From 422b31f90d44432a023f0ccabb0151da01e19e2a Mon Sep 17 00:00:00 2001
From: Sam Willis <sam.willis@gmail.com>
Date: Thu, 4 Dec 2025 18:59:39 +0000
Subject: [PATCH 1/4] test(react-db): add tests for deletion from partial page
 in infinite query

Add tests for deleting items from a page with fewer rows than pageSize
in useLiveInfiniteQuery. Tests both ascending and descending order to
verify the behavior difference.
---
 .../tests/useLiveInfiniteQuery.test.tsx       | 131 ++++++++++++++++++
 1 file changed, 131 insertions(+)

diff --git a/packages/react-db/tests/useLiveInfiniteQuery.test.tsx b/packages/react-db/tests/useLiveInfiniteQuery.test.tsx
index 5dbb69c1b..b59753b34 100644
--- a/packages/react-db/tests/useLiveInfiniteQuery.test.tsx
+++ b/packages/react-db/tests/useLiveInfiniteQuery.test.tsx
@@ -368,6 +368,137 @@ describe(`useLiveInfiniteQuery`, () => {
     expect(result.current.pages[1]).toHaveLength(10)
   })
 
+  it(`should handle deletion from partial page with descending order`, async () => {
+    // Create only 5 items - fewer than the pageSize of 20
+    const posts = createMockPosts(5)
+    const collection = createCollection(
+      mockSyncCollectionOptions<Post>({
+        id: `partial-page-deletion-desc-test`,
+        getKey: (post: Post) => post.id,
+        initialData: posts,
+      })
+    )
+
+    const { result } = renderHook(() => {
+      return useLiveInfiniteQuery(
+        (q) =>
+          q
+            .from({ posts: collection })
+            .orderBy(({ posts: p }) => p.createdAt, `desc`),
+        {
+          pageSize: 20,
+          getNextPageParam: (lastPage) =>
+            lastPage.length === 20 ? lastPage.length : undefined,
+        }
+      )
+    })
+
+    await waitFor(() => {
+      expect(result.current.isReady).toBe(true)
+    })
+
+    // Should have all 5 items on one page (partial page)
+    expect(result.current.pages).toHaveLength(1)
+    expect(result.current.data).toHaveLength(5)
+    expect(result.current.hasNextPage).toBe(false)
+
+    // Verify the first item (most recent by createdAt descending)
+    const firstItemId = result.current.data[0]!.id
+    expect(firstItemId).toBe(`1`) // Post 1 has the highest createdAt
+
+    // Delete the first item (the one that appears first in descending order)
+    act(() => {
+      collection.utils.begin()
+      collection.utils.write({
+        type: `delete`,
+        value: posts[0]!, // Post 1
+      })
+      collection.utils.commit()
+    })
+
+    // The deleted item should disappear from the result
+    await waitFor(() => {
+      expect(result.current.data).toHaveLength(4)
+    })
+
+    // Verify the deleted item is no longer in the data
+    expect(
+      result.current.data.find((p) => p.id === firstItemId)
+    ).toBeUndefined()
+
+    // Verify the new first item is Post 2
+    expect(result.current.data[0]!.id).toBe(`2`)
+
+    // Still should have 1 page with 4 items
+    expect(result.current.pages).toHaveLength(1)
+    expect(result.current.pages[0]).toHaveLength(4)
+    expect(result.current.hasNextPage).toBe(false)
+  })
+
+  it(`should handle deletion from partial page with ascending order`, async () => {
+    // Create only 5 items - fewer than the pageSize of 20
+    const posts = createMockPosts(5)
+    const collection = createCollection(
+      mockSyncCollectionOptions<Post>({
+        id: `partial-page-deletion-asc-test`,
+        getKey: (post: Post) => post.id,
+        initialData: posts,
+      })
+    )
+
+    const { result } = renderHook(() => {
+      return useLiveInfiniteQuery(
+        (q) =>
+          q
+            .from({ posts: collection })
+            .orderBy(({ posts: p }) => p.createdAt, `asc`), // ascending order
+        {
+          pageSize: 20,
+          getNextPageParam: (lastPage) =>
+            lastPage.length === 20 ? lastPage.length : undefined,
+        }
+      )
+    })
+
+    await waitFor(() => {
+      expect(result.current.isReady).toBe(true)
+    })
+
+    // Should have all 5 items on one page (partial page)
+    expect(result.current.pages).toHaveLength(1)
+    expect(result.current.data).toHaveLength(5)
+    expect(result.current.hasNextPage).toBe(false)
+
+    // In ascending order, Post 5 has the lowest createdAt and appears first
+    const firstItemId = result.current.data[0]!.id
+    expect(firstItemId).toBe(`5`) // Post 5 has the lowest createdAt
+
+    // Delete the first item (the one that appears first in ascending order)
+    act(() => {
+      collection.utils.begin()
+      collection.utils.write({
+        type: `delete`,
+        value: posts[4]!, // Post 5 (index 4 in array)
+      })
+      collection.utils.commit()
+    })
+
+    // The deleted item should disappear from the result
+    await waitFor(() => {
+      expect(result.current.data).toHaveLength(4)
+    })
+
+    // Verify the deleted item is no longer in the data
+    expect(
+      result.current.data.find((p) => p.id === firstItemId)
+    ).toBeUndefined()
+
+    // Still should have 1 page with 4 items
+    expect(result.current.pages).toHaveLength(1)
+    expect(result.current.pages[0]).toHaveLength(4)
+    expect(result.current.hasNextPage).toBe(false)
+  })
+
   it(`should work with where clauses`, async () => {
     const posts = createMockPosts(50)
     const collection = createCollection(

From 79a2e269db7ddb0bff8609e2c8bea648ac6bd27a Mon Sep 17 00:00:00 2001
From: Sam Willis <sam.willis@gmail.com>
Date: Thu, 4 Dec 2025 19:47:51 +0000
Subject: [PATCH 2/4] fix: correctly extract indexed value in
 requestLimitedSnapshot

The `biggestObservedValue` variable was incorrectly set to the full row object
instead of the indexed value (e.g., salary). This caused the BTree comparison
in `index.take()` to fail, resulting in the same data being loaded multiple
times. Each item would be inserted with a multiplicity > 1, and when deleted,
the multiplicity would decrement but not reach 0, so the item would remain
visible in the TopK.

This fix creates a value extractor from the orderBy expression and uses it to
extract the actual indexed value from each row before tracking it as the
"biggest observed value".
---
 packages/db/src/collection/subscription.ts | 14 ++++++++--
 packages/db/tests/query/order-by.test.ts   | 32 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/packages/db/src/collection/subscription.ts b/packages/db/src/collection/subscription.ts
index 1c23d7b04..9cc3700d1 100644
--- a/packages/db/src/collection/subscription.ts
+++ b/packages/db/src/collection/subscription.ts
@@ -1,7 +1,8 @@
 import { ensureIndexForExpression } from "../indexes/auto-index.js"
 import { and, eq, gt, gte, lt } from "../query/builder/functions.js"
-import { Value } from "../query/ir.js"
+import { PropRef, Value } from "../query/ir.js"
 import { EventEmitter } from "../event-emitter.js"
+import { compileExpression } from "../query/compiler/evaluators.js"
 import {
   createFilterFunctionFromExpression,
   createFilteredCallback,
@@ -314,6 +315,13 @@ export class CollectionSubscription
     const valuesNeeded = () => Math.max(limit - changes.length, 0)
     const collectionExhausted = () => keys.length === 0
 
+    // Create a value extractor for the orderBy field to properly track the biggest indexed value
+    const orderByExpression = orderBy[0]!.expression
+    const valueExtractor =
+      orderByExpression.type === `ref`
+        ? compileExpression(new PropRef(orderByExpression.path), true)
+        : null
+
     while (valuesNeeded() > 0 && !collectionExhausted()) {
       const insertedKeys = new Set<string | number>() // Track keys we add to `changes` in this iteration
 
@@ -324,7 +332,9 @@ export class CollectionSubscription
           key,
           value,
         })
-        biggestObservedValue = value
+        // Extract the indexed value (e.g., salary) from the row, not the full row
+        // This is needed for index.take() to work correctly with the BTree comparator
+        biggestObservedValue = valueExtractor ? valueExtractor(value) : value
         insertedKeys.add(key) // Track this key
       }
 
diff --git a/packages/db/tests/query/order-by.test.ts b/packages/db/tests/query/order-by.test.ts
index d7c11b848..82afec689 100644
--- a/packages/db/tests/query/order-by.test.ts
+++ b/packages/db/tests/query/order-by.test.ts
@@ -733,6 +733,38 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
           [5, 52_000],
         ])
       })
+
+      it(`handles deletion from partial page with limit larger than data`, async () => {
+        const collection = createLiveQueryCollection((q) =>
+          q
+            .from({ employees: employeesCollection })
+            .orderBy(({ employees }) => employees.salary, `desc`)
+            .limit(20) // Limit larger than number of employees (5)
+            .select(({ employees }) => ({
+              id: employees.id,
+              name: employees.name,
+              salary: employees.salary,
+            }))
+        )
+        await collection.preload()
+
+        const results = Array.from(collection.values())
+        expect(results).toHaveLength(5)
+        expect(results[0]!.name).toBe(`Diana`)
+
+        // Delete Diana (the highest paid employee, first in DESC order)
+        const dianaData = employeeData.find((e) => e.id === 4)!
+        employeesCollection.utils.begin()
+        employeesCollection.utils.write({
+          type: `delete`,
+          value: dianaData,
+        })
+        employeesCollection.utils.commit()
+
+        const newResults = Array.from(collection.values())
+        expect(newResults).toHaveLength(4)
+        expect(newResults[0]!.name).toBe(`Bob`)
+      })
     })
 
     describe(`OrderBy with Joins`, () => {

From 7890567fcb7c47865f8be639613a072992adb81b Mon Sep 17 00:00:00 2001
From: Sam Willis <sam.willis@gmail.com>
Date: Thu, 4 Dec 2025 19:48:45 +0000
Subject: [PATCH 3/4] chore: add changeset for DESC deletion fix

---
 .changeset/fix-desc-deletion-partial-page.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .changeset/fix-desc-deletion-partial-page.md

diff --git a/.changeset/fix-desc-deletion-partial-page.md b/.changeset/fix-desc-deletion-partial-page.md
new file mode 100644
index 000000000..1c599b6fe
--- /dev/null
+++ b/.changeset/fix-desc-deletion-partial-page.md
@@ -0,0 +1,9 @@
+---
+"@tanstack/db": patch
+---
+
+Fix useLiveInfiniteQuery not updating when deleting an item from a partial page with DESC order.
+
+The bug occurred when using `useLiveInfiniteQuery` with `orderBy(..., 'desc')` and having fewer items than the `pageSize`. Deleting an item would not update the live result - the deleted item would remain visible until another change occurred.
+
+The root cause was in `requestLimitedSnapshot` where `biggestObservedValue` was incorrectly set to the full row object instead of the indexed value (e.g., the salary field used for ordering). This caused the BTree comparison to fail, resulting in the same data being loaded multiple times with each item having a multiplicity > 1. When an item was deleted, its multiplicity would decrement but not reach 0, so it remained visible.

From 0e075e33464bd8ae998910273be14e30b78a8875 Mon Sep 17 00:00:00 2001
From: Sam Willis <sam.willis@gmail.com>
Date: Tue, 23 Dec 2025 16:40:10 +0000
Subject: [PATCH 4/4] Main branch merge conflict (#1066)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(query-db-collection): use deep equality for object field comparison (#967)

* test: add test for object field update rollback issue

Add test that verifies object field updates with refetch: false
don't rollback to previous values after server response.

* fix: use deep equality for object field comparison in query observer

Replace shallow equality (===) with deep equality when comparing items
in the query observer callback. This fixes an issue where updating
object fields with refetch: false would cause rollback to previous
values every other update.

* chore: add changeset for object field update rollback fix

* ci: Version Packages (#961)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* docs: regenerate API documentation (#969)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* ci: run prettier autofix action (#972)

* ci: prettier auto-fix

* Sync prettier config with other TanStack projects

* Fix lockfile

* docs: correct local relative links (#973)

* fix(db-ivm): use row keys for stable ORDER BY tie-breaking (#957)

* fix(db-ivm): use row keys for stable ORDER BY tie-breaking

Replace hash-based object ID tie-breaking with direct key comparison
for deterministic ordering when ORDER BY values are equal.

- Use row key directly as tie-breaker (always string | number, unique per row)
- Remove globalObjectIdGenerator dependency
- Simplify TaggedValue from [K, V, Tag] to [K, T] tuple
- Clean up helper functions (tagValue, getKey, getVal, getTag)

This ensures stable, deterministic ordering across page reloads and
eliminates potential hash collisions.

* ci: apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* fix(db): ensure deterministic iteration order for collections and indexes (#958)

* fix(db): ensure deterministic iteration order for collections and indexes

- SortedMap: add key-based tie-breaking for deterministic ordering
- SortedMap: optimize to skip value comparison when no comparator provided
- BTreeIndex: sort keys within same indexed value for deterministic order
- BTreeIndex: add fast paths for empty/single-key sets
- CollectionStateManager: always use SortedMap for deterministic iteration
- Extract compareKeys utility to utils/comparison.ts
- Add comprehensive tests for deterministic ordering behavior

* ci: apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* fix(db) loadSubset when orderby has multiple columns (#926)

* fix(db) loadSubset when orderby has multiple columns

failing test for multiple orderby and loadsubset

push down multiple orderby predicates to load subset

split order by cursor predicate build into two, inprecise wider band for local lading, precise for the sync loadSubset

new e2e tests for composite orderby and pagination

changeset

when doing gt/lt comparisons to a bool cast to string

fix: use non-boolean columns in multi-column orderBy e2e tests

Electric/PostgreSQL doesn't support comparison operators (<, >, <=, >=)
on boolean types. Changed tests to use age (number) and name (string)
columns instead of isActive (boolean) to avoid this limitation.

The core multi-column orderBy functionality still works correctly -
this is just a test adjustment to work within Electric's SQL parser
constraints.

* ci: apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* ci: sync changes from other projects (#978)

* ci: fix vitest/lint, fix package.json

* ci: apply automated fixes

* Remove ts-expect-error

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* ci: more changes from other projects (#980)

* Revert husky removal (#981)

* revert: restore husky pre-commit hook removed in #980

This restores the husky pre-commit hook configuration that was removed
in PR #980. The hook runs lint-staged on staged .ts and .tsx files.

* chore: update pnpm-lock.yaml and fix husky pre-commit format

Update lockfile with husky and lint-staged dependencies.
Update pre-commit hook to modern husky v9 format.

---------

Co-authored-by: Claude <noreply@anthropic.com>

* Restore only publishing docs on release (#982)

* ci: revert doc publishing workflow changes from #980

Restore the doc publishing workflow that was removed in PR #980:
- Restore docs-sync.yml for daily auto-generated docs
- Restore doc generation steps in release.yml after package publish
- Restore NPM_TOKEN environment variable

* ci: restore doc generation on release only

Restore doc generation steps in release.yml that run after package
publish. Remove the daily docs-sync.yml workflow - docs should only
be regenerated when we release.

---------

Co-authored-by: Claude <noreply@anthropic.com>

* ci: sync package versions (#984)

* chore(deps): update dependency @angular/common to v19.2.16 [security] (#919)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update all non-major dependencies (#986)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix build example site auth secret error (#988)

fix(ci): add BETTER_AUTH_SECRET for projects example build

Copy .env.example to .env during CI build to provide required
BETTER_AUTH_SECRET that better-auth now enforces.

Co-authored-by: Claude <noreply@anthropic.com>

* Unit tests for data equality comparison (#992)

* Add @tanstack/config dev dependency

* Tests for eq comparison of Date objects

* ci: apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* Handle invalid collection getKey return values (#1008)

* Add runtime validation for collection getKey return values

Throws InvalidKeyError when getKey returns values other than string or
number (e.g., null, objects, booleans). The validation is optimized to
only require 1 typeof check on the happy path (string keys).

- Add InvalidKeyError class to errors.ts
- Update generateGlobalKey to validate key type before generating key
- Add tests for invalid key types (null, object, boolean)
- Add tests confirming valid keys (string, number, empty string, zero)

* ci: apply automated fixes

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* Remove doc regeneration from autofix action (#1009)

ci: remove doc regeneration from autofix workflow

Docs are regenerated as part of releases, not on every PR/push.

Co-authored-by: Claude <noreply@anthropic.com>

* feat(db,electric,query): separate cursor expressions for flexible pagination (#960)

* feat(db,electric,query): separate cursor expressions from where clause in loadSubset

- Add CursorExpressions type with whereFrom, whereCurrent, and lastKey
- LoadSubsetOptions.where no longer includes cursor - passed separately via cursor property
- Add offset to LoadSubsetOptions for offset-based pagination support
- Electric sync layer makes two parallel requestSnapshot calls when cursor present
- Query collection serialization includes offset for query key generation

This allows sync layers to choose between cursor-based or offset-based pagination,
and Electric can efficiently handle tie-breaking with targeted requests.

test(react-db): update useLiveInfiniteQuery test mock to handle cursor expressions

The test mock's loadSubset handler now handles the new cursor property
in LoadSubsetOptions by combining whereCurrent (ties) and whereFrom (next page)
data, deduplicating by id, and re-sorting.

fix(electric): make cursor requestSnapshot calls sequential

Changed parallel requestSnapshot calls to sequential to avoid potential
issues with concurrent snapshot requests that may cause timeouts in CI.

fix(electric): combine cursor expressions into single requestSnapshot

Instead of making two separate requestSnapshot calls (one for whereFrom,
one for whereCurrent), combine them using OR into a single request.
This avoids potential issues with multiple sequential snapshot requests
that were causing timeouts in CI.

The combined expression (whereFrom OR whereCurrent) matches the original
behavior where cursor was combined with the where clause.

wip

working?

update changeset

fix query test

* update docs

* ci: apply automated fixes

* fixups

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* ci: Version Packages (#974)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Query collection select writeupsert error (#1023)

* test(query-db-collection): add failing tests for select + writeInsert/writeUpsert bug

Add tests that reproduce the bug where using writeInsert or writeUpsert
with a collection that has a select option causes an error:
"select() must return an array of objects. Got: undefined"

The bug occurs because performWriteOperations sets the query cache with
a raw array, but the select function expects the wrapped response format.

Related issue: https://github.com/TanStack/db/issues/xyz

* fix(query-db-collection): fix select option breaking writeInsert/writeUpsert

When using the `select` option to extract items from a wrapped API response
(e.g., `{ data: [...], meta: {...} }`), calling `writeInsert()` or
`writeUpsert()` would corrupt the query cache by setting it to a raw array.

This caused the `select` function to receive the wrong data format and
return `undefined`, triggering the error:
"select() must return an array of objects. Got: undefined"

The fix adds a `hasSelect` flag to the SyncContext and skips the
`setQueryData` call when `select` is configured. This is the correct
behavior because:
1. The collection's synced store is already updated
2. The query cache stores the wrapped response format, not the raw items
3. Overwriting the cache with raw items would break the select function

* fix(query-db-collection): fix select option breaking writeInsert/writeUpsert

When using the `select` option to extract items from a wrapped API response
(e.g., `{ data: [...], meta: {...} }`), calling `writeInsert()` or
`writeUpsert()` would corrupt the query cache by setting it to a raw array.

This caused the `select` function to receive the wrong data format and
return `undefined`, triggering the error:
"select() must return an array of objects. Got: undefined"

The fix adds an `updateCacheData` function to the SyncContext that properly
handles cache updates for both cases:
- Without `select`: sets the cache directly with the raw array
- With `select`: uses setQueryData with an updater function to preserve
  the wrapper structure while updating the items array inside it

Also added a comprehensive test that verifies the wrapped response format
(including metadata) is preserved after write operations.

* ci: apply automated fixes

* refactor(query-db-collection): lift updateCacheData out of inline context

Move the updateCacheData function from being inline in the writeContext
object to a standalone function for better readability and maintainability.

* fix(query-db-collection): improve updateCacheData with select-based property detection

Address review feedback:
1. Use select(oldData) to identify the correct array property by reference
   equality instead of "first array property wins" heuristic
2. Fallback to common property names (data, items, results) before scanning
3. Return oldData unchanged instead of raw array when property can't be found
   to avoid breaking select
4. Make updateCacheData optional in SyncContext to avoid breaking changes
5. Add changeset for release

* ci: apply automated fixes

* fix: resolve TypeScript type errors for queryKey

Handle both static and function-based queryKey types properly:
- Get base query key before passing to setQueryData
- Keep writeContext.queryKey as Array<unknown> for SyncContext compatibility

* chore: fix version inconsistencies in example apps

Update example apps to use consistent versions of:
- @tanstack/query-db-collection: ^1.0.7
- @tanstack/react-db: ^0.1.56

Fixes sherif multiple-dependency-versions check.

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* Fix serializing null/undefined when generating subset queries (#951)

* Fix invalid Electric proxy queries with missing params for null values

When comparison operators (eq, gt, lt, etc.) were used with null/undefined
values, the SQL compiler would generate placeholders ($1, $2) in the WHERE
clause but skip adding the params to the dictionary because serialize()
returns empty string for null/undefined.

This resulted in invalid queries being sent to Electric like:
  subset__where="name" = $1
  subset__params={}

The fix:
- For eq(col, null): Transform to "col IS NULL" syntax
- For other comparisons (gt, lt, gte, lte, like, ilike): Throw a clear
  error since null comparisons don't make semantic sense in SQL

Added comprehensive tests for the sql-compiler including null handling.

* chore: add changeset for Electric null params fix

* fix: use type assertions in sql-compiler tests for phantom type compatibility

* fix: handle edge cases for null comparisons in sql-compiler

Address reviewer feedback:
- eq(null, null) now throws (both args null would cause missing params)
- eq(null, literal) now throws (comparing literal to null is nonsensical)
- Only allow ref and func types as non-null arg in eq(..., null)
- Update changeset to explicitly mention undefined behavior
- Add tests for edge cases and OR + null equality

* test: add e2e tests for eq(col, null) transformation to IS NULL

* test: improve e2e tests for eq(col, null) with longer timeout and baseline comparison

* fix: handle eq(col, null) in local evaluator to match SQL IS NULL semantics

When eq() is called with a literal null/undefined value, the local
JavaScript evaluator now treats it as an IS NULL check instead of
using 3-valued logic (which would always return UNKNOWN).

This matches the SQL compiler's transformation of eq(col, null) to
IS NULL, ensuring consistent behavior between local query evaluation
and remote SQL queries.

- eq(col, null) now returns true if col is null/undefined, false otherwise
- eq(null, col) is also handled symmetrically
- eq(null, null) returns true (both are null)
- 3-valued logic still applies for column-to-column comparisons

This fixes e2e test failures where eq(col, null) queries returned 0
results because all rows were being excluded by the UNKNOWN result.

* docs: explain eq(col, null) handling and 3-valued logic reasoning

Add design document explaining the middle-ground approach for handling
eq(col, null) in the context of PR #765's 3-valued logic implementation.

Key points:
- Literal null values in eq() are transformed to isNull semantics
- 3-valued logic still applies for column-to-column comparisons
- This maintains SQL/JS consistency and handles dynamic values gracefully

* fix: throw error for eq(col, null) - use isNull() instead

Per Kevin's feedback on the 3-valued logic design (PR #765), eq(col, null)
should throw an error rather than being transformed to IS NULL. This is
consistent with how other comparison operators (gt, lt, etc.) handle null.

Changes:
- Revert JS evaluator change that transformed eq(col, null) to isNull semantics
- Update SQL compiler to throw error for eq(col, null) instead of IS NULL
- Update all related unit tests to expect errors
- Remove e2e tests for eq(col, null) (now throws error)
- Update documentation to explain the correct approach

Users should:
- Use isNull(col) or isUndefined(col) to check for null values
- Handle dynamic null values explicitly in their code
- Use non-nullable columns for cursor-based pagination

The original bug (invalid SQL with missing params) is fixed by throwing
a clear error that guides users to the correct approach.

* fix: update changeset and remove design doc per review feedback

- Update changeset to reflect that eq(col, null) throws error (not transforms to IS NULL)
- Remove docs/design/eq-null-handling.md - was only for review, not meant to be merged

* ci: apply automated fixes

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* Fix awaitMatch helper on collection inserts and export isChangeMessage (#1000)

fix(electric-db-collection): fix awaitMatch race condition on inserts and export isChangeMessage

Two issues fixed:

1. **isChangeMessage not exported**: The `isChangeMessage` and `isControlMessage` utilities
   were exported from electric.ts but not re-exported from the package's index.ts, making
   them unavailable to users despite documentation stating otherwise.

2. **awaitMatch race condition on inserts**: When `awaitMatch` was called after the Electric
   messages had already been processed (including up-to-date), it would timeout because:
   - The message buffer (`currentBatchMessages`) was cleared on up-to-date
   - Immediate matches found in the buffer still waited for another up-to-date to resolve

   Fixed by:
   - Moving buffer clearing to the START of batch processing (preserves messages until next batch)
   - Adding `batchCommitted` flag to track when a batch is committed
   - For immediate matches: resolve immediately only if batch is committed (consistent with awaitTxId)
   - For immediate matches during batch processing: wait for up-to-date (maintains commit semantics)
   - Set `batchCommitted` BEFORE `resolveMatchedPendingMatches()` to avoid timing window
   - Set `batchCommitted` on snapshot-end in on-demand mode (matching "ready" semantics)

Fixes issue reported on Discord where inserts would timeout while updates worked.

Co-authored-by: Claude <noreply@anthropic.com>

* ci: Version Packages (#1026)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* docs: regenerate API documentation (#1027)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Don't pin @electric-sql/client version (#1031)

* Don't pin @electric-sql/client version

* Add changeset

* update lock file

* Fix sherif linter errors for dependency version mismatches

Standardizes @electric-sql/client to use ^1.2.0 across react-db, solid-db, and vue-db packages, and updates @tanstack/query-db-collection to ^1.0.8 in todo examples.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>

* ci: Version Packages (#1033)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Handle subset end message in Electric collection (#1004)

Adds support for the subset-end message introduced in electric-sql/electric#3582

* Delete a row by its key (#1003)

This PR makes it possible to delete a row by key when using the write function passed to a collection's sync function.

* Tagged rows and support for move outs in Electric DB collection (#942)

Builds on top of Electric's ts-client support for tagging rows and move out events: electric-sql/electric#3497

This PR extends tanstack DB such that it handles tagged rows and move out events. A tagged row is removed from the Electric collection when its tag set becomes empty. Note that rows only have tags when the shape they belong to has one or more subqueries.

* Fix: deleted items not disappearing from live queries with `.limit()` (#1044)

* fix: emit delete events when subscribing with includeInitialState: false

When subscribing to a collection with includeInitialState: false,
delete events were being filtered out because the sentKeys set was
empty. This affected live queries with limit/offset where users
would subscribe to get future changes after already loading
initial data via preload() or values().

Changes:
- Add skipFiltering flag separate from loadedInitialState to allow
  filtering to be skipped while still allowing requestSnapshot to work
- Call markAllStateAsSeen() when includeInitialState is explicitly false
- Change internal subscriptions to not pass includeInitialState: false
  explicitly, so they can be distinguished from user subscriptions
- Add tests for optimistic delete behavior with limit

Fixes the issue where deleted items would not disappear from live
queries when using .limit() and subscribing with includeInitialState: false.

* debug: add extensive logging to track delete event flow

This is a DEBUG BUILD with [TanStack-DB-DEBUG] logs to help track down
why delete events may not be reaching subscribers when using limit/offset.

The debug logs cover:
- subscribeChanges: when subscriptions are created
- emitEvents: when events are emitted to subscriptions
- Subscription.emitEvents: when individual subscriptions receive events
- filterAndFlipChanges: when events are filtered or passed through
- recomputeOptimisticState: when optimistic state is recomputed and events emitted
- sendChangesToPipeline: when changes flow through the D2 pipeline
- applyChanges: when D2 pipeline outputs to the live query collection

To use: Filter browser console for "[TanStack-DB-DEBUG]"

Also includes the fix for includeInitialState: false not emitting deletes.

* ci: apply automated fixes

* debug: add more logging to track delete event flow in live queries

Add comprehensive debug logging to:
- createFilteredCallback in change-events.ts for whereExpression filtering
- sendChangesToInput for D2 pipeline input
- subscribeToOrderedChanges for orderBy/limit path
- splitUpdates for update event handling
- recomputeOptimisticState for pending sync key filtering

This additional logging helps track where delete events may be filtered
out when using live queries with limit/offset and where clauses.

* ci: apply automated fixes

* debug: add logging to graph scheduling and execution

Add debug logging to track:
- scheduleGraphRun: when graph run is scheduled
- executeGraphRun: when graph run executes or returns early
- maybeRunGraph: when graph actually runs, pending work status

This helps diagnose issues where deletes are sent to D2 pipeline
but never appear in the output (applyChanges not called).

* ci: apply automated fixes

* debug: add detailed logging to D2 reduce and topK operators

Add debug logging to track:
- ReduceOperator: input processing, key handling, and result output
- topK: consolidation, sorting, slicing, and result details

Also add two new test cases:
1. Test delete from different page (page 1 delete while viewing page 2)
   - Verifies items shift correctly when delete occurs on earlier page
2. Test delete beyond TopK window (no-op case)
   - Verifies deleting item outside window doesn't affect results

These tests and debug logs will help diagnose issues where deleted
items don't disappear from live queries when using limit/offset.

* ci: apply automated fixes

* debug: add more detailed logging to D2 graph and subscription

Add additional debug logging to help diagnose delete issues:

D2 graph (d2.ts):
- Log when run() starts and completes with step count
- Log pendingWork() results with operator IDs
- Log when operators have pending work in step()

Output operator (output.ts):
- Log when run is called with message count
- Log items in each message being processed

Subscription (subscription.ts):
- Log trackSentKeys with keys being added
- Show total sentKeys count

This should help diagnose scenarios where delete events are sent
to D2 but no applyChanges output is produced.

* ci: apply automated fixes

* debug: add operator type logging to trace D2 pipeline

Add operatorType property to Operator base class and log it when
operators run. This will help identify which operators are processing
the delete and where the data is being lost.

Also add detailed logging to LinearUnaryOperator.run() to show:
- Input message count
- Input/output item counts
- Sample of input and output items

This should reveal exactly which operator is dropping the delete.

* debug: add logging to TopKWithFractionalIndexOperator

This is the key operator for orderBy+limit queries. Add detailed logging to:
- run(): Show message count and index size
- processElement(): Show key, multiplicity changes, and action (INSERT/DELETE/NO_CHANGE)
- processElement result: Show moveIn/moveOut keys

This should reveal exactly why deletes aren't producing output changes
when the item exists in the TopK index.

* ci: apply automated fixes

* fix: filter duplicate inserts in subscription to prevent D2 multiplicity issues

When an item is inserted multiple times without a delete in between,
D2 multiplicity goes above 1. Then when a single delete arrives,
multiplicity goes from 2 to 1 (not 0), so TopK doesn't emit a DELETE event.

This fix:
1. Filters out duplicate inserts in filterAndFlipChanges when key already in sentKeys
2. Removes keys from sentKeys on delete in both filterAndFlipChanges and trackSentKeys
3. Updates test expectation to reflect correct behavior (2 events instead of 3)

Root cause: Multiple subscriptions or sync mechanisms could send duplicate
insert events for the same key, causing D2 to track multiplicity > 1.

* fix: add D2 input level deduplication to prevent multiplicity > 1

The previous fix in CollectionSubscription.filterAndFlipChanges was only
catching duplicates at the subscription level. But each live query has its
own CollectionSubscriber with its own D2 pipeline.

This fix adds a sentToD2Keys set in CollectionSubscriber to track which
keys have been sent to the D2 input, preventing duplicate inserts at the
D2 level regardless of which code path triggers them.

Also clears the tracking on truncate events.

* docs: add detailed changeset for delete fix

* ci: apply automated fixes

* chore: remove debug logging from D2 pipeline and subscription code

Remove all TanStack-DB-DEBUG console statements that were added during
investigation of the deleted items not disappearing from live queries bug.

The fix for duplicate D2 inserts is preserved - just removing the verbose
debug output now that the issue is resolved.

* debug: add logging to trace source of duplicate D2 inserts

Add targeted debug logging to understand where duplicate inserts originate:

1. recomputeOptimisticState: Track what events are generated and when
2. CollectionSubscription.filterAndFlipChanges: Trace filtering decisions
3. CollectionSubscriber.sendChangesToPipeline: Track D2-level deduplication

This will help determine if duplicates come from:
- Multiple calls to recomputeOptimisticState for the same key
- Overlap between initial snapshot and change events
- Multiple code paths feeding the D2 pipeline

* ci: apply automated fixes

* fix: prevent race condition in snapshot loading by adding keys to sentKeys before callback

The race condition occurred because snapshot methods (requestSnapshot, requestLimitedSnapshot)
added keys to sentKeys AFTER calling the callback, while filterAndFlipChanges added keys
BEFORE. If a change event arrived during callback execution, it would not see the keys
in sentKeys yet, allowing duplicate inserts.

Changes:
- Add keys to sentKeys BEFORE calling callback in requestSnapshot and requestLimitedSnapshot
- Remove redundant D2-level deduplication (sentToD2Keys) - subscription-level filtering is sufficient
- Remove debug logging added during investigation

* docs: update changeset to reflect race condition fix

* cleanup

* simplify changeset

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Sam Willis <sam.willis@gmail.com>

* ci: Version Packages (#1036)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix(db): re-request and buffer subsets after truncate for on-demand sync mode (#1043)

* fix(db): re-request subsets after truncate for on-demand sync mode

When a must-refetch (409) occurs in on-demand sync mode, the collection
receives a truncate which clears all data and resets the loadSubset
deduplication state. However, subscriptions were not re-requesting
their previously loaded subsets, leaving the collection empty.

This fix adds a truncate event listener to CollectionSubscription that:
1. Resets pagination/snapshot tracking state (but NOT sentKeys)
2. Re-requests all previously loaded subsets

We intentionally keep sentKeys intact because the truncate event is
emitted BEFORE delete events are sent to subscribers. If we cleared
sentKeys, delete events would be filtered by filterAndFlipChanges.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* feat: Buffer subscription changes during truncate

This change buffers subscription changes during a truncate event until all
loadSubset refetches complete. This prevents a flash of missing content
between deletes and new inserts.

Co-authored-by: sam.willis <sam.willis@gmail.com>

* ci: apply automated fixes

* changeset

* tweaks

* test

* address review

* ci: apply automated fixes

---------

Co-authored-by: Igor Barakaiev <ibarakaiev@gmail.com>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* ci: Version Packages (#1050)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: prevent duplicate inserts from reaching D2 pipeline in live queries (#1054)

* add test

* fix

* changeset

* fix versions

* ci: apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* docs: regenerate API documentation (#1051)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* ci: Version Packages (#1055)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix slow onInsert awaitMatch performance issue (#1029)

* fix(electric): preserve message buffer across batches for awaitMatch

The buffer was being cleared at the start of each new batch, which caused
messages to be lost when multiple batches arrived before awaitMatch was
called. This led to:
- awaitMatch timing out (~3-5s per attempt)
- Transaction rollbacks when the timeout threw an error

The fix removes the buffer clearing between batches. Messages are now
preserved until the buffer reaches MAX_BATCH_MESSAGES (1000), at which
point the oldest messages are dropped. This ensures awaitMatch can find
messages even when heartbeat batches or other sync activity arrives
before the API call completes.

Added test case for the specific race condition: multiple batches
(including heartbeats) arriving while onInsert's API call is in progress.

* chore: align query-db-collection versions in examples

Update todo examples to use ^1.0.8 to match other examples and fix
sherif version consistency check.

* chore: align example dependency versions

Update todo and paced-mutations-demo examples to use consistent versions:
- @tanstack/query-db-collection: ^1.0.11
- @tanstack/react-db: ^0.1.59

---------

Co-authored-by: Claude <noreply@anthropic.com>

* Add missing changeset for PR 1029 (#1062)

Add changeset for PR #1029 (awaitMatch performance fix)

Co-authored-by: Claude <noreply@anthropic.com>

* ci: Version Packages (#1063)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* ci: apply automated fixes

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Kyle Mathews <mathews.kyle@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Kevin <kevin@electric-sql.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Igor Barakaiev <ibarakaiev@gmail.com>
---
 .changeset/fix-desc-deletion-partial-page.md  |    2 +-
 .changeset/fix-filter-expression-compile.md   |    7 -
 .changeset/fix-isready-disabled-queries.md    |   13 -
 .changeset/fix-tanstack-db-peerdeps.md        |    6 -
 .github/ISSUE_TEMPLATE/bug_report.md          |    6 +-
 .github/workflows/autofix.yml                 |    8 +-
 .github/workflows/claude.yml                  |    2 +-
 .github/workflows/docs-sync.yml               |  104 -
 .github/workflows/e2e-tests.yml               |    6 +-
 .github/workflows/pr.yml                      |   27 +-
 .github/workflows/release.yml                 |    9 +-
 .gitignore                                    |  170 +-
 .husky/pre-commit                             |    3 -
 .pnpmfile.cjs                                 |   25 -
 .prettierrc                                   |    5 -
 AGENTS.md                                     |   20 +-
 docs/collections/query-collection.md          |   19 +-
 docs/framework/angular/overview.md            |    2 +-
 .../reference/functions/injectLiveQuery.md    |   72 +-
 docs/framework/angular/reference/index.md     |    4 +-
 .../interfaces/InjectLiveQueryResult.md       |    8 +-
 docs/framework/react/overview.md              |    2 +-
 .../functions/useLiveInfiniteQuery.md         |    8 +-
 docs/framework/react/reference/index.md       |   14 +-
 docs/framework/solid/overview.md              |    2 +-
 .../solid/reference/functions/useLiveQuery.md |  150 +-
 docs/framework/solid/reference/index.md       |    2 +-
 docs/framework/svelte/overview.md             |    2 +-
 .../reference/functions/useLiveQuery.md       |  414 +++
 docs/framework/svelte/reference/index.md      |   15 +
 .../interfaces/UseLiveQueryReturn.md          |  125 +
 .../UseLiveQueryReturnWithCollection.md       |  112 +
 docs/framework/vue/overview.md                |    2 +-
 .../vue/reference/functions/useLiveQuery.md   |   96 +-
 docs/framework/vue/reference/index.md         |    6 +-
 docs/guides/error-handling.md                 |    6 +-
 docs/guides/live-queries.md                   |    4 +-
 docs/overview.md                              |   30 +-
 docs/quick-start.md                           |    6 +-
 .../namespaces/IR/classes/Aggregate.md        |    2 +-
 .../namespaces/IR/classes/CollectionRef.md    |    2 +-
 .../@tanstack/namespaces/IR/classes/Func.md   |    2 +-
 .../namespaces/IR/classes/QueryRef.md         |    2 +-
 .../IR/functions/createResidualWhere.md       |    4 +-
 .../namespaces/IR/functions/followRef.md      |    8 +-
 .../IR/functions/getHavingExpression.md       |    6 +-
 .../IR/functions/getWhereExpression.md        |    4 +-
 .../IR/functions/isResidualWhere.md           |    2 +-
 .../@tanstack/namespaces/IR/index.md          |   52 +-
 .../namespaces/IR/interfaces/QueryIR.md       |    6 +-
 .../AggregateFunctionNotInSelectError.md      |   22 +-
 .../classes/AggregateNotSupportedError.md     |   22 +-
 docs/reference/classes/BTreeIndex.md          |  126 +-
 docs/reference/classes/BaseIndex.md           |   58 +-
 docs/reference/classes/BaseQueryBuilder.md    |   56 +-
 .../CannotCombineEmptyExpressionListError.md  |   22 +-
 .../classes/CollectionConfigurationError.md   |   26 +-
 docs/reference/classes/CollectionImpl.md      |  126 +-
 .../classes/CollectionInErrorStateError.md    |   18 +-
 .../classes/CollectionInputNotFoundError.md   |   22 +-
 .../classes/CollectionIsInErrorStateError.md  |   18 +-
 .../classes/CollectionOperationError.md       |   37 +-
 .../classes/CollectionRequiresConfigError.md  |   18 +-
 .../CollectionRequiresSyncConfigError.md      |   18 +-
 .../reference/classes/CollectionStateError.md |   26 +-
 .../classes/DeduplicatedLoadSubset.md         |    2 +-
 .../classes/DeleteKeyNotFoundError.md         |   22 +-
 .../classes/DistinctRequiresSelectError.md    |   22 +-
 .../classes/DuplicateAliasInSubqueryError.md  |   22 +-
 .../classes/DuplicateDbInstanceError.md       |   18 +-
 docs/reference/classes/DuplicateKeyError.md   |   22 +-
 .../classes/DuplicateKeySyncError.md          |   22 +-
 .../classes/EmptyReferencePathError.md        |   22 +-
 docs/reference/classes/GroupByError.md        |   30 +-
 .../classes/HavingRequiresGroupByError.md     |   22 +-
 docs/reference/classes/IndexProxy.md          |   12 +-
 .../InvalidCollectionStatusTransitionError.md |   18 +-
 .../reference/classes/InvalidJoinCondition.md |   22 +-
 .../InvalidJoinConditionLeftSourceError.md    |   22 +-
 .../InvalidJoinConditionRightSourceError.md   |   22 +-
 .../InvalidJoinConditionSameSourceError.md    |   22 +-
 ...InvalidJoinConditionSourceMismatchError.md |   22 +-
 docs/reference/classes/InvalidKeyError.md     |  224 ++
 docs/reference/classes/InvalidSchemaError.md  |   18 +-
 docs/reference/classes/InvalidSourceError.md  |   22 +-
 .../classes/InvalidSourceTypeError.md         |   22 +-
 .../classes/InvalidStorageDataFormatError.md  |   22 +-
 .../InvalidStorageObjectFormatError.md        |   22 +-
 .../classes/JoinCollectionNotFoundError.md    |   22 +-
 .../JoinConditionMustBeEqualityError.md       |   22 +-
 docs/reference/classes/JoinError.md           |   36 +-
 .../classes/KeyUpdateNotAllowedError.md       |   22 +-
 docs/reference/classes/LazyIndexWrapper.md    |   10 +-
 .../classes/LimitOffsetRequireOrderByError.md |   22 +-
 .../classes/LocalStorageCollectionError.md    |   28 +-
 .../classes/MissingAliasInputsError.md        |   22 +-
 .../classes/MissingDeleteHandlerError.md      |   22 +-
 docs/reference/classes/MissingHandlerError.md |   28 +-
 .../classes/MissingInsertHandlerError.md      |   22 +-
 .../classes/MissingMutationFunctionError.md   |   22 +-
 .../classes/MissingUpdateArgumentError.md     |   22 +-
 .../classes/MissingUpdateHandlerError.md      |   22 +-
 .../classes/NegativeActiveSubscribersError.md |   18 +-
 .../classes/NoKeysPassedToDeleteError.md      |   22 +-
 .../classes/NoKeysPassedToUpdateError.md      |   22 +-
 .../NoPendingSyncTransactionCommitError.md    |   22 +-
 .../NoPendingSyncTransactionWriteError.md     |   22 +-
 ...NonAggregateExpressionNotInGroupByError.md |   22 +-
 docs/reference/classes/NonRetriableError.md   |   18 +-
 .../classes/OnMutateMustBeSynchronousError.md |   22 +-
 .../classes/OnlyOneSourceAllowedError.md      |   22 +-
 docs/reference/classes/QueryBuilderError.md   |   34 +-
 .../classes/QueryCompilationError.md          |   50 +-
 .../classes/QueryMustHaveFromClauseError.md   |   22 +-
 docs/reference/classes/QueryOptimizerError.md |   26 +-
 .../classes/SchemaMustBeSynchronousError.md   |   18 +-
 .../classes/SchemaValidationError.md          |   18 +-
 docs/reference/classes/SerializationError.md  |   22 +-
 .../classes/SetWindowRequiresOrderByError.md  |   22 +-
 docs/reference/classes/SortedMap.md           |   33 +-
 docs/reference/classes/StorageError.md        |   26 +-
 .../classes/StorageKeyRequiredError.md        |   22 +-
 .../SubQueryMustHaveFromClauseError.md        |   22 +-
 .../classes/SubscriptionNotFoundError.md      |   22 +-
 docs/reference/classes/SyncCleanupError.md    |   22 +-
 .../SyncTransactionAlreadyCommittedError.md   |   22 +-
 ...ncTransactionAlreadyCommittedWriteError.md |   22 +-
 docs/reference/classes/TanStackDBError.md     |   30 +-
 ...ransactionAlreadyCompletedRollbackError.md |   22 +-
 docs/reference/classes/TransactionError.md    |   40 +-
 .../TransactionNotPendingCommitError.md       |   22 +-
 .../TransactionNotPendingMutateError.md       |   22 +-
 docs/reference/classes/UndefinedKeyError.md   |   18 +-
 .../classes/UnknownExpressionTypeError.md     |   22 +-
 .../reference/classes/UnknownFunctionError.md |   22 +-
 .../UnknownHavingExpressionTypeError.md       |   22 +-
 .../UnsupportedAggregateFunctionError.md      |   22 +-
 .../classes/UnsupportedFromTypeError.md       |   22 +-
 .../classes/UnsupportedJoinSourceTypeError.md |   22 +-
 .../classes/UnsupportedJoinTypeError.md       |   22 +-
 .../classes/UpdateKeyNotFoundError.md         |   22 +-
 .../classes/WhereClauseConversionError.md     |   22 +-
 .../classes/ElectricDBCollectionError.md      |    8 +-
 .../classes/ExpectedNumberInAwaitTxIdError.md |   18 +-
 .../classes/StreamAbortedError.md             |   18 +-
 .../classes/TimeoutWaitingForMatchError.md    |   18 +-
 .../classes/TimeoutWaitingForTxIdError.md     |   18 +-
 .../functions/electricCollectionOptions.md    |    8 +-
 .../functions/isChangeMessage.md              |   46 +
 .../functions/isControlMessage.md             |   48 +
 .../reference/electric-db-collection/index.md |   22 +-
 .../interfaces/ElectricCollectionConfig.md    |   22 +-
 .../interfaces/ElectricCollectionUtils.md     |    6 +-
 .../type-aliases/AwaitTxIdFn.md               |    4 +-
 .../type-aliases/Txid.md                      |    2 +-
 docs/reference/functions/and.md               |    4 +-
 docs/reference/functions/coalesce.md          |    2 +-
 docs/reference/functions/compileQuery.md      |    6 +-
 docs/reference/functions/concat.md            |    2 +-
 docs/reference/functions/count.md             |    2 +-
 docs/reference/functions/createCollection.md  |   48 +-
 .../functions/createLiveQueryCollection.md    |   10 +-
 .../functions/createOptimisticAction.md       |    4 +-
 .../functions/createPacedMutations.md         |    4 +-
 docs/reference/functions/createTransaction.md |    4 +-
 docs/reference/functions/debounceStrategy.md  |    4 +-
 docs/reference/functions/deepEquals.md        |   45 +
 docs/reference/functions/eq.md                |    8 +-
 docs/reference/functions/extractFieldPath.md  |    2 +-
 .../functions/extractSimpleComparisons.md     |    2 +-
 .../functions/getActiveTransaction.md         |    2 +-
 docs/reference/functions/gt.md                |    8 +-
 docs/reference/functions/gte.md               |    8 +-
 docs/reference/functions/ilike.md             |    2 +-
 docs/reference/functions/inArray.md           |    2 +-
 docs/reference/functions/isLimitSubset.md     |    5 +-
 docs/reference/functions/isNull.md            |    2 +-
 .../functions/isOffsetLimitSubset.md          |   63 +
 docs/reference/functions/isOrderBySubset.md   |    4 +-
 docs/reference/functions/isPredicateSubset.md |    8 +-
 docs/reference/functions/isUndefined.md       |    2 +-
 docs/reference/functions/isWhereSubset.md     |    4 +-
 docs/reference/functions/like.md              |    2 +-
 .../functions/liveQueryCollectionOptions.md   |    4 +-
 .../functions/localOnlyCollectionOptions.md   |    8 +-
 .../localStorageCollectionOptions.md          |    8 +-
 docs/reference/functions/lt.md                |    8 +-
 docs/reference/functions/lte.md               |    8 +-
 .../functions/minusWherePredicates.md         |    6 +-
 docs/reference/functions/not.md               |    2 +-
 docs/reference/functions/or.md                |    4 +-
 .../functions/parseLoadSubsetOptions.md       |    2 +-
 .../functions/parseOrderByExpression.md       |    4 +-
 .../functions/parseWhereExpression.md         |    2 +-
 docs/reference/functions/queueStrategy.md     |    4 +-
 docs/reference/functions/throttleStrategy.md  |    4 +-
 .../functions/unionWherePredicates.md         |    4 +-
 docs/reference/index.md                       |  513 ++--
 .../reference/interfaces/BTreeIndexOptions.md |    6 +-
 .../interfaces/BaseCollectionConfig.md        |   34 +-
 docs/reference/interfaces/BaseStrategy.md     |    8 +-
 docs/reference/interfaces/ChangeMessage.md    |   16 +-
 docs/reference/interfaces/Collection.md       |  212 +-
 docs/reference/interfaces/CollectionConfig.md |   60 +-
 docs/reference/interfaces/CollectionLike.md   |   16 +-
 .../CreateOptimisticActionsOptions.md         |    6 +-
 .../CurrentStateAsChangesOptions.md           |   10 +-
 docs/reference/interfaces/DebounceStrategy.md |   10 +-
 docs/reference/interfaces/IndexInterface.md   |    8 +-
 docs/reference/interfaces/IndexOptions.md     |    2 +-
 docs/reference/interfaces/InsertConfig.md     |    6 +-
 .../interfaces/LiveQueryCollectionConfig.md   |    4 +-
 .../interfaces/LocalOnlyCollectionConfig.md   |   30 +-
 .../interfaces/LocalOnlyCollectionUtils.md    |    4 +-
 .../LocalStorageCollectionConfig.md           |   54 +-
 .../interfaces/LocalStorageCollectionUtils.md |    4 +-
 docs/reference/interfaces/OperationConfig.md  |    6 +-
 .../interfaces/OptimisticChangeMessage.md     |   98 -
 docs/reference/interfaces/PendingMutation.md  |    4 +-
 docs/reference/interfaces/QueueStrategy.md    |   10 +-
 .../reference/interfaces/RangeQueryOptions.md |   10 +-
 .../interfaces/SubscribeChangesOptions.md     |    6 +-
 .../SubscribeChangesSnapshotOptions.md        |   12 +-
 docs/reference/interfaces/Subscription.md     |   16 +-
 .../interfaces/SubscriptionStatusEvent.md     |    2 +-
 docs/reference/interfaces/SyncConfig.md       |   14 +-
 docs/reference/interfaces/ThrottleStrategy.md |   10 +-
 docs/reference/interfaces/Transaction.md      |    4 +-
 .../classes/PowerSyncTransactor.md            |    2 +-
 .../functions/powerSyncCollectionOptions.md   |   10 +-
 .../powersync-db-collection/index.md          |   30 +-
 .../BasePowerSyncCollectionConfig.md          |    2 +-
 .../type-aliases/PowerSyncCollectionUtils.md  |    2 +-
 .../type-aliases/SerializerConfig.md          |    2 +-
 .../variables/DEFAULT_BATCH_SIZE.md           |    2 +-
 .../DeleteOperationItemNotFoundError.md       |   18 +-
 .../classes/DuplicateKeyInBatchError.md       |   18 +-
 .../classes/GetKeyRequiredError.md            |   18 +-
 .../classes/InvalidItemStructureError.md      |   18 +-
 .../classes/InvalidSyncOperationError.md      |   18 +-
 .../classes/ItemNotFoundError.md              |   18 +-
 .../classes/MissingKeyFieldError.md           |   18 +-
 .../classes/QueryClientRequiredError.md       |   18 +-
 .../classes/QueryCollectionError.md           |   26 +-
 .../classes/QueryFnRequiredError.md           |   18 +-
 .../classes/QueryKeyRequiredError.md          |   18 +-
 .../classes/SyncNotInitializedError.md        |   18 +-
 .../classes/UnknownOperationTypeError.md      |   18 +-
 .../UpdateOperationItemNotFoundError.md       |   18 +-
 .../functions/queryCollectionOptions.md       |   24 +-
 docs/reference/query-db-collection/index.md   |   38 +-
 .../interfaces/QueryCollectionConfig.md       |   22 +-
 .../interfaces/QueryCollectionUtils.md        |   32 +-
 docs/reference/type-aliases/ChangeListener.md |    4 +-
 .../ChangeMessageOrDeleteKeyMessage.md        |   24 +
 docs/reference/type-aliases/ChangesPayload.md |    2 +-
 docs/reference/type-aliases/CleanupFn.md      |    2 +-
 .../CollectionConfigSingleRowOption.md        |    4 +-
 .../type-aliases/CollectionStatus.md          |    2 +-
 .../type-aliases/CursorExpressions.md         |   60 +
 .../type-aliases/DeleteKeyMessage.md          |   26 +
 .../type-aliases/DeleteMutationFn.md          |    6 +-
 .../type-aliases/DeleteMutationFnParams.md    |    8 +-
 docs/reference/type-aliases/GetResult.md      |    2 +-
 .../type-aliases/IndexConstructor.md          |    4 +-
 .../reference/type-aliases/InferResultType.md |    2 +-
 docs/reference/type-aliases/InputRow.md       |    2 +-
 .../type-aliases/InsertMutationFn.md          |    6 +-
 .../type-aliases/InsertMutationFnParams.md    |    8 +-
 .../type-aliases/KeyedNamespacedRow.md        |    2 +-
 docs/reference/type-aliases/KeyedStream.md    |    2 +-
 docs/reference/type-aliases/LoadSubsetFn.md   |    4 +-
 .../type-aliases/LoadSubsetOptions.md         |   39 +-
 docs/reference/type-aliases/MakeOptional.md   |   22 +
 .../type-aliases/MaybeSingleResult.md         |    4 +-
 docs/reference/type-aliases/MutationFn.md     |    2 +-
 .../type-aliases/NamespacedAndKeyedStream.md  |    2 +-
 docs/reference/type-aliases/NamespacedRow.md  |    2 +-
 .../reference/type-aliases/NonSingleResult.md |    4 +-
 .../type-aliases/OptimisticChangeMessage.md   |   24 +
 docs/reference/type-aliases/QueryBuilder.md   |    2 +-
 .../type-aliases/ResolveTransactionChanges.md |    2 +-
 docs/reference/type-aliases/ResultStream.md   |    2 +-
 docs/reference/type-aliases/SingleResult.md   |    4 +-
 docs/reference/type-aliases/StandardSchema.md |    2 +-
 .../type-aliases/StandardSchemaAlias.md       |    2 +-
 .../reference/type-aliases/StrategyOptions.md |    2 +-
 docs/reference/type-aliases/SyncConfigRes.md  |    8 +-
 docs/reference/type-aliases/SyncMode.md       |    2 +-
 .../type-aliases/TransactionWithMutations.md  |    2 +-
 docs/reference/type-aliases/UnloadSubsetFn.md |    4 +-
 .../type-aliases/UpdateMutationFn.md          |    6 +-
 .../type-aliases/UpdateMutationFnParams.md    |    8 +-
 docs/reference/type-aliases/WritableDeep.md   |    2 +-
 eslint.config.js                              |   26 +-
 examples/angular/todos/.postcssrc.json        |    3 +-
 examples/angular/todos/package.json           |   34 +-
 examples/angular/todos/src/app/app.config.ts  |    8 +-
 examples/angular/todos/src/app/app.routes.ts  |    4 +-
 examples/angular/todos/src/app/app.ts         |   36 +-
 .../todos/src/collections/todos-collection.ts |   14 +-
 examples/angular/todos/src/main.ts            |    8 +-
 examples/angular/todos/src/styles.css         |    4 +-
 examples/angular/todos/tailwind.config.js     |    8 -
 .../react/offline-transactions/package.json   |   27 +-
 .../offline-transactions/postcss.config.mjs   |    6 -
 .../src/components/DefaultCatchBoundary.tsx   |    4 +-
 .../src/components/NotFound.tsx               |    2 +-
 .../src/components/TodoDemo.tsx               |    8 +-
 .../offline-transactions/src/db/todos.ts      |   40 +-
 .../offline-transactions/src/routeTree.gen.ts |  138 +-
 .../react/offline-transactions/src/router.tsx |   10 +-
 .../src/routes/__root.tsx                     |   18 +-
 .../src/routes/api/todos.$todoId.ts           |   12 +-
 .../src/routes/api/todos.ts                   |   10 +-
 .../src/routes/api/users.$userId.ts           |    8 +-
 .../src/routes/api/users.ts                   |   10 +-
 .../offline-transactions/src/routes/index.tsx |    2 +-
 .../src/routes/indexeddb.tsx                  |    8 +-
 .../src/routes/localstorage.tsx               |    8 +-
 .../offline-transactions/src/styles/app.css   |    4 +-
 .../src/utils/loggingMiddleware.tsx           |    2 +-
 .../src/utils/queryClient.ts                  |    2 +-
 .../offline-transactions/src/utils/todos.ts   |    2 +-
 .../offline-transactions/tailwind.config.mjs  |    4 -
 .../react/offline-transactions/vite.config.ts |   16 +-
 .../react/paced-mutations-demo/package.json   |   18 +-
 .../react/paced-mutations-demo/src/App.tsx    |   16 +-
 .../react/paced-mutations-demo/src/index.css  |   10 +-
 .../react/paced-mutations-demo/src/main.tsx   |   10 +-
 .../react/paced-mutations-demo/vite.config.ts |    4 +-
 examples/react/projects/.env.example          |    2 +-
 examples/react/projects/README.md             |   32 +-
 examples/react/projects/docker-compose.yaml   |    4 +-
 examples/react/projects/drizzle.config.ts     |    4 +-
 examples/react/projects/eslint.config.mjs     |   38 +-
 examples/react/projects/package.json          |   36 +-
 examples/react/projects/src/db/auth-schema.ts |   82 +-
 examples/react/projects/src/db/connection.ts  |    4 +-
 .../src/db/out/meta/0000_snapshot.json        |   50 +-
 .../projects/src/db/out/meta/_journal.json    |    2 +-
 examples/react/projects/src/db/schema.ts      |   26 +-
 .../react/projects/src/lib/auth-client.ts     |    2 +-
 examples/react/projects/src/lib/auth.ts       |   16 +-
 .../react/projects/src/lib/collections.ts     |   22 +-
 .../react/projects/src/lib/trpc-client.ts     |    8 +-
 examples/react/projects/src/lib/trpc.ts       |    8 +-
 .../react/projects/src/lib/trpc/projects.ts   |   22 +-
 examples/react/projects/src/lib/trpc/todos.ts |   18 +-
 examples/react/projects/src/lib/trpc/users.ts |   14 +-
 examples/react/projects/src/router.tsx        |    6 +-
 examples/react/projects/src/routes/__root.tsx |    8 +-
 .../projects/src/routes/_authenticated.tsx    |   10 +-
 .../src/routes/_authenticated/index.tsx       |   10 +-
 .../_authenticated/project/$projectId.tsx     |   12 +-
 .../react/projects/src/routes/api/auth.ts     |    4 +-
 .../react/projects/src/routes/api/trpc/$.ts   |   16 +-
 examples/react/projects/src/routes/login.tsx  |    8 +-
 examples/react/projects/src/start.tsx         |    2 +-
 examples/react/projects/src/styles.css        |    8 +-
 examples/react/projects/vite.config.ts        |   10 +-
 examples/react/todo/docker-compose.yml        |   10 +-
 examples/react/todo/drizzle.config.ts         |    2 +-
 examples/react/todo/package.json              |   36 +-
 examples/react/todo/scripts/migrate.ts        |    8 +-
 examples/react/todo/src/api/server.ts         |   12 +-
 .../react/todo/src/components/NotFound.tsx    |    2 +-
 .../react/todo/src/components/TodoApp.tsx     |   18 +-
 examples/react/todo/src/db/index.ts           |    6 +-
 examples/react/todo/src/db/postgres.ts        |    2 +-
 examples/react/todo/src/db/schema.ts          |    2 +-
 examples/react/todo/src/db/validation.ts      |    6 +-
 examples/react/todo/src/index.css             |    4 +-
 examples/react/todo/src/lib/api.ts            |   20 +-
 examples/react/todo/src/lib/collections.ts    |   42 +-
 examples/react/todo/src/main.tsx              |   12 +-
 examples/react/todo/src/router.tsx            |    8 +-
 examples/react/todo/src/routes/__root.tsx     |    6 +-
 .../react/todo/src/routes/api/config.$id.ts   |   16 +-
 examples/react/todo/src/routes/api/config.ts  |   14 +-
 .../react/todo/src/routes/api/todos.$id.ts    |   16 +-
 examples/react/todo/src/routes/api/todos.ts   |   14 +-
 examples/react/todo/src/routes/electric.tsx   |   22 +-
 examples/react/todo/src/routes/index.tsx      |    4 +-
 examples/react/todo/src/routes/query.tsx      |   22 +-
 examples/react/todo/src/routes/trailbase.tsx  |   14 +-
 examples/react/todo/src/server.ts             |    2 +-
 examples/react/todo/src/start.tsx             |    2 +-
 examples/react/todo/src/styles.css            |    8 +-
 examples/react/todo/vite.config.ts            |   10 +-
 examples/solid/todo/docker-compose.yml        |   10 +-
 examples/solid/todo/drizzle.config.ts         |    2 +-
 examples/solid/todo/package.json              |   30 +-
 examples/solid/todo/scripts/migrate.ts        |    8 +-
 examples/solid/todo/src/api/server.ts         |   12 +-
 .../solid/todo/src/components/NotFound.tsx    |    2 +-
 .../solid/todo/src/components/TodoApp.tsx     |   18 +-
 examples/solid/todo/src/db/index.ts           |    6 +-
 examples/solid/todo/src/db/postgres.ts        |    2 +-
 examples/solid/todo/src/db/schema.ts          |    2 +-
 examples/solid/todo/src/db/validation.ts      |    6 +-
 examples/solid/todo/src/index.css             |    4 +-
 examples/solid/todo/src/lib/api.ts            |   20 +-
 examples/solid/todo/src/lib/collections.ts    |   42 +-
 examples/solid/todo/src/main.tsx              |   10 +-
 examples/solid/todo/src/router.tsx            |   10 +-
 examples/solid/todo/src/routes/__root.tsx     |    4 +-
 .../solid/todo/src/routes/api/config.$id.ts   |   16 +-
 examples/solid/todo/src/routes/api/config.ts  |   14 +-
 .../solid/todo/src/routes/api/todos.$id.ts    |   16 +-
 examples/solid/todo/src/routes/api/todos.ts   |   14 +-
 examples/solid/todo/src/routes/electric.tsx   |   12 +-
 examples/solid/todo/src/routes/index.tsx      |    2 +-
 examples/solid/todo/src/routes/query.tsx      |   12 +-
 examples/solid/todo/src/routes/trailbase.tsx  |   12 +-
 examples/solid/todo/src/styles.css            |    8 +-
 examples/solid/todo/vite.config.ts            |   10 +-
 package.json                                  |   51 +-
 packages/angular-db/CHANGELOG.md              |   41 +
 packages/angular-db/package.json              |   51 +-
 packages/angular-db/src/index.ts              |   24 +-
 .../tests/inject-live-query.test.ts           |   68 +-
 packages/angular-db/tests/test-setup.ts       |   10 +-
 packages/angular-db/vite.config.ts            |    8 +-
 packages/db-collection-e2e/CHANGELOG.md       |    9 +
 packages/db-collection-e2e/README.md          |   46 +-
 .../docker/docker-compose.yml                 |   11 +-
 packages/db-collection-e2e/package.json       |    6 +-
 .../src/fixtures/seed-data.ts                 |    4 +-
 .../src/fixtures/test-schema.ts               |    4 +-
 packages/db-collection-e2e/src/index.ts       |   29 +-
 .../src/suites/collation.suite.ts             |   16 +-
 .../src/suites/deduplication.suite.ts         |   60 +-
 .../src/suites/joins.suite.ts                 |   54 +-
 .../src/suites/live-updates.suite.ts          |   30 +-
 .../src/suites/moves.suite.ts                 |  756 +++++
 .../src/suites/mutations.suite.ts             |   28 +-
 .../src/suites/pagination.suite.ts            |  624 +++-
 .../src/suites/predicates.suite.ts            |  128 +-
 .../src/suites/progressive.suite.ts           |   42 +-
 packages/db-collection-e2e/src/types.ts       |    4 +-
 .../db-collection-e2e/src/utils/assertions.ts |   40 +-
 .../db-collection-e2e/src/utils/helpers.ts    |   24 +-
 .../db-collection-e2e/support/global-setup.ts |   52 +-
 .../db-collection-e2e/support/test-context.ts |   52 +-
 packages/db-collection-e2e/vite.config.ts     |   12 +-
 packages/db-ivm/CHANGELOG.md                  |   14 +-
 packages/db-ivm/README.md                     |    6 +-
 packages/db-ivm/package.json                  |   69 +-
 packages/db-ivm/src/d2.ts                     |    8 +-
 packages/db-ivm/src/graph.ts                  |   12 +-
 packages/db-ivm/src/hashing/hash.ts           |    6 +-
 packages/db-ivm/src/hashing/index.ts          |    4 +-
 packages/db-ivm/src/index.ts                  |    9 +-
 packages/db-ivm/src/indexes.ts                |   16 +-
 packages/db-ivm/src/multiset.ts               |   10 +-
 packages/db-ivm/src/operators/concat.ts       |   12 +-
 packages/db-ivm/src/operators/consolidate.ts  |   12 +-
 packages/db-ivm/src/operators/count.ts        |   18 +-
 packages/db-ivm/src/operators/debug.ts        |   16 +-
 packages/db-ivm/src/operators/distinct.ts     |   22 +-
 packages/db-ivm/src/operators/filter.ts       |   16 +-
 packages/db-ivm/src/operators/filterBy.ts     |   14 +-
 packages/db-ivm/src/operators/groupBy.ts      |   44 +-
 packages/db-ivm/src/operators/index.ts        |   38 +-
 packages/db-ivm/src/operators/join.ts         |   46 +-
 packages/db-ivm/src/operators/keying.ts       |    8 +-
 packages/db-ivm/src/operators/map.ts          |   16 +-
 packages/db-ivm/src/operators/negate.ts       |   12 +-
 packages/db-ivm/src/operators/orderBy.ts      |   52 +-
 packages/db-ivm/src/operators/orderByBTree.ts |   14 +-
 packages/db-ivm/src/operators/output.ts       |   18 +-
 packages/db-ivm/src/operators/pipe.ts         |    2 +-
 packages/db-ivm/src/operators/reduce.ts       |   18 +-
 packages/db-ivm/src/operators/tap.ts          |   16 +-
 packages/db-ivm/src/operators/topK.ts         |   16 +-
 .../src/operators/topKWithFractionalIndex.ts  |  145 +-
 .../operators/topKWithFractionalIndexBTree.ts |   39 +-
 packages/db-ivm/src/types.ts                  |   44 +-
 packages/db-ivm/src/utils.ts                  |   23 +-
 packages/db-ivm/tests/graph.test.ts           |    8 +-
 packages/db-ivm/tests/indexes.test.ts         |    4 +-
 packages/db-ivm/tests/multiset.test.ts        |    4 +-
 .../db-ivm/tests/operators/concat.test.ts     |   32 +-
 .../tests/operators/consolidate.test.ts       |   30 +-
 packages/db-ivm/tests/operators/count.test.ts |   42 +-
 packages/db-ivm/tests/operators/debug.test.ts |   20 +-
 .../db-ivm/tests/operators/distinct.test.ts   |   46 +-
 .../db-ivm/tests/operators/filter.test.ts     |   20 +-
 .../db-ivm/tests/operators/filterBy.test.ts   |   44 +-
 .../db-ivm/tests/operators/groupBy.test.ts    |   96 +-
 .../db-ivm/tests/operators/join-types.test.ts |   90 +-
 packages/db-ivm/tests/operators/join.test.ts  |   66 +-
 .../tests/operators/keying-types.test.ts      |   10 +-
 .../db-ivm/tests/operators/keying.test.ts     |   10 +-
 packages/db-ivm/tests/operators/map.test.ts   |   20 +-
 .../db-ivm/tests/operators/negate.test.ts     |   24 +-
 .../db-ivm/tests/operators/orderBy.test.ts    |   58 +-
 .../orderByWithFractionalIndex.test.ts        |  128 +-
 .../tests/operators/orderByWithIndex.test.ts  |   60 +-
 .../db-ivm/tests/operators/output.test.ts     |   16 +-
 packages/db-ivm/tests/operators/pipe.test.ts  |   14 +-
 .../db-ivm/tests/operators/reduce.test.ts     |   96 +-
 packages/db-ivm/tests/operators/topK.test.ts  |   64 +-
 .../operators/topKWithFractionalIndex.test.ts |  218 +-
 .../tests/operators/topKWithIndex.test.ts     |   58 +-
 packages/db-ivm/tests/test-utils.ts           |   40 +-
 packages/db-ivm/tests/utils.test.ts           |    6 +-
 packages/db-ivm/vite.config.ts                |    8 +-
 packages/db/CHANGELOG.md                      |  174 +-
 packages/db/package.json                      |   71 +-
 packages/db/src/SortedMap.ts                  |   81 +-
 packages/db/src/collection/change-events.ts   |   40 +-
 packages/db/src/collection/changes.ts         |   28 +-
 packages/db/src/collection/events.ts          |   30 +-
 packages/db/src/collection/index.ts           |   93 +-
 packages/db/src/collection/indexes.ts         |   28 +-
 packages/db/src/collection/lifecycle.ts       |   32 +-
 packages/db/src/collection/mutations.ts       |   45 +-
 packages/db/src/collection/state.ts           |   79 +-
 packages/db/src/collection/subscription.ts    |  425 ++-
 packages/db/src/collection/sync.ts            |   56 +-
 packages/db/src/duplicate-instance-check.ts   |    2 +-
 packages/db/src/errors.ts                     |   89 +-
 packages/db/src/event-emitter.ts              |   10 +-
 packages/db/src/index.ts                      |   41 +-
 packages/db/src/indexes/auto-index.ts         |   22 +-
 packages/db/src/indexes/base-index.ts         |   26 +-
 packages/db/src/indexes/btree-index.ts        |   38 +-
 packages/db/src/indexes/index-options.ts      |    6 +-
 packages/db/src/indexes/lazy-index.ts         |   16 +-
 packages/db/src/indexes/reverse-index.ts      |   10 +-
 packages/db/src/local-only.ts                 |   24 +-
 packages/db/src/local-storage.ts              |   34 +-
 packages/db/src/optimistic-action.ts          |   10 +-
 packages/db/src/paced-mutations.ts            |   12 +-
 packages/db/src/proxy.ts                      |   86 +-
 packages/db/src/query/builder/functions.ts    |   56 +-
 packages/db/src/query/builder/index.ts        |   44 +-
 packages/db/src/query/builder/ref-proxy.ts    |    8 +-
 packages/db/src/query/builder/types.ts        |   16 +-
 packages/db/src/query/compiler/evaluators.ts  |   18 +-
 packages/db/src/query/compiler/expressions.ts |   12 +-
 packages/db/src/query/compiler/group-by.ts    |   48 +-
 packages/db/src/query/compiler/index.ts       |   88 +-
 packages/db/src/query/compiler/joins.ts       |   74 +-
 packages/db/src/query/compiler/order-by.ts    |  247 +-
 packages/db/src/query/compiler/select.ts      |   26 +-
 packages/db/src/query/compiler/types.ts       |    4 +-
 packages/db/src/query/expression-helpers.ts   |   32 +-
 packages/db/src/query/index.ts                |   19 +-
 packages/db/src/query/ir.ts                   |   26 +-
 .../db/src/query/live-query-collection.ts     |   30 +-
 .../query/live/collection-config-builder.ts   |  106 +-
 .../db/src/query/live/collection-registry.ts  |   12 +-
 .../src/query/live/collection-subscriber.ts   |  171 +-
 packages/db/src/query/live/internal.ts        |    2 +-
 packages/db/src/query/live/types.ts           |    8 +-
 packages/db/src/query/optimizer.ts            |   58 +-
 packages/db/src/query/predicate-utils.ts      |  155 +-
 packages/db/src/query/subset-dedupe.ts        |   12 +-
 packages/db/src/scheduler.ts                  |    6 +-
 .../db/src/strategies/debounceStrategy.ts     |   12 +-
 packages/db/src/strategies/index.ts           |    8 +-
 packages/db/src/strategies/queueStrategy.ts   |   10 +-
 .../db/src/strategies/throttleStrategy.ts     |   12 +-
 packages/db/src/strategies/types.ts           |    4 +-
 packages/db/src/transactions.ts               |   18 +-
 packages/db/src/types.ts                      |   94 +-
 packages/db/src/utils.ts                      |    8 +-
 packages/db/src/utils/array-utils.ts          |    2 +-
 packages/db/src/utils/browser-polyfills.ts    |    4 +-
 packages/db/src/utils/btree.ts                |   44 +-
 packages/db/src/utils/comparison.ts           |    6 +-
 packages/db/src/utils/cursor.ts               |   78 +
 packages/db/src/utils/index-optimization.ts   |   28 +-
 packages/db/tests/SortedMap.test.ts           |    4 +-
 packages/db/tests/apply-mutations.test.ts     |    6 +-
 .../db/tests/collection-auto-index.test.ts    |   40 +-
 .../db/tests/collection-change-events.test.ts |   40 +-
 packages/db/tests/collection-errors.test.ts   |   61 +-
 packages/db/tests/collection-events.test.ts   |    8 +-
 packages/db/tests/collection-getters.test.ts  |   20 +-
 packages/db/tests/collection-indexes.test.ts  |   80 +-
 .../db/tests/collection-lifecycle.test.ts     |    4 +-
 packages/db/tests/collection-schema.test.ts   |   56 +-
 .../collection-subscribe-changes.test.ts      |   56 +-
 ...ction-subscriber-duplicate-inserts.test.ts |  452 +++
 .../db/tests/collection-subscription.test.ts  |    6 +-
 packages/db/tests/collection-truncate.test.ts |  434 ++-
 packages/db/tests/collection.test-d.ts        |   10 +-
 packages/db/tests/collection.test.ts          |  314 +-
 packages/db/tests/cursor.test.ts              |  226 ++
 packages/db/tests/deferred.test.ts            |    6 +-
 .../db/tests/deterministic-ordering.test.ts   |  398 +++
 packages/db/tests/errors.test.ts              |    4 +-
 .../uint8array-id-comparison.test.ts          |   26 +-
 packages/db/tests/local-only.test-d.ts        |   22 +-
 packages/db/tests/local-only.test.ts          |   50 +-
 packages/db/tests/local-storage.test-d.ts     |   28 +-
 packages/db/tests/local-storage.test.ts       |  138 +-
 packages/db/tests/optimistic-action.test.ts   |   12 +-
 packages/db/tests/paced-mutations.test.ts     |   12 +-
 packages/db/tests/proxy.test.ts               |   18 +-
 packages/db/tests/query/basic.test-d.ts       |   28 +-
 packages/db/tests/query/basic.test.ts         |   35 +-
 .../db/tests/query/builder/buildQuery.test.ts |   22 +-
 .../query/builder/callback-types.test-d.ts    |   58 +-
 packages/db/tests/query/builder/from.test.ts  |   18 +-
 .../query/builder/functional-variants.test.ts |   22 +-
 .../db/tests/query/builder/functions.test.ts  |   12 +-
 .../db/tests/query/builder/group-by.test.ts   |    8 +-
 packages/db/tests/query/builder/join.test.ts  |   52 +-
 .../db/tests/query/builder/order-by.test.ts   |   10 +-
 .../db/tests/query/builder/ref-proxy.test.ts  |   10 +-
 .../db/tests/query/builder/select.test.ts     |    8 +-
 .../tests/query/builder/subqueries.test-d.ts  |   20 +-
 packages/db/tests/query/builder/where.test.ts |   16 +-
 .../db/tests/query/compiler/basic.test.ts     |   36 +-
 .../tests/query/compiler/evaluators.test.ts   |   44 +-
 .../db/tests/query/compiler/group-by.test.ts  |   14 +-
 .../db/tests/query/compiler/select.test.ts    |    8 +-
 .../tests/query/compiler/subqueries.test.ts   |   42 +-
 .../query/compiler/subquery-caching.test.ts   |   32 +-
 packages/db/tests/query/composables.test.ts   |   32 +-
 packages/db/tests/query/distinct.test.ts      |   55 +-
 .../db/tests/query/expression-helpers.test.ts |   16 +-
 .../db/tests/query/findone-joins.test-d.ts    |   34 +-
 .../tests/query/functional-variants.test-d.ts |   24 +-
 .../tests/query/functional-variants.test.ts   |   22 +-
 packages/db/tests/query/group-by.test-d.ts    |   16 +-
 packages/db/tests/query/group-by.test.ts      |   58 +-
 packages/db/tests/query/indexes.test.ts       |   52 +-
 .../db/tests/query/join-subquery.test-d.ts    |   28 +-
 packages/db/tests/query/join-subquery.test.ts |   54 +-
 packages/db/tests/query/join.test-d.ts        |   84 +-
 packages/db/tests/query/join.test.ts          |  154 +-
 .../tests/query/live-query-collection.test.ts |  244 +-
 .../db/tests/query/nested-props.test-d.ts     |   16 +-
 .../optimistic-delete-with-limit.test.ts      |  596 ++++
 packages/db/tests/query/optimizer.test.ts     |  153 +-
 .../query/optional-fields-negative.test-d.ts  |   16 +-
 .../query/optional-fields-runtime.test.ts     |   16 +-
 packages/db/tests/query/order-by.test.ts      |  437 ++-
 .../db/tests/query/predicate-utils.test.ts    |  359 ++-
 .../tests/query/query-while-syncing.test.ts   |   18 +-
 packages/db/tests/query/scheduler.test.ts     |   38 +-
 .../db/tests/query/select-spread.test-d.ts    |   12 +-
 packages/db/tests/query/select-spread.test.ts |   36 +-
 packages/db/tests/query/select.test-d.ts      |   18 +-
 packages/db/tests/query/select.test.ts        |   18 +-
 packages/db/tests/query/subquery.test-d.ts    |   10 +-
 packages/db/tests/query/subquery.test.ts      |   16 +-
 packages/db/tests/query/subset-dedupe.test.ts |   18 +-
 .../db/tests/query/validate-aliases.test.ts   |   20 +-
 packages/db/tests/query/where.test.ts         |   98 +-
 packages/db/tests/test-setup.ts               |    2 +-
 packages/db/tests/transaction-types.test.ts   |    6 +-
 packages/db/tests/transactions.test.ts        |   14 +-
 packages/db/tests/utility-exposure.test.ts    |    8 +-
 packages/db/tests/utils.test.ts               |    8 +-
 packages/db/tests/utils.ts                    |   14 +-
 packages/db/vite.config.ts                    |    8 +-
 packages/electric-db-collection/CHANGELOG.md  |  128 +-
 .../e2e/electric.e2e.test.ts                  |   75 +-
 packages/electric-db-collection/package.json  |   75 +-
 .../electric-db-collection/src/electric.ts    |  562 +++-
 packages/electric-db-collection/src/errors.ts |    2 +-
 packages/electric-db-collection/src/index.ts  |    6 +-
 .../src/sql-compiler.ts                       |  179 +-
 .../electric-db-collection/src/tag-index.ts   |  160 ++
 .../tests/electric-live-query.test.ts         |   67 +-
 .../tests/electric.test-d.ts                  |   28 +-
 .../tests/electric.test.ts                    |  714 ++++-
 .../tests/pg-serializer.test.ts               |   12 +-
 .../tests/sql-compiler.test.ts                |  312 ++
 .../electric-db-collection/tests/tags.test.ts | 1241 ++++++++
 .../electric-db-collection/vite.config.ts     |    8 +-
 .../vitest.e2e.config.ts                      |    2 +-
 packages/offline-transactions/CHANGELOG.md    |   45 +-
 packages/offline-transactions/README.md       |   28 +-
 packages/offline-transactions/package.json    |   37 +-
 .../src/OfflineExecutor.ts                    |   52 +-
 .../src/api/OfflineAction.ts                  |   12 +-
 .../src/api/OfflineTransaction.ts             |   12 +-
 .../src/connectivity/OnlineDetector.ts        |    4 +-
 .../coordination/BroadcastChannelLeader.ts    |    2 +-
 .../src/coordination/LeaderElection.ts        |    2 +-
 .../src/coordination/WebLocksLeader.ts        |    6 +-
 .../src/executor/KeyScheduler.ts              |   24 +-
 .../src/executor/TransactionExecutor.ts       |   44 +-
 packages/offline-transactions/src/index.ts    |   32 +-
 .../src/outbox/OutboxManager.ts               |   34 +-
 .../src/outbox/TransactionSerializer.ts       |   14 +-
 .../src/retry/NonRetriableError.ts            |    2 +-
 .../src/retry/RetryPolicy.ts                  |    6 +-
 .../src/storage/IndexedDBAdapter.ts           |    6 +-
 .../src/storage/LocalStorageAdapter.ts        |    6 +-
 .../src/storage/StorageAdapter.ts             |    2 +-
 .../src/telemetry/tracer.ts                   |    6 +-
 packages/offline-transactions/src/types.ts    |    6 +-
 .../tests/OfflineExecutor.test.ts             |    8 +-
 .../offline-transactions/tests/harness.ts     |   16 +-
 .../tests/leader-failover.test.ts             |   10 +-
 .../tests/offline-e2e.test.ts                 |   24 +-
 packages/offline-transactions/tests/setup.ts  |    2 +-
 .../tests/storage-failure.test.ts             |   26 +-
 packages/offline-transactions/vite.config.ts  |    8 +-
 .../offline-transactions/vitest.config.ts     |    2 +-
 packages/powersync-db-collection/CHANGELOG.md |   35 +
 packages/powersync-db-collection/package.json |   81 +-
 .../src/PendingOperationStore.ts              |    6 +-
 .../src/PowerSyncTransactor.ts                |   56 +-
 .../src/definitions.ts                        |   10 +-
 .../powersync-db-collection/src/helpers.ts    |    4 +-
 packages/powersync-db-collection/src/index.ts |    6 +-
 .../powersync-db-collection/src/powersync.ts  |   56 +-
 .../powersync-db-collection/src/schema.ts     |   14 +-
 .../src/serialization.ts                      |   14 +-
 .../tests/collection-schema.test.ts           |   32 +-
 .../tests/powersync.test.ts                   |   79 +-
 .../tests/schema.test.ts                      |    8 +-
 .../powersync-db-collection/vite.config.ts    |    8 +-
 packages/query-db-collection/CHANGELOG.md     |  115 +-
 .../query-db-collection/e2e/query-filter.ts   |   57 +-
 .../query-db-collection/e2e/query.e2e.test.ts |   26 +-
 packages/query-db-collection/package.json     |   67 +-
 packages/query-db-collection/src/errors.ts    |    4 +-
 packages/query-db-collection/src/global.ts    |    4 +-
 packages/query-db-collection/src/index.ts     |    8 +-
 .../query-db-collection/src/manual-sync.ts    |   35 +-
 packages/query-db-collection/src/query.ts     |  173 +-
 .../query-db-collection/src/serialization.ts  |   15 +-
 .../query-db-collection/tests/query.test-d.ts |   24 +-
 .../query-db-collection/tests/query.test.ts   |  361 ++-
 packages/query-db-collection/vite.config.ts   |    8 +-
 .../query-db-collection/vitest.e2e.config.ts  |    2 +-
 packages/react-db/CHANGELOG.md                |   55 +-
 packages/react-db/package.json                |   55 +-
 packages/react-db/src/index.ts                |   14 +-
 packages/react-db/src/useLiveInfiniteQuery.ts |   28 +-
 packages/react-db/src/useLiveQuery.ts         |   38 +-
 packages/react-db/src/useLiveSuspenseQuery.ts |   18 +-
 packages/react-db/src/usePacedMutations.ts    |    8 +-
 packages/react-db/tests/test-setup.ts         |    6 +-
 .../tests/useLiveInfiniteQuery.test.tsx       |  150 +-
 .../react-db/tests/useLiveQuery.test-d.tsx    |   24 +-
 packages/react-db/tests/useLiveQuery.test.tsx |  152 +-
 .../tests/useLiveSuspenseQuery.test.tsx       |   88 +-
 .../react-db/tests/usePacedMutations.test.tsx |   26 +-
 packages/react-db/vite.config.ts              |    8 +-
 packages/rxdb-db-collection/CHANGELOG.md      |   35 +
 packages/rxdb-db-collection/package.json      |   81 +-
 packages/rxdb-db-collection/src/index.ts      |    4 +-
 packages/rxdb-db-collection/src/rxdb.ts       |   38 +-
 .../rxdb-db-collection/tests/rxdb.test.ts     |   30 +-
 packages/rxdb-db-collection/vite.config.ts    |    8 +-
 packages/solid-db/CHANGELOG.md                |   41 +
 packages/solid-db/package.json                |   51 +-
 packages/solid-db/src/index.ts                |    8 +-
 packages/solid-db/src/useLiveQuery.ts         |   36 +-
 packages/solid-db/tests/test-setup.ts         |    6 +-
 packages/solid-db/tests/useLiveQuery.test.tsx |  109 +-
 packages/solid-db/vite.config.ts              |   10 +-
 packages/svelte-db/CHANGELOG.md               |   41 +
 packages/svelte-db/package.json               |   67 +-
 packages/svelte-db/src/index.ts               |    8 +-
 packages/svelte-db/src/useLiveQuery.svelte.ts |   24 +-
 packages/svelte-db/svelte.config.js           |    2 +-
 .../tests/useLiveQuery.svelte.test.ts         |   92 +-
 packages/svelte-db/tsconfig.json              |    1 -
 packages/svelte-db/vite.config.ts             |    6 +-
 packages/trailbase-db-collection/CHANGELOG.md |   47 +-
 packages/trailbase-db-collection/package.json |   71 +-
 .../trailbase-db-collection/src/errors.ts     |    2 +-
 packages/trailbase-db-collection/src/index.ts |    4 +-
 .../trailbase-db-collection/src/trailbase.ts  |   28 +-
 .../tests/trailbase.test.ts                   |   24 +-
 .../trailbase-db-collection/vite.config.ts    |    8 +-
 packages/vue-db/CHANGELOG.md                  |   41 +
 packages/vue-db/package.json                  |   43 +-
 packages/vue-db/src/index.ts                  |    8 +-
 packages/vue-db/src/useLiveQuery.ts           |   28 +-
 packages/vue-db/tests/useLiveQuery.test.ts    |   96 +-
 packages/vue-db/vite.config.ts                |   10 +-
 pnpm-lock.yaml                                | 2544 +++++------------
 pnpm-workspace.yaml                           |    2 +-
 prettier.config.js                            |   10 +
 scripts/{generateDocs.ts => generate-docs.ts} |   46 +-
 scripts/verify-links.ts                       |  110 +-
 tsconfig.json                                 |    4 +-
 791 files changed, 20236 insertions(+), 11449 deletions(-)
 delete mode 100644 .changeset/fix-filter-expression-compile.md
 delete mode 100644 .changeset/fix-isready-disabled-queries.md
 delete mode 100644 .changeset/fix-tanstack-db-peerdeps.md
 delete mode 100644 .github/workflows/docs-sync.yml
 delete mode 100644 .pnpmfile.cjs
 delete mode 100644 .prettierrc
 create mode 100644 docs/framework/svelte/reference/functions/useLiveQuery.md
 create mode 100644 docs/framework/svelte/reference/index.md
 create mode 100644 docs/framework/svelte/reference/interfaces/UseLiveQueryReturn.md
 create mode 100644 docs/framework/svelte/reference/interfaces/UseLiveQueryReturnWithCollection.md
 create mode 100644 docs/reference/classes/InvalidKeyError.md
 create mode 100644 docs/reference/electric-db-collection/functions/isChangeMessage.md
 create mode 100644 docs/reference/electric-db-collection/functions/isControlMessage.md
 create mode 100644 docs/reference/functions/deepEquals.md
 create mode 100644 docs/reference/functions/isOffsetLimitSubset.md
 delete mode 100644 docs/reference/interfaces/OptimisticChangeMessage.md
 create mode 100644 docs/reference/type-aliases/ChangeMessageOrDeleteKeyMessage.md
 create mode 100644 docs/reference/type-aliases/CursorExpressions.md
 create mode 100644 docs/reference/type-aliases/DeleteKeyMessage.md
 create mode 100644 docs/reference/type-aliases/MakeOptional.md
 create mode 100644 docs/reference/type-aliases/OptimisticChangeMessage.md
 delete mode 100644 examples/angular/todos/tailwind.config.js
 delete mode 100644 examples/react/offline-transactions/postcss.config.mjs
 delete mode 100644 examples/react/offline-transactions/tailwind.config.mjs
 create mode 100644 packages/db-collection-e2e/src/suites/moves.suite.ts
 create mode 100644 packages/db/src/utils/cursor.ts
 create mode 100644 packages/db/tests/collection-subscriber-duplicate-inserts.test.ts
 create mode 100644 packages/db/tests/cursor.test.ts
 create mode 100644 packages/db/tests/deterministic-ordering.test.ts
 create mode 100644 packages/db/tests/query/optimistic-delete-with-limit.test.ts
 create mode 100644 packages/electric-db-collection/src/tag-index.ts
 create mode 100644 packages/electric-db-collection/tests/sql-compiler.test.ts
 create mode 100644 packages/electric-db-collection/tests/tags.test.ts
 create mode 100644 prettier.config.js
 rename scripts/{generateDocs.ts => generate-docs.ts} (71%)

diff --git a/.changeset/fix-desc-deletion-partial-page.md b/.changeset/fix-desc-deletion-partial-page.md
index 1c599b6fe..c4c65740a 100644
--- a/.changeset/fix-desc-deletion-partial-page.md
+++ b/.changeset/fix-desc-deletion-partial-page.md
@@ -1,5 +1,5 @@
 ---
-"@tanstack/db": patch
+'@tanstack/db': patch
 ---
 
 Fix useLiveInfiniteQuery not updating when deleting an item from a partial page with DESC order.
diff --git a/.changeset/fix-filter-expression-compile.md b/.changeset/fix-filter-expression-compile.md
deleted file mode 100644
index 8d637937e..000000000
--- a/.changeset/fix-filter-expression-compile.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@tanstack/db": patch
----
-
-fix(db): compile filter expression once in createFilterFunctionFromExpression
-
-Fixed a performance issue in `createFilterFunctionFromExpression` where the expression was being recompiled on every filter call. This only affected realtime change event filtering for pushed-down predicates at the collection level when using orderBy + limit. The core query engine was not affected as it already compiled predicates once.
diff --git a/.changeset/fix-isready-disabled-queries.md b/.changeset/fix-isready-disabled-queries.md
deleted file mode 100644
index 132902238..000000000
--- a/.changeset/fix-isready-disabled-queries.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-"@tanstack/react-db": patch
-"@tanstack/solid-db": patch
-"@tanstack/vue-db": patch
-"@tanstack/svelte-db": patch
-"@tanstack/angular-db": patch
----
-
-Fixed `isReady` to return `true` for disabled queries in `useLiveQuery`/`injectLiveQuery` across all framework packages. When a query function returns `null` or `undefined` (disabling the query), there's no async operation to wait for, so the hook should be considered "ready" immediately.
-
-Additionally, all frameworks now have proper TypeScript overloads that explicitly support returning `undefined | null` from query functions, making the disabled query pattern type-safe.
-
-This fixes the common pattern where users conditionally enable queries and don't want to show loading states when the query is disabled.
diff --git a/.changeset/fix-tanstack-db-peerdeps.md b/.changeset/fix-tanstack-db-peerdeps.md
deleted file mode 100644
index 26b0248bb..000000000
--- a/.changeset/fix-tanstack-db-peerdeps.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@tanstack/query-db-collection": patch
-"@tanstack/offline-transactions": patch
----
-
-Use regular dependency for @tanstack/db instead of peerDependency to match the standard pattern used by other TanStack DB packages and prevent duplicate installations
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8fbf8f760..b39f31408 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,9 +1,9 @@
 ---
 name: 🐛 Bug Report
 about: Create a report to help us improve
-title: ""
-labels: ""
-assignees: ""
+title: ''
+labels: ''
+assignees: ''
 ---
 
 - [ ] I've validated the bug against the latest version of DB packages
diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
index d783ef32d..e98a12985 100644
--- a/.github/workflows/autofix.yml
+++ b/.github/workflows/autofix.yml
@@ -18,16 +18,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
       - name: Setup Tools
         uses: tanstack/config/.github/setup@main
       - name: Fix formatting
-        run: pnpm prettier --ignore-unknown . --check
-      - name: Run ESLint
-        run: pnpm run lint
+        run: pnpm format
       - name: Apply fixes
         uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27
         with:
-          commit-message: "ci: apply automated fixes"
+          commit-message: 'ci: apply automated fixes'
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 72623ed4d..c4bb5e220 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -18,7 +18,7 @@ jobs:
       actions: read # Required for Claude to read CI results on PRs
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0 # required for Claude Code
       - uses: anthropics/claude-code-action@v1
diff --git a/.github/workflows/docs-sync.yml b/.github/workflows/docs-sync.yml
deleted file mode 100644
index fdbcb9ba2..000000000
--- a/.github/workflows/docs-sync.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-name: Sync Generated Docs
-
-on:
-  schedule:
-    # Run daily at 2 AM UTC
-    - cron: "0 2 * * *"
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  sync-docs:
-    name: Generate and Sync Docs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5.0.1
-        with:
-          fetch-depth: 0
-
-      - name: Setup Tools
-        uses: tanstack/config/.github/setup@main
-
-      - name: Build Packages
-        run: pnpm run build
-
-      - name: Generate Docs
-        run: pnpm docs:generate
-
-      - name: Check for changes
-        id: check_changes
-        run: |
-          if [ -n "$(git status --porcelain)" ]; then
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-            echo "Changes detected in generated docs"
-          else
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-            echo "No changes in generated docs"
-          fi
-
-      - name: Configure Git
-        if: steps.check_changes.outputs.has_changes == 'true'
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Commit and Push Changes
-        if: steps.check_changes.outputs.has_changes == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          BRANCH_NAME="docs/auto-generate"
-
-          # Check if branch exists remotely
-          if git ls-remote --exit-code --heads origin $BRANCH_NAME; then
-            echo "Branch exists, checking out and updating"
-            git fetch origin $BRANCH_NAME
-            git checkout $BRANCH_NAME
-            git pull origin $BRANCH_NAME
-          else
-            echo "Creating new branch"
-            git checkout -b $BRANCH_NAME
-          fi
-
-          # Stage and commit changes
-          git add docs/
-          git commit -m "docs: regenerate API documentation
-
-          Auto-generated by daily docs sync workflow"
-
-          # Push changes
-          git push origin $BRANCH_NAME
-
-      - name: Create or Update PR
-        if: steps.check_changes.outputs.has_changes == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          BRANCH_NAME="docs/auto-generate"
-
-          # Check if PR already exists
-          existing_pr=$(gh pr list --head $BRANCH_NAME --json number --jq '.[0].number')
-
-          if [ -n "$existing_pr" ]; then
-            echo "PR #$existing_pr already exists, it has been updated with the latest changes"
-            gh pr comment $existing_pr --body "Updated with latest generated docs from scheduled workflow run."
-          else
-            echo "Creating new PR"
-            gh pr create \
-              --title "docs: sync generated API documentation" \
-              --body "This PR was automatically created by the daily docs sync workflow.
-
-          The generated API documentation has been updated to reflect the latest changes in the codebase.
-
-          **Generated by**: [Docs Sync Workflow](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
-
-          Please review and merge if the changes look correct." \
-              --head $BRANCH_NAME \
-              --base main
-          fi
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 2c5ac83b0..e1442c739 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.1
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -23,8 +23,8 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
-          cache: "pnpm"
+          node-version: '20'
+          cache: 'pnpm'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9d789f762..a04e0c347 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
       - name: Setup Tools
@@ -33,13 +33,13 @@ jobs:
         with:
           main-branch-name: main
       - name: Run Checks
-        run: pnpm run build && pnpm run test
+        run: pnpm run build && pnpm run test && pnpm run test:sherif
   preview:
     name: Preview
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
       - name: Setup Tools
@@ -51,23 +51,23 @@ jobs:
       - name: Compressed Size Action - DB Package
         uses: preactjs/compressed-size-action@v2
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          pattern: "./packages/db/dist/**/*.{js,mjs}"
-          comment-key: "db-package-size"
-          build-script: "build:minified"
+          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          pattern: './packages/db/dist/**/*.{js,mjs}'
+          comment-key: 'db-package-size'
+          build-script: 'build:minified'
       - name: Compressed Size Action - React DB Package
         uses: preactjs/compressed-size-action@v2
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          pattern: "./packages/react-db/dist/**/*.{js,mjs}"
-          comment-key: "react-db-package-size"
-          build-script: "build:minified"
+          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          pattern: './packages/react-db/dist/**/*.{js,mjs}'
+          comment-key: 'react-db-package-size'
+          build-script: 'build:minified'
   build-example:
     name: Build Example Site
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.1
       - name: Setup Tools
         uses: tanstack/config/.github/setup@main
       - name: Build Packages
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.1
       - name: Setup Tools
         uses: tanstack/config/.github/setup@main
       - name: Build Packages
@@ -89,4 +89,5 @@ jobs:
       - name: Build Starter Site
         run: |
           cd examples/react/projects
+          cp .env.example .env
           pnpm build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 11042f7b0..2e49cf139 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
       - name: Setup Tools
@@ -36,14 +36,13 @@ jobs:
         with:
           version: pnpm run changeset:version
           publish: pnpm run changeset:publish
-          commit: "ci: Version Packages"
-          title: "ci: Version Packages"
+          commit: 'ci: Version Packages'
+          title: 'ci: Version Packages'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Generate Docs
         if: steps.changesets.outputs.published == 'true'
-        run: pnpm docs:generate
+        run: pnpm generate-docs
       - name: Commit Generated Docs
         if: steps.changesets.outputs.published == 'true'
         run: |
diff --git a/.gitignore b/.gitignore
index 9e71f3da7..22096f2e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,154 +1,44 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
+# dependencies
+node_modules
+package-lock.json
+yarn.lock
 
-# Coverage directory used by tools like istanbul
+# builds
+build
 coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-web_modules/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional stylelint cache
-.stylelintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
+dist
 
-# dotenv environment variable files
+# misc
+.DS_Store
 .env
+.env.local
 .env.development.local
 .env.test.local
 .env.production.local
-.env.local
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-.parcel-cache
-
-# Next.js build output
 .next
-out
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
 
-# vuepress build output
-.vuepress/dist
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.history
+size-plugin.json
+stats-hydration.json
+stats.json
+stats.html
+.vscode/settings.json
 
-# vuepress v2.x temp and cache directory
-.temp
+*.log
 .cache
-
-# Docusaurus cache and generated files
-.docusaurus
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
-.DS_Store
-
-# Added by Task Master AI
-dev-debug.log
-# Environment variables
-# Editor directories and files
 .idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-# OS specific
-# Task files
-tasks.json
-tasks/ 
-
-## Tanstack Start
-.nitro
-.output
-.tanstack
-.claude
-package-lock.json
+.nx/cache
+.nx/workspace-data
+.pnpm-store
+.tsup
+.svelte-kit
+
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
+tsconfig.vitest-temp.json
diff --git a/.husky/pre-commit b/.husky/pre-commit
index a5a29d9f7..cb2c84d5c 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 pnpm lint-staged
diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs
deleted file mode 100644
index f154da33d..000000000
--- a/.pnpmfile.cjs
+++ /dev/null
@@ -1,25 +0,0 @@
-function readPackage(pkg, context) {
-  // Force all @tanstack/db dependencies to resolve to workspace version
-  if (pkg.dependencies && pkg.dependencies["@tanstack/db"]) {
-    pkg.dependencies["@tanstack/db"] = "workspace:*"
-    context.log(`Overriding @tanstack/db dependency in ${pkg.name}`)
-  }
-
-  if (pkg.devDependencies && pkg.devDependencies["@tanstack/db"]) {
-    pkg.devDependencies["@tanstack/db"] = "workspace:*"
-    context.log(`Overriding @tanstack/db devDependency in ${pkg.name}`)
-  }
-
-  if (pkg.peerDependencies && pkg.peerDependencies["@tanstack/db"]) {
-    pkg.peerDependencies["@tanstack/db"] = "workspace:*"
-    context.log(`Overriding @tanstack/db peerDependency in ${pkg.name}`)
-  }
-
-  return pkg
-}
-
-module.exports = {
-  hooks: {
-    readPackage,
-  },
-}
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index eaff0359c..000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "trailingComma": "es5",
-  "semi": false,
-  "tabWidth": 2
-}
diff --git a/AGENTS.md b/AGENTS.md
index ee8056447..6654f89bf 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -36,7 +36,7 @@ function processData(data: unknown) {
   if (isDataObject(data)) {
     return data.value
   }
-  throw new Error("Invalid data")
+  throw new Error('Invalid data')
 }
 
 const result: TQueryData = someOperation()
@@ -58,12 +58,12 @@ const result: TQueryData = someOperation()
 ```typescript
 // Duplicated logic in multiple places
 function processA() {
-  const key = typeof value === "number" ? `__number__${value}` : String(value)
+  const key = typeof value === 'number' ? `__number__${value}` : String(value)
   // ...
 }
 
 function processB() {
-  const key = typeof value === "number" ? `__number__${value}` : String(value)
+  const key = typeof value === 'number' ? `__number__${value}` : String(value)
   // ...
 }
 ```
@@ -72,7 +72,7 @@ function processB() {
 
 ```typescript
 function serializeKey(value: string | number): string {
-  return typeof value === "number" ? `__number__${value}` : String(value)
+  return typeof value === 'number' ? `__number__${value}` : String(value)
 }
 
 function processA() {
@@ -161,7 +161,7 @@ readyJobs.forEach(processJob)
 
 ```typescript
 // O(n) lookup for each check
-const items = ["foo", "bar", "baz" /* hundreds more */]
+const items = ['foo', 'bar', 'baz' /* hundreds more */]
 if (items.includes(searchValue)) {
   // ...
 }
@@ -171,7 +171,7 @@ if (items.includes(searchValue)) {
 
 ```typescript
 // O(1) lookup
-const items = new Set(["foo", "bar", "baz" /* hundreds more */])
+const items = new Set(['foo', 'bar', 'baz' /* hundreds more */])
 if (items.has(searchValue)) {
   // ...
 }
@@ -194,7 +194,7 @@ if (items.has(searchValue)) {
 // Intending to check if subset limit is more restrictive than superset
 function isLimitSubset(
   subset: number | undefined,
-  superset: number | undefined
+  superset: number | undefined,
 ) {
   return subset === undefined || superset === undefined || subset <= superset
 }
@@ -207,7 +207,7 @@ function isLimitSubset(
 ```typescript
 function isLimitSubset(
   subset: number | undefined,
-  superset: number | undefined
+  superset: number | undefined,
 ) {
   // Subset with no limit cannot be a subset of one with a limit
   return superset === undefined || (subset !== undefined && subset <= superset)
@@ -361,7 +361,7 @@ const dependentBuilders = [] // Accurately describes dependents
 ```typescript
 // Found a bug with fetchSnapshot resolving after up-to-date message
 // Should add a test:
-test("ignores snapshot that resolves after up-to-date message", async () => {
+test('ignores snapshot that resolves after up-to-date message', async () => {
   // Reproduce the corner case
   // Verify it's handled correctly
 })
@@ -520,7 +520,7 @@ const filtered = items.filter((item) => item.value > 0)
 
    ```typescript
    // ❌ Bad: numeric 1 and string "__number__1" collide
-   const key = typeof val === "number" ? `__number__${val}` : String(val)
+   const key = typeof val === 'number' ? `__number__${val}` : String(val)
 
    // ✅ Good: proper encoding with type prefix
    const key = `${typeof val}_${String(val)}`
diff --git a/docs/collections/query-collection.md b/docs/collections/query-collection.md
index 67331e126..cf13291a8 100644
--- a/docs/collections/query-collection.md
+++ b/docs/collections/query-collection.md
@@ -521,7 +521,7 @@ All direct write methods are available on `collection.utils`:
 
 ## QueryFn and Predicate Push-Down
 
-When using `syncMode: 'on-demand'`, the collection automatically pushes down query predicates (where clauses, orderBy, and limit) to your `queryFn`. This allows you to fetch only the data needed for each specific query, rather than fetching the entire dataset.
+When using `syncMode: 'on-demand'`, the collection automatically pushes down query predicates (where clauses, orderBy, limit, and offset) to your `queryFn`. This allows you to fetch only the data needed for each specific query, rather than fetching the entire dataset.
 
 ### How LoadSubsetOptions Are Passed
 
@@ -530,9 +530,13 @@ LoadSubsetOptions are passed to your `queryFn` via the query context's `meta` pr
 ```typescript
 queryFn: async (ctx) => {
   // Extract LoadSubsetOptions from the context
-  const { limit, where, orderBy } = ctx.meta.loadSubsetOptions
+  const { limit, offset, where, orderBy } = ctx.meta.loadSubsetOptions
 
   // Use these to fetch only the data you need
+  // - where: filter expression (AST)
+  // - orderBy: sort expression (AST)
+  // - limit: maximum number of rows
+  // - offset: number of rows to skip (for pagination)
   // ...
 }
 ```
@@ -572,7 +576,7 @@ const productsCollection = createCollection(
     syncMode: 'on-demand', // Enable predicate push-down
 
     queryFn: async (ctx) => {
-      const { limit, where, orderBy } = ctx.meta.loadSubsetOptions
+      const { limit, offset, where, orderBy } = ctx.meta.loadSubsetOptions
 
       // Parse the expressions into simple format
       const parsed = parseLoadSubsetOptions({ where, orderBy, limit })
@@ -605,6 +609,11 @@ const productsCollection = createCollection(
         params.set('limit', String(parsed.limit))
       }
 
+      // Add offset for pagination
+      if (offset) {
+        params.set('offset', String(offset))
+      }
+
       const response = await fetch(`/api/products?${params}`)
       return response.json()
     },
@@ -629,6 +638,7 @@ const affordableElectronics = createLiveQueryCollection({
 
 // This triggers a queryFn call with:
 // GET /api/products?category=electronics&price_lt=100&sort=price:asc&limit=10
+// When paginating, offset is included: &offset=20
 ```
 
 ### Custom Handlers for Complex APIs
@@ -731,10 +741,11 @@ queryFn: async (ctx) => {
 Convenience function that parses all LoadSubsetOptions at once. Good for simple use cases.
 
 ```typescript
-const { filters, sorts, limit } = parseLoadSubsetOptions(ctx.meta?.loadSubsetOptions)
+const { filters, sorts, limit, offset } = parseLoadSubsetOptions(ctx.meta?.loadSubsetOptions)
 // filters: [{ field: ['category'], operator: 'eq', value: 'electronics' }]
 // sorts: [{ field: ['price'], direction: 'asc', nulls: 'last' }]
 // limit: 10
+// offset: 20 (for pagination)
 ```
 
 #### `parseWhereExpression(expr, options)`
diff --git a/docs/framework/angular/overview.md b/docs/framework/angular/overview.md
index 15adcaf6c..916262313 100644
--- a/docs/framework/angular/overview.md
+++ b/docs/framework/angular/overview.md
@@ -11,7 +11,7 @@ npm install @tanstack/angular-db
 
 ## Angular inject function
 
-See the [Angular Functions Reference](../reference/index.md) to see the full list of functions available in the Angular Adapter.
+See the [Angular Functions Reference](./reference/index.md) to see the full list of functions available in the Angular Adapter.
 
 For comprehensive documentation on writing queries (filtering, joins, aggregations, etc.), see the [Live Queries Guide](../../guides/live-queries).
 
diff --git a/docs/framework/angular/reference/functions/injectLiveQuery.md b/docs/framework/angular/reference/functions/injectLiveQuery.md
index 4b3209aca..46a9a35fb 100644
--- a/docs/framework/angular/reference/functions/injectLiveQuery.md
+++ b/docs/framework/angular/reference/functions/injectLiveQuery.md
@@ -37,12 +37,12 @@ Defined in: [index.ts:51](https://github.com/TanStack/db/blob/main/packages/angu
 
 ### Returns
 
-[`InjectLiveQueryResult`](../../interfaces/InjectLiveQueryResult.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+[`InjectLiveQueryResult`](../interfaces/InjectLiveQueryResult.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
 
 ## Call Signature
 
 ```ts
-function injectLiveQuery<TContext>(queryFn): InjectLiveQueryResult<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
+function injectLiveQuery<TContext, TParams>(options): InjectLiveQueryResult<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
 ```
 
 Defined in: [index.ts:61](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L61)
@@ -53,6 +53,40 @@ Defined in: [index.ts:61](https://github.com/TanStack/db/blob/main/packages/angu
 
 `TContext` *extends* `Context`
 
+#### TParams
+
+`TParams` *extends* `unknown`
+
+### Parameters
+
+#### options
+
+##### params
+
+() => `TParams`
+
+##### query
+
+(`args`) => `QueryBuilder`\<`TContext`\> \| `null` \| `undefined`
+
+### Returns
+
+[`InjectLiveQueryResult`](../interfaces/InjectLiveQueryResult.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+
+## Call Signature
+
+```ts
+function injectLiveQuery<TContext>(queryFn): InjectLiveQueryResult<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
+```
+
+Defined in: [index.ts:71](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L71)
+
+### Type Parameters
+
+#### TContext
+
+`TContext` *extends* `Context`
+
 ### Parameters
 
 #### queryFn
@@ -61,7 +95,31 @@ Defined in: [index.ts:61](https://github.com/TanStack/db/blob/main/packages/angu
 
 ### Returns
 
-[`InjectLiveQueryResult`](../../interfaces/InjectLiveQueryResult.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+[`InjectLiveQueryResult`](../interfaces/InjectLiveQueryResult.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+
+## Call Signature
+
+```ts
+function injectLiveQuery<TContext>(queryFn): InjectLiveQueryResult<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
+```
+
+Defined in: [index.ts:74](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L74)
+
+### Type Parameters
+
+#### TContext
+
+`TContext` *extends* `Context`
+
+### Parameters
+
+#### queryFn
+
+(`q`) => `QueryBuilder`\<`TContext`\> \| `null` \| `undefined`
+
+### Returns
+
+[`InjectLiveQueryResult`](../interfaces/InjectLiveQueryResult.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
 
 ## Call Signature
 
@@ -69,7 +127,7 @@ Defined in: [index.ts:61](https://github.com/TanStack/db/blob/main/packages/angu
 function injectLiveQuery<TContext>(config): InjectLiveQueryResult<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
 ```
 
-Defined in: [index.ts:64](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L64)
+Defined in: [index.ts:79](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L79)
 
 ### Type Parameters
 
@@ -85,7 +143,7 @@ Defined in: [index.ts:64](https://github.com/TanStack/db/blob/main/packages/angu
 
 ### Returns
 
-[`InjectLiveQueryResult`](../../interfaces/InjectLiveQueryResult.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+[`InjectLiveQueryResult`](../interfaces/InjectLiveQueryResult.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
 
 ## Call Signature
 
@@ -93,7 +151,7 @@ Defined in: [index.ts:64](https://github.com/TanStack/db/blob/main/packages/angu
 function injectLiveQuery<TResult, TKey, TUtils>(liveQueryCollection): InjectLiveQueryResult<TResult, TKey, TUtils>;
 ```
 
-Defined in: [index.ts:67](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L67)
+Defined in: [index.ts:82](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L82)
 
 ### Type Parameters
 
@@ -117,4 +175,4 @@ Defined in: [index.ts:67](https://github.com/TanStack/db/blob/main/packages/angu
 
 ### Returns
 
-[`InjectLiveQueryResult`](../../interfaces/InjectLiveQueryResult.md)\<`TResult`, `TKey`, `TUtils`\>
+[`InjectLiveQueryResult`](../interfaces/InjectLiveQueryResult.md)\<`TResult`, `TKey`, `TUtils`\>
diff --git a/docs/framework/angular/reference/index.md b/docs/framework/angular/reference/index.md
index 3dfb77c21..1321a5528 100644
--- a/docs/framework/angular/reference/index.md
+++ b/docs/framework/angular/reference/index.md
@@ -7,8 +7,8 @@ title: "@tanstack/angular-db"
 
 ## Interfaces
 
-- [InjectLiveQueryResult](../interfaces/InjectLiveQueryResult.md)
+- [InjectLiveQueryResult](interfaces/InjectLiveQueryResult.md)
 
 ## Functions
 
-- [injectLiveQuery](../functions/injectLiveQuery.md)
+- [injectLiveQuery](functions/injectLiveQuery.md)
diff --git a/docs/framework/angular/reference/interfaces/InjectLiveQueryResult.md b/docs/framework/angular/reference/interfaces/InjectLiveQueryResult.md
index aa45218bc..2e00287c2 100644
--- a/docs/framework/angular/reference/interfaces/InjectLiveQueryResult.md
+++ b/docs/framework/angular/reference/interfaces/InjectLiveQueryResult.md
@@ -30,12 +30,14 @@ Contains reactive signals for the query state and data.
 ### collection
 
 ```ts
-collection: Signal<Collection<TResult, TKey, TUtils, StandardSchemaV1<unknown, unknown>, TResult>>;
+collection: Signal<
+  | Collection<TResult, TKey, TUtils, StandardSchemaV1<unknown, unknown>, TResult>
+| null>;
 ```
 
 Defined in: [index.ts:36](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L36)
 
-A signal containing the underlying collection instance
+A signal containing the underlying collection instance (null for disabled queries)
 
 ***
 
@@ -126,7 +128,7 @@ A signal containing the complete state map of results keyed by their ID
 ### status
 
 ```ts
-status: Signal<CollectionStatus>;
+status: Signal<CollectionStatus | "disabled">;
 ```
 
 Defined in: [index.ts:38](https://github.com/TanStack/db/blob/main/packages/angular-db/src/index.ts#L38)
diff --git a/docs/framework/react/overview.md b/docs/framework/react/overview.md
index 0e53916f9..ed96a7506 100644
--- a/docs/framework/react/overview.md
+++ b/docs/framework/react/overview.md
@@ -11,7 +11,7 @@ npm install @tanstack/react-db
 
 ## React Hooks
 
-See the [React Functions Reference](../reference/index.md) to see the full list of hooks available in the React Adapter.
+See the [React Functions Reference](./reference/index.md) to see the full list of hooks available in the React Adapter.
 
 For comprehensive documentation on writing queries (filtering, joins, aggregations, etc.), see the [Live Queries Guide](../../guides/live-queries).
 
diff --git a/docs/framework/react/reference/functions/useLiveInfiniteQuery.md b/docs/framework/react/reference/functions/useLiveInfiniteQuery.md
index 49f258cf6..8fe91f730 100644
--- a/docs/framework/react/reference/functions/useLiveInfiniteQuery.md
+++ b/docs/framework/react/reference/functions/useLiveInfiniteQuery.md
@@ -40,13 +40,13 @@ without recreating the live query collection on each page change.
 
 #### config
 
-[`UseLiveInfiniteQueryConfig`](../../type-aliases/UseLiveInfiniteQueryConfig.md)\<`any`\>
+[`UseLiveInfiniteQueryConfig`](../type-aliases/UseLiveInfiniteQueryConfig.md)\<`any`\>
 
 Configuration including pageSize and getNextPageParam
 
 ### Returns
 
-[`UseLiveInfiniteQueryReturn`](../../type-aliases/UseLiveInfiniteQueryReturn.md)\<`any`\>
+[`UseLiveInfiniteQueryReturn`](../type-aliases/UseLiveInfiniteQueryReturn.md)\<`any`\>
 
 Object with pages, data, and pagination controls
 
@@ -141,7 +141,7 @@ Query function that defines what data to fetch. Must include `.orderBy()` for se
 
 #### config
 
-[`UseLiveInfiniteQueryConfig`](../../type-aliases/UseLiveInfiniteQueryConfig.md)\<`TContext`\>
+[`UseLiveInfiniteQueryConfig`](../type-aliases/UseLiveInfiniteQueryConfig.md)\<`TContext`\>
 
 Configuration including pageSize and getNextPageParam
 
@@ -153,7 +153,7 @@ Array of dependencies that trigger query re-execution when changed
 
 ### Returns
 
-[`UseLiveInfiniteQueryReturn`](../../type-aliases/UseLiveInfiniteQueryReturn.md)\<`TContext`\>
+[`UseLiveInfiniteQueryReturn`](../type-aliases/UseLiveInfiniteQueryReturn.md)\<`TContext`\>
 
 Object with pages, data, and pagination controls
 
diff --git a/docs/framework/react/reference/index.md b/docs/framework/react/reference/index.md
index f60a0261c..a35d6af9f 100644
--- a/docs/framework/react/reference/index.md
+++ b/docs/framework/react/reference/index.md
@@ -7,13 +7,13 @@ title: "@tanstack/react-db"
 
 ## Type Aliases
 
-- [UseLiveInfiniteQueryConfig](../type-aliases/UseLiveInfiniteQueryConfig.md)
-- [UseLiveInfiniteQueryReturn](../type-aliases/UseLiveInfiniteQueryReturn.md)
-- [UseLiveQueryStatus](../type-aliases/UseLiveQueryStatus.md)
+- [UseLiveInfiniteQueryConfig](type-aliases/UseLiveInfiniteQueryConfig.md)
+- [UseLiveInfiniteQueryReturn](type-aliases/UseLiveInfiniteQueryReturn.md)
+- [UseLiveQueryStatus](type-aliases/UseLiveQueryStatus.md)
 
 ## Functions
 
-- [useLiveInfiniteQuery](../functions/useLiveInfiniteQuery.md)
-- [useLiveQuery](../functions/useLiveQuery.md)
-- [useLiveSuspenseQuery](../functions/useLiveSuspenseQuery.md)
-- [usePacedMutations](../functions/usePacedMutations.md)
+- [useLiveInfiniteQuery](functions/useLiveInfiniteQuery.md)
+- [useLiveQuery](functions/useLiveQuery.md)
+- [useLiveSuspenseQuery](functions/useLiveSuspenseQuery.md)
+- [usePacedMutations](functions/usePacedMutations.md)
diff --git a/docs/framework/solid/overview.md b/docs/framework/solid/overview.md
index d7781bfbc..d69a75b75 100644
--- a/docs/framework/solid/overview.md
+++ b/docs/framework/solid/overview.md
@@ -11,7 +11,7 @@ npm install @tanstack/solid-db
 
 ## Solid Primitives
 
-See the [Solid Functions Reference](../reference/index.md) to see the full list of primitives available in the Solid Adapter.
+See the [Solid Functions Reference](./reference/index.md) to see the full list of primitives available in the Solid Adapter.
 
 For comprehensive documentation on writing queries (filtering, joins, aggregations, etc.), see the [Live Queries Guide](../../guides/live-queries).
 
diff --git a/docs/framework/solid/reference/functions/useLiveQuery.md b/docs/framework/solid/reference/functions/useLiveQuery.md
index 2291a4b34..a1261ff4b 100644
--- a/docs/framework/solid/reference/functions/useLiveQuery.md
+++ b/docs/framework/solid/reference/functions/useLiveQuery.md
@@ -11,7 +11,7 @@ title: useLiveQuery
 function useLiveQuery<TContext>(queryFn): object;
 ```
 
-Defined in: [useLiveQuery.ts:80](https://github.com/TanStack/db/blob/main/packages/solid-db/src/useLiveQuery.ts#L80)
+Defined in: [useLiveQuery.ts:84](https://github.com/TanStack/db/blob/main/packages/solid-db/src/useLiveQuery.ts#L84)
 
 Create a live query using a query function
 
@@ -149,11 +149,155 @@ return (
 
 ## Call Signature
 
+```ts
+function useLiveQuery<TContext>(queryFn): object;
+```
+
+Defined in: [useLiveQuery.ts:99](https://github.com/TanStack/db/blob/main/packages/solid-db/src/useLiveQuery.ts#L99)
+
+Create a live query using a query function
+
+### Type Parameters
+
+#### TContext
+
+`TContext` *extends* `Context`
+
+### Parameters
+
+#### queryFn
+
+(`q`) => `QueryBuilder`\<`TContext`\> \| `null` \| `undefined`
+
+Query function that defines what data to fetch
+
+### Returns
+
+`object`
+
+Object with reactive data, state, and status information
+
+#### collection
+
+```ts
+collection: Accessor<
+  | Collection<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }, string | number, {
+}, StandardSchemaV1<unknown, unknown>, { [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>
+| null>;
+```
+
+#### data
+
+```ts
+data: { [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }[];
+```
+
+#### isCleanedUp
+
+```ts
+isCleanedUp: Accessor<boolean>;
+```
+
+#### isError
+
+```ts
+isError: Accessor<boolean>;
+```
+
+#### isIdle
+
+```ts
+isIdle: Accessor<boolean>;
+```
+
+#### isLoading
+
+```ts
+isLoading: Accessor<boolean>;
+```
+
+#### isReady
+
+```ts
+isReady: Accessor<boolean>;
+```
+
+#### state
+
+```ts
+state: ReactiveMap<string | number, { [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
+```
+
+#### status
+
+```ts
+status: Accessor<CollectionStatus | "disabled">;
+```
+
+### Examples
+
+```ts
+// Basic query with object syntax
+const todosQuery = useLiveQuery((q) =>
+  q.from({ todos: todosCollection })
+   .where(({ todos }) => eq(todos.completed, false))
+   .select(({ todos }) => ({ id: todos.id, text: todos.text }))
+)
+```
+
+```ts
+// With dependencies that trigger re-execution
+const todosQuery = useLiveQuery(
+  (q) => q.from({ todos: todosCollection })
+         .where(({ todos }) => gt(todos.priority, minPriority())),
+)
+```
+
+```ts
+// Join pattern
+const personIssues = useLiveQuery((q) =>
+  q.from({ issues: issueCollection })
+   .join({ persons: personCollection }, ({ issues, persons }) =>
+     eq(issues.userId, persons.id)
+   )
+   .select(({ issues, persons }) => ({
+     id: issues.id,
+     title: issues.title,
+     userName: persons.name
+   }))
+)
+```
+
+```ts
+// Handle loading and error states
+const todosQuery = useLiveQuery((q) =>
+  q.from({ todos: todoCollection })
+)
+
+return (
+  <Switch>
+    <Match when={todosQuery.isLoading()}>
+      <div>Loading...</div>
+    </Match>
+    <Match when={todosQuery.isError()}>
+      <div>Error: {todosQuery.status()}</div>
+    </Match>
+    <Match when={todosQuery.isReady()}>
+      <For each={todosQuery.data()}>
+        {(todo) => <li key={todo.id}>{todo.text}</li>}
+      </For>
+    </Match>
+  </Switch>
+)
+```
+
+## Call Signature
+
 ```ts
 function useLiveQuery<TContext>(config): object;
 ```
 
-Defined in: [useLiveQuery.ts:135](https://github.com/TanStack/db/blob/main/packages/solid-db/src/useLiveQuery.ts#L135)
+Defined in: [useLiveQuery.ts:160](https://github.com/TanStack/db/blob/main/packages/solid-db/src/useLiveQuery.ts#L160)
 
 Create a live query using configuration object
 
@@ -279,7 +423,7 @@ return (
 function useLiveQuery<TResult, TKey, TUtils>(liveQueryCollection): object;
 ```
 
-Defined in: [useLiveQuery.ts:185](https://github.com/TanStack/db/blob/main/packages/solid-db/src/useLiveQuery.ts#L185)
+Defined in: [useLiveQuery.ts:210](https://github.com/TanStack/db/blob/main/packages/solid-db/src/useLiveQuery.ts#L210)
 
 Subscribe to an existing live query collection
 
diff --git a/docs/framework/solid/reference/index.md b/docs/framework/solid/reference/index.md
index c44007f86..da2d0de79 100644
--- a/docs/framework/solid/reference/index.md
+++ b/docs/framework/solid/reference/index.md
@@ -7,4 +7,4 @@ title: "@tanstack/solid-db"
 
 ## Functions
 
-- [useLiveQuery](../functions/useLiveQuery.md)
+- [useLiveQuery](functions/useLiveQuery.md)
diff --git a/docs/framework/svelte/overview.md b/docs/framework/svelte/overview.md
index aeaa8cd95..f7497d0e7 100644
--- a/docs/framework/svelte/overview.md
+++ b/docs/framework/svelte/overview.md
@@ -11,7 +11,7 @@ npm install @tanstack/svelte-db
 
 ## Svelte Utilities
 
-See the [Svelte Functions Reference](../reference/index.md) to see the full list of utilities available in the Svelte Adapter.
+See the [Svelte Functions Reference](./reference/index.md) to see the full list of utilities available in the Svelte Adapter.
 
 For comprehensive documentation on writing queries (filtering, joins, aggregations, etc.), see the [Live Queries Guide](../../guides/live-queries).
 
diff --git a/docs/framework/svelte/reference/functions/useLiveQuery.md b/docs/framework/svelte/reference/functions/useLiveQuery.md
new file mode 100644
index 000000000..835bd781b
--- /dev/null
+++ b/docs/framework/svelte/reference/functions/useLiveQuery.md
@@ -0,0 +1,414 @@
+---
+id: useLiveQuery
+title: useLiveQuery
+---
+
+# Function: useLiveQuery()
+
+## Call Signature
+
+```ts
+function useLiveQuery<TContext>(queryFn, deps?): UseLiveQueryReturn<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
+```
+
+Defined in: [useLiveQuery.svelte.ts:155](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L155)
+
+Create a live query using a query function
+
+### Type Parameters
+
+#### TContext
+
+`TContext` *extends* `Context`
+
+### Parameters
+
+#### queryFn
+
+(`q`) => `QueryBuilder`\<`TContext`\>
+
+Query function that defines what data to fetch
+
+#### deps?
+
+() => `unknown`[]
+
+Array of reactive dependencies that trigger query re-execution when changed
+
+### Returns
+
+[`UseLiveQueryReturn`](../interfaces/UseLiveQueryReturn.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+
+Reactive object with query data, state, and status information
+
+### Remarks
+
+**IMPORTANT - Destructuring in Svelte 5:**
+Direct destructuring breaks reactivity. To destructure, wrap with `$derived`:
+
+❌ **Incorrect** - Loses reactivity:
+```ts
+const { data, isLoading } = useLiveQuery(...)
+```
+
+✅ **Correct** - Maintains reactivity:
+```ts
+// Option 1: Use dot notation (recommended)
+const query = useLiveQuery(...)
+// Access: query.data, query.isLoading
+
+// Option 2: Wrap with $derived for destructuring
+const query = useLiveQuery(...)
+const { data, isLoading } = $derived(query)
+```
+
+This is a fundamental Svelte 5 limitation, not a library bug. See:
+https://github.com/sveltejs/svelte/issues/11002
+
+### Examples
+
+```ts
+// Basic query with object syntax (recommended pattern)
+const todosQuery = useLiveQuery((q) =>
+  q.from({ todos: todosCollection })
+   .where(({ todos }) => eq(todos.completed, false))
+   .select(({ todos }) => ({ id: todos.id, text: todos.text }))
+)
+// Access via: todosQuery.data, todosQuery.isLoading, etc.
+```
+
+```ts
+// With reactive dependencies
+let minPriority = $state(5)
+const todosQuery = useLiveQuery(
+  (q) => q.from({ todos: todosCollection })
+         .where(({ todos }) => gt(todos.priority, minPriority)),
+  [() => minPriority] // Re-run when minPriority changes
+)
+```
+
+```ts
+// Destructuring with $derived (if needed)
+const query = useLiveQuery((q) =>
+  q.from({ todos: todosCollection })
+)
+const { data, isLoading, isError } = $derived(query)
+// Now data, isLoading, and isError maintain reactivity
+```
+
+```ts
+// Join pattern
+const issuesQuery = useLiveQuery((q) =>
+  q.from({ issues: issueCollection })
+   .join({ persons: personCollection }, ({ issues, persons }) =>
+     eq(issues.userId, persons.id)
+   )
+   .select(({ issues, persons }) => ({
+     id: issues.id,
+     title: issues.title,
+     userName: persons.name
+   }))
+)
+```
+
+```ts
+// Handle loading and error states in template
+const todosQuery = useLiveQuery((q) =>
+  q.from({ todos: todoCollection })
+)
+
+// In template:
+// {#if todosQuery.isLoading}
+//   <div>Loading...</div>
+// {:else if todosQuery.isError}
+//   <div>Error: {todosQuery.status}</div>
+// {:else}
+//   <ul>
+//     {#each todosQuery.data as todo (todo.id)}
+//       <li>{todo.text}</li>
+//     {/each}
+//   </ul>
+// {/if}
+```
+
+## Call Signature
+
+```ts
+function useLiveQuery<TContext>(queryFn, deps?): UseLiveQueryReturn<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
+```
+
+Defined in: [useLiveQuery.svelte.ts:161](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L161)
+
+Create a live query using a query function
+
+### Type Parameters
+
+#### TContext
+
+`TContext` *extends* `Context`
+
+### Parameters
+
+#### queryFn
+
+(`q`) => `QueryBuilder`\<`TContext`\> \| `null` \| `undefined`
+
+Query function that defines what data to fetch
+
+#### deps?
+
+() => `unknown`[]
+
+Array of reactive dependencies that trigger query re-execution when changed
+
+### Returns
+
+[`UseLiveQueryReturn`](../interfaces/UseLiveQueryReturn.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+
+Reactive object with query data, state, and status information
+
+### Remarks
+
+**IMPORTANT - Destructuring in Svelte 5:**
+Direct destructuring breaks reactivity. To destructure, wrap with `$derived`:
+
+❌ **Incorrect** - Loses reactivity:
+```ts
+const { data, isLoading } = useLiveQuery(...)
+```
+
+✅ **Correct** - Maintains reactivity:
+```ts
+// Option 1: Use dot notation (recommended)
+const query = useLiveQuery(...)
+// Access: query.data, query.isLoading
+
+// Option 2: Wrap with $derived for destructuring
+const query = useLiveQuery(...)
+const { data, isLoading } = $derived(query)
+```
+
+This is a fundamental Svelte 5 limitation, not a library bug. See:
+https://github.com/sveltejs/svelte/issues/11002
+
+### Examples
+
+```ts
+// Basic query with object syntax (recommended pattern)
+const todosQuery = useLiveQuery((q) =>
+  q.from({ todos: todosCollection })
+   .where(({ todos }) => eq(todos.completed, false))
+   .select(({ todos }) => ({ id: todos.id, text: todos.text }))
+)
+// Access via: todosQuery.data, todosQuery.isLoading, etc.
+```
+
+```ts
+// With reactive dependencies
+let minPriority = $state(5)
+const todosQuery = useLiveQuery(
+  (q) => q.from({ todos: todosCollection })
+         .where(({ todos }) => gt(todos.priority, minPriority)),
+  [() => minPriority] // Re-run when minPriority changes
+)
+```
+
+```ts
+// Destructuring with $derived (if needed)
+const query = useLiveQuery((q) =>
+  q.from({ todos: todosCollection })
+)
+const { data, isLoading, isError } = $derived(query)
+// Now data, isLoading, and isError maintain reactivity
+```
+
+```ts
+// Join pattern
+const issuesQuery = useLiveQuery((q) =>
+  q.from({ issues: issueCollection })
+   .join({ persons: personCollection }, ({ issues, persons }) =>
+     eq(issues.userId, persons.id)
+   )
+   .select(({ issues, persons }) => ({
+     id: issues.id,
+     title: issues.title,
+     userName: persons.name
+   }))
+)
+```
+
+```ts
+// Handle loading and error states in template
+const todosQuery = useLiveQuery((q) =>
+  q.from({ todos: todoCollection })
+)
+
+// In template:
+// {#if todosQuery.isLoading}
+//   <div>Loading...</div>
+// {:else if todosQuery.isError}
+//   <div>Error: {todosQuery.status}</div>
+// {:else}
+//   <ul>
+//     {#each todosQuery.data as todo (todo.id)}
+//       <li>{todo.text}</li>
+//     {/each}
+//   </ul>
+// {/if}
+```
+
+## Call Signature
+
+```ts
+function useLiveQuery<TContext>(config, deps?): UseLiveQueryReturn<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
+```
+
+Defined in: [useLiveQuery.svelte.ts:206](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L206)
+
+Create a live query using configuration object
+
+### Type Parameters
+
+#### TContext
+
+`TContext` *extends* `Context`
+
+### Parameters
+
+#### config
+
+`LiveQueryCollectionConfig`\<`TContext`\>
+
+Configuration object with query and options
+
+#### deps?
+
+() => `unknown`[]
+
+Array of reactive dependencies that trigger query re-execution when changed
+
+### Returns
+
+[`UseLiveQueryReturn`](../interfaces/UseLiveQueryReturn.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+
+Reactive object with query data, state, and status information
+
+### Examples
+
+```ts
+// Basic config object usage
+const todosQuery = useLiveQuery({
+  query: (q) => q.from({ todos: todosCollection }),
+  gcTime: 60000
+})
+```
+
+```ts
+// With reactive dependencies
+let filter = $state('active')
+const todosQuery = useLiveQuery({
+  query: (q) => q.from({ todos: todosCollection })
+                 .where(({ todos }) => eq(todos.status, filter))
+}, [() => filter])
+```
+
+```ts
+// Handle all states uniformly
+const itemsQuery = useLiveQuery({
+  query: (q) => q.from({ items: itemCollection })
+})
+
+// In template:
+// {#if itemsQuery.isLoading}
+//   <div>Loading...</div>
+// {:else if itemsQuery.isError}
+//   <div>Something went wrong</div>
+// {:else if !itemsQuery.isReady}
+//   <div>Preparing...</div>
+// {:else}
+//   <div>{itemsQuery.data.length} items loaded</div>
+// {/if}
+```
+
+## Call Signature
+
+```ts
+function useLiveQuery<TResult, TKey, TUtils>(liveQueryCollection): UseLiveQueryReturnWithCollection<TResult, TKey, TUtils>;
+```
+
+Defined in: [useLiveQuery.svelte.ts:255](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L255)
+
+Subscribe to an existing query collection (can be reactive)
+
+### Type Parameters
+
+#### TResult
+
+`TResult` *extends* `object`
+
+#### TKey
+
+`TKey` *extends* `string` \| `number`
+
+#### TUtils
+
+`TUtils` *extends* `Record`\<`string`, `any`\>
+
+### Parameters
+
+#### liveQueryCollection
+
+`MaybeGetter`\<`Collection`\<`TResult`, `TKey`, `TUtils`, `StandardSchemaV1`\<`unknown`, `unknown`\>, `TResult`\>\>
+
+Pre-created query collection to subscribe to (can be a getter)
+
+### Returns
+
+[`UseLiveQueryReturnWithCollection`](../interfaces/UseLiveQueryReturnWithCollection.md)\<`TResult`, `TKey`, `TUtils`\>
+
+Reactive object with query data, state, and status information
+
+### Examples
+
+```ts
+// Using pre-created query collection
+const myLiveQuery = createLiveQueryCollection((q) =>
+  q.from({ todos: todosCollection }).where(({ todos }) => eq(todos.active, true))
+)
+const queryResult = useLiveQuery(myLiveQuery)
+```
+
+```ts
+// Reactive query collection reference
+let selectedQuery = $state(todosQuery)
+const queryResult = useLiveQuery(() => selectedQuery)
+
+// Switch queries reactively
+selectedQuery = archiveQuery
+```
+
+```ts
+// Access query collection methods directly
+const queryResult = useLiveQuery(existingQuery)
+
+// Use underlying collection for mutations
+const handleToggle = (id) => {
+  queryResult.collection.update(id, draft => { draft.completed = !draft.completed })
+}
+```
+
+```ts
+// Handle states consistently
+const queryResult = useLiveQuery(sharedQuery)
+
+// In template:
+// {#if queryResult.isLoading}
+//   <div>Loading...</div>
+// {:else if queryResult.isError}
+//   <div>Error loading data</div>
+// {:else}
+//   {#each queryResult.data as item (item.id)}
+//     <Item {...item} />
+//   {/each}
+// {/if}
+```
diff --git a/docs/framework/svelte/reference/index.md b/docs/framework/svelte/reference/index.md
new file mode 100644
index 000000000..152862d59
--- /dev/null
+++ b/docs/framework/svelte/reference/index.md
@@ -0,0 +1,15 @@
+---
+id: "@tanstack/svelte-db"
+title: "@tanstack/svelte-db"
+---
+
+# @tanstack/svelte-db
+
+## Interfaces
+
+- [UseLiveQueryReturn](interfaces/UseLiveQueryReturn.md)
+- [UseLiveQueryReturnWithCollection](interfaces/UseLiveQueryReturnWithCollection.md)
+
+## Functions
+
+- [useLiveQuery](functions/useLiveQuery.md)
diff --git a/docs/framework/svelte/reference/interfaces/UseLiveQueryReturn.md b/docs/framework/svelte/reference/interfaces/UseLiveQueryReturn.md
new file mode 100644
index 000000000..ee969a2eb
--- /dev/null
+++ b/docs/framework/svelte/reference/interfaces/UseLiveQueryReturn.md
@@ -0,0 +1,125 @@
+---
+id: UseLiveQueryReturn
+title: UseLiveQueryReturn
+---
+
+# Interface: UseLiveQueryReturn\<T\>
+
+Defined in: [useLiveQuery.svelte.ts:29](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L29)
+
+Return type for useLiveQuery hook
+
+## Type Parameters
+
+### T
+
+`T` *extends* `object`
+
+## Properties
+
+### collection
+
+```ts
+collection: Collection<T, string | number, {
+}>;
+```
+
+Defined in: [useLiveQuery.svelte.ts:32](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L32)
+
+The underlying query collection instance
+
+***
+
+### data
+
+```ts
+data: T[];
+```
+
+Defined in: [useLiveQuery.svelte.ts:31](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L31)
+
+Reactive array of query results in order
+
+***
+
+### isCleanedUp
+
+```ts
+isCleanedUp: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:38](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L38)
+
+True when query has been cleaned up
+
+***
+
+### isError
+
+```ts
+isError: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:37](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L37)
+
+True when query encountered an error
+
+***
+
+### isIdle
+
+```ts
+isIdle: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:36](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L36)
+
+True when query hasn't started yet
+
+***
+
+### isLoading
+
+```ts
+isLoading: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:34](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L34)
+
+True while initial query data is loading
+
+***
+
+### isReady
+
+```ts
+isReady: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:35](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L35)
+
+True when query has received first data and is ready
+
+***
+
+### state
+
+```ts
+state: Map<string | number, T>;
+```
+
+Defined in: [useLiveQuery.svelte.ts:30](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L30)
+
+Reactive Map of query results (key → item)
+
+***
+
+### status
+
+```ts
+status: CollectionStatus;
+```
+
+Defined in: [useLiveQuery.svelte.ts:33](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L33)
+
+Current query status
diff --git a/docs/framework/svelte/reference/interfaces/UseLiveQueryReturnWithCollection.md b/docs/framework/svelte/reference/interfaces/UseLiveQueryReturnWithCollection.md
new file mode 100644
index 000000000..9d921fcf9
--- /dev/null
+++ b/docs/framework/svelte/reference/interfaces/UseLiveQueryReturnWithCollection.md
@@ -0,0 +1,112 @@
+---
+id: UseLiveQueryReturnWithCollection
+title: UseLiveQueryReturnWithCollection
+---
+
+# Interface: UseLiveQueryReturnWithCollection\<T, TKey, TUtils\>
+
+Defined in: [useLiveQuery.svelte.ts:41](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L41)
+
+## Type Parameters
+
+### T
+
+`T` *extends* `object`
+
+### TKey
+
+`TKey` *extends* `string` \| `number`
+
+### TUtils
+
+`TUtils` *extends* `Record`\<`string`, `any`\>
+
+## Properties
+
+### collection
+
+```ts
+collection: Collection<T, TKey, TUtils>;
+```
+
+Defined in: [useLiveQuery.svelte.ts:48](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L48)
+
+***
+
+### data
+
+```ts
+data: T[];
+```
+
+Defined in: [useLiveQuery.svelte.ts:47](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L47)
+
+***
+
+### isCleanedUp
+
+```ts
+isCleanedUp: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:54](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L54)
+
+***
+
+### isError
+
+```ts
+isError: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:53](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L53)
+
+***
+
+### isIdle
+
+```ts
+isIdle: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:52](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L52)
+
+***
+
+### isLoading
+
+```ts
+isLoading: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:50](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L50)
+
+***
+
+### isReady
+
+```ts
+isReady: boolean;
+```
+
+Defined in: [useLiveQuery.svelte.ts:51](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L51)
+
+***
+
+### state
+
+```ts
+state: Map<TKey, T>;
+```
+
+Defined in: [useLiveQuery.svelte.ts:46](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L46)
+
+***
+
+### status
+
+```ts
+status: CollectionStatus;
+```
+
+Defined in: [useLiveQuery.svelte.ts:49](https://github.com/TanStack/db/blob/main/packages/svelte-db/src/useLiveQuery.svelte.ts#L49)
diff --git a/docs/framework/vue/overview.md b/docs/framework/vue/overview.md
index f4b2a3f6d..eb78d370f 100644
--- a/docs/framework/vue/overview.md
+++ b/docs/framework/vue/overview.md
@@ -11,7 +11,7 @@ npm install @tanstack/vue-db
 
 ## Vue Composables
 
-See the [Vue Functions Reference](../reference/index.md) to see the full list of composables available in the Vue Adapter.
+See the [Vue Functions Reference](./reference/index.md) to see the full list of composables available in the Vue Adapter.
 
 For comprehensive documentation on writing queries (filtering, joins, aggregations, etc.), see the [Live Queries Guide](../../guides/live-queries).
 
diff --git a/docs/framework/vue/reference/functions/useLiveQuery.md b/docs/framework/vue/reference/functions/useLiveQuery.md
index d233b05ed..b00e512e5 100644
--- a/docs/framework/vue/reference/functions/useLiveQuery.md
+++ b/docs/framework/vue/reference/functions/useLiveQuery.md
@@ -37,7 +37,93 @@ Array of reactive dependencies that trigger query re-execution when changed
 
 ### Returns
 
-[`UseLiveQueryReturn`](../../interfaces/UseLiveQueryReturn.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+[`UseLiveQueryReturn`](../interfaces/UseLiveQueryReturn.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+
+Reactive object with query data, state, and status information
+
+### Examples
+
+```ts
+// Basic query with object syntax
+const { data, isLoading } = useLiveQuery((q) =>
+  q.from({ todos: todosCollection })
+   .where(({ todos }) => eq(todos.completed, false))
+   .select(({ todos }) => ({ id: todos.id, text: todos.text }))
+)
+```
+
+```ts
+// With reactive dependencies
+const minPriority = ref(5)
+const { data, state } = useLiveQuery(
+  (q) => q.from({ todos: todosCollection })
+         .where(({ todos }) => gt(todos.priority, minPriority.value)),
+  [minPriority] // Re-run when minPriority changes
+)
+```
+
+```ts
+// Join pattern
+const { data } = useLiveQuery((q) =>
+  q.from({ issues: issueCollection })
+   .join({ persons: personCollection }, ({ issues, persons }) =>
+     eq(issues.userId, persons.id)
+   )
+   .select(({ issues, persons }) => ({
+     id: issues.id,
+     title: issues.title,
+     userName: persons.name
+   }))
+)
+```
+
+```ts
+// Handle loading and error states in template
+const { data, isLoading, isError, status } = useLiveQuery((q) =>
+  q.from({ todos: todoCollection })
+)
+
+// In template:
+// <div v-if="isLoading">Loading...</div>
+// <div v-else-if="isError">Error: {{ status }}</div>
+// <ul v-else>
+//   <li v-for="todo in data" :key="todo.id">{{ todo.text }}</li>
+// </ul>
+```
+
+## Call Signature
+
+```ts
+function useLiveQuery<TContext>(queryFn, deps?): UseLiveQueryReturn<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
+```
+
+Defined in: [useLiveQuery.ts:120](https://github.com/TanStack/db/blob/main/packages/vue-db/src/useLiveQuery.ts#L120)
+
+Create a live query using a query function
+
+### Type Parameters
+
+#### TContext
+
+`TContext` *extends* `Context`
+
+### Parameters
+
+#### queryFn
+
+(`q`) => `QueryBuilder`\<`TContext`\> \| `null` \| `undefined`
+
+Query function that defines what data to fetch
+
+#### deps?
+
+`unknown`[]
+
+Array of reactive dependencies that trigger query re-execution when changed
+
+### Returns
+
+[`UseLiveQueryReturn`](../interfaces/UseLiveQueryReturn.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
 
 Reactive object with query data, state, and status information
 
@@ -97,7 +183,7 @@ const { data, isLoading, isError, status } = useLiveQuery((q) =>
 function useLiveQuery<TContext>(config, deps?): UseLiveQueryReturn<{ [K in string | number | symbol]: (TContext["result"] extends object ? any[any] : TContext["hasJoins"] extends true ? TContext["schema"] : TContext["schema"][TContext["fromSourceName"]])[K] }>;
 ```
 
-Defined in: [useLiveQuery.ts:152](https://github.com/TanStack/db/blob/main/packages/vue-db/src/useLiveQuery.ts#L152)
+Defined in: [useLiveQuery.ts:160](https://github.com/TanStack/db/blob/main/packages/vue-db/src/useLiveQuery.ts#L160)
 
 Create a live query using configuration object
 
@@ -123,7 +209,7 @@ Array of reactive dependencies that trigger query re-execution when changed
 
 ### Returns
 
-[`UseLiveQueryReturn`](../../interfaces/UseLiveQueryReturn.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
+[`UseLiveQueryReturn`](../interfaces/UseLiveQueryReturn.md)\<\{ \[K in string \| number \| symbol\]: (TContext\["result"\] extends object ? any\[any\] : TContext\["hasJoins"\] extends true ? TContext\["schema"\] : TContext\["schema"\]\[TContext\["fromSourceName"\]\])\[K\] \}\>
 
 Reactive object with query data, state, and status information
 
@@ -165,7 +251,7 @@ const { data, isLoading, isReady, isError } = useLiveQuery({
 function useLiveQuery<TResult, TKey, TUtils>(liveQueryCollection): UseLiveQueryReturnWithCollection<TResult, TKey, TUtils>;
 ```
 
-Defined in: [useLiveQuery.ts:197](https://github.com/TanStack/db/blob/main/packages/vue-db/src/useLiveQuery.ts#L197)
+Defined in: [useLiveQuery.ts:205](https://github.com/TanStack/db/blob/main/packages/vue-db/src/useLiveQuery.ts#L205)
 
 Subscribe to an existing query collection (can be reactive)
 
@@ -193,7 +279,7 @@ Pre-created query collection to subscribe to (can be a ref)
 
 ### Returns
 
-[`UseLiveQueryReturnWithCollection`](../../interfaces/UseLiveQueryReturnWithCollection.md)\<`TResult`, `TKey`, `TUtils`\>
+[`UseLiveQueryReturnWithCollection`](../interfaces/UseLiveQueryReturnWithCollection.md)\<`TResult`, `TKey`, `TUtils`\>
 
 Reactive object with query data, state, and status information
 
diff --git a/docs/framework/vue/reference/index.md b/docs/framework/vue/reference/index.md
index d9fc4a358..65af759fc 100644
--- a/docs/framework/vue/reference/index.md
+++ b/docs/framework/vue/reference/index.md
@@ -7,9 +7,9 @@ title: "@tanstack/vue-db"
 
 ## Interfaces
 
-- [UseLiveQueryReturn](../interfaces/UseLiveQueryReturn.md)
-- [UseLiveQueryReturnWithCollection](../interfaces/UseLiveQueryReturnWithCollection.md)
+- [UseLiveQueryReturn](interfaces/UseLiveQueryReturn.md)
+- [UseLiveQueryReturnWithCollection](interfaces/UseLiveQueryReturnWithCollection.md)
 
 ## Functions
 
-- [useLiveQuery](../functions/useLiveQuery.md)
+- [useLiveQuery](functions/useLiveQuery.md)
diff --git a/docs/guides/error-handling.md b/docs/guides/error-handling.md
index 8f6573d7b..dfd4fa0b8 100644
--- a/docs/guides/error-handling.md
+++ b/docs/guides/error-handling.md
@@ -177,7 +177,7 @@ const App = () => (
 )
 ```
 
-With this approach, loading states are handled by `<Suspense>` and error states are handled by `<ErrorBoundary>` instead of within your component logic. See the [React Suspense section in Live Queries](../live-queries#using-with-react-suspense) for more details.
+With this approach, loading states are handled by `<Suspense>` and error states are handled by `<ErrorBoundary>` instead of within your component logic. See the [React Suspense section in Live Queries](./live-queries#using-with-react-suspense) for more details.
 
 ## Transaction Error Handling
 
@@ -810,6 +810,6 @@ const TodoApp = () => {
 
 ## See Also
 
-- [API Reference](../../overview.md#api-reference) - Detailed API documentation
-- [Mutations Guide](../../overview.md#making-optimistic-mutations) - Learn about optimistic updates and rollbacks
+- [API Reference](../overview.md#api-reference) - Detailed API documentation
+- [Mutations Guide](../overview.md#making-optimistic-mutations) - Learn about optimistic updates and rollbacks
 - [TanStack Query Error Handling](https://tanstack.com/query/latest/docs/react/guides/error-handling) - Query-specific error handling
diff --git a/docs/guides/live-queries.md b/docs/guides/live-queries.md
index f02c68d22..409b87cac 100644
--- a/docs/guides/live-queries.md
+++ b/docs/guides/live-queries.md
@@ -161,9 +161,9 @@ export class UserListComponent {
 }
 ```
 
-> **Note:** React hooks (`useLiveQuery`, `useLiveInfiniteQuery`, `useLiveSuspenseQuery`) accept an optional dependency array parameter to re-execute queries when values change, similar to React's `useEffect`. See the [React Adapter documentation](../../framework/react/adapter#dependency-arrays) for details on when and how to use dependency arrays.
+> **Note:** React hooks (`useLiveQuery`, `useLiveInfiniteQuery`, `useLiveSuspenseQuery`) accept an optional dependency array parameter to re-execute queries when values change, similar to React's `useEffect`. See the [React Adapter documentation](../framework/react/overview#dependency-arrays) for details on when and how to use dependency arrays.
 
-For more details on framework integration, see the [React](../../framework/react/adapter), [Vue](../../framework/vue/adapter), and [Angular](../../framework/angular/adapter) adapter documentation.
+For more details on framework integration, see the [React](../framework/react/overview), [Vue](../framework/vue/overview), and [Angular](../framework/angular/overview) adapter documentation.
 
 ### Using with React Suspense
 
diff --git a/docs/overview.md b/docs/overview.md
index 3f068b7c8..8af0254c3 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -87,7 +87,7 @@ Collections can be populated in many ways, including:
 
 - fetching data, for example [from API endpoints using TanStack Query](https://tanstack.com/query/latest)
 - syncing data, for example [using a sync engine like ElectricSQL](https://electric-sql.com/)
-- storing local data, for example [using localStorage for user preferences and settings](../collections/local-storage-collection.md) or [in-memory client data or UI state](../collections/local-only-collection.md)
+- storing local data, for example [using localStorage for user preferences and settings](./collections/local-storage-collection.md) or [in-memory client data or UI state](./collections/local-only-collection.md)
 - from live collection queries, creating [derived collections as materialised views](#using-live-queries)
 
 Once you have your data in collections, you can query across them using live queries in your components.
@@ -118,7 +118,7 @@ const productsCollection = createCollection(
 
 TanStack DB automatically collapses duplicate requests, performs delta loading when expanding queries, optimizes joins into minimal batched requests, and respects your TanStack Query cache policies. You often end up with _fewer_ network requests than custom view-specific APIs.
 
-See the [Query Collection documentation](../collections/query-collection.md#queryfn-and-predicate-push-down) for full predicate mapping details.
+See the [Query Collection documentation](./collections/query-collection.md#queryfn-and-predicate-push-down) for full predicate mapping details.
 
 ### Using live queries
 
@@ -135,7 +135,7 @@ Live queries support joins across collections. This allows you to:
 
 Every query returns another collection which can _also_ be queried.
 
-For more details on live queries, see the [Live Queries](../guides/live-queries.md) documentation.
+For more details on live queries, see the [Live Queries](./guides/live-queries.md) documentation.
 
 ### Making optimistic mutations
 
@@ -162,7 +162,7 @@ The collection maintains optimistic state separately from synced data. When live
 
 The optimistic state is held until the handler resolves, at which point the data is persisted to the server and synced back. If the handler throws an error, the optimistic state is rolled back.
 
-For more complex mutations, you can create custom actions with `createOptimisticAction` or custom transactions with `createTransaction`. See the [Mutations guide](../guides/mutations.md) for details.
+For more complex mutations, you can create custom actions with `createOptimisticAction` or custom transactions with `createTransaction`. See the [Mutations guide](./guides/mutations.md) for details.
 
 ### Uni-directional data flow
 
@@ -186,23 +186,23 @@ TanStack DB provides several built-in collection types for different data source
 
 **Fetch Collections**
 
-- **[QueryCollection](../collections/query-collection.md)** &mdash; Load data into collections using TanStack Query for REST APIs and data fetching.
+- **[QueryCollection](./collections/query-collection.md)** &mdash; Load data into collections using TanStack Query for REST APIs and data fetching.
 
 **Sync Collections**
 
-- **[ElectricCollection](../collections/electric-collection.md)** &mdash; Sync data into collections from Postgres using ElectricSQL's real-time sync engine.
+- **[ElectricCollection](./collections/electric-collection.md)** &mdash; Sync data into collections from Postgres using ElectricSQL's real-time sync engine.
 
-- **[TrailBaseCollection](../collections/trailbase-collection.md)** &mdash; Sync data into collections using TrailBase's self-hosted backend with real-time subscriptions.
+- **[TrailBaseCollection](./collections/trailbase-collection.md)** &mdash; Sync data into collections using TrailBase's self-hosted backend with real-time subscriptions.
 
-- **[RxDBCollection](../collections/rxdb-collection.md)** &mdash; Integrate with RxDB for offline-first local persistence with powerful replication and sync capabilities.
+- **[RxDBCollection](./collections/rxdb-collection.md)** &mdash; Integrate with RxDB for offline-first local persistence with powerful replication and sync capabilities.
 
-- **[PowerSyncCollection](../collections/powersync-collection.md)** &mdash; Sync with PowerSync's SQLite-based database for offline-first persistence with real-time synchronization with PostgreSQL, MongoDB, and MySQL backends.
+- **[PowerSyncCollection](./collections/powersync-collection.md)** &mdash; Sync with PowerSync's SQLite-based database for offline-first persistence with real-time synchronization with PostgreSQL, MongoDB, and MySQL backends.
 
 **Local Collections**
 
-- **[LocalStorageCollection](../collections/local-storage-collection.md)** &mdash; Store small amounts of local-only state that persists across sessions and syncs across browser tabs.
+- **[LocalStorageCollection](./collections/local-storage-collection.md)** &mdash; Store small amounts of local-only state that persists across sessions and syncs across browser tabs.
 
-- **[LocalOnlyCollection](../collections/local-only-collection.md)** &mdash; Manage in-memory client data or UI state that doesn't need persistence or cross-tab sync.
+- **[LocalOnlyCollection](./collections/local-only-collection.md)** &mdash; Manage in-memory client data or UI state that doesn't need persistence or cross-tab sync.
 
 #### Collection Schemas
 
@@ -256,7 +256,7 @@ The collection will use the schema for its type inference. If you provide a sche
 
 You can create your own collection types by implementing the `Collection` interface found in [`../packages/db/src/collection/index.ts`](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts).
 
-See the existing implementations in [`../packages/db`](https://github.com/TanStack/db/tree/main/packages/db), [`../packages/query-db-collection`](https://github.com/TanStack/db/tree/main/packages/query-db-collection), [`../packages/electric-db-collection`](https://github.com/TanStack/db/tree/main/packages/electric-db-collection) and [`../packages/trailbase-db-collection`](https://github.com/TanStack/db/tree/main/packages/trailbase-db-collection) for reference. Also see the [Collection Options Creator guide](../guides/collection-options-creator.md) for a pattern to create reusable collection configuration factories.
+See the existing implementations in [`../packages/db`](https://github.com/TanStack/db/tree/main/packages/db), [`../packages/query-db-collection`](https://github.com/TanStack/db/tree/main/packages/query-db-collection), [`../packages/electric-db-collection`](https://github.com/TanStack/db/tree/main/packages/electric-db-collection) and [`../packages/trailbase-db-collection`](https://github.com/TanStack/db/tree/main/packages/trailbase-db-collection) for reference. Also see the [Collection Options Creator guide](./guides/collection-options-creator.md) for a pattern to create reusable collection configuration factories.
 
 ### Live queries
 
@@ -337,7 +337,7 @@ const App = () => (
 )
 ```
 
-See the [React Suspense section in Live Queries](../guides/live-queries#using-with-react-suspense) for detailed usage patterns and when to use `useLiveSuspenseQuery` vs `useLiveQuery`.
+See the [React Suspense section in Live Queries](./guides/live-queries#using-with-react-suspense) for detailed usage patterns and when to use `useLiveSuspenseQuery` vs `useLiveQuery`.
 
 #### `queryBuilder`
 
@@ -362,13 +362,13 @@ Note also that:
 1. the query results [are themselves a collection](#derived-collections)
 2. the `useLiveQuery` automatically starts and stops live query subscriptions when you mount and unmount your components; if you're creating queries manually, you need to manually manage the subscription lifecycle yourself
 
-See the [Live Queries](../guides/live-queries.md) documentation for more details.
+See the [Live Queries](./guides/live-queries.md) documentation for more details.
 
 ### Transactional mutators
 
 For more complex mutations beyond simple CRUD operations, TanStack DB provides `createOptimisticAction` and `createTransaction` for creating custom mutations with full control over the mutation lifecycle.
 
-See the [Mutations guide](../guides/mutations.md) for comprehensive documentation on:
+See the [Mutations guide](./guides/mutations.md) for comprehensive documentation on:
 
 - Creating custom actions with `createOptimisticAction`
 - Manual transactions with `createTransaction`
diff --git a/docs/quick-start.md b/docs/quick-start.md
index 5b53bff94..ea6799974 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -178,6 +178,6 @@ You now understand the basics of TanStack DB! The collection loads and persists
 
 Explore the docs to learn more about:
 
-- **[Installation](../installation.md)** - All framework and collection packages
-- **[Overview](../overview.md)** - Complete feature overview and examples
-- **[Live Queries](../guides/live-queries.md)** - Advanced querying, joins, and aggregations
+- **[Installation](./installation.md)** - All framework and collection packages
+- **[Overview](./overview.md)** - Complete feature overview and examples
+- **[Live Queries](./guides/live-queries.md)** - Advanced querying, joins, and aggregations
diff --git a/docs/reference/@tanstack/namespaces/IR/classes/Aggregate.md b/docs/reference/@tanstack/namespaces/IR/classes/Aggregate.md
index 7a9758d72..75915c41c 100644
--- a/docs/reference/@tanstack/namespaces/IR/classes/Aggregate.md
+++ b/docs/reference/@tanstack/namespaces/IR/classes/Aggregate.md
@@ -35,7 +35,7 @@ Defined in: [packages/db/src/query/ir.ts:127](https://github.com/TanStack/db/blo
 
 ##### args
 
-[`BasicExpression`](../../type-aliases/BasicExpression.md)\<`any`\>[]
+[`BasicExpression`](../type-aliases/BasicExpression.md)\<`any`\>[]
 
 #### Returns
 
diff --git a/docs/reference/@tanstack/namespaces/IR/classes/CollectionRef.md b/docs/reference/@tanstack/namespaces/IR/classes/CollectionRef.md
index 0d820a8b1..1550a7e6f 100644
--- a/docs/reference/@tanstack/namespaces/IR/classes/CollectionRef.md
+++ b/docs/reference/@tanstack/namespaces/IR/classes/CollectionRef.md
@@ -25,7 +25,7 @@ Defined in: [packages/db/src/query/ir.ts:74](https://github.com/TanStack/db/blob
 
 ##### collection
 
-[`CollectionImpl`](../../../../../classes/CollectionImpl.md)
+[`CollectionImpl`](../../../../classes/CollectionImpl.md)
 
 ##### alias
 
diff --git a/docs/reference/@tanstack/namespaces/IR/classes/Func.md b/docs/reference/@tanstack/namespaces/IR/classes/Func.md
index 3550d8362..37fe6c377 100644
--- a/docs/reference/@tanstack/namespaces/IR/classes/Func.md
+++ b/docs/reference/@tanstack/namespaces/IR/classes/Func.md
@@ -35,7 +35,7 @@ Defined in: [packages/db/src/query/ir.ts:112](https://github.com/TanStack/db/blo
 
 ##### args
 
-[`BasicExpression`](../../type-aliases/BasicExpression.md)\<`any`\>[]
+[`BasicExpression`](../type-aliases/BasicExpression.md)\<`any`\>[]
 
 #### Returns
 
diff --git a/docs/reference/@tanstack/namespaces/IR/classes/QueryRef.md b/docs/reference/@tanstack/namespaces/IR/classes/QueryRef.md
index 6650b0389..5f29109ba 100644
--- a/docs/reference/@tanstack/namespaces/IR/classes/QueryRef.md
+++ b/docs/reference/@tanstack/namespaces/IR/classes/QueryRef.md
@@ -25,7 +25,7 @@ Defined in: [packages/db/src/query/ir.ts:84](https://github.com/TanStack/db/blob
 
 ##### query
 
-[`QueryIR`](../../interfaces/QueryIR.md)
+[`QueryIR`](../interfaces/QueryIR.md)
 
 ##### alias
 
diff --git a/docs/reference/@tanstack/namespaces/IR/functions/createResidualWhere.md b/docs/reference/@tanstack/namespaces/IR/functions/createResidualWhere.md
index 05ed3ea3d..93851c21c 100644
--- a/docs/reference/@tanstack/namespaces/IR/functions/createResidualWhere.md
+++ b/docs/reference/@tanstack/namespaces/IR/functions/createResidualWhere.md
@@ -17,8 +17,8 @@ Create a residual Where clause from an expression
 
 ### expression
 
-[`BasicExpression`](../../type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Returns
 
-[`Where`](../../type-aliases/Where.md)
+[`Where`](../type-aliases/Where.md)
diff --git a/docs/reference/@tanstack/namespaces/IR/functions/followRef.md b/docs/reference/@tanstack/namespaces/IR/functions/followRef.md
index 8b1fca465..3147d38c1 100644
--- a/docs/reference/@tanstack/namespaces/IR/functions/followRef.md
+++ b/docs/reference/@tanstack/namespaces/IR/functions/followRef.md
@@ -26,21 +26,21 @@ until its finds the root field the reference points to.
 
 ### query
 
-[`QueryIR`](../../interfaces/QueryIR.md)
+[`QueryIR`](../interfaces/QueryIR.md)
 
 ### ref
 
-[`PropRef`](../../classes/PropRef.md)\<`any`\>
+[`PropRef`](../classes/PropRef.md)\<`any`\>
 
 ### collection
 
-[`Collection`](../../../../../interfaces/Collection.md)
+[`Collection`](../../../../interfaces/Collection.md)
 
 ## Returns
 
   \| `void`
   \| \{
-  `collection`: [`Collection`](../../../../../interfaces/Collection.md);
+  `collection`: [`Collection`](../../../../interfaces/Collection.md);
   `path`: `string`[];
 \}
 
diff --git a/docs/reference/@tanstack/namespaces/IR/functions/getHavingExpression.md b/docs/reference/@tanstack/namespaces/IR/functions/getHavingExpression.md
index 0fe5ee30c..a52e0646a 100644
--- a/docs/reference/@tanstack/namespaces/IR/functions/getHavingExpression.md
+++ b/docs/reference/@tanstack/namespaces/IR/functions/getHavingExpression.md
@@ -20,9 +20,9 @@ HAVING clauses can contain aggregates, unlike regular WHERE clauses
 
 ### having
 
-[`Where`](../../type-aliases/Where.md)
+[`Where`](../type-aliases/Where.md)
 
 ## Returns
 
-  \| [`Aggregate`](../../classes/Aggregate.md)\<`any`\>
-  \| [`BasicExpression`](../../type-aliases/BasicExpression.md)\<`any`\>
+  \| [`Aggregate`](../classes/Aggregate.md)\<`any`\>
+  \| [`BasicExpression`](../type-aliases/BasicExpression.md)\<`any`\>
diff --git a/docs/reference/@tanstack/namespaces/IR/functions/getWhereExpression.md b/docs/reference/@tanstack/namespaces/IR/functions/getWhereExpression.md
index fbc8b9808..41bb467a8 100644
--- a/docs/reference/@tanstack/namespaces/IR/functions/getWhereExpression.md
+++ b/docs/reference/@tanstack/namespaces/IR/functions/getWhereExpression.md
@@ -17,8 +17,8 @@ Extract the expression from a Where clause
 
 ### where
 
-[`Where`](../../type-aliases/Where.md)
+[`Where`](../type-aliases/Where.md)
 
 ## Returns
 
-[`BasicExpression`](../../type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/@tanstack/namespaces/IR/functions/isResidualWhere.md b/docs/reference/@tanstack/namespaces/IR/functions/isResidualWhere.md
index 3b433feff..28f2a059c 100644
--- a/docs/reference/@tanstack/namespaces/IR/functions/isResidualWhere.md
+++ b/docs/reference/@tanstack/namespaces/IR/functions/isResidualWhere.md
@@ -17,7 +17,7 @@ Check if a Where clause is marked as residual
 
 ### where
 
-[`Where`](../../type-aliases/Where.md)
+[`Where`](../type-aliases/Where.md)
 
 ## Returns
 
diff --git a/docs/reference/@tanstack/namespaces/IR/index.md b/docs/reference/@tanstack/namespaces/IR/index.md
index e1937961e..2e6b180ed 100644
--- a/docs/reference/@tanstack/namespaces/IR/index.md
+++ b/docs/reference/@tanstack/namespaces/IR/index.md
@@ -7,38 +7,38 @@ title: IR
 
 ## Classes
 
-- [Aggregate](../classes/Aggregate.md)
-- [CollectionRef](../classes/CollectionRef.md)
-- [Func](../classes/Func.md)
-- [PropRef](../classes/PropRef.md)
-- [QueryRef](../classes/QueryRef.md)
-- [Value](../classes/Value.md)
+- [Aggregate](classes/Aggregate.md)
+- [CollectionRef](classes/CollectionRef.md)
+- [Func](classes/Func.md)
+- [PropRef](classes/PropRef.md)
+- [QueryRef](classes/QueryRef.md)
+- [Value](classes/Value.md)
 
 ## Interfaces
 
-- [JoinClause](../interfaces/JoinClause.md)
-- [QueryIR](../interfaces/QueryIR.md)
+- [JoinClause](interfaces/JoinClause.md)
+- [QueryIR](interfaces/QueryIR.md)
 
 ## Type Aliases
 
-- [BasicExpression](../type-aliases/BasicExpression.md)
-- [From](../type-aliases/From.md)
-- [GroupBy](../type-aliases/GroupBy.md)
-- [Having](../type-aliases/Having.md)
-- [Join](../type-aliases/Join.md)
-- [Limit](../type-aliases/Limit.md)
-- [Offset](../type-aliases/Offset.md)
-- [OrderBy](../type-aliases/OrderBy.md)
-- [OrderByClause](../type-aliases/OrderByClause.md)
-- [OrderByDirection](../type-aliases/OrderByDirection.md)
-- [Select](../type-aliases/Select.md)
-- [Where](../type-aliases/Where.md)
+- [BasicExpression](type-aliases/BasicExpression.md)
+- [From](type-aliases/From.md)
+- [GroupBy](type-aliases/GroupBy.md)
+- [Having](type-aliases/Having.md)
+- [Join](type-aliases/Join.md)
+- [Limit](type-aliases/Limit.md)
+- [Offset](type-aliases/Offset.md)
+- [OrderBy](type-aliases/OrderBy.md)
+- [OrderByClause](type-aliases/OrderByClause.md)
+- [OrderByDirection](type-aliases/OrderByDirection.md)
+- [Select](type-aliases/Select.md)
+- [Where](type-aliases/Where.md)
 
 ## Functions
 
-- [createResidualWhere](../functions/createResidualWhere.md)
-- [followRef](../functions/followRef.md)
-- [getHavingExpression](../functions/getHavingExpression.md)
-- [getWhereExpression](../functions/getWhereExpression.md)
-- [isExpressionLike](../functions/isExpressionLike.md)
-- [isResidualWhere](../functions/isResidualWhere.md)
+- [createResidualWhere](functions/createResidualWhere.md)
+- [followRef](functions/followRef.md)
+- [getHavingExpression](functions/getHavingExpression.md)
+- [getWhereExpression](functions/getWhereExpression.md)
+- [isExpressionLike](functions/isExpressionLike.md)
+- [isResidualWhere](functions/isResidualWhere.md)
diff --git a/docs/reference/@tanstack/namespaces/IR/interfaces/QueryIR.md b/docs/reference/@tanstack/namespaces/IR/interfaces/QueryIR.md
index 835f2b562..c47622a9e 100644
--- a/docs/reference/@tanstack/namespaces/IR/interfaces/QueryIR.md
+++ b/docs/reference/@tanstack/namespaces/IR/interfaces/QueryIR.md
@@ -31,7 +31,7 @@ Defined in: [packages/db/src/query/ir.ts:25](https://github.com/TanStack/db/blob
 
 ##### row
 
-[`NamespacedRow`](../../../../../type-aliases/NamespacedRow.md)
+[`NamespacedRow`](../../../../type-aliases/NamespacedRow.md)
 
 #### Returns
 
@@ -51,7 +51,7 @@ Defined in: [packages/db/src/query/ir.ts:23](https://github.com/TanStack/db/blob
 
 ##### row
 
-[`NamespacedRow`](../../../../../type-aliases/NamespacedRow.md)
+[`NamespacedRow`](../../../../type-aliases/NamespacedRow.md)
 
 #### Returns
 
@@ -71,7 +71,7 @@ Defined in: [packages/db/src/query/ir.ts:24](https://github.com/TanStack/db/blob
 
 ##### row
 
-[`NamespacedRow`](../../../../../type-aliases/NamespacedRow.md)
+[`NamespacedRow`](../../../../type-aliases/NamespacedRow.md)
 
 #### Returns
 
diff --git a/docs/reference/classes/AggregateFunctionNotInSelectError.md b/docs/reference/classes/AggregateFunctionNotInSelectError.md
index d4d41540e..26ca39d02 100644
--- a/docs/reference/classes/AggregateFunctionNotInSelectError.md
+++ b/docs/reference/classes/AggregateFunctionNotInSelectError.md
@@ -5,11 +5,11 @@ title: AggregateFunctionNotInSelectError
 
 # Class: AggregateFunctionNotInSelectError
 
-Defined in: [packages/db/src/errors.ts:556](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L556)
+Defined in: [packages/db/src/errors.ts:565](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L565)
 
 ## Extends
 
-- [`GroupByError`](../GroupByError.md)
+- [`GroupByError`](GroupByError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:556](https://github.com/TanStack/db/blob/
 new AggregateFunctionNotInSelectError(functionName): AggregateFunctionNotInSelectError;
 ```
 
-Defined in: [packages/db/src/errors.ts:557](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L557)
+Defined in: [packages/db/src/errors.ts:566](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L566)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:557](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`GroupByError`](../GroupByError.md).[`constructor`](../GroupByError.md#constructor)
+[`GroupByError`](GroupByError.md).[`constructor`](GroupByError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`cause`](../GroupByError.md#cause)
+[`GroupByError`](GroupByError.md).[`cause`](GroupByError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`message`](../GroupByError.md#message)
+[`GroupByError`](GroupByError.md).[`message`](GroupByError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`name`](../GroupByError.md#name)
+[`GroupByError`](GroupByError.md).[`name`](GroupByError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`stack`](../GroupByError.md#stack)
+[`GroupByError`](GroupByError.md).[`stack`](GroupByError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`stackTraceLimit`](../GroupByError.md#stacktracelimit)
+[`GroupByError`](GroupByError.md).[`stackTraceLimit`](GroupByError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`captureStackTrace`](../GroupByError.md#capturestacktrace)
+[`GroupByError`](GroupByError.md).[`captureStackTrace`](GroupByError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`prepareStackTrace`](../GroupByError.md#preparestacktrace)
+[`GroupByError`](GroupByError.md).[`prepareStackTrace`](GroupByError.md#preparestacktrace)
diff --git a/docs/reference/classes/AggregateNotSupportedError.md b/docs/reference/classes/AggregateNotSupportedError.md
index a880fa93a..ef2169e5a 100644
--- a/docs/reference/classes/AggregateNotSupportedError.md
+++ b/docs/reference/classes/AggregateNotSupportedError.md
@@ -5,13 +5,13 @@ title: AggregateNotSupportedError
 
 # Class: AggregateNotSupportedError
 
-Defined in: [packages/db/src/errors.ts:672](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L672)
+Defined in: [packages/db/src/errors.ts:681](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L681)
 
 Error thrown when aggregate expressions are used outside of a GROUP BY context.
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -21,7 +21,7 @@ Error thrown when aggregate expressions are used outside of a GROUP BY context.
 new AggregateNotSupportedError(): AggregateNotSupportedError;
 ```
 
-Defined in: [packages/db/src/errors.ts:673](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L673)
+Defined in: [packages/db/src/errors.ts:682](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L682)
 
 #### Returns
 
@@ -29,7 +29,7 @@ Defined in: [packages/db/src/errors.ts:673](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -43,7 +43,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -57,7 +57,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -71,7 +71,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -85,7 +85,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -109,7 +109,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -181,7 +181,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -213,4 +213,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/BTreeIndex.md b/docs/reference/classes/BTreeIndex.md
index fe55cef10..68054f1c3 100644
--- a/docs/reference/classes/BTreeIndex.md
+++ b/docs/reference/classes/BTreeIndex.md
@@ -5,14 +5,14 @@ title: BTreeIndex
 
 # Class: BTreeIndex\<TKey\>
 
-Defined in: [packages/db/src/indexes/btree-index.ts:30](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L30)
+Defined in: [packages/db/src/indexes/btree-index.ts:31](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L31)
 
 B+Tree index for sorted data with range queries
 This maintains items in sorted order and provides efficient range operations
 
 ## Extends
 
-- [`BaseIndex`](../BaseIndex.md)\<`TKey`\>
+- [`BaseIndex`](BaseIndex.md)\<`TKey`\>
 
 ## Type Parameters
 
@@ -32,7 +32,7 @@ new BTreeIndex<TKey>(
 options?): BTreeIndex<TKey>;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:50](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L50)
+Defined in: [packages/db/src/indexes/btree-index.ts:51](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L51)
 
 #### Parameters
 
@@ -42,7 +42,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:50](https://github.com/TanSt
 
 ##### expression
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
 
 ##### name?
 
@@ -58,7 +58,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:50](https://github.com/TanSt
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`constructor`](../BaseIndex.md#constructor)
+[`BaseIndex`](BaseIndex.md).[`constructor`](BaseIndex.md#constructor)
 
 ## Properties
 
@@ -72,7 +72,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:87](https://github.com/TanSta
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`compareOptions`](../BaseIndex.md#compareoptions)
+[`BaseIndex`](BaseIndex.md).[`compareOptions`](BaseIndex.md#compareoptions)
 
 ***
 
@@ -86,7 +86,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:81](https://github.com/TanSta
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`expression`](../BaseIndex.md#expression)
+[`BaseIndex`](BaseIndex.md).[`expression`](BaseIndex.md#expression)
 
 ***
 
@@ -100,7 +100,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:79](https://github.com/TanSta
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`id`](../BaseIndex.md#id)
+[`BaseIndex`](BaseIndex.md).[`id`](BaseIndex.md#id)
 
 ***
 
@@ -114,7 +114,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:86](https://github.com/TanSta
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`lastUpdated`](../BaseIndex.md#lastupdated)
+[`BaseIndex`](BaseIndex.md).[`lastUpdated`](BaseIndex.md#lastupdated)
 
 ***
 
@@ -128,7 +128,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:84](https://github.com/TanSta
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`lookupCount`](../BaseIndex.md#lookupcount)
+[`BaseIndex`](BaseIndex.md).[`lookupCount`](BaseIndex.md#lookupcount)
 
 ***
 
@@ -142,7 +142,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:80](https://github.com/TanSta
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`name`](../BaseIndex.md#name)
+[`BaseIndex`](BaseIndex.md).[`name`](BaseIndex.md#name)
 
 ***
 
@@ -152,11 +152,11 @@ Defined in: [packages/db/src/indexes/base-index.ts:80](https://github.com/TanSta
 readonly supportedOperations: Set<"eq" | "gt" | "gte" | "lt" | "lte" | "in" | "like" | "ilike">;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:33](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L33)
+Defined in: [packages/db/src/indexes/btree-index.ts:34](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L34)
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`supportedOperations`](../BaseIndex.md#supportedoperations)
+[`BaseIndex`](BaseIndex.md).[`supportedOperations`](BaseIndex.md#supportedoperations)
 
 ***
 
@@ -170,7 +170,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:85](https://github.com/TanSta
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`totalLookupTime`](../BaseIndex.md#totallookuptime)
+[`BaseIndex`](BaseIndex.md).[`totalLookupTime`](BaseIndex.md#totallookuptime)
 
 ## Accessors
 
@@ -182,7 +182,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:85](https://github.com/TanSta
 get indexedKeysSet(): Set<TKey>;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:333](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L333)
+Defined in: [packages/db/src/indexes/btree-index.ts:337](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L337)
 
 ##### Returns
 
@@ -190,7 +190,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:333](https://github.com/TanS
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`indexedKeysSet`](../BaseIndex.md#indexedkeysset)
+[`BaseIndex`](BaseIndex.md).[`indexedKeysSet`](BaseIndex.md#indexedkeysset)
 
 ***
 
@@ -202,7 +202,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:333](https://github.com/TanS
 get keyCount(): number;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:199](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L199)
+Defined in: [packages/db/src/indexes/btree-index.ts:200](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L200)
 
 Gets the number of indexed keys
 
@@ -212,7 +212,7 @@ Gets the number of indexed keys
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`keyCount`](../BaseIndex.md#keycount)
+[`BaseIndex`](BaseIndex.md).[`keyCount`](BaseIndex.md#keycount)
 
 ***
 
@@ -224,7 +224,7 @@ Gets the number of indexed keys
 get orderedEntriesArray(): [any, Set<TKey>][];
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:337](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L337)
+Defined in: [packages/db/src/indexes/btree-index.ts:341](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L341)
 
 ##### Returns
 
@@ -232,7 +232,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:337](https://github.com/TanS
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`orderedEntriesArray`](../BaseIndex.md#orderedentriesarray)
+[`BaseIndex`](BaseIndex.md).[`orderedEntriesArray`](BaseIndex.md#orderedentriesarray)
 
 ***
 
@@ -244,7 +244,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:337](https://github.com/TanS
 get orderedEntriesArrayReversed(): [any, Set<TKey>][];
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:343](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L343)
+Defined in: [packages/db/src/indexes/btree-index.ts:347](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L347)
 
 ##### Returns
 
@@ -252,7 +252,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:343](https://github.com/TanS
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`orderedEntriesArrayReversed`](../BaseIndex.md#orderedentriesarrayreversed)
+[`BaseIndex`](BaseIndex.md).[`orderedEntriesArrayReversed`](BaseIndex.md#orderedentriesarrayreversed)
 
 ***
 
@@ -264,7 +264,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:343](https://github.com/TanS
 get valueMapData(): Map<any, Set<TKey>>;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:350](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L350)
+Defined in: [packages/db/src/indexes/btree-index.ts:354](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L354)
 
 ##### Returns
 
@@ -272,7 +272,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:350](https://github.com/TanS
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`valueMapData`](../BaseIndex.md#valuemapdata)
+[`BaseIndex`](BaseIndex.md).[`valueMapData`](BaseIndex.md#valuemapdata)
 
 ## Methods
 
@@ -282,7 +282,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:350](https://github.com/TanS
 add(key, item): void;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:69](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L69)
+Defined in: [packages/db/src/indexes/btree-index.ts:70](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L70)
 
 Adds a value to the index
 
@@ -302,7 +302,7 @@ Adds a value to the index
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`add`](../BaseIndex.md#add)
+[`BaseIndex`](BaseIndex.md).[`add`](BaseIndex.md#add)
 
 ***
 
@@ -312,7 +312,7 @@ Adds a value to the index
 build(entries): void;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:143](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L143)
+Defined in: [packages/db/src/indexes/btree-index.ts:144](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L144)
 
 Builds the index from a collection of entries
 
@@ -328,7 +328,7 @@ Builds the index from a collection of entries
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`build`](../BaseIndex.md#build)
+[`BaseIndex`](BaseIndex.md).[`build`](BaseIndex.md#build)
 
 ***
 
@@ -338,7 +338,7 @@ Builds the index from a collection of entries
 clear(): void;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:154](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L154)
+Defined in: [packages/db/src/indexes/btree-index.ts:155](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L155)
 
 Clears all data from the index
 
@@ -348,7 +348,7 @@ Clears all data from the index
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`clear`](../BaseIndex.md#clear)
+[`BaseIndex`](BaseIndex.md).[`clear`](BaseIndex.md#clear)
 
 ***
 
@@ -358,7 +358,7 @@ Clears all data from the index
 equalityLookup(value): Set<TKey>;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:208](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L208)
+Defined in: [packages/db/src/indexes/btree-index.ts:209](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L209)
 
 Performs an equality lookup
 
@@ -374,7 +374,7 @@ Performs an equality lookup
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`equalityLookup`](../BaseIndex.md#equalitylookup)
+[`BaseIndex`](BaseIndex.md).[`equalityLookup`](BaseIndex.md#equalitylookup)
 
 ***
 
@@ -398,7 +398,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:182](https://github.com/TanSt
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`evaluateIndexExpression`](../BaseIndex.md#evaluateindexexpression)
+[`BaseIndex`](BaseIndex.md).[`evaluateIndexExpression`](BaseIndex.md#evaluateindexexpression)
 
 ***
 
@@ -412,11 +412,11 @@ Defined in: [packages/db/src/indexes/base-index.ts:169](https://github.com/TanSt
 
 #### Returns
 
-[`IndexStats`](../../interfaces/IndexStats.md)
+[`IndexStats`](../interfaces/IndexStats.md)
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`getStats`](../BaseIndex.md#getstats)
+[`BaseIndex`](BaseIndex.md).[`getStats`](BaseIndex.md#getstats)
 
 ***
 
@@ -426,7 +426,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:169](https://github.com/TanSt
 inArrayLookup(values): Set<TKey>;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:318](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L318)
+Defined in: [packages/db/src/indexes/btree-index.ts:322](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L322)
 
 Performs an IN array lookup
 
@@ -442,7 +442,7 @@ Performs an IN array lookup
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`inArrayLookup`](../BaseIndex.md#inarraylookup)
+[`BaseIndex`](BaseIndex.md).[`inArrayLookup`](BaseIndex.md#inarraylookup)
 
 ***
 
@@ -452,13 +452,13 @@ Performs an IN array lookup
 protected initialize(_options?): void;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:64](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L64)
+Defined in: [packages/db/src/indexes/btree-index.ts:65](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L65)
 
 #### Parameters
 
 ##### \_options?
 
-[`BTreeIndexOptions`](../../interfaces/BTreeIndexOptions.md)
+[`BTreeIndexOptions`](../interfaces/BTreeIndexOptions.md)
 
 #### Returns
 
@@ -466,7 +466,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:64](https://github.com/TanSt
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`initialize`](../BaseIndex.md#initialize)
+[`BaseIndex`](BaseIndex.md).[`initialize`](BaseIndex.md#initialize)
 
 ***
 
@@ -476,7 +476,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:64](https://github.com/TanSt
 lookup(operation, value): Set<TKey>;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:164](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L164)
+Defined in: [packages/db/src/indexes/btree-index.ts:165](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L165)
 
 Performs a lookup operation
 
@@ -496,7 +496,7 @@ Performs a lookup operation
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`lookup`](../BaseIndex.md#lookup)
+[`BaseIndex`](BaseIndex.md).[`lookup`](BaseIndex.md#lookup)
 
 ***
 
@@ -523,7 +523,7 @@ The direction is ignored because the index can be reversed if the direction is d
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`matchesCompareOptions`](../BaseIndex.md#matchescompareoptions)
+[`BaseIndex`](BaseIndex.md).[`matchesCompareOptions`](BaseIndex.md#matchescompareoptions)
 
 ***
 
@@ -541,7 +541,7 @@ Checks if the index matches the provided direction.
 
 ##### direction
 
-[`OrderByDirection`](../../@tanstack/namespaces/IR/type-aliases/OrderByDirection.md)
+[`OrderByDirection`](../@tanstack/namespaces/IR/type-aliases/OrderByDirection.md)
 
 #### Returns
 
@@ -549,7 +549,7 @@ Checks if the index matches the provided direction.
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`matchesDirection`](../BaseIndex.md#matchesdirection)
+[`BaseIndex`](BaseIndex.md).[`matchesDirection`](BaseIndex.md#matchesdirection)
 
 ***
 
@@ -573,7 +573,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:134](https://github.com/TanSt
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`matchesField`](../BaseIndex.md#matchesfield)
+[`BaseIndex`](BaseIndex.md).[`matchesField`](BaseIndex.md#matchesfield)
 
 ***
 
@@ -583,7 +583,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:134](https://github.com/TanSt
 rangeQuery(options): Set<TKey>;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:217](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L217)
+Defined in: [packages/db/src/indexes/btree-index.ts:218](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L218)
 
 Performs a range query with options
 This is more efficient for compound queries like "WHERE a > 5 AND a < 10"
@@ -592,7 +592,7 @@ This is more efficient for compound queries like "WHERE a > 5 AND a < 10"
 
 ##### options
 
-[`RangeQueryOptions`](../../interfaces/RangeQueryOptions.md) = `{}`
+[`RangeQueryOptions`](../interfaces/RangeQueryOptions.md) = `{}`
 
 #### Returns
 
@@ -600,7 +600,7 @@ This is more efficient for compound queries like "WHERE a > 5 AND a < 10"
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`rangeQuery`](../BaseIndex.md#rangequery)
+[`BaseIndex`](BaseIndex.md).[`rangeQuery`](BaseIndex.md#rangequery)
 
 ***
 
@@ -610,7 +610,7 @@ This is more efficient for compound queries like "WHERE a > 5 AND a < 10"
 rangeQueryReversed(options): Set<TKey>;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:250](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L250)
+Defined in: [packages/db/src/indexes/btree-index.ts:251](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L251)
 
 Performs a reversed range query
 
@@ -618,7 +618,7 @@ Performs a reversed range query
 
 ##### options
 
-[`RangeQueryOptions`](../../interfaces/RangeQueryOptions.md) = `{}`
+[`RangeQueryOptions`](../interfaces/RangeQueryOptions.md) = `{}`
 
 #### Returns
 
@@ -626,7 +626,7 @@ Performs a reversed range query
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`rangeQueryReversed`](../BaseIndex.md#rangequeryreversed)
+[`BaseIndex`](BaseIndex.md).[`rangeQueryReversed`](BaseIndex.md#rangequeryreversed)
 
 ***
 
@@ -636,7 +636,7 @@ Performs a reversed range query
 remove(key, item): void;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:100](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L100)
+Defined in: [packages/db/src/indexes/btree-index.ts:101](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L101)
 
 Removes a value from the index
 
@@ -656,7 +656,7 @@ Removes a value from the index
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`remove`](../BaseIndex.md#remove)
+[`BaseIndex`](BaseIndex.md).[`remove`](BaseIndex.md#remove)
 
 ***
 
@@ -680,7 +680,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:130](https://github.com/TanSt
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`supports`](../BaseIndex.md#supports)
+[`BaseIndex`](BaseIndex.md).[`supports`](BaseIndex.md#supports)
 
 ***
 
@@ -693,7 +693,7 @@ take(
    filterFn?): TKey[];
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:295](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L295)
+Defined in: [packages/db/src/indexes/btree-index.ts:299](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L299)
 
 Returns the next n items after the provided item or the first n items if no from item is provided.
 
@@ -723,7 +723,7 @@ The next n items after the provided key. Returns the first n items if no from it
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`take`](../BaseIndex.md#take)
+[`BaseIndex`](BaseIndex.md).[`take`](BaseIndex.md#take)
 
 ***
 
@@ -736,7 +736,7 @@ takeReversed(
    filterFn?): TKey[];
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:306](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L306)
+Defined in: [packages/db/src/indexes/btree-index.ts:310](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L310)
 
 Returns the next n items **before** the provided item (in descending order) or the last n items if no from item is provided.
 
@@ -766,7 +766,7 @@ The next n items **before** the provided key. Returns the last n items if no fro
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`takeReversed`](../BaseIndex.md#takereversed)
+[`BaseIndex`](BaseIndex.md).[`takeReversed`](BaseIndex.md#takereversed)
 
 ***
 
@@ -790,7 +790,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:187](https://github.com/TanSt
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`trackLookup`](../BaseIndex.md#tracklookup)
+[`BaseIndex`](BaseIndex.md).[`trackLookup`](BaseIndex.md#tracklookup)
 
 ***
 
@@ -803,7 +803,7 @@ update(
    newItem): void;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:135](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L135)
+Defined in: [packages/db/src/indexes/btree-index.ts:136](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L136)
 
 Updates a value in the index
 
@@ -827,7 +827,7 @@ Updates a value in the index
 
 #### Overrides
 
-[`BaseIndex`](../BaseIndex.md).[`update`](../BaseIndex.md#update)
+[`BaseIndex`](BaseIndex.md).[`update`](BaseIndex.md#update)
 
 ***
 
@@ -845,4 +845,4 @@ Defined in: [packages/db/src/indexes/base-index.ts:193](https://github.com/TanSt
 
 #### Inherited from
 
-[`BaseIndex`](../BaseIndex.md).[`updateTimestamp`](../BaseIndex.md#updatetimestamp)
+[`BaseIndex`](BaseIndex.md).[`updateTimestamp`](BaseIndex.md#updatetimestamp)
diff --git a/docs/reference/classes/BaseIndex.md b/docs/reference/classes/BaseIndex.md
index a1a6434c5..0327f8674 100644
--- a/docs/reference/classes/BaseIndex.md
+++ b/docs/reference/classes/BaseIndex.md
@@ -11,7 +11,7 @@ Base abstract class that all index types extend
 
 ## Extended by
 
-- [`BTreeIndex`](../BTreeIndex.md)
+- [`BTreeIndex`](BTreeIndex.md)
 
 ## Type Parameters
 
@@ -21,7 +21,7 @@ Base abstract class that all index types extend
 
 ## Implements
 
-- [`IndexInterface`](../../interfaces/IndexInterface.md)\<`TKey`\>
+- [`IndexInterface`](../interfaces/IndexInterface.md)\<`TKey`\>
 
 ## Constructors
 
@@ -45,7 +45,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:89](https://github.com/TanSta
 
 ##### expression
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
 
 ##### name?
 
@@ -157,7 +157,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:126](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`indexedKeysSet`](../../interfaces/IndexInterface.md#indexedkeysset)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`indexedKeysSet`](../interfaces/IndexInterface.md#indexedkeysset)
 
 ***
 
@@ -177,7 +177,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:119](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`keyCount`](../../interfaces/IndexInterface.md#keycount)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`keyCount`](../interfaces/IndexInterface.md#keycount)
 
 ***
 
@@ -197,7 +197,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:124](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`orderedEntriesArray`](../../interfaces/IndexInterface.md#orderedentriesarray)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`orderedEntriesArray`](../interfaces/IndexInterface.md#orderedentriesarray)
 
 ***
 
@@ -217,7 +217,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:125](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`orderedEntriesArrayReversed`](../../interfaces/IndexInterface.md#orderedentriesarrayreversed)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`orderedEntriesArrayReversed`](../interfaces/IndexInterface.md#orderedentriesarrayreversed)
 
 ***
 
@@ -237,7 +237,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:127](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`valueMapData`](../../interfaces/IndexInterface.md#valuemapdata)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`valueMapData`](../interfaces/IndexInterface.md#valuemapdata)
 
 ## Methods
 
@@ -265,7 +265,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:103](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`add`](../../interfaces/IndexInterface.md#add)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`add`](../interfaces/IndexInterface.md#add)
 
 ***
 
@@ -289,7 +289,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:106](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`build`](../../interfaces/IndexInterface.md#build)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`build`](../interfaces/IndexInterface.md#build)
 
 ***
 
@@ -307,7 +307,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:107](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`clear`](../../interfaces/IndexInterface.md#clear)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`clear`](../interfaces/IndexInterface.md#clear)
 
 ***
 
@@ -331,7 +331,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:120](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`equalityLookup`](../../interfaces/IndexInterface.md#equalitylookup)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`equalityLookup`](../interfaces/IndexInterface.md#equalitylookup)
 
 ***
 
@@ -365,11 +365,11 @@ Defined in: [packages/db/src/indexes/base-index.ts:169](https://github.com/TanSt
 
 #### Returns
 
-[`IndexStats`](../../interfaces/IndexStats.md)
+[`IndexStats`](../interfaces/IndexStats.md)
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`getStats`](../../interfaces/IndexInterface.md#getstats)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`getStats`](../interfaces/IndexInterface.md#getstats)
 
 ***
 
@@ -393,7 +393,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:121](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`inArrayLookup`](../../interfaces/IndexInterface.md#inarraylookup)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`inArrayLookup`](../interfaces/IndexInterface.md#inarraylookup)
 
 ***
 
@@ -441,7 +441,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:108](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`lookup`](../../interfaces/IndexInterface.md#lookup)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`lookup`](../interfaces/IndexInterface.md#lookup)
 
 ***
 
@@ -468,7 +468,7 @@ The direction is ignored because the index can be reversed if the direction is d
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`matchesCompareOptions`](../../interfaces/IndexInterface.md#matchescompareoptions)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`matchesCompareOptions`](../interfaces/IndexInterface.md#matchescompareoptions)
 
 ***
 
@@ -486,7 +486,7 @@ Checks if the index matches the provided direction.
 
 ##### direction
 
-[`OrderByDirection`](../../@tanstack/namespaces/IR/type-aliases/OrderByDirection.md)
+[`OrderByDirection`](../@tanstack/namespaces/IR/type-aliases/OrderByDirection.md)
 
 #### Returns
 
@@ -494,7 +494,7 @@ Checks if the index matches the provided direction.
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`matchesDirection`](../../interfaces/IndexInterface.md#matchesdirection)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`matchesDirection`](../interfaces/IndexInterface.md#matchesdirection)
 
 ***
 
@@ -518,7 +518,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:134](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`matchesField`](../../interfaces/IndexInterface.md#matchesfield)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`matchesField`](../interfaces/IndexInterface.md#matchesfield)
 
 ***
 
@@ -534,7 +534,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:122](https://github.com/TanSt
 
 ##### options
 
-[`RangeQueryOptions`](../../interfaces/RangeQueryOptions.md)
+[`RangeQueryOptions`](../interfaces/RangeQueryOptions.md)
 
 #### Returns
 
@@ -542,7 +542,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:122](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`rangeQuery`](../../interfaces/IndexInterface.md#rangequery)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`rangeQuery`](../interfaces/IndexInterface.md#rangequery)
 
 ***
 
@@ -558,7 +558,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:123](https://github.com/TanSt
 
 ##### options
 
-[`RangeQueryOptions`](../../interfaces/RangeQueryOptions.md)
+[`RangeQueryOptions`](../interfaces/RangeQueryOptions.md)
 
 #### Returns
 
@@ -566,7 +566,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:123](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`rangeQueryReversed`](../../interfaces/IndexInterface.md#rangequeryreversed)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`rangeQueryReversed`](../interfaces/IndexInterface.md#rangequeryreversed)
 
 ***
 
@@ -594,7 +594,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:104](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`remove`](../../interfaces/IndexInterface.md#remove)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`remove`](../interfaces/IndexInterface.md#remove)
 
 ***
 
@@ -618,7 +618,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:130](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`supports`](../../interfaces/IndexInterface.md#supports)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`supports`](../interfaces/IndexInterface.md#supports)
 
 ***
 
@@ -653,7 +653,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:109](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`take`](../../interfaces/IndexInterface.md#take)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`take`](../interfaces/IndexInterface.md#take)
 
 ***
 
@@ -688,7 +688,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:114](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`takeReversed`](../../interfaces/IndexInterface.md#takereversed)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`takeReversed`](../interfaces/IndexInterface.md#takereversed)
 
 ***
 
@@ -743,7 +743,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:105](https://github.com/TanSt
 
 #### Implementation of
 
-[`IndexInterface`](../../interfaces/IndexInterface.md).[`update`](../../interfaces/IndexInterface.md#update)
+[`IndexInterface`](../interfaces/IndexInterface.md).[`update`](../interfaces/IndexInterface.md#update)
 
 ***
 
diff --git a/docs/reference/classes/BaseQueryBuilder.md b/docs/reference/classes/BaseQueryBuilder.md
index 7789b52f1..57b094f15 100644
--- a/docs/reference/classes/BaseQueryBuilder.md
+++ b/docs/reference/classes/BaseQueryBuilder.md
@@ -11,7 +11,7 @@ Defined in: [packages/db/src/query/builder/index.ts:47](https://github.com/TanSt
 
 ### TContext
 
-`TContext` *extends* [`Context`](../../interfaces/Context.md) = [`Context`](../../interfaces/Context.md)
+`TContext` *extends* [`Context`](../interfaces/Context.md) = [`Context`](../interfaces/Context.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/query/builder/index.ts:50](https://github.com/TanSt
 
 ##### query
 
-`Partial`\<[`QueryIR`](../../@tanstack/namespaces/IR/interfaces/QueryIR.md)\> = `{}`
+`Partial`\<[`QueryIR`](../@tanstack/namespaces/IR/interfaces/QueryIR.md)\> = `{}`
 
 #### Returns
 
@@ -80,7 +80,7 @@ A function that receives an aggregated row and returns a boolean
 
 ###### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with functional having filter applied
 
@@ -119,7 +119,7 @@ A function that receives a row and returns the selected value
 
 ###### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`WithResult`\<`TContext`, `TFuncSelectResult`\>\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`WithResult`\<`TContext`, `TFuncSelectResult`\>\>
 
 A QueryBuilder with functional selection applied
 
@@ -154,7 +154,7 @@ A function that receives a row and returns a boolean
 
 ###### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with functional filtering applied
 
@@ -179,7 +179,7 @@ Defined in: [packages/db/src/query/builder/index.ts:784](https://github.com/TanS
 
 #### Returns
 
-[`QueryIR`](../../@tanstack/namespaces/IR/interfaces/QueryIR.md)
+[`QueryIR`](../@tanstack/namespaces/IR/interfaces/QueryIR.md)
 
 ***
 
@@ -196,7 +196,7 @@ Deduplicates rows based on the selected columns.
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with distinct enabled
 
@@ -224,7 +224,7 @@ Specify that the query should return a single result
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext` & [`SingleResult`](../../type-aliases/SingleResult.md)\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext` & [`SingleResult`](../type-aliases/SingleResult.md)\>
 
 A QueryBuilder that returns the first result
 
@@ -259,7 +259,7 @@ Specify the source table or subquery for the query
 
 ##### TSource
 
-`TSource` *extends* [`Source`](../../type-aliases/Source.md)
+`TSource` *extends* [`Source`](../type-aliases/Source.md)
 
 #### Parameters
 
@@ -271,7 +271,7 @@ An object with a single key-value pair where the key is the table alias and the
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<\{
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<\{
   `baseSchema`: `SchemaFromSource`\<`TSource`\>;
   `fromSourceName`: keyof `TSource` & `string`;
   `hasJoins`: `false`;
@@ -307,7 +307,7 @@ Perform a FULL JOIN with another table or subquery
 
 ##### TSource
 
-`TSource` *extends* [`Source`](../../type-aliases/Source.md)
+`TSource` *extends* [`Source`](../type-aliases/Source.md)
 
 #### Parameters
 
@@ -325,7 +325,7 @@ A function that receives table references and returns the join condition
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `"full"`\>\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `"full"`\>\>
 
 A QueryBuilder with the full joined table available
 
@@ -360,7 +360,7 @@ A function that receives table references and returns the field(s) to group by
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with grouping applied (enables aggregate functions in SELECT and HAVING)
 
@@ -409,7 +409,7 @@ A function that receives table references and returns an expression
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with the having condition applied
 
@@ -452,7 +452,7 @@ Perform an INNER JOIN with another table or subquery
 
 ##### TSource
 
-`TSource` *extends* [`Source`](../../type-aliases/Source.md)
+`TSource` *extends* [`Source`](../type-aliases/Source.md)
 
 #### Parameters
 
@@ -470,7 +470,7 @@ A function that receives table references and returns the join condition
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `"inner"`\>\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `"inner"`\>\>
 
 A QueryBuilder with the inner joined table available
 
@@ -502,7 +502,7 @@ Join another table or subquery to the current query
 
 ##### TSource
 
-`TSource` *extends* [`Source`](../../type-aliases/Source.md)
+`TSource` *extends* [`Source`](../type-aliases/Source.md)
 
 ##### TJoinType
 
@@ -530,7 +530,7 @@ The type of join: 'inner', 'left', 'right', or 'full' (defaults to 'left')
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `TJoinType`\>\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `TJoinType`\>\>
 
 A QueryBuilder with the joined table available
 
@@ -570,7 +570,7 @@ Perform a LEFT JOIN with another table or subquery
 
 ##### TSource
 
-`TSource` *extends* [`Source`](../../type-aliases/Source.md)
+`TSource` *extends* [`Source`](../type-aliases/Source.md)
 
 #### Parameters
 
@@ -588,7 +588,7 @@ A function that receives table references and returns the join condition
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `"left"`\>\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `"left"`\>\>
 
 A QueryBuilder with the left joined table available
 
@@ -624,7 +624,7 @@ Maximum number of rows to return
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with the limit applied
 
@@ -661,7 +661,7 @@ Number of rows to skip
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with the offset applied
 
@@ -698,11 +698,11 @@ A function that receives table references and returns the field to sort by
 
 ##### options
 
-[`OrderByDirection`](../../@tanstack/namespaces/IR/type-aliases/OrderByDirection.md) | `OrderByOptions`
+[`OrderByDirection`](../@tanstack/namespaces/IR/type-aliases/OrderByDirection.md) | `OrderByOptions`
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with the ordering applied
 
@@ -742,7 +742,7 @@ Perform a RIGHT JOIN with another table or subquery
 
 ##### TSource
 
-`TSource` *extends* [`Source`](../../type-aliases/Source.md)
+`TSource` *extends* [`Source`](../type-aliases/Source.md)
 
 #### Parameters
 
@@ -760,7 +760,7 @@ A function that receives table references and returns the join condition
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `"right"`\>\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`MergeContextWithJoinType`\<`TContext`, `SchemaFromSource`\<`TSource`\>, `"right"`\>\>
 
 A QueryBuilder with the right joined table available
 
@@ -801,7 +801,7 @@ A function that receives table references and returns an object with selected fi
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`WithResult`\<`TContext`, `ResultTypeFromSelect`\<`TSelectObject`\>\>\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`WithResult`\<`TContext`, `ResultTypeFromSelect`\<`TSelectObject`\>\>\>
 
 A QueryBuilder that returns only the selected fields
 
@@ -856,7 +856,7 @@ A function that receives table references and returns an expression
 
 #### Returns
 
-[`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+[`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 A QueryBuilder with the where condition applied
 
diff --git a/docs/reference/classes/CannotCombineEmptyExpressionListError.md b/docs/reference/classes/CannotCombineEmptyExpressionListError.md
index 93536c9f8..fd9b8767c 100644
--- a/docs/reference/classes/CannotCombineEmptyExpressionListError.md
+++ b/docs/reference/classes/CannotCombineEmptyExpressionListError.md
@@ -5,11 +5,11 @@ title: CannotCombineEmptyExpressionListError
 
 # Class: CannotCombineEmptyExpressionListError
 
-Defined in: [packages/db/src/errors.ts:635](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L635)
+Defined in: [packages/db/src/errors.ts:644](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L644)
 
 ## Extends
 
-- [`QueryOptimizerError`](../QueryOptimizerError.md)
+- [`QueryOptimizerError`](QueryOptimizerError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:635](https://github.com/TanStack/db/blob/
 new CannotCombineEmptyExpressionListError(): CannotCombineEmptyExpressionListError;
 ```
 
-Defined in: [packages/db/src/errors.ts:636](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L636)
+Defined in: [packages/db/src/errors.ts:645](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L645)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:636](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`constructor`](../QueryOptimizerError.md#constructor)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`constructor`](QueryOptimizerError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`cause`](../QueryOptimizerError.md#cause)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`cause`](QueryOptimizerError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`message`](../QueryOptimizerError.md#message)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`message`](QueryOptimizerError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`name`](../QueryOptimizerError.md#name)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`name`](QueryOptimizerError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`stack`](../QueryOptimizerError.md#stack)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`stack`](QueryOptimizerError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`stackTraceLimit`](../QueryOptimizerError.md#stacktracelimit)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`stackTraceLimit`](QueryOptimizerError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`captureStackTrace`](../QueryOptimizerError.md#capturestacktrace)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`captureStackTrace`](QueryOptimizerError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`prepareStackTrace`](../QueryOptimizerError.md#preparestacktrace)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`prepareStackTrace`](QueryOptimizerError.md#preparestacktrace)
diff --git a/docs/reference/classes/CollectionConfigurationError.md b/docs/reference/classes/CollectionConfigurationError.md
index 2a1d4274f..e71badeba 100644
--- a/docs/reference/classes/CollectionConfigurationError.md
+++ b/docs/reference/classes/CollectionConfigurationError.md
@@ -9,14 +9,14 @@ Defined in: [packages/db/src/errors.ts:71](https://github.com/TanStack/db/blob/m
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`CollectionRequiresConfigError`](../CollectionRequiresConfigError.md)
-- [`CollectionRequiresSyncConfigError`](../CollectionRequiresSyncConfigError.md)
-- [`InvalidSchemaError`](../InvalidSchemaError.md)
-- [`SchemaMustBeSynchronousError`](../SchemaMustBeSynchronousError.md)
+- [`CollectionRequiresConfigError`](CollectionRequiresConfigError.md)
+- [`CollectionRequiresSyncConfigError`](CollectionRequiresSyncConfigError.md)
+- [`InvalidSchemaError`](InvalidSchemaError.md)
+- [`SchemaMustBeSynchronousError`](SchemaMustBeSynchronousError.md)
 
 ## Constructors
 
@@ -40,7 +40,7 @@ Defined in: [packages/db/src/errors.ts:72](https://github.com/TanStack/db/blob/m
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -54,7 +54,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -68,7 +68,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -82,7 +82,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -96,7 +96,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -120,7 +120,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -192,7 +192,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -224,4 +224,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/CollectionImpl.md b/docs/reference/classes/CollectionImpl.md
index 3177f0e93..869656a40 100644
--- a/docs/reference/classes/CollectionImpl.md
+++ b/docs/reference/classes/CollectionImpl.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/collection/index.ts:266](https://github.com/TanStac
 
 ## Extended by
 
-- [`Collection`](../../interfaces/Collection.md)
+- [`Collection`](../interfaces/Collection.md)
 
 ## Type Parameters
 
@@ -23,7 +23,7 @@ Defined in: [packages/db/src/collection/index.ts:266](https://github.com/TanStac
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md) = \{
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md) = \{
 \}
 
 ### TSchema
@@ -50,7 +50,7 @@ Creates a new Collection instance
 
 ##### config
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<`TOutput`, `TKey`, `TSchema`\>
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<`TOutput`, `TKey`, `TSchema`\>
 
 Configuration object for the collection
 
@@ -132,11 +132,11 @@ Defined in: [packages/db/src/collection/index.ts:278](https://github.com/TanStac
 get compareOptions(): StringCollationConfig;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:579](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L579)
+Defined in: [packages/db/src/collection/index.ts:580](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L580)
 
 ##### Returns
 
-[`StringCollationConfig`](../../type-aliases/StringCollationConfig.md)
+[`StringCollationConfig`](../type-aliases/StringCollationConfig.md)
 
 ***
 
@@ -148,13 +148,13 @@ Defined in: [packages/db/src/collection/index.ts:579](https://github.com/TanStac
 get indexes(): Map<number, BaseIndex<TKey>>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:564](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L564)
+Defined in: [packages/db/src/collection/index.ts:565](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L565)
 
 Get resolved indexes for query optimization
 
 ##### Returns
 
-`Map`\<`number`, [`BaseIndex`](../BaseIndex.md)\<`TKey`\>\>
+`Map`\<`number`, [`BaseIndex`](BaseIndex.md)\<`TKey`\>\>
 
 ***
 
@@ -166,7 +166,7 @@ Get resolved indexes for query optimization
 get isLoadingSubset(): boolean;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:430](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L430)
+Defined in: [packages/db/src/collection/index.ts:431](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L431)
 
 Check if the collection is currently loading more data
 
@@ -186,7 +186,7 @@ true if the collection has pending load more operations, false otherwise
 get size(): number;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:467](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L467)
+Defined in: [packages/db/src/collection/index.ts:468](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L468)
 
 Get the current size of the collection (cached)
 
@@ -204,7 +204,7 @@ Get the current size of the collection (cached)
 get state(): Map<TKey, TOutput>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:756](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L756)
+Defined in: [packages/db/src/collection/index.ts:757](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L757)
 
 Gets the current state of the collection as a Map
 
@@ -240,13 +240,13 @@ Map containing all items in the collection, with keys as identifiers
 get status(): CollectionStatus;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:385](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L385)
+Defined in: [packages/db/src/collection/index.ts:386](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L386)
 
 Gets the current status of the collection
 
 ##### Returns
 
-[`CollectionStatus`](../../type-aliases/CollectionStatus.md)
+[`CollectionStatus`](../type-aliases/CollectionStatus.md)
 
 ***
 
@@ -258,7 +258,7 @@ Gets the current status of the collection
 get subscriberCount(): number;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:392](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L392)
+Defined in: [packages/db/src/collection/index.ts:393](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L393)
 
 Get the number of subscribers to the collection
 
@@ -276,7 +276,7 @@ Get the number of subscribers to the collection
 get toArray(): TOutput[];
 ```
 
-Defined in: [packages/db/src/collection/index.ts:785](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L785)
+Defined in: [packages/db/src/collection/index.ts:786](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L786)
 
 Gets the current state of the collection as an Array
 
@@ -294,7 +294,7 @@ An Array containing all items in the collection
 iterator: IterableIterator<[TKey, TOutput]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:495](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L495)
+Defined in: [packages/db/src/collection/index.ts:496](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L496)
 
 Get all entries (virtual derived state)
 
@@ -310,7 +310,7 @@ Get all entries (virtual derived state)
 cleanup(): Promise<void>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:919](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L919)
+Defined in: [packages/db/src/collection/index.ts:920](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L920)
 
 Clean up the collection by stopping sync and clearing data
 This can be called manually or automatically by garbage collection
@@ -327,7 +327,7 @@ This can be called manually or automatically by garbage collection
 createIndex<TResolver>(indexCallback, config): IndexProxy<TKey>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:554](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L554)
+Defined in: [packages/db/src/collection/index.ts:555](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L555)
 
 Creates an index on a collection for faster queries.
 Indexes significantly improve query performance by allowing constant time lookups
@@ -337,7 +337,7 @@ and logarithmic time range queries instead of full scans.
 
 ##### TResolver
 
-`TResolver` *extends* [`IndexResolver`](../../type-aliases/IndexResolver.md)\<`TKey`\> = *typeof* [`BTreeIndex`](../BTreeIndex.md)
+`TResolver` *extends* [`IndexResolver`](../type-aliases/IndexResolver.md)\<`TKey`\> = *typeof* [`BTreeIndex`](BTreeIndex.md)
 
 The type of the index resolver (constructor or async loader)
 
@@ -351,13 +351,13 @@ Function that extracts the indexed value from each item
 
 ##### config
 
-[`IndexOptions`](../../interfaces/IndexOptions.md)\<`TResolver`\> = `{}`
+[`IndexOptions`](../interfaces/IndexOptions.md)\<`TResolver`\> = `{}`
 
 Configuration including index type and type-specific options
 
 #### Returns
 
-[`IndexProxy`](../IndexProxy.md)\<`TKey`\>
+[`IndexProxy`](IndexProxy.md)\<`TKey`\>
 
 An index proxy that provides access to the index when ready
 
@@ -397,7 +397,7 @@ currentStateAsChanges(options):
   | ChangeMessage<TOutput, string | number>[];
 ```
 
-Defined in: [packages/db/src/collection/index.ts:823](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L823)
+Defined in: [packages/db/src/collection/index.ts:824](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L824)
 
 Returns the current state of the collection as an array of changes
 
@@ -405,14 +405,14 @@ Returns the current state of the collection as an array of changes
 
 ##### options
 
-[`CurrentStateAsChangesOptions`](../../interfaces/CurrentStateAsChangesOptions.md) = `{}`
+[`CurrentStateAsChangesOptions`](../interfaces/CurrentStateAsChangesOptions.md) = `{}`
 
 Options including optional where filter
 
 #### Returns
 
   \| `void`
-  \| [`ChangeMessage`](../../interfaces/ChangeMessage.md)\<`TOutput`, `string` \| `number`\>[]
+  \| [`ChangeMessage`](../interfaces/ChangeMessage.md)\<`TOutput`, `string` \| `number`\>[]
 
 An array of changes
 
@@ -441,7 +441,7 @@ const activeChanges = collection.currentStateAsChanges({
 delete(keys, config?): Transaction<any>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:733](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L733)
+Defined in: [packages/db/src/collection/index.ts:734](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L734)
 
 Deletes one or more items from the collection
 
@@ -455,13 +455,13 @@ Single key or array of keys to delete
 
 ##### config?
 
-[`OperationConfig`](../../interfaces/OperationConfig.md)
+[`OperationConfig`](../interfaces/OperationConfig.md)
 
 Optional configuration including metadata
 
 #### Returns
 
-[`Transaction`](../../interfaces/Transaction.md)\<`any`\>
+[`Transaction`](../interfaces/Transaction.md)\<`any`\>
 
 A Transaction object representing the delete operation(s)
 
@@ -504,7 +504,7 @@ try {
 entries(): IterableIterator<[TKey, TOutput]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:488](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L488)
+Defined in: [packages/db/src/collection/index.ts:489](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L489)
 
 Get all entries (virtual derived state)
 
@@ -520,7 +520,7 @@ Get all entries (virtual derived state)
 forEach(callbackfn): void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:502](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L502)
+Defined in: [packages/db/src/collection/index.ts:503](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L503)
 
 Execute a callback for each entry in the collection
 
@@ -542,7 +542,7 @@ Execute a callback for each entry in the collection
 get(key): TOutput | undefined;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:453](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L453)
+Defined in: [packages/db/src/collection/index.ts:454](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L454)
 
 Get the current value for a key (virtual derived state)
 
@@ -564,7 +564,7 @@ Get the current value for a key (virtual derived state)
 getKeyFromItem(item): TKey;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:517](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L517)
+Defined in: [packages/db/src/collection/index.ts:518](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L518)
 
 #### Parameters
 
@@ -584,7 +584,7 @@ Defined in: [packages/db/src/collection/index.ts:517](https://github.com/TanStac
 has(key): boolean;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:460](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L460)
+Defined in: [packages/db/src/collection/index.ts:461](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L461)
 
 Check if a key exists in the collection (virtual derived state)
 
@@ -608,7 +608,7 @@ insert(data, config?):
 | Transaction<TOutput>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:620](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L620)
+Defined in: [packages/db/src/collection/index.ts:621](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L621)
 
 Inserts one or more items into the collection
 
@@ -620,14 +620,14 @@ Inserts one or more items into the collection
 
 ##### config?
 
-[`InsertConfig`](../../interfaces/InsertConfig.md)
+[`InsertConfig`](../interfaces/InsertConfig.md)
 
 Optional configuration including metadata
 
 #### Returns
 
-  \| [`Transaction`](../../interfaces/Transaction.md)\<`Record`\<`string`, `unknown`\>\>
-  \| [`Transaction`](../../interfaces/Transaction.md)\<`TOutput`\>
+  \| [`Transaction`](../interfaces/Transaction.md)\<`Record`\<`string`, `unknown`\>\>
+  \| [`Transaction`](../interfaces/Transaction.md)\<`TOutput`\>
 
 A Transaction object representing the insert operation(s)
 
@@ -679,7 +679,7 @@ try {
 isReady(): boolean;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:422](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L422)
+Defined in: [packages/db/src/collection/index.ts:423](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L423)
 
 Check if the collection is ready for use
 Returns true if the collection has been marked as ready by its sync implementation
@@ -709,7 +709,7 @@ if (collection.isReady()) {
 keys(): IterableIterator<TKey>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:474](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L474)
+Defined in: [packages/db/src/collection/index.ts:475](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L475)
 
 Get all keys (virtual derived state)
 
@@ -725,7 +725,7 @@ Get all keys (virtual derived state)
 map<U>(callbackfn): U[];
 ```
 
-Defined in: [packages/db/src/collection/index.ts:511](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L511)
+Defined in: [packages/db/src/collection/index.ts:512](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L512)
 
 Create a new array with the results of calling a function for each entry in the collection
 
@@ -753,7 +753,7 @@ Create a new array with the results of calling a function for each entry in the
 off<T>(event, callback): void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:898](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L898)
+Defined in: [packages/db/src/collection/index.ts:899](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L899)
 
 Unsubscribe from a collection event
 
@@ -770,6 +770,7 @@ Unsubscribe from a collection event
   \| `"status:change"`
   \| `"subscribers:change"`
   \| `"loadingSubset:change"`
+  \| `"truncate"`
 
 #### Parameters
 
@@ -793,7 +794,7 @@ Unsubscribe from a collection event
 on<T>(event, callback): () => void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:878](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L878)
+Defined in: [packages/db/src/collection/index.ts:879](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L879)
 
 Subscribe to a collection event
 
@@ -810,6 +811,7 @@ Subscribe to a collection event
   \| `"status:change"`
   \| `"subscribers:change"`
   \| `"loadingSubset:change"`
+  \| `"truncate"`
 
 #### Parameters
 
@@ -839,7 +841,7 @@ Subscribe to a collection event
 once<T>(event, callback): () => void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:888](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L888)
+Defined in: [packages/db/src/collection/index.ts:889](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L889)
 
 Subscribe to a collection event once
 
@@ -856,6 +858,7 @@ Subscribe to a collection event once
   \| `"status:change"`
   \| `"subscribers:change"`
   \| `"loadingSubset:change"`
+  \| `"truncate"`
 
 #### Parameters
 
@@ -885,7 +888,7 @@ Subscribe to a collection event once
 onFirstReady(callback): void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:406](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L406)
+Defined in: [packages/db/src/collection/index.ts:407](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L407)
 
 Register a callback to be executed when the collection first becomes ready
 Useful for preloading collections
@@ -919,7 +922,7 @@ collection.onFirstReady(() => {
 preload(): Promise<void>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:446](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L446)
+Defined in: [packages/db/src/collection/index.ts:447](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L447)
 
 Preload the collection data by starting sync if not already started
 Multiple concurrent calls will share the same promise
@@ -936,7 +939,7 @@ Multiple concurrent calls will share the same promise
 startSyncImmediate(): void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:438](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L438)
+Defined in: [packages/db/src/collection/index.ts:439](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L439)
 
 Start sync immediately - internal method for compiled queries
 This bypasses lazy loading for special cases like live query results
@@ -953,7 +956,7 @@ This bypasses lazy loading for special cases like live query results
 stateWhenReady(): Promise<Map<TKey, TOutput>>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:770](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L770)
+Defined in: [packages/db/src/collection/index.ts:771](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L771)
 
 Gets the current state of the collection as a Map, but only resolves when data is available
 Waits for the first sync commit to complete before resolving
@@ -972,7 +975,7 @@ Promise that resolves to a Map containing all items in the collection
 subscribeChanges(callback, options): CollectionSubscription;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:868](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L868)
+Defined in: [packages/db/src/collection/index.ts:869](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L869)
 
 Subscribe to changes in the collection
 
@@ -986,7 +989,7 @@ Function called when items change
 
 ##### options
 
-[`SubscribeChangesOptions`](../../interfaces/SubscribeChangesOptions.md) = `{}`
+[`SubscribeChangesOptions`](../interfaces/SubscribeChangesOptions.md) = `{}`
 
 Subscription options including includeInitialState and where filter
 
@@ -1044,7 +1047,7 @@ const subscription = collection.subscribeChanges((changes) => {
 toArrayWhenReady(): Promise<TOutput[]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:795](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L795)
+Defined in: [packages/db/src/collection/index.ts:796](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L796)
 
 Gets the current state of the collection as an Array, but only resolves when data is available
 Waits for the first sync commit to complete before resolving
@@ -1065,7 +1068,7 @@ Promise that resolves to an Array containing all items in the collection
 update(key, callback): Transaction;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:665](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L665)
+Defined in: [packages/db/src/collection/index.ts:666](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L666)
 
 Updates one or more items in the collection using a callback function
 
@@ -1081,7 +1084,7 @@ Updates one or more items in the collection using a callback function
 
 ##### Returns
 
-[`Transaction`](../../interfaces/Transaction.md)
+[`Transaction`](../interfaces/Transaction.md)
 
 A Transaction object representing the update operation(s)
 
@@ -1136,7 +1139,7 @@ update(
    callback): Transaction;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:671](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L671)
+Defined in: [packages/db/src/collection/index.ts:672](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L672)
 
 Updates one or more items in the collection using a callback function
 
@@ -1150,7 +1153,7 @@ Single key or array of keys to update
 
 ###### config
 
-[`OperationConfig`](../../interfaces/OperationConfig.md)
+[`OperationConfig`](../interfaces/OperationConfig.md)
 
 ###### callback
 
@@ -1158,7 +1161,7 @@ Single key or array of keys to update
 
 ##### Returns
 
-[`Transaction`](../../interfaces/Transaction.md)
+[`Transaction`](../interfaces/Transaction.md)
 
 A Transaction object representing the update operation(s)
 
@@ -1210,7 +1213,7 @@ try {
 update(id, callback): Transaction;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:678](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L678)
+Defined in: [packages/db/src/collection/index.ts:679](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L679)
 
 Updates one or more items in the collection using a callback function
 
@@ -1226,7 +1229,7 @@ Updates one or more items in the collection using a callback function
 
 ##### Returns
 
-[`Transaction`](../../interfaces/Transaction.md)
+[`Transaction`](../interfaces/Transaction.md)
 
 A Transaction object representing the update operation(s)
 
@@ -1281,7 +1284,7 @@ update(
    callback): Transaction;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:684](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L684)
+Defined in: [packages/db/src/collection/index.ts:685](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L685)
 
 Updates one or more items in the collection using a callback function
 
@@ -1293,7 +1296,7 @@ Updates one or more items in the collection using a callback function
 
 ###### config
 
-[`OperationConfig`](../../interfaces/OperationConfig.md)
+[`OperationConfig`](../interfaces/OperationConfig.md)
 
 ###### callback
 
@@ -1301,7 +1304,7 @@ Updates one or more items in the collection using a callback function
 
 ##### Returns
 
-[`Transaction`](../../interfaces/Transaction.md)
+[`Transaction`](../interfaces/Transaction.md)
 
 A Transaction object representing the update operation(s)
 
@@ -1358,7 +1361,7 @@ validateData(
    key?): TOutput;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:571](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L571)
+Defined in: [packages/db/src/collection/index.ts:572](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L572)
 
 Validates the data against the schema
 
@@ -1388,7 +1391,7 @@ Validates the data against the schema
 values(): IterableIterator<TOutput>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:481](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L481)
+Defined in: [packages/db/src/collection/index.ts:482](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L482)
 
 Get all values (virtual derived state)
 
@@ -1404,7 +1407,7 @@ Get all values (virtual derived state)
 waitFor<T>(event, timeout?): Promise<AllCollectionEvents[T]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:908](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L908)
+Defined in: [packages/db/src/collection/index.ts:909](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L909)
 
 Wait for a collection event
 
@@ -1421,6 +1424,7 @@ Wait for a collection event
   \| `"status:change"`
   \| `"subscribers:change"`
   \| `"loadingSubset:change"`
+  \| `"truncate"`
 
 #### Parameters
 
diff --git a/docs/reference/classes/CollectionInErrorStateError.md b/docs/reference/classes/CollectionInErrorStateError.md
index 6a0da4bd1..8c83cc03a 100644
--- a/docs/reference/classes/CollectionInErrorStateError.md
+++ b/docs/reference/classes/CollectionInErrorStateError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:110](https://github.com/TanStack/db/blob/
 
 ## Extends
 
-- [`CollectionStateError`](../CollectionStateError.md)
+- [`CollectionStateError`](CollectionStateError.md)
 
 ## Constructors
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/errors.ts:111](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionStateError`](../CollectionStateError.md).[`constructor`](../CollectionStateError.md#constructor)
+[`CollectionStateError`](CollectionStateError.md).[`constructor`](CollectionStateError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`cause`](../CollectionStateError.md#cause)
+[`CollectionStateError`](CollectionStateError.md).[`cause`](CollectionStateError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`message`](../CollectionStateError.md#message)
+[`CollectionStateError`](CollectionStateError.md).[`message`](CollectionStateError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`name`](../CollectionStateError.md#name)
+[`CollectionStateError`](CollectionStateError.md).[`name`](CollectionStateError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`stack`](../CollectionStateError.md#stack)
+[`CollectionStateError`](CollectionStateError.md).[`stack`](CollectionStateError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`stackTraceLimit`](../CollectionStateError.md#stacktracelimit)
+[`CollectionStateError`](CollectionStateError.md).[`stackTraceLimit`](CollectionStateError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`captureStackTrace`](../CollectionStateError.md#capturestacktrace)
+[`CollectionStateError`](CollectionStateError.md).[`captureStackTrace`](CollectionStateError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`prepareStackTrace`](../CollectionStateError.md#preparestacktrace)
+[`CollectionStateError`](CollectionStateError.md).[`prepareStackTrace`](CollectionStateError.md#preparestacktrace)
diff --git a/docs/reference/classes/CollectionInputNotFoundError.md b/docs/reference/classes/CollectionInputNotFoundError.md
index 53b6f6970..94a99e04f 100644
--- a/docs/reference/classes/CollectionInputNotFoundError.md
+++ b/docs/reference/classes/CollectionInputNotFoundError.md
@@ -5,14 +5,14 @@ title: CollectionInputNotFoundError
 
 # Class: CollectionInputNotFoundError
 
-Defined in: [packages/db/src/errors.ts:416](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L416)
+Defined in: [packages/db/src/errors.ts:425](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L425)
 
 Error thrown when a collection input stream is not found during query compilation.
 In self-joins, each alias (e.g., 'employee', 'manager') requires its own input stream.
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -25,7 +25,7 @@ new CollectionInputNotFoundError(
    availableKeys?): CollectionInputNotFoundError;
 ```
 
-Defined in: [packages/db/src/errors.ts:417](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L417)
+Defined in: [packages/db/src/errors.ts:426](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L426)
 
 #### Parameters
 
@@ -47,7 +47,7 @@ Defined in: [packages/db/src/errors.ts:417](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -103,7 +103,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -127,7 +127,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -199,7 +199,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -231,4 +231,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/CollectionIsInErrorStateError.md b/docs/reference/classes/CollectionIsInErrorStateError.md
index a116584a7..86a1813a2 100644
--- a/docs/reference/classes/CollectionIsInErrorStateError.md
+++ b/docs/reference/classes/CollectionIsInErrorStateError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:126](https://github.com/TanStack/db/blob/
 
 ## Extends
 
-- [`CollectionStateError`](../CollectionStateError.md)
+- [`CollectionStateError`](CollectionStateError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:127](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionStateError`](../CollectionStateError.md).[`constructor`](../CollectionStateError.md#constructor)
+[`CollectionStateError`](CollectionStateError.md).[`constructor`](CollectionStateError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`cause`](../CollectionStateError.md#cause)
+[`CollectionStateError`](CollectionStateError.md).[`cause`](CollectionStateError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`message`](../CollectionStateError.md#message)
+[`CollectionStateError`](CollectionStateError.md).[`message`](CollectionStateError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`name`](../CollectionStateError.md#name)
+[`CollectionStateError`](CollectionStateError.md).[`name`](CollectionStateError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`stack`](../CollectionStateError.md#stack)
+[`CollectionStateError`](CollectionStateError.md).[`stack`](CollectionStateError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`stackTraceLimit`](../CollectionStateError.md#stacktracelimit)
+[`CollectionStateError`](CollectionStateError.md).[`stackTraceLimit`](CollectionStateError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`captureStackTrace`](../CollectionStateError.md#capturestacktrace)
+[`CollectionStateError`](CollectionStateError.md).[`captureStackTrace`](CollectionStateError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`prepareStackTrace`](../CollectionStateError.md#preparestacktrace)
+[`CollectionStateError`](CollectionStateError.md).[`prepareStackTrace`](CollectionStateError.md#preparestacktrace)
diff --git a/docs/reference/classes/CollectionOperationError.md b/docs/reference/classes/CollectionOperationError.md
index e9ce186b1..f090d7b44 100644
--- a/docs/reference/classes/CollectionOperationError.md
+++ b/docs/reference/classes/CollectionOperationError.md
@@ -9,19 +9,20 @@ Defined in: [packages/db/src/errors.ts:139](https://github.com/TanStack/db/blob/
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`UndefinedKeyError`](../UndefinedKeyError.md)
-- [`DuplicateKeyError`](../DuplicateKeyError.md)
-- [`DuplicateKeySyncError`](../DuplicateKeySyncError.md)
-- [`MissingUpdateArgumentError`](../MissingUpdateArgumentError.md)
-- [`NoKeysPassedToUpdateError`](../NoKeysPassedToUpdateError.md)
-- [`UpdateKeyNotFoundError`](../UpdateKeyNotFoundError.md)
-- [`KeyUpdateNotAllowedError`](../KeyUpdateNotAllowedError.md)
-- [`NoKeysPassedToDeleteError`](../NoKeysPassedToDeleteError.md)
-- [`DeleteKeyNotFoundError`](../DeleteKeyNotFoundError.md)
+- [`UndefinedKeyError`](UndefinedKeyError.md)
+- [`InvalidKeyError`](InvalidKeyError.md)
+- [`DuplicateKeyError`](DuplicateKeyError.md)
+- [`DuplicateKeySyncError`](DuplicateKeySyncError.md)
+- [`MissingUpdateArgumentError`](MissingUpdateArgumentError.md)
+- [`NoKeysPassedToUpdateError`](NoKeysPassedToUpdateError.md)
+- [`UpdateKeyNotFoundError`](UpdateKeyNotFoundError.md)
+- [`KeyUpdateNotAllowedError`](KeyUpdateNotAllowedError.md)
+- [`NoKeysPassedToDeleteError`](NoKeysPassedToDeleteError.md)
+- [`DeleteKeyNotFoundError`](DeleteKeyNotFoundError.md)
 
 ## Constructors
 
@@ -45,7 +46,7 @@ Defined in: [packages/db/src/errors.ts:140](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -59,7 +60,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -73,7 +74,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -87,7 +88,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -101,7 +102,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -125,7 +126,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -197,7 +198,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -229,4 +230,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/CollectionRequiresConfigError.md b/docs/reference/classes/CollectionRequiresConfigError.md
index 86db7e06d..6e1ac161f 100644
--- a/docs/reference/classes/CollectionRequiresConfigError.md
+++ b/docs/reference/classes/CollectionRequiresConfigError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:78](https://github.com/TanStack/db/blob/m
 
 ## Extends
 
-- [`CollectionConfigurationError`](../CollectionConfigurationError.md)
+- [`CollectionConfigurationError`](CollectionConfigurationError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:79](https://github.com/TanStack/db/blob/m
 
 #### Overrides
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`constructor`](../CollectionConfigurationError.md#constructor)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`constructor`](CollectionConfigurationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`cause`](../CollectionConfigurationError.md#cause)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`cause`](CollectionConfigurationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`message`](../CollectionConfigurationError.md#message)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`message`](CollectionConfigurationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`name`](../CollectionConfigurationError.md#name)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`name`](CollectionConfigurationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`stack`](../CollectionConfigurationError.md#stack)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`stack`](CollectionConfigurationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`stackTraceLimit`](../CollectionConfigurationError.md#stacktracelimit)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`stackTraceLimit`](CollectionConfigurationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`captureStackTrace`](../CollectionConfigurationError.md#capturestacktrace)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`captureStackTrace`](CollectionConfigurationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`prepareStackTrace`](../CollectionConfigurationError.md#preparestacktrace)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`prepareStackTrace`](CollectionConfigurationError.md#preparestacktrace)
diff --git a/docs/reference/classes/CollectionRequiresSyncConfigError.md b/docs/reference/classes/CollectionRequiresSyncConfigError.md
index 8a2a57092..99e4d12ce 100644
--- a/docs/reference/classes/CollectionRequiresSyncConfigError.md
+++ b/docs/reference/classes/CollectionRequiresSyncConfigError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:84](https://github.com/TanStack/db/blob/m
 
 ## Extends
 
-- [`CollectionConfigurationError`](../CollectionConfigurationError.md)
+- [`CollectionConfigurationError`](CollectionConfigurationError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:85](https://github.com/TanStack/db/blob/m
 
 #### Overrides
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`constructor`](../CollectionConfigurationError.md#constructor)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`constructor`](CollectionConfigurationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`cause`](../CollectionConfigurationError.md#cause)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`cause`](CollectionConfigurationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`message`](../CollectionConfigurationError.md#message)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`message`](CollectionConfigurationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`name`](../CollectionConfigurationError.md#name)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`name`](CollectionConfigurationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`stack`](../CollectionConfigurationError.md#stack)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`stack`](CollectionConfigurationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`stackTraceLimit`](../CollectionConfigurationError.md#stacktracelimit)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`stackTraceLimit`](CollectionConfigurationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`captureStackTrace`](../CollectionConfigurationError.md#capturestacktrace)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`captureStackTrace`](CollectionConfigurationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`prepareStackTrace`](../CollectionConfigurationError.md#preparestacktrace)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`prepareStackTrace`](CollectionConfigurationError.md#preparestacktrace)
diff --git a/docs/reference/classes/CollectionStateError.md b/docs/reference/classes/CollectionStateError.md
index 891c5b4db..5848428b0 100644
--- a/docs/reference/classes/CollectionStateError.md
+++ b/docs/reference/classes/CollectionStateError.md
@@ -9,14 +9,14 @@ Defined in: [packages/db/src/errors.ts:103](https://github.com/TanStack/db/blob/
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`CollectionInErrorStateError`](../CollectionInErrorStateError.md)
-- [`InvalidCollectionStatusTransitionError`](../InvalidCollectionStatusTransitionError.md)
-- [`CollectionIsInErrorStateError`](../CollectionIsInErrorStateError.md)
-- [`NegativeActiveSubscribersError`](../NegativeActiveSubscribersError.md)
+- [`CollectionInErrorStateError`](CollectionInErrorStateError.md)
+- [`InvalidCollectionStatusTransitionError`](InvalidCollectionStatusTransitionError.md)
+- [`CollectionIsInErrorStateError`](CollectionIsInErrorStateError.md)
+- [`NegativeActiveSubscribersError`](NegativeActiveSubscribersError.md)
 
 ## Constructors
 
@@ -40,7 +40,7 @@ Defined in: [packages/db/src/errors.ts:104](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -54,7 +54,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -68,7 +68,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -82,7 +82,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -96,7 +96,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -120,7 +120,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -192,7 +192,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -224,4 +224,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/DeduplicatedLoadSubset.md b/docs/reference/classes/DeduplicatedLoadSubset.md
index 946c4097b..490a8435e 100644
--- a/docs/reference/classes/DeduplicatedLoadSubset.md
+++ b/docs/reference/classes/DeduplicatedLoadSubset.md
@@ -88,7 +88,7 @@ losing its `this` context (e.g., `loadSubset: dedupe.loadSubset` in a sync confi
 
 ##### options
 
-[`LoadSubsetOptions`](../../type-aliases/LoadSubsetOptions.md)
+[`LoadSubsetOptions`](../type-aliases/LoadSubsetOptions.md)
 
 The predicate options (where, orderBy, limit)
 
diff --git a/docs/reference/classes/DeleteKeyNotFoundError.md b/docs/reference/classes/DeleteKeyNotFoundError.md
index bf70f44da..553724a2a 100644
--- a/docs/reference/classes/DeleteKeyNotFoundError.md
+++ b/docs/reference/classes/DeleteKeyNotFoundError.md
@@ -5,11 +5,11 @@ title: DeleteKeyNotFoundError
 
 # Class: DeleteKeyNotFoundError
 
-Defined in: [packages/db/src/errors.ts:220](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L220)
+Defined in: [packages/db/src/errors.ts:229](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L229)
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:220](https://github.com/TanStack/db/blob/
 new DeleteKeyNotFoundError(key): DeleteKeyNotFoundError;
 ```
 
-Defined in: [packages/db/src/errors.ts:221](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L221)
+Defined in: [packages/db/src/errors.ts:230](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L230)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:221](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/DistinctRequiresSelectError.md b/docs/reference/classes/DistinctRequiresSelectError.md
index 135d46e71..bbaaef4c3 100644
--- a/docs/reference/classes/DistinctRequiresSelectError.md
+++ b/docs/reference/classes/DistinctRequiresSelectError.md
@@ -5,11 +5,11 @@ title: DistinctRequiresSelectError
 
 # Class: DistinctRequiresSelectError
 
-Defined in: [packages/db/src/errors.ts:392](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L392)
+Defined in: [packages/db/src/errors.ts:401](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L401)
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:392](https://github.com/TanStack/db/blob/
 new DistinctRequiresSelectError(): DistinctRequiresSelectError;
 ```
 
-Defined in: [packages/db/src/errors.ts:393](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L393)
+Defined in: [packages/db/src/errors.ts:402](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L402)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:393](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/DuplicateAliasInSubqueryError.md b/docs/reference/classes/DuplicateAliasInSubqueryError.md
index 5cc24785a..74e7a2e2a 100644
--- a/docs/reference/classes/DuplicateAliasInSubqueryError.md
+++ b/docs/reference/classes/DuplicateAliasInSubqueryError.md
@@ -5,7 +5,7 @@ title: DuplicateAliasInSubqueryError
 
 # Class: DuplicateAliasInSubqueryError
 
-Defined in: [packages/db/src/errors.ts:437](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L437)
+Defined in: [packages/db/src/errors.ts:446](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L446)
 
 Error thrown when a subquery uses the same alias as its parent query.
 This causes issues because parent and subquery would share the same input streams,
@@ -13,7 +13,7 @@ leading to empty results or incorrect data (aggregation cross-leaking).
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -23,7 +23,7 @@ leading to empty results or incorrect data (aggregation cross-leaking).
 new DuplicateAliasInSubqueryError(alias, parentAliases): DuplicateAliasInSubqueryError;
 ```
 
-Defined in: [packages/db/src/errors.ts:438](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L438)
+Defined in: [packages/db/src/errors.ts:447](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L447)
 
 #### Parameters
 
@@ -41,7 +41,7 @@ Defined in: [packages/db/src/errors.ts:438](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -97,7 +97,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -121,7 +121,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -193,7 +193,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -225,4 +225,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/DuplicateDbInstanceError.md b/docs/reference/classes/DuplicateDbInstanceError.md
index 2d292ae10..2251277f2 100644
--- a/docs/reference/classes/DuplicateDbInstanceError.md
+++ b/docs/reference/classes/DuplicateDbInstanceError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:45](https://github.com/TanStack/db/blob/m
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:46](https://github.com/TanStack/db/blob/m
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/DuplicateKeyError.md b/docs/reference/classes/DuplicateKeyError.md
index 35d674b3f..fb6e0ba18 100644
--- a/docs/reference/classes/DuplicateKeyError.md
+++ b/docs/reference/classes/DuplicateKeyError.md
@@ -5,11 +5,11 @@ title: DuplicateKeyError
 
 # Class: DuplicateKeyError
 
-Defined in: [packages/db/src/errors.ts:154](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L154)
+Defined in: [packages/db/src/errors.ts:163](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L163)
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:154](https://github.com/TanStack/db/blob/
 new DuplicateKeyError(key): DuplicateKeyError;
 ```
 
-Defined in: [packages/db/src/errors.ts:155](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L155)
+Defined in: [packages/db/src/errors.ts:164](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L164)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:155](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/DuplicateKeySyncError.md b/docs/reference/classes/DuplicateKeySyncError.md
index 42a98eb28..3ba64d64d 100644
--- a/docs/reference/classes/DuplicateKeySyncError.md
+++ b/docs/reference/classes/DuplicateKeySyncError.md
@@ -5,11 +5,11 @@ title: DuplicateKeySyncError
 
 # Class: DuplicateKeySyncError
 
-Defined in: [packages/db/src/errors.ts:162](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L162)
+Defined in: [packages/db/src/errors.ts:171](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L171)
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -22,7 +22,7 @@ new DuplicateKeySyncError(
    options?): DuplicateKeySyncError;
 ```
 
-Defined in: [packages/db/src/errors.ts:163](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L163)
+Defined in: [packages/db/src/errors.ts:172](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L172)
 
 #### Parameters
 
@@ -50,7 +50,7 @@ Defined in: [packages/db/src/errors.ts:163](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -64,7 +64,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -78,7 +78,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -92,7 +92,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -106,7 +106,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -130,7 +130,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -202,7 +202,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -234,4 +234,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/EmptyReferencePathError.md b/docs/reference/classes/EmptyReferencePathError.md
index 6fbfb6121..160890023 100644
--- a/docs/reference/classes/EmptyReferencePathError.md
+++ b/docs/reference/classes/EmptyReferencePathError.md
@@ -5,11 +5,11 @@ title: EmptyReferencePathError
 
 # Class: EmptyReferencePathError
 
-Defined in: [packages/db/src/errors.ts:460](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L460)
+Defined in: [packages/db/src/errors.ts:469](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L469)
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:460](https://github.com/TanStack/db/blob/
 new EmptyReferencePathError(): EmptyReferencePathError;
 ```
 
-Defined in: [packages/db/src/errors.ts:461](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L461)
+Defined in: [packages/db/src/errors.ts:470](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L470)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:461](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/GroupByError.md b/docs/reference/classes/GroupByError.md
index 6656def56..70a57f415 100644
--- a/docs/reference/classes/GroupByError.md
+++ b/docs/reference/classes/GroupByError.md
@@ -5,18 +5,18 @@ title: GroupByError
 
 # Class: GroupByError
 
-Defined in: [packages/db/src/errors.ts:535](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L535)
+Defined in: [packages/db/src/errors.ts:544](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L544)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`NonAggregateExpressionNotInGroupByError`](../NonAggregateExpressionNotInGroupByError.md)
-- [`UnsupportedAggregateFunctionError`](../UnsupportedAggregateFunctionError.md)
-- [`AggregateFunctionNotInSelectError`](../AggregateFunctionNotInSelectError.md)
-- [`UnknownHavingExpressionTypeError`](../UnknownHavingExpressionTypeError.md)
+- [`NonAggregateExpressionNotInGroupByError`](NonAggregateExpressionNotInGroupByError.md)
+- [`UnsupportedAggregateFunctionError`](UnsupportedAggregateFunctionError.md)
+- [`AggregateFunctionNotInSelectError`](AggregateFunctionNotInSelectError.md)
+- [`UnknownHavingExpressionTypeError`](UnknownHavingExpressionTypeError.md)
 
 ## Constructors
 
@@ -26,7 +26,7 @@ Defined in: [packages/db/src/errors.ts:535](https://github.com/TanStack/db/blob/
 new GroupByError(message): GroupByError;
 ```
 
-Defined in: [packages/db/src/errors.ts:536](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L536)
+Defined in: [packages/db/src/errors.ts:545](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L545)
 
 #### Parameters
 
@@ -40,7 +40,7 @@ Defined in: [packages/db/src/errors.ts:536](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -54,7 +54,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -68,7 +68,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -82,7 +82,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -96,7 +96,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -120,7 +120,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -192,7 +192,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -224,4 +224,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/HavingRequiresGroupByError.md b/docs/reference/classes/HavingRequiresGroupByError.md
index 423d3a083..2116ffcdd 100644
--- a/docs/reference/classes/HavingRequiresGroupByError.md
+++ b/docs/reference/classes/HavingRequiresGroupByError.md
@@ -5,11 +5,11 @@ title: HavingRequiresGroupByError
 
 # Class: HavingRequiresGroupByError
 
-Defined in: [packages/db/src/errors.ts:398](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L398)
+Defined in: [packages/db/src/errors.ts:407](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L407)
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:398](https://github.com/TanStack/db/blob/
 new HavingRequiresGroupByError(): HavingRequiresGroupByError;
 ```
 
-Defined in: [packages/db/src/errors.ts:399](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L399)
+Defined in: [packages/db/src/errors.ts:408](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L408)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:399](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/IndexProxy.md b/docs/reference/classes/IndexProxy.md
index 0ff7dff72..203620ae0 100644
--- a/docs/reference/classes/IndexProxy.md
+++ b/docs/reference/classes/IndexProxy.md
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/indexes/lazy-index.ts:132](https://github.com/TanSt
 
 ##### lazyIndex
 
-[`LazyIndexWrapper`](../LazyIndexWrapper.md)\<`TKey`\>
+[`LazyIndexWrapper`](LazyIndexWrapper.md)\<`TKey`\>
 
 #### Returns
 
@@ -55,7 +55,7 @@ Get the index expression (available immediately)
 
 ##### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
 
 ***
 
@@ -91,7 +91,7 @@ Get the resolved index (throws if not ready)
 
 ##### Returns
 
-[`BaseIndex`](../BaseIndex.md)\<`TKey`\>
+[`BaseIndex`](BaseIndex.md)\<`TKey`\>
 
 ***
 
@@ -207,7 +207,7 @@ Defined in: [packages/db/src/indexes/lazy-index.ts:248](https://github.com/TanSt
 
 #### Returns
 
-[`LazyIndexWrapper`](../LazyIndexWrapper.md)\<`TKey`\>
+[`LazyIndexWrapper`](LazyIndexWrapper.md)\<`TKey`\>
 
 ***
 
@@ -243,7 +243,7 @@ Get index statistics (throws if not ready)
 
 #### Returns
 
-[`IndexStats`](../../interfaces/IndexStats.md)
+[`IndexStats`](../interfaces/IndexStats.md)
 
 ***
 
@@ -343,4 +343,4 @@ Wait for index to be ready
 
 #### Returns
 
-`Promise`\<[`BaseIndex`](../BaseIndex.md)\<`TKey`\>\>
+`Promise`\<[`BaseIndex`](BaseIndex.md)\<`TKey`\>\>
diff --git a/docs/reference/classes/InvalidCollectionStatusTransitionError.md b/docs/reference/classes/InvalidCollectionStatusTransitionError.md
index 81c1a3d0c..8881268af 100644
--- a/docs/reference/classes/InvalidCollectionStatusTransitionError.md
+++ b/docs/reference/classes/InvalidCollectionStatusTransitionError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:118](https://github.com/TanStack/db/blob/
 
 ## Extends
 
-- [`CollectionStateError`](../CollectionStateError.md)
+- [`CollectionStateError`](CollectionStateError.md)
 
 ## Constructors
 
@@ -44,7 +44,7 @@ Defined in: [packages/db/src/errors.ts:119](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionStateError`](../CollectionStateError.md).[`constructor`](../CollectionStateError.md#constructor)
+[`CollectionStateError`](CollectionStateError.md).[`constructor`](CollectionStateError.md#constructor)
 
 ## Properties
 
@@ -58,7 +58,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`cause`](../CollectionStateError.md#cause)
+[`CollectionStateError`](CollectionStateError.md).[`cause`](CollectionStateError.md#cause)
 
 ***
 
@@ -72,7 +72,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`message`](../CollectionStateError.md#message)
+[`CollectionStateError`](CollectionStateError.md).[`message`](CollectionStateError.md#message)
 
 ***
 
@@ -86,7 +86,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`name`](../CollectionStateError.md#name)
+[`CollectionStateError`](CollectionStateError.md).[`name`](CollectionStateError.md#name)
 
 ***
 
@@ -100,7 +100,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`stack`](../CollectionStateError.md#stack)
+[`CollectionStateError`](CollectionStateError.md).[`stack`](CollectionStateError.md#stack)
 
 ***
 
@@ -124,7 +124,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`stackTraceLimit`](../CollectionStateError.md#stacktracelimit)
+[`CollectionStateError`](CollectionStateError.md).[`stackTraceLimit`](CollectionStateError.md#stacktracelimit)
 
 ## Methods
 
@@ -196,7 +196,7 @@ a();
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`captureStackTrace`](../CollectionStateError.md#capturestacktrace)
+[`CollectionStateError`](CollectionStateError.md).[`captureStackTrace`](CollectionStateError.md#capturestacktrace)
 
 ***
 
@@ -228,4 +228,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`prepareStackTrace`](../CollectionStateError.md#preparestacktrace)
+[`CollectionStateError`](CollectionStateError.md).[`prepareStackTrace`](CollectionStateError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidJoinCondition.md b/docs/reference/classes/InvalidJoinCondition.md
index da478f258..86fbf51ea 100644
--- a/docs/reference/classes/InvalidJoinCondition.md
+++ b/docs/reference/classes/InvalidJoinCondition.md
@@ -5,11 +5,11 @@ title: InvalidJoinCondition
 
 # Class: InvalidJoinCondition
 
-Defined in: [packages/db/src/errors.ts:522](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L522)
+Defined in: [packages/db/src/errors.ts:531](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L531)
 
 ## Extends
 
-- [`JoinError`](../JoinError.md)
+- [`JoinError`](JoinError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:522](https://github.com/TanStack/db/blob/
 new InvalidJoinCondition(): InvalidJoinCondition;
 ```
 
-Defined in: [packages/db/src/errors.ts:523](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L523)
+Defined in: [packages/db/src/errors.ts:532](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L532)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:523](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`JoinError`](../JoinError.md).[`constructor`](../JoinError.md#constructor)
+[`JoinError`](JoinError.md).[`constructor`](JoinError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`cause`](../JoinError.md#cause)
+[`JoinError`](JoinError.md).[`cause`](JoinError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`message`](../JoinError.md#message)
+[`JoinError`](JoinError.md).[`message`](JoinError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`name`](../JoinError.md#name)
+[`JoinError`](JoinError.md).[`name`](JoinError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stack`](../JoinError.md#stack)
+[`JoinError`](JoinError.md).[`stack`](JoinError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stackTraceLimit`](../JoinError.md#stacktracelimit)
+[`JoinError`](JoinError.md).[`stackTraceLimit`](JoinError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`captureStackTrace`](../JoinError.md#capturestacktrace)
+[`JoinError`](JoinError.md).[`captureStackTrace`](JoinError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`prepareStackTrace`](../JoinError.md#preparestacktrace)
+[`JoinError`](JoinError.md).[`prepareStackTrace`](JoinError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidJoinConditionLeftSourceError.md b/docs/reference/classes/InvalidJoinConditionLeftSourceError.md
index 47f2a8e15..4d61d221e 100644
--- a/docs/reference/classes/InvalidJoinConditionLeftSourceError.md
+++ b/docs/reference/classes/InvalidJoinConditionLeftSourceError.md
@@ -5,11 +5,11 @@ title: InvalidJoinConditionLeftSourceError
 
 # Class: InvalidJoinConditionLeftSourceError
 
-Defined in: [packages/db/src/errors.ts:506](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L506)
+Defined in: [packages/db/src/errors.ts:515](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L515)
 
 ## Extends
 
-- [`JoinError`](../JoinError.md)
+- [`JoinError`](JoinError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:506](https://github.com/TanStack/db/blob/
 new InvalidJoinConditionLeftSourceError(sourceAlias): InvalidJoinConditionLeftSourceError;
 ```
 
-Defined in: [packages/db/src/errors.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L507)
+Defined in: [packages/db/src/errors.ts:516](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L516)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:507](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`JoinError`](../JoinError.md).[`constructor`](../JoinError.md#constructor)
+[`JoinError`](JoinError.md).[`constructor`](JoinError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`cause`](../JoinError.md#cause)
+[`JoinError`](JoinError.md).[`cause`](JoinError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`message`](../JoinError.md#message)
+[`JoinError`](JoinError.md).[`message`](JoinError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`name`](../JoinError.md#name)
+[`JoinError`](JoinError.md).[`name`](JoinError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stack`](../JoinError.md#stack)
+[`JoinError`](JoinError.md).[`stack`](JoinError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stackTraceLimit`](../JoinError.md#stacktracelimit)
+[`JoinError`](JoinError.md).[`stackTraceLimit`](JoinError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`captureStackTrace`](../JoinError.md#capturestacktrace)
+[`JoinError`](JoinError.md).[`captureStackTrace`](JoinError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`prepareStackTrace`](../JoinError.md#preparestacktrace)
+[`JoinError`](JoinError.md).[`prepareStackTrace`](JoinError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidJoinConditionRightSourceError.md b/docs/reference/classes/InvalidJoinConditionRightSourceError.md
index 2294e6d0a..e39c4a1fd 100644
--- a/docs/reference/classes/InvalidJoinConditionRightSourceError.md
+++ b/docs/reference/classes/InvalidJoinConditionRightSourceError.md
@@ -5,11 +5,11 @@ title: InvalidJoinConditionRightSourceError
 
 # Class: InvalidJoinConditionRightSourceError
 
-Defined in: [packages/db/src/errors.ts:514](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L514)
+Defined in: [packages/db/src/errors.ts:523](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L523)
 
 ## Extends
 
-- [`JoinError`](../JoinError.md)
+- [`JoinError`](JoinError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:514](https://github.com/TanStack/db/blob/
 new InvalidJoinConditionRightSourceError(sourceAlias): InvalidJoinConditionRightSourceError;
 ```
 
-Defined in: [packages/db/src/errors.ts:515](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L515)
+Defined in: [packages/db/src/errors.ts:524](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L524)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:515](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`JoinError`](../JoinError.md).[`constructor`](../JoinError.md#constructor)
+[`JoinError`](JoinError.md).[`constructor`](JoinError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`cause`](../JoinError.md#cause)
+[`JoinError`](JoinError.md).[`cause`](JoinError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`message`](../JoinError.md#message)
+[`JoinError`](JoinError.md).[`message`](JoinError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`name`](../JoinError.md#name)
+[`JoinError`](JoinError.md).[`name`](JoinError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stack`](../JoinError.md#stack)
+[`JoinError`](JoinError.md).[`stack`](JoinError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stackTraceLimit`](../JoinError.md#stacktracelimit)
+[`JoinError`](JoinError.md).[`stackTraceLimit`](JoinError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`captureStackTrace`](../JoinError.md#capturestacktrace)
+[`JoinError`](JoinError.md).[`captureStackTrace`](JoinError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`prepareStackTrace`](../JoinError.md#preparestacktrace)
+[`JoinError`](JoinError.md).[`prepareStackTrace`](JoinError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidJoinConditionSameSourceError.md b/docs/reference/classes/InvalidJoinConditionSameSourceError.md
index 942301fdb..89f8d42fa 100644
--- a/docs/reference/classes/InvalidJoinConditionSameSourceError.md
+++ b/docs/reference/classes/InvalidJoinConditionSameSourceError.md
@@ -5,11 +5,11 @@ title: InvalidJoinConditionSameSourceError
 
 # Class: InvalidJoinConditionSameSourceError
 
-Defined in: [packages/db/src/errors.ts:492](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L492)
+Defined in: [packages/db/src/errors.ts:501](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L501)
 
 ## Extends
 
-- [`JoinError`](../JoinError.md)
+- [`JoinError`](JoinError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:492](https://github.com/TanStack/db/blob/
 new InvalidJoinConditionSameSourceError(sourceAlias): InvalidJoinConditionSameSourceError;
 ```
 
-Defined in: [packages/db/src/errors.ts:493](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L493)
+Defined in: [packages/db/src/errors.ts:502](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L502)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:493](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`JoinError`](../JoinError.md).[`constructor`](../JoinError.md#constructor)
+[`JoinError`](JoinError.md).[`constructor`](JoinError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`cause`](../JoinError.md#cause)
+[`JoinError`](JoinError.md).[`cause`](JoinError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`message`](../JoinError.md#message)
+[`JoinError`](JoinError.md).[`message`](JoinError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`name`](../JoinError.md#name)
+[`JoinError`](JoinError.md).[`name`](JoinError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stack`](../JoinError.md#stack)
+[`JoinError`](JoinError.md).[`stack`](JoinError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stackTraceLimit`](../JoinError.md#stacktracelimit)
+[`JoinError`](JoinError.md).[`stackTraceLimit`](JoinError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`captureStackTrace`](../JoinError.md#capturestacktrace)
+[`JoinError`](JoinError.md).[`captureStackTrace`](JoinError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`prepareStackTrace`](../JoinError.md#preparestacktrace)
+[`JoinError`](JoinError.md).[`prepareStackTrace`](JoinError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidJoinConditionSourceMismatchError.md b/docs/reference/classes/InvalidJoinConditionSourceMismatchError.md
index 1a883518c..24130138c 100644
--- a/docs/reference/classes/InvalidJoinConditionSourceMismatchError.md
+++ b/docs/reference/classes/InvalidJoinConditionSourceMismatchError.md
@@ -5,11 +5,11 @@ title: InvalidJoinConditionSourceMismatchError
 
 # Class: InvalidJoinConditionSourceMismatchError
 
-Defined in: [packages/db/src/errors.ts:500](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L500)
+Defined in: [packages/db/src/errors.ts:509](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L509)
 
 ## Extends
 
-- [`JoinError`](../JoinError.md)
+- [`JoinError`](JoinError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:500](https://github.com/TanStack/db/blob/
 new InvalidJoinConditionSourceMismatchError(): InvalidJoinConditionSourceMismatchError;
 ```
 
-Defined in: [packages/db/src/errors.ts:501](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L501)
+Defined in: [packages/db/src/errors.ts:510](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L510)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:501](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`JoinError`](../JoinError.md).[`constructor`](../JoinError.md#constructor)
+[`JoinError`](JoinError.md).[`constructor`](JoinError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`cause`](../JoinError.md#cause)
+[`JoinError`](JoinError.md).[`cause`](JoinError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`message`](../JoinError.md#message)
+[`JoinError`](JoinError.md).[`message`](JoinError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`name`](../JoinError.md#name)
+[`JoinError`](JoinError.md).[`name`](JoinError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stack`](../JoinError.md#stack)
+[`JoinError`](JoinError.md).[`stack`](JoinError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stackTraceLimit`](../JoinError.md#stacktracelimit)
+[`JoinError`](JoinError.md).[`stackTraceLimit`](JoinError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`captureStackTrace`](../JoinError.md#capturestacktrace)
+[`JoinError`](JoinError.md).[`captureStackTrace`](JoinError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`prepareStackTrace`](../JoinError.md#preparestacktrace)
+[`JoinError`](JoinError.md).[`prepareStackTrace`](JoinError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidKeyError.md b/docs/reference/classes/InvalidKeyError.md
new file mode 100644
index 000000000..b06bd9262
--- /dev/null
+++ b/docs/reference/classes/InvalidKeyError.md
@@ -0,0 +1,224 @@
+---
+id: InvalidKeyError
+title: InvalidKeyError
+---
+
+# Class: InvalidKeyError
+
+Defined in: [packages/db/src/errors.ts:154](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L154)
+
+## Extends
+
+- [`CollectionOperationError`](CollectionOperationError.md)
+
+## Constructors
+
+### Constructor
+
+```ts
+new InvalidKeyError(key, item): InvalidKeyError;
+```
+
+Defined in: [packages/db/src/errors.ts:155](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L155)
+
+#### Parameters
+
+##### key
+
+`unknown`
+
+##### item
+
+`unknown`
+
+#### Returns
+
+`InvalidKeyError`
+
+#### Overrides
+
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
+
+## Properties
+
+### cause?
+
+```ts
+optional cause: unknown;
+```
+
+Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es2022.error.d.ts:26
+
+#### Inherited from
+
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
+
+***
+
+### message
+
+```ts
+message: string;
+```
+
+Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1077
+
+#### Inherited from
+
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
+
+***
+
+### name
+
+```ts
+name: string;
+```
+
+Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1076
+
+#### Inherited from
+
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
+
+***
+
+### stack?
+
+```ts
+optional stack: string;
+```
+
+Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1078
+
+#### Inherited from
+
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
+
+***
+
+### stackTraceLimit
+
+```ts
+static stackTraceLimit: number;
+```
+
+Defined in: node\_modules/.pnpm/@types+node@24.7.0/node\_modules/@types/node/globals.d.ts:68
+
+The `Error.stackTraceLimit` property specifies the number of stack frames
+collected by a stack trace (whether generated by `new Error().stack` or
+`Error.captureStackTrace(obj)`).
+
+The default value is `10` but may be set to any valid JavaScript number. Changes
+will affect any stack trace captured _after_ the value has been changed.
+
+If set to a non-number value, or set to a negative number, stack traces will
+not capture any frames.
+
+#### Inherited from
+
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
+
+## Methods
+
+### captureStackTrace()
+
+```ts
+static captureStackTrace(targetObject, constructorOpt?): void;
+```
+
+Defined in: node\_modules/.pnpm/@types+node@24.7.0/node\_modules/@types/node/globals.d.ts:52
+
+Creates a `.stack` property on `targetObject`, which when accessed returns
+a string representing the location in the code at which
+`Error.captureStackTrace()` was called.
+
+```js
+const myObject = {};
+Error.captureStackTrace(myObject);
+myObject.stack;  // Similar to `new Error().stack`
+```
+
+The first line of the trace will be prefixed with
+`${myObject.name}: ${myObject.message}`.
+
+The optional `constructorOpt` argument accepts a function. If given, all frames
+above `constructorOpt`, including `constructorOpt`, will be omitted from the
+generated stack trace.
+
+The `constructorOpt` argument is useful for hiding implementation
+details of error generation from the user. For instance:
+
+```js
+function a() {
+  b();
+}
+
+function b() {
+  c();
+}
+
+function c() {
+  // Create an error without stack trace to avoid calculating the stack trace twice.
+  const { stackTraceLimit } = Error;
+  Error.stackTraceLimit = 0;
+  const error = new Error();
+  Error.stackTraceLimit = stackTraceLimit;
+
+  // Capture the stack trace above function b
+  Error.captureStackTrace(error, b); // Neither function c, nor b is included in the stack trace
+  throw error;
+}
+
+a();
+```
+
+#### Parameters
+
+##### targetObject
+
+`object`
+
+##### constructorOpt?
+
+`Function`
+
+#### Returns
+
+`void`
+
+#### Inherited from
+
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
+
+***
+
+### prepareStackTrace()
+
+```ts
+static prepareStackTrace(err, stackTraces): any;
+```
+
+Defined in: node\_modules/.pnpm/@types+node@24.7.0/node\_modules/@types/node/globals.d.ts:56
+
+#### Parameters
+
+##### err
+
+`Error`
+
+##### stackTraces
+
+`CallSite`[]
+
+#### Returns
+
+`any`
+
+#### See
+
+https://v8.dev/docs/stack-trace-api#customizing-stack-traces
+
+#### Inherited from
+
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidSchemaError.md b/docs/reference/classes/InvalidSchemaError.md
index a98453c36..b50d2cff0 100644
--- a/docs/reference/classes/InvalidSchemaError.md
+++ b/docs/reference/classes/InvalidSchemaError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:90](https://github.com/TanStack/db/blob/m
 
 ## Extends
 
-- [`CollectionConfigurationError`](../CollectionConfigurationError.md)
+- [`CollectionConfigurationError`](CollectionConfigurationError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:91](https://github.com/TanStack/db/blob/m
 
 #### Overrides
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`constructor`](../CollectionConfigurationError.md#constructor)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`constructor`](CollectionConfigurationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`cause`](../CollectionConfigurationError.md#cause)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`cause`](CollectionConfigurationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`message`](../CollectionConfigurationError.md#message)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`message`](CollectionConfigurationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`name`](../CollectionConfigurationError.md#name)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`name`](CollectionConfigurationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`stack`](../CollectionConfigurationError.md#stack)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`stack`](CollectionConfigurationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`stackTraceLimit`](../CollectionConfigurationError.md#stacktracelimit)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`stackTraceLimit`](CollectionConfigurationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`captureStackTrace`](../CollectionConfigurationError.md#capturestacktrace)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`captureStackTrace`](CollectionConfigurationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`prepareStackTrace`](../CollectionConfigurationError.md#preparestacktrace)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`prepareStackTrace`](CollectionConfigurationError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidSourceError.md b/docs/reference/classes/InvalidSourceError.md
index 4450c1120..cb95d9f94 100644
--- a/docs/reference/classes/InvalidSourceError.md
+++ b/docs/reference/classes/InvalidSourceError.md
@@ -5,11 +5,11 @@ title: InvalidSourceError
 
 # Class: InvalidSourceError
 
-Defined in: [packages/db/src/errors.ts:355](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L355)
+Defined in: [packages/db/src/errors.ts:364](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L364)
 
 ## Extends
 
-- [`QueryBuilderError`](../QueryBuilderError.md)
+- [`QueryBuilderError`](QueryBuilderError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:355](https://github.com/TanStack/db/blob/
 new InvalidSourceError(alias): InvalidSourceError;
 ```
 
-Defined in: [packages/db/src/errors.ts:356](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L356)
+Defined in: [packages/db/src/errors.ts:365](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L365)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:356](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`constructor`](../QueryBuilderError.md#constructor)
+[`QueryBuilderError`](QueryBuilderError.md).[`constructor`](QueryBuilderError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`cause`](../QueryBuilderError.md#cause)
+[`QueryBuilderError`](QueryBuilderError.md).[`cause`](QueryBuilderError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`message`](../QueryBuilderError.md#message)
+[`QueryBuilderError`](QueryBuilderError.md).[`message`](QueryBuilderError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`name`](../QueryBuilderError.md#name)
+[`QueryBuilderError`](QueryBuilderError.md).[`name`](QueryBuilderError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stack`](../QueryBuilderError.md#stack)
+[`QueryBuilderError`](QueryBuilderError.md).[`stack`](QueryBuilderError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stackTraceLimit`](../QueryBuilderError.md#stacktracelimit)
+[`QueryBuilderError`](QueryBuilderError.md).[`stackTraceLimit`](QueryBuilderError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`captureStackTrace`](../QueryBuilderError.md#capturestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`captureStackTrace`](QueryBuilderError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`prepareStackTrace`](../QueryBuilderError.md#preparestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`prepareStackTrace`](QueryBuilderError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidSourceTypeError.md b/docs/reference/classes/InvalidSourceTypeError.md
index 42daca63c..690895015 100644
--- a/docs/reference/classes/InvalidSourceTypeError.md
+++ b/docs/reference/classes/InvalidSourceTypeError.md
@@ -5,11 +5,11 @@ title: InvalidSourceTypeError
 
 # Class: InvalidSourceTypeError
 
-Defined in: [packages/db/src/errors.ts:363](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L363)
+Defined in: [packages/db/src/errors.ts:372](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L372)
 
 ## Extends
 
-- [`QueryBuilderError`](../QueryBuilderError.md)
+- [`QueryBuilderError`](QueryBuilderError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:363](https://github.com/TanStack/db/blob/
 new InvalidSourceTypeError(context, type): InvalidSourceTypeError;
 ```
 
-Defined in: [packages/db/src/errors.ts:364](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L364)
+Defined in: [packages/db/src/errors.ts:373](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L373)
 
 #### Parameters
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/errors.ts:364](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`constructor`](../QueryBuilderError.md#constructor)
+[`QueryBuilderError`](QueryBuilderError.md).[`constructor`](QueryBuilderError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`cause`](../QueryBuilderError.md#cause)
+[`QueryBuilderError`](QueryBuilderError.md).[`cause`](QueryBuilderError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`message`](../QueryBuilderError.md#message)
+[`QueryBuilderError`](QueryBuilderError.md).[`message`](QueryBuilderError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`name`](../QueryBuilderError.md#name)
+[`QueryBuilderError`](QueryBuilderError.md).[`name`](QueryBuilderError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stack`](../QueryBuilderError.md#stack)
+[`QueryBuilderError`](QueryBuilderError.md).[`stack`](QueryBuilderError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stackTraceLimit`](../QueryBuilderError.md#stacktracelimit)
+[`QueryBuilderError`](QueryBuilderError.md).[`stackTraceLimit`](QueryBuilderError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`captureStackTrace`](../QueryBuilderError.md#capturestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`captureStackTrace`](QueryBuilderError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`prepareStackTrace`](../QueryBuilderError.md#preparestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`prepareStackTrace`](QueryBuilderError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidStorageDataFormatError.md b/docs/reference/classes/InvalidStorageDataFormatError.md
index 1a9f10e11..bb6fc704e 100644
--- a/docs/reference/classes/InvalidStorageDataFormatError.md
+++ b/docs/reference/classes/InvalidStorageDataFormatError.md
@@ -5,11 +5,11 @@ title: InvalidStorageDataFormatError
 
 # Class: InvalidStorageDataFormatError
 
-Defined in: [packages/db/src/errors.ts:600](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L600)
+Defined in: [packages/db/src/errors.ts:609](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L609)
 
 ## Extends
 
-- [`LocalStorageCollectionError`](../LocalStorageCollectionError.md)
+- [`LocalStorageCollectionError`](LocalStorageCollectionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:600](https://github.com/TanStack/db/blob/
 new InvalidStorageDataFormatError(storageKey, key): InvalidStorageDataFormatError;
 ```
 
-Defined in: [packages/db/src/errors.ts:601](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L601)
+Defined in: [packages/db/src/errors.ts:610](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L610)
 
 #### Parameters
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/errors.ts:601](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`constructor`](../LocalStorageCollectionError.md#constructor)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`constructor`](LocalStorageCollectionError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`cause`](../LocalStorageCollectionError.md#cause)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`cause`](LocalStorageCollectionError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`message`](../LocalStorageCollectionError.md#message)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`message`](LocalStorageCollectionError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`name`](../LocalStorageCollectionError.md#name)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`name`](LocalStorageCollectionError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`stack`](../LocalStorageCollectionError.md#stack)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`stack`](LocalStorageCollectionError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`stackTraceLimit`](../LocalStorageCollectionError.md#stacktracelimit)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`stackTraceLimit`](LocalStorageCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`captureStackTrace`](../LocalStorageCollectionError.md#capturestacktrace)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`captureStackTrace`](LocalStorageCollectionError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`prepareStackTrace`](../LocalStorageCollectionError.md#preparestacktrace)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`prepareStackTrace`](LocalStorageCollectionError.md#preparestacktrace)
diff --git a/docs/reference/classes/InvalidStorageObjectFormatError.md b/docs/reference/classes/InvalidStorageObjectFormatError.md
index ed3b0efd0..77f06a3bb 100644
--- a/docs/reference/classes/InvalidStorageObjectFormatError.md
+++ b/docs/reference/classes/InvalidStorageObjectFormatError.md
@@ -5,11 +5,11 @@ title: InvalidStorageObjectFormatError
 
 # Class: InvalidStorageObjectFormatError
 
-Defined in: [packages/db/src/errors.ts:608](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L608)
+Defined in: [packages/db/src/errors.ts:617](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L617)
 
 ## Extends
 
-- [`LocalStorageCollectionError`](../LocalStorageCollectionError.md)
+- [`LocalStorageCollectionError`](LocalStorageCollectionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:608](https://github.com/TanStack/db/blob/
 new InvalidStorageObjectFormatError(storageKey): InvalidStorageObjectFormatError;
 ```
 
-Defined in: [packages/db/src/errors.ts:609](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L609)
+Defined in: [packages/db/src/errors.ts:618](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L618)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:609](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`constructor`](../LocalStorageCollectionError.md#constructor)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`constructor`](LocalStorageCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`cause`](../LocalStorageCollectionError.md#cause)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`cause`](LocalStorageCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`message`](../LocalStorageCollectionError.md#message)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`message`](LocalStorageCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`name`](../LocalStorageCollectionError.md#name)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`name`](LocalStorageCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`stack`](../LocalStorageCollectionError.md#stack)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`stack`](LocalStorageCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`stackTraceLimit`](../LocalStorageCollectionError.md#stacktracelimit)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`stackTraceLimit`](LocalStorageCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`captureStackTrace`](../LocalStorageCollectionError.md#capturestacktrace)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`captureStackTrace`](LocalStorageCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`prepareStackTrace`](../LocalStorageCollectionError.md#preparestacktrace)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`prepareStackTrace`](LocalStorageCollectionError.md#preparestacktrace)
diff --git a/docs/reference/classes/JoinCollectionNotFoundError.md b/docs/reference/classes/JoinCollectionNotFoundError.md
index f21f5b9a5..5b3945ddd 100644
--- a/docs/reference/classes/JoinCollectionNotFoundError.md
+++ b/docs/reference/classes/JoinCollectionNotFoundError.md
@@ -5,11 +5,11 @@ title: JoinCollectionNotFoundError
 
 # Class: JoinCollectionNotFoundError
 
-Defined in: [packages/db/src/errors.ts:472](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L472)
+Defined in: [packages/db/src/errors.ts:481](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L481)
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:472](https://github.com/TanStack/db/blob/
 new JoinCollectionNotFoundError(collectionId): JoinCollectionNotFoundError;
 ```
 
-Defined in: [packages/db/src/errors.ts:473](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L473)
+Defined in: [packages/db/src/errors.ts:482](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L482)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:473](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/JoinConditionMustBeEqualityError.md b/docs/reference/classes/JoinConditionMustBeEqualityError.md
index 6e6240e8c..a4df5fc6a 100644
--- a/docs/reference/classes/JoinConditionMustBeEqualityError.md
+++ b/docs/reference/classes/JoinConditionMustBeEqualityError.md
@@ -5,11 +5,11 @@ title: JoinConditionMustBeEqualityError
 
 # Class: JoinConditionMustBeEqualityError
 
-Defined in: [packages/db/src/errors.ts:372](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L372)
+Defined in: [packages/db/src/errors.ts:381](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L381)
 
 ## Extends
 
-- [`QueryBuilderError`](../QueryBuilderError.md)
+- [`QueryBuilderError`](QueryBuilderError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:372](https://github.com/TanStack/db/blob/
 new JoinConditionMustBeEqualityError(): JoinConditionMustBeEqualityError;
 ```
 
-Defined in: [packages/db/src/errors.ts:373](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L373)
+Defined in: [packages/db/src/errors.ts:382](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L382)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:373](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`constructor`](../QueryBuilderError.md#constructor)
+[`QueryBuilderError`](QueryBuilderError.md).[`constructor`](QueryBuilderError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`cause`](../QueryBuilderError.md#cause)
+[`QueryBuilderError`](QueryBuilderError.md).[`cause`](QueryBuilderError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`message`](../QueryBuilderError.md#message)
+[`QueryBuilderError`](QueryBuilderError.md).[`message`](QueryBuilderError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`name`](../QueryBuilderError.md#name)
+[`QueryBuilderError`](QueryBuilderError.md).[`name`](QueryBuilderError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stack`](../QueryBuilderError.md#stack)
+[`QueryBuilderError`](QueryBuilderError.md).[`stack`](QueryBuilderError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stackTraceLimit`](../QueryBuilderError.md#stacktracelimit)
+[`QueryBuilderError`](QueryBuilderError.md).[`stackTraceLimit`](QueryBuilderError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`captureStackTrace`](../QueryBuilderError.md#capturestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`captureStackTrace`](QueryBuilderError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`prepareStackTrace`](../QueryBuilderError.md#preparestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`prepareStackTrace`](QueryBuilderError.md#preparestacktrace)
diff --git a/docs/reference/classes/JoinError.md b/docs/reference/classes/JoinError.md
index 6058f4f73..bc02c6bf1 100644
--- a/docs/reference/classes/JoinError.md
+++ b/docs/reference/classes/JoinError.md
@@ -5,21 +5,21 @@ title: JoinError
 
 # Class: JoinError
 
-Defined in: [packages/db/src/errors.ts:479](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L479)
+Defined in: [packages/db/src/errors.ts:488](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L488)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`UnsupportedJoinTypeError`](../UnsupportedJoinTypeError.md)
-- [`InvalidJoinConditionSameSourceError`](../InvalidJoinConditionSameSourceError.md)
-- [`InvalidJoinConditionSourceMismatchError`](../InvalidJoinConditionSourceMismatchError.md)
-- [`InvalidJoinConditionLeftSourceError`](../InvalidJoinConditionLeftSourceError.md)
-- [`InvalidJoinConditionRightSourceError`](../InvalidJoinConditionRightSourceError.md)
-- [`InvalidJoinCondition`](../InvalidJoinCondition.md)
-- [`UnsupportedJoinSourceTypeError`](../UnsupportedJoinSourceTypeError.md)
+- [`UnsupportedJoinTypeError`](UnsupportedJoinTypeError.md)
+- [`InvalidJoinConditionSameSourceError`](InvalidJoinConditionSameSourceError.md)
+- [`InvalidJoinConditionSourceMismatchError`](InvalidJoinConditionSourceMismatchError.md)
+- [`InvalidJoinConditionLeftSourceError`](InvalidJoinConditionLeftSourceError.md)
+- [`InvalidJoinConditionRightSourceError`](InvalidJoinConditionRightSourceError.md)
+- [`InvalidJoinCondition`](InvalidJoinCondition.md)
+- [`UnsupportedJoinSourceTypeError`](UnsupportedJoinSourceTypeError.md)
 
 ## Constructors
 
@@ -29,7 +29,7 @@ Defined in: [packages/db/src/errors.ts:479](https://github.com/TanStack/db/blob/
 new JoinError(message): JoinError;
 ```
 
-Defined in: [packages/db/src/errors.ts:480](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L480)
+Defined in: [packages/db/src/errors.ts:489](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L489)
 
 #### Parameters
 
@@ -43,7 +43,7 @@ Defined in: [packages/db/src/errors.ts:480](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -57,7 +57,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -71,7 +71,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -85,7 +85,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -99,7 +99,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -123,7 +123,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -195,7 +195,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -227,4 +227,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/KeyUpdateNotAllowedError.md b/docs/reference/classes/KeyUpdateNotAllowedError.md
index 0396ca6ef..26899d765 100644
--- a/docs/reference/classes/KeyUpdateNotAllowedError.md
+++ b/docs/reference/classes/KeyUpdateNotAllowedError.md
@@ -5,11 +5,11 @@ title: KeyUpdateNotAllowedError
 
 # Class: KeyUpdateNotAllowedError
 
-Defined in: [packages/db/src/errors.ts:206](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L206)
+Defined in: [packages/db/src/errors.ts:215](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L215)
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:206](https://github.com/TanStack/db/blob/
 new KeyUpdateNotAllowedError(originalKey, newKey): KeyUpdateNotAllowedError;
 ```
 
-Defined in: [packages/db/src/errors.ts:207](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L207)
+Defined in: [packages/db/src/errors.ts:216](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L216)
 
 #### Parameters
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/errors.ts:207](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/LazyIndexWrapper.md b/docs/reference/classes/LazyIndexWrapper.md
index 45592142b..703809366 100644
--- a/docs/reference/classes/LazyIndexWrapper.md
+++ b/docs/reference/classes/LazyIndexWrapper.md
@@ -39,7 +39,7 @@ Defined in: [packages/db/src/indexes/lazy-index.ts:43](https://github.com/TanSta
 
 ##### expression
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
 
 ##### name
 
@@ -47,7 +47,7 @@ Defined in: [packages/db/src/indexes/lazy-index.ts:43](https://github.com/TanSta
 
 ##### resolver
 
-[`IndexResolver`](../../type-aliases/IndexResolver.md)\<`TKey`\>
+[`IndexResolver`](../type-aliases/IndexResolver.md)\<`TKey`\>
 
 ##### options
 
@@ -75,7 +75,7 @@ Get the index expression
 
 #### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
 
 ***
 
@@ -123,7 +123,7 @@ Get resolved index (throws if not ready)
 
 #### Returns
 
-[`BaseIndex`](../BaseIndex.md)\<`TKey`\>
+[`BaseIndex`](BaseIndex.md)\<`TKey`\>
 
 ***
 
@@ -155,4 +155,4 @@ Resolve the actual index
 
 #### Returns
 
-`Promise`\<[`BaseIndex`](../BaseIndex.md)\<`TKey`\>\>
+`Promise`\<[`BaseIndex`](BaseIndex.md)\<`TKey`\>\>
diff --git a/docs/reference/classes/LimitOffsetRequireOrderByError.md b/docs/reference/classes/LimitOffsetRequireOrderByError.md
index 53e0be1f1..5023b746e 100644
--- a/docs/reference/classes/LimitOffsetRequireOrderByError.md
+++ b/docs/reference/classes/LimitOffsetRequireOrderByError.md
@@ -5,11 +5,11 @@ title: LimitOffsetRequireOrderByError
 
 # Class: LimitOffsetRequireOrderByError
 
-Defined in: [packages/db/src/errors.ts:404](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L404)
+Defined in: [packages/db/src/errors.ts:413](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L413)
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:404](https://github.com/TanStack/db/blob/
 new LimitOffsetRequireOrderByError(): LimitOffsetRequireOrderByError;
 ```
 
-Defined in: [packages/db/src/errors.ts:405](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L405)
+Defined in: [packages/db/src/errors.ts:414](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L414)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:405](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/LocalStorageCollectionError.md b/docs/reference/classes/LocalStorageCollectionError.md
index e101629b3..5166ac94a 100644
--- a/docs/reference/classes/LocalStorageCollectionError.md
+++ b/docs/reference/classes/LocalStorageCollectionError.md
@@ -5,17 +5,17 @@ title: LocalStorageCollectionError
 
 # Class: LocalStorageCollectionError
 
-Defined in: [packages/db/src/errors.ts:587](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L587)
+Defined in: [packages/db/src/errors.ts:596](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L596)
 
 ## Extends
 
-- [`StorageError`](../StorageError.md)
+- [`StorageError`](StorageError.md)
 
 ## Extended by
 
-- [`StorageKeyRequiredError`](../StorageKeyRequiredError.md)
-- [`InvalidStorageDataFormatError`](../InvalidStorageDataFormatError.md)
-- [`InvalidStorageObjectFormatError`](../InvalidStorageObjectFormatError.md)
+- [`StorageKeyRequiredError`](StorageKeyRequiredError.md)
+- [`InvalidStorageDataFormatError`](InvalidStorageDataFormatError.md)
+- [`InvalidStorageObjectFormatError`](InvalidStorageObjectFormatError.md)
 
 ## Constructors
 
@@ -25,7 +25,7 @@ Defined in: [packages/db/src/errors.ts:587](https://github.com/TanStack/db/blob/
 new LocalStorageCollectionError(message): LocalStorageCollectionError;
 ```
 
-Defined in: [packages/db/src/errors.ts:588](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L588)
+Defined in: [packages/db/src/errors.ts:597](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L597)
 
 #### Parameters
 
@@ -39,7 +39,7 @@ Defined in: [packages/db/src/errors.ts:588](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`StorageError`](../StorageError.md).[`constructor`](../StorageError.md#constructor)
+[`StorageError`](StorageError.md).[`constructor`](StorageError.md#constructor)
 
 ## Properties
 
@@ -53,7 +53,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`cause`](../StorageError.md#cause)
+[`StorageError`](StorageError.md).[`cause`](StorageError.md#cause)
 
 ***
 
@@ -67,7 +67,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`message`](../StorageError.md#message)
+[`StorageError`](StorageError.md).[`message`](StorageError.md#message)
 
 ***
 
@@ -81,7 +81,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`name`](../StorageError.md#name)
+[`StorageError`](StorageError.md).[`name`](StorageError.md#name)
 
 ***
 
@@ -95,7 +95,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`stack`](../StorageError.md#stack)
+[`StorageError`](StorageError.md).[`stack`](StorageError.md#stack)
 
 ***
 
@@ -119,7 +119,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`stackTraceLimit`](../StorageError.md#stacktracelimit)
+[`StorageError`](StorageError.md).[`stackTraceLimit`](StorageError.md#stacktracelimit)
 
 ## Methods
 
@@ -191,7 +191,7 @@ a();
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`captureStackTrace`](../StorageError.md#capturestacktrace)
+[`StorageError`](StorageError.md).[`captureStackTrace`](StorageError.md#capturestacktrace)
 
 ***
 
@@ -223,4 +223,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`prepareStackTrace`](../StorageError.md#preparestacktrace)
+[`StorageError`](StorageError.md).[`prepareStackTrace`](StorageError.md#preparestacktrace)
diff --git a/docs/reference/classes/MissingAliasInputsError.md b/docs/reference/classes/MissingAliasInputsError.md
index bd1cb17e5..2b0fb0585 100644
--- a/docs/reference/classes/MissingAliasInputsError.md
+++ b/docs/reference/classes/MissingAliasInputsError.md
@@ -5,14 +5,14 @@ title: MissingAliasInputsError
 
 # Class: MissingAliasInputsError
 
-Defined in: [packages/db/src/errors.ts:684](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L684)
+Defined in: [packages/db/src/errors.ts:693](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L693)
 
 Internal error when the compiler returns aliases that don't have corresponding input streams.
 This should never happen since all aliases come from user declarations.
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -22,7 +22,7 @@ This should never happen since all aliases come from user declarations.
 new MissingAliasInputsError(missingAliases): MissingAliasInputsError;
 ```
 
-Defined in: [packages/db/src/errors.ts:685](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L685)
+Defined in: [packages/db/src/errors.ts:694](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L694)
 
 #### Parameters
 
@@ -36,7 +36,7 @@ Defined in: [packages/db/src/errors.ts:685](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -50,7 +50,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -64,7 +64,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -78,7 +78,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -92,7 +92,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -116,7 +116,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -188,7 +188,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -220,4 +220,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/MissingDeleteHandlerError.md b/docs/reference/classes/MissingDeleteHandlerError.md
index 708d29cf9..dc65b1acf 100644
--- a/docs/reference/classes/MissingDeleteHandlerError.md
+++ b/docs/reference/classes/MissingDeleteHandlerError.md
@@ -5,11 +5,11 @@ title: MissingDeleteHandlerError
 
 # Class: MissingDeleteHandlerError
 
-Defined in: [packages/db/src/errors.ts:252](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L252)
+Defined in: [packages/db/src/errors.ts:261](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L261)
 
 ## Extends
 
-- [`MissingHandlerError`](../MissingHandlerError.md)
+- [`MissingHandlerError`](MissingHandlerError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:252](https://github.com/TanStack/db/blob/
 new MissingDeleteHandlerError(): MissingDeleteHandlerError;
 ```
 
-Defined in: [packages/db/src/errors.ts:253](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L253)
+Defined in: [packages/db/src/errors.ts:262](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L262)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:253](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`constructor`](../MissingHandlerError.md#constructor)
+[`MissingHandlerError`](MissingHandlerError.md).[`constructor`](MissingHandlerError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`cause`](../MissingHandlerError.md#cause)
+[`MissingHandlerError`](MissingHandlerError.md).[`cause`](MissingHandlerError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`message`](../MissingHandlerError.md#message)
+[`MissingHandlerError`](MissingHandlerError.md).[`message`](MissingHandlerError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`name`](../MissingHandlerError.md#name)
+[`MissingHandlerError`](MissingHandlerError.md).[`name`](MissingHandlerError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`stack`](../MissingHandlerError.md#stack)
+[`MissingHandlerError`](MissingHandlerError.md).[`stack`](MissingHandlerError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`stackTraceLimit`](../MissingHandlerError.md#stacktracelimit)
+[`MissingHandlerError`](MissingHandlerError.md).[`stackTraceLimit`](MissingHandlerError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`captureStackTrace`](../MissingHandlerError.md#capturestacktrace)
+[`MissingHandlerError`](MissingHandlerError.md).[`captureStackTrace`](MissingHandlerError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`prepareStackTrace`](../MissingHandlerError.md#preparestacktrace)
+[`MissingHandlerError`](MissingHandlerError.md).[`prepareStackTrace`](MissingHandlerError.md#preparestacktrace)
diff --git a/docs/reference/classes/MissingHandlerError.md b/docs/reference/classes/MissingHandlerError.md
index 4f1b02439..8504d778b 100644
--- a/docs/reference/classes/MissingHandlerError.md
+++ b/docs/reference/classes/MissingHandlerError.md
@@ -5,17 +5,17 @@ title: MissingHandlerError
 
 # Class: MissingHandlerError
 
-Defined in: [packages/db/src/errors.ts:229](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L229)
+Defined in: [packages/db/src/errors.ts:238](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L238)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`MissingInsertHandlerError`](../MissingInsertHandlerError.md)
-- [`MissingUpdateHandlerError`](../MissingUpdateHandlerError.md)
-- [`MissingDeleteHandlerError`](../MissingDeleteHandlerError.md)
+- [`MissingInsertHandlerError`](MissingInsertHandlerError.md)
+- [`MissingUpdateHandlerError`](MissingUpdateHandlerError.md)
+- [`MissingDeleteHandlerError`](MissingDeleteHandlerError.md)
 
 ## Constructors
 
@@ -25,7 +25,7 @@ Defined in: [packages/db/src/errors.ts:229](https://github.com/TanStack/db/blob/
 new MissingHandlerError(message): MissingHandlerError;
 ```
 
-Defined in: [packages/db/src/errors.ts:230](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L230)
+Defined in: [packages/db/src/errors.ts:239](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L239)
 
 #### Parameters
 
@@ -39,7 +39,7 @@ Defined in: [packages/db/src/errors.ts:230](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -53,7 +53,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -67,7 +67,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -81,7 +81,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -95,7 +95,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -119,7 +119,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -191,7 +191,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -223,4 +223,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/MissingInsertHandlerError.md b/docs/reference/classes/MissingInsertHandlerError.md
index f2d1e932a..543da47a5 100644
--- a/docs/reference/classes/MissingInsertHandlerError.md
+++ b/docs/reference/classes/MissingInsertHandlerError.md
@@ -5,11 +5,11 @@ title: MissingInsertHandlerError
 
 # Class: MissingInsertHandlerError
 
-Defined in: [packages/db/src/errors.ts:236](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L236)
+Defined in: [packages/db/src/errors.ts:245](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L245)
 
 ## Extends
 
-- [`MissingHandlerError`](../MissingHandlerError.md)
+- [`MissingHandlerError`](MissingHandlerError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:236](https://github.com/TanStack/db/blob/
 new MissingInsertHandlerError(): MissingInsertHandlerError;
 ```
 
-Defined in: [packages/db/src/errors.ts:237](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L237)
+Defined in: [packages/db/src/errors.ts:246](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L246)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:237](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`constructor`](../MissingHandlerError.md#constructor)
+[`MissingHandlerError`](MissingHandlerError.md).[`constructor`](MissingHandlerError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`cause`](../MissingHandlerError.md#cause)
+[`MissingHandlerError`](MissingHandlerError.md).[`cause`](MissingHandlerError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`message`](../MissingHandlerError.md#message)
+[`MissingHandlerError`](MissingHandlerError.md).[`message`](MissingHandlerError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`name`](../MissingHandlerError.md#name)
+[`MissingHandlerError`](MissingHandlerError.md).[`name`](MissingHandlerError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`stack`](../MissingHandlerError.md#stack)
+[`MissingHandlerError`](MissingHandlerError.md).[`stack`](MissingHandlerError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`stackTraceLimit`](../MissingHandlerError.md#stacktracelimit)
+[`MissingHandlerError`](MissingHandlerError.md).[`stackTraceLimit`](MissingHandlerError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`captureStackTrace`](../MissingHandlerError.md#capturestacktrace)
+[`MissingHandlerError`](MissingHandlerError.md).[`captureStackTrace`](MissingHandlerError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`prepareStackTrace`](../MissingHandlerError.md#preparestacktrace)
+[`MissingHandlerError`](MissingHandlerError.md).[`prepareStackTrace`](MissingHandlerError.md#preparestacktrace)
diff --git a/docs/reference/classes/MissingMutationFunctionError.md b/docs/reference/classes/MissingMutationFunctionError.md
index 4d07a7939..464693258 100644
--- a/docs/reference/classes/MissingMutationFunctionError.md
+++ b/docs/reference/classes/MissingMutationFunctionError.md
@@ -5,11 +5,11 @@ title: MissingMutationFunctionError
 
 # Class: MissingMutationFunctionError
 
-Defined in: [packages/db/src/errors.ts:268](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L268)
+Defined in: [packages/db/src/errors.ts:277](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L277)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:268](https://github.com/TanStack/db/blob/
 new MissingMutationFunctionError(): MissingMutationFunctionError;
 ```
 
-Defined in: [packages/db/src/errors.ts:269](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L269)
+Defined in: [packages/db/src/errors.ts:278](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L278)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:269](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/MissingUpdateArgumentError.md b/docs/reference/classes/MissingUpdateArgumentError.md
index 86d4cfbda..c55942cc2 100644
--- a/docs/reference/classes/MissingUpdateArgumentError.md
+++ b/docs/reference/classes/MissingUpdateArgumentError.md
@@ -5,11 +5,11 @@ title: MissingUpdateArgumentError
 
 # Class: MissingUpdateArgumentError
 
-Defined in: [packages/db/src/errors.ts:186](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L186)
+Defined in: [packages/db/src/errors.ts:195](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L195)
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:186](https://github.com/TanStack/db/blob/
 new MissingUpdateArgumentError(): MissingUpdateArgumentError;
 ```
 
-Defined in: [packages/db/src/errors.ts:187](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L187)
+Defined in: [packages/db/src/errors.ts:196](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L196)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:187](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/MissingUpdateHandlerError.md b/docs/reference/classes/MissingUpdateHandlerError.md
index 627dbf336..2ae8f2cfb 100644
--- a/docs/reference/classes/MissingUpdateHandlerError.md
+++ b/docs/reference/classes/MissingUpdateHandlerError.md
@@ -5,11 +5,11 @@ title: MissingUpdateHandlerError
 
 # Class: MissingUpdateHandlerError
 
-Defined in: [packages/db/src/errors.ts:244](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L244)
+Defined in: [packages/db/src/errors.ts:253](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L253)
 
 ## Extends
 
-- [`MissingHandlerError`](../MissingHandlerError.md)
+- [`MissingHandlerError`](MissingHandlerError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:244](https://github.com/TanStack/db/blob/
 new MissingUpdateHandlerError(): MissingUpdateHandlerError;
 ```
 
-Defined in: [packages/db/src/errors.ts:245](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L245)
+Defined in: [packages/db/src/errors.ts:254](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L254)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:245](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`constructor`](../MissingHandlerError.md#constructor)
+[`MissingHandlerError`](MissingHandlerError.md).[`constructor`](MissingHandlerError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`cause`](../MissingHandlerError.md#cause)
+[`MissingHandlerError`](MissingHandlerError.md).[`cause`](MissingHandlerError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`message`](../MissingHandlerError.md#message)
+[`MissingHandlerError`](MissingHandlerError.md).[`message`](MissingHandlerError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`name`](../MissingHandlerError.md#name)
+[`MissingHandlerError`](MissingHandlerError.md).[`name`](MissingHandlerError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`stack`](../MissingHandlerError.md#stack)
+[`MissingHandlerError`](MissingHandlerError.md).[`stack`](MissingHandlerError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`stackTraceLimit`](../MissingHandlerError.md#stacktracelimit)
+[`MissingHandlerError`](MissingHandlerError.md).[`stackTraceLimit`](MissingHandlerError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`captureStackTrace`](../MissingHandlerError.md#capturestacktrace)
+[`MissingHandlerError`](MissingHandlerError.md).[`captureStackTrace`](MissingHandlerError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`MissingHandlerError`](../MissingHandlerError.md).[`prepareStackTrace`](../MissingHandlerError.md#preparestacktrace)
+[`MissingHandlerError`](MissingHandlerError.md).[`prepareStackTrace`](MissingHandlerError.md#preparestacktrace)
diff --git a/docs/reference/classes/NegativeActiveSubscribersError.md b/docs/reference/classes/NegativeActiveSubscribersError.md
index cd3b1cc36..d94047c24 100644
--- a/docs/reference/classes/NegativeActiveSubscribersError.md
+++ b/docs/reference/classes/NegativeActiveSubscribersError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:132](https://github.com/TanStack/db/blob/
 
 ## Extends
 
-- [`CollectionStateError`](../CollectionStateError.md)
+- [`CollectionStateError`](CollectionStateError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:133](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionStateError`](../CollectionStateError.md).[`constructor`](../CollectionStateError.md#constructor)
+[`CollectionStateError`](CollectionStateError.md).[`constructor`](CollectionStateError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`cause`](../CollectionStateError.md#cause)
+[`CollectionStateError`](CollectionStateError.md).[`cause`](CollectionStateError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`message`](../CollectionStateError.md#message)
+[`CollectionStateError`](CollectionStateError.md).[`message`](CollectionStateError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`name`](../CollectionStateError.md#name)
+[`CollectionStateError`](CollectionStateError.md).[`name`](CollectionStateError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`stack`](../CollectionStateError.md#stack)
+[`CollectionStateError`](CollectionStateError.md).[`stack`](CollectionStateError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`stackTraceLimit`](../CollectionStateError.md#stacktracelimit)
+[`CollectionStateError`](CollectionStateError.md).[`stackTraceLimit`](CollectionStateError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`captureStackTrace`](../CollectionStateError.md#capturestacktrace)
+[`CollectionStateError`](CollectionStateError.md).[`captureStackTrace`](CollectionStateError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionStateError`](../CollectionStateError.md).[`prepareStackTrace`](../CollectionStateError.md#preparestacktrace)
+[`CollectionStateError`](CollectionStateError.md).[`prepareStackTrace`](CollectionStateError.md#preparestacktrace)
diff --git a/docs/reference/classes/NoKeysPassedToDeleteError.md b/docs/reference/classes/NoKeysPassedToDeleteError.md
index 6decc6337..035ba7cce 100644
--- a/docs/reference/classes/NoKeysPassedToDeleteError.md
+++ b/docs/reference/classes/NoKeysPassedToDeleteError.md
@@ -5,11 +5,11 @@ title: NoKeysPassedToDeleteError
 
 # Class: NoKeysPassedToDeleteError
 
-Defined in: [packages/db/src/errors.ts:214](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L214)
+Defined in: [packages/db/src/errors.ts:223](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L223)
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:214](https://github.com/TanStack/db/blob/
 new NoKeysPassedToDeleteError(): NoKeysPassedToDeleteError;
 ```
 
-Defined in: [packages/db/src/errors.ts:215](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L215)
+Defined in: [packages/db/src/errors.ts:224](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L224)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:215](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/NoKeysPassedToUpdateError.md b/docs/reference/classes/NoKeysPassedToUpdateError.md
index e177fb8a5..a00dfbcd6 100644
--- a/docs/reference/classes/NoKeysPassedToUpdateError.md
+++ b/docs/reference/classes/NoKeysPassedToUpdateError.md
@@ -5,11 +5,11 @@ title: NoKeysPassedToUpdateError
 
 # Class: NoKeysPassedToUpdateError
 
-Defined in: [packages/db/src/errors.ts:192](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L192)
+Defined in: [packages/db/src/errors.ts:201](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L201)
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:192](https://github.com/TanStack/db/blob/
 new NoKeysPassedToUpdateError(): NoKeysPassedToUpdateError;
 ```
 
-Defined in: [packages/db/src/errors.ts:193](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L193)
+Defined in: [packages/db/src/errors.ts:202](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L202)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:193](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/NoPendingSyncTransactionCommitError.md b/docs/reference/classes/NoPendingSyncTransactionCommitError.md
index 4451bf185..09e630c36 100644
--- a/docs/reference/classes/NoPendingSyncTransactionCommitError.md
+++ b/docs/reference/classes/NoPendingSyncTransactionCommitError.md
@@ -5,11 +5,11 @@ title: NoPendingSyncTransactionCommitError
 
 # Class: NoPendingSyncTransactionCommitError
 
-Defined in: [packages/db/src/errors.ts:321](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L321)
+Defined in: [packages/db/src/errors.ts:330](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L330)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:321](https://github.com/TanStack/db/blob/
 new NoPendingSyncTransactionCommitError(): NoPendingSyncTransactionCommitError;
 ```
 
-Defined in: [packages/db/src/errors.ts:322](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L322)
+Defined in: [packages/db/src/errors.ts:331](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L331)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:322](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/NoPendingSyncTransactionWriteError.md b/docs/reference/classes/NoPendingSyncTransactionWriteError.md
index 38d0ac384..f084b858c 100644
--- a/docs/reference/classes/NoPendingSyncTransactionWriteError.md
+++ b/docs/reference/classes/NoPendingSyncTransactionWriteError.md
@@ -5,11 +5,11 @@ title: NoPendingSyncTransactionWriteError
 
 # Class: NoPendingSyncTransactionWriteError
 
-Defined in: [packages/db/src/errors.ts:307](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L307)
+Defined in: [packages/db/src/errors.ts:316](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L316)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:307](https://github.com/TanStack/db/blob/
 new NoPendingSyncTransactionWriteError(): NoPendingSyncTransactionWriteError;
 ```
 
-Defined in: [packages/db/src/errors.ts:308](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L308)
+Defined in: [packages/db/src/errors.ts:317](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L317)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:308](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/NonAggregateExpressionNotInGroupByError.md b/docs/reference/classes/NonAggregateExpressionNotInGroupByError.md
index 8a56a9c0b..47df0cff2 100644
--- a/docs/reference/classes/NonAggregateExpressionNotInGroupByError.md
+++ b/docs/reference/classes/NonAggregateExpressionNotInGroupByError.md
@@ -5,11 +5,11 @@ title: NonAggregateExpressionNotInGroupByError
 
 # Class: NonAggregateExpressionNotInGroupByError
 
-Defined in: [packages/db/src/errors.ts:542](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L542)
+Defined in: [packages/db/src/errors.ts:551](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L551)
 
 ## Extends
 
-- [`GroupByError`](../GroupByError.md)
+- [`GroupByError`](GroupByError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:542](https://github.com/TanStack/db/blob/
 new NonAggregateExpressionNotInGroupByError(alias): NonAggregateExpressionNotInGroupByError;
 ```
 
-Defined in: [packages/db/src/errors.ts:543](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L543)
+Defined in: [packages/db/src/errors.ts:552](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L552)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:543](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`GroupByError`](../GroupByError.md).[`constructor`](../GroupByError.md#constructor)
+[`GroupByError`](GroupByError.md).[`constructor`](GroupByError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`cause`](../GroupByError.md#cause)
+[`GroupByError`](GroupByError.md).[`cause`](GroupByError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`message`](../GroupByError.md#message)
+[`GroupByError`](GroupByError.md).[`message`](GroupByError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`name`](../GroupByError.md#name)
+[`GroupByError`](GroupByError.md).[`name`](GroupByError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`stack`](../GroupByError.md#stack)
+[`GroupByError`](GroupByError.md).[`stack`](GroupByError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`stackTraceLimit`](../GroupByError.md#stacktracelimit)
+[`GroupByError`](GroupByError.md).[`stackTraceLimit`](GroupByError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`captureStackTrace`](../GroupByError.md#capturestacktrace)
+[`GroupByError`](GroupByError.md).[`captureStackTrace`](GroupByError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`prepareStackTrace`](../GroupByError.md#preparestacktrace)
+[`GroupByError`](GroupByError.md).[`prepareStackTrace`](GroupByError.md#preparestacktrace)
diff --git a/docs/reference/classes/NonRetriableError.md b/docs/reference/classes/NonRetriableError.md
index c048829fd..f7c35f700 100644
--- a/docs/reference/classes/NonRetriableError.md
+++ b/docs/reference/classes/NonRetriableError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:10](https://github.com/TanStack/db/blob/m
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:11](https://github.com/TanStack/db/blob/m
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/OnMutateMustBeSynchronousError.md b/docs/reference/classes/OnMutateMustBeSynchronousError.md
index 9294d8e4f..3a37f0eee 100644
--- a/docs/reference/classes/OnMutateMustBeSynchronousError.md
+++ b/docs/reference/classes/OnMutateMustBeSynchronousError.md
@@ -5,11 +5,11 @@ title: OnMutateMustBeSynchronousError
 
 # Class: OnMutateMustBeSynchronousError
 
-Defined in: [packages/db/src/errors.ts:274](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L274)
+Defined in: [packages/db/src/errors.ts:283](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L283)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:274](https://github.com/TanStack/db/blob/
 new OnMutateMustBeSynchronousError(): OnMutateMustBeSynchronousError;
 ```
 
-Defined in: [packages/db/src/errors.ts:275](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L275)
+Defined in: [packages/db/src/errors.ts:284](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L284)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:275](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/OnlyOneSourceAllowedError.md b/docs/reference/classes/OnlyOneSourceAllowedError.md
index 81ae7f6fd..0ccd0ddfe 100644
--- a/docs/reference/classes/OnlyOneSourceAllowedError.md
+++ b/docs/reference/classes/OnlyOneSourceAllowedError.md
@@ -5,11 +5,11 @@ title: OnlyOneSourceAllowedError
 
 # Class: OnlyOneSourceAllowedError
 
-Defined in: [packages/db/src/errors.ts:343](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L343)
+Defined in: [packages/db/src/errors.ts:352](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L352)
 
 ## Extends
 
-- [`QueryBuilderError`](../QueryBuilderError.md)
+- [`QueryBuilderError`](QueryBuilderError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:343](https://github.com/TanStack/db/blob/
 new OnlyOneSourceAllowedError(context): OnlyOneSourceAllowedError;
 ```
 
-Defined in: [packages/db/src/errors.ts:344](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L344)
+Defined in: [packages/db/src/errors.ts:353](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L353)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:344](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`constructor`](../QueryBuilderError.md#constructor)
+[`QueryBuilderError`](QueryBuilderError.md).[`constructor`](QueryBuilderError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`cause`](../QueryBuilderError.md#cause)
+[`QueryBuilderError`](QueryBuilderError.md).[`cause`](QueryBuilderError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`message`](../QueryBuilderError.md#message)
+[`QueryBuilderError`](QueryBuilderError.md).[`message`](QueryBuilderError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`name`](../QueryBuilderError.md#name)
+[`QueryBuilderError`](QueryBuilderError.md).[`name`](QueryBuilderError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stack`](../QueryBuilderError.md#stack)
+[`QueryBuilderError`](QueryBuilderError.md).[`stack`](QueryBuilderError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stackTraceLimit`](../QueryBuilderError.md#stacktracelimit)
+[`QueryBuilderError`](QueryBuilderError.md).[`stackTraceLimit`](QueryBuilderError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`captureStackTrace`](../QueryBuilderError.md#capturestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`captureStackTrace`](QueryBuilderError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`prepareStackTrace`](../QueryBuilderError.md#preparestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`prepareStackTrace`](QueryBuilderError.md#preparestacktrace)
diff --git a/docs/reference/classes/QueryBuilderError.md b/docs/reference/classes/QueryBuilderError.md
index 83c0a2bcc..9298c9ad7 100644
--- a/docs/reference/classes/QueryBuilderError.md
+++ b/docs/reference/classes/QueryBuilderError.md
@@ -5,20 +5,20 @@ title: QueryBuilderError
 
 # Class: QueryBuilderError
 
-Defined in: [packages/db/src/errors.ts:336](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L336)
+Defined in: [packages/db/src/errors.ts:345](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L345)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`OnlyOneSourceAllowedError`](../OnlyOneSourceAllowedError.md)
-- [`SubQueryMustHaveFromClauseError`](../SubQueryMustHaveFromClauseError.md)
-- [`InvalidSourceError`](../InvalidSourceError.md)
-- [`InvalidSourceTypeError`](../InvalidSourceTypeError.md)
-- [`JoinConditionMustBeEqualityError`](../JoinConditionMustBeEqualityError.md)
-- [`QueryMustHaveFromClauseError`](../QueryMustHaveFromClauseError.md)
+- [`OnlyOneSourceAllowedError`](OnlyOneSourceAllowedError.md)
+- [`SubQueryMustHaveFromClauseError`](SubQueryMustHaveFromClauseError.md)
+- [`InvalidSourceError`](InvalidSourceError.md)
+- [`InvalidSourceTypeError`](InvalidSourceTypeError.md)
+- [`JoinConditionMustBeEqualityError`](JoinConditionMustBeEqualityError.md)
+- [`QueryMustHaveFromClauseError`](QueryMustHaveFromClauseError.md)
 
 ## Constructors
 
@@ -28,7 +28,7 @@ Defined in: [packages/db/src/errors.ts:336](https://github.com/TanStack/db/blob/
 new QueryBuilderError(message): QueryBuilderError;
 ```
 
-Defined in: [packages/db/src/errors.ts:337](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L337)
+Defined in: [packages/db/src/errors.ts:346](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L346)
 
 #### Parameters
 
@@ -42,7 +42,7 @@ Defined in: [packages/db/src/errors.ts:337](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -56,7 +56,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -70,7 +70,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -84,7 +84,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -98,7 +98,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -122,7 +122,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -194,7 +194,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -226,4 +226,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/QueryCompilationError.md b/docs/reference/classes/QueryCompilationError.md
index 7628112a7..554bf1ad0 100644
--- a/docs/reference/classes/QueryCompilationError.md
+++ b/docs/reference/classes/QueryCompilationError.md
@@ -5,28 +5,28 @@ title: QueryCompilationError
 
 # Class: QueryCompilationError
 
-Defined in: [packages/db/src/errors.ts:385](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L385)
+Defined in: [packages/db/src/errors.ts:394](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L394)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`DistinctRequiresSelectError`](../DistinctRequiresSelectError.md)
-- [`HavingRequiresGroupByError`](../HavingRequiresGroupByError.md)
-- [`LimitOffsetRequireOrderByError`](../LimitOffsetRequireOrderByError.md)
-- [`CollectionInputNotFoundError`](../CollectionInputNotFoundError.md)
-- [`DuplicateAliasInSubqueryError`](../DuplicateAliasInSubqueryError.md)
-- [`UnsupportedFromTypeError`](../UnsupportedFromTypeError.md)
-- [`UnknownExpressionTypeError`](../UnknownExpressionTypeError.md)
-- [`EmptyReferencePathError`](../EmptyReferencePathError.md)
-- [`UnknownFunctionError`](../UnknownFunctionError.md)
-- [`JoinCollectionNotFoundError`](../JoinCollectionNotFoundError.md)
-- [`SubscriptionNotFoundError`](../SubscriptionNotFoundError.md)
-- [`AggregateNotSupportedError`](../AggregateNotSupportedError.md)
-- [`MissingAliasInputsError`](../MissingAliasInputsError.md)
-- [`SetWindowRequiresOrderByError`](../SetWindowRequiresOrderByError.md)
+- [`DistinctRequiresSelectError`](DistinctRequiresSelectError.md)
+- [`HavingRequiresGroupByError`](HavingRequiresGroupByError.md)
+- [`LimitOffsetRequireOrderByError`](LimitOffsetRequireOrderByError.md)
+- [`CollectionInputNotFoundError`](CollectionInputNotFoundError.md)
+- [`DuplicateAliasInSubqueryError`](DuplicateAliasInSubqueryError.md)
+- [`UnsupportedFromTypeError`](UnsupportedFromTypeError.md)
+- [`UnknownExpressionTypeError`](UnknownExpressionTypeError.md)
+- [`EmptyReferencePathError`](EmptyReferencePathError.md)
+- [`UnknownFunctionError`](UnknownFunctionError.md)
+- [`JoinCollectionNotFoundError`](JoinCollectionNotFoundError.md)
+- [`SubscriptionNotFoundError`](SubscriptionNotFoundError.md)
+- [`AggregateNotSupportedError`](AggregateNotSupportedError.md)
+- [`MissingAliasInputsError`](MissingAliasInputsError.md)
+- [`SetWindowRequiresOrderByError`](SetWindowRequiresOrderByError.md)
 
 ## Constructors
 
@@ -36,7 +36,7 @@ Defined in: [packages/db/src/errors.ts:385](https://github.com/TanStack/db/blob/
 new QueryCompilationError(message): QueryCompilationError;
 ```
 
-Defined in: [packages/db/src/errors.ts:386](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L386)
+Defined in: [packages/db/src/errors.ts:395](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L395)
 
 #### Parameters
 
@@ -50,7 +50,7 @@ Defined in: [packages/db/src/errors.ts:386](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -64,7 +64,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -78,7 +78,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -92,7 +92,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -106,7 +106,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -130,7 +130,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -202,7 +202,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -234,4 +234,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/QueryMustHaveFromClauseError.md b/docs/reference/classes/QueryMustHaveFromClauseError.md
index 07b085bc2..2c1614f3a 100644
--- a/docs/reference/classes/QueryMustHaveFromClauseError.md
+++ b/docs/reference/classes/QueryMustHaveFromClauseError.md
@@ -5,11 +5,11 @@ title: QueryMustHaveFromClauseError
 
 # Class: QueryMustHaveFromClauseError
 
-Defined in: [packages/db/src/errors.ts:378](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L378)
+Defined in: [packages/db/src/errors.ts:387](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L387)
 
 ## Extends
 
-- [`QueryBuilderError`](../QueryBuilderError.md)
+- [`QueryBuilderError`](QueryBuilderError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:378](https://github.com/TanStack/db/blob/
 new QueryMustHaveFromClauseError(): QueryMustHaveFromClauseError;
 ```
 
-Defined in: [packages/db/src/errors.ts:379](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L379)
+Defined in: [packages/db/src/errors.ts:388](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L388)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:379](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`constructor`](../QueryBuilderError.md#constructor)
+[`QueryBuilderError`](QueryBuilderError.md).[`constructor`](QueryBuilderError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`cause`](../QueryBuilderError.md#cause)
+[`QueryBuilderError`](QueryBuilderError.md).[`cause`](QueryBuilderError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`message`](../QueryBuilderError.md#message)
+[`QueryBuilderError`](QueryBuilderError.md).[`message`](QueryBuilderError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`name`](../QueryBuilderError.md#name)
+[`QueryBuilderError`](QueryBuilderError.md).[`name`](QueryBuilderError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stack`](../QueryBuilderError.md#stack)
+[`QueryBuilderError`](QueryBuilderError.md).[`stack`](QueryBuilderError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stackTraceLimit`](../QueryBuilderError.md#stacktracelimit)
+[`QueryBuilderError`](QueryBuilderError.md).[`stackTraceLimit`](QueryBuilderError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`captureStackTrace`](../QueryBuilderError.md#capturestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`captureStackTrace`](QueryBuilderError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`prepareStackTrace`](../QueryBuilderError.md#preparestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`prepareStackTrace`](QueryBuilderError.md#preparestacktrace)
diff --git a/docs/reference/classes/QueryOptimizerError.md b/docs/reference/classes/QueryOptimizerError.md
index 310a308e3..5921d72f0 100644
--- a/docs/reference/classes/QueryOptimizerError.md
+++ b/docs/reference/classes/QueryOptimizerError.md
@@ -5,16 +5,16 @@ title: QueryOptimizerError
 
 # Class: QueryOptimizerError
 
-Defined in: [packages/db/src/errors.ts:628](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L628)
+Defined in: [packages/db/src/errors.ts:637](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L637)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`CannotCombineEmptyExpressionListError`](../CannotCombineEmptyExpressionListError.md)
-- [`WhereClauseConversionError`](../WhereClauseConversionError.md)
+- [`CannotCombineEmptyExpressionListError`](CannotCombineEmptyExpressionListError.md)
+- [`WhereClauseConversionError`](WhereClauseConversionError.md)
 
 ## Constructors
 
@@ -24,7 +24,7 @@ Defined in: [packages/db/src/errors.ts:628](https://github.com/TanStack/db/blob/
 new QueryOptimizerError(message): QueryOptimizerError;
 ```
 
-Defined in: [packages/db/src/errors.ts:629](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L629)
+Defined in: [packages/db/src/errors.ts:638](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L638)
 
 #### Parameters
 
@@ -38,7 +38,7 @@ Defined in: [packages/db/src/errors.ts:629](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -52,7 +52,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -66,7 +66,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -80,7 +80,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -94,7 +94,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -118,7 +118,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -190,7 +190,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -222,4 +222,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/SchemaMustBeSynchronousError.md b/docs/reference/classes/SchemaMustBeSynchronousError.md
index 85d06e5fa..875b79afd 100644
--- a/docs/reference/classes/SchemaMustBeSynchronousError.md
+++ b/docs/reference/classes/SchemaMustBeSynchronousError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:96](https://github.com/TanStack/db/blob/m
 
 ## Extends
 
-- [`CollectionConfigurationError`](../CollectionConfigurationError.md)
+- [`CollectionConfigurationError`](CollectionConfigurationError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:97](https://github.com/TanStack/db/blob/m
 
 #### Overrides
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`constructor`](../CollectionConfigurationError.md#constructor)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`constructor`](CollectionConfigurationError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`cause`](../CollectionConfigurationError.md#cause)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`cause`](CollectionConfigurationError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`message`](../CollectionConfigurationError.md#message)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`message`](CollectionConfigurationError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`name`](../CollectionConfigurationError.md#name)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`name`](CollectionConfigurationError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`stack`](../CollectionConfigurationError.md#stack)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`stack`](CollectionConfigurationError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`stackTraceLimit`](../CollectionConfigurationError.md#stacktracelimit)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`stackTraceLimit`](CollectionConfigurationError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`captureStackTrace`](../CollectionConfigurationError.md#capturestacktrace)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`captureStackTrace`](CollectionConfigurationError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionConfigurationError`](../CollectionConfigurationError.md).[`prepareStackTrace`](../CollectionConfigurationError.md#preparestacktrace)
+[`CollectionConfigurationError`](CollectionConfigurationError.md).[`prepareStackTrace`](CollectionConfigurationError.md#preparestacktrace)
diff --git a/docs/reference/classes/SchemaValidationError.md b/docs/reference/classes/SchemaValidationError.md
index fecd17ffa..8c7f1d436 100644
--- a/docs/reference/classes/SchemaValidationError.md
+++ b/docs/reference/classes/SchemaValidationError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:18](https://github.com/TanStack/db/blob/m
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Constructors
 
@@ -44,7 +44,7 @@ readonly `object`[]
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -58,7 +58,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -82,7 +82,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -96,7 +96,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -110,7 +110,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -144,7 +144,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -216,7 +216,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -248,4 +248,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/SerializationError.md b/docs/reference/classes/SerializationError.md
index ba8d0cd59..68cb34f6d 100644
--- a/docs/reference/classes/SerializationError.md
+++ b/docs/reference/classes/SerializationError.md
@@ -5,11 +5,11 @@ title: SerializationError
 
 # Class: SerializationError
 
-Defined in: [packages/db/src/errors.ts:578](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L578)
+Defined in: [packages/db/src/errors.ts:587](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L587)
 
 ## Extends
 
-- [`StorageError`](../StorageError.md)
+- [`StorageError`](StorageError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:578](https://github.com/TanStack/db/blob/
 new SerializationError(operation, originalError): SerializationError;
 ```
 
-Defined in: [packages/db/src/errors.ts:579](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L579)
+Defined in: [packages/db/src/errors.ts:588](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L588)
 
 #### Parameters
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/errors.ts:579](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`StorageError`](../StorageError.md).[`constructor`](../StorageError.md#constructor)
+[`StorageError`](StorageError.md).[`constructor`](StorageError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`cause`](../StorageError.md#cause)
+[`StorageError`](StorageError.md).[`cause`](StorageError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`message`](../StorageError.md#message)
+[`StorageError`](StorageError.md).[`message`](StorageError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`name`](../StorageError.md#name)
+[`StorageError`](StorageError.md).[`name`](StorageError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`stack`](../StorageError.md#stack)
+[`StorageError`](StorageError.md).[`stack`](StorageError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`stackTraceLimit`](../StorageError.md#stacktracelimit)
+[`StorageError`](StorageError.md).[`stackTraceLimit`](StorageError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`captureStackTrace`](../StorageError.md#capturestacktrace)
+[`StorageError`](StorageError.md).[`captureStackTrace`](StorageError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`StorageError`](../StorageError.md).[`prepareStackTrace`](../StorageError.md#preparestacktrace)
+[`StorageError`](StorageError.md).[`prepareStackTrace`](StorageError.md#preparestacktrace)
diff --git a/docs/reference/classes/SetWindowRequiresOrderByError.md b/docs/reference/classes/SetWindowRequiresOrderByError.md
index 68ae1e85e..4184822cf 100644
--- a/docs/reference/classes/SetWindowRequiresOrderByError.md
+++ b/docs/reference/classes/SetWindowRequiresOrderByError.md
@@ -5,13 +5,13 @@ title: SetWindowRequiresOrderByError
 
 # Class: SetWindowRequiresOrderByError
 
-Defined in: [packages/db/src/errors.ts:696](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L696)
+Defined in: [packages/db/src/errors.ts:705](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L705)
 
 Error thrown when setWindow is called on a collection without an ORDER BY clause.
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -21,7 +21,7 @@ Error thrown when setWindow is called on a collection without an ORDER BY clause
 new SetWindowRequiresOrderByError(): SetWindowRequiresOrderByError;
 ```
 
-Defined in: [packages/db/src/errors.ts:697](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L697)
+Defined in: [packages/db/src/errors.ts:706](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L706)
 
 #### Returns
 
@@ -29,7 +29,7 @@ Defined in: [packages/db/src/errors.ts:697](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -43,7 +43,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -57,7 +57,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -71,7 +71,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -85,7 +85,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -109,7 +109,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -181,7 +181,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -213,4 +213,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/SortedMap.md b/docs/reference/classes/SortedMap.md
index 9b81f77cf..b61e5adcb 100644
--- a/docs/reference/classes/SortedMap.md
+++ b/docs/reference/classes/SortedMap.md
@@ -5,7 +5,7 @@ title: SortedMap
 
 # Class: SortedMap\<TKey, TValue\>
 
-Defined in: [packages/db/src/SortedMap.ts:6](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L6)
+Defined in: [packages/db/src/SortedMap.ts:8](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L8)
 
 A Map implementation that keeps its entries sorted based on a comparator function
 
@@ -13,9 +13,9 @@ A Map implementation that keeps its entries sorted based on a comparator functio
 
 ### TKey
 
-`TKey`
+`TKey` *extends* `string` \| `number`
 
-The type of keys in the map
+The type of keys in the map (must be string | number)
 
 ### TValue
 
@@ -31,7 +31,7 @@ The type of values in the map
 new SortedMap<TKey, TValue>(comparator?): SortedMap<TKey, TValue>;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:16](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L16)
+Defined in: [packages/db/src/SortedMap.ts:19](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L19)
 
 Creates a new SortedMap instance
 
@@ -41,7 +41,8 @@ Creates a new SortedMap instance
 
 (`a`, `b`) => `number`
 
-Optional function to compare values for sorting
+Optional function to compare values for sorting.
+                    If not provided, entries are sorted by key only.
 
 #### Returns
 
@@ -57,7 +58,7 @@ Optional function to compare values for sorting
 get size(): number;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:138](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L138)
+Defined in: [packages/db/src/SortedMap.ts:157](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L157)
 
 Gets the number of key-value pairs in the map
 
@@ -73,7 +74,7 @@ Gets the number of key-value pairs in the map
 iterator: IterableIterator<[TKey, TValue]>;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:147](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L147)
+Defined in: [packages/db/src/SortedMap.ts:166](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L166)
 
 Default iterator that returns entries in sorted order
 
@@ -91,7 +92,7 @@ An iterator for the map's entries
 clear(): void;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:130](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L130)
+Defined in: [packages/db/src/SortedMap.ts:149](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L149)
 
 Removes all key-value pairs from the map
 
@@ -107,7 +108,7 @@ Removes all key-value pairs from the map
 delete(key): boolean;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:106](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L106)
+Defined in: [packages/db/src/SortedMap.ts:125](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L125)
 
 Removes a key-value pair from the map
 
@@ -133,7 +134,7 @@ True if the key was found and removed, false otherwise
 entries(): IterableIterator<[TKey, TValue]>;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:158](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L158)
+Defined in: [packages/db/src/SortedMap.ts:177](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L177)
 
 Returns an iterator for the map's entries in sorted order
 
@@ -151,7 +152,7 @@ An iterator for the map's entries
 forEach(callbackfn): void;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:189](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L189)
+Defined in: [packages/db/src/SortedMap.ts:208](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L208)
 
 Executes a callback function for each key-value pair in the map in sorted order
 
@@ -175,7 +176,7 @@ Function to execute for each entry
 get(key): TValue | undefined;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:96](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L96)
+Defined in: [packages/db/src/SortedMap.ts:115](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L115)
 
 Gets a value by its key
 
@@ -201,7 +202,7 @@ The value associated with the key, or undefined if not found
 has(key): boolean;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:123](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L123)
+Defined in: [packages/db/src/SortedMap.ts:142](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L142)
 
 Checks if a key exists in the map
 
@@ -227,7 +228,7 @@ True if the key exists, false otherwise
 keys(): IterableIterator<TKey>;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:167](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L167)
+Defined in: [packages/db/src/SortedMap.ts:186](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L186)
 
 Returns an iterator for the map's keys in sorted order
 
@@ -245,7 +246,7 @@ An iterator for the map's keys
 set(key, value): this;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:73](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L73)
+Defined in: [packages/db/src/SortedMap.ts:92](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L92)
 
 Sets a key-value pair in the map and maintains sort order
 
@@ -277,7 +278,7 @@ This SortedMap instance for chaining
 values(): IterableIterator<TValue>;
 ```
 
-Defined in: [packages/db/src/SortedMap.ts:176](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L176)
+Defined in: [packages/db/src/SortedMap.ts:195](https://github.com/TanStack/db/blob/main/packages/db/src/SortedMap.ts#L195)
 
 Returns an iterator for the map's values in sorted order
 
diff --git a/docs/reference/classes/StorageError.md b/docs/reference/classes/StorageError.md
index d8c4fc35b..9cc3dedd8 100644
--- a/docs/reference/classes/StorageError.md
+++ b/docs/reference/classes/StorageError.md
@@ -5,16 +5,16 @@ title: StorageError
 
 # Class: StorageError
 
-Defined in: [packages/db/src/errors.ts:571](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L571)
+Defined in: [packages/db/src/errors.ts:580](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L580)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`SerializationError`](../SerializationError.md)
-- [`LocalStorageCollectionError`](../LocalStorageCollectionError.md)
+- [`SerializationError`](SerializationError.md)
+- [`LocalStorageCollectionError`](LocalStorageCollectionError.md)
 
 ## Constructors
 
@@ -24,7 +24,7 @@ Defined in: [packages/db/src/errors.ts:571](https://github.com/TanStack/db/blob/
 new StorageError(message): StorageError;
 ```
 
-Defined in: [packages/db/src/errors.ts:572](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L572)
+Defined in: [packages/db/src/errors.ts:581](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L581)
 
 #### Parameters
 
@@ -38,7 +38,7 @@ Defined in: [packages/db/src/errors.ts:572](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -52,7 +52,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -66,7 +66,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -80,7 +80,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -94,7 +94,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -118,7 +118,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -190,7 +190,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -222,4 +222,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/StorageKeyRequiredError.md b/docs/reference/classes/StorageKeyRequiredError.md
index ac825a752..14f3628f7 100644
--- a/docs/reference/classes/StorageKeyRequiredError.md
+++ b/docs/reference/classes/StorageKeyRequiredError.md
@@ -5,11 +5,11 @@ title: StorageKeyRequiredError
 
 # Class: StorageKeyRequiredError
 
-Defined in: [packages/db/src/errors.ts:594](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L594)
+Defined in: [packages/db/src/errors.ts:603](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L603)
 
 ## Extends
 
-- [`LocalStorageCollectionError`](../LocalStorageCollectionError.md)
+- [`LocalStorageCollectionError`](LocalStorageCollectionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:594](https://github.com/TanStack/db/blob/
 new StorageKeyRequiredError(): StorageKeyRequiredError;
 ```
 
-Defined in: [packages/db/src/errors.ts:595](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L595)
+Defined in: [packages/db/src/errors.ts:604](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L604)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:595](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`constructor`](../LocalStorageCollectionError.md#constructor)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`constructor`](LocalStorageCollectionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`cause`](../LocalStorageCollectionError.md#cause)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`cause`](LocalStorageCollectionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`message`](../LocalStorageCollectionError.md#message)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`message`](LocalStorageCollectionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`name`](../LocalStorageCollectionError.md#name)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`name`](LocalStorageCollectionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`stack`](../LocalStorageCollectionError.md#stack)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`stack`](LocalStorageCollectionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`stackTraceLimit`](../LocalStorageCollectionError.md#stacktracelimit)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`stackTraceLimit`](LocalStorageCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`captureStackTrace`](../LocalStorageCollectionError.md#capturestacktrace)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`captureStackTrace`](LocalStorageCollectionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`LocalStorageCollectionError`](../LocalStorageCollectionError.md).[`prepareStackTrace`](../LocalStorageCollectionError.md#preparestacktrace)
+[`LocalStorageCollectionError`](LocalStorageCollectionError.md).[`prepareStackTrace`](LocalStorageCollectionError.md#preparestacktrace)
diff --git a/docs/reference/classes/SubQueryMustHaveFromClauseError.md b/docs/reference/classes/SubQueryMustHaveFromClauseError.md
index db02ceff9..f9425a733 100644
--- a/docs/reference/classes/SubQueryMustHaveFromClauseError.md
+++ b/docs/reference/classes/SubQueryMustHaveFromClauseError.md
@@ -5,11 +5,11 @@ title: SubQueryMustHaveFromClauseError
 
 # Class: SubQueryMustHaveFromClauseError
 
-Defined in: [packages/db/src/errors.ts:349](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L349)
+Defined in: [packages/db/src/errors.ts:358](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L358)
 
 ## Extends
 
-- [`QueryBuilderError`](../QueryBuilderError.md)
+- [`QueryBuilderError`](QueryBuilderError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:349](https://github.com/TanStack/db/blob/
 new SubQueryMustHaveFromClauseError(context): SubQueryMustHaveFromClauseError;
 ```
 
-Defined in: [packages/db/src/errors.ts:350](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L350)
+Defined in: [packages/db/src/errors.ts:359](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L359)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:350](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`constructor`](../QueryBuilderError.md#constructor)
+[`QueryBuilderError`](QueryBuilderError.md).[`constructor`](QueryBuilderError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`cause`](../QueryBuilderError.md#cause)
+[`QueryBuilderError`](QueryBuilderError.md).[`cause`](QueryBuilderError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`message`](../QueryBuilderError.md#message)
+[`QueryBuilderError`](QueryBuilderError.md).[`message`](QueryBuilderError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`name`](../QueryBuilderError.md#name)
+[`QueryBuilderError`](QueryBuilderError.md).[`name`](QueryBuilderError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stack`](../QueryBuilderError.md#stack)
+[`QueryBuilderError`](QueryBuilderError.md).[`stack`](QueryBuilderError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`stackTraceLimit`](../QueryBuilderError.md#stacktracelimit)
+[`QueryBuilderError`](QueryBuilderError.md).[`stackTraceLimit`](QueryBuilderError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`captureStackTrace`](../QueryBuilderError.md#capturestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`captureStackTrace`](QueryBuilderError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryBuilderError`](../QueryBuilderError.md).[`prepareStackTrace`](../QueryBuilderError.md#preparestacktrace)
+[`QueryBuilderError`](QueryBuilderError.md).[`prepareStackTrace`](QueryBuilderError.md#preparestacktrace)
diff --git a/docs/reference/classes/SubscriptionNotFoundError.md b/docs/reference/classes/SubscriptionNotFoundError.md
index a42d9079f..5fee01cd9 100644
--- a/docs/reference/classes/SubscriptionNotFoundError.md
+++ b/docs/reference/classes/SubscriptionNotFoundError.md
@@ -5,14 +5,14 @@ title: SubscriptionNotFoundError
 
 # Class: SubscriptionNotFoundError
 
-Defined in: [packages/db/src/errors.ts:656](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L656)
+Defined in: [packages/db/src/errors.ts:665](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L665)
 
 Error when a subscription cannot be found during lazy join processing.
 For subqueries, aliases may be remapped (e.g., 'activeUser' → 'user').
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -26,7 +26,7 @@ new SubscriptionNotFoundError(
    availableAliases): SubscriptionNotFoundError;
 ```
 
-Defined in: [packages/db/src/errors.ts:657](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L657)
+Defined in: [packages/db/src/errors.ts:666](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L666)
 
 #### Parameters
 
@@ -52,7 +52,7 @@ Defined in: [packages/db/src/errors.ts:657](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -66,7 +66,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -80,7 +80,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -94,7 +94,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -108,7 +108,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -132,7 +132,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -204,7 +204,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -236,4 +236,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/SyncCleanupError.md b/docs/reference/classes/SyncCleanupError.md
index d8d7c3b7a..1a0d6fffd 100644
--- a/docs/reference/classes/SyncCleanupError.md
+++ b/docs/reference/classes/SyncCleanupError.md
@@ -5,11 +5,11 @@ title: SyncCleanupError
 
 # Class: SyncCleanupError
 
-Defined in: [packages/db/src/errors.ts:617](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L617)
+Defined in: [packages/db/src/errors.ts:626](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L626)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:617](https://github.com/TanStack/db/blob/
 new SyncCleanupError(collectionId, error): SyncCleanupError;
 ```
 
-Defined in: [packages/db/src/errors.ts:618](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L618)
+Defined in: [packages/db/src/errors.ts:627](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L627)
 
 #### Parameters
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/errors.ts:618](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/SyncTransactionAlreadyCommittedError.md b/docs/reference/classes/SyncTransactionAlreadyCommittedError.md
index 78daaf215..eccf52231 100644
--- a/docs/reference/classes/SyncTransactionAlreadyCommittedError.md
+++ b/docs/reference/classes/SyncTransactionAlreadyCommittedError.md
@@ -5,11 +5,11 @@ title: SyncTransactionAlreadyCommittedError
 
 # Class: SyncTransactionAlreadyCommittedError
 
-Defined in: [packages/db/src/errors.ts:327](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L327)
+Defined in: [packages/db/src/errors.ts:336](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L336)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:327](https://github.com/TanStack/db/blob/
 new SyncTransactionAlreadyCommittedError(): SyncTransactionAlreadyCommittedError;
 ```
 
-Defined in: [packages/db/src/errors.ts:328](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L328)
+Defined in: [packages/db/src/errors.ts:337](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L337)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:328](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/SyncTransactionAlreadyCommittedWriteError.md b/docs/reference/classes/SyncTransactionAlreadyCommittedWriteError.md
index 1fa89e16b..d0b28cccc 100644
--- a/docs/reference/classes/SyncTransactionAlreadyCommittedWriteError.md
+++ b/docs/reference/classes/SyncTransactionAlreadyCommittedWriteError.md
@@ -5,11 +5,11 @@ title: SyncTransactionAlreadyCommittedWriteError
 
 # Class: SyncTransactionAlreadyCommittedWriteError
 
-Defined in: [packages/db/src/errors.ts:313](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L313)
+Defined in: [packages/db/src/errors.ts:322](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L322)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:313](https://github.com/TanStack/db/blob/
 new SyncTransactionAlreadyCommittedWriteError(): SyncTransactionAlreadyCommittedWriteError;
 ```
 
-Defined in: [packages/db/src/errors.ts:314](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L314)
+Defined in: [packages/db/src/errors.ts:323](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L323)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:314](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/TanStackDBError.md b/docs/reference/classes/TanStackDBError.md
index dabc7ccbd..f0566cbf1 100644
--- a/docs/reference/classes/TanStackDBError.md
+++ b/docs/reference/classes/TanStackDBError.md
@@ -13,21 +13,21 @@ Defined in: [packages/db/src/errors.ts:2](https://github.com/TanStack/db/blob/ma
 
 ## Extended by
 
-- [`NonRetriableError`](../NonRetriableError.md)
-- [`SchemaValidationError`](../SchemaValidationError.md)
-- [`DuplicateDbInstanceError`](../DuplicateDbInstanceError.md)
-- [`CollectionConfigurationError`](../CollectionConfigurationError.md)
-- [`CollectionStateError`](../CollectionStateError.md)
-- [`CollectionOperationError`](../CollectionOperationError.md)
-- [`MissingHandlerError`](../MissingHandlerError.md)
-- [`TransactionError`](../TransactionError.md)
-- [`QueryBuilderError`](../QueryBuilderError.md)
-- [`QueryCompilationError`](../QueryCompilationError.md)
-- [`JoinError`](../JoinError.md)
-- [`GroupByError`](../GroupByError.md)
-- [`StorageError`](../StorageError.md)
-- [`SyncCleanupError`](../SyncCleanupError.md)
-- [`QueryOptimizerError`](../QueryOptimizerError.md)
+- [`NonRetriableError`](NonRetriableError.md)
+- [`SchemaValidationError`](SchemaValidationError.md)
+- [`DuplicateDbInstanceError`](DuplicateDbInstanceError.md)
+- [`CollectionConfigurationError`](CollectionConfigurationError.md)
+- [`CollectionStateError`](CollectionStateError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
+- [`MissingHandlerError`](MissingHandlerError.md)
+- [`TransactionError`](TransactionError.md)
+- [`QueryBuilderError`](QueryBuilderError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
+- [`JoinError`](JoinError.md)
+- [`GroupByError`](GroupByError.md)
+- [`StorageError`](StorageError.md)
+- [`SyncCleanupError`](SyncCleanupError.md)
+- [`QueryOptimizerError`](QueryOptimizerError.md)
 
 ## Constructors
 
diff --git a/docs/reference/classes/TransactionAlreadyCompletedRollbackError.md b/docs/reference/classes/TransactionAlreadyCompletedRollbackError.md
index 6469f7f0c..2dbfcd439 100644
--- a/docs/reference/classes/TransactionAlreadyCompletedRollbackError.md
+++ b/docs/reference/classes/TransactionAlreadyCompletedRollbackError.md
@@ -5,11 +5,11 @@ title: TransactionAlreadyCompletedRollbackError
 
 # Class: TransactionAlreadyCompletedRollbackError
 
-Defined in: [packages/db/src/errors.ts:291](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L291)
+Defined in: [packages/db/src/errors.ts:300](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L300)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:291](https://github.com/TanStack/db/blob/
 new TransactionAlreadyCompletedRollbackError(): TransactionAlreadyCompletedRollbackError;
 ```
 
-Defined in: [packages/db/src/errors.ts:292](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L292)
+Defined in: [packages/db/src/errors.ts:301](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L301)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:292](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/TransactionError.md b/docs/reference/classes/TransactionError.md
index 29381eeb0..045dad833 100644
--- a/docs/reference/classes/TransactionError.md
+++ b/docs/reference/classes/TransactionError.md
@@ -5,23 +5,23 @@ title: TransactionError
 
 # Class: TransactionError
 
-Defined in: [packages/db/src/errors.ts:261](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L261)
+Defined in: [packages/db/src/errors.ts:270](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L270)
 
 ## Extends
 
-- [`TanStackDBError`](../TanStackDBError.md)
+- [`TanStackDBError`](TanStackDBError.md)
 
 ## Extended by
 
-- [`MissingMutationFunctionError`](../MissingMutationFunctionError.md)
-- [`OnMutateMustBeSynchronousError`](../OnMutateMustBeSynchronousError.md)
-- [`TransactionNotPendingMutateError`](../TransactionNotPendingMutateError.md)
-- [`TransactionAlreadyCompletedRollbackError`](../TransactionAlreadyCompletedRollbackError.md)
-- [`TransactionNotPendingCommitError`](../TransactionNotPendingCommitError.md)
-- [`NoPendingSyncTransactionWriteError`](../NoPendingSyncTransactionWriteError.md)
-- [`SyncTransactionAlreadyCommittedWriteError`](../SyncTransactionAlreadyCommittedWriteError.md)
-- [`NoPendingSyncTransactionCommitError`](../NoPendingSyncTransactionCommitError.md)
-- [`SyncTransactionAlreadyCommittedError`](../SyncTransactionAlreadyCommittedError.md)
+- [`MissingMutationFunctionError`](MissingMutationFunctionError.md)
+- [`OnMutateMustBeSynchronousError`](OnMutateMustBeSynchronousError.md)
+- [`TransactionNotPendingMutateError`](TransactionNotPendingMutateError.md)
+- [`TransactionAlreadyCompletedRollbackError`](TransactionAlreadyCompletedRollbackError.md)
+- [`TransactionNotPendingCommitError`](TransactionNotPendingCommitError.md)
+- [`NoPendingSyncTransactionWriteError`](NoPendingSyncTransactionWriteError.md)
+- [`SyncTransactionAlreadyCommittedWriteError`](SyncTransactionAlreadyCommittedWriteError.md)
+- [`NoPendingSyncTransactionCommitError`](NoPendingSyncTransactionCommitError.md)
+- [`SyncTransactionAlreadyCommittedError`](SyncTransactionAlreadyCommittedError.md)
 
 ## Constructors
 
@@ -31,7 +31,7 @@ Defined in: [packages/db/src/errors.ts:261](https://github.com/TanStack/db/blob/
 new TransactionError(message): TransactionError;
 ```
 
-Defined in: [packages/db/src/errors.ts:262](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L262)
+Defined in: [packages/db/src/errors.ts:271](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L271)
 
 #### Parameters
 
@@ -45,7 +45,7 @@ Defined in: [packages/db/src/errors.ts:262](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TanStackDBError`](../TanStackDBError.md).[`constructor`](../TanStackDBError.md#constructor)
+[`TanStackDBError`](TanStackDBError.md).[`constructor`](TanStackDBError.md#constructor)
 
 ## Properties
 
@@ -59,7 +59,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`cause`](../TanStackDBError.md#cause)
+[`TanStackDBError`](TanStackDBError.md).[`cause`](TanStackDBError.md#cause)
 
 ***
 
@@ -73,7 +73,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`message`](../TanStackDBError.md#message)
+[`TanStackDBError`](TanStackDBError.md).[`message`](TanStackDBError.md#message)
 
 ***
 
@@ -87,7 +87,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`name`](../TanStackDBError.md#name)
+[`TanStackDBError`](TanStackDBError.md).[`name`](TanStackDBError.md#name)
 
 ***
 
@@ -101,7 +101,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stack`](../TanStackDBError.md#stack)
+[`TanStackDBError`](TanStackDBError.md).[`stack`](TanStackDBError.md#stack)
 
 ***
 
@@ -125,7 +125,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`stackTraceLimit`](../TanStackDBError.md#stacktracelimit)
+[`TanStackDBError`](TanStackDBError.md).[`stackTraceLimit`](TanStackDBError.md#stacktracelimit)
 
 ## Methods
 
@@ -197,7 +197,7 @@ a();
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`captureStackTrace`](../TanStackDBError.md#capturestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`captureStackTrace`](TanStackDBError.md#capturestacktrace)
 
 ***
 
@@ -229,4 +229,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TanStackDBError`](../TanStackDBError.md).[`prepareStackTrace`](../TanStackDBError.md#preparestacktrace)
+[`TanStackDBError`](TanStackDBError.md).[`prepareStackTrace`](TanStackDBError.md#preparestacktrace)
diff --git a/docs/reference/classes/TransactionNotPendingCommitError.md b/docs/reference/classes/TransactionNotPendingCommitError.md
index dc9705bb8..10610aba6 100644
--- a/docs/reference/classes/TransactionNotPendingCommitError.md
+++ b/docs/reference/classes/TransactionNotPendingCommitError.md
@@ -5,11 +5,11 @@ title: TransactionNotPendingCommitError
 
 # Class: TransactionNotPendingCommitError
 
-Defined in: [packages/db/src/errors.ts:299](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L299)
+Defined in: [packages/db/src/errors.ts:308](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L308)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:299](https://github.com/TanStack/db/blob/
 new TransactionNotPendingCommitError(): TransactionNotPendingCommitError;
 ```
 
-Defined in: [packages/db/src/errors.ts:300](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L300)
+Defined in: [packages/db/src/errors.ts:309](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L309)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:300](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/TransactionNotPendingMutateError.md b/docs/reference/classes/TransactionNotPendingMutateError.md
index 57bf6eb32..7fe36cb7c 100644
--- a/docs/reference/classes/TransactionNotPendingMutateError.md
+++ b/docs/reference/classes/TransactionNotPendingMutateError.md
@@ -5,11 +5,11 @@ title: TransactionNotPendingMutateError
 
 # Class: TransactionNotPendingMutateError
 
-Defined in: [packages/db/src/errors.ts:283](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L283)
+Defined in: [packages/db/src/errors.ts:292](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L292)
 
 ## Extends
 
-- [`TransactionError`](../TransactionError.md)
+- [`TransactionError`](TransactionError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:283](https://github.com/TanStack/db/blob/
 new TransactionNotPendingMutateError(): TransactionNotPendingMutateError;
 ```
 
-Defined in: [packages/db/src/errors.ts:284](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L284)
+Defined in: [packages/db/src/errors.ts:293](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L293)
 
 #### Returns
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/errors.ts:284](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`TransactionError`](../TransactionError.md).[`constructor`](../TransactionError.md#constructor)
+[`TransactionError`](TransactionError.md).[`constructor`](TransactionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`cause`](../TransactionError.md#cause)
+[`TransactionError`](TransactionError.md).[`cause`](TransactionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`message`](../TransactionError.md#message)
+[`TransactionError`](TransactionError.md).[`message`](TransactionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`name`](../TransactionError.md#name)
+[`TransactionError`](TransactionError.md).[`name`](TransactionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stack`](../TransactionError.md#stack)
+[`TransactionError`](TransactionError.md).[`stack`](TransactionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`stackTraceLimit`](../TransactionError.md#stacktracelimit)
+[`TransactionError`](TransactionError.md).[`stackTraceLimit`](TransactionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`captureStackTrace`](../TransactionError.md#capturestacktrace)
+[`TransactionError`](TransactionError.md).[`captureStackTrace`](TransactionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`TransactionError`](../TransactionError.md).[`prepareStackTrace`](../TransactionError.md#preparestacktrace)
+[`TransactionError`](TransactionError.md).[`prepareStackTrace`](TransactionError.md#preparestacktrace)
diff --git a/docs/reference/classes/UndefinedKeyError.md b/docs/reference/classes/UndefinedKeyError.md
index 24f075ab1..57fa5d9a1 100644
--- a/docs/reference/classes/UndefinedKeyError.md
+++ b/docs/reference/classes/UndefinedKeyError.md
@@ -9,7 +9,7 @@ Defined in: [packages/db/src/errors.ts:146](https://github.com/TanStack/db/blob/
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:147](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/UnknownExpressionTypeError.md b/docs/reference/classes/UnknownExpressionTypeError.md
index f4d74a8d2..d3b5fa3dd 100644
--- a/docs/reference/classes/UnknownExpressionTypeError.md
+++ b/docs/reference/classes/UnknownExpressionTypeError.md
@@ -5,11 +5,11 @@ title: UnknownExpressionTypeError
 
 # Class: UnknownExpressionTypeError
 
-Defined in: [packages/db/src/errors.ts:454](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L454)
+Defined in: [packages/db/src/errors.ts:463](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L463)
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:454](https://github.com/TanStack/db/blob/
 new UnknownExpressionTypeError(type): UnknownExpressionTypeError;
 ```
 
-Defined in: [packages/db/src/errors.ts:455](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L455)
+Defined in: [packages/db/src/errors.ts:464](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L464)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:455](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/UnknownFunctionError.md b/docs/reference/classes/UnknownFunctionError.md
index 7b9c5cd10..e1f7bc56c 100644
--- a/docs/reference/classes/UnknownFunctionError.md
+++ b/docs/reference/classes/UnknownFunctionError.md
@@ -5,11 +5,11 @@ title: UnknownFunctionError
 
 # Class: UnknownFunctionError
 
-Defined in: [packages/db/src/errors.ts:466](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L466)
+Defined in: [packages/db/src/errors.ts:475](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L475)
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:466](https://github.com/TanStack/db/blob/
 new UnknownFunctionError(functionName): UnknownFunctionError;
 ```
 
-Defined in: [packages/db/src/errors.ts:467](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L467)
+Defined in: [packages/db/src/errors.ts:476](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L476)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:467](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/UnknownHavingExpressionTypeError.md b/docs/reference/classes/UnknownHavingExpressionTypeError.md
index 802a4699c..1b65a6db1 100644
--- a/docs/reference/classes/UnknownHavingExpressionTypeError.md
+++ b/docs/reference/classes/UnknownHavingExpressionTypeError.md
@@ -5,11 +5,11 @@ title: UnknownHavingExpressionTypeError
 
 # Class: UnknownHavingExpressionTypeError
 
-Defined in: [packages/db/src/errors.ts:564](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L564)
+Defined in: [packages/db/src/errors.ts:573](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L573)
 
 ## Extends
 
-- [`GroupByError`](../GroupByError.md)
+- [`GroupByError`](GroupByError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:564](https://github.com/TanStack/db/blob/
 new UnknownHavingExpressionTypeError(type): UnknownHavingExpressionTypeError;
 ```
 
-Defined in: [packages/db/src/errors.ts:565](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L565)
+Defined in: [packages/db/src/errors.ts:574](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L574)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:565](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`GroupByError`](../GroupByError.md).[`constructor`](../GroupByError.md#constructor)
+[`GroupByError`](GroupByError.md).[`constructor`](GroupByError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`cause`](../GroupByError.md#cause)
+[`GroupByError`](GroupByError.md).[`cause`](GroupByError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`message`](../GroupByError.md#message)
+[`GroupByError`](GroupByError.md).[`message`](GroupByError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`name`](../GroupByError.md#name)
+[`GroupByError`](GroupByError.md).[`name`](GroupByError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`stack`](../GroupByError.md#stack)
+[`GroupByError`](GroupByError.md).[`stack`](GroupByError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`stackTraceLimit`](../GroupByError.md#stacktracelimit)
+[`GroupByError`](GroupByError.md).[`stackTraceLimit`](GroupByError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`captureStackTrace`](../GroupByError.md#capturestacktrace)
+[`GroupByError`](GroupByError.md).[`captureStackTrace`](GroupByError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`prepareStackTrace`](../GroupByError.md#preparestacktrace)
+[`GroupByError`](GroupByError.md).[`prepareStackTrace`](GroupByError.md#preparestacktrace)
diff --git a/docs/reference/classes/UnsupportedAggregateFunctionError.md b/docs/reference/classes/UnsupportedAggregateFunctionError.md
index 6f377c35f..d9533a3b9 100644
--- a/docs/reference/classes/UnsupportedAggregateFunctionError.md
+++ b/docs/reference/classes/UnsupportedAggregateFunctionError.md
@@ -5,11 +5,11 @@ title: UnsupportedAggregateFunctionError
 
 # Class: UnsupportedAggregateFunctionError
 
-Defined in: [packages/db/src/errors.ts:550](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L550)
+Defined in: [packages/db/src/errors.ts:559](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L559)
 
 ## Extends
 
-- [`GroupByError`](../GroupByError.md)
+- [`GroupByError`](GroupByError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:550](https://github.com/TanStack/db/blob/
 new UnsupportedAggregateFunctionError(functionName): UnsupportedAggregateFunctionError;
 ```
 
-Defined in: [packages/db/src/errors.ts:551](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L551)
+Defined in: [packages/db/src/errors.ts:560](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L560)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:551](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`GroupByError`](../GroupByError.md).[`constructor`](../GroupByError.md#constructor)
+[`GroupByError`](GroupByError.md).[`constructor`](GroupByError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`cause`](../GroupByError.md#cause)
+[`GroupByError`](GroupByError.md).[`cause`](GroupByError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`message`](../GroupByError.md#message)
+[`GroupByError`](GroupByError.md).[`message`](GroupByError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`name`](../GroupByError.md#name)
+[`GroupByError`](GroupByError.md).[`name`](GroupByError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`stack`](../GroupByError.md#stack)
+[`GroupByError`](GroupByError.md).[`stack`](GroupByError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`stackTraceLimit`](../GroupByError.md#stacktracelimit)
+[`GroupByError`](GroupByError.md).[`stackTraceLimit`](GroupByError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`captureStackTrace`](../GroupByError.md#capturestacktrace)
+[`GroupByError`](GroupByError.md).[`captureStackTrace`](GroupByError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`GroupByError`](../GroupByError.md).[`prepareStackTrace`](../GroupByError.md#preparestacktrace)
+[`GroupByError`](GroupByError.md).[`prepareStackTrace`](GroupByError.md#preparestacktrace)
diff --git a/docs/reference/classes/UnsupportedFromTypeError.md b/docs/reference/classes/UnsupportedFromTypeError.md
index 5dd5b84cf..052f7e181 100644
--- a/docs/reference/classes/UnsupportedFromTypeError.md
+++ b/docs/reference/classes/UnsupportedFromTypeError.md
@@ -5,11 +5,11 @@ title: UnsupportedFromTypeError
 
 # Class: UnsupportedFromTypeError
 
-Defined in: [packages/db/src/errors.ts:448](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L448)
+Defined in: [packages/db/src/errors.ts:457](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L457)
 
 ## Extends
 
-- [`QueryCompilationError`](../QueryCompilationError.md)
+- [`QueryCompilationError`](QueryCompilationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:448](https://github.com/TanStack/db/blob/
 new UnsupportedFromTypeError(type): UnsupportedFromTypeError;
 ```
 
-Defined in: [packages/db/src/errors.ts:449](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L449)
+Defined in: [packages/db/src/errors.ts:458](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L458)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:449](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`constructor`](../QueryCompilationError.md#constructor)
+[`QueryCompilationError`](QueryCompilationError.md).[`constructor`](QueryCompilationError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`cause`](../QueryCompilationError.md#cause)
+[`QueryCompilationError`](QueryCompilationError.md).[`cause`](QueryCompilationError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`message`](../QueryCompilationError.md#message)
+[`QueryCompilationError`](QueryCompilationError.md).[`message`](QueryCompilationError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`name`](../QueryCompilationError.md#name)
+[`QueryCompilationError`](QueryCompilationError.md).[`name`](QueryCompilationError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stack`](../QueryCompilationError.md#stack)
+[`QueryCompilationError`](QueryCompilationError.md).[`stack`](QueryCompilationError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`stackTraceLimit`](../QueryCompilationError.md#stacktracelimit)
+[`QueryCompilationError`](QueryCompilationError.md).[`stackTraceLimit`](QueryCompilationError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`captureStackTrace`](../QueryCompilationError.md#capturestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`captureStackTrace`](QueryCompilationError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCompilationError`](../QueryCompilationError.md).[`prepareStackTrace`](../QueryCompilationError.md#preparestacktrace)
+[`QueryCompilationError`](QueryCompilationError.md).[`prepareStackTrace`](QueryCompilationError.md#preparestacktrace)
diff --git a/docs/reference/classes/UnsupportedJoinSourceTypeError.md b/docs/reference/classes/UnsupportedJoinSourceTypeError.md
index 35282dcef..ca2d13df6 100644
--- a/docs/reference/classes/UnsupportedJoinSourceTypeError.md
+++ b/docs/reference/classes/UnsupportedJoinSourceTypeError.md
@@ -5,11 +5,11 @@ title: UnsupportedJoinSourceTypeError
 
 # Class: UnsupportedJoinSourceTypeError
 
-Defined in: [packages/db/src/errors.ts:528](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L528)
+Defined in: [packages/db/src/errors.ts:537](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L537)
 
 ## Extends
 
-- [`JoinError`](../JoinError.md)
+- [`JoinError`](JoinError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:528](https://github.com/TanStack/db/blob/
 new UnsupportedJoinSourceTypeError(type): UnsupportedJoinSourceTypeError;
 ```
 
-Defined in: [packages/db/src/errors.ts:529](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L529)
+Defined in: [packages/db/src/errors.ts:538](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L538)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:529](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`JoinError`](../JoinError.md).[`constructor`](../JoinError.md#constructor)
+[`JoinError`](JoinError.md).[`constructor`](JoinError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`cause`](../JoinError.md#cause)
+[`JoinError`](JoinError.md).[`cause`](JoinError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`message`](../JoinError.md#message)
+[`JoinError`](JoinError.md).[`message`](JoinError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`name`](../JoinError.md#name)
+[`JoinError`](JoinError.md).[`name`](JoinError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stack`](../JoinError.md#stack)
+[`JoinError`](JoinError.md).[`stack`](JoinError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stackTraceLimit`](../JoinError.md#stacktracelimit)
+[`JoinError`](JoinError.md).[`stackTraceLimit`](JoinError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`captureStackTrace`](../JoinError.md#capturestacktrace)
+[`JoinError`](JoinError.md).[`captureStackTrace`](JoinError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`prepareStackTrace`](../JoinError.md#preparestacktrace)
+[`JoinError`](JoinError.md).[`prepareStackTrace`](JoinError.md#preparestacktrace)
diff --git a/docs/reference/classes/UnsupportedJoinTypeError.md b/docs/reference/classes/UnsupportedJoinTypeError.md
index 9ef53dc56..86e4d6483 100644
--- a/docs/reference/classes/UnsupportedJoinTypeError.md
+++ b/docs/reference/classes/UnsupportedJoinTypeError.md
@@ -5,11 +5,11 @@ title: UnsupportedJoinTypeError
 
 # Class: UnsupportedJoinTypeError
 
-Defined in: [packages/db/src/errors.ts:486](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L486)
+Defined in: [packages/db/src/errors.ts:495](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L495)
 
 ## Extends
 
-- [`JoinError`](../JoinError.md)
+- [`JoinError`](JoinError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:486](https://github.com/TanStack/db/blob/
 new UnsupportedJoinTypeError(joinType): UnsupportedJoinTypeError;
 ```
 
-Defined in: [packages/db/src/errors.ts:487](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L487)
+Defined in: [packages/db/src/errors.ts:496](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L496)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:487](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`JoinError`](../JoinError.md).[`constructor`](../JoinError.md#constructor)
+[`JoinError`](JoinError.md).[`constructor`](JoinError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`cause`](../JoinError.md#cause)
+[`JoinError`](JoinError.md).[`cause`](JoinError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`message`](../JoinError.md#message)
+[`JoinError`](JoinError.md).[`message`](JoinError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`name`](../JoinError.md#name)
+[`JoinError`](JoinError.md).[`name`](JoinError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stack`](../JoinError.md#stack)
+[`JoinError`](JoinError.md).[`stack`](JoinError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`stackTraceLimit`](../JoinError.md#stacktracelimit)
+[`JoinError`](JoinError.md).[`stackTraceLimit`](JoinError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`captureStackTrace`](../JoinError.md#capturestacktrace)
+[`JoinError`](JoinError.md).[`captureStackTrace`](JoinError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`JoinError`](../JoinError.md).[`prepareStackTrace`](../JoinError.md#preparestacktrace)
+[`JoinError`](JoinError.md).[`prepareStackTrace`](JoinError.md#preparestacktrace)
diff --git a/docs/reference/classes/UpdateKeyNotFoundError.md b/docs/reference/classes/UpdateKeyNotFoundError.md
index d029b874b..ad1a7f598 100644
--- a/docs/reference/classes/UpdateKeyNotFoundError.md
+++ b/docs/reference/classes/UpdateKeyNotFoundError.md
@@ -5,11 +5,11 @@ title: UpdateKeyNotFoundError
 
 # Class: UpdateKeyNotFoundError
 
-Defined in: [packages/db/src/errors.ts:198](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L198)
+Defined in: [packages/db/src/errors.ts:207](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L207)
 
 ## Extends
 
-- [`CollectionOperationError`](../CollectionOperationError.md)
+- [`CollectionOperationError`](CollectionOperationError.md)
 
 ## Constructors
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/errors.ts:198](https://github.com/TanStack/db/blob/
 new UpdateKeyNotFoundError(key): UpdateKeyNotFoundError;
 ```
 
-Defined in: [packages/db/src/errors.ts:199](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L199)
+Defined in: [packages/db/src/errors.ts:208](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L208)
 
 #### Parameters
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/errors.ts:199](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`constructor`](../CollectionOperationError.md#constructor)
+[`CollectionOperationError`](CollectionOperationError.md).[`constructor`](CollectionOperationError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`cause`](../CollectionOperationError.md#cause)
+[`CollectionOperationError`](CollectionOperationError.md).[`cause`](CollectionOperationError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`message`](../CollectionOperationError.md#message)
+[`CollectionOperationError`](CollectionOperationError.md).[`message`](CollectionOperationError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`name`](../CollectionOperationError.md#name)
+[`CollectionOperationError`](CollectionOperationError.md).[`name`](CollectionOperationError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stack`](../CollectionOperationError.md#stack)
+[`CollectionOperationError`](CollectionOperationError.md).[`stack`](CollectionOperationError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`stackTraceLimit`](../CollectionOperationError.md#stacktracelimit)
+[`CollectionOperationError`](CollectionOperationError.md).[`stackTraceLimit`](CollectionOperationError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`captureStackTrace`](../CollectionOperationError.md#capturestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`captureStackTrace`](CollectionOperationError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`CollectionOperationError`](../CollectionOperationError.md).[`prepareStackTrace`](../CollectionOperationError.md#preparestacktrace)
+[`CollectionOperationError`](CollectionOperationError.md).[`prepareStackTrace`](CollectionOperationError.md#preparestacktrace)
diff --git a/docs/reference/classes/WhereClauseConversionError.md b/docs/reference/classes/WhereClauseConversionError.md
index 98fb6f2d7..0ddb226a0 100644
--- a/docs/reference/classes/WhereClauseConversionError.md
+++ b/docs/reference/classes/WhereClauseConversionError.md
@@ -5,13 +5,13 @@ title: WhereClauseConversionError
 
 # Class: WhereClauseConversionError
 
-Defined in: [packages/db/src/errors.ts:644](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L644)
+Defined in: [packages/db/src/errors.ts:653](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L653)
 
 Internal error when the query optimizer fails to convert a WHERE clause to a collection filter.
 
 ## Extends
 
-- [`QueryOptimizerError`](../QueryOptimizerError.md)
+- [`QueryOptimizerError`](QueryOptimizerError.md)
 
 ## Constructors
 
@@ -21,7 +21,7 @@ Internal error when the query optimizer fails to convert a WHERE clause to a col
 new WhereClauseConversionError(collectionId, alias): WhereClauseConversionError;
 ```
 
-Defined in: [packages/db/src/errors.ts:645](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L645)
+Defined in: [packages/db/src/errors.ts:654](https://github.com/TanStack/db/blob/main/packages/db/src/errors.ts#L654)
 
 #### Parameters
 
@@ -39,7 +39,7 @@ Defined in: [packages/db/src/errors.ts:645](https://github.com/TanStack/db/blob/
 
 #### Overrides
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`constructor`](../QueryOptimizerError.md#constructor)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`constructor`](QueryOptimizerError.md#constructor)
 
 ## Properties
 
@@ -53,7 +53,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`cause`](../QueryOptimizerError.md#cause)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`cause`](QueryOptimizerError.md#cause)
 
 ***
 
@@ -67,7 +67,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`message`](../QueryOptimizerError.md#message)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`message`](QueryOptimizerError.md#message)
 
 ***
 
@@ -81,7 +81,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`name`](../QueryOptimizerError.md#name)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`name`](QueryOptimizerError.md#name)
 
 ***
 
@@ -95,7 +95,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`stack`](../QueryOptimizerError.md#stack)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`stack`](QueryOptimizerError.md#stack)
 
 ***
 
@@ -119,7 +119,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`stackTraceLimit`](../QueryOptimizerError.md#stacktracelimit)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`stackTraceLimit`](QueryOptimizerError.md#stacktracelimit)
 
 ## Methods
 
@@ -191,7 +191,7 @@ a();
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`captureStackTrace`](../QueryOptimizerError.md#capturestacktrace)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`captureStackTrace`](QueryOptimizerError.md#capturestacktrace)
 
 ***
 
@@ -223,4 +223,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryOptimizerError`](../QueryOptimizerError.md).[`prepareStackTrace`](../QueryOptimizerError.md#preparestacktrace)
+[`QueryOptimizerError`](QueryOptimizerError.md).[`prepareStackTrace`](QueryOptimizerError.md#preparestacktrace)
diff --git a/docs/reference/electric-db-collection/classes/ElectricDBCollectionError.md b/docs/reference/electric-db-collection/classes/ElectricDBCollectionError.md
index 8ec928746..a7ee69f1d 100644
--- a/docs/reference/electric-db-collection/classes/ElectricDBCollectionError.md
+++ b/docs/reference/electric-db-collection/classes/ElectricDBCollectionError.md
@@ -13,10 +13,10 @@ Defined in: [packages/electric-db-collection/src/errors.ts:4](https://github.com
 
 ## Extended by
 
-- [`ExpectedNumberInAwaitTxIdError`](../ExpectedNumberInAwaitTxIdError.md)
-- [`TimeoutWaitingForTxIdError`](../TimeoutWaitingForTxIdError.md)
-- [`TimeoutWaitingForMatchError`](../TimeoutWaitingForMatchError.md)
-- [`StreamAbortedError`](../StreamAbortedError.md)
+- [`ExpectedNumberInAwaitTxIdError`](ExpectedNumberInAwaitTxIdError.md)
+- [`TimeoutWaitingForTxIdError`](TimeoutWaitingForTxIdError.md)
+- [`TimeoutWaitingForMatchError`](TimeoutWaitingForMatchError.md)
+- [`StreamAbortedError`](StreamAbortedError.md)
 
 ## Constructors
 
diff --git a/docs/reference/electric-db-collection/classes/ExpectedNumberInAwaitTxIdError.md b/docs/reference/electric-db-collection/classes/ExpectedNumberInAwaitTxIdError.md
index a0c31569e..9b2a3317b 100644
--- a/docs/reference/electric-db-collection/classes/ExpectedNumberInAwaitTxIdError.md
+++ b/docs/reference/electric-db-collection/classes/ExpectedNumberInAwaitTxIdError.md
@@ -9,7 +9,7 @@ Defined in: [packages/electric-db-collection/src/errors.ts:11](https://github.co
 
 ## Extends
 
-- [`ElectricDBCollectionError`](../ElectricDBCollectionError.md)
+- [`ElectricDBCollectionError`](ElectricDBCollectionError.md)
 
 ## Constructors
 
@@ -37,7 +37,7 @@ Defined in: [packages/electric-db-collection/src/errors.ts:12](https://github.co
 
 #### Overrides
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`constructor`](../ElectricDBCollectionError.md#constructor)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`constructor`](ElectricDBCollectionError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`cause`](../ElectricDBCollectionError.md#cause)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`cause`](ElectricDBCollectionError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`message`](../ElectricDBCollectionError.md#message)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`message`](ElectricDBCollectionError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`name`](../ElectricDBCollectionError.md#name)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`name`](ElectricDBCollectionError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`stack`](../ElectricDBCollectionError.md#stack)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`stack`](ElectricDBCollectionError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`stackTraceLimit`](../ElectricDBCollectionError.md#stacktracelimit)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`stackTraceLimit`](ElectricDBCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`captureStackTrace`](../ElectricDBCollectionError.md#capturestacktrace)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`captureStackTrace`](ElectricDBCollectionError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`prepareStackTrace`](../ElectricDBCollectionError.md#preparestacktrace)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`prepareStackTrace`](ElectricDBCollectionError.md#preparestacktrace)
diff --git a/docs/reference/electric-db-collection/classes/StreamAbortedError.md b/docs/reference/electric-db-collection/classes/StreamAbortedError.md
index d08f6639f..6b2a5c286 100644
--- a/docs/reference/electric-db-collection/classes/StreamAbortedError.md
+++ b/docs/reference/electric-db-collection/classes/StreamAbortedError.md
@@ -9,7 +9,7 @@ Defined in: [packages/electric-db-collection/src/errors.ts:32](https://github.co
 
 ## Extends
 
-- [`ElectricDBCollectionError`](../ElectricDBCollectionError.md)
+- [`ElectricDBCollectionError`](ElectricDBCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/electric-db-collection/src/errors.ts:33](https://github.co
 
 #### Overrides
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`constructor`](../ElectricDBCollectionError.md#constructor)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`constructor`](ElectricDBCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`cause`](../ElectricDBCollectionError.md#cause)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`cause`](ElectricDBCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`message`](../ElectricDBCollectionError.md#message)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`message`](ElectricDBCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`name`](../ElectricDBCollectionError.md#name)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`name`](ElectricDBCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`stack`](../ElectricDBCollectionError.md#stack)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`stack`](ElectricDBCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`stackTraceLimit`](../ElectricDBCollectionError.md#stacktracelimit)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`stackTraceLimit`](ElectricDBCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`captureStackTrace`](../ElectricDBCollectionError.md#capturestacktrace)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`captureStackTrace`](ElectricDBCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`prepareStackTrace`](../ElectricDBCollectionError.md#preparestacktrace)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`prepareStackTrace`](ElectricDBCollectionError.md#preparestacktrace)
diff --git a/docs/reference/electric-db-collection/classes/TimeoutWaitingForMatchError.md b/docs/reference/electric-db-collection/classes/TimeoutWaitingForMatchError.md
index 2cfd78e55..8d6383e1d 100644
--- a/docs/reference/electric-db-collection/classes/TimeoutWaitingForMatchError.md
+++ b/docs/reference/electric-db-collection/classes/TimeoutWaitingForMatchError.md
@@ -9,7 +9,7 @@ Defined in: [packages/electric-db-collection/src/errors.ts:25](https://github.co
 
 ## Extends
 
-- [`ElectricDBCollectionError`](../ElectricDBCollectionError.md)
+- [`ElectricDBCollectionError`](ElectricDBCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/electric-db-collection/src/errors.ts:26](https://github.co
 
 #### Overrides
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`constructor`](../ElectricDBCollectionError.md#constructor)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`constructor`](ElectricDBCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`cause`](../ElectricDBCollectionError.md#cause)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`cause`](ElectricDBCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`message`](../ElectricDBCollectionError.md#message)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`message`](ElectricDBCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`name`](../ElectricDBCollectionError.md#name)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`name`](ElectricDBCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`stack`](../ElectricDBCollectionError.md#stack)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`stack`](ElectricDBCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`stackTraceLimit`](../ElectricDBCollectionError.md#stacktracelimit)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`stackTraceLimit`](ElectricDBCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`captureStackTrace`](../ElectricDBCollectionError.md#capturestacktrace)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`captureStackTrace`](ElectricDBCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`prepareStackTrace`](../ElectricDBCollectionError.md#preparestacktrace)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`prepareStackTrace`](ElectricDBCollectionError.md#preparestacktrace)
diff --git a/docs/reference/electric-db-collection/classes/TimeoutWaitingForTxIdError.md b/docs/reference/electric-db-collection/classes/TimeoutWaitingForTxIdError.md
index 5f7f76187..ec39c57d4 100644
--- a/docs/reference/electric-db-collection/classes/TimeoutWaitingForTxIdError.md
+++ b/docs/reference/electric-db-collection/classes/TimeoutWaitingForTxIdError.md
@@ -9,7 +9,7 @@ Defined in: [packages/electric-db-collection/src/errors.ts:18](https://github.co
 
 ## Extends
 
-- [`ElectricDBCollectionError`](../ElectricDBCollectionError.md)
+- [`ElectricDBCollectionError`](ElectricDBCollectionError.md)
 
 ## Constructors
 
@@ -37,7 +37,7 @@ Defined in: [packages/electric-db-collection/src/errors.ts:19](https://github.co
 
 #### Overrides
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`constructor`](../ElectricDBCollectionError.md#constructor)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`constructor`](ElectricDBCollectionError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`cause`](../ElectricDBCollectionError.md#cause)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`cause`](ElectricDBCollectionError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`message`](../ElectricDBCollectionError.md#message)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`message`](ElectricDBCollectionError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`name`](../ElectricDBCollectionError.md#name)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`name`](ElectricDBCollectionError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`stack`](../ElectricDBCollectionError.md#stack)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`stack`](ElectricDBCollectionError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`stackTraceLimit`](../ElectricDBCollectionError.md#stacktracelimit)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`stackTraceLimit`](ElectricDBCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`captureStackTrace`](../ElectricDBCollectionError.md#capturestacktrace)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`captureStackTrace`](ElectricDBCollectionError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`ElectricDBCollectionError`](../ElectricDBCollectionError.md).[`prepareStackTrace`](../ElectricDBCollectionError.md#preparestacktrace)
+[`ElectricDBCollectionError`](ElectricDBCollectionError.md).[`prepareStackTrace`](ElectricDBCollectionError.md#preparestacktrace)
diff --git a/docs/reference/electric-db-collection/functions/electricCollectionOptions.md b/docs/reference/electric-db-collection/functions/electricCollectionOptions.md
index b4dc3df4e..eaafcc44a 100644
--- a/docs/reference/electric-db-collection/functions/electricCollectionOptions.md
+++ b/docs/reference/electric-db-collection/functions/electricCollectionOptions.md
@@ -11,7 +11,7 @@ title: electricCollectionOptions
 function electricCollectionOptions<T>(config): Omit<CollectionConfig<InferSchemaOutput<T>, string | number, T, UtilsRecord>, "utils"> & object;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:427](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L427)
+Defined in: [packages/electric-db-collection/src/electric.ts:499](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L499)
 
 Creates Electric collection options for use with a standard Collection
 
@@ -27,7 +27,7 @@ The explicit type of items in the collection (highest priority)
 
 #### config
 
-[`ElectricCollectionConfig`](../../interfaces/ElectricCollectionConfig.md)\<`InferSchemaOutput`\<`T`\>, `T`\> & `object`
+[`ElectricCollectionConfig`](../interfaces/ElectricCollectionConfig.md)\<`InferSchemaOutput`\<`T`\>, `T`\> & `object`
 
 Configuration options for the Electric collection
 
@@ -43,7 +43,7 @@ Collection options with utilities
 function electricCollectionOptions<T>(config): Omit<CollectionConfig<T, string | number, never, UtilsRecord>, "utils"> & object;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:438](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L438)
+Defined in: [packages/electric-db-collection/src/electric.ts:510](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L510)
 
 Creates Electric collection options for use with a standard Collection
 
@@ -59,7 +59,7 @@ The explicit type of items in the collection (highest priority)
 
 #### config
 
-[`ElectricCollectionConfig`](../../interfaces/ElectricCollectionConfig.md)\<`T`, `never`\> & `object`
+[`ElectricCollectionConfig`](../interfaces/ElectricCollectionConfig.md)\<`T`, `never`\> & `object`
 
 Configuration options for the Electric collection
 
diff --git a/docs/reference/electric-db-collection/functions/isChangeMessage.md b/docs/reference/electric-db-collection/functions/isChangeMessage.md
new file mode 100644
index 000000000..124fa10eb
--- /dev/null
+++ b/docs/reference/electric-db-collection/functions/isChangeMessage.md
@@ -0,0 +1,46 @@
+---
+id: isChangeMessage
+title: isChangeMessage
+---
+
+# Function: isChangeMessage()
+
+```ts
+function isChangeMessage<T>(message): message is ChangeMessage<T>;
+```
+
+Defined in: node\_modules/.pnpm/@electric-sql+client@1.3.0/node\_modules/@electric-sql/client/dist/index.d.ts:816
+
+Type guard for checking Message is ChangeMessage.
+
+See [TS docs](https://www.typescriptlang.org/docs/handbook/advanced-types.html#user-defined-type-guards)
+for information on how to use type guards.
+
+## Type Parameters
+
+### T
+
+`T` *extends* `Row`\<`unknown`\> = `Row`\<`never`\>
+
+## Parameters
+
+### message
+
+`Message`\<`T`\>
+
+the message to check
+
+## Returns
+
+`message is ChangeMessage<T>`
+
+true if the message is a ChangeMessage
+
+## Example
+
+```ts
+if (isChangeMessage(message)) {
+  const msgChng: ChangeMessage = message // Ok
+  const msgCtrl: ControlMessage = message // Err, type mismatch
+}
+```
diff --git a/docs/reference/electric-db-collection/functions/isControlMessage.md b/docs/reference/electric-db-collection/functions/isControlMessage.md
new file mode 100644
index 000000000..d6e025c25
--- /dev/null
+++ b/docs/reference/electric-db-collection/functions/isControlMessage.md
@@ -0,0 +1,48 @@
+---
+id: isControlMessage
+title: isControlMessage
+---
+
+# Function: isControlMessage()
+
+```ts
+function isControlMessage<T>(message): message is ControlMessage;
+```
+
+Defined in: node\_modules/.pnpm/@electric-sql+client@1.3.0/node\_modules/@electric-sql/client/dist/index.d.ts:834
+
+Type guard for checking Message is ControlMessage.
+
+See [TS docs](https://www.typescriptlang.org/docs/handbook/advanced-types.html#user-defined-type-guards)
+for information on how to use type guards.
+
+## Type Parameters
+
+### T
+
+`T` *extends* `Row`\<`unknown`\> = `Row`\<`never`\>
+
+## Parameters
+
+### message
+
+`Message`\<`T`\>
+
+the message to check
+
+## Returns
+
+`message is ControlMessage`
+
+true if the message is a ControlMessage
+
+ *
+
+## Example
+
+```ts
+if (isControlMessage(message)) {
+  const msgChng: ChangeMessage = message // Err, type mismatch
+  const msgCtrl: ControlMessage = message // Ok
+}
+```
diff --git a/docs/reference/electric-db-collection/index.md b/docs/reference/electric-db-collection/index.md
index be4322541..b8b740997 100644
--- a/docs/reference/electric-db-collection/index.md
+++ b/docs/reference/electric-db-collection/index.md
@@ -7,22 +7,24 @@ title: "@tanstack/electric-db-collection"
 
 ## Classes
 
-- [ElectricDBCollectionError](../classes/ElectricDBCollectionError.md)
-- [ExpectedNumberInAwaitTxIdError](../classes/ExpectedNumberInAwaitTxIdError.md)
-- [StreamAbortedError](../classes/StreamAbortedError.md)
-- [TimeoutWaitingForMatchError](../classes/TimeoutWaitingForMatchError.md)
-- [TimeoutWaitingForTxIdError](../classes/TimeoutWaitingForTxIdError.md)
+- [ElectricDBCollectionError](classes/ElectricDBCollectionError.md)
+- [ExpectedNumberInAwaitTxIdError](classes/ExpectedNumberInAwaitTxIdError.md)
+- [StreamAbortedError](classes/StreamAbortedError.md)
+- [TimeoutWaitingForMatchError](classes/TimeoutWaitingForMatchError.md)
+- [TimeoutWaitingForTxIdError](classes/TimeoutWaitingForTxIdError.md)
 
 ## Interfaces
 
-- [ElectricCollectionConfig](../interfaces/ElectricCollectionConfig.md)
-- [ElectricCollectionUtils](../interfaces/ElectricCollectionUtils.md)
+- [ElectricCollectionConfig](interfaces/ElectricCollectionConfig.md)
+- [ElectricCollectionUtils](interfaces/ElectricCollectionUtils.md)
 
 ## Type Aliases
 
-- [AwaitTxIdFn](../type-aliases/AwaitTxIdFn.md)
-- [Txid](../type-aliases/Txid.md)
+- [AwaitTxIdFn](type-aliases/AwaitTxIdFn.md)
+- [Txid](type-aliases/Txid.md)
 
 ## Functions
 
-- [electricCollectionOptions](../functions/electricCollectionOptions.md)
+- [electricCollectionOptions](functions/electricCollectionOptions.md)
+- [isChangeMessage](functions/isChangeMessage.md)
+- [isControlMessage](functions/isControlMessage.md)
diff --git a/docs/reference/electric-db-collection/interfaces/ElectricCollectionConfig.md b/docs/reference/electric-db-collection/interfaces/ElectricCollectionConfig.md
index b096292e3..46a6dc547 100644
--- a/docs/reference/electric-db-collection/interfaces/ElectricCollectionConfig.md
+++ b/docs/reference/electric-db-collection/interfaces/ElectricCollectionConfig.md
@@ -5,13 +5,13 @@ title: ElectricCollectionConfig
 
 # Interface: ElectricCollectionConfig\<T, TSchema\>
 
-Defined in: [packages/electric-db-collection/src/electric.ts:124](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L124)
+Defined in: [packages/electric-db-collection/src/electric.ts:140](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L140)
 
 Configuration interface for Electric collection options
 
 ## Extends
 
-- `Omit`\<`BaseCollectionConfig`\<`T`, `string` \| `number`, `TSchema`, [`ElectricCollectionUtils`](../ElectricCollectionUtils.md)\<`T`\>, `any`\>, `"onInsert"` \| `"onUpdate"` \| `"onDelete"` \| `"syncMode"`\>
+- `Omit`\<`BaseCollectionConfig`\<`T`, `string` \| `number`, `TSchema`, [`ElectricCollectionUtils`](ElectricCollectionUtils.md)\<`T`\>, `any`\>, `"onInsert"` \| `"onUpdate"` \| `"onDelete"` \| `"syncMode"`\>
 
 ## Type Parameters
 
@@ -35,7 +35,7 @@ The schema type for validation
 optional [ELECTRIC_TEST_HOOKS]: ElectricTestHooks;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:147](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L147)
+Defined in: [packages/electric-db-collection/src/electric.ts:163](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L163)
 
 Internal test hooks (for testing only)
 Hidden via Symbol to prevent accidental usage in production
@@ -48,7 +48,7 @@ Hidden via Symbol to prevent accidental usage in production
 optional onDelete: (params) => Promise<MatchingStrategy>;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:264](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L264)
+Defined in: [packages/electric-db-collection/src/electric.ts:280](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L280)
 
 Optional asynchronous handler function called before a delete operation
 
@@ -56,7 +56,7 @@ Optional asynchronous handler function called before a delete operation
 
 ##### params
 
-`DeleteMutationFnParams`\<`T`, `string` \| `number`, [`ElectricCollectionUtils`](../ElectricCollectionUtils.md)\<`T`\>\>
+`DeleteMutationFnParams`\<`T`, `string` \| `number`, [`ElectricCollectionUtils`](ElectricCollectionUtils.md)\<`T`\>\>
 
 Object containing transaction and collection information
 
@@ -100,7 +100,7 @@ onDelete: async ({ transaction, collection }) => {
 optional onInsert: (params) => Promise<MatchingStrategy>;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:195](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L195)
+Defined in: [packages/electric-db-collection/src/electric.ts:211](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L211)
 
 Optional asynchronous handler function called before an insert operation
 
@@ -108,7 +108,7 @@ Optional asynchronous handler function called before an insert operation
 
 ##### params
 
-`InsertMutationFnParams`\<`T`, `string` \| `number`, [`ElectricCollectionUtils`](../ElectricCollectionUtils.md)\<`T`\>\>
+`InsertMutationFnParams`\<`T`, `string` \| `number`, [`ElectricCollectionUtils`](ElectricCollectionUtils.md)\<`T`\>\>
 
 Object containing transaction and collection information
 
@@ -174,7 +174,7 @@ onInsert: async ({ transaction, collection }) => {
 optional onUpdate: (params) => Promise<MatchingStrategy>;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:230](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L230)
+Defined in: [packages/electric-db-collection/src/electric.ts:246](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L246)
 
 Optional asynchronous handler function called before an update operation
 
@@ -182,7 +182,7 @@ Optional asynchronous handler function called before an update operation
 
 ##### params
 
-`UpdateMutationFnParams`\<`T`, `string` \| `number`, [`ElectricCollectionUtils`](../ElectricCollectionUtils.md)\<`T`\>\>
+`UpdateMutationFnParams`\<`T`, `string` \| `number`, [`ElectricCollectionUtils`](ElectricCollectionUtils.md)\<`T`\>\>
 
 Object containing transaction and collection information
 
@@ -227,7 +227,7 @@ onUpdate: async ({ transaction, collection }) => {
 shapeOptions: ShapeStreamOptions<GetExtensions<T>>;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:140](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L140)
+Defined in: [packages/electric-db-collection/src/electric.ts:156](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L156)
 
 Configuration options for the ElectricSQL ShapeStream
 
@@ -239,4 +239,4 @@ Configuration options for the ElectricSQL ShapeStream
 optional syncMode: ElectricSyncMode;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:141](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L141)
+Defined in: [packages/electric-db-collection/src/electric.ts:157](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L157)
diff --git a/docs/reference/electric-db-collection/interfaces/ElectricCollectionUtils.md b/docs/reference/electric-db-collection/interfaces/ElectricCollectionUtils.md
index 6364e3072..6139732b6 100644
--- a/docs/reference/electric-db-collection/interfaces/ElectricCollectionUtils.md
+++ b/docs/reference/electric-db-collection/interfaces/ElectricCollectionUtils.md
@@ -5,7 +5,7 @@ title: ElectricCollectionUtils
 
 # Interface: ElectricCollectionUtils\<T\>
 
-Defined in: [packages/electric-db-collection/src/electric.ts:409](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L409)
+Defined in: [packages/electric-db-collection/src/electric.ts:481](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L481)
 
 Electric collection utilities type
 
@@ -33,7 +33,7 @@ Electric collection utilities type
 awaitMatch: AwaitMatchFn<T>;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:413](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L413)
+Defined in: [packages/electric-db-collection/src/electric.ts:485](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L485)
 
 ***
 
@@ -43,4 +43,4 @@ Defined in: [packages/electric-db-collection/src/electric.ts:413](https://github
 awaitTxId: AwaitTxIdFn;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:412](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L412)
+Defined in: [packages/electric-db-collection/src/electric.ts:484](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L484)
diff --git a/docs/reference/electric-db-collection/type-aliases/AwaitTxIdFn.md b/docs/reference/electric-db-collection/type-aliases/AwaitTxIdFn.md
index 8dd0d67e9..93974fec0 100644
--- a/docs/reference/electric-db-collection/type-aliases/AwaitTxIdFn.md
+++ b/docs/reference/electric-db-collection/type-aliases/AwaitTxIdFn.md
@@ -9,7 +9,7 @@ title: AwaitTxIdFn
 type AwaitTxIdFn = (txId, timeout?) => Promise<boolean>;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:396](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L396)
+Defined in: [packages/electric-db-collection/src/electric.ts:468](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L468)
 
 Type for the awaitTxId utility function
 
@@ -17,7 +17,7 @@ Type for the awaitTxId utility function
 
 ### txId
 
-[`Txid`](../Txid.md)
+[`Txid`](Txid.md)
 
 ### timeout?
 
diff --git a/docs/reference/electric-db-collection/type-aliases/Txid.md b/docs/reference/electric-db-collection/type-aliases/Txid.md
index 3870788c6..7c7750aaf 100644
--- a/docs/reference/electric-db-collection/type-aliases/Txid.md
+++ b/docs/reference/electric-db-collection/type-aliases/Txid.md
@@ -9,6 +9,6 @@ title: Txid
 type Txid = number;
 ```
 
-Defined in: [packages/electric-db-collection/src/electric.ts:62](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L62)
+Defined in: [packages/electric-db-collection/src/electric.ts:78](https://github.com/TanStack/db/blob/main/packages/electric-db-collection/src/electric.ts#L78)
 
 Type representing a transaction ID in ElectricSQL
diff --git a/docs/reference/functions/and.md b/docs/reference/functions/and.md
index b48e66633..85a7304a1 100644
--- a/docs/reference/functions/and.md
+++ b/docs/reference/functions/and.md
@@ -25,7 +25,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:181](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -54,4 +54,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:185](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/coalesce.md b/docs/reference/functions/coalesce.md
index db59fc945..2849b63e8 100644
--- a/docs/reference/functions/coalesce.md
+++ b/docs/reference/functions/coalesce.md
@@ -19,4 +19,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:288](https://github.com/
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`any`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`any`\>
diff --git a/docs/reference/functions/compileQuery.md b/docs/reference/functions/compileQuery.md
index 729b5ae39..ae1e2e08a 100644
--- a/docs/reference/functions/compileQuery.md
+++ b/docs/reference/functions/compileQuery.md
@@ -27,19 +27,19 @@ Compiles a query IR into a D2 pipeline
 
 ### rawQuery
 
-[`QueryIR`](../../@tanstack/namespaces/IR/interfaces/QueryIR.md)
+[`QueryIR`](../@tanstack/namespaces/IR/interfaces/QueryIR.md)
 
 The query IR to compile
 
 ### inputs
 
-`Record`\<`string`, [`KeyedStream`](../../type-aliases/KeyedStream.md)\>
+`Record`\<`string`, [`KeyedStream`](../type-aliases/KeyedStream.md)\>
 
 Mapping of source aliases to input streams (e.g., `{ employee: input1, manager: input2 }`)
 
 ### collections
 
-`Record`\<`string`, [`Collection`](../../interfaces/Collection.md)\<`any`, `any`, `any`, `any`, `any`\>\>
+`Record`\<`string`, [`Collection`](../interfaces/Collection.md)\<`any`, `any`, `any`, `any`, `any`\>\>
 
 Mapping of collection IDs to Collection instances
 
diff --git a/docs/reference/functions/concat.md b/docs/reference/functions/concat.md
index 9c8edfbd6..1da806bc5 100644
--- a/docs/reference/functions/concat.md
+++ b/docs/reference/functions/concat.md
@@ -19,4 +19,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:279](https://github.com/
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`string`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`string`\>
diff --git a/docs/reference/functions/count.md b/docs/reference/functions/count.md
index bc82fcf79..ef1a990e9 100644
--- a/docs/reference/functions/count.md
+++ b/docs/reference/functions/count.md
@@ -19,4 +19,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:307](https://github.com/
 
 ## Returns
 
-[`Aggregate`](../../@tanstack/namespaces/IR/classes/Aggregate.md)\<`number`\>
+[`Aggregate`](../@tanstack/namespaces/IR/classes/Aggregate.md)\<`number`\>
diff --git a/docs/reference/functions/createCollection.md b/docs/reference/functions/createCollection.md
index 5c71455d2..556471744 100644
--- a/docs/reference/functions/createCollection.md
+++ b/docs/reference/functions/createCollection.md
@@ -31,7 +31,7 @@ The type of the key for the collection
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -39,13 +39,13 @@ The utilities record type
 
 #### options
 
-`Omit`\<[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, `TUtils`\>, `"utils"`\> & `object` & [`NonSingleResult`](../../type-aliases/NonSingleResult.md)
+`Omit`\<[`CollectionConfig`](../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, `TUtils`\>, `"utils"`\> & `object` & [`NonSingleResult`](../type-aliases/NonSingleResult.md)
 
 Collection options with optional utilities
 
 ### Returns
 
-[`Collection`](../../interfaces/Collection.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `TUtils`, `T`, [`InferSchemaInput`](../../type-aliases/InferSchemaInput.md)\<`T`\>\> & [`NonSingleResult`](../../type-aliases/NonSingleResult.md)
+[`Collection`](../interfaces/Collection.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `TUtils`, `T`, [`InferSchemaInput`](../type-aliases/InferSchemaInput.md)\<`T`\>\> & [`NonSingleResult`](../type-aliases/NonSingleResult.md)
 
 A new Collection with utilities exposed both at top level and under .utils
 
@@ -140,7 +140,7 @@ The type of the key for the collection
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -148,13 +148,13 @@ The utilities record type
 
 #### options
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, `TUtils`\> & `object` & [`NonSingleResult`](../../type-aliases/NonSingleResult.md)
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, `TUtils`\> & `object` & [`NonSingleResult`](../type-aliases/NonSingleResult.md)
 
 Collection options with optional utilities
 
 ### Returns
 
-[`Collection`](../../interfaces/Collection.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `Exclude`\<`TUtils`, `undefined`\>, `T`, [`InferSchemaInput`](../../type-aliases/InferSchemaInput.md)\<`T`\>\> & [`NonSingleResult`](../../type-aliases/NonSingleResult.md)
+[`Collection`](../interfaces/Collection.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `Exclude`\<`TUtils`, `undefined`\>, `T`, [`InferSchemaInput`](../type-aliases/InferSchemaInput.md)\<`T`\>\> & [`NonSingleResult`](../type-aliases/NonSingleResult.md)
 
 A new Collection with utilities exposed both at top level and under .utils
 
@@ -249,7 +249,7 @@ The type of the key for the collection
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -257,13 +257,13 @@ The utilities record type
 
 #### options
 
-`Omit`\<[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, `TUtils`\>, `"utils"`\> & `object` & [`SingleResult`](../../type-aliases/SingleResult.md)
+`Omit`\<[`CollectionConfig`](../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, `TUtils`\>, `"utils"`\> & `object` & [`SingleResult`](../type-aliases/SingleResult.md)
 
 Collection options with optional utilities
 
 ### Returns
 
-[`Collection`](../../interfaces/Collection.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `TUtils`, `T`, [`InferSchemaInput`](../../type-aliases/InferSchemaInput.md)\<`T`\>\> & [`SingleResult`](../../type-aliases/SingleResult.md)
+[`Collection`](../interfaces/Collection.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `TUtils`, `T`, [`InferSchemaInput`](../type-aliases/InferSchemaInput.md)\<`T`\>\> & [`SingleResult`](../type-aliases/SingleResult.md)
 
 A new Collection with utilities exposed both at top level and under .utils
 
@@ -358,7 +358,7 @@ The type of the key for the collection
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -366,13 +366,13 @@ The utilities record type
 
 #### options
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, `TUtils`\> & `object` & [`SingleResult`](../../type-aliases/SingleResult.md)
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, `TUtils`\> & `object` & [`SingleResult`](../type-aliases/SingleResult.md)
 
 Collection options with optional utilities
 
 ### Returns
 
-[`Collection`](../../interfaces/Collection.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `TUtils`, `T`, [`InferSchemaInput`](../../type-aliases/InferSchemaInput.md)\<`T`\>\> & [`SingleResult`](../../type-aliases/SingleResult.md)
+[`Collection`](../interfaces/Collection.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `TUtils`, `T`, [`InferSchemaInput`](../type-aliases/InferSchemaInput.md)\<`T`\>\> & [`SingleResult`](../type-aliases/SingleResult.md)
 
 A new Collection with utilities exposed both at top level and under .utils
 
@@ -467,7 +467,7 @@ The type of the key for the collection
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -475,13 +475,13 @@ The utilities record type
 
 #### options
 
-`Omit`\<[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, `TUtils`\>, `"utils"`\> & `object` & [`NonSingleResult`](../../type-aliases/NonSingleResult.md)
+`Omit`\<[`CollectionConfig`](../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, `TUtils`\>, `"utils"`\> & `object` & [`NonSingleResult`](../type-aliases/NonSingleResult.md)
 
 Collection options with optional utilities
 
 ### Returns
 
-[`Collection`](../../interfaces/Collection.md)\<`T`, `TKey`, `TUtils`, `never`, `T`\> & [`NonSingleResult`](../../type-aliases/NonSingleResult.md)
+[`Collection`](../interfaces/Collection.md)\<`T`, `TKey`, `TUtils`, `never`, `T`\> & [`NonSingleResult`](../type-aliases/NonSingleResult.md)
 
 A new Collection with utilities exposed both at top level and under .utils
 
@@ -576,7 +576,7 @@ The type of the key for the collection
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -584,13 +584,13 @@ The utilities record type
 
 #### options
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, `TUtils`\> & `object` & [`NonSingleResult`](../../type-aliases/NonSingleResult.md)
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, `TUtils`\> & `object` & [`NonSingleResult`](../type-aliases/NonSingleResult.md)
 
 Collection options with optional utilities
 
 ### Returns
 
-[`Collection`](../../interfaces/Collection.md)\<`T`, `TKey`, `TUtils`, `never`, `T`\> & [`NonSingleResult`](../../type-aliases/NonSingleResult.md)
+[`Collection`](../interfaces/Collection.md)\<`T`, `TKey`, `TUtils`, `never`, `T`\> & [`NonSingleResult`](../type-aliases/NonSingleResult.md)
 
 A new Collection with utilities exposed both at top level and under .utils
 
@@ -685,7 +685,7 @@ The type of the key for the collection
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -693,13 +693,13 @@ The utilities record type
 
 #### options
 
-`Omit`\<[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, `TUtils`\>, `"utils"`\> & `object` & [`SingleResult`](../../type-aliases/SingleResult.md)
+`Omit`\<[`CollectionConfig`](../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, `TUtils`\>, `"utils"`\> & `object` & [`SingleResult`](../type-aliases/SingleResult.md)
 
 Collection options with optional utilities
 
 ### Returns
 
-[`Collection`](../../interfaces/Collection.md)\<`T`, `TKey`, `TUtils`, `never`, `T`\> & [`SingleResult`](../../type-aliases/SingleResult.md)
+[`Collection`](../interfaces/Collection.md)\<`T`, `TKey`, `TUtils`, `never`, `T`\> & [`SingleResult`](../type-aliases/SingleResult.md)
 
 A new Collection with utilities exposed both at top level and under .utils
 
@@ -794,7 +794,7 @@ The type of the key for the collection
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -802,13 +802,13 @@ The utilities record type
 
 #### options
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, `TUtils`\> & `object` & [`SingleResult`](../../type-aliases/SingleResult.md)
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, `TUtils`\> & `object` & [`SingleResult`](../type-aliases/SingleResult.md)
 
 Collection options with optional utilities
 
 ### Returns
 
-[`Collection`](../../interfaces/Collection.md)\<`T`, `TKey`, `TUtils`, `never`, `T`\> & [`SingleResult`](../../type-aliases/SingleResult.md)
+[`Collection`](../interfaces/Collection.md)\<`T`, `TKey`, `TUtils`, `never`, `T`\> & [`SingleResult`](../type-aliases/SingleResult.md)
 
 A new Collection with utilities exposed both at top level and under .utils
 
diff --git a/docs/reference/functions/createLiveQueryCollection.md b/docs/reference/functions/createLiveQueryCollection.md
index b35008dc4..55db713f5 100644
--- a/docs/reference/functions/createLiveQueryCollection.md
+++ b/docs/reference/functions/createLiveQueryCollection.md
@@ -20,7 +20,7 @@ Creates a live query collection directly
 
 #### TContext
 
-`TContext` *extends* [`Context`](../../interfaces/Context.md)
+`TContext` *extends* [`Context`](../interfaces/Context.md)
 
 #### TResult
 
@@ -30,7 +30,7 @@ Creates a live query collection directly
 
 #### query
 
-(`q`) => [`QueryBuilder`](../../type-aliases/QueryBuilder.md)\<`TContext`\>
+(`q`) => [`QueryBuilder`](../type-aliases/QueryBuilder.md)\<`TContext`\>
 
 ### Returns
 
@@ -83,7 +83,7 @@ Creates a live query collection directly
 
 #### TContext
 
-`TContext` *extends* [`Context`](../../interfaces/Context.md)
+`TContext` *extends* [`Context`](../interfaces/Context.md)
 
 #### TResult
 
@@ -91,14 +91,14 @@ Creates a live query collection directly
 
 #### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md) = \{
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md) = \{
 \}
 
 ### Parameters
 
 #### config
 
-[`LiveQueryCollectionConfig`](../../interfaces/LiveQueryCollectionConfig.md)\<`TContext`, `TResult`\> & `object`
+[`LiveQueryCollectionConfig`](../interfaces/LiveQueryCollectionConfig.md)\<`TContext`, `TResult`\> & `object`
 
 ### Returns
 
diff --git a/docs/reference/functions/createOptimisticAction.md b/docs/reference/functions/createOptimisticAction.md
index bb19c9432..f01ae27db 100644
--- a/docs/reference/functions/createOptimisticAction.md
+++ b/docs/reference/functions/createOptimisticAction.md
@@ -35,7 +35,7 @@ The type of variables that will be passed to the action function
 
 ### options
 
-[`CreateOptimisticActionsOptions`](../../interfaces/CreateOptimisticActionsOptions.md)\<`TVariables`\>
+[`CreateOptimisticActionsOptions`](../interfaces/CreateOptimisticActionsOptions.md)\<`TVariables`\>
 
 Configuration options for the optimistic action
 
@@ -55,7 +55,7 @@ A function that accepts variables of type TVariables and returns a Transaction
 
 ### Returns
 
-[`Transaction`](../../interfaces/Transaction.md)
+[`Transaction`](../interfaces/Transaction.md)
 
 ## Example
 
diff --git a/docs/reference/functions/createPacedMutations.md b/docs/reference/functions/createPacedMutations.md
index 7418b828e..a51bd3a51 100644
--- a/docs/reference/functions/createPacedMutations.md
+++ b/docs/reference/functions/createPacedMutations.md
@@ -36,7 +36,7 @@ or to handle errors.
 
 ### config
 
-[`PacedMutationsConfig`](../../interfaces/PacedMutationsConfig.md)\<`TVariables`, `T`\>
+[`PacedMutationsConfig`](../interfaces/PacedMutationsConfig.md)\<`TVariables`, `T`\>
 
 Configuration including onMutate, mutationFn and strategy
 
@@ -56,7 +56,7 @@ A function that accepts variables and returns a Transaction
 
 ### Returns
 
-[`Transaction`](../../interfaces/Transaction.md)\<`T`\>
+[`Transaction`](../interfaces/Transaction.md)\<`T`\>
 
 ## Examples
 
diff --git a/docs/reference/functions/createTransaction.md b/docs/reference/functions/createTransaction.md
index 5309fffcf..e1207af82 100644
--- a/docs/reference/functions/createTransaction.md
+++ b/docs/reference/functions/createTransaction.md
@@ -23,13 +23,13 @@ Creates a new transaction for grouping multiple collection operations
 
 ### config
 
-[`TransactionConfig`](../../interfaces/TransactionConfig.md)\<`T`\>
+[`TransactionConfig`](../interfaces/TransactionConfig.md)\<`T`\>
 
 Transaction configuration with mutation function
 
 ## Returns
 
-[`Transaction`](../../interfaces/Transaction.md)\<`T`\>
+[`Transaction`](../interfaces/Transaction.md)\<`T`\>
 
 A new Transaction instance
 
diff --git a/docs/reference/functions/debounceStrategy.md b/docs/reference/functions/debounceStrategy.md
index 44e016bee..cb38e9688 100644
--- a/docs/reference/functions/debounceStrategy.md
+++ b/docs/reference/functions/debounceStrategy.md
@@ -21,13 +21,13 @@ to wait for the user to stop typing before persisting changes.
 
 ### options
 
-[`DebounceStrategyOptions`](../../interfaces/DebounceStrategyOptions.md)
+[`DebounceStrategyOptions`](../interfaces/DebounceStrategyOptions.md)
 
 Configuration for the debounce behavior
 
 ## Returns
 
-[`DebounceStrategy`](../../interfaces/DebounceStrategy.md)
+[`DebounceStrategy`](../interfaces/DebounceStrategy.md)
 
 A debounce strategy instance
 
diff --git a/docs/reference/functions/deepEquals.md b/docs/reference/functions/deepEquals.md
new file mode 100644
index 000000000..c95964693
--- /dev/null
+++ b/docs/reference/functions/deepEquals.md
@@ -0,0 +1,45 @@
+---
+id: deepEquals
+title: deepEquals
+---
+
+# Function: deepEquals()
+
+```ts
+function deepEquals(a, b): boolean;
+```
+
+Defined in: [packages/db/src/utils.ts:29](https://github.com/TanStack/db/blob/main/packages/db/src/utils.ts#L29)
+
+Deep equality function that compares two values recursively
+Handles primitives, objects, arrays, Date, RegExp, Map, Set, TypedArrays, and Temporal objects
+
+## Parameters
+
+### a
+
+`any`
+
+First value to compare
+
+### b
+
+`any`
+
+Second value to compare
+
+## Returns
+
+`boolean`
+
+True if the values are deeply equal, false otherwise
+
+## Example
+
+```typescript
+deepEquals({ a: 1, b: 2 }, { b: 2, a: 1 }) // true (property order doesn't matter)
+deepEquals([1, { x: 2 }], [1, { x: 2 }]) // true
+deepEquals({ a: 1 }, { a: 2 }) // false
+deepEquals(new Date('2023-01-01'), new Date('2023-01-01')) // true
+deepEquals(new Map([['a', 1]]), new Map([['a', 1]])) // true
+```
diff --git a/docs/reference/functions/eq.md b/docs/reference/functions/eq.md
index 0199b5da1..8890c3eac 100644
--- a/docs/reference/functions/eq.md
+++ b/docs/reference/functions/eq.md
@@ -31,7 +31,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:115](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -59,7 +59,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:119](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -79,7 +79,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:123](https://github.com/
 
 #### left
 
-[`Aggregate`](../../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
+[`Aggregate`](../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
 
 #### right
 
@@ -87,4 +87,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:123](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/extractFieldPath.md b/docs/reference/functions/extractFieldPath.md
index 4e12e218e..1738e66db 100644
--- a/docs/reference/functions/extractFieldPath.md
+++ b/docs/reference/functions/extractFieldPath.md
@@ -24,7 +24,7 @@ The expression to extract from
 
 ## Returns
 
-[`FieldPath`](../../type-aliases/FieldPath.md) \| `null`
+[`FieldPath`](../type-aliases/FieldPath.md) \| `null`
 
 The field path array, or null
 
diff --git a/docs/reference/functions/extractSimpleComparisons.md b/docs/reference/functions/extractSimpleComparisons.md
index 282214367..39c3ff0db 100644
--- a/docs/reference/functions/extractSimpleComparisons.md
+++ b/docs/reference/functions/extractSimpleComparisons.md
@@ -29,7 +29,7 @@ The WHERE expression to parse
 
 ## Returns
 
-[`SimpleComparison`](../../interfaces/SimpleComparison.md)[]
+[`SimpleComparison`](../interfaces/SimpleComparison.md)[]
 
 Array of simple comparisons
 
diff --git a/docs/reference/functions/getActiveTransaction.md b/docs/reference/functions/getActiveTransaction.md
index 31ac09e1c..b1488c8d0 100644
--- a/docs/reference/functions/getActiveTransaction.md
+++ b/docs/reference/functions/getActiveTransaction.md
@@ -18,7 +18,7 @@ Used internally by collection operations to join existing transactions
 
 ## Returns
 
-  \| [`Transaction`](../../interfaces/Transaction.md)\<`Record`\<`string`, `unknown`\>\>
+  \| [`Transaction`](../interfaces/Transaction.md)\<`Record`\<`string`, `unknown`\>\>
   \| `undefined`
 
 The active transaction or undefined if none is active
diff --git a/docs/reference/functions/gt.md b/docs/reference/functions/gt.md
index 050c7712c..7a6cb1589 100644
--- a/docs/reference/functions/gt.md
+++ b/docs/reference/functions/gt.md
@@ -31,7 +31,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:128](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -59,7 +59,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:132](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -79,7 +79,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:136](https://github.com/
 
 #### left
 
-[`Aggregate`](../../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
+[`Aggregate`](../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
 
 #### right
 
@@ -87,4 +87,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:136](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/gte.md b/docs/reference/functions/gte.md
index 7a6798a69..6a5f0c6e8 100644
--- a/docs/reference/functions/gte.md
+++ b/docs/reference/functions/gte.md
@@ -31,7 +31,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:141](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -59,7 +59,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:145](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -79,7 +79,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:149](https://github.com/
 
 #### left
 
-[`Aggregate`](../../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
+[`Aggregate`](../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
 
 #### right
 
@@ -87,4 +87,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:149](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/ilike.md b/docs/reference/functions/ilike.md
index 989b7e9f5..7f422aa0c 100644
--- a/docs/reference/functions/ilike.md
+++ b/docs/reference/functions/ilike.md
@@ -23,4 +23,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:252](https://github.com/
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/inArray.md b/docs/reference/functions/inArray.md
index c48e33a81..5f93c467b 100644
--- a/docs/reference/functions/inArray.md
+++ b/docs/reference/functions/inArray.md
@@ -23,4 +23,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:237](https://github.com/
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/isLimitSubset.md b/docs/reference/functions/isLimitSubset.md
index ac464fcb2..5578b4b24 100644
--- a/docs/reference/functions/isLimitSubset.md
+++ b/docs/reference/functions/isLimitSubset.md
@@ -9,11 +9,14 @@ title: isLimitSubset
 function isLimitSubset(subset, superset): boolean;
 ```
 
-Defined in: [packages/db/src/query/predicate-utils.ts:768](https://github.com/TanStack/db/blob/main/packages/db/src/query/predicate-utils.ts#L768)
+Defined in: [packages/db/src/query/predicate-utils.ts:771](https://github.com/TanStack/db/blob/main/packages/db/src/query/predicate-utils.ts#L771)
 
 Check if one limit is a subset of another.
 Returns true if the subset limit requirements are satisfied by the superset limit.
 
+Note: This function does NOT consider offset. For offset-aware subset checking,
+use `isOffsetLimitSubset` instead.
+
 ## Parameters
 
 ### subset
diff --git a/docs/reference/functions/isNull.md b/docs/reference/functions/isNull.md
index 704ae7f33..3b7576a6f 100644
--- a/docs/reference/functions/isNull.md
+++ b/docs/reference/functions/isNull.md
@@ -19,4 +19,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:233](https://github.com/
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/isOffsetLimitSubset.md b/docs/reference/functions/isOffsetLimitSubset.md
new file mode 100644
index 000000000..0844f2a99
--- /dev/null
+++ b/docs/reference/functions/isOffsetLimitSubset.md
@@ -0,0 +1,63 @@
+---
+id: isOffsetLimitSubset
+title: isOffsetLimitSubset
+---
+
+# Function: isOffsetLimitSubset()
+
+```ts
+function isOffsetLimitSubset(subset, superset): boolean;
+```
+
+Defined in: [packages/db/src/query/predicate-utils.ts:811](https://github.com/TanStack/db/blob/main/packages/db/src/query/predicate-utils.ts#L811)
+
+Check if one offset+limit range is a subset of another.
+Returns true if the subset range is fully contained within the superset range.
+
+A query with `{limit: 10, offset: 0}` loads rows [0, 10).
+A query with `{limit: 10, offset: 20}` loads rows [20, 30).
+
+For subset to be satisfied by superset:
+- Superset must start at or before subset (superset.offset <= subset.offset)
+- Superset must end at or after subset (superset.offset + superset.limit >= subset.offset + subset.limit)
+
+## Parameters
+
+### subset
+
+The offset+limit requirements to check
+
+#### limit?
+
+`number`
+
+#### offset?
+
+`number`
+
+### superset
+
+The offset+limit that might satisfy the requirements
+
+#### limit?
+
+`number`
+
+#### offset?
+
+`number`
+
+## Returns
+
+`boolean`
+
+true if subset range is fully contained within superset range
+
+## Example
+
+```ts
+isOffsetLimitSubset({ offset: 0, limit: 5 }, { offset: 0, limit: 10 }) // true
+isOffsetLimitSubset({ offset: 5, limit: 5 }, { offset: 0, limit: 10 }) // true (rows 5-9 within 0-9)
+isOffsetLimitSubset({ offset: 5, limit: 10 }, { offset: 0, limit: 10 }) // false (rows 5-14 exceed 0-9)
+isOffsetLimitSubset({ offset: 20, limit: 10 }, { offset: 0, limit: 10 }) // false (rows 20-29 outside 0-9)
+```
diff --git a/docs/reference/functions/isOrderBySubset.md b/docs/reference/functions/isOrderBySubset.md
index 0a23a6505..525dbacc9 100644
--- a/docs/reference/functions/isOrderBySubset.md
+++ b/docs/reference/functions/isOrderBySubset.md
@@ -20,13 +20,13 @@ Returns true if the subset ordering requirements are satisfied by the superset o
 
 The ordering requirements to check
 
-[`OrderBy`](../../@tanstack/namespaces/IR/type-aliases/OrderBy.md) | `undefined`
+[`OrderBy`](../@tanstack/namespaces/IR/type-aliases/OrderBy.md) | `undefined`
 
 ### superset
 
 The ordering that might satisfy the requirements
 
-[`OrderBy`](../../@tanstack/namespaces/IR/type-aliases/OrderBy.md) | `undefined`
+[`OrderBy`](../@tanstack/namespaces/IR/type-aliases/OrderBy.md) | `undefined`
 
 ## Returns
 
diff --git a/docs/reference/functions/isPredicateSubset.md b/docs/reference/functions/isPredicateSubset.md
index d898b144d..78d107235 100644
--- a/docs/reference/functions/isPredicateSubset.md
+++ b/docs/reference/functions/isPredicateSubset.md
@@ -9,22 +9,22 @@ title: isPredicateSubset
 function isPredicateSubset(subset, superset): boolean;
 ```
 
-Defined in: [packages/db/src/query/predicate-utils.ts:801](https://github.com/TanStack/db/blob/main/packages/db/src/query/predicate-utils.ts#L801)
+Defined in: [packages/db/src/query/predicate-utils.ts:854](https://github.com/TanStack/db/blob/main/packages/db/src/query/predicate-utils.ts#L854)
 
-Check if one predicate (where + orderBy + limit) is a subset of another.
+Check if one predicate (where + orderBy + limit + offset) is a subset of another.
 Returns true if all aspects of the subset predicate are satisfied by the superset.
 
 ## Parameters
 
 ### subset
 
-[`LoadSubsetOptions`](../../type-aliases/LoadSubsetOptions.md)
+[`LoadSubsetOptions`](../type-aliases/LoadSubsetOptions.md)
 
 The predicate requirements to check
 
 ### superset
 
-[`LoadSubsetOptions`](../../type-aliases/LoadSubsetOptions.md)
+[`LoadSubsetOptions`](../type-aliases/LoadSubsetOptions.md)
 
 The predicate that might satisfy the requirements
 
diff --git a/docs/reference/functions/isUndefined.md b/docs/reference/functions/isUndefined.md
index 0862c3cc9..8924d9cd1 100644
--- a/docs/reference/functions/isUndefined.md
+++ b/docs/reference/functions/isUndefined.md
@@ -19,4 +19,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:229](https://github.com/
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/isWhereSubset.md b/docs/reference/functions/isWhereSubset.md
index 3c68dc250..4817c778e 100644
--- a/docs/reference/functions/isWhereSubset.md
+++ b/docs/reference/functions/isWhereSubset.md
@@ -20,13 +20,13 @@ Returns true if the subset predicate is more restrictive than (or equal to) the
 
 The potentially more restrictive predicate
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\> | `undefined`
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\> | `undefined`
 
 ### superset
 
 The potentially less restrictive predicate
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\> | `undefined`
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\> | `undefined`
 
 ## Returns
 
diff --git a/docs/reference/functions/like.md b/docs/reference/functions/like.md
index d94a428d4..fdaa7fc93 100644
--- a/docs/reference/functions/like.md
+++ b/docs/reference/functions/like.md
@@ -23,4 +23,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:244](https://github.com/
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/liveQueryCollectionOptions.md b/docs/reference/functions/liveQueryCollectionOptions.md
index 20b266568..43427f374 100644
--- a/docs/reference/functions/liveQueryCollectionOptions.md
+++ b/docs/reference/functions/liveQueryCollectionOptions.md
@@ -18,7 +18,7 @@ Creates live query collection options for use with createCollection
 
 ### TContext
 
-`TContext` *extends* [`Context`](../../interfaces/Context.md)
+`TContext` *extends* [`Context`](../interfaces/Context.md)
 
 ### TResult
 
@@ -28,7 +28,7 @@ Creates live query collection options for use with createCollection
 
 ### config
 
-[`LiveQueryCollectionConfig`](../../interfaces/LiveQueryCollectionConfig.md)\<`TContext`, `TResult`\>
+[`LiveQueryCollectionConfig`](../interfaces/LiveQueryCollectionConfig.md)\<`TContext`, `TResult`\>
 
 Configuration options for the live query collection
 
diff --git a/docs/reference/functions/localOnlyCollectionOptions.md b/docs/reference/functions/localOnlyCollectionOptions.md
index f473f9599..06ea87aff 100644
--- a/docs/reference/functions/localOnlyCollectionOptions.md
+++ b/docs/reference/functions/localOnlyCollectionOptions.md
@@ -43,13 +43,13 @@ The type of the key returned by getKey
 
 #### config
 
-[`LocalOnlyCollectionConfig`](../../interfaces/LocalOnlyCollectionConfig.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `T`, `TKey`\> & `object`
+[`LocalOnlyCollectionConfig`](../interfaces/LocalOnlyCollectionConfig.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `T`, `TKey`\> & `object`
 
 Configuration options for the Local-only collection
 
 ### Returns
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, [`UtilsRecord`](../../type-aliases/UtilsRecord.md)\> & `object` & `object`
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, [`UtilsRecord`](../type-aliases/UtilsRecord.md)\> & `object` & `object`
 
 Collection options with utilities including acceptMutations
 
@@ -155,13 +155,13 @@ The type of the key returned by getKey
 
 #### config
 
-[`LocalOnlyCollectionConfig`](../../interfaces/LocalOnlyCollectionConfig.md)\<`T`, `never`, `TKey`\> & `object`
+[`LocalOnlyCollectionConfig`](../interfaces/LocalOnlyCollectionConfig.md)\<`T`, `never`, `TKey`\> & `object`
 
 Configuration options for the Local-only collection
 
 ### Returns
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, [`UtilsRecord`](../../type-aliases/UtilsRecord.md)\> & `object` & `object`
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, [`UtilsRecord`](../type-aliases/UtilsRecord.md)\> & `object` & `object`
 
 Collection options with utilities including acceptMutations
 
diff --git a/docs/reference/functions/localStorageCollectionOptions.md b/docs/reference/functions/localStorageCollectionOptions.md
index 48e42965d..6ea5ecad0 100644
--- a/docs/reference/functions/localStorageCollectionOptions.md
+++ b/docs/reference/functions/localStorageCollectionOptions.md
@@ -46,13 +46,13 @@ don't participate in the standard mutation handler flow for manual transactions.
 
 #### config
 
-[`LocalStorageCollectionConfig`](../../interfaces/LocalStorageCollectionConfig.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `T`, `TKey`\> & `object`
+[`LocalStorageCollectionConfig`](../interfaces/LocalStorageCollectionConfig.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `T`, `TKey`\> & `object`
 
 Configuration options for the localStorage collection
 
 ### Returns
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, [`LocalStorageCollectionUtils`](../../interfaces/LocalStorageCollectionUtils.md)\> & `object`
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<[`InferSchemaOutput`](../type-aliases/InferSchemaOutput.md)\<`T`\>, `TKey`, `T`, [`LocalStorageCollectionUtils`](../interfaces/LocalStorageCollectionUtils.md)\> & `object`
 
 Collection options with utilities including clearStorage, getStorageSize, and acceptMutations
 
@@ -161,13 +161,13 @@ don't participate in the standard mutation handler flow for manual transactions.
 
 #### config
 
-[`LocalStorageCollectionConfig`](../../interfaces/LocalStorageCollectionConfig.md)\<`T`, `never`, `TKey`\> & `object`
+[`LocalStorageCollectionConfig`](../interfaces/LocalStorageCollectionConfig.md)\<`T`, `never`, `TKey`\> & `object`
 
 Configuration options for the localStorage collection
 
 ### Returns
 
-[`CollectionConfig`](../../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, [`LocalStorageCollectionUtils`](../../interfaces/LocalStorageCollectionUtils.md)\> & `object`
+[`CollectionConfig`](../interfaces/CollectionConfig.md)\<`T`, `TKey`, `never`, [`LocalStorageCollectionUtils`](../interfaces/LocalStorageCollectionUtils.md)\> & `object`
 
 Collection options with utilities including clearStorage, getStorageSize, and acceptMutations
 
diff --git a/docs/reference/functions/lt.md b/docs/reference/functions/lt.md
index b7cbe7e61..b7c95cdf7 100644
--- a/docs/reference/functions/lt.md
+++ b/docs/reference/functions/lt.md
@@ -31,7 +31,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:154](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -59,7 +59,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:158](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -79,7 +79,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:162](https://github.com/
 
 #### left
 
-[`Aggregate`](../../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
+[`Aggregate`](../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
 
 #### right
 
@@ -87,4 +87,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:162](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/lte.md b/docs/reference/functions/lte.md
index 25db4b12f..d71cacef0 100644
--- a/docs/reference/functions/lte.md
+++ b/docs/reference/functions/lte.md
@@ -31,7 +31,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:167](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -59,7 +59,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:171](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -79,7 +79,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:175](https://github.com/
 
 #### left
 
-[`Aggregate`](../../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
+[`Aggregate`](../@tanstack/namespaces/IR/classes/Aggregate.md)\<`T`\>
 
 #### right
 
@@ -87,4 +87,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:175](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/minusWherePredicates.md b/docs/reference/functions/minusWherePredicates.md
index e5e33e6c7..d86b411df 100644
--- a/docs/reference/functions/minusWherePredicates.md
+++ b/docs/reference/functions/minusWherePredicates.md
@@ -23,17 +23,17 @@ Returns the simplified predicate, or null if the difference cannot be simplified
 
 The predicate to subtract from
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\> | `undefined`
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\> | `undefined`
 
 ### subtractPredicate
 
 The predicate to subtract
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\> | `undefined`
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\> | `undefined`
 
 ## Returns
 
-  \| [`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+  \| [`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
   \| `null`
 
 The simplified difference, or null if cannot be simplified
diff --git a/docs/reference/functions/not.md b/docs/reference/functions/not.md
index d0bab9aff..3a5214236 100644
--- a/docs/reference/functions/not.md
+++ b/docs/reference/functions/not.md
@@ -19,4 +19,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:224](https://github.com/
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/or.md b/docs/reference/functions/or.md
index 11e471f9e..351e72ce8 100644
--- a/docs/reference/functions/or.md
+++ b/docs/reference/functions/or.md
@@ -25,7 +25,7 @@ Defined in: [packages/db/src/query/builder/functions.ts:203](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 ## Call Signature
 
@@ -54,4 +54,4 @@ Defined in: [packages/db/src/query/builder/functions.ts:207](https://github.com/
 
 ### Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
diff --git a/docs/reference/functions/parseLoadSubsetOptions.md b/docs/reference/functions/parseLoadSubsetOptions.md
index 880c34177..40e850e7f 100644
--- a/docs/reference/functions/parseLoadSubsetOptions.md
+++ b/docs/reference/functions/parseLoadSubsetOptions.md
@@ -22,7 +22,7 @@ The LoadSubsetOptions from ctx.meta
 
 \{
 `limit?`: `number`;
-`orderBy?`: [`OrderBy`](../../@tanstack/namespaces/IR/type-aliases/OrderBy.md);
+`orderBy?`: [`OrderBy`](../@tanstack/namespaces/IR/type-aliases/OrderBy.md);
 `where?`: `BasicExpression`\<`boolean`\>;
 \} | `null` | `undefined`
 
diff --git a/docs/reference/functions/parseOrderByExpression.md b/docs/reference/functions/parseOrderByExpression.md
index 13e2d77f0..2df1508c5 100644
--- a/docs/reference/functions/parseOrderByExpression.md
+++ b/docs/reference/functions/parseOrderByExpression.md
@@ -19,11 +19,11 @@ Parses an ORDER BY expression into a simple array of sort specifications.
 
 The ORDER BY expression array
 
-[`OrderBy`](../../@tanstack/namespaces/IR/type-aliases/OrderBy.md) | `null` | `undefined`
+[`OrderBy`](../@tanstack/namespaces/IR/type-aliases/OrderBy.md) | `null` | `undefined`
 
 ## Returns
 
-[`ParsedOrderBy`](../../interfaces/ParsedOrderBy.md)[]
+[`ParsedOrderBy`](../interfaces/ParsedOrderBy.md)[]
 
 Array of parsed order by specifications
 
diff --git a/docs/reference/functions/parseWhereExpression.md b/docs/reference/functions/parseWhereExpression.md
index a15a8f7e3..792773811 100644
--- a/docs/reference/functions/parseWhereExpression.md
+++ b/docs/reference/functions/parseWhereExpression.md
@@ -33,7 +33,7 @@ The WHERE expression to parse
 
 ### options
 
-[`ParseWhereOptions`](../../interfaces/ParseWhereOptions.md)\<`T`\>
+[`ParseWhereOptions`](../interfaces/ParseWhereOptions.md)\<`T`\>
 
 Configuration with handler functions for each operator
 
diff --git a/docs/reference/functions/queueStrategy.md b/docs/reference/functions/queueStrategy.md
index 8752c1746..524ca194f 100644
--- a/docs/reference/functions/queueStrategy.md
+++ b/docs/reference/functions/queueStrategy.md
@@ -22,13 +22,13 @@ every operation must complete in order.
 
 ### options?
 
-[`QueueStrategyOptions`](../../interfaces/QueueStrategyOptions.md)
+[`QueueStrategyOptions`](../interfaces/QueueStrategyOptions.md)
 
 Configuration for queue behavior (FIFO/LIFO, timing, size limits)
 
 ## Returns
 
-[`QueueStrategy`](../../interfaces/QueueStrategy.md)
+[`QueueStrategy`](../interfaces/QueueStrategy.md)
 
 A queue strategy instance
 
diff --git a/docs/reference/functions/throttleStrategy.md b/docs/reference/functions/throttleStrategy.md
index b9ac28644..35c7aa07e 100644
--- a/docs/reference/functions/throttleStrategy.md
+++ b/docs/reference/functions/throttleStrategy.md
@@ -22,13 +22,13 @@ execution timing.
 
 ### options
 
-[`ThrottleStrategyOptions`](../../interfaces/ThrottleStrategyOptions.md)
+[`ThrottleStrategyOptions`](../interfaces/ThrottleStrategyOptions.md)
 
 Configuration for throttle behavior
 
 ## Returns
 
-[`ThrottleStrategy`](../../interfaces/ThrottleStrategy.md)
+[`ThrottleStrategy`](../interfaces/ThrottleStrategy.md)
 
 A throttle strategy instance
 
diff --git a/docs/reference/functions/unionWherePredicates.md b/docs/reference/functions/unionWherePredicates.md
index eb34b9775..ffd244a1c 100644
--- a/docs/reference/functions/unionWherePredicates.md
+++ b/docs/reference/functions/unionWherePredicates.md
@@ -19,13 +19,13 @@ Simplifies when possible (e.g., age > 10 OR age > 20 → age > 10).
 
 ### predicates
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>[]
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>[]
 
 Array of where predicates to union
 
 ## Returns
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)\<`boolean`\>
 
 Combined predicate representing the union
 
diff --git a/docs/reference/index.md b/docs/reference/index.md
index a04fc672b..5f3d224ed 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -7,271 +7,278 @@ title: "@tanstack/db"
 
 ## Namespaces
 
-- [IR](../@tanstack/namespaces/IR/index.md)
+- [IR](@tanstack/namespaces/IR/index.md)
 
 ## Classes
 
-- [AggregateFunctionNotInSelectError](../classes/AggregateFunctionNotInSelectError.md)
-- [AggregateNotSupportedError](../classes/AggregateNotSupportedError.md)
-- [BaseIndex](../classes/BaseIndex.md)
-- [BaseQueryBuilder](../classes/BaseQueryBuilder.md)
-- [BTreeIndex](../classes/BTreeIndex.md)
-- [CannotCombineEmptyExpressionListError](../classes/CannotCombineEmptyExpressionListError.md)
-- [CollectionConfigurationError](../classes/CollectionConfigurationError.md)
-- [CollectionImpl](../classes/CollectionImpl.md)
-- [CollectionInErrorStateError](../classes/CollectionInErrorStateError.md)
-- [CollectionInputNotFoundError](../classes/CollectionInputNotFoundError.md)
-- [CollectionIsInErrorStateError](../classes/CollectionIsInErrorStateError.md)
-- [CollectionOperationError](../classes/CollectionOperationError.md)
-- [CollectionRequiresConfigError](../classes/CollectionRequiresConfigError.md)
-- [CollectionRequiresSyncConfigError](../classes/CollectionRequiresSyncConfigError.md)
-- [CollectionStateError](../classes/CollectionStateError.md)
-- [DeduplicatedLoadSubset](../classes/DeduplicatedLoadSubset.md)
-- [DeleteKeyNotFoundError](../classes/DeleteKeyNotFoundError.md)
-- [DistinctRequiresSelectError](../classes/DistinctRequiresSelectError.md)
-- [DuplicateAliasInSubqueryError](../classes/DuplicateAliasInSubqueryError.md)
-- [DuplicateDbInstanceError](../classes/DuplicateDbInstanceError.md)
-- [DuplicateKeyError](../classes/DuplicateKeyError.md)
-- [DuplicateKeySyncError](../classes/DuplicateKeySyncError.md)
-- [EmptyReferencePathError](../classes/EmptyReferencePathError.md)
-- [GroupByError](../classes/GroupByError.md)
-- [HavingRequiresGroupByError](../classes/HavingRequiresGroupByError.md)
-- [IndexProxy](../classes/IndexProxy.md)
-- [InvalidCollectionStatusTransitionError](../classes/InvalidCollectionStatusTransitionError.md)
-- [InvalidJoinCondition](../classes/InvalidJoinCondition.md)
-- [InvalidJoinConditionLeftSourceError](../classes/InvalidJoinConditionLeftSourceError.md)
-- [InvalidJoinConditionRightSourceError](../classes/InvalidJoinConditionRightSourceError.md)
-- [InvalidJoinConditionSameSourceError](../classes/InvalidJoinConditionSameSourceError.md)
-- [InvalidJoinConditionSourceMismatchError](../classes/InvalidJoinConditionSourceMismatchError.md)
-- [InvalidSchemaError](../classes/InvalidSchemaError.md)
-- [InvalidSourceError](../classes/InvalidSourceError.md)
-- [InvalidSourceTypeError](../classes/InvalidSourceTypeError.md)
-- [InvalidStorageDataFormatError](../classes/InvalidStorageDataFormatError.md)
-- [InvalidStorageObjectFormatError](../classes/InvalidStorageObjectFormatError.md)
-- [JoinCollectionNotFoundError](../classes/JoinCollectionNotFoundError.md)
-- [JoinConditionMustBeEqualityError](../classes/JoinConditionMustBeEqualityError.md)
-- [JoinError](../classes/JoinError.md)
-- [KeyUpdateNotAllowedError](../classes/KeyUpdateNotAllowedError.md)
-- [LazyIndexWrapper](../classes/LazyIndexWrapper.md)
-- [LimitOffsetRequireOrderByError](../classes/LimitOffsetRequireOrderByError.md)
-- [LocalStorageCollectionError](../classes/LocalStorageCollectionError.md)
-- [MissingAliasInputsError](../classes/MissingAliasInputsError.md)
-- [MissingDeleteHandlerError](../classes/MissingDeleteHandlerError.md)
-- [MissingHandlerError](../classes/MissingHandlerError.md)
-- [MissingInsertHandlerError](../classes/MissingInsertHandlerError.md)
-- [MissingMutationFunctionError](../classes/MissingMutationFunctionError.md)
-- [MissingUpdateArgumentError](../classes/MissingUpdateArgumentError.md)
-- [MissingUpdateHandlerError](../classes/MissingUpdateHandlerError.md)
-- [NegativeActiveSubscribersError](../classes/NegativeActiveSubscribersError.md)
-- [NoKeysPassedToDeleteError](../classes/NoKeysPassedToDeleteError.md)
-- [NoKeysPassedToUpdateError](../classes/NoKeysPassedToUpdateError.md)
-- [NonAggregateExpressionNotInGroupByError](../classes/NonAggregateExpressionNotInGroupByError.md)
-- [NonRetriableError](../classes/NonRetriableError.md)
-- [NoPendingSyncTransactionCommitError](../classes/NoPendingSyncTransactionCommitError.md)
-- [NoPendingSyncTransactionWriteError](../classes/NoPendingSyncTransactionWriteError.md)
-- [OnlyOneSourceAllowedError](../classes/OnlyOneSourceAllowedError.md)
-- [OnMutateMustBeSynchronousError](../classes/OnMutateMustBeSynchronousError.md)
-- [QueryBuilderError](../classes/QueryBuilderError.md)
-- [QueryCompilationError](../classes/QueryCompilationError.md)
-- [QueryMustHaveFromClauseError](../classes/QueryMustHaveFromClauseError.md)
-- [QueryOptimizerError](../classes/QueryOptimizerError.md)
-- [SchemaMustBeSynchronousError](../classes/SchemaMustBeSynchronousError.md)
-- [SchemaValidationError](../classes/SchemaValidationError.md)
-- [SerializationError](../classes/SerializationError.md)
-- [SetWindowRequiresOrderByError](../classes/SetWindowRequiresOrderByError.md)
-- [SortedMap](../classes/SortedMap.md)
-- [StorageError](../classes/StorageError.md)
-- [StorageKeyRequiredError](../classes/StorageKeyRequiredError.md)
-- [SubQueryMustHaveFromClauseError](../classes/SubQueryMustHaveFromClauseError.md)
-- [SubscriptionNotFoundError](../classes/SubscriptionNotFoundError.md)
-- [SyncCleanupError](../classes/SyncCleanupError.md)
-- [SyncTransactionAlreadyCommittedError](../classes/SyncTransactionAlreadyCommittedError.md)
-- [SyncTransactionAlreadyCommittedWriteError](../classes/SyncTransactionAlreadyCommittedWriteError.md)
-- [TanStackDBError](../classes/TanStackDBError.md)
-- [TransactionAlreadyCompletedRollbackError](../classes/TransactionAlreadyCompletedRollbackError.md)
-- [TransactionError](../classes/TransactionError.md)
-- [TransactionNotPendingCommitError](../classes/TransactionNotPendingCommitError.md)
-- [TransactionNotPendingMutateError](../classes/TransactionNotPendingMutateError.md)
-- [UndefinedKeyError](../classes/UndefinedKeyError.md)
-- [UnknownExpressionTypeError](../classes/UnknownExpressionTypeError.md)
-- [UnknownFunctionError](../classes/UnknownFunctionError.md)
-- [UnknownHavingExpressionTypeError](../classes/UnknownHavingExpressionTypeError.md)
-- [UnsupportedAggregateFunctionError](../classes/UnsupportedAggregateFunctionError.md)
-- [UnsupportedFromTypeError](../classes/UnsupportedFromTypeError.md)
-- [UnsupportedJoinSourceTypeError](../classes/UnsupportedJoinSourceTypeError.md)
-- [UnsupportedJoinTypeError](../classes/UnsupportedJoinTypeError.md)
-- [UpdateKeyNotFoundError](../classes/UpdateKeyNotFoundError.md)
-- [WhereClauseConversionError](../classes/WhereClauseConversionError.md)
+- [AggregateFunctionNotInSelectError](classes/AggregateFunctionNotInSelectError.md)
+- [AggregateNotSupportedError](classes/AggregateNotSupportedError.md)
+- [BaseIndex](classes/BaseIndex.md)
+- [BaseQueryBuilder](classes/BaseQueryBuilder.md)
+- [BTreeIndex](classes/BTreeIndex.md)
+- [CannotCombineEmptyExpressionListError](classes/CannotCombineEmptyExpressionListError.md)
+- [CollectionConfigurationError](classes/CollectionConfigurationError.md)
+- [CollectionImpl](classes/CollectionImpl.md)
+- [CollectionInErrorStateError](classes/CollectionInErrorStateError.md)
+- [CollectionInputNotFoundError](classes/CollectionInputNotFoundError.md)
+- [CollectionIsInErrorStateError](classes/CollectionIsInErrorStateError.md)
+- [CollectionOperationError](classes/CollectionOperationError.md)
+- [CollectionRequiresConfigError](classes/CollectionRequiresConfigError.md)
+- [CollectionRequiresSyncConfigError](classes/CollectionRequiresSyncConfigError.md)
+- [CollectionStateError](classes/CollectionStateError.md)
+- [DeduplicatedLoadSubset](classes/DeduplicatedLoadSubset.md)
+- [DeleteKeyNotFoundError](classes/DeleteKeyNotFoundError.md)
+- [DistinctRequiresSelectError](classes/DistinctRequiresSelectError.md)
+- [DuplicateAliasInSubqueryError](classes/DuplicateAliasInSubqueryError.md)
+- [DuplicateDbInstanceError](classes/DuplicateDbInstanceError.md)
+- [DuplicateKeyError](classes/DuplicateKeyError.md)
+- [DuplicateKeySyncError](classes/DuplicateKeySyncError.md)
+- [EmptyReferencePathError](classes/EmptyReferencePathError.md)
+- [GroupByError](classes/GroupByError.md)
+- [HavingRequiresGroupByError](classes/HavingRequiresGroupByError.md)
+- [IndexProxy](classes/IndexProxy.md)
+- [InvalidCollectionStatusTransitionError](classes/InvalidCollectionStatusTransitionError.md)
+- [InvalidJoinCondition](classes/InvalidJoinCondition.md)
+- [InvalidJoinConditionLeftSourceError](classes/InvalidJoinConditionLeftSourceError.md)
+- [InvalidJoinConditionRightSourceError](classes/InvalidJoinConditionRightSourceError.md)
+- [InvalidJoinConditionSameSourceError](classes/InvalidJoinConditionSameSourceError.md)
+- [InvalidJoinConditionSourceMismatchError](classes/InvalidJoinConditionSourceMismatchError.md)
+- [InvalidKeyError](classes/InvalidKeyError.md)
+- [InvalidSchemaError](classes/InvalidSchemaError.md)
+- [InvalidSourceError](classes/InvalidSourceError.md)
+- [InvalidSourceTypeError](classes/InvalidSourceTypeError.md)
+- [InvalidStorageDataFormatError](classes/InvalidStorageDataFormatError.md)
+- [InvalidStorageObjectFormatError](classes/InvalidStorageObjectFormatError.md)
+- [JoinCollectionNotFoundError](classes/JoinCollectionNotFoundError.md)
+- [JoinConditionMustBeEqualityError](classes/JoinConditionMustBeEqualityError.md)
+- [JoinError](classes/JoinError.md)
+- [KeyUpdateNotAllowedError](classes/KeyUpdateNotAllowedError.md)
+- [LazyIndexWrapper](classes/LazyIndexWrapper.md)
+- [LimitOffsetRequireOrderByError](classes/LimitOffsetRequireOrderByError.md)
+- [LocalStorageCollectionError](classes/LocalStorageCollectionError.md)
+- [MissingAliasInputsError](classes/MissingAliasInputsError.md)
+- [MissingDeleteHandlerError](classes/MissingDeleteHandlerError.md)
+- [MissingHandlerError](classes/MissingHandlerError.md)
+- [MissingInsertHandlerError](classes/MissingInsertHandlerError.md)
+- [MissingMutationFunctionError](classes/MissingMutationFunctionError.md)
+- [MissingUpdateArgumentError](classes/MissingUpdateArgumentError.md)
+- [MissingUpdateHandlerError](classes/MissingUpdateHandlerError.md)
+- [NegativeActiveSubscribersError](classes/NegativeActiveSubscribersError.md)
+- [NoKeysPassedToDeleteError](classes/NoKeysPassedToDeleteError.md)
+- [NoKeysPassedToUpdateError](classes/NoKeysPassedToUpdateError.md)
+- [NonAggregateExpressionNotInGroupByError](classes/NonAggregateExpressionNotInGroupByError.md)
+- [NonRetriableError](classes/NonRetriableError.md)
+- [NoPendingSyncTransactionCommitError](classes/NoPendingSyncTransactionCommitError.md)
+- [NoPendingSyncTransactionWriteError](classes/NoPendingSyncTransactionWriteError.md)
+- [OnlyOneSourceAllowedError](classes/OnlyOneSourceAllowedError.md)
+- [OnMutateMustBeSynchronousError](classes/OnMutateMustBeSynchronousError.md)
+- [QueryBuilderError](classes/QueryBuilderError.md)
+- [QueryCompilationError](classes/QueryCompilationError.md)
+- [QueryMustHaveFromClauseError](classes/QueryMustHaveFromClauseError.md)
+- [QueryOptimizerError](classes/QueryOptimizerError.md)
+- [SchemaMustBeSynchronousError](classes/SchemaMustBeSynchronousError.md)
+- [SchemaValidationError](classes/SchemaValidationError.md)
+- [SerializationError](classes/SerializationError.md)
+- [SetWindowRequiresOrderByError](classes/SetWindowRequiresOrderByError.md)
+- [SortedMap](classes/SortedMap.md)
+- [StorageError](classes/StorageError.md)
+- [StorageKeyRequiredError](classes/StorageKeyRequiredError.md)
+- [SubQueryMustHaveFromClauseError](classes/SubQueryMustHaveFromClauseError.md)
+- [SubscriptionNotFoundError](classes/SubscriptionNotFoundError.md)
+- [SyncCleanupError](classes/SyncCleanupError.md)
+- [SyncTransactionAlreadyCommittedError](classes/SyncTransactionAlreadyCommittedError.md)
+- [SyncTransactionAlreadyCommittedWriteError](classes/SyncTransactionAlreadyCommittedWriteError.md)
+- [TanStackDBError](classes/TanStackDBError.md)
+- [TransactionAlreadyCompletedRollbackError](classes/TransactionAlreadyCompletedRollbackError.md)
+- [TransactionError](classes/TransactionError.md)
+- [TransactionNotPendingCommitError](classes/TransactionNotPendingCommitError.md)
+- [TransactionNotPendingMutateError](classes/TransactionNotPendingMutateError.md)
+- [UndefinedKeyError](classes/UndefinedKeyError.md)
+- [UnknownExpressionTypeError](classes/UnknownExpressionTypeError.md)
+- [UnknownFunctionError](classes/UnknownFunctionError.md)
+- [UnknownHavingExpressionTypeError](classes/UnknownHavingExpressionTypeError.md)
+- [UnsupportedAggregateFunctionError](classes/UnsupportedAggregateFunctionError.md)
+- [UnsupportedFromTypeError](classes/UnsupportedFromTypeError.md)
+- [UnsupportedJoinSourceTypeError](classes/UnsupportedJoinSourceTypeError.md)
+- [UnsupportedJoinTypeError](classes/UnsupportedJoinTypeError.md)
+- [UpdateKeyNotFoundError](classes/UpdateKeyNotFoundError.md)
+- [WhereClauseConversionError](classes/WhereClauseConversionError.md)
 
 ## Interfaces
 
-- [BaseCollectionConfig](../interfaces/BaseCollectionConfig.md)
-- [BaseStrategy](../interfaces/BaseStrategy.md)
-- [BTreeIndexOptions](../interfaces/BTreeIndexOptions.md)
-- [ChangeMessage](../interfaces/ChangeMessage.md)
-- [Collection](../interfaces/Collection.md)
-- [CollectionConfig](../interfaces/CollectionConfig.md)
-- [CollectionLike](../interfaces/CollectionLike.md)
-- [Context](../interfaces/Context.md)
-- [CreateOptimisticActionsOptions](../interfaces/CreateOptimisticActionsOptions.md)
-- [CurrentStateAsChangesOptions](../interfaces/CurrentStateAsChangesOptions.md)
-- [DebounceStrategy](../interfaces/DebounceStrategy.md)
-- [DebounceStrategyOptions](../interfaces/DebounceStrategyOptions.md)
-- [IndexInterface](../interfaces/IndexInterface.md)
-- [IndexOptions](../interfaces/IndexOptions.md)
-- [IndexStats](../interfaces/IndexStats.md)
-- [InsertConfig](../interfaces/InsertConfig.md)
-- [LiveQueryCollectionConfig](../interfaces/LiveQueryCollectionConfig.md)
-- [LocalOnlyCollectionConfig](../interfaces/LocalOnlyCollectionConfig.md)
-- [LocalOnlyCollectionUtils](../interfaces/LocalOnlyCollectionUtils.md)
-- [LocalStorageCollectionConfig](../interfaces/LocalStorageCollectionConfig.md)
-- [LocalStorageCollectionUtils](../interfaces/LocalStorageCollectionUtils.md)
-- [OperationConfig](../interfaces/OperationConfig.md)
-- [OptimisticChangeMessage](../interfaces/OptimisticChangeMessage.md)
-- [PacedMutationsConfig](../interfaces/PacedMutationsConfig.md)
-- [ParsedOrderBy](../interfaces/ParsedOrderBy.md)
-- [Parser](../interfaces/Parser.md)
-- [ParseWhereOptions](../interfaces/ParseWhereOptions.md)
-- [PendingMutation](../interfaces/PendingMutation.md)
-- [QueueStrategy](../interfaces/QueueStrategy.md)
-- [QueueStrategyOptions](../interfaces/QueueStrategyOptions.md)
-- [RangeQueryOptions](../interfaces/RangeQueryOptions.md)
-- [SimpleComparison](../interfaces/SimpleComparison.md)
-- [SubscribeChangesOptions](../interfaces/SubscribeChangesOptions.md)
-- [SubscribeChangesSnapshotOptions](../interfaces/SubscribeChangesSnapshotOptions.md)
-- [Subscription](../interfaces/Subscription.md)
-- [SubscriptionStatusChangeEvent](../interfaces/SubscriptionStatusChangeEvent.md)
-- [SubscriptionStatusEvent](../interfaces/SubscriptionStatusEvent.md)
-- [SubscriptionUnsubscribedEvent](../interfaces/SubscriptionUnsubscribedEvent.md)
-- [SyncConfig](../interfaces/SyncConfig.md)
-- [ThrottleStrategy](../interfaces/ThrottleStrategy.md)
-- [ThrottleStrategyOptions](../interfaces/ThrottleStrategyOptions.md)
-- [Transaction](../interfaces/Transaction.md)
-- [TransactionConfig](../interfaces/TransactionConfig.md)
+- [BaseCollectionConfig](interfaces/BaseCollectionConfig.md)
+- [BaseStrategy](interfaces/BaseStrategy.md)
+- [BTreeIndexOptions](interfaces/BTreeIndexOptions.md)
+- [ChangeMessage](interfaces/ChangeMessage.md)
+- [Collection](interfaces/Collection.md)
+- [CollectionConfig](interfaces/CollectionConfig.md)
+- [CollectionLike](interfaces/CollectionLike.md)
+- [Context](interfaces/Context.md)
+- [CreateOptimisticActionsOptions](interfaces/CreateOptimisticActionsOptions.md)
+- [CurrentStateAsChangesOptions](interfaces/CurrentStateAsChangesOptions.md)
+- [DebounceStrategy](interfaces/DebounceStrategy.md)
+- [DebounceStrategyOptions](interfaces/DebounceStrategyOptions.md)
+- [IndexInterface](interfaces/IndexInterface.md)
+- [IndexOptions](interfaces/IndexOptions.md)
+- [IndexStats](interfaces/IndexStats.md)
+- [InsertConfig](interfaces/InsertConfig.md)
+- [LiveQueryCollectionConfig](interfaces/LiveQueryCollectionConfig.md)
+- [LocalOnlyCollectionConfig](interfaces/LocalOnlyCollectionConfig.md)
+- [LocalOnlyCollectionUtils](interfaces/LocalOnlyCollectionUtils.md)
+- [LocalStorageCollectionConfig](interfaces/LocalStorageCollectionConfig.md)
+- [LocalStorageCollectionUtils](interfaces/LocalStorageCollectionUtils.md)
+- [OperationConfig](interfaces/OperationConfig.md)
+- [PacedMutationsConfig](interfaces/PacedMutationsConfig.md)
+- [ParsedOrderBy](interfaces/ParsedOrderBy.md)
+- [Parser](interfaces/Parser.md)
+- [ParseWhereOptions](interfaces/ParseWhereOptions.md)
+- [PendingMutation](interfaces/PendingMutation.md)
+- [QueueStrategy](interfaces/QueueStrategy.md)
+- [QueueStrategyOptions](interfaces/QueueStrategyOptions.md)
+- [RangeQueryOptions](interfaces/RangeQueryOptions.md)
+- [SimpleComparison](interfaces/SimpleComparison.md)
+- [SubscribeChangesOptions](interfaces/SubscribeChangesOptions.md)
+- [SubscribeChangesSnapshotOptions](interfaces/SubscribeChangesSnapshotOptions.md)
+- [Subscription](interfaces/Subscription.md)
+- [SubscriptionStatusChangeEvent](interfaces/SubscriptionStatusChangeEvent.md)
+- [SubscriptionStatusEvent](interfaces/SubscriptionStatusEvent.md)
+- [SubscriptionUnsubscribedEvent](interfaces/SubscriptionUnsubscribedEvent.md)
+- [SyncConfig](interfaces/SyncConfig.md)
+- [ThrottleStrategy](interfaces/ThrottleStrategy.md)
+- [ThrottleStrategyOptions](interfaces/ThrottleStrategyOptions.md)
+- [Transaction](interfaces/Transaction.md)
+- [TransactionConfig](interfaces/TransactionConfig.md)
 
 ## Type Aliases
 
-- [ChangeListener](../type-aliases/ChangeListener.md)
-- [ChangesPayload](../type-aliases/ChangesPayload.md)
-- [CleanupFn](../type-aliases/CleanupFn.md)
-- [ClearStorageFn](../type-aliases/ClearStorageFn.md)
-- [CollectionConfigSingleRowOption](../type-aliases/CollectionConfigSingleRowOption.md)
-- [CollectionStatus](../type-aliases/CollectionStatus.md)
-- [DeleteMutationFn](../type-aliases/DeleteMutationFn.md)
-- [DeleteMutationFnParams](../type-aliases/DeleteMutationFnParams.md)
-- [FieldPath](../type-aliases/FieldPath.md)
-- [Fn](../type-aliases/Fn.md)
-- [GetResult](../type-aliases/GetResult.md)
-- [GetStorageSizeFn](../type-aliases/GetStorageSizeFn.md)
-- [IndexConstructor](../type-aliases/IndexConstructor.md)
-- [IndexOperation](../type-aliases/IndexOperation.md)
-- [IndexResolver](../type-aliases/IndexResolver.md)
-- [InferResultType](../type-aliases/InferResultType.md)
-- [InferSchemaInput](../type-aliases/InferSchemaInput.md)
-- [InferSchemaOutput](../type-aliases/InferSchemaOutput.md)
-- [InitialQueryBuilder](../type-aliases/InitialQueryBuilder.md)
-- [InputRow](../type-aliases/InputRow.md)
-- [InsertMutationFn](../type-aliases/InsertMutationFn.md)
-- [InsertMutationFnParams](../type-aliases/InsertMutationFnParams.md)
-- [KeyedNamespacedRow](../type-aliases/KeyedNamespacedRow.md)
-- [KeyedStream](../type-aliases/KeyedStream.md)
-- [LiveQueryCollectionUtils](../type-aliases/LiveQueryCollectionUtils.md)
-- [LoadSubsetFn](../type-aliases/LoadSubsetFn.md)
-- [LoadSubsetOptions](../type-aliases/LoadSubsetOptions.md)
-- [MaybeSingleResult](../type-aliases/MaybeSingleResult.md)
-- [MutationFn](../type-aliases/MutationFn.md)
-- [MutationFnParams](../type-aliases/MutationFnParams.md)
-- [NamespacedAndKeyedStream](../type-aliases/NamespacedAndKeyedStream.md)
-- [NamespacedRow](../type-aliases/NamespacedRow.md)
-- [NonEmptyArray](../type-aliases/NonEmptyArray.md)
-- [NonSingleResult](../type-aliases/NonSingleResult.md)
-- [OperationType](../type-aliases/OperationType.md)
-- [OperatorName](../type-aliases/OperatorName.md)
-- [QueryBuilder](../type-aliases/QueryBuilder.md)
-- [Ref](../type-aliases/Ref.md)
-- [ResolveTransactionChanges](../type-aliases/ResolveTransactionChanges.md)
-- [ResultStream](../type-aliases/ResultStream.md)
-- [Row](../type-aliases/Row.md)
-- [SingleResult](../type-aliases/SingleResult.md)
-- [Source](../type-aliases/Source.md)
-- [StandardSchema](../type-aliases/StandardSchema.md)
-- [StandardSchemaAlias](../type-aliases/StandardSchemaAlias.md)
-- [StorageApi](../type-aliases/StorageApi.md)
-- [StorageEventApi](../type-aliases/StorageEventApi.md)
-- [Strategy](../type-aliases/Strategy.md)
-- [StrategyOptions](../type-aliases/StrategyOptions.md)
-- [StringCollationConfig](../type-aliases/StringCollationConfig.md)
-- [SubscriptionEvents](../type-aliases/SubscriptionEvents.md)
-- [SubscriptionStatus](../type-aliases/SubscriptionStatus.md)
-- [SyncConfigRes](../type-aliases/SyncConfigRes.md)
-- [SyncMode](../type-aliases/SyncMode.md)
-- [TransactionState](../type-aliases/TransactionState.md)
-- [TransactionWithMutations](../type-aliases/TransactionWithMutations.md)
-- [UnloadSubsetFn](../type-aliases/UnloadSubsetFn.md)
-- [UpdateMutationFn](../type-aliases/UpdateMutationFn.md)
-- [UpdateMutationFnParams](../type-aliases/UpdateMutationFnParams.md)
-- [UtilsRecord](../type-aliases/UtilsRecord.md)
-- [WritableDeep](../type-aliases/WritableDeep.md)
+- [ChangeListener](type-aliases/ChangeListener.md)
+- [ChangeMessageOrDeleteKeyMessage](type-aliases/ChangeMessageOrDeleteKeyMessage.md)
+- [ChangesPayload](type-aliases/ChangesPayload.md)
+- [CleanupFn](type-aliases/CleanupFn.md)
+- [ClearStorageFn](type-aliases/ClearStorageFn.md)
+- [CollectionConfigSingleRowOption](type-aliases/CollectionConfigSingleRowOption.md)
+- [CollectionStatus](type-aliases/CollectionStatus.md)
+- [CursorExpressions](type-aliases/CursorExpressions.md)
+- [DeleteKeyMessage](type-aliases/DeleteKeyMessage.md)
+- [DeleteMutationFn](type-aliases/DeleteMutationFn.md)
+- [DeleteMutationFnParams](type-aliases/DeleteMutationFnParams.md)
+- [FieldPath](type-aliases/FieldPath.md)
+- [Fn](type-aliases/Fn.md)
+- [GetResult](type-aliases/GetResult.md)
+- [GetStorageSizeFn](type-aliases/GetStorageSizeFn.md)
+- [IndexConstructor](type-aliases/IndexConstructor.md)
+- [IndexOperation](type-aliases/IndexOperation.md)
+- [IndexResolver](type-aliases/IndexResolver.md)
+- [InferResultType](type-aliases/InferResultType.md)
+- [InferSchemaInput](type-aliases/InferSchemaInput.md)
+- [InferSchemaOutput](type-aliases/InferSchemaOutput.md)
+- [InitialQueryBuilder](type-aliases/InitialQueryBuilder.md)
+- [InputRow](type-aliases/InputRow.md)
+- [InsertMutationFn](type-aliases/InsertMutationFn.md)
+- [InsertMutationFnParams](type-aliases/InsertMutationFnParams.md)
+- [KeyedNamespacedRow](type-aliases/KeyedNamespacedRow.md)
+- [KeyedStream](type-aliases/KeyedStream.md)
+- [LiveQueryCollectionUtils](type-aliases/LiveQueryCollectionUtils.md)
+- [LoadSubsetFn](type-aliases/LoadSubsetFn.md)
+- [LoadSubsetOptions](type-aliases/LoadSubsetOptions.md)
+- [MakeOptional](type-aliases/MakeOptional.md)
+- [MaybeSingleResult](type-aliases/MaybeSingleResult.md)
+- [MutationFn](type-aliases/MutationFn.md)
+- [MutationFnParams](type-aliases/MutationFnParams.md)
+- [NamespacedAndKeyedStream](type-aliases/NamespacedAndKeyedStream.md)
+- [NamespacedRow](type-aliases/NamespacedRow.md)
+- [NonEmptyArray](type-aliases/NonEmptyArray.md)
+- [NonSingleResult](type-aliases/NonSingleResult.md)
+- [OperationType](type-aliases/OperationType.md)
+- [OperatorName](type-aliases/OperatorName.md)
+- [OptimisticChangeMessage](type-aliases/OptimisticChangeMessage.md)
+- [QueryBuilder](type-aliases/QueryBuilder.md)
+- [Ref](type-aliases/Ref.md)
+- [ResolveTransactionChanges](type-aliases/ResolveTransactionChanges.md)
+- [ResultStream](type-aliases/ResultStream.md)
+- [Row](type-aliases/Row.md)
+- [SingleResult](type-aliases/SingleResult.md)
+- [Source](type-aliases/Source.md)
+- [StandardSchema](type-aliases/StandardSchema.md)
+- [StandardSchemaAlias](type-aliases/StandardSchemaAlias.md)
+- [StorageApi](type-aliases/StorageApi.md)
+- [StorageEventApi](type-aliases/StorageEventApi.md)
+- [Strategy](type-aliases/Strategy.md)
+- [StrategyOptions](type-aliases/StrategyOptions.md)
+- [StringCollationConfig](type-aliases/StringCollationConfig.md)
+- [SubscriptionEvents](type-aliases/SubscriptionEvents.md)
+- [SubscriptionStatus](type-aliases/SubscriptionStatus.md)
+- [SyncConfigRes](type-aliases/SyncConfigRes.md)
+- [SyncMode](type-aliases/SyncMode.md)
+- [TransactionState](type-aliases/TransactionState.md)
+- [TransactionWithMutations](type-aliases/TransactionWithMutations.md)
+- [UnloadSubsetFn](type-aliases/UnloadSubsetFn.md)
+- [UpdateMutationFn](type-aliases/UpdateMutationFn.md)
+- [UpdateMutationFnParams](type-aliases/UpdateMutationFnParams.md)
+- [UtilsRecord](type-aliases/UtilsRecord.md)
+- [WritableDeep](type-aliases/WritableDeep.md)
 
 ## Variables
 
-- [IndexOperation](../variables/IndexOperation.md)
-- [operators](../variables/operators.md)
-- [Query](../variables/Query.md)
+- [IndexOperation](variables/IndexOperation.md)
+- [operators](variables/operators.md)
+- [Query](variables/Query.md)
 
 ## Functions
 
-- [add](../functions/add.md)
-- [and](../functions/and.md)
-- [avg](../functions/avg.md)
-- [coalesce](../functions/coalesce.md)
-- [compileQuery](../functions/compileQuery.md)
-- [concat](../functions/concat.md)
-- [count](../functions/count.md)
-- [createArrayChangeProxy](../functions/createArrayChangeProxy.md)
-- [createChangeProxy](../functions/createChangeProxy.md)
-- [createCollection](../functions/createCollection.md)
-- [createLiveQueryCollection](../functions/createLiveQueryCollection.md)
-- [createOptimisticAction](../functions/createOptimisticAction.md)
-- [createPacedMutations](../functions/createPacedMutations.md)
-- [createTransaction](../functions/createTransaction.md)
-- [debounceStrategy](../functions/debounceStrategy.md)
-- [eq](../functions/eq.md)
-- [extractFieldPath](../functions/extractFieldPath.md)
-- [extractSimpleComparisons](../functions/extractSimpleComparisons.md)
-- [extractValue](../functions/extractValue.md)
-- [getActiveTransaction](../functions/getActiveTransaction.md)
-- [gt](../functions/gt.md)
-- [gte](../functions/gte.md)
-- [ilike](../functions/ilike.md)
-- [inArray](../functions/inArray.md)
-- [isLimitSubset](../functions/isLimitSubset.md)
-- [isNull](../functions/isNull.md)
-- [isOrderBySubset](../functions/isOrderBySubset.md)
-- [isPredicateSubset](../functions/isPredicateSubset.md)
-- [isUndefined](../functions/isUndefined.md)
-- [isWhereSubset](../functions/isWhereSubset.md)
-- [length](../functions/length.md)
-- [like](../functions/like.md)
-- [liveQueryCollectionOptions](../functions/liveQueryCollectionOptions.md)
-- [localOnlyCollectionOptions](../functions/localOnlyCollectionOptions.md)
-- [localStorageCollectionOptions](../functions/localStorageCollectionOptions.md)
-- [lower](../functions/lower.md)
-- [lt](../functions/lt.md)
-- [lte](../functions/lte.md)
-- [max](../functions/max.md)
-- [min](../functions/min.md)
-- [minusWherePredicates](../functions/minusWherePredicates.md)
-- [not](../functions/not.md)
-- [or](../functions/or.md)
-- [parseLoadSubsetOptions](../functions/parseLoadSubsetOptions.md)
-- [parseOrderByExpression](../functions/parseOrderByExpression.md)
-- [parseWhereExpression](../functions/parseWhereExpression.md)
-- [queueStrategy](../functions/queueStrategy.md)
-- [sum](../functions/sum.md)
-- [throttleStrategy](../functions/throttleStrategy.md)
-- [unionWherePredicates](../functions/unionWherePredicates.md)
-- [upper](../functions/upper.md)
-- [walkExpression](../functions/walkExpression.md)
-- [withArrayChangeTracking](../functions/withArrayChangeTracking.md)
-- [withChangeTracking](../functions/withChangeTracking.md)
+- [add](functions/add.md)
+- [and](functions/and.md)
+- [avg](functions/avg.md)
+- [coalesce](functions/coalesce.md)
+- [compileQuery](functions/compileQuery.md)
+- [concat](functions/concat.md)
+- [count](functions/count.md)
+- [createArrayChangeProxy](functions/createArrayChangeProxy.md)
+- [createChangeProxy](functions/createChangeProxy.md)
+- [createCollection](functions/createCollection.md)
+- [createLiveQueryCollection](functions/createLiveQueryCollection.md)
+- [createOptimisticAction](functions/createOptimisticAction.md)
+- [createPacedMutations](functions/createPacedMutations.md)
+- [createTransaction](functions/createTransaction.md)
+- [debounceStrategy](functions/debounceStrategy.md)
+- [deepEquals](functions/deepEquals.md)
+- [eq](functions/eq.md)
+- [extractFieldPath](functions/extractFieldPath.md)
+- [extractSimpleComparisons](functions/extractSimpleComparisons.md)
+- [extractValue](functions/extractValue.md)
+- [getActiveTransaction](functions/getActiveTransaction.md)
+- [gt](functions/gt.md)
+- [gte](functions/gte.md)
+- [ilike](functions/ilike.md)
+- [inArray](functions/inArray.md)
+- [isLimitSubset](functions/isLimitSubset.md)
+- [isNull](functions/isNull.md)
+- [isOffsetLimitSubset](functions/isOffsetLimitSubset.md)
+- [isOrderBySubset](functions/isOrderBySubset.md)
+- [isPredicateSubset](functions/isPredicateSubset.md)
+- [isUndefined](functions/isUndefined.md)
+- [isWhereSubset](functions/isWhereSubset.md)
+- [length](functions/length.md)
+- [like](functions/like.md)
+- [liveQueryCollectionOptions](functions/liveQueryCollectionOptions.md)
+- [localOnlyCollectionOptions](functions/localOnlyCollectionOptions.md)
+- [localStorageCollectionOptions](functions/localStorageCollectionOptions.md)
+- [lower](functions/lower.md)
+- [lt](functions/lt.md)
+- [lte](functions/lte.md)
+- [max](functions/max.md)
+- [min](functions/min.md)
+- [minusWherePredicates](functions/minusWherePredicates.md)
+- [not](functions/not.md)
+- [or](functions/or.md)
+- [parseLoadSubsetOptions](functions/parseLoadSubsetOptions.md)
+- [parseOrderByExpression](functions/parseOrderByExpression.md)
+- [parseWhereExpression](functions/parseWhereExpression.md)
+- [queueStrategy](functions/queueStrategy.md)
+- [sum](functions/sum.md)
+- [throttleStrategy](functions/throttleStrategy.md)
+- [unionWherePredicates](functions/unionWherePredicates.md)
+- [upper](functions/upper.md)
+- [walkExpression](functions/walkExpression.md)
+- [withArrayChangeTracking](functions/withArrayChangeTracking.md)
+- [withChangeTracking](functions/withChangeTracking.md)
diff --git a/docs/reference/interfaces/BTreeIndexOptions.md b/docs/reference/interfaces/BTreeIndexOptions.md
index 6e6b27aa2..95e568924 100644
--- a/docs/reference/interfaces/BTreeIndexOptions.md
+++ b/docs/reference/interfaces/BTreeIndexOptions.md
@@ -5,7 +5,7 @@ title: BTreeIndexOptions
 
 # Interface: BTreeIndexOptions
 
-Defined in: [packages/db/src/indexes/btree-index.ts:11](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L11)
+Defined in: [packages/db/src/indexes/btree-index.ts:12](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L12)
 
 Options for Ordered index
 
@@ -17,7 +17,7 @@ Options for Ordered index
 optional compareFn: (a, b) => number;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:12](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L12)
+Defined in: [packages/db/src/indexes/btree-index.ts:13](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L13)
 
 #### Parameters
 
@@ -41,4 +41,4 @@ Defined in: [packages/db/src/indexes/btree-index.ts:12](https://github.com/TanSt
 optional compareOptions: CompareOptions;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:13](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L13)
+Defined in: [packages/db/src/indexes/btree-index.ts:14](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L14)
diff --git a/docs/reference/interfaces/BaseCollectionConfig.md b/docs/reference/interfaces/BaseCollectionConfig.md
index df59ed52a..0ada11698 100644
--- a/docs/reference/interfaces/BaseCollectionConfig.md
+++ b/docs/reference/interfaces/BaseCollectionConfig.md
@@ -5,12 +5,12 @@ title: BaseCollectionConfig
 
 # Interface: BaseCollectionConfig\<T, TKey, TSchema, TUtils, TReturn\>
 
-Defined in: [packages/db/src/types.ts:438](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L438)
+Defined in: [packages/db/src/types.ts:493](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L493)
 
 ## Extended by
 
-- [`CollectionConfig`](../CollectionConfig.md)
-- [`LocalStorageCollectionConfig`](../LocalStorageCollectionConfig.md)
+- [`CollectionConfig`](CollectionConfig.md)
+- [`LocalStorageCollectionConfig`](LocalStorageCollectionConfig.md)
 
 ## Type Parameters
 
@@ -28,7 +28,7 @@ Defined in: [packages/db/src/types.ts:438](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 ### TReturn
 
@@ -42,7 +42,7 @@ Defined in: [packages/db/src/types.ts:438](https://github.com/TanStack/db/blob/m
 optional autoIndex: "eager" | "off";
 ```
 
-Defined in: [packages/db/src/types.ts:487](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L487)
+Defined in: [packages/db/src/types.ts:542](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L542)
 
 Auto-indexing mode for the collection.
 When enabled, indexes will be automatically created for simple where expressions.
@@ -66,7 +66,7 @@ When enabled, indexes will be automatically created for simple where expressions
 optional compare: (x, y) => number;
 ```
 
-Defined in: [packages/db/src/types.ts:498](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L498)
+Defined in: [packages/db/src/types.ts:553](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L553)
 
 Optional function to compare two items.
 This is used to order the items in the collection.
@@ -106,7 +106,7 @@ compare: (x, y) => x.createdAt.getTime() - y.createdAt.getTime()
 optional defaultStringCollation: StringCollationConfig;
 ```
 
-Defined in: [packages/db/src/types.ts:644](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L644)
+Defined in: [packages/db/src/types.ts:699](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L699)
 
 Specifies how to compare data in the collection.
 This should be configured to match data ordering on the backend.
@@ -121,7 +121,7 @@ E.g., when using the Electric DB collection these options
 optional gcTime: number;
 ```
 
-Defined in: [packages/db/src/types.ts:467](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L467)
+Defined in: [packages/db/src/types.ts:522](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L522)
 
 Time in milliseconds after which the collection will be garbage collected
 when it has no active subscribers. Defaults to 5 minutes (300000ms).
@@ -134,7 +134,7 @@ when it has no active subscribers. Defaults to 5 minutes (300000ms).
 getKey: (item) => TKey;
 ```
 
-Defined in: [packages/db/src/types.ts:462](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L462)
+Defined in: [packages/db/src/types.ts:517](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L517)
 
 Function to extract the ID from an object
 This is required for update/delete operations which now only accept IDs
@@ -168,7 +168,7 @@ getKey: (item) => item.uuid
 optional id: string;
 ```
 
-Defined in: [packages/db/src/types.ts:451](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L451)
+Defined in: [packages/db/src/types.ts:506](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L506)
 
 ***
 
@@ -178,7 +178,7 @@ Defined in: [packages/db/src/types.ts:451](https://github.com/TanStack/db/blob/m
 optional onDelete: DeleteMutationFn<T, TKey, TUtils, TReturn>;
 ```
 
-Defined in: [packages/db/src/types.ts:636](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L636)
+Defined in: [packages/db/src/types.ts:691](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L691)
 
 Optional asynchronous handler function called before a delete operation
 
@@ -242,7 +242,7 @@ onDelete: async ({ transaction, collection }) => {
 optional onInsert: InsertMutationFn<T, TKey, TUtils, TReturn>;
 ```
 
-Defined in: [packages/db/src/types.ts:549](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L549)
+Defined in: [packages/db/src/types.ts:604](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L604)
 
 Optional asynchronous handler function called before an insert operation
 
@@ -305,7 +305,7 @@ onInsert: async ({ transaction, collection }) => {
 optional onUpdate: UpdateMutationFn<T, TKey, TUtils, TReturn>;
 ```
 
-Defined in: [packages/db/src/types.ts:593](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L593)
+Defined in: [packages/db/src/types.ts:648](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L648)
 
 Optional asynchronous handler function called before an update operation
 
@@ -369,7 +369,7 @@ onUpdate: async ({ transaction, collection }) => {
 optional schema: TSchema;
 ```
 
-Defined in: [packages/db/src/types.ts:452](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L452)
+Defined in: [packages/db/src/types.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L507)
 
 ***
 
@@ -379,7 +379,7 @@ Defined in: [packages/db/src/types.ts:452](https://github.com/TanStack/db/blob/m
 optional startSync: boolean;
 ```
 
-Defined in: [packages/db/src/types.ts:478](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L478)
+Defined in: [packages/db/src/types.ts:533](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L533)
 
 Whether to eagerly start syncing on collection creation.
 When true, syncing begins immediately. When false, syncing starts when the first subscriber attaches.
@@ -402,7 +402,7 @@ false
 optional syncMode: SyncMode;
 ```
 
-Defined in: [packages/db/src/types.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L507)
+Defined in: [packages/db/src/types.ts:562](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L562)
 
 The mode of sync to use for the collection.
 
@@ -424,4 +424,4 @@ The exact implementation of the sync mode is up to the sync implementation.
 optional utils: TUtils;
 ```
 
-Defined in: [packages/db/src/types.ts:646](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L646)
+Defined in: [packages/db/src/types.ts:701](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L701)
diff --git a/docs/reference/interfaces/BaseStrategy.md b/docs/reference/interfaces/BaseStrategy.md
index fdfb8354c..af8c9a5aa 100644
--- a/docs/reference/interfaces/BaseStrategy.md
+++ b/docs/reference/interfaces/BaseStrategy.md
@@ -11,9 +11,9 @@ Base strategy interface that all strategy implementations must conform to
 
 ## Extended by
 
-- [`DebounceStrategy`](../DebounceStrategy.md)
-- [`QueueStrategy`](../QueueStrategy.md)
-- [`ThrottleStrategy`](../ThrottleStrategy.md)
+- [`DebounceStrategy`](DebounceStrategy.md)
+- [`QueueStrategy`](QueueStrategy.md)
+- [`ThrottleStrategy`](ThrottleStrategy.md)
 
 ## Type Parameters
 
@@ -72,7 +72,7 @@ Execute a function according to the strategy's timing rules
 
 ##### fn
 
-() => [`Transaction`](../Transaction.md)\<`T`\>
+() => [`Transaction`](Transaction.md)\<`T`\>
 
 The function to execute
 
diff --git a/docs/reference/interfaces/ChangeMessage.md b/docs/reference/interfaces/ChangeMessage.md
index d8b61bf5c..023798310 100644
--- a/docs/reference/interfaces/ChangeMessage.md
+++ b/docs/reference/interfaces/ChangeMessage.md
@@ -5,11 +5,7 @@ title: ChangeMessage
 
 # Interface: ChangeMessage\<T, TKey\>
 
-Defined in: [packages/db/src/types.ts:314](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L314)
-
-## Extended by
-
-- [`OptimisticChangeMessage`](../OptimisticChangeMessage.md)
+Defined in: [packages/db/src/types.ts:353](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L353)
 
 ## Type Parameters
 
@@ -29,7 +25,7 @@ Defined in: [packages/db/src/types.ts:314](https://github.com/TanStack/db/blob/m
 key: TKey;
 ```
 
-Defined in: [packages/db/src/types.ts:318](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L318)
+Defined in: [packages/db/src/types.ts:357](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L357)
 
 ***
 
@@ -39,7 +35,7 @@ Defined in: [packages/db/src/types.ts:318](https://github.com/TanStack/db/blob/m
 optional metadata: Record<string, unknown>;
 ```
 
-Defined in: [packages/db/src/types.ts:322](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L322)
+Defined in: [packages/db/src/types.ts:361](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L361)
 
 ***
 
@@ -49,7 +45,7 @@ Defined in: [packages/db/src/types.ts:322](https://github.com/TanStack/db/blob/m
 optional previousValue: T;
 ```
 
-Defined in: [packages/db/src/types.ts:320](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L320)
+Defined in: [packages/db/src/types.ts:359](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L359)
 
 ***
 
@@ -59,7 +55,7 @@ Defined in: [packages/db/src/types.ts:320](https://github.com/TanStack/db/blob/m
 type: OperationType;
 ```
 
-Defined in: [packages/db/src/types.ts:321](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L321)
+Defined in: [packages/db/src/types.ts:360](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L360)
 
 ***
 
@@ -69,4 +65,4 @@ Defined in: [packages/db/src/types.ts:321](https://github.com/TanStack/db/blob/m
 value: T;
 ```
 
-Defined in: [packages/db/src/types.ts:319](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L319)
+Defined in: [packages/db/src/types.ts:358](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L358)
diff --git a/docs/reference/interfaces/Collection.md b/docs/reference/interfaces/Collection.md
index 9b57df6ba..b80735f69 100644
--- a/docs/reference/interfaces/Collection.md
+++ b/docs/reference/interfaces/Collection.md
@@ -11,7 +11,7 @@ Enhanced Collection interface that includes both data type T and utilities TUtil
 
 ## Extends
 
-- [`CollectionImpl`](../../classes/CollectionImpl.md)\<`T`, `TKey`, `TUtils`, `TSchema`, `TInsertInput`\>
+- [`CollectionImpl`](../classes/CollectionImpl.md)\<`T`, `TKey`, `TUtils`, `TSchema`, `TInsertInput`\>
 
 ## Type Parameters
 
@@ -29,7 +29,7 @@ The type of the key for the collection
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 The utilities record type
 
@@ -55,7 +55,7 @@ Defined in: [packages/db/src/collection/index.ts:283](https://github.com/TanStac
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`_lifecycle`](../../classes/CollectionImpl.md#_lifecycle)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`_lifecycle`](../classes/CollectionImpl.md#_lifecycle)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: [packages/db/src/collection/index.ts:295](https://github.com/TanStac
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`_state`](../../classes/CollectionImpl.md#_state)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`_state`](../classes/CollectionImpl.md#_state)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: [packages/db/src/collection/index.ts:284](https://github.com/TanStac
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`_sync`](../../classes/CollectionImpl.md#_sync)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`_sync`](../classes/CollectionImpl.md#_sync)
 
 ***
 
@@ -97,7 +97,7 @@ Defined in: [packages/db/src/collection/index.ts:274](https://github.com/TanStac
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`config`](../../classes/CollectionImpl.md#config)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`config`](../classes/CollectionImpl.md#config)
 
 ***
 
@@ -111,7 +111,7 @@ Defined in: [packages/db/src/collection/index.ts:273](https://github.com/TanStac
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`id`](../../classes/CollectionImpl.md#id)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`id`](../classes/CollectionImpl.md#id)
 
 ***
 
@@ -135,7 +135,7 @@ Defined in: [packages/db/src/collection/index.ts:55](https://github.com/TanStack
 
 #### Overrides
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`utils`](../../classes/CollectionImpl.md#utils)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`utils`](../classes/CollectionImpl.md#utils)
 
 ## Accessors
 
@@ -147,15 +147,15 @@ Defined in: [packages/db/src/collection/index.ts:55](https://github.com/TanStack
 get compareOptions(): StringCollationConfig;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:579](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L579)
+Defined in: [packages/db/src/collection/index.ts:580](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L580)
 
 ##### Returns
 
-[`StringCollationConfig`](../../type-aliases/StringCollationConfig.md)
+[`StringCollationConfig`](../type-aliases/StringCollationConfig.md)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`compareOptions`](../../classes/CollectionImpl.md#compareoptions)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`compareOptions`](../classes/CollectionImpl.md#compareoptions)
 
 ***
 
@@ -167,17 +167,17 @@ Defined in: [packages/db/src/collection/index.ts:579](https://github.com/TanStac
 get indexes(): Map<number, BaseIndex<TKey>>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:564](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L564)
+Defined in: [packages/db/src/collection/index.ts:565](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L565)
 
 Get resolved indexes for query optimization
 
 ##### Returns
 
-`Map`\<`number`, [`BaseIndex`](../../classes/BaseIndex.md)\<`TKey`\>\>
+`Map`\<`number`, [`BaseIndex`](../classes/BaseIndex.md)\<`TKey`\>\>
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`indexes`](../../classes/CollectionImpl.md#indexes)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`indexes`](../classes/CollectionImpl.md#indexes)
 
 ***
 
@@ -189,7 +189,7 @@ Get resolved indexes for query optimization
 get isLoadingSubset(): boolean;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:430](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L430)
+Defined in: [packages/db/src/collection/index.ts:431](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L431)
 
 Check if the collection is currently loading more data
 
@@ -201,7 +201,7 @@ true if the collection has pending load more operations, false otherwise
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`isLoadingSubset`](../../classes/CollectionImpl.md#isloadingsubset)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`isLoadingSubset`](../classes/CollectionImpl.md#isloadingsubset)
 
 ***
 
@@ -213,7 +213,7 @@ true if the collection has pending load more operations, false otherwise
 get size(): number;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:467](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L467)
+Defined in: [packages/db/src/collection/index.ts:468](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L468)
 
 Get the current size of the collection (cached)
 
@@ -223,7 +223,7 @@ Get the current size of the collection (cached)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`size`](../../classes/CollectionImpl.md#size)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`size`](../classes/CollectionImpl.md#size)
 
 ***
 
@@ -235,7 +235,7 @@ Get the current size of the collection (cached)
 get state(): Map<TKey, TOutput>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:756](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L756)
+Defined in: [packages/db/src/collection/index.ts:757](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L757)
 
 Gets the current state of the collection as a Map
 
@@ -263,7 +263,7 @@ Map containing all items in the collection, with keys as identifiers
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`state`](../../classes/CollectionImpl.md#state)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`state`](../classes/CollectionImpl.md#state)
 
 ***
 
@@ -275,17 +275,17 @@ Map containing all items in the collection, with keys as identifiers
 get status(): CollectionStatus;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:385](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L385)
+Defined in: [packages/db/src/collection/index.ts:386](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L386)
 
 Gets the current status of the collection
 
 ##### Returns
 
-[`CollectionStatus`](../../type-aliases/CollectionStatus.md)
+[`CollectionStatus`](../type-aliases/CollectionStatus.md)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`status`](../../classes/CollectionImpl.md#status)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`status`](../classes/CollectionImpl.md#status)
 
 ***
 
@@ -297,7 +297,7 @@ Gets the current status of the collection
 get subscriberCount(): number;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:392](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L392)
+Defined in: [packages/db/src/collection/index.ts:393](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L393)
 
 Get the number of subscribers to the collection
 
@@ -307,7 +307,7 @@ Get the number of subscribers to the collection
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`subscriberCount`](../../classes/CollectionImpl.md#subscribercount)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`subscriberCount`](../classes/CollectionImpl.md#subscribercount)
 
 ***
 
@@ -319,7 +319,7 @@ Get the number of subscribers to the collection
 get toArray(): TOutput[];
 ```
 
-Defined in: [packages/db/src/collection/index.ts:785](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L785)
+Defined in: [packages/db/src/collection/index.ts:786](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L786)
 
 Gets the current state of the collection as an Array
 
@@ -331,7 +331,7 @@ An Array containing all items in the collection
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`toArray`](../../classes/CollectionImpl.md#toarray)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`toArray`](../classes/CollectionImpl.md#toarray)
 
 ## Methods
 
@@ -341,7 +341,7 @@ An Array containing all items in the collection
 iterator: IterableIterator<[TKey, T]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:495](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L495)
+Defined in: [packages/db/src/collection/index.ts:496](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L496)
 
 Get all entries (virtual derived state)
 
@@ -351,7 +351,7 @@ Get all entries (virtual derived state)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`[iterator]`](../../classes/CollectionImpl.md#iterator)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`[iterator]`](../classes/CollectionImpl.md#iterator)
 
 ***
 
@@ -361,7 +361,7 @@ Get all entries (virtual derived state)
 cleanup(): Promise<void>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:919](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L919)
+Defined in: [packages/db/src/collection/index.ts:920](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L920)
 
 Clean up the collection by stopping sync and clearing data
 This can be called manually or automatically by garbage collection
@@ -372,7 +372,7 @@ This can be called manually or automatically by garbage collection
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`cleanup`](../../classes/CollectionImpl.md#cleanup)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`cleanup`](../classes/CollectionImpl.md#cleanup)
 
 ***
 
@@ -382,7 +382,7 @@ This can be called manually or automatically by garbage collection
 createIndex<TResolver>(indexCallback, config): IndexProxy<TKey>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:554](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L554)
+Defined in: [packages/db/src/collection/index.ts:555](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L555)
 
 Creates an index on a collection for faster queries.
 Indexes significantly improve query performance by allowing constant time lookups
@@ -392,7 +392,7 @@ and logarithmic time range queries instead of full scans.
 
 ##### TResolver
 
-`TResolver` *extends* [`IndexResolver`](../../type-aliases/IndexResolver.md)\<`TKey`\> = *typeof* [`BTreeIndex`](../../classes/BTreeIndex.md)
+`TResolver` *extends* [`IndexResolver`](../type-aliases/IndexResolver.md)\<`TKey`\> = *typeof* [`BTreeIndex`](../classes/BTreeIndex.md)
 
 The type of the index resolver (constructor or async loader)
 
@@ -406,13 +406,13 @@ Function that extracts the indexed value from each item
 
 ##### config
 
-[`IndexOptions`](../IndexOptions.md)\<`TResolver`\> = `{}`
+[`IndexOptions`](IndexOptions.md)\<`TResolver`\> = `{}`
 
 Configuration including index type and type-specific options
 
 #### Returns
 
-[`IndexProxy`](../../classes/IndexProxy.md)\<`TKey`\>
+[`IndexProxy`](../classes/IndexProxy.md)\<`TKey`\>
 
 An index proxy that provides access to the index when ready
 
@@ -444,7 +444,7 @@ const textIndex = collection.createIndex((row) => row.content, {
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`createIndex`](../../classes/CollectionImpl.md#createindex)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`createIndex`](../classes/CollectionImpl.md#createindex)
 
 ***
 
@@ -456,7 +456,7 @@ currentStateAsChanges(options):
   | ChangeMessage<T, string | number>[];
 ```
 
-Defined in: [packages/db/src/collection/index.ts:823](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L823)
+Defined in: [packages/db/src/collection/index.ts:824](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L824)
 
 Returns the current state of the collection as an array of changes
 
@@ -464,14 +464,14 @@ Returns the current state of the collection as an array of changes
 
 ##### options
 
-[`CurrentStateAsChangesOptions`](../CurrentStateAsChangesOptions.md) = `{}`
+[`CurrentStateAsChangesOptions`](CurrentStateAsChangesOptions.md) = `{}`
 
 Options including optional where filter
 
 #### Returns
 
   \| `void`
-  \| [`ChangeMessage`](../ChangeMessage.md)\<`T`, `string` \| `number`\>[]
+  \| [`ChangeMessage`](ChangeMessage.md)\<`T`, `string` \| `number`\>[]
 
 An array of changes
 
@@ -494,7 +494,7 @@ const activeChanges = collection.currentStateAsChanges({
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`currentStateAsChanges`](../../classes/CollectionImpl.md#currentstateaschanges)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`currentStateAsChanges`](../classes/CollectionImpl.md#currentstateaschanges)
 
 ***
 
@@ -504,7 +504,7 @@ const activeChanges = collection.currentStateAsChanges({
 delete(keys, config?): Transaction<any>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:733](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L733)
+Defined in: [packages/db/src/collection/index.ts:734](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L734)
 
 Deletes one or more items from the collection
 
@@ -518,13 +518,13 @@ Single key or array of keys to delete
 
 ##### config?
 
-[`OperationConfig`](../OperationConfig.md)
+[`OperationConfig`](OperationConfig.md)
 
 Optional configuration including metadata
 
 #### Returns
 
-[`Transaction`](../Transaction.md)\<`any`\>
+[`Transaction`](Transaction.md)\<`any`\>
 
 A Transaction object representing the delete operation(s)
 
@@ -561,7 +561,7 @@ try {
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`delete`](../../classes/CollectionImpl.md#delete)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`delete`](../classes/CollectionImpl.md#delete)
 
 ***
 
@@ -571,7 +571,7 @@ try {
 entries(): IterableIterator<[TKey, T]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:488](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L488)
+Defined in: [packages/db/src/collection/index.ts:489](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L489)
 
 Get all entries (virtual derived state)
 
@@ -581,7 +581,7 @@ Get all entries (virtual derived state)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`entries`](../../classes/CollectionImpl.md#entries)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`entries`](../classes/CollectionImpl.md#entries)
 
 ***
 
@@ -591,7 +591,7 @@ Get all entries (virtual derived state)
 forEach(callbackfn): void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:502](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L502)
+Defined in: [packages/db/src/collection/index.ts:503](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L503)
 
 Execute a callback for each entry in the collection
 
@@ -607,7 +607,7 @@ Execute a callback for each entry in the collection
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`forEach`](../../classes/CollectionImpl.md#foreach)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`forEach`](../classes/CollectionImpl.md#foreach)
 
 ***
 
@@ -617,7 +617,7 @@ Execute a callback for each entry in the collection
 get(key): T | undefined;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:453](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L453)
+Defined in: [packages/db/src/collection/index.ts:454](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L454)
 
 Get the current value for a key (virtual derived state)
 
@@ -633,7 +633,7 @@ Get the current value for a key (virtual derived state)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`get`](../../classes/CollectionImpl.md#get)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`get`](../classes/CollectionImpl.md#get)
 
 ***
 
@@ -643,7 +643,7 @@ Get the current value for a key (virtual derived state)
 getKeyFromItem(item): TKey;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:517](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L517)
+Defined in: [packages/db/src/collection/index.ts:518](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L518)
 
 #### Parameters
 
@@ -657,7 +657,7 @@ Defined in: [packages/db/src/collection/index.ts:517](https://github.com/TanStac
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`getKeyFromItem`](../../classes/CollectionImpl.md#getkeyfromitem)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`getKeyFromItem`](../classes/CollectionImpl.md#getkeyfromitem)
 
 ***
 
@@ -667,7 +667,7 @@ Defined in: [packages/db/src/collection/index.ts:517](https://github.com/TanStac
 has(key): boolean;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:460](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L460)
+Defined in: [packages/db/src/collection/index.ts:461](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L461)
 
 Check if a key exists in the collection (virtual derived state)
 
@@ -683,7 +683,7 @@ Check if a key exists in the collection (virtual derived state)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`has`](../../classes/CollectionImpl.md#has)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`has`](../classes/CollectionImpl.md#has)
 
 ***
 
@@ -695,7 +695,7 @@ insert(data, config?):
 | Transaction<T>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:620](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L620)
+Defined in: [packages/db/src/collection/index.ts:621](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L621)
 
 Inserts one or more items into the collection
 
@@ -707,14 +707,14 @@ Inserts one or more items into the collection
 
 ##### config?
 
-[`InsertConfig`](../InsertConfig.md)
+[`InsertConfig`](InsertConfig.md)
 
 Optional configuration including metadata
 
 #### Returns
 
-  \| [`Transaction`](../Transaction.md)\<`Record`\<`string`, `unknown`\>\>
-  \| [`Transaction`](../Transaction.md)\<`T`\>
+  \| [`Transaction`](Transaction.md)\<`Record`\<`string`, `unknown`\>\>
+  \| [`Transaction`](Transaction.md)\<`T`\>
 
 A Transaction object representing the insert operation(s)
 
@@ -760,7 +760,7 @@ try {
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`insert`](../../classes/CollectionImpl.md#insert)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`insert`](../classes/CollectionImpl.md#insert)
 
 ***
 
@@ -770,7 +770,7 @@ try {
 isReady(): boolean;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:422](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L422)
+Defined in: [packages/db/src/collection/index.ts:423](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L423)
 
 Check if the collection is ready for use
 Returns true if the collection has been marked as ready by its sync implementation
@@ -794,7 +794,7 @@ if (collection.isReady()) {
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`isReady`](../../classes/CollectionImpl.md#isready)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`isReady`](../classes/CollectionImpl.md#isready)
 
 ***
 
@@ -804,7 +804,7 @@ if (collection.isReady()) {
 keys(): IterableIterator<TKey>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:474](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L474)
+Defined in: [packages/db/src/collection/index.ts:475](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L475)
 
 Get all keys (virtual derived state)
 
@@ -814,7 +814,7 @@ Get all keys (virtual derived state)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`keys`](../../classes/CollectionImpl.md#keys)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`keys`](../classes/CollectionImpl.md#keys)
 
 ***
 
@@ -824,7 +824,7 @@ Get all keys (virtual derived state)
 map<U>(callbackfn): U[];
 ```
 
-Defined in: [packages/db/src/collection/index.ts:511](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L511)
+Defined in: [packages/db/src/collection/index.ts:512](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L512)
 
 Create a new array with the results of calling a function for each entry in the collection
 
@@ -846,7 +846,7 @@ Create a new array with the results of calling a function for each entry in the
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`map`](../../classes/CollectionImpl.md#map)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`map`](../classes/CollectionImpl.md#map)
 
 ***
 
@@ -856,7 +856,7 @@ Create a new array with the results of calling a function for each entry in the
 off<T>(event, callback): void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:898](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L898)
+Defined in: [packages/db/src/collection/index.ts:899](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L899)
 
 Unsubscribe from a collection event
 
@@ -873,6 +873,7 @@ Unsubscribe from a collection event
   \| `"status:change"`
   \| `"subscribers:change"`
   \| `"loadingSubset:change"`
+  \| `"truncate"`
 
 #### Parameters
 
@@ -890,7 +891,7 @@ Unsubscribe from a collection event
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`off`](../../classes/CollectionImpl.md#off)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`off`](../classes/CollectionImpl.md#off)
 
 ***
 
@@ -900,7 +901,7 @@ Unsubscribe from a collection event
 on<T>(event, callback): () => void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:878](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L878)
+Defined in: [packages/db/src/collection/index.ts:879](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L879)
 
 Subscribe to a collection event
 
@@ -917,6 +918,7 @@ Subscribe to a collection event
   \| `"status:change"`
   \| `"subscribers:change"`
   \| `"loadingSubset:change"`
+  \| `"truncate"`
 
 #### Parameters
 
@@ -940,7 +942,7 @@ Subscribe to a collection event
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`on`](../../classes/CollectionImpl.md#on)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`on`](../classes/CollectionImpl.md#on)
 
 ***
 
@@ -950,7 +952,7 @@ Subscribe to a collection event
 once<T>(event, callback): () => void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:888](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L888)
+Defined in: [packages/db/src/collection/index.ts:889](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L889)
 
 Subscribe to a collection event once
 
@@ -967,6 +969,7 @@ Subscribe to a collection event once
   \| `"status:change"`
   \| `"subscribers:change"`
   \| `"loadingSubset:change"`
+  \| `"truncate"`
 
 #### Parameters
 
@@ -990,7 +993,7 @@ Subscribe to a collection event once
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`once`](../../classes/CollectionImpl.md#once)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`once`](../classes/CollectionImpl.md#once)
 
 ***
 
@@ -1000,7 +1003,7 @@ Subscribe to a collection event once
 onFirstReady(callback): void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:406](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L406)
+Defined in: [packages/db/src/collection/index.ts:407](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L407)
 
 Register a callback to be executed when the collection first becomes ready
 Useful for preloading collections
@@ -1028,7 +1031,7 @@ collection.onFirstReady(() => {
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`onFirstReady`](../../classes/CollectionImpl.md#onfirstready)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`onFirstReady`](../classes/CollectionImpl.md#onfirstready)
 
 ***
 
@@ -1038,7 +1041,7 @@ collection.onFirstReady(() => {
 preload(): Promise<void>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:446](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L446)
+Defined in: [packages/db/src/collection/index.ts:447](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L447)
 
 Preload the collection data by starting sync if not already started
 Multiple concurrent calls will share the same promise
@@ -1049,7 +1052,7 @@ Multiple concurrent calls will share the same promise
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`preload`](../../classes/CollectionImpl.md#preload)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`preload`](../classes/CollectionImpl.md#preload)
 
 ***
 
@@ -1059,7 +1062,7 @@ Multiple concurrent calls will share the same promise
 startSyncImmediate(): void;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:438](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L438)
+Defined in: [packages/db/src/collection/index.ts:439](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L439)
 
 Start sync immediately - internal method for compiled queries
 This bypasses lazy loading for special cases like live query results
@@ -1070,7 +1073,7 @@ This bypasses lazy loading for special cases like live query results
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`startSyncImmediate`](../../classes/CollectionImpl.md#startsyncimmediate)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`startSyncImmediate`](../classes/CollectionImpl.md#startsyncimmediate)
 
 ***
 
@@ -1080,7 +1083,7 @@ This bypasses lazy loading for special cases like live query results
 stateWhenReady(): Promise<Map<TKey, T>>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:770](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L770)
+Defined in: [packages/db/src/collection/index.ts:771](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L771)
 
 Gets the current state of the collection as a Map, but only resolves when data is available
 Waits for the first sync commit to complete before resolving
@@ -1093,7 +1096,7 @@ Promise that resolves to a Map containing all items in the collection
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`stateWhenReady`](../../classes/CollectionImpl.md#statewhenready)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`stateWhenReady`](../classes/CollectionImpl.md#statewhenready)
 
 ***
 
@@ -1103,7 +1106,7 @@ Promise that resolves to a Map containing all items in the collection
 subscribeChanges(callback, options): CollectionSubscription;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:868](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L868)
+Defined in: [packages/db/src/collection/index.ts:869](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L869)
 
 Subscribe to changes in the collection
 
@@ -1117,7 +1120,7 @@ Function called when items change
 
 ##### options
 
-[`SubscribeChangesOptions`](../SubscribeChangesOptions.md) = `{}`
+[`SubscribeChangesOptions`](SubscribeChangesOptions.md) = `{}`
 
 Subscription options including includeInitialState and where filter
 
@@ -1169,7 +1172,7 @@ const subscription = collection.subscribeChanges((changes) => {
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`subscribeChanges`](../../classes/CollectionImpl.md#subscribechanges)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`subscribeChanges`](../classes/CollectionImpl.md#subscribechanges)
 
 ***
 
@@ -1179,7 +1182,7 @@ const subscription = collection.subscribeChanges((changes) => {
 toArrayWhenReady(): Promise<T[]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:795](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L795)
+Defined in: [packages/db/src/collection/index.ts:796](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L796)
 
 Gets the current state of the collection as an Array, but only resolves when data is available
 Waits for the first sync commit to complete before resolving
@@ -1192,7 +1195,7 @@ Promise that resolves to an Array containing all items in the collection
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`toArrayWhenReady`](../../classes/CollectionImpl.md#toarraywhenready)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`toArrayWhenReady`](../classes/CollectionImpl.md#toarraywhenready)
 
 ***
 
@@ -1204,7 +1207,7 @@ Promise that resolves to an Array containing all items in the collection
 update(key, callback): Transaction;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:665](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L665)
+Defined in: [packages/db/src/collection/index.ts:666](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L666)
 
 Updates one or more items in the collection using a callback function
 
@@ -1220,7 +1223,7 @@ Updates one or more items in the collection using a callback function
 
 ##### Returns
 
-[`Transaction`](../Transaction.md)
+[`Transaction`](Transaction.md)
 
 A Transaction object representing the update operation(s)
 
@@ -1268,7 +1271,7 @@ try {
 
 ##### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`update`](../../classes/CollectionImpl.md#update)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`update`](../classes/CollectionImpl.md#update)
 
 #### Call Signature
 
@@ -1279,7 +1282,7 @@ update(
    callback): Transaction;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:671](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L671)
+Defined in: [packages/db/src/collection/index.ts:672](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L672)
 
 Updates one or more items in the collection using a callback function
 
@@ -1293,7 +1296,7 @@ Single key or array of keys to update
 
 ###### config
 
-[`OperationConfig`](../OperationConfig.md)
+[`OperationConfig`](OperationConfig.md)
 
 ###### callback
 
@@ -1301,7 +1304,7 @@ Single key or array of keys to update
 
 ##### Returns
 
-[`Transaction`](../Transaction.md)
+[`Transaction`](Transaction.md)
 
 A Transaction object representing the update operation(s)
 
@@ -1349,7 +1352,7 @@ try {
 
 ##### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`update`](../../classes/CollectionImpl.md#update)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`update`](../classes/CollectionImpl.md#update)
 
 #### Call Signature
 
@@ -1357,7 +1360,7 @@ try {
 update(id, callback): Transaction;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:678](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L678)
+Defined in: [packages/db/src/collection/index.ts:679](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L679)
 
 Updates one or more items in the collection using a callback function
 
@@ -1373,7 +1376,7 @@ Updates one or more items in the collection using a callback function
 
 ##### Returns
 
-[`Transaction`](../Transaction.md)
+[`Transaction`](Transaction.md)
 
 A Transaction object representing the update operation(s)
 
@@ -1421,7 +1424,7 @@ try {
 
 ##### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`update`](../../classes/CollectionImpl.md#update)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`update`](../classes/CollectionImpl.md#update)
 
 #### Call Signature
 
@@ -1432,7 +1435,7 @@ update(
    callback): Transaction;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:684](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L684)
+Defined in: [packages/db/src/collection/index.ts:685](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L685)
 
 Updates one or more items in the collection using a callback function
 
@@ -1444,7 +1447,7 @@ Updates one or more items in the collection using a callback function
 
 ###### config
 
-[`OperationConfig`](../OperationConfig.md)
+[`OperationConfig`](OperationConfig.md)
 
 ###### callback
 
@@ -1452,7 +1455,7 @@ Updates one or more items in the collection using a callback function
 
 ##### Returns
 
-[`Transaction`](../Transaction.md)
+[`Transaction`](Transaction.md)
 
 A Transaction object representing the update operation(s)
 
@@ -1500,7 +1503,7 @@ try {
 
 ##### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`update`](../../classes/CollectionImpl.md#update)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`update`](../classes/CollectionImpl.md#update)
 
 ***
 
@@ -1513,7 +1516,7 @@ validateData(
    key?): T;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:571](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L571)
+Defined in: [packages/db/src/collection/index.ts:572](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L572)
 
 Validates the data against the schema
 
@@ -1537,7 +1540,7 @@ Validates the data against the schema
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`validateData`](../../classes/CollectionImpl.md#validatedata)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`validateData`](../classes/CollectionImpl.md#validatedata)
 
 ***
 
@@ -1547,7 +1550,7 @@ Validates the data against the schema
 values(): IterableIterator<T>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:481](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L481)
+Defined in: [packages/db/src/collection/index.ts:482](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L482)
 
 Get all values (virtual derived state)
 
@@ -1557,7 +1560,7 @@ Get all values (virtual derived state)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`values`](../../classes/CollectionImpl.md#values)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`values`](../classes/CollectionImpl.md#values)
 
 ***
 
@@ -1567,7 +1570,7 @@ Get all values (virtual derived state)
 waitFor<T>(event, timeout?): Promise<AllCollectionEvents[T]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:908](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L908)
+Defined in: [packages/db/src/collection/index.ts:909](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L909)
 
 Wait for a collection event
 
@@ -1584,6 +1587,7 @@ Wait for a collection event
   \| `"status:change"`
   \| `"subscribers:change"`
   \| `"loadingSubset:change"`
+  \| `"truncate"`
 
 #### Parameters
 
@@ -1601,4 +1605,4 @@ Wait for a collection event
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`waitFor`](../../classes/CollectionImpl.md#waitfor)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`waitFor`](../classes/CollectionImpl.md#waitfor)
diff --git a/docs/reference/interfaces/CollectionConfig.md b/docs/reference/interfaces/CollectionConfig.md
index e3ce87cd6..1598d8221 100644
--- a/docs/reference/interfaces/CollectionConfig.md
+++ b/docs/reference/interfaces/CollectionConfig.md
@@ -5,11 +5,11 @@ title: CollectionConfig
 
 # Interface: CollectionConfig\<T, TKey, TSchema, TUtils\>
 
-Defined in: [packages/db/src/types.ts:649](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L649)
+Defined in: [packages/db/src/types.ts:704](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L704)
 
 ## Extends
 
-- [`BaseCollectionConfig`](../BaseCollectionConfig.md)\<`T`, `TKey`, `TSchema`, `TUtils`\>
+- [`BaseCollectionConfig`](BaseCollectionConfig.md)\<`T`, `TKey`, `TSchema`, `TUtils`\>
 
 ## Type Parameters
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/types.ts:649](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](../type-aliases/UtilsRecord.md) = [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 ## Properties
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/types.ts:649](https://github.com/TanStack/db/blob/m
 optional autoIndex: "eager" | "off";
 ```
 
-Defined in: [packages/db/src/types.ts:487](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L487)
+Defined in: [packages/db/src/types.ts:542](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L542)
 
 Auto-indexing mode for the collection.
 When enabled, indexes will be automatically created for simple where expressions.
@@ -55,7 +55,7 @@ When enabled, indexes will be automatically created for simple where expressions
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`autoIndex`](../BaseCollectionConfig.md#autoindex)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`autoIndex`](BaseCollectionConfig.md#autoindex)
 
 ***
 
@@ -65,7 +65,7 @@ When enabled, indexes will be automatically created for simple where expressions
 optional compare: (x, y) => number;
 ```
 
-Defined in: [packages/db/src/types.ts:498](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L498)
+Defined in: [packages/db/src/types.ts:553](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L553)
 
 Optional function to compare two items.
 This is used to order the items in the collection.
@@ -99,7 +99,7 @@ compare: (x, y) => x.createdAt.getTime() - y.createdAt.getTime()
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`compare`](../BaseCollectionConfig.md#compare)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`compare`](BaseCollectionConfig.md#compare)
 
 ***
 
@@ -109,7 +109,7 @@ compare: (x, y) => x.createdAt.getTime() - y.createdAt.getTime()
 optional defaultStringCollation: StringCollationConfig;
 ```
 
-Defined in: [packages/db/src/types.ts:644](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L644)
+Defined in: [packages/db/src/types.ts:699](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L699)
 
 Specifies how to compare data in the collection.
 This should be configured to match data ordering on the backend.
@@ -118,7 +118,7 @@ E.g., when using the Electric DB collection these options
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`defaultStringCollation`](../BaseCollectionConfig.md#defaultstringcollation)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`defaultStringCollation`](BaseCollectionConfig.md#defaultstringcollation)
 
 ***
 
@@ -128,14 +128,14 @@ E.g., when using the Electric DB collection these options
 optional gcTime: number;
 ```
 
-Defined in: [packages/db/src/types.ts:467](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L467)
+Defined in: [packages/db/src/types.ts:522](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L522)
 
 Time in milliseconds after which the collection will be garbage collected
 when it has no active subscribers. Defaults to 5 minutes (300000ms).
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`gcTime`](../BaseCollectionConfig.md#gctime)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`gcTime`](BaseCollectionConfig.md#gctime)
 
 ***
 
@@ -145,7 +145,7 @@ when it has no active subscribers. Defaults to 5 minutes (300000ms).
 getKey: (item) => TKey;
 ```
 
-Defined in: [packages/db/src/types.ts:462](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L462)
+Defined in: [packages/db/src/types.ts:517](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L517)
 
 Function to extract the ID from an object
 This is required for update/delete operations which now only accept IDs
@@ -173,7 +173,7 @@ getKey: (item) => item.uuid
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`getKey`](../BaseCollectionConfig.md#getkey)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`getKey`](BaseCollectionConfig.md#getkey)
 
 ***
 
@@ -183,11 +183,11 @@ getKey: (item) => item.uuid
 optional id: string;
 ```
 
-Defined in: [packages/db/src/types.ts:451](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L451)
+Defined in: [packages/db/src/types.ts:506](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L506)
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`id`](../BaseCollectionConfig.md#id)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`id`](BaseCollectionConfig.md#id)
 
 ***
 
@@ -197,7 +197,7 @@ Defined in: [packages/db/src/types.ts:451](https://github.com/TanStack/db/blob/m
 optional onDelete: DeleteMutationFn<T, TKey, TUtils, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:636](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L636)
+Defined in: [packages/db/src/types.ts:691](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L691)
 
 Optional asynchronous handler function called before a delete operation
 
@@ -255,7 +255,7 @@ onDelete: async ({ transaction, collection }) => {
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`onDelete`](../BaseCollectionConfig.md#ondelete)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`onDelete`](BaseCollectionConfig.md#ondelete)
 
 ***
 
@@ -265,7 +265,7 @@ onDelete: async ({ transaction, collection }) => {
 optional onInsert: InsertMutationFn<T, TKey, TUtils, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:549](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L549)
+Defined in: [packages/db/src/types.ts:604](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L604)
 
 Optional asynchronous handler function called before an insert operation
 
@@ -322,7 +322,7 @@ onInsert: async ({ transaction, collection }) => {
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`onInsert`](../BaseCollectionConfig.md#oninsert)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`onInsert`](BaseCollectionConfig.md#oninsert)
 
 ***
 
@@ -332,7 +332,7 @@ onInsert: async ({ transaction, collection }) => {
 optional onUpdate: UpdateMutationFn<T, TKey, TUtils, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:593](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L593)
+Defined in: [packages/db/src/types.ts:648](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L648)
 
 Optional asynchronous handler function called before an update operation
 
@@ -390,7 +390,7 @@ onUpdate: async ({ transaction, collection }) => {
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`onUpdate`](../BaseCollectionConfig.md#onupdate)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`onUpdate`](BaseCollectionConfig.md#onupdate)
 
 ***
 
@@ -400,11 +400,11 @@ onUpdate: async ({ transaction, collection }) => {
 optional schema: TSchema;
 ```
 
-Defined in: [packages/db/src/types.ts:452](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L452)
+Defined in: [packages/db/src/types.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L507)
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`schema`](../BaseCollectionConfig.md#schema)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`schema`](BaseCollectionConfig.md#schema)
 
 ***
 
@@ -414,7 +414,7 @@ Defined in: [packages/db/src/types.ts:452](https://github.com/TanStack/db/blob/m
 optional startSync: boolean;
 ```
 
-Defined in: [packages/db/src/types.ts:478](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L478)
+Defined in: [packages/db/src/types.ts:533](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L533)
 
 Whether to eagerly start syncing on collection creation.
 When true, syncing begins immediately. When false, syncing starts when the first subscriber attaches.
@@ -431,7 +431,7 @@ false
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`startSync`](../BaseCollectionConfig.md#startsync)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`startSync`](BaseCollectionConfig.md#startsync)
 
 ***
 
@@ -441,7 +441,7 @@ false
 sync: SyncConfig<T, TKey>;
 ```
 
-Defined in: [packages/db/src/types.ts:655](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L655)
+Defined in: [packages/db/src/types.ts:710](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L710)
 
 ***
 
@@ -451,7 +451,7 @@ Defined in: [packages/db/src/types.ts:655](https://github.com/TanStack/db/blob/m
 optional syncMode: SyncMode;
 ```
 
-Defined in: [packages/db/src/types.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L507)
+Defined in: [packages/db/src/types.ts:562](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L562)
 
 The mode of sync to use for the collection.
 
@@ -467,7 +467,7 @@ The exact implementation of the sync mode is up to the sync implementation.
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`syncMode`](../BaseCollectionConfig.md#syncmode)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`syncMode`](BaseCollectionConfig.md#syncmode)
 
 ***
 
@@ -477,8 +477,8 @@ The exact implementation of the sync mode is up to the sync implementation.
 optional utils: TUtils;
 ```
 
-Defined in: [packages/db/src/types.ts:646](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L646)
+Defined in: [packages/db/src/types.ts:701](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L701)
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`utils`](../BaseCollectionConfig.md#utils)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`utils`](BaseCollectionConfig.md#utils)
diff --git a/docs/reference/interfaces/CollectionLike.md b/docs/reference/interfaces/CollectionLike.md
index 05679c1ad..cc1f3b446 100644
--- a/docs/reference/interfaces/CollectionLike.md
+++ b/docs/reference/interfaces/CollectionLike.md
@@ -12,7 +12,7 @@ for the change events system to work
 
 ## Extends
 
-- `Pick`\<[`Collection`](../Collection.md)\<`T`, `TKey`\>, `"get"` \| `"has"` \| `"entries"` \| `"indexes"` \| `"id"` \| `"compareOptions"`\>
+- `Pick`\<[`Collection`](Collection.md)\<`T`, `TKey`\>, `"get"` \| `"has"` \| `"entries"` \| `"indexes"` \| `"id"` \| `"compareOptions"`\>
 
 ## Type Parameters
 
@@ -32,11 +32,11 @@ for the change events system to work
 compareOptions: StringCollationConfig;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:579](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L579)
+Defined in: [packages/db/src/collection/index.ts:580](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L580)
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`compareOptions`](../../classes/CollectionImpl.md#compareoptions)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`compareOptions`](../classes/CollectionImpl.md#compareoptions)
 
 ***
 
@@ -50,7 +50,7 @@ Defined in: [packages/db/src/collection/index.ts:273](https://github.com/TanStac
 
 #### Inherited from
 
-[`CollectionImpl`](../../classes/CollectionImpl.md).[`id`](../../classes/CollectionImpl.md#id)
+[`CollectionImpl`](../classes/CollectionImpl.md).[`id`](../classes/CollectionImpl.md#id)
 
 ***
 
@@ -60,7 +60,7 @@ Defined in: [packages/db/src/collection/index.ts:273](https://github.com/TanStac
 indexes: Map<number, BaseIndex<TKey>>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:564](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L564)
+Defined in: [packages/db/src/collection/index.ts:565](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L565)
 
 #### Inherited from
 
@@ -76,7 +76,7 @@ Pick.indexes
 entries(): IterableIterator<[TKey, T]>;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:488](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L488)
+Defined in: [packages/db/src/collection/index.ts:489](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L489)
 
 Get all entries (virtual derived state)
 
@@ -98,7 +98,7 @@ Pick.entries
 get(key): T | undefined;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:453](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L453)
+Defined in: [packages/db/src/collection/index.ts:454](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L454)
 
 Get the current value for a key (virtual derived state)
 
@@ -126,7 +126,7 @@ Pick.get
 has(key): boolean;
 ```
 
-Defined in: [packages/db/src/collection/index.ts:460](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L460)
+Defined in: [packages/db/src/collection/index.ts:461](https://github.com/TanStack/db/blob/main/packages/db/src/collection/index.ts#L461)
 
 Check if a key exists in the collection (virtual derived state)
 
diff --git a/docs/reference/interfaces/CreateOptimisticActionsOptions.md b/docs/reference/interfaces/CreateOptimisticActionsOptions.md
index 166e135dc..3e20fe56d 100644
--- a/docs/reference/interfaces/CreateOptimisticActionsOptions.md
+++ b/docs/reference/interfaces/CreateOptimisticActionsOptions.md
@@ -11,7 +11,7 @@ Options for the createOptimisticAction helper
 
 ## Extends
 
-- `Omit`\<[`TransactionConfig`](../TransactionConfig.md)\<`T`\>, `"mutationFn"`\>
+- `Omit`\<[`TransactionConfig`](TransactionConfig.md)\<`T`\>, `"mutationFn"`\>
 
 ## Type Parameters
 
@@ -35,7 +35,7 @@ Defined in: [packages/db/src/types.ts:169](https://github.com/TanStack/db/blob/m
 
 #### Inherited from
 
-[`TransactionConfig`](../TransactionConfig.md).[`autoCommit`](../TransactionConfig.md#autocommit)
+[`TransactionConfig`](TransactionConfig.md).[`autoCommit`](TransactionConfig.md#autocommit)
 
 ***
 
@@ -93,7 +93,7 @@ Function to execute the mutation on the server
 
 ##### params
 
-[`MutationFnParams`](../../type-aliases/MutationFnParams.md)\<`T`\>
+[`MutationFnParams`](../type-aliases/MutationFnParams.md)\<`T`\>
 
 #### Returns
 
diff --git a/docs/reference/interfaces/CurrentStateAsChangesOptions.md b/docs/reference/interfaces/CurrentStateAsChangesOptions.md
index 0774a7c7b..58063467c 100644
--- a/docs/reference/interfaces/CurrentStateAsChangesOptions.md
+++ b/docs/reference/interfaces/CurrentStateAsChangesOptions.md
@@ -5,7 +5,7 @@ title: CurrentStateAsChangesOptions
 
 # Interface: CurrentStateAsChangesOptions
 
-Defined in: [packages/db/src/types.ts:741](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L741)
+Defined in: [packages/db/src/types.ts:796](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L796)
 
 Options for getting current state as changes
 
@@ -17,7 +17,7 @@ Options for getting current state as changes
 optional limit: number;
 ```
 
-Defined in: [packages/db/src/types.ts:745](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L745)
+Defined in: [packages/db/src/types.ts:800](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L800)
 
 ***
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/types.ts:745](https://github.com/TanStack/db/blob/m
 optional optimizedOnly: boolean;
 ```
 
-Defined in: [packages/db/src/types.ts:746](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L746)
+Defined in: [packages/db/src/types.ts:801](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L801)
 
 ***
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/types.ts:746](https://github.com/TanStack/db/blob/m
 optional orderBy: OrderBy;
 ```
 
-Defined in: [packages/db/src/types.ts:744](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L744)
+Defined in: [packages/db/src/types.ts:799](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L799)
 
 ***
 
@@ -47,6 +47,6 @@ Defined in: [packages/db/src/types.ts:744](https://github.com/TanStack/db/blob/m
 optional where: BasicExpression<boolean>;
 ```
 
-Defined in: [packages/db/src/types.ts:743](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L743)
+Defined in: [packages/db/src/types.ts:798](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L798)
 
 Pre-compiled expression for filtering the current state
diff --git a/docs/reference/interfaces/DebounceStrategy.md b/docs/reference/interfaces/DebounceStrategy.md
index f0418edc7..9ca361705 100644
--- a/docs/reference/interfaces/DebounceStrategy.md
+++ b/docs/reference/interfaces/DebounceStrategy.md
@@ -11,7 +11,7 @@ Debounce strategy that delays execution until activity stops
 
 ## Extends
 
-- [`BaseStrategy`](../BaseStrategy.md)\<`"debounce"`\>
+- [`BaseStrategy`](BaseStrategy.md)\<`"debounce"`\>
 
 ## Properties
 
@@ -27,7 +27,7 @@ Type discriminator for strategy identification
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`_type`](../BaseStrategy.md#_type)
+[`BaseStrategy`](BaseStrategy.md).[`_type`](BaseStrategy.md#_type)
 
 ***
 
@@ -48,7 +48,7 @@ Should be called when the strategy is no longer needed
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`cleanup`](../BaseStrategy.md#cleanup)
+[`BaseStrategy`](BaseStrategy.md).[`cleanup`](BaseStrategy.md#cleanup)
 
 ***
 
@@ -72,7 +72,7 @@ Execute a function according to the strategy's timing rules
 
 ##### fn
 
-() => [`Transaction`](../Transaction.md)\<`T`\>
+() => [`Transaction`](Transaction.md)\<`T`\>
 
 The function to execute
 
@@ -84,7 +84,7 @@ The result of the function execution (if applicable)
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`execute`](../BaseStrategy.md#execute)
+[`BaseStrategy`](BaseStrategy.md).[`execute`](BaseStrategy.md#execute)
 
 ***
 
diff --git a/docs/reference/interfaces/IndexInterface.md b/docs/reference/interfaces/IndexInterface.md
index ebb33b416..5a649aa31 100644
--- a/docs/reference/interfaces/IndexInterface.md
+++ b/docs/reference/interfaces/IndexInterface.md
@@ -103,7 +103,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:70](https://github.com/TanSta
 
 #### Returns
 
-[`IndexStats`](../IndexStats.md)
+[`IndexStats`](IndexStats.md)
 
 ***
 
@@ -183,7 +183,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:68](https://github.com/TanSta
 
 ##### direction
 
-[`OrderByDirection`](../../@tanstack/namespaces/IR/type-aliases/OrderByDirection.md)
+[`OrderByDirection`](../@tanstack/namespaces/IR/type-aliases/OrderByDirection.md)
 
 #### Returns
 
@@ -223,7 +223,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:43](https://github.com/TanSta
 
 ##### options
 
-[`RangeQueryOptions`](../RangeQueryOptions.md)
+[`RangeQueryOptions`](RangeQueryOptions.md)
 
 #### Returns
 
@@ -243,7 +243,7 @@ Defined in: [packages/db/src/indexes/base-index.ts:44](https://github.com/TanSta
 
 ##### options
 
-[`RangeQueryOptions`](../RangeQueryOptions.md)
+[`RangeQueryOptions`](RangeQueryOptions.md)
 
 #### Returns
 
diff --git a/docs/reference/interfaces/IndexOptions.md b/docs/reference/interfaces/IndexOptions.md
index 8a99a578a..3ca169871 100644
--- a/docs/reference/interfaces/IndexOptions.md
+++ b/docs/reference/interfaces/IndexOptions.md
@@ -13,7 +13,7 @@ Enhanced index options that support both sync and async resolvers
 
 ### TResolver
 
-`TResolver` *extends* [`IndexResolver`](../../type-aliases/IndexResolver.md) = [`IndexResolver`](../../type-aliases/IndexResolver.md)
+`TResolver` *extends* [`IndexResolver`](../type-aliases/IndexResolver.md) = [`IndexResolver`](../type-aliases/IndexResolver.md)
 
 ## Properties
 
diff --git a/docs/reference/interfaces/InsertConfig.md b/docs/reference/interfaces/InsertConfig.md
index 47410c1e4..5ea89658c 100644
--- a/docs/reference/interfaces/InsertConfig.md
+++ b/docs/reference/interfaces/InsertConfig.md
@@ -5,7 +5,7 @@ title: InsertConfig
 
 # Interface: InsertConfig
 
-Defined in: [packages/db/src/types.ts:356](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L356)
+Defined in: [packages/db/src/types.ts:411](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L411)
 
 ## Properties
 
@@ -15,7 +15,7 @@ Defined in: [packages/db/src/types.ts:356](https://github.com/TanStack/db/blob/m
 optional metadata: Record<string, unknown>;
 ```
 
-Defined in: [packages/db/src/types.ts:357](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L357)
+Defined in: [packages/db/src/types.ts:412](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L412)
 
 ***
 
@@ -25,6 +25,6 @@ Defined in: [packages/db/src/types.ts:357](https://github.com/TanStack/db/blob/m
 optional optimistic: boolean;
 ```
 
-Defined in: [packages/db/src/types.ts:359](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L359)
+Defined in: [packages/db/src/types.ts:414](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L414)
 
 Whether to apply optimistic updates immediately. Defaults to true.
diff --git a/docs/reference/interfaces/LiveQueryCollectionConfig.md b/docs/reference/interfaces/LiveQueryCollectionConfig.md
index 1c3a8ed77..b2b9df507 100644
--- a/docs/reference/interfaces/LiveQueryCollectionConfig.md
+++ b/docs/reference/interfaces/LiveQueryCollectionConfig.md
@@ -35,11 +35,11 @@ const config: LiveQueryCollectionConfig<any, any> = {
 
 ### TContext
 
-`TContext` *extends* [`Context`](../Context.md)
+`TContext` *extends* [`Context`](Context.md)
 
 ### TResult
 
-`TResult` *extends* `object` = [`GetResult`](../../type-aliases/GetResult.md)\<`TContext`\> & `object`
+`TResult` *extends* `object` = [`GetResult`](../type-aliases/GetResult.md)\<`TContext`\> & `object`
 
 ## Properties
 
diff --git a/docs/reference/interfaces/LocalOnlyCollectionConfig.md b/docs/reference/interfaces/LocalOnlyCollectionConfig.md
index 5174a1e32..9ca473d97 100644
--- a/docs/reference/interfaces/LocalOnlyCollectionConfig.md
+++ b/docs/reference/interfaces/LocalOnlyCollectionConfig.md
@@ -11,7 +11,7 @@ Configuration interface for Local-only collection options
 
 ## Extends
 
-- `Omit`\<[`BaseCollectionConfig`](../BaseCollectionConfig.md)\<`T`, `TKey`, `TSchema`, [`LocalOnlyCollectionUtils`](../LocalOnlyCollectionUtils.md)\>, `"gcTime"` \| `"startSync"`\>
+- `Omit`\<[`BaseCollectionConfig`](BaseCollectionConfig.md)\<`T`, `TKey`, `TSchema`, [`LocalOnlyCollectionUtils`](LocalOnlyCollectionUtils.md)\>, `"gcTime"` \| `"startSync"`\>
 
 ## Type Parameters
 
@@ -41,7 +41,7 @@ The type of the key returned by `getKey`
 optional autoIndex: "eager" | "off";
 ```
 
-Defined in: [packages/db/src/types.ts:487](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L487)
+Defined in: [packages/db/src/types.ts:542](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L542)
 
 Auto-indexing mode for the collection.
 When enabled, indexes will be automatically created for simple where expressions.
@@ -59,7 +59,7 @@ When enabled, indexes will be automatically created for simple where expressions
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`autoIndex`](../BaseCollectionConfig.md#autoindex)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`autoIndex`](BaseCollectionConfig.md#autoindex)
 
 ***
 
@@ -69,7 +69,7 @@ When enabled, indexes will be automatically created for simple where expressions
 optional compare: (x, y) => number;
 ```
 
-Defined in: [packages/db/src/types.ts:498](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L498)
+Defined in: [packages/db/src/types.ts:553](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L553)
 
 Optional function to compare two items.
 This is used to order the items in the collection.
@@ -115,7 +115,7 @@ Omit.compare
 optional defaultStringCollation: StringCollationConfig;
 ```
 
-Defined in: [packages/db/src/types.ts:644](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L644)
+Defined in: [packages/db/src/types.ts:699](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L699)
 
 Specifies how to compare data in the collection.
 This should be configured to match data ordering on the backend.
@@ -136,7 +136,7 @@ Omit.defaultStringCollation
 getKey: (item) => TKey;
 ```
 
-Defined in: [packages/db/src/types.ts:462](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L462)
+Defined in: [packages/db/src/types.ts:517](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L517)
 
 Function to extract the ID from an object
 This is required for update/delete operations which now only accept IDs
@@ -176,11 +176,11 @@ Omit.getKey
 optional id: string;
 ```
 
-Defined in: [packages/db/src/types.ts:451](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L451)
+Defined in: [packages/db/src/types.ts:506](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L506)
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`id`](../BaseCollectionConfig.md#id)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`id`](BaseCollectionConfig.md#id)
 
 ***
 
@@ -203,7 +203,7 @@ This data will be applied during the initial sync process
 optional onDelete: DeleteMutationFn<T, TKey, LocalOnlyCollectionUtils, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:636](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L636)
+Defined in: [packages/db/src/types.ts:691](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L691)
 
 Optional asynchronous handler function called before a delete operation
 
@@ -273,7 +273,7 @@ Omit.onDelete
 optional onInsert: InsertMutationFn<T, TKey, LocalOnlyCollectionUtils, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:549](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L549)
+Defined in: [packages/db/src/types.ts:604](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L604)
 
 Optional asynchronous handler function called before an insert operation
 
@@ -342,7 +342,7 @@ Omit.onInsert
 optional onUpdate: UpdateMutationFn<T, TKey, LocalOnlyCollectionUtils, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:593](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L593)
+Defined in: [packages/db/src/types.ts:648](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L648)
 
 Optional asynchronous handler function called before an update operation
 
@@ -412,7 +412,7 @@ Omit.onUpdate
 optional schema: TSchema;
 ```
 
-Defined in: [packages/db/src/types.ts:452](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L452)
+Defined in: [packages/db/src/types.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L507)
 
 #### Inherited from
 
@@ -428,7 +428,7 @@ Omit.schema
 optional syncMode: SyncMode;
 ```
 
-Defined in: [packages/db/src/types.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L507)
+Defined in: [packages/db/src/types.ts:562](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L562)
 
 The mode of sync to use for the collection.
 
@@ -444,7 +444,7 @@ The exact implementation of the sync mode is up to the sync implementation.
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`syncMode`](../BaseCollectionConfig.md#syncmode)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`syncMode`](BaseCollectionConfig.md#syncmode)
 
 ***
 
@@ -454,7 +454,7 @@ The exact implementation of the sync mode is up to the sync implementation.
 optional utils: LocalOnlyCollectionUtils;
 ```
 
-Defined in: [packages/db/src/types.ts:646](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L646)
+Defined in: [packages/db/src/types.ts:701](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L701)
 
 #### Inherited from
 
diff --git a/docs/reference/interfaces/LocalOnlyCollectionUtils.md b/docs/reference/interfaces/LocalOnlyCollectionUtils.md
index 75d3e41ce..c86fbc07b 100644
--- a/docs/reference/interfaces/LocalOnlyCollectionUtils.md
+++ b/docs/reference/interfaces/LocalOnlyCollectionUtils.md
@@ -11,7 +11,7 @@ Local-only collection utilities type
 
 ## Extends
 
-- [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+- [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 ## Indexable
 
@@ -40,7 +40,7 @@ The transaction containing mutations to accept
 
 ###### mutations
 
-[`PendingMutation`](../PendingMutation.md)\<`Record`\<`string`, `unknown`\>, [`OperationType`](../../type-aliases/OperationType.md), [`Collection`](../Collection.md)\<`Record`\<`string`, `unknown`\>, `any`, `any`, `any`, `any`\>\>[]
+[`PendingMutation`](PendingMutation.md)\<`Record`\<`string`, `unknown`\>, [`OperationType`](../type-aliases/OperationType.md), [`Collection`](Collection.md)\<`Record`\<`string`, `unknown`\>, `any`, `any`, `any`, `any`\>\>[]
 
 #### Returns
 
diff --git a/docs/reference/interfaces/LocalStorageCollectionConfig.md b/docs/reference/interfaces/LocalStorageCollectionConfig.md
index 358d4e72f..ea895db11 100644
--- a/docs/reference/interfaces/LocalStorageCollectionConfig.md
+++ b/docs/reference/interfaces/LocalStorageCollectionConfig.md
@@ -11,7 +11,7 @@ Configuration interface for localStorage collection options
 
 ## Extends
 
-- [`BaseCollectionConfig`](../BaseCollectionConfig.md)\<`T`, `TKey`, `TSchema`\>
+- [`BaseCollectionConfig`](BaseCollectionConfig.md)\<`T`, `TKey`, `TSchema`\>
 
 ## Type Parameters
 
@@ -41,7 +41,7 @@ The type of the key returned by `getKey`
 optional autoIndex: "eager" | "off";
 ```
 
-Defined in: [packages/db/src/types.ts:487](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L487)
+Defined in: [packages/db/src/types.ts:542](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L542)
 
 Auto-indexing mode for the collection.
 When enabled, indexes will be automatically created for simple where expressions.
@@ -59,7 +59,7 @@ When enabled, indexes will be automatically created for simple where expressions
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`autoIndex`](../BaseCollectionConfig.md#autoindex)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`autoIndex`](BaseCollectionConfig.md#autoindex)
 
 ***
 
@@ -69,7 +69,7 @@ When enabled, indexes will be automatically created for simple where expressions
 optional compare: (x, y) => number;
 ```
 
-Defined in: [packages/db/src/types.ts:498](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L498)
+Defined in: [packages/db/src/types.ts:553](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L553)
 
 Optional function to compare two items.
 This is used to order the items in the collection.
@@ -103,7 +103,7 @@ compare: (x, y) => x.createdAt.getTime() - y.createdAt.getTime()
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`compare`](../BaseCollectionConfig.md#compare)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`compare`](BaseCollectionConfig.md#compare)
 
 ***
 
@@ -113,7 +113,7 @@ compare: (x, y) => x.createdAt.getTime() - y.createdAt.getTime()
 optional defaultStringCollation: StringCollationConfig;
 ```
 
-Defined in: [packages/db/src/types.ts:644](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L644)
+Defined in: [packages/db/src/types.ts:699](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L699)
 
 Specifies how to compare data in the collection.
 This should be configured to match data ordering on the backend.
@@ -122,7 +122,7 @@ E.g., when using the Electric DB collection these options
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`defaultStringCollation`](../BaseCollectionConfig.md#defaultstringcollation)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`defaultStringCollation`](BaseCollectionConfig.md#defaultstringcollation)
 
 ***
 
@@ -132,14 +132,14 @@ E.g., when using the Electric DB collection these options
 optional gcTime: number;
 ```
 
-Defined in: [packages/db/src/types.ts:467](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L467)
+Defined in: [packages/db/src/types.ts:522](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L522)
 
 Time in milliseconds after which the collection will be garbage collected
 when it has no active subscribers. Defaults to 5 minutes (300000ms).
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`gcTime`](../BaseCollectionConfig.md#gctime)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`gcTime`](BaseCollectionConfig.md#gctime)
 
 ***
 
@@ -149,7 +149,7 @@ when it has no active subscribers. Defaults to 5 minutes (300000ms).
 getKey: (item) => TKey;
 ```
 
-Defined in: [packages/db/src/types.ts:462](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L462)
+Defined in: [packages/db/src/types.ts:517](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L517)
 
 Function to extract the ID from an object
 This is required for update/delete operations which now only accept IDs
@@ -177,7 +177,7 @@ getKey: (item) => item.uuid
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`getKey`](../BaseCollectionConfig.md#getkey)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`getKey`](BaseCollectionConfig.md#getkey)
 
 ***
 
@@ -187,11 +187,11 @@ getKey: (item) => item.uuid
 optional id: string;
 ```
 
-Defined in: [packages/db/src/types.ts:451](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L451)
+Defined in: [packages/db/src/types.ts:506](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L506)
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`id`](../BaseCollectionConfig.md#id)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`id`](BaseCollectionConfig.md#id)
 
 ***
 
@@ -201,7 +201,7 @@ Defined in: [packages/db/src/types.ts:451](https://github.com/TanStack/db/blob/m
 optional onDelete: DeleteMutationFn<T, TKey, UtilsRecord, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:636](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L636)
+Defined in: [packages/db/src/types.ts:691](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L691)
 
 Optional asynchronous handler function called before a delete operation
 
@@ -259,7 +259,7 @@ onDelete: async ({ transaction, collection }) => {
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`onDelete`](../BaseCollectionConfig.md#ondelete)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`onDelete`](BaseCollectionConfig.md#ondelete)
 
 ***
 
@@ -269,7 +269,7 @@ onDelete: async ({ transaction, collection }) => {
 optional onInsert: InsertMutationFn<T, TKey, UtilsRecord, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:549](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L549)
+Defined in: [packages/db/src/types.ts:604](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L604)
 
 Optional asynchronous handler function called before an insert operation
 
@@ -326,7 +326,7 @@ onInsert: async ({ transaction, collection }) => {
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`onInsert`](../BaseCollectionConfig.md#oninsert)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`onInsert`](BaseCollectionConfig.md#oninsert)
 
 ***
 
@@ -336,7 +336,7 @@ onInsert: async ({ transaction, collection }) => {
 optional onUpdate: UpdateMutationFn<T, TKey, UtilsRecord, any>;
 ```
 
-Defined in: [packages/db/src/types.ts:593](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L593)
+Defined in: [packages/db/src/types.ts:648](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L648)
 
 Optional asynchronous handler function called before an update operation
 
@@ -394,7 +394,7 @@ onUpdate: async ({ transaction, collection }) => {
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`onUpdate`](../BaseCollectionConfig.md#onupdate)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`onUpdate`](BaseCollectionConfig.md#onupdate)
 
 ***
 
@@ -417,11 +417,11 @@ Defaults to JSON
 optional schema: TSchema;
 ```
 
-Defined in: [packages/db/src/types.ts:452](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L452)
+Defined in: [packages/db/src/types.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L507)
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`schema`](../BaseCollectionConfig.md#schema)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`schema`](BaseCollectionConfig.md#schema)
 
 ***
 
@@ -431,7 +431,7 @@ Defined in: [packages/db/src/types.ts:452](https://github.com/TanStack/db/blob/m
 optional startSync: boolean;
 ```
 
-Defined in: [packages/db/src/types.ts:478](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L478)
+Defined in: [packages/db/src/types.ts:533](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L533)
 
 Whether to eagerly start syncing on collection creation.
 When true, syncing begins immediately. When false, syncing starts when the first subscriber attaches.
@@ -448,7 +448,7 @@ false
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`startSync`](../BaseCollectionConfig.md#startsync)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`startSync`](BaseCollectionConfig.md#startsync)
 
 ***
 
@@ -496,7 +496,7 @@ The key to use for storing the collection data in localStorage/sessionStorage
 optional syncMode: SyncMode;
 ```
 
-Defined in: [packages/db/src/types.ts:507](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L507)
+Defined in: [packages/db/src/types.ts:562](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L562)
 
 The mode of sync to use for the collection.
 
@@ -512,7 +512,7 @@ The exact implementation of the sync mode is up to the sync implementation.
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`syncMode`](../BaseCollectionConfig.md#syncmode)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`syncMode`](BaseCollectionConfig.md#syncmode)
 
 ***
 
@@ -522,8 +522,8 @@ The exact implementation of the sync mode is up to the sync implementation.
 optional utils: UtilsRecord;
 ```
 
-Defined in: [packages/db/src/types.ts:646](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L646)
+Defined in: [packages/db/src/types.ts:701](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L701)
 
 #### Inherited from
 
-[`BaseCollectionConfig`](../BaseCollectionConfig.md).[`utils`](../BaseCollectionConfig.md#utils)
+[`BaseCollectionConfig`](BaseCollectionConfig.md).[`utils`](BaseCollectionConfig.md#utils)
diff --git a/docs/reference/interfaces/LocalStorageCollectionUtils.md b/docs/reference/interfaces/LocalStorageCollectionUtils.md
index 9b35e540d..9472f18f6 100644
--- a/docs/reference/interfaces/LocalStorageCollectionUtils.md
+++ b/docs/reference/interfaces/LocalStorageCollectionUtils.md
@@ -11,7 +11,7 @@ LocalStorage collection utilities type
 
 ## Extends
 
-- [`UtilsRecord`](../../type-aliases/UtilsRecord.md)
+- [`UtilsRecord`](../type-aliases/UtilsRecord.md)
 
 ## Indexable
 
@@ -40,7 +40,7 @@ The transaction containing mutations to accept
 
 ###### mutations
 
-[`PendingMutation`](../PendingMutation.md)\<`Record`\<`string`, `unknown`\>, [`OperationType`](../../type-aliases/OperationType.md), [`Collection`](../Collection.md)\<`Record`\<`string`, `unknown`\>, `any`, `any`, `any`, `any`\>\>[]
+[`PendingMutation`](PendingMutation.md)\<`Record`\<`string`, `unknown`\>, [`OperationType`](../type-aliases/OperationType.md), [`Collection`](Collection.md)\<`Record`\<`string`, `unknown`\>, `any`, `any`, `any`, `any`\>\>[]
 
 #### Returns
 
diff --git a/docs/reference/interfaces/OperationConfig.md b/docs/reference/interfaces/OperationConfig.md
index 66c3e6e55..c0df1505d 100644
--- a/docs/reference/interfaces/OperationConfig.md
+++ b/docs/reference/interfaces/OperationConfig.md
@@ -5,7 +5,7 @@ title: OperationConfig
 
 # Interface: OperationConfig
 
-Defined in: [packages/db/src/types.ts:350](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L350)
+Defined in: [packages/db/src/types.ts:405](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L405)
 
 ## Properties
 
@@ -15,7 +15,7 @@ Defined in: [packages/db/src/types.ts:350](https://github.com/TanStack/db/blob/m
 optional metadata: Record<string, unknown>;
 ```
 
-Defined in: [packages/db/src/types.ts:351](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L351)
+Defined in: [packages/db/src/types.ts:406](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L406)
 
 ***
 
@@ -25,6 +25,6 @@ Defined in: [packages/db/src/types.ts:351](https://github.com/TanStack/db/blob/m
 optional optimistic: boolean;
 ```
 
-Defined in: [packages/db/src/types.ts:353](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L353)
+Defined in: [packages/db/src/types.ts:408](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L408)
 
 Whether to apply optimistic updates immediately. Defaults to true.
diff --git a/docs/reference/interfaces/OptimisticChangeMessage.md b/docs/reference/interfaces/OptimisticChangeMessage.md
deleted file mode 100644
index cda28f0f3..000000000
--- a/docs/reference/interfaces/OptimisticChangeMessage.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-id: OptimisticChangeMessage
-title: OptimisticChangeMessage
----
-
-# Interface: OptimisticChangeMessage\<T\>
-
-Defined in: [packages/db/src/types.ts:325](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L325)
-
-## Extends
-
-- [`ChangeMessage`](../ChangeMessage.md)\<`T`\>
-
-## Type Parameters
-
-### T
-
-`T` *extends* `object` = `Record`\<`string`, `unknown`\>
-
-## Properties
-
-### isActive?
-
-```ts
-optional isActive: boolean;
-```
-
-Defined in: [packages/db/src/types.ts:329](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L329)
-
-***
-
-### key
-
-```ts
-key: string | number;
-```
-
-Defined in: [packages/db/src/types.ts:318](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L318)
-
-#### Inherited from
-
-[`ChangeMessage`](../ChangeMessage.md).[`key`](../ChangeMessage.md#key)
-
-***
-
-### metadata?
-
-```ts
-optional metadata: Record<string, unknown>;
-```
-
-Defined in: [packages/db/src/types.ts:322](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L322)
-
-#### Inherited from
-
-[`ChangeMessage`](../ChangeMessage.md).[`metadata`](../ChangeMessage.md#metadata)
-
-***
-
-### previousValue?
-
-```ts
-optional previousValue: T;
-```
-
-Defined in: [packages/db/src/types.ts:320](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L320)
-
-#### Inherited from
-
-[`ChangeMessage`](../ChangeMessage.md).[`previousValue`](../ChangeMessage.md#previousvalue)
-
-***
-
-### type
-
-```ts
-type: OperationType;
-```
-
-Defined in: [packages/db/src/types.ts:321](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L321)
-
-#### Inherited from
-
-[`ChangeMessage`](../ChangeMessage.md).[`type`](../ChangeMessage.md#type)
-
-***
-
-### value
-
-```ts
-value: T;
-```
-
-Defined in: [packages/db/src/types.ts:319](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L319)
-
-#### Inherited from
-
-[`ChangeMessage`](../ChangeMessage.md).[`value`](../ChangeMessage.md#value)
diff --git a/docs/reference/interfaces/PendingMutation.md b/docs/reference/interfaces/PendingMutation.md
index 2a5264f25..2b9c68cc9 100644
--- a/docs/reference/interfaces/PendingMutation.md
+++ b/docs/reference/interfaces/PendingMutation.md
@@ -18,11 +18,11 @@ Contains information about the original and modified data, as well as metadata
 
 ### TOperation
 
-`TOperation` *extends* [`OperationType`](../../type-aliases/OperationType.md) = [`OperationType`](../../type-aliases/OperationType.md)
+`TOperation` *extends* [`OperationType`](../type-aliases/OperationType.md) = [`OperationType`](../type-aliases/OperationType.md)
 
 ### TCollection
 
-`TCollection` *extends* [`Collection`](../Collection.md)\<`T`, `any`, `any`, `any`, `any`\> = [`Collection`](../Collection.md)\<`T`, `any`, `any`, `any`, `any`\>
+`TCollection` *extends* [`Collection`](Collection.md)\<`T`, `any`, `any`, `any`, `any`\> = [`Collection`](Collection.md)\<`T`, `any`, `any`, `any`, `any`\>
 
 ## Properties
 
diff --git a/docs/reference/interfaces/QueueStrategy.md b/docs/reference/interfaces/QueueStrategy.md
index d22576848..b38776d5c 100644
--- a/docs/reference/interfaces/QueueStrategy.md
+++ b/docs/reference/interfaces/QueueStrategy.md
@@ -13,7 +13,7 @@ LIFO: { addItemsTo: 'back', getItemsFrom: 'back' }
 
 ## Extends
 
-- [`BaseStrategy`](../BaseStrategy.md)\<`"queue"`\>
+- [`BaseStrategy`](BaseStrategy.md)\<`"queue"`\>
 
 ## Properties
 
@@ -29,7 +29,7 @@ Type discriminator for strategy identification
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`_type`](../BaseStrategy.md#_type)
+[`BaseStrategy`](BaseStrategy.md).[`_type`](BaseStrategy.md#_type)
 
 ***
 
@@ -50,7 +50,7 @@ Should be called when the strategy is no longer needed
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`cleanup`](../BaseStrategy.md#cleanup)
+[`BaseStrategy`](BaseStrategy.md).[`cleanup`](BaseStrategy.md#cleanup)
 
 ***
 
@@ -74,7 +74,7 @@ Execute a function according to the strategy's timing rules
 
 ##### fn
 
-() => [`Transaction`](../Transaction.md)\<`T`\>
+() => [`Transaction`](Transaction.md)\<`T`\>
 
 The function to execute
 
@@ -86,7 +86,7 @@ The result of the function execution (if applicable)
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`execute`](../BaseStrategy.md#execute)
+[`BaseStrategy`](BaseStrategy.md).[`execute`](BaseStrategy.md#execute)
 
 ***
 
diff --git a/docs/reference/interfaces/RangeQueryOptions.md b/docs/reference/interfaces/RangeQueryOptions.md
index cae26c2a6..cdf9c1ba4 100644
--- a/docs/reference/interfaces/RangeQueryOptions.md
+++ b/docs/reference/interfaces/RangeQueryOptions.md
@@ -5,7 +5,7 @@ title: RangeQueryOptions
 
 # Interface: RangeQueryOptions
 
-Defined in: [packages/db/src/indexes/btree-index.ts:19](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L19)
+Defined in: [packages/db/src/indexes/btree-index.ts:20](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L20)
 
 Options for range queries
 
@@ -17,7 +17,7 @@ Options for range queries
 optional from: any;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:20](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L20)
+Defined in: [packages/db/src/indexes/btree-index.ts:21](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L21)
 
 ***
 
@@ -27,7 +27,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:20](https://github.com/TanSt
 optional fromInclusive: boolean;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:22](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L22)
+Defined in: [packages/db/src/indexes/btree-index.ts:23](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L23)
 
 ***
 
@@ -37,7 +37,7 @@ Defined in: [packages/db/src/indexes/btree-index.ts:22](https://github.com/TanSt
 optional to: any;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:21](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L21)
+Defined in: [packages/db/src/indexes/btree-index.ts:22](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L22)
 
 ***
 
@@ -47,4 +47,4 @@ Defined in: [packages/db/src/indexes/btree-index.ts:21](https://github.com/TanSt
 optional toInclusive: boolean;
 ```
 
-Defined in: [packages/db/src/indexes/btree-index.ts:23](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L23)
+Defined in: [packages/db/src/indexes/btree-index.ts:24](https://github.com/TanStack/db/blob/main/packages/db/src/indexes/btree-index.ts#L24)
diff --git a/docs/reference/interfaces/SubscribeChangesOptions.md b/docs/reference/interfaces/SubscribeChangesOptions.md
index 901fa75b6..2af6fbdcd 100644
--- a/docs/reference/interfaces/SubscribeChangesOptions.md
+++ b/docs/reference/interfaces/SubscribeChangesOptions.md
@@ -5,7 +5,7 @@ title: SubscribeChangesOptions
 
 # Interface: SubscribeChangesOptions
 
-Defined in: [packages/db/src/types.ts:723](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L723)
+Defined in: [packages/db/src/types.ts:778](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L778)
 
 Options for subscribing to collection changes
 
@@ -17,7 +17,7 @@ Options for subscribing to collection changes
 optional includeInitialState: boolean;
 ```
 
-Defined in: [packages/db/src/types.ts:725](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L725)
+Defined in: [packages/db/src/types.ts:780](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L780)
 
 Whether to include the current state as initial changes
 
@@ -29,6 +29,6 @@ Whether to include the current state as initial changes
 optional whereExpression: BasicExpression<boolean>;
 ```
 
-Defined in: [packages/db/src/types.ts:727](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L727)
+Defined in: [packages/db/src/types.ts:782](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L782)
 
 Pre-compiled expression for filtering changes
diff --git a/docs/reference/interfaces/SubscribeChangesSnapshotOptions.md b/docs/reference/interfaces/SubscribeChangesSnapshotOptions.md
index 34d59c8ad..5d6296f43 100644
--- a/docs/reference/interfaces/SubscribeChangesSnapshotOptions.md
+++ b/docs/reference/interfaces/SubscribeChangesSnapshotOptions.md
@@ -5,11 +5,11 @@ title: SubscribeChangesSnapshotOptions
 
 # Interface: SubscribeChangesSnapshotOptions
 
-Defined in: [packages/db/src/types.ts:730](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L730)
+Defined in: [packages/db/src/types.ts:785](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L785)
 
 ## Extends
 
-- `Omit`\<[`SubscribeChangesOptions`](../SubscribeChangesOptions.md), `"includeInitialState"`\>
+- `Omit`\<[`SubscribeChangesOptions`](SubscribeChangesOptions.md), `"includeInitialState"`\>
 
 ## Properties
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/types.ts:730](https://github.com/TanStack/db/blob/m
 optional limit: number;
 ```
 
-Defined in: [packages/db/src/types.ts:735](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L735)
+Defined in: [packages/db/src/types.ts:790](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L790)
 
 ***
 
@@ -29,7 +29,7 @@ Defined in: [packages/db/src/types.ts:735](https://github.com/TanStack/db/blob/m
 optional orderBy: OrderBy;
 ```
 
-Defined in: [packages/db/src/types.ts:734](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L734)
+Defined in: [packages/db/src/types.ts:789](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L789)
 
 ***
 
@@ -39,10 +39,10 @@ Defined in: [packages/db/src/types.ts:734](https://github.com/TanStack/db/blob/m
 optional whereExpression: BasicExpression<boolean>;
 ```
 
-Defined in: [packages/db/src/types.ts:727](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L727)
+Defined in: [packages/db/src/types.ts:782](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L782)
 
 Pre-compiled expression for filtering changes
 
 #### Inherited from
 
-[`SubscribeChangesOptions`](../SubscribeChangesOptions.md).[`whereExpression`](../SubscribeChangesOptions.md#whereexpression)
+[`SubscribeChangesOptions`](SubscribeChangesOptions.md).[`whereExpression`](SubscribeChangesOptions.md#whereexpression)
diff --git a/docs/reference/interfaces/Subscription.md b/docs/reference/interfaces/Subscription.md
index 7c7e38148..c8cb4a790 100644
--- a/docs/reference/interfaces/Subscription.md
+++ b/docs/reference/interfaces/Subscription.md
@@ -12,7 +12,7 @@ Used by sync implementations to track subscription lifecycle
 
 ## Extends
 
-- `EventEmitter`\<[`SubscriptionEvents`](../../type-aliases/SubscriptionEvents.md)\>
+- `EventEmitter`\<[`SubscriptionEvents`](../type-aliases/SubscriptionEvents.md)\>
 
 ## Properties
 
@@ -66,7 +66,7 @@ Emit an event to all listeners
 
 ##### T
 
-`T` *extends* keyof [`SubscriptionEvents`](../../type-aliases/SubscriptionEvents.md)
+`T` *extends* keyof [`SubscriptionEvents`](../type-aliases/SubscriptionEvents.md)
 
 #### Parameters
 
@@ -78,7 +78,7 @@ Event name to emit
 
 ##### eventPayload
 
-[`SubscriptionEvents`](../../type-aliases/SubscriptionEvents.md)\[`T`\]
+[`SubscriptionEvents`](../type-aliases/SubscriptionEvents.md)\[`T`\]
 
 Event payload
  For use by subclasses - subclasses should wrap this with a public emit if needed
@@ -109,7 +109,7 @@ Unsubscribe from an event
 
 ##### T
 
-`T` *extends* keyof [`SubscriptionEvents`](../../type-aliases/SubscriptionEvents.md)
+`T` *extends* keyof [`SubscriptionEvents`](../type-aliases/SubscriptionEvents.md)
 
 #### Parameters
 
@@ -151,7 +151,7 @@ Subscribe to an event
 
 ##### T
 
-`T` *extends* keyof [`SubscriptionEvents`](../../type-aliases/SubscriptionEvents.md)
+`T` *extends* keyof [`SubscriptionEvents`](../type-aliases/SubscriptionEvents.md)
 
 #### Parameters
 
@@ -201,7 +201,7 @@ Subscribe to an event once (automatically unsubscribes after first emission)
 
 ##### T
 
-`T` *extends* keyof [`SubscriptionEvents`](../../type-aliases/SubscriptionEvents.md)
+`T` *extends* keyof [`SubscriptionEvents`](../type-aliases/SubscriptionEvents.md)
 
 #### Parameters
 
@@ -251,7 +251,7 @@ Wait for an event to be emitted
 
 ##### T
 
-`T` *extends* keyof [`SubscriptionEvents`](../../type-aliases/SubscriptionEvents.md)
+`T` *extends* keyof [`SubscriptionEvents`](../type-aliases/SubscriptionEvents.md)
 
 #### Parameters
 
@@ -269,7 +269,7 @@ Optional timeout in milliseconds
 
 #### Returns
 
-`Promise`\<[`SubscriptionEvents`](../../type-aliases/SubscriptionEvents.md)\[`T`\]\>
+`Promise`\<[`SubscriptionEvents`](../type-aliases/SubscriptionEvents.md)\[`T`\]\>
 
 Promise that resolves with the event payload
 
diff --git a/docs/reference/interfaces/SubscriptionStatusEvent.md b/docs/reference/interfaces/SubscriptionStatusEvent.md
index 4e9b14f26..a84679586 100644
--- a/docs/reference/interfaces/SubscriptionStatusEvent.md
+++ b/docs/reference/interfaces/SubscriptionStatusEvent.md
@@ -13,7 +13,7 @@ Event emitted when subscription status changes to a specific status
 
 ### T
 
-`T` *extends* [`SubscriptionStatus`](../../type-aliases/SubscriptionStatus.md)
+`T` *extends* [`SubscriptionStatus`](../type-aliases/SubscriptionStatus.md)
 
 ## Properties
 
diff --git a/docs/reference/interfaces/SyncConfig.md b/docs/reference/interfaces/SyncConfig.md
index d49cfbb86..f6510d576 100644
--- a/docs/reference/interfaces/SyncConfig.md
+++ b/docs/reference/interfaces/SyncConfig.md
@@ -5,7 +5,7 @@ title: SyncConfig
 
 # Interface: SyncConfig\<T, TKey\>
 
-Defined in: [packages/db/src/types.ts:285](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L285)
+Defined in: [packages/db/src/types.ts:324](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L324)
 
 ## Type Parameters
 
@@ -25,7 +25,7 @@ Defined in: [packages/db/src/types.ts:285](https://github.com/TanStack/db/blob/m
 optional getSyncMetadata: () => Record<string, unknown>;
 ```
 
-Defined in: [packages/db/src/types.ts:302](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L302)
+Defined in: [packages/db/src/types.ts:341](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L341)
 
 Get the sync metadata for insert operations
 
@@ -43,7 +43,7 @@ Record containing relation information
 optional rowUpdateMode: "full" | "partial";
 ```
 
-Defined in: [packages/db/src/types.ts:311](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L311)
+Defined in: [packages/db/src/types.ts:350](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L350)
 
 The row update mode used to sync to the collection.
 
@@ -67,7 +67,7 @@ sync: (params) =>
   | SyncConfigRes;
 ```
 
-Defined in: [packages/db/src/types.ts:289](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L289)
+Defined in: [packages/db/src/types.ts:328](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L328)
 
 #### Parameters
 
@@ -79,7 +79,7 @@ Defined in: [packages/db/src/types.ts:289](https://github.com/TanStack/db/blob/m
 
 ###### collection
 
-[`Collection`](../Collection.md)\<`T`, `TKey`, `any`, `any`, `any`\>
+[`Collection`](Collection.md)\<`T`, `TKey`, `any`, `any`, `any`\>
 
 ###### commit
 
@@ -100,5 +100,5 @@ Defined in: [packages/db/src/types.ts:289](https://github.com/TanStack/db/blob/m
 #### Returns
 
   \| `void`
-  \| [`CleanupFn`](../../type-aliases/CleanupFn.md)
-  \| [`SyncConfigRes`](../../type-aliases/SyncConfigRes.md)
+  \| [`CleanupFn`](../type-aliases/CleanupFn.md)
+  \| [`SyncConfigRes`](../type-aliases/SyncConfigRes.md)
diff --git a/docs/reference/interfaces/ThrottleStrategy.md b/docs/reference/interfaces/ThrottleStrategy.md
index e21a6f88e..0732d3b3a 100644
--- a/docs/reference/interfaces/ThrottleStrategy.md
+++ b/docs/reference/interfaces/ThrottleStrategy.md
@@ -11,7 +11,7 @@ Throttle strategy that spaces executions evenly over time
 
 ## Extends
 
-- [`BaseStrategy`](../BaseStrategy.md)\<`"throttle"`\>
+- [`BaseStrategy`](BaseStrategy.md)\<`"throttle"`\>
 
 ## Properties
 
@@ -27,7 +27,7 @@ Type discriminator for strategy identification
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`_type`](../BaseStrategy.md#_type)
+[`BaseStrategy`](BaseStrategy.md).[`_type`](BaseStrategy.md#_type)
 
 ***
 
@@ -48,7 +48,7 @@ Should be called when the strategy is no longer needed
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`cleanup`](../BaseStrategy.md#cleanup)
+[`BaseStrategy`](BaseStrategy.md).[`cleanup`](BaseStrategy.md#cleanup)
 
 ***
 
@@ -72,7 +72,7 @@ Execute a function according to the strategy's timing rules
 
 ##### fn
 
-() => [`Transaction`](../Transaction.md)\<`T`\>
+() => [`Transaction`](Transaction.md)\<`T`\>
 
 The function to execute
 
@@ -84,7 +84,7 @@ The result of the function execution (if applicable)
 
 #### Inherited from
 
-[`BaseStrategy`](../BaseStrategy.md).[`execute`](../BaseStrategy.md#execute)
+[`BaseStrategy`](BaseStrategy.md).[`execute`](BaseStrategy.md#execute)
 
 ***
 
diff --git a/docs/reference/interfaces/Transaction.md b/docs/reference/interfaces/Transaction.md
index 5ad434341..cffa50699 100644
--- a/docs/reference/interfaces/Transaction.md
+++ b/docs/reference/interfaces/Transaction.md
@@ -153,7 +153,7 @@ aligned with user intent.
 
 ##### mutations
 
-[`PendingMutation`](../PendingMutation.md)\<`any`, [`OperationType`](../../type-aliases/OperationType.md), [`Collection`](../Collection.md)\<`any`, `any`, `any`, `any`, `any`\>\>[]
+[`PendingMutation`](PendingMutation.md)\<`any`, [`OperationType`](../type-aliases/OperationType.md), [`Collection`](Collection.md)\<`any`, `any`, `any`, `any`, `any`\>\>[]
 
 Array of new mutations to apply
 
@@ -396,7 +396,7 @@ Defined in: [packages/db/src/transactions.ts:238](https://github.com/TanStack/db
 
 ##### newState
 
-[`TransactionState`](../../type-aliases/TransactionState.md)
+[`TransactionState`](../type-aliases/TransactionState.md)
 
 #### Returns
 
diff --git a/docs/reference/powersync-db-collection/classes/PowerSyncTransactor.md b/docs/reference/powersync-db-collection/classes/PowerSyncTransactor.md
index e06450b40..b13c77ec4 100644
--- a/docs/reference/powersync-db-collection/classes/PowerSyncTransactor.md
+++ b/docs/reference/powersync-db-collection/classes/PowerSyncTransactor.md
@@ -57,7 +57,7 @@ Defined in: [PowerSyncTransactor.ts:55](https://github.com/TanStack/db/blob/main
 
 ##### options
 
-[`TransactorOptions`](../../type-aliases/TransactorOptions.md)
+[`TransactorOptions`](../type-aliases/TransactorOptions.md)
 
 #### Returns
 
diff --git a/docs/reference/powersync-db-collection/functions/powerSyncCollectionOptions.md b/docs/reference/powersync-db-collection/functions/powerSyncCollectionOptions.md
index e18eebcb9..a6dba45f7 100644
--- a/docs/reference/powersync-db-collection/functions/powerSyncCollectionOptions.md
+++ b/docs/reference/powersync-db-collection/functions/powerSyncCollectionOptions.md
@@ -32,7 +32,7 @@ Input and Output types are the SQLite column types.
 
 ### Returns
 
-[`EnhancedPowerSyncCollectionConfig`](../../type-aliases/EnhancedPowerSyncCollectionConfig.md)\<`TTable`, `OptionalExtractedTable`\<`TTable`\>, `never`\>
+[`EnhancedPowerSyncCollectionConfig`](../type-aliases/EnhancedPowerSyncCollectionConfig.md)\<`TTable`, `OptionalExtractedTable`\<`TTable`\>, `never`\>
 
 ### Example
 
@@ -92,11 +92,11 @@ serializer specifications. Partial column overrides can be supplied to `serializ
 
 #### config
 
-`Omit`\<`BaseCollectionConfig`\<`ExtractedTable`\<`TTable`\>, `string`, `TSchema`, `UtilsRecord`, `any`\>, `"onInsert"` \| `"onUpdate"` \| `"onDelete"` \| `"getKey"`\> & `object` & [`SerializerConfig`](../../type-aliases/SerializerConfig.md)\<`InferOutput`\<`TSchema`\>, `ExtractedTable`\<`TTable`\>\> & `object`
+`Omit`\<`BaseCollectionConfig`\<`ExtractedTable`\<`TTable`\>, `string`, `TSchema`, `UtilsRecord`, `any`\>, `"onInsert"` \| `"onUpdate"` \| `"onDelete"` \| `"getKey"`\> & `object` & [`SerializerConfig`](../type-aliases/SerializerConfig.md)\<`InferOutput`\<`TSchema`\>, `ExtractedTable`\<`TTable`\>\> & `object`
 
 ### Returns
 
-`CollectionConfig`\<[`InferPowerSyncOutputType`](../../type-aliases/InferPowerSyncOutputType.md)\<`TTable`, `TSchema`\>, `string`, `TSchema`, `UtilsRecord`\> & `object` & `object`
+`CollectionConfig`\<[`InferPowerSyncOutputType`](../type-aliases/InferPowerSyncOutputType.md)\<`TTable`, `TSchema`\>, `string`, `TSchema`, `UtilsRecord`\> & `object` & `object`
 
 ### Example
 
@@ -169,11 +169,11 @@ serializer specifications. Partial column overrides can be supplied to `serializ
 
 #### config
 
-`Omit`\<`BaseCollectionConfig`\<`ExtractedTable`\<`TTable`\>, `string`, `TSchema`, `UtilsRecord`, `any`\>, `"onInsert"` \| `"onUpdate"` \| `"onDelete"` \| `"getKey"`\> & `object` & [`SerializerConfig`](../../type-aliases/SerializerConfig.md)\<`InferOutput`\<`TSchema`\>, `ExtractedTable`\<`TTable`\>\> & `object`
+`Omit`\<`BaseCollectionConfig`\<`ExtractedTable`\<`TTable`\>, `string`, `TSchema`, `UtilsRecord`, `any`\>, `"onInsert"` \| `"onUpdate"` \| `"onDelete"` \| `"getKey"`\> & `object` & [`SerializerConfig`](../type-aliases/SerializerConfig.md)\<`InferOutput`\<`TSchema`\>, `ExtractedTable`\<`TTable`\>\> & `object`
 
 ### Returns
 
-`CollectionConfig`\<[`InferPowerSyncOutputType`](../../type-aliases/InferPowerSyncOutputType.md)\<`TTable`, `TSchema`\>, `string`, `TSchema`, `UtilsRecord`\> & `object` & `object`
+`CollectionConfig`\<[`InferPowerSyncOutputType`](../type-aliases/InferPowerSyncOutputType.md)\<`TTable`, `TSchema`\>, `string`, `TSchema`, `UtilsRecord`\> & `object` & `object`
 
 ### Example
 
diff --git a/docs/reference/powersync-db-collection/index.md b/docs/reference/powersync-db-collection/index.md
index c0894dac0..f6467856d 100644
--- a/docs/reference/powersync-db-collection/index.md
+++ b/docs/reference/powersync-db-collection/index.md
@@ -7,27 +7,27 @@ title: "@tanstack/powersync-db-collection"
 
 ## Classes
 
-- [PowerSyncTransactor](../classes/PowerSyncTransactor.md)
+- [PowerSyncTransactor](classes/PowerSyncTransactor.md)
 
 ## Type Aliases
 
-- [BasePowerSyncCollectionConfig](../type-aliases/BasePowerSyncCollectionConfig.md)
-- [ConfigWithArbitraryCollectionTypes](../type-aliases/ConfigWithArbitraryCollectionTypes.md)
-- [ConfigWithSQLiteInputType](../type-aliases/ConfigWithSQLiteInputType.md)
-- [ConfigWithSQLiteTypes](../type-aliases/ConfigWithSQLiteTypes.md)
-- [CustomSQLiteSerializer](../type-aliases/CustomSQLiteSerializer.md)
-- [EnhancedPowerSyncCollectionConfig](../type-aliases/EnhancedPowerSyncCollectionConfig.md)
-- [InferPowerSyncOutputType](../type-aliases/InferPowerSyncOutputType.md)
-- [PowerSyncCollectionConfig](../type-aliases/PowerSyncCollectionConfig.md)
-- [PowerSyncCollectionMeta](../type-aliases/PowerSyncCollectionMeta.md)
-- [PowerSyncCollectionUtils](../type-aliases/PowerSyncCollectionUtils.md)
-- [SerializerConfig](../type-aliases/SerializerConfig.md)
-- [TransactorOptions](../type-aliases/TransactorOptions.md)
+- [BasePowerSyncCollectionConfig](type-aliases/BasePowerSyncCollectionConfig.md)
+- [ConfigWithArbitraryCollectionTypes](type-aliases/ConfigWithArbitraryCollectionTypes.md)
+- [ConfigWithSQLiteInputType](type-aliases/ConfigWithSQLiteInputType.md)
+- [ConfigWithSQLiteTypes](type-aliases/ConfigWithSQLiteTypes.md)
+- [CustomSQLiteSerializer](type-aliases/CustomSQLiteSerializer.md)
+- [EnhancedPowerSyncCollectionConfig](type-aliases/EnhancedPowerSyncCollectionConfig.md)
+- [InferPowerSyncOutputType](type-aliases/InferPowerSyncOutputType.md)
+- [PowerSyncCollectionConfig](type-aliases/PowerSyncCollectionConfig.md)
+- [PowerSyncCollectionMeta](type-aliases/PowerSyncCollectionMeta.md)
+- [PowerSyncCollectionUtils](type-aliases/PowerSyncCollectionUtils.md)
+- [SerializerConfig](type-aliases/SerializerConfig.md)
+- [TransactorOptions](type-aliases/TransactorOptions.md)
 
 ## Variables
 
-- [DEFAULT\_BATCH\_SIZE](../variables/DEFAULT_BATCH_SIZE.md)
+- [DEFAULT\_BATCH\_SIZE](variables/DEFAULT_BATCH_SIZE.md)
 
 ## Functions
 
-- [powerSyncCollectionOptions](../functions/powerSyncCollectionOptions.md)
+- [powerSyncCollectionOptions](functions/powerSyncCollectionOptions.md)
diff --git a/docs/reference/powersync-db-collection/type-aliases/BasePowerSyncCollectionConfig.md b/docs/reference/powersync-db-collection/type-aliases/BasePowerSyncCollectionConfig.md
index ab1d26dcc..4966c6574 100644
--- a/docs/reference/powersync-db-collection/type-aliases/BasePowerSyncCollectionConfig.md
+++ b/docs/reference/powersync-db-collection/type-aliases/BasePowerSyncCollectionConfig.md
@@ -33,7 +33,7 @@ in-memory TanStack DB collection.
 
 #### Remarks
 
-- Defaults to [DEFAULT\_BATCH\_SIZE](../../variables/DEFAULT_BATCH_SIZE.md) if not specified.
+- Defaults to [DEFAULT\_BATCH\_SIZE](../variables/DEFAULT_BATCH_SIZE.md) if not specified.
 - Larger values reduce the number of round trips to the storage
   engine but increase memory usage per batch.
 - Smaller values may lower memory usage and allow earlier
diff --git a/docs/reference/powersync-db-collection/type-aliases/PowerSyncCollectionUtils.md b/docs/reference/powersync-db-collection/type-aliases/PowerSyncCollectionUtils.md
index 28ab62975..6657add36 100644
--- a/docs/reference/powersync-db-collection/type-aliases/PowerSyncCollectionUtils.md
+++ b/docs/reference/powersync-db-collection/type-aliases/PowerSyncCollectionUtils.md
@@ -31,4 +31,4 @@ Defined in: [definitions.ts:268](https://github.com/TanStack/db/blob/main/packag
 
 #### Returns
 
-[`PowerSyncCollectionMeta`](../PowerSyncCollectionMeta.md)\<`TTable`\>
+[`PowerSyncCollectionMeta`](PowerSyncCollectionMeta.md)\<`TTable`\>
diff --git a/docs/reference/powersync-db-collection/type-aliases/SerializerConfig.md b/docs/reference/powersync-db-collection/type-aliases/SerializerConfig.md
index f437cdbf2..2ce69107c 100644
--- a/docs/reference/powersync-db-collection/type-aliases/SerializerConfig.md
+++ b/docs/reference/powersync-db-collection/type-aliases/SerializerConfig.md
@@ -58,7 +58,7 @@ Defined in: [definitions.ts:87](https://github.com/TanStack/db/blob/main/package
 Optional partial serializer object for customizing how individual columns are serialized for SQLite.
 
 This should be a partial map of column keys to serialization functions, following the
-[CustomSQLiteSerializer](../CustomSQLiteSerializer.md) type. Each function receives the column value and returns a value
+[CustomSQLiteSerializer](CustomSQLiteSerializer.md) type. Each function receives the column value and returns a value
 compatible with SQLite storage.
 
 If not provided for a column, the default behavior is used:
diff --git a/docs/reference/powersync-db-collection/variables/DEFAULT_BATCH_SIZE.md b/docs/reference/powersync-db-collection/variables/DEFAULT_BATCH_SIZE.md
index 46f9f447a..16054c0b3 100644
--- a/docs/reference/powersync-db-collection/variables/DEFAULT_BATCH_SIZE.md
+++ b/docs/reference/powersync-db-collection/variables/DEFAULT_BATCH_SIZE.md
@@ -11,4 +11,4 @@ const DEFAULT_BATCH_SIZE: 1000 = 1000;
 
 Defined in: [definitions.ts:274](https://github.com/TanStack/db/blob/main/packages/powersync-db-collection/src/definitions.ts#L274)
 
-Default value for [PowerSyncCollectionConfig#syncBatchSize](../../type-aliases/BasePowerSyncCollectionConfig.md).
+Default value for [PowerSyncCollectionConfig#syncBatchSize](../type-aliases/BasePowerSyncCollectionConfig.md).
diff --git a/docs/reference/query-db-collection/classes/DeleteOperationItemNotFoundError.md b/docs/reference/query-db-collection/classes/DeleteOperationItemNotFoundError.md
index 34fa05249..ed4d24c84 100644
--- a/docs/reference/query-db-collection/classes/DeleteOperationItemNotFoundError.md
+++ b/docs/reference/query-db-collection/classes/DeleteOperationItemNotFoundError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:76](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:77](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/DuplicateKeyInBatchError.md b/docs/reference/query-db-collection/classes/DuplicateKeyInBatchError.md
index 7e04fe138..8c6038af9 100644
--- a/docs/reference/query-db-collection/classes/DuplicateKeyInBatchError.md
+++ b/docs/reference/query-db-collection/classes/DuplicateKeyInBatchError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:62](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:63](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/GetKeyRequiredError.md b/docs/reference/query-db-collection/classes/GetKeyRequiredError.md
index 6a02f66e5..adb0bb685 100644
--- a/docs/reference/query-db-collection/classes/GetKeyRequiredError.md
+++ b/docs/reference/query-db-collection/classes/GetKeyRequiredError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:32](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:33](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/InvalidItemStructureError.md b/docs/reference/query-db-collection/classes/InvalidItemStructureError.md
index be43e7c39..bc37f4f43 100644
--- a/docs/reference/query-db-collection/classes/InvalidItemStructureError.md
+++ b/docs/reference/query-db-collection/classes/InvalidItemStructureError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:48](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:49](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/InvalidSyncOperationError.md b/docs/reference/query-db-collection/classes/InvalidSyncOperationError.md
index 12f97f90f..9643105fc 100644
--- a/docs/reference/query-db-collection/classes/InvalidSyncOperationError.md
+++ b/docs/reference/query-db-collection/classes/InvalidSyncOperationError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:83](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:84](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/ItemNotFoundError.md b/docs/reference/query-db-collection/classes/ItemNotFoundError.md
index 682e70337..a9c7f9a17 100644
--- a/docs/reference/query-db-collection/classes/ItemNotFoundError.md
+++ b/docs/reference/query-db-collection/classes/ItemNotFoundError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:55](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:56](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/MissingKeyFieldError.md b/docs/reference/query-db-collection/classes/MissingKeyFieldError.md
index 6a0e666f3..a1ee4accc 100644
--- a/docs/reference/query-db-collection/classes/MissingKeyFieldError.md
+++ b/docs/reference/query-db-collection/classes/MissingKeyFieldError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:97](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -37,7 +37,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:98](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -51,7 +51,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -65,7 +65,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -79,7 +79,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -93,7 +93,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -117,7 +117,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -189,7 +189,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -221,4 +221,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/QueryClientRequiredError.md b/docs/reference/query-db-collection/classes/QueryClientRequiredError.md
index bfd900f4b..cf983aae2 100644
--- a/docs/reference/query-db-collection/classes/QueryClientRequiredError.md
+++ b/docs/reference/query-db-collection/classes/QueryClientRequiredError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:25](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:26](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/QueryCollectionError.md b/docs/reference/query-db-collection/classes/QueryCollectionError.md
index 83b6c2d31..4e443177e 100644
--- a/docs/reference/query-db-collection/classes/QueryCollectionError.md
+++ b/docs/reference/query-db-collection/classes/QueryCollectionError.md
@@ -13,19 +13,19 @@ Defined in: [packages/query-db-collection/src/errors.ts:4](https://github.com/Ta
 
 ## Extended by
 
-- [`QueryKeyRequiredError`](../QueryKeyRequiredError.md)
-- [`QueryFnRequiredError`](../QueryFnRequiredError.md)
-- [`QueryClientRequiredError`](../QueryClientRequiredError.md)
-- [`GetKeyRequiredError`](../GetKeyRequiredError.md)
-- [`SyncNotInitializedError`](../SyncNotInitializedError.md)
-- [`InvalidItemStructureError`](../InvalidItemStructureError.md)
-- [`ItemNotFoundError`](../ItemNotFoundError.md)
-- [`DuplicateKeyInBatchError`](../DuplicateKeyInBatchError.md)
-- [`UpdateOperationItemNotFoundError`](../UpdateOperationItemNotFoundError.md)
-- [`DeleteOperationItemNotFoundError`](../DeleteOperationItemNotFoundError.md)
-- [`InvalidSyncOperationError`](../InvalidSyncOperationError.md)
-- [`UnknownOperationTypeError`](../UnknownOperationTypeError.md)
-- [`MissingKeyFieldError`](../MissingKeyFieldError.md)
+- [`QueryKeyRequiredError`](QueryKeyRequiredError.md)
+- [`QueryFnRequiredError`](QueryFnRequiredError.md)
+- [`QueryClientRequiredError`](QueryClientRequiredError.md)
+- [`GetKeyRequiredError`](GetKeyRequiredError.md)
+- [`SyncNotInitializedError`](SyncNotInitializedError.md)
+- [`InvalidItemStructureError`](InvalidItemStructureError.md)
+- [`ItemNotFoundError`](ItemNotFoundError.md)
+- [`DuplicateKeyInBatchError`](DuplicateKeyInBatchError.md)
+- [`UpdateOperationItemNotFoundError`](UpdateOperationItemNotFoundError.md)
+- [`DeleteOperationItemNotFoundError`](DeleteOperationItemNotFoundError.md)
+- [`InvalidSyncOperationError`](InvalidSyncOperationError.md)
+- [`UnknownOperationTypeError`](UnknownOperationTypeError.md)
+- [`MissingKeyFieldError`](MissingKeyFieldError.md)
 
 ## Constructors
 
diff --git a/docs/reference/query-db-collection/classes/QueryFnRequiredError.md b/docs/reference/query-db-collection/classes/QueryFnRequiredError.md
index 4ba61732f..8acbcf589 100644
--- a/docs/reference/query-db-collection/classes/QueryFnRequiredError.md
+++ b/docs/reference/query-db-collection/classes/QueryFnRequiredError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:18](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:19](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/QueryKeyRequiredError.md b/docs/reference/query-db-collection/classes/QueryKeyRequiredError.md
index 3988a0acb..fdbbafa46 100644
--- a/docs/reference/query-db-collection/classes/QueryKeyRequiredError.md
+++ b/docs/reference/query-db-collection/classes/QueryKeyRequiredError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:11](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:12](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/SyncNotInitializedError.md b/docs/reference/query-db-collection/classes/SyncNotInitializedError.md
index 8adee5e9a..25a501e89 100644
--- a/docs/reference/query-db-collection/classes/SyncNotInitializedError.md
+++ b/docs/reference/query-db-collection/classes/SyncNotInitializedError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:39](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -27,7 +27,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:40](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -41,7 +41,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -55,7 +55,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -69,7 +69,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -83,7 +83,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -107,7 +107,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -179,7 +179,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -211,4 +211,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/UnknownOperationTypeError.md b/docs/reference/query-db-collection/classes/UnknownOperationTypeError.md
index f3bb18fdd..0fd2aab5c 100644
--- a/docs/reference/query-db-collection/classes/UnknownOperationTypeError.md
+++ b/docs/reference/query-db-collection/classes/UnknownOperationTypeError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:90](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:91](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/classes/UpdateOperationItemNotFoundError.md b/docs/reference/query-db-collection/classes/UpdateOperationItemNotFoundError.md
index 2745b0a98..3a86f840e 100644
--- a/docs/reference/query-db-collection/classes/UpdateOperationItemNotFoundError.md
+++ b/docs/reference/query-db-collection/classes/UpdateOperationItemNotFoundError.md
@@ -9,7 +9,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:69](https://github.com/T
 
 ## Extends
 
-- [`QueryCollectionError`](../QueryCollectionError.md)
+- [`QueryCollectionError`](QueryCollectionError.md)
 
 ## Constructors
 
@@ -33,7 +33,7 @@ Defined in: [packages/query-db-collection/src/errors.ts:70](https://github.com/T
 
 #### Overrides
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`constructor`](../QueryCollectionError.md#constructor)
+[`QueryCollectionError`](QueryCollectionError.md).[`constructor`](QueryCollectionError.md#constructor)
 
 ## Properties
 
@@ -47,7 +47,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`cause`](../QueryCollectionError.md#cause)
+[`QueryCollectionError`](QueryCollectionError.md).[`cause`](QueryCollectionError.md#cause)
 
 ***
 
@@ -61,7 +61,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`message`](../QueryCollectionError.md#message)
+[`QueryCollectionError`](QueryCollectionError.md).[`message`](QueryCollectionError.md#message)
 
 ***
 
@@ -75,7 +75,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`name`](../QueryCollectionError.md#name)
+[`QueryCollectionError`](QueryCollectionError.md).[`name`](QueryCollectionError.md#name)
 
 ***
 
@@ -89,7 +89,7 @@ Defined in: node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/li
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stack`](../QueryCollectionError.md#stack)
+[`QueryCollectionError`](QueryCollectionError.md).[`stack`](QueryCollectionError.md#stack)
 
 ***
 
@@ -113,7 +113,7 @@ not capture any frames.
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`stackTraceLimit`](../QueryCollectionError.md#stacktracelimit)
+[`QueryCollectionError`](QueryCollectionError.md).[`stackTraceLimit`](QueryCollectionError.md#stacktracelimit)
 
 ## Methods
 
@@ -185,7 +185,7 @@ a();
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`captureStackTrace`](../QueryCollectionError.md#capturestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`captureStackTrace`](QueryCollectionError.md#capturestacktrace)
 
 ***
 
@@ -217,4 +217,4 @@ https://v8.dev/docs/stack-trace-api#customizing-stack-traces
 
 #### Inherited from
 
-[`QueryCollectionError`](../QueryCollectionError.md).[`prepareStackTrace`](../QueryCollectionError.md#preparestacktrace)
+[`QueryCollectionError`](QueryCollectionError.md).[`prepareStackTrace`](QueryCollectionError.md#preparestacktrace)
diff --git a/docs/reference/query-db-collection/functions/queryCollectionOptions.md b/docs/reference/query-db-collection/functions/queryCollectionOptions.md
index 36fe817f4..3aab0096f 100644
--- a/docs/reference/query-db-collection/functions/queryCollectionOptions.md
+++ b/docs/reference/query-db-collection/functions/queryCollectionOptions.md
@@ -11,7 +11,7 @@ title: queryCollectionOptions
 function queryCollectionOptions<T, TQueryFn, TError, TQueryKey, TKey, TQueryData>(config): CollectionConfig<InferSchemaOutput<T>, TKey, T, QueryCollectionUtils<InferSchemaOutput<T>, TKey, InferSchemaInput<T>, TError>> & object;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:393](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L393)
+Defined in: [packages/query-db-collection/src/query.ts:394](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L394)
 
 Creates query collection options for use with a standard Collection.
 This integrates TanStack Query with TanStack DB for automatic synchronization.
@@ -58,13 +58,13 @@ The type of the item keys
 
 #### config
 
-[`QueryCollectionConfig`](../../interfaces/QueryCollectionConfig.md)\<`InferSchemaOutput`\<`T`\>, `TQueryFn`, `TError`, `TQueryKey`, `TKey`, `T`, `Awaited`\<`ReturnType`\<`TQueryFn`\>\>\> & `object`
+[`QueryCollectionConfig`](../interfaces/QueryCollectionConfig.md)\<`InferSchemaOutput`\<`T`\>, `TQueryFn`, `TError`, `TQueryKey`, `TKey`, `T`, `Awaited`\<`ReturnType`\<`TQueryFn`\>\>\> & `object`
 
 Configuration options for the Query collection
 
 ### Returns
 
-`CollectionConfig`\<`InferSchemaOutput`\<`T`\>, `TKey`, `T`, [`QueryCollectionUtils`](../../interfaces/QueryCollectionUtils.md)\<`InferSchemaOutput`\<`T`\>, `TKey`, `InferSchemaInput`\<`T`\>, `TError`\>\> & `object`
+`CollectionConfig`\<`InferSchemaOutput`\<`T`\>, `TKey`, `T`, [`QueryCollectionUtils`](../interfaces/QueryCollectionUtils.md)\<`InferSchemaOutput`\<`T`\>, `TKey`, `InferSchemaInput`\<`T`\>, `TError`\>\> & `object`
 
 Collection options with utilities for direct writes and manual operations
 
@@ -151,7 +151,7 @@ const todosCollection = createCollection(
 function queryCollectionOptions<T, TQueryFn, TError, TQueryKey, TKey, TQueryData>(config): CollectionConfig<T, TKey, never, QueryCollectionUtils<T, TKey, T, TError>> & object;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:428](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L428)
+Defined in: [packages/query-db-collection/src/query.ts:429](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L429)
 
 Creates query collection options for use with a standard Collection.
 This integrates TanStack Query with TanStack DB for automatic synchronization.
@@ -198,13 +198,13 @@ The type of the item keys
 
 #### config
 
-[`QueryCollectionConfig`](../../interfaces/QueryCollectionConfig.md)\<`T`, `TQueryFn`, `TError`, `TQueryKey`, `TKey`, `never`, `TQueryData`\> & `object`
+[`QueryCollectionConfig`](../interfaces/QueryCollectionConfig.md)\<`T`, `TQueryFn`, `TError`, `TQueryKey`, `TKey`, `never`, `TQueryData`\> & `object`
 
 Configuration options for the Query collection
 
 ### Returns
 
-`CollectionConfig`\<`T`, `TKey`, `never`, [`QueryCollectionUtils`](../../interfaces/QueryCollectionUtils.md)\<`T`, `TKey`, `T`, `TError`\>\> & `object`
+`CollectionConfig`\<`T`, `TKey`, `never`, [`QueryCollectionUtils`](../interfaces/QueryCollectionUtils.md)\<`T`, `TKey`, `T`, `TError`\>\> & `object`
 
 Collection options with utilities for direct writes and manual operations
 
@@ -291,7 +291,7 @@ const todosCollection = createCollection(
 function queryCollectionOptions<T, TError, TQueryKey, TKey>(config): CollectionConfig<InferSchemaOutput<T>, TKey, T, QueryCollectionUtils<InferSchemaOutput<T>, TKey, InferSchemaInput<T>, TError>> & object;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:461](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L461)
+Defined in: [packages/query-db-collection/src/query.ts:462](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L462)
 
 Creates query collection options for use with a standard Collection.
 This integrates TanStack Query with TanStack DB for automatic synchronization.
@@ -330,13 +330,13 @@ The type of the item keys
 
 #### config
 
-[`QueryCollectionConfig`](../../interfaces/QueryCollectionConfig.md)\<`InferSchemaOutput`\<`T`\>, (`context`) => `Promise`\<`InferSchemaOutput`\<`T`\>[]\>, `TError`, `TQueryKey`, `TKey`, `T`, `InferSchemaOutput`\<`T`\>[]\> & `object`
+[`QueryCollectionConfig`](../interfaces/QueryCollectionConfig.md)\<`InferSchemaOutput`\<`T`\>, (`context`) => `Promise`\<`InferSchemaOutput`\<`T`\>[]\>, `TError`, `TQueryKey`, `TKey`, `T`, `InferSchemaOutput`\<`T`\>[]\> & `object`
 
 Configuration options for the Query collection
 
 ### Returns
 
-`CollectionConfig`\<`InferSchemaOutput`\<`T`\>, `TKey`, `T`, [`QueryCollectionUtils`](../../interfaces/QueryCollectionUtils.md)\<`InferSchemaOutput`\<`T`\>, `TKey`, `InferSchemaInput`\<`T`\>, `TError`\>\> & `object`
+`CollectionConfig`\<`InferSchemaOutput`\<`T`\>, `TKey`, `T`, [`QueryCollectionUtils`](../interfaces/QueryCollectionUtils.md)\<`InferSchemaOutput`\<`T`\>, `TKey`, `InferSchemaInput`\<`T`\>, `TError`\>\> & `object`
 
 Collection options with utilities for direct writes and manual operations
 
@@ -423,7 +423,7 @@ const todosCollection = createCollection(
 function queryCollectionOptions<T, TError, TQueryKey, TKey>(config): CollectionConfig<T, TKey, never, QueryCollectionUtils<T, TKey, T, TError>> & object;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:495](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L495)
+Defined in: [packages/query-db-collection/src/query.ts:496](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L496)
 
 Creates query collection options for use with a standard Collection.
 This integrates TanStack Query with TanStack DB for automatic synchronization.
@@ -462,13 +462,13 @@ The type of the item keys
 
 #### config
 
-[`QueryCollectionConfig`](../../interfaces/QueryCollectionConfig.md)\<`T`, (`context`) => `Promise`\<`T`[]\>, `TError`, `TQueryKey`, `TKey`, `never`, `T`[]\> & `object`
+[`QueryCollectionConfig`](../interfaces/QueryCollectionConfig.md)\<`T`, (`context`) => `Promise`\<`T`[]\>, `TError`, `TQueryKey`, `TKey`, `never`, `T`[]\> & `object`
 
 Configuration options for the Query collection
 
 ### Returns
 
-`CollectionConfig`\<`T`, `TKey`, `never`, [`QueryCollectionUtils`](../../interfaces/QueryCollectionUtils.md)\<`T`, `TKey`, `T`, `TError`\>\> & `object`
+`CollectionConfig`\<`T`, `TKey`, `never`, [`QueryCollectionUtils`](../interfaces/QueryCollectionUtils.md)\<`T`, `TKey`, `T`, `TError`\>\> & `object`
 
 Collection options with utilities for direct writes and manual operations
 
diff --git a/docs/reference/query-db-collection/index.md b/docs/reference/query-db-collection/index.md
index c75c60703..569ee31dd 100644
--- a/docs/reference/query-db-collection/index.md
+++ b/docs/reference/query-db-collection/index.md
@@ -7,31 +7,31 @@ title: "@tanstack/query-db-collection"
 
 ## Classes
 
-- [DeleteOperationItemNotFoundError](../classes/DeleteOperationItemNotFoundError.md)
-- [DuplicateKeyInBatchError](../classes/DuplicateKeyInBatchError.md)
-- [GetKeyRequiredError](../classes/GetKeyRequiredError.md)
-- [InvalidItemStructureError](../classes/InvalidItemStructureError.md)
-- [InvalidSyncOperationError](../classes/InvalidSyncOperationError.md)
-- [ItemNotFoundError](../classes/ItemNotFoundError.md)
-- [MissingKeyFieldError](../classes/MissingKeyFieldError.md)
-- [QueryClientRequiredError](../classes/QueryClientRequiredError.md)
-- [QueryCollectionError](../classes/QueryCollectionError.md)
-- [QueryFnRequiredError](../classes/QueryFnRequiredError.md)
-- [QueryKeyRequiredError](../classes/QueryKeyRequiredError.md)
-- [SyncNotInitializedError](../classes/SyncNotInitializedError.md)
-- [UnknownOperationTypeError](../classes/UnknownOperationTypeError.md)
-- [UpdateOperationItemNotFoundError](../classes/UpdateOperationItemNotFoundError.md)
+- [DeleteOperationItemNotFoundError](classes/DeleteOperationItemNotFoundError.md)
+- [DuplicateKeyInBatchError](classes/DuplicateKeyInBatchError.md)
+- [GetKeyRequiredError](classes/GetKeyRequiredError.md)
+- [InvalidItemStructureError](classes/InvalidItemStructureError.md)
+- [InvalidSyncOperationError](classes/InvalidSyncOperationError.md)
+- [ItemNotFoundError](classes/ItemNotFoundError.md)
+- [MissingKeyFieldError](classes/MissingKeyFieldError.md)
+- [QueryClientRequiredError](classes/QueryClientRequiredError.md)
+- [QueryCollectionError](classes/QueryCollectionError.md)
+- [QueryFnRequiredError](classes/QueryFnRequiredError.md)
+- [QueryKeyRequiredError](classes/QueryKeyRequiredError.md)
+- [SyncNotInitializedError](classes/SyncNotInitializedError.md)
+- [UnknownOperationTypeError](classes/UnknownOperationTypeError.md)
+- [UpdateOperationItemNotFoundError](classes/UpdateOperationItemNotFoundError.md)
 
 ## Interfaces
 
-- [QueryCollectionConfig](../interfaces/QueryCollectionConfig.md)
-- [QueryCollectionMeta](../interfaces/QueryCollectionMeta.md)
-- [QueryCollectionUtils](../interfaces/QueryCollectionUtils.md)
+- [QueryCollectionConfig](interfaces/QueryCollectionConfig.md)
+- [QueryCollectionMeta](interfaces/QueryCollectionMeta.md)
+- [QueryCollectionUtils](interfaces/QueryCollectionUtils.md)
 
 ## Type Aliases
 
-- [SyncOperation](../type-aliases/SyncOperation.md)
+- [SyncOperation](type-aliases/SyncOperation.md)
 
 ## Functions
 
-- [queryCollectionOptions](../functions/queryCollectionOptions.md)
+- [queryCollectionOptions](functions/queryCollectionOptions.md)
diff --git a/docs/reference/query-db-collection/interfaces/QueryCollectionConfig.md b/docs/reference/query-db-collection/interfaces/QueryCollectionConfig.md
index f2c1b8498..710db1ee9 100644
--- a/docs/reference/query-db-collection/interfaces/QueryCollectionConfig.md
+++ b/docs/reference/query-db-collection/interfaces/QueryCollectionConfig.md
@@ -5,7 +5,7 @@ title: QueryCollectionConfig
 
 # Interface: QueryCollectionConfig\<T, TQueryFn, TError, TQueryKey, TKey, TSchema, TQueryData\>
 
-Defined in: [packages/query-db-collection/src/query.ts:59](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L59)
+Defined in: [packages/query-db-collection/src/query.ts:60](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L60)
 
 Configuration options for creating a Query Collection
 
@@ -63,7 +63,7 @@ The schema type for validation
 optional enabled: boolean;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:85](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L85)
+Defined in: [packages/query-db-collection/src/query.ts:86](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L86)
 
 Whether the query should automatically run (default: true)
 
@@ -75,7 +75,7 @@ Whether the query should automatically run (default: true)
 optional meta: Record<string, unknown>;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:135](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L135)
+Defined in: [packages/query-db-collection/src/query.ts:136](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L136)
 
 Metadata to pass to the query.
 Available in queryFn via context.meta
@@ -107,7 +107,7 @@ meta: {
 queryClient: QueryClient;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:81](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L81)
+Defined in: [packages/query-db-collection/src/query.ts:82](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L82)
 
 The TanStack Query client instance
 
@@ -119,7 +119,7 @@ The TanStack Query client instance
 queryFn: TQueryFn extends (context) => Promise<any[]> ? (context) => Promise<T[]> : TQueryFn;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:73](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L73)
+Defined in: [packages/query-db-collection/src/query.ts:74](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L74)
 
 Function that fetches data from the server. Must return the complete collection state
 
@@ -131,7 +131,7 @@ Function that fetches data from the server. Must return the complete collection
 queryKey: TQueryKey | TQueryKeyBuilder<TQueryKey>;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:71](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L71)
+Defined in: [packages/query-db-collection/src/query.ts:72](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L72)
 
 The query key used by TanStack Query to identify this query
 
@@ -143,7 +143,7 @@ The query key used by TanStack Query to identify this query
 optional refetchInterval: number | false | (query) => number | false | undefined;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:86](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L86)
+Defined in: [packages/query-db-collection/src/query.ts:87](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L87)
 
 ***
 
@@ -153,7 +153,7 @@ Defined in: [packages/query-db-collection/src/query.ts:86](https://github.com/Ta
 optional retry: RetryValue<TError>;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:93](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L93)
+Defined in: [packages/query-db-collection/src/query.ts:94](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L94)
 
 ***
 
@@ -163,7 +163,7 @@ Defined in: [packages/query-db-collection/src/query.ts:93](https://github.com/Ta
 optional retryDelay: RetryDelayValue<TError>;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:100](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L100)
+Defined in: [packages/query-db-collection/src/query.ts:101](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L101)
 
 ***
 
@@ -173,7 +173,7 @@ Defined in: [packages/query-db-collection/src/query.ts:100](https://github.com/T
 optional select: (data) => T[];
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:79](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L79)
+Defined in: [packages/query-db-collection/src/query.ts:80](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L80)
 
 #### Parameters
 
@@ -193,4 +193,4 @@ Defined in: [packages/query-db-collection/src/query.ts:79](https://github.com/Ta
 optional staleTime: StaleTimeFunction<T[], TError, T[], TQueryKey>;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:107](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L107)
+Defined in: [packages/query-db-collection/src/query.ts:108](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L108)
diff --git a/docs/reference/query-db-collection/interfaces/QueryCollectionUtils.md b/docs/reference/query-db-collection/interfaces/QueryCollectionUtils.md
index 47cb7ea56..2385eca11 100644
--- a/docs/reference/query-db-collection/interfaces/QueryCollectionUtils.md
+++ b/docs/reference/query-db-collection/interfaces/QueryCollectionUtils.md
@@ -5,7 +5,7 @@ title: QueryCollectionUtils
 
 # Interface: QueryCollectionUtils\<TItem, TKey, TInsertInput, TError\>
 
-Defined in: [packages/query-db-collection/src/query.ts:154](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L154)
+Defined in: [packages/query-db-collection/src/query.ts:155](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L155)
 
 Utility methods available on Query Collections for direct writes and manual operations.
 Direct writes bypass the normal query/mutation flow and write directly to the synced data store.
@@ -54,7 +54,7 @@ The type of errors that can occur during queries
 clearError: () => Promise<void>;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:199](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L199)
+Defined in: [packages/query-db-collection/src/query.ts:200](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L200)
 
 Clear the error state and trigger a refetch of the query
 
@@ -76,7 +76,7 @@ Error if the refetch fails
 dataUpdatedAt: number;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:190](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L190)
+Defined in: [packages/query-db-collection/src/query.ts:191](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L191)
 
 Get timestamp of last successful data update (in milliseconds)
 
@@ -88,7 +88,7 @@ Get timestamp of last successful data update (in milliseconds)
 errorCount: number;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:182](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L182)
+Defined in: [packages/query-db-collection/src/query.ts:183](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L183)
 
 Get the number of consecutive sync failures.
 Incremented only when query fails completely (not per retry attempt); reset on success.
@@ -101,7 +101,7 @@ Incremented only when query fails completely (not per retry attempt); reset on s
 fetchStatus: "idle" | "fetching" | "paused";
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:192](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L192)
+Defined in: [packages/query-db-collection/src/query.ts:193](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L193)
 
 Get current fetch status
 
@@ -113,7 +113,7 @@ Get current fetch status
 isError: boolean;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:177](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L177)
+Defined in: [packages/query-db-collection/src/query.ts:178](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L178)
 
 Check if the collection is in an error state
 
@@ -125,7 +125,7 @@ Check if the collection is in an error state
 isFetching: boolean;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:184](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L184)
+Defined in: [packages/query-db-collection/src/query.ts:185](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L185)
 
 Check if query is currently fetching (initial or background)
 
@@ -137,7 +137,7 @@ Check if query is currently fetching (initial or background)
 isLoading: boolean;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:188](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L188)
+Defined in: [packages/query-db-collection/src/query.ts:189](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L189)
 
 Check if query is loading for the first time (no data yet)
 
@@ -149,7 +149,7 @@ Check if query is loading for the first time (no data yet)
 isRefetching: boolean;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:186](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L186)
+Defined in: [packages/query-db-collection/src/query.ts:187](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L187)
 
 Check if query is refetching in background (not initial fetch)
 
@@ -161,7 +161,7 @@ Check if query is refetching in background (not initial fetch)
 lastError: TError | undefined;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:175](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L175)
+Defined in: [packages/query-db-collection/src/query.ts:176](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L176)
 
 Get the last error encountered by the query (if any); reset on success
 
@@ -173,7 +173,7 @@ Get the last error encountered by the query (if any); reset on success
 refetch: RefetchFn;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:161](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L161)
+Defined in: [packages/query-db-collection/src/query.ts:162](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L162)
 
 Manually trigger a refetch of the query
 
@@ -185,7 +185,7 @@ Manually trigger a refetch of the query
 writeBatch: (callback) => void;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:171](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L171)
+Defined in: [packages/query-db-collection/src/query.ts:172](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L172)
 
 Execute multiple write operations as a single atomic batch to the synced data store
 
@@ -207,7 +207,7 @@ Execute multiple write operations as a single atomic batch to the synced data st
 writeDelete: (keys) => void;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:167](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L167)
+Defined in: [packages/query-db-collection/src/query.ts:168](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L168)
 
 Delete one or more items directly from the synced data store without triggering a query refetch or optimistic update
 
@@ -229,7 +229,7 @@ Delete one or more items directly from the synced data store without triggering
 writeInsert: (data) => void;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:163](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L163)
+Defined in: [packages/query-db-collection/src/query.ts:164](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L164)
 
 Insert one or more items directly into the synced data store without triggering a query refetch or optimistic update
 
@@ -251,7 +251,7 @@ Insert one or more items directly into the synced data store without triggering
 writeUpdate: (updates) => void;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:165](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L165)
+Defined in: [packages/query-db-collection/src/query.ts:166](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L166)
 
 Update one or more items directly in the synced data store without triggering a query refetch or optimistic update
 
@@ -273,7 +273,7 @@ Update one or more items directly in the synced data store without triggering a
 writeUpsert: (data) => void;
 ```
 
-Defined in: [packages/query-db-collection/src/query.ts:169](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L169)
+Defined in: [packages/query-db-collection/src/query.ts:170](https://github.com/TanStack/db/blob/main/packages/query-db-collection/src/query.ts#L170)
 
 Insert or update one or more items directly in the synced data store without triggering a query refetch or optimistic update
 
diff --git a/docs/reference/type-aliases/ChangeListener.md b/docs/reference/type-aliases/ChangeListener.md
index 5c5950806..6a393f0f9 100644
--- a/docs/reference/type-aliases/ChangeListener.md
+++ b/docs/reference/type-aliases/ChangeListener.md
@@ -9,7 +9,7 @@ title: ChangeListener
 type ChangeListener<T, TKey> = (changes) => void;
 ```
 
-Defined in: [packages/db/src/types.ts:780](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L780)
+Defined in: [packages/db/src/types.ts:835](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L835)
 
 Function type for listening to collection changes
 
@@ -27,7 +27,7 @@ Function type for listening to collection changes
 
 ### changes
 
-[`ChangeMessage`](../../interfaces/ChangeMessage.md)\<`T`, `TKey`\>[]
+[`ChangeMessage`](../interfaces/ChangeMessage.md)\<`T`, `TKey`\>[]
 
 Array of change messages describing what happened
 
diff --git a/docs/reference/type-aliases/ChangeMessageOrDeleteKeyMessage.md b/docs/reference/type-aliases/ChangeMessageOrDeleteKeyMessage.md
new file mode 100644
index 000000000..74c5078f6
--- /dev/null
+++ b/docs/reference/type-aliases/ChangeMessageOrDeleteKeyMessage.md
@@ -0,0 +1,24 @@
+---
+id: ChangeMessageOrDeleteKeyMessage
+title: ChangeMessageOrDeleteKeyMessage
+---
+
+# Type Alias: ChangeMessageOrDeleteKeyMessage\<T, TKey\>
+
+```ts
+type ChangeMessageOrDeleteKeyMessage<T, TKey> = 
+  | Omit<ChangeMessage<T>, "key">
+| DeleteKeyMessage<TKey>;
+```
+
+Defined in: [packages/db/src/types.ts:369](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L369)
+
+## Type Parameters
+
+### T
+
+`T` *extends* `object` = `Record`\<`string`, `unknown`\>
+
+### TKey
+
+`TKey` *extends* `string` \| `number` = `string` \| `number`
diff --git a/docs/reference/type-aliases/ChangesPayload.md b/docs/reference/type-aliases/ChangesPayload.md
index 492558932..05ba48656 100644
--- a/docs/reference/type-aliases/ChangesPayload.md
+++ b/docs/reference/type-aliases/ChangesPayload.md
@@ -9,7 +9,7 @@ title: ChangesPayload
 type ChangesPayload<T> = ChangeMessage<T>[];
 ```
 
-Defined in: [packages/db/src/types.ts:681](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L681)
+Defined in: [packages/db/src/types.ts:736](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L736)
 
 ## Type Parameters
 
diff --git a/docs/reference/type-aliases/CleanupFn.md b/docs/reference/type-aliases/CleanupFn.md
index 75202b7a1..13b001030 100644
--- a/docs/reference/type-aliases/CleanupFn.md
+++ b/docs/reference/type-aliases/CleanupFn.md
@@ -9,7 +9,7 @@ title: CleanupFn
 type CleanupFn = () => void;
 ```
 
-Defined in: [packages/db/src/types.ts:278](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L278)
+Defined in: [packages/db/src/types.ts:317](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L317)
 
 ## Returns
 
diff --git a/docs/reference/type-aliases/CollectionConfigSingleRowOption.md b/docs/reference/type-aliases/CollectionConfigSingleRowOption.md
index 950a98e3f..586c1a116 100644
--- a/docs/reference/type-aliases/CollectionConfigSingleRowOption.md
+++ b/docs/reference/type-aliases/CollectionConfigSingleRowOption.md
@@ -9,7 +9,7 @@ title: CollectionConfigSingleRowOption
 type CollectionConfigSingleRowOption<T, TKey, TSchema, TUtils> = CollectionConfig<T, TKey, TSchema, TUtils> & MaybeSingleResult;
 ```
 
-Defined in: [packages/db/src/types.ts:674](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L674)
+Defined in: [packages/db/src/types.ts:729](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L729)
 
 ## Type Parameters
 
@@ -27,5 +27,5 @@ Defined in: [packages/db/src/types.ts:674](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../UtilsRecord.md) = \{
+`TUtils` *extends* [`UtilsRecord`](UtilsRecord.md) = \{
 \}
diff --git a/docs/reference/type-aliases/CollectionStatus.md b/docs/reference/type-aliases/CollectionStatus.md
index de248cd6e..a438a8d6b 100644
--- a/docs/reference/type-aliases/CollectionStatus.md
+++ b/docs/reference/type-aliases/CollectionStatus.md
@@ -9,7 +9,7 @@ title: CollectionStatus
 type CollectionStatus = "idle" | "loading" | "ready" | "error" | "cleaned-up";
 ```
 
-Defined in: [packages/db/src/types.ts:424](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L424)
+Defined in: [packages/db/src/types.ts:479](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L479)
 
 Collection status values for lifecycle management
 
diff --git a/docs/reference/type-aliases/CursorExpressions.md b/docs/reference/type-aliases/CursorExpressions.md
new file mode 100644
index 000000000..ea48981db
--- /dev/null
+++ b/docs/reference/type-aliases/CursorExpressions.md
@@ -0,0 +1,60 @@
+---
+id: CursorExpressions
+title: CursorExpressions
+---
+
+# Type Alias: CursorExpressions
+
+```ts
+type CursorExpressions = object;
+```
+
+Defined in: [packages/db/src/types.ts:263](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L263)
+
+Cursor expressions for pagination, passed separately from the main `where` clause.
+The sync layer can choose to use cursor-based pagination (combining these with the where)
+or offset-based pagination (ignoring these and using the `offset` parameter).
+
+Neither expression includes the main `where` clause - they are cursor-specific only.
+
+## Properties
+
+### lastKey?
+
+```ts
+optional lastKey: string | number;
+```
+
+Defined in: [packages/db/src/types.ts:281](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L281)
+
+The key of the last item that was loaded.
+Can be used by sync layers for tracking or deduplication.
+
+***
+
+### whereCurrent
+
+```ts
+whereCurrent: BasicExpression<boolean>;
+```
+
+Defined in: [packages/db/src/types.ts:276](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L276)
+
+Expression for rows equal to the current cursor value (first orderBy column only).
+Used to handle tie-breaking/duplicates at the boundary.
+Example: eq(col1, v1) or for Dates: and(gte(col1, v1), lt(col1, v1+1ms))
+
+***
+
+### whereFrom
+
+```ts
+whereFrom: BasicExpression<boolean>;
+```
+
+Defined in: [packages/db/src/types.ts:270](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L270)
+
+Expression for rows greater than (after) the cursor value.
+For multi-column orderBy, this is a composite cursor using OR of conditions.
+Example for [col1 ASC, col2 DESC] with values [v1, v2]:
+  or(gt(col1, v1), and(eq(col1, v1), lt(col2, v2)))
diff --git a/docs/reference/type-aliases/DeleteKeyMessage.md b/docs/reference/type-aliases/DeleteKeyMessage.md
new file mode 100644
index 000000000..50511304a
--- /dev/null
+++ b/docs/reference/type-aliases/DeleteKeyMessage.md
@@ -0,0 +1,26 @@
+---
+id: DeleteKeyMessage
+title: DeleteKeyMessage
+---
+
+# Type Alias: DeleteKeyMessage\<TKey\>
+
+```ts
+type DeleteKeyMessage<TKey> = Omit<ChangeMessage<any, TKey>, "value" | "previousValue" | "type"> & object;
+```
+
+Defined in: [packages/db/src/types.ts:364](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L364)
+
+## Type Declaration
+
+### type
+
+```ts
+type: "delete";
+```
+
+## Type Parameters
+
+### TKey
+
+`TKey` *extends* `string` \| `number` = `string` \| `number`
diff --git a/docs/reference/type-aliases/DeleteMutationFn.md b/docs/reference/type-aliases/DeleteMutationFn.md
index 5f48caad8..e81d79037 100644
--- a/docs/reference/type-aliases/DeleteMutationFn.md
+++ b/docs/reference/type-aliases/DeleteMutationFn.md
@@ -9,7 +9,7 @@ title: DeleteMutationFn
 type DeleteMutationFn<T, TKey, TUtils, TReturn> = (params) => Promise<TReturn>;
 ```
 
-Defined in: [packages/db/src/types.ts:402](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L402)
+Defined in: [packages/db/src/types.ts:457](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L457)
 
 ## Type Parameters
 
@@ -23,7 +23,7 @@ Defined in: [packages/db/src/types.ts:402](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../UtilsRecord.md) = [`UtilsRecord`](../UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](UtilsRecord.md) = [`UtilsRecord`](UtilsRecord.md)
 
 ### TReturn
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/types.ts:402](https://github.com/TanStack/db/blob/m
 
 ### params
 
-[`DeleteMutationFnParams`](../DeleteMutationFnParams.md)\<`T`, `TKey`, `TUtils`\>
+[`DeleteMutationFnParams`](DeleteMutationFnParams.md)\<`T`, `TKey`, `TUtils`\>
 
 ## Returns
 
diff --git a/docs/reference/type-aliases/DeleteMutationFnParams.md b/docs/reference/type-aliases/DeleteMutationFnParams.md
index 872eccd9b..8e2d767aa 100644
--- a/docs/reference/type-aliases/DeleteMutationFnParams.md
+++ b/docs/reference/type-aliases/DeleteMutationFnParams.md
@@ -9,7 +9,7 @@ title: DeleteMutationFnParams
 type DeleteMutationFnParams<T, TKey, TUtils> = object;
 ```
 
-Defined in: [packages/db/src/types.ts:379](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L379)
+Defined in: [packages/db/src/types.ts:434](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L434)
 
 ## Type Parameters
 
@@ -23,7 +23,7 @@ Defined in: [packages/db/src/types.ts:379](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../UtilsRecord.md) = [`UtilsRecord`](../UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](UtilsRecord.md) = [`UtilsRecord`](UtilsRecord.md)
 
 ## Properties
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/types.ts:379](https://github.com/TanStack/db/blob/m
 collection: Collection<T, TKey, TUtils>;
 ```
 
-Defined in: [packages/db/src/types.ts:385](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L385)
+Defined in: [packages/db/src/types.ts:440](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L440)
 
 ***
 
@@ -43,4 +43,4 @@ Defined in: [packages/db/src/types.ts:385](https://github.com/TanStack/db/blob/m
 transaction: TransactionWithMutations<T, "delete">;
 ```
 
-Defined in: [packages/db/src/types.ts:384](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L384)
+Defined in: [packages/db/src/types.ts:439](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L439)
diff --git a/docs/reference/type-aliases/GetResult.md b/docs/reference/type-aliases/GetResult.md
index fde3475a2..8a311ca9d 100644
--- a/docs/reference/type-aliases/GetResult.md
+++ b/docs/reference/type-aliases/GetResult.md
@@ -39,4 +39,4 @@ complex intersection types into readable object types.
 
 ### TContext
 
-`TContext` *extends* [`Context`](../../interfaces/Context.md)
+`TContext` *extends* [`Context`](../interfaces/Context.md)
diff --git a/docs/reference/type-aliases/IndexConstructor.md b/docs/reference/type-aliases/IndexConstructor.md
index fa3e2d37b..37b7a182a 100644
--- a/docs/reference/type-aliases/IndexConstructor.md
+++ b/docs/reference/type-aliases/IndexConstructor.md
@@ -27,7 +27,7 @@ Type for index constructor
 
 ### expression
 
-[`BasicExpression`](../../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
+[`BasicExpression`](../@tanstack/namespaces/IR/type-aliases/BasicExpression.md)
 
 ### name?
 
@@ -39,4 +39,4 @@ Type for index constructor
 
 ## Returns
 
-[`BaseIndex`](../../classes/BaseIndex.md)\<`TKey`\>
+[`BaseIndex`](../classes/BaseIndex.md)\<`TKey`\>
diff --git a/docs/reference/type-aliases/InferResultType.md b/docs/reference/type-aliases/InferResultType.md
index 851862eee..76e19e763 100644
--- a/docs/reference/type-aliases/InferResultType.md
+++ b/docs/reference/type-aliases/InferResultType.md
@@ -17,4 +17,4 @@ Utility type to infer the query result size (single row or an array)
 
 ### TContext
 
-`TContext` *extends* [`Context`](../../interfaces/Context.md)
+`TContext` *extends* [`Context`](../interfaces/Context.md)
diff --git a/docs/reference/type-aliases/InputRow.md b/docs/reference/type-aliases/InputRow.md
index 991ce93f7..9be0b19c2 100644
--- a/docs/reference/type-aliases/InputRow.md
+++ b/docs/reference/type-aliases/InputRow.md
@@ -9,6 +9,6 @@ title: InputRow
 type InputRow = [unknown, Record<string, unknown>];
 ```
 
-Defined in: [packages/db/src/types.ts:688](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L688)
+Defined in: [packages/db/src/types.ts:743](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L743)
 
 An input row from a collection
diff --git a/docs/reference/type-aliases/InsertMutationFn.md b/docs/reference/type-aliases/InsertMutationFn.md
index 573a31414..b8e357f0c 100644
--- a/docs/reference/type-aliases/InsertMutationFn.md
+++ b/docs/reference/type-aliases/InsertMutationFn.md
@@ -9,7 +9,7 @@ title: InsertMutationFn
 type InsertMutationFn<T, TKey, TUtils, TReturn> = (params) => Promise<TReturn>;
 ```
 
-Defined in: [packages/db/src/types.ts:388](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L388)
+Defined in: [packages/db/src/types.ts:443](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L443)
 
 ## Type Parameters
 
@@ -23,7 +23,7 @@ Defined in: [packages/db/src/types.ts:388](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../UtilsRecord.md) = [`UtilsRecord`](../UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](UtilsRecord.md) = [`UtilsRecord`](UtilsRecord.md)
 
 ### TReturn
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/types.ts:388](https://github.com/TanStack/db/blob/m
 
 ### params
 
-[`InsertMutationFnParams`](../InsertMutationFnParams.md)\<`T`, `TKey`, `TUtils`\>
+[`InsertMutationFnParams`](InsertMutationFnParams.md)\<`T`, `TKey`, `TUtils`\>
 
 ## Returns
 
diff --git a/docs/reference/type-aliases/InsertMutationFnParams.md b/docs/reference/type-aliases/InsertMutationFnParams.md
index 6080b4a33..9646082be 100644
--- a/docs/reference/type-aliases/InsertMutationFnParams.md
+++ b/docs/reference/type-aliases/InsertMutationFnParams.md
@@ -9,7 +9,7 @@ title: InsertMutationFnParams
 type InsertMutationFnParams<T, TKey, TUtils> = object;
 ```
 
-Defined in: [packages/db/src/types.ts:371](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L371)
+Defined in: [packages/db/src/types.ts:426](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L426)
 
 ## Type Parameters
 
@@ -23,7 +23,7 @@ Defined in: [packages/db/src/types.ts:371](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../UtilsRecord.md) = [`UtilsRecord`](../UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](UtilsRecord.md) = [`UtilsRecord`](UtilsRecord.md)
 
 ## Properties
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/types.ts:371](https://github.com/TanStack/db/blob/m
 collection: Collection<T, TKey, TUtils>;
 ```
 
-Defined in: [packages/db/src/types.ts:377](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L377)
+Defined in: [packages/db/src/types.ts:432](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L432)
 
 ***
 
@@ -43,4 +43,4 @@ Defined in: [packages/db/src/types.ts:377](https://github.com/TanStack/db/blob/m
 transaction: TransactionWithMutations<T, "insert">;
 ```
 
-Defined in: [packages/db/src/types.ts:376](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L376)
+Defined in: [packages/db/src/types.ts:431](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L431)
diff --git a/docs/reference/type-aliases/KeyedNamespacedRow.md b/docs/reference/type-aliases/KeyedNamespacedRow.md
index 8a1de5808..65a0dd8a4 100644
--- a/docs/reference/type-aliases/KeyedNamespacedRow.md
+++ b/docs/reference/type-aliases/KeyedNamespacedRow.md
@@ -9,7 +9,7 @@ title: KeyedNamespacedRow
 type KeyedNamespacedRow = [unknown, NamespacedRow];
 ```
 
-Defined in: [packages/db/src/types.ts:711](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L711)
+Defined in: [packages/db/src/types.ts:766](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L766)
 
 A keyed namespaced row is a row with a key and a namespaced row
 This is the main representation of a row in a query pipeline
diff --git a/docs/reference/type-aliases/KeyedStream.md b/docs/reference/type-aliases/KeyedStream.md
index d8607f87a..377570018 100644
--- a/docs/reference/type-aliases/KeyedStream.md
+++ b/docs/reference/type-aliases/KeyedStream.md
@@ -9,7 +9,7 @@ title: KeyedStream
 type KeyedStream = IStreamBuilder<InputRow>;
 ```
 
-Defined in: [packages/db/src/types.ts:694](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L694)
+Defined in: [packages/db/src/types.ts:749](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L749)
 
 A keyed stream is a stream of rows
 This is used as the inputs from a collection to a query
diff --git a/docs/reference/type-aliases/LoadSubsetFn.md b/docs/reference/type-aliases/LoadSubsetFn.md
index 9c6d796e5..092ea1e72 100644
--- a/docs/reference/type-aliases/LoadSubsetFn.md
+++ b/docs/reference/type-aliases/LoadSubsetFn.md
@@ -9,13 +9,13 @@ title: LoadSubsetFn
 type LoadSubsetFn = (options) => true | Promise<void>;
 ```
 
-Defined in: [packages/db/src/types.ts:274](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L274)
+Defined in: [packages/db/src/types.ts:313](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L313)
 
 ## Parameters
 
 ### options
 
-[`LoadSubsetOptions`](../LoadSubsetOptions.md)
+[`LoadSubsetOptions`](LoadSubsetOptions.md)
 
 ## Returns
 
diff --git a/docs/reference/type-aliases/LoadSubsetOptions.md b/docs/reference/type-aliases/LoadSubsetOptions.md
index 64c0a3c4e..aa3f1b5eb 100644
--- a/docs/reference/type-aliases/LoadSubsetOptions.md
+++ b/docs/reference/type-aliases/LoadSubsetOptions.md
@@ -9,29 +9,56 @@ title: LoadSubsetOptions
 type LoadSubsetOptions = object;
 ```
 
-Defined in: [packages/db/src/types.ts:256](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L256)
+Defined in: [packages/db/src/types.ts:284](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L284)
 
 ## Properties
 
+### cursor?
+
+```ts
+optional cursor: CursorExpressions;
+```
+
+Defined in: [packages/db/src/types.ts:296](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L296)
+
+Cursor expressions for cursor-based pagination.
+These are separate from `where` - the sync layer should combine them if using cursor-based pagination.
+Neither expression includes the main `where` clause.
+
+***
+
 ### limit?
 
 ```ts
 optional limit: number;
 ```
 
-Defined in: [packages/db/src/types.ts:262](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L262)
+Defined in: [packages/db/src/types.ts:290](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L290)
 
 The limit of the data to load
 
 ***
 
+### offset?
+
+```ts
+optional offset: number;
+```
+
+Defined in: [packages/db/src/types.ts:301](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L301)
+
+Row offset for offset-based pagination.
+The sync layer can use this instead of `cursor` if it prefers offset-based pagination.
+
+***
+
 ### orderBy?
 
 ```ts
 optional orderBy: OrderBy;
 ```
 
-Defined in: [packages/db/src/types.ts:260](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L260)
+Defined in: [packages/db/src/types.ts:288](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L288)
 
 The order by clause to sort the data
 
@@ -43,7 +70,7 @@ The order by clause to sort the data
 optional subscription: Subscription;
 ```
 
-Defined in: [packages/db/src/types.ts:271](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L271)
+Defined in: [packages/db/src/types.ts:310](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L310)
 
 The subscription that triggered the load.
 Advanced sync implementations can use this for:
@@ -63,6 +90,6 @@ Available when called from CollectionSubscription, may be undefined for direct c
 optional where: BasicExpression<boolean>;
 ```
 
-Defined in: [packages/db/src/types.ts:258](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L258)
+Defined in: [packages/db/src/types.ts:286](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L286)
 
-The where expression to filter the data
+The where expression to filter the data (does NOT include cursor expressions)
diff --git a/docs/reference/type-aliases/MakeOptional.md b/docs/reference/type-aliases/MakeOptional.md
new file mode 100644
index 000000000..bcaba38e1
--- /dev/null
+++ b/docs/reference/type-aliases/MakeOptional.md
@@ -0,0 +1,22 @@
+---
+id: MakeOptional
+title: MakeOptional
+---
+
+# Type Alias: MakeOptional\<T, K\>
+
+```ts
+type MakeOptional<T, K> = Omit<T, K> & Partial<Pick<T, K>>;
+```
+
+Defined in: [packages/db/src/types.ts:914](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L914)
+
+## Type Parameters
+
+### T
+
+`T`
+
+### K
+
+`K` *extends* keyof `T`
diff --git a/docs/reference/type-aliases/MaybeSingleResult.md b/docs/reference/type-aliases/MaybeSingleResult.md
index 95512ef93..9eeb7a1b2 100644
--- a/docs/reference/type-aliases/MaybeSingleResult.md
+++ b/docs/reference/type-aliases/MaybeSingleResult.md
@@ -9,7 +9,7 @@ title: MaybeSingleResult
 type MaybeSingleResult = object;
 ```
 
-Defined in: [packages/db/src/types.ts:666](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L666)
+Defined in: [packages/db/src/types.ts:721](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L721)
 
 ## Properties
 
@@ -19,6 +19,6 @@ Defined in: [packages/db/src/types.ts:666](https://github.com/TanStack/db/blob/m
 optional singleResult: true;
 ```
 
-Defined in: [packages/db/src/types.ts:670](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L670)
+Defined in: [packages/db/src/types.ts:725](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L725)
 
 If enabled the collection will return a single object instead of an array
diff --git a/docs/reference/type-aliases/MutationFn.md b/docs/reference/type-aliases/MutationFn.md
index 146de19e0..9ebaa5538 100644
--- a/docs/reference/type-aliases/MutationFn.md
+++ b/docs/reference/type-aliases/MutationFn.md
@@ -21,7 +21,7 @@ Defined in: [packages/db/src/types.ts:126](https://github.com/TanStack/db/blob/m
 
 ### params
 
-[`MutationFnParams`](../MutationFnParams.md)\<`T`\>
+[`MutationFnParams`](MutationFnParams.md)\<`T`\>
 
 ## Returns
 
diff --git a/docs/reference/type-aliases/NamespacedAndKeyedStream.md b/docs/reference/type-aliases/NamespacedAndKeyedStream.md
index c7d501506..48fe8ec75 100644
--- a/docs/reference/type-aliases/NamespacedAndKeyedStream.md
+++ b/docs/reference/type-aliases/NamespacedAndKeyedStream.md
@@ -9,7 +9,7 @@ title: NamespacedAndKeyedStream
 type NamespacedAndKeyedStream = IStreamBuilder<KeyedNamespacedRow>;
 ```
 
-Defined in: [packages/db/src/types.ts:718](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L718)
+Defined in: [packages/db/src/types.ts:773](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L773)
 
 A namespaced and keyed stream is a stream of rows
 This is used throughout a query pipeline and as the output from a query without
diff --git a/docs/reference/type-aliases/NamespacedRow.md b/docs/reference/type-aliases/NamespacedRow.md
index f2759dc9e..1b9e35c18 100644
--- a/docs/reference/type-aliases/NamespacedRow.md
+++ b/docs/reference/type-aliases/NamespacedRow.md
@@ -9,6 +9,6 @@ title: NamespacedRow
 type NamespacedRow = Record<string, Record<string, unknown>>;
 ```
 
-Defined in: [packages/db/src/types.ts:705](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L705)
+Defined in: [packages/db/src/types.ts:760](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L760)
 
 A namespaced row is a row withing a pipeline that had each table wrapped in its alias
diff --git a/docs/reference/type-aliases/NonSingleResult.md b/docs/reference/type-aliases/NonSingleResult.md
index 7a7306afb..690995848 100644
--- a/docs/reference/type-aliases/NonSingleResult.md
+++ b/docs/reference/type-aliases/NonSingleResult.md
@@ -9,7 +9,7 @@ title: NonSingleResult
 type NonSingleResult = object;
 ```
 
-Defined in: [packages/db/src/types.ts:662](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L662)
+Defined in: [packages/db/src/types.ts:717](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L717)
 
 ## Properties
 
@@ -19,4 +19,4 @@ Defined in: [packages/db/src/types.ts:662](https://github.com/TanStack/db/blob/m
 optional singleResult: never;
 ```
 
-Defined in: [packages/db/src/types.ts:663](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L663)
+Defined in: [packages/db/src/types.ts:718](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L718)
diff --git a/docs/reference/type-aliases/OptimisticChangeMessage.md b/docs/reference/type-aliases/OptimisticChangeMessage.md
new file mode 100644
index 000000000..23cfbd7a4
--- /dev/null
+++ b/docs/reference/type-aliases/OptimisticChangeMessage.md
@@ -0,0 +1,24 @@
+---
+id: OptimisticChangeMessage
+title: OptimisticChangeMessage
+---
+
+# Type Alias: OptimisticChangeMessage\<T, TKey\>
+
+```ts
+type OptimisticChangeMessage<T, TKey> = 
+  | ChangeMessage<T> & object
+  | DeleteKeyMessage<TKey> & object;
+```
+
+Defined in: [packages/db/src/types.ts:374](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L374)
+
+## Type Parameters
+
+### T
+
+`T` *extends* `object` = `Record`\<`string`, `unknown`\>
+
+### TKey
+
+`TKey` *extends* `string` \| `number` = `string` \| `number`
diff --git a/docs/reference/type-aliases/QueryBuilder.md b/docs/reference/type-aliases/QueryBuilder.md
index 63ca2622f..314c04f38 100644
--- a/docs/reference/type-aliases/QueryBuilder.md
+++ b/docs/reference/type-aliases/QueryBuilder.md
@@ -15,4 +15,4 @@ Defined in: [packages/db/src/query/builder/index.ts:850](https://github.com/TanS
 
 ### TContext
 
-`TContext` *extends* [`Context`](../../interfaces/Context.md)
+`TContext` *extends* [`Context`](../interfaces/Context.md)
diff --git a/docs/reference/type-aliases/ResolveTransactionChanges.md b/docs/reference/type-aliases/ResolveTransactionChanges.md
index d8349caab..12a4e2ed0 100644
--- a/docs/reference/type-aliases/ResolveTransactionChanges.md
+++ b/docs/reference/type-aliases/ResolveTransactionChanges.md
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/types.ts:79](https://github.com/TanStack/db/blob/ma
 
 ### TOperation
 
-`TOperation` *extends* [`OperationType`](../OperationType.md) = [`OperationType`](../OperationType.md)
+`TOperation` *extends* [`OperationType`](OperationType.md) = [`OperationType`](OperationType.md)
 
 ## Remarks
 
diff --git a/docs/reference/type-aliases/ResultStream.md b/docs/reference/type-aliases/ResultStream.md
index bce6ea4af..22de70167 100644
--- a/docs/reference/type-aliases/ResultStream.md
+++ b/docs/reference/type-aliases/ResultStream.md
@@ -9,7 +9,7 @@ title: ResultStream
 type ResultStream = IStreamBuilder<[unknown, [any, string | undefined]]>;
 ```
 
-Defined in: [packages/db/src/types.ts:700](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L700)
+Defined in: [packages/db/src/types.ts:755](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L755)
 
 Result stream type representing the output of compiled queries
 Always returns [key, [result, orderByIndex]] where orderByIndex is undefined for unordered queries
diff --git a/docs/reference/type-aliases/SingleResult.md b/docs/reference/type-aliases/SingleResult.md
index f0b9e74b8..1865f0741 100644
--- a/docs/reference/type-aliases/SingleResult.md
+++ b/docs/reference/type-aliases/SingleResult.md
@@ -9,7 +9,7 @@ title: SingleResult
 type SingleResult = object;
 ```
 
-Defined in: [packages/db/src/types.ts:658](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L658)
+Defined in: [packages/db/src/types.ts:713](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L713)
 
 ## Properties
 
@@ -19,4 +19,4 @@ Defined in: [packages/db/src/types.ts:658](https://github.com/TanStack/db/blob/m
 singleResult: true;
 ```
 
-Defined in: [packages/db/src/types.ts:659](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L659)
+Defined in: [packages/db/src/types.ts:714](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L714)
diff --git a/docs/reference/type-aliases/StandardSchema.md b/docs/reference/type-aliases/StandardSchema.md
index d59b54f94..25a86f518 100644
--- a/docs/reference/type-aliases/StandardSchema.md
+++ b/docs/reference/type-aliases/StandardSchema.md
@@ -9,7 +9,7 @@ title: StandardSchema
 type StandardSchema<T> = StandardSchemaV1 & object;
 ```
 
-Defined in: [packages/db/src/types.ts:336](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L336)
+Defined in: [packages/db/src/types.ts:391](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L391)
 
 The Standard Schema interface.
 This follows the standard-schema specification: https://github.com/standard-schema/standard-schema
diff --git a/docs/reference/type-aliases/StandardSchemaAlias.md b/docs/reference/type-aliases/StandardSchemaAlias.md
index f2ac532e4..400d678dd 100644
--- a/docs/reference/type-aliases/StandardSchemaAlias.md
+++ b/docs/reference/type-aliases/StandardSchemaAlias.md
@@ -9,7 +9,7 @@ title: StandardSchemaAlias
 type StandardSchemaAlias<T> = StandardSchema<T>;
 ```
 
-Defined in: [packages/db/src/types.ts:348](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L348)
+Defined in: [packages/db/src/types.ts:403](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L403)
 
 Type alias for StandardSchema
 
diff --git a/docs/reference/type-aliases/StrategyOptions.md b/docs/reference/type-aliases/StrategyOptions.md
index e4b212030..e7dd3712d 100644
--- a/docs/reference/type-aliases/StrategyOptions.md
+++ b/docs/reference/type-aliases/StrategyOptions.md
@@ -17,4 +17,4 @@ Extract the options type from a strategy
 
 ### T
 
-`T` *extends* [`Strategy`](../Strategy.md)
+`T` *extends* [`Strategy`](Strategy.md)
diff --git a/docs/reference/type-aliases/SyncConfigRes.md b/docs/reference/type-aliases/SyncConfigRes.md
index 6e0e64aca..0a873792f 100644
--- a/docs/reference/type-aliases/SyncConfigRes.md
+++ b/docs/reference/type-aliases/SyncConfigRes.md
@@ -9,7 +9,7 @@ title: SyncConfigRes
 type SyncConfigRes = object;
 ```
 
-Defined in: [packages/db/src/types.ts:280](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L280)
+Defined in: [packages/db/src/types.ts:319](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L319)
 
 ## Properties
 
@@ -19,7 +19,7 @@ Defined in: [packages/db/src/types.ts:280](https://github.com/TanStack/db/blob/m
 optional cleanup: CleanupFn;
 ```
 
-Defined in: [packages/db/src/types.ts:281](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L281)
+Defined in: [packages/db/src/types.ts:320](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L320)
 
 ***
 
@@ -29,7 +29,7 @@ Defined in: [packages/db/src/types.ts:281](https://github.com/TanStack/db/blob/m
 optional loadSubset: LoadSubsetFn;
 ```
 
-Defined in: [packages/db/src/types.ts:282](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L282)
+Defined in: [packages/db/src/types.ts:321](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L321)
 
 ***
 
@@ -39,4 +39,4 @@ Defined in: [packages/db/src/types.ts:282](https://github.com/TanStack/db/blob/m
 optional unloadSubset: UnloadSubsetFn;
 ```
 
-Defined in: [packages/db/src/types.ts:283](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L283)
+Defined in: [packages/db/src/types.ts:322](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L322)
diff --git a/docs/reference/type-aliases/SyncMode.md b/docs/reference/type-aliases/SyncMode.md
index 6e72cfbf4..450eff6ab 100644
--- a/docs/reference/type-aliases/SyncMode.md
+++ b/docs/reference/type-aliases/SyncMode.md
@@ -9,4 +9,4 @@ title: SyncMode
 type SyncMode = "eager" | "on-demand";
 ```
 
-Defined in: [packages/db/src/types.ts:436](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L436)
+Defined in: [packages/db/src/types.ts:491](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L491)
diff --git a/docs/reference/type-aliases/TransactionWithMutations.md b/docs/reference/type-aliases/TransactionWithMutations.md
index 493335cd9..3aca2e51f 100644
--- a/docs/reference/type-aliases/TransactionWithMutations.md
+++ b/docs/reference/type-aliases/TransactionWithMutations.md
@@ -48,4 +48,4 @@ With `Omit`:
 
 ### TOperation
 
-`TOperation` *extends* [`OperationType`](../OperationType.md) = [`OperationType`](../OperationType.md)
+`TOperation` *extends* [`OperationType`](OperationType.md) = [`OperationType`](OperationType.md)
diff --git a/docs/reference/type-aliases/UnloadSubsetFn.md b/docs/reference/type-aliases/UnloadSubsetFn.md
index 3a8eb3d37..3073bbe16 100644
--- a/docs/reference/type-aliases/UnloadSubsetFn.md
+++ b/docs/reference/type-aliases/UnloadSubsetFn.md
@@ -9,13 +9,13 @@ title: UnloadSubsetFn
 type UnloadSubsetFn = (options) => void;
 ```
 
-Defined in: [packages/db/src/types.ts:276](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L276)
+Defined in: [packages/db/src/types.ts:315](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L315)
 
 ## Parameters
 
 ### options
 
-[`LoadSubsetOptions`](../LoadSubsetOptions.md)
+[`LoadSubsetOptions`](LoadSubsetOptions.md)
 
 ## Returns
 
diff --git a/docs/reference/type-aliases/UpdateMutationFn.md b/docs/reference/type-aliases/UpdateMutationFn.md
index cda049813..e1d45bf9c 100644
--- a/docs/reference/type-aliases/UpdateMutationFn.md
+++ b/docs/reference/type-aliases/UpdateMutationFn.md
@@ -9,7 +9,7 @@ title: UpdateMutationFn
 type UpdateMutationFn<T, TKey, TUtils, TReturn> = (params) => Promise<TReturn>;
 ```
 
-Defined in: [packages/db/src/types.ts:395](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L395)
+Defined in: [packages/db/src/types.ts:450](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L450)
 
 ## Type Parameters
 
@@ -23,7 +23,7 @@ Defined in: [packages/db/src/types.ts:395](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../UtilsRecord.md) = [`UtilsRecord`](../UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](UtilsRecord.md) = [`UtilsRecord`](UtilsRecord.md)
 
 ### TReturn
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/types.ts:395](https://github.com/TanStack/db/blob/m
 
 ### params
 
-[`UpdateMutationFnParams`](../UpdateMutationFnParams.md)\<`T`, `TKey`, `TUtils`\>
+[`UpdateMutationFnParams`](UpdateMutationFnParams.md)\<`T`, `TKey`, `TUtils`\>
 
 ## Returns
 
diff --git a/docs/reference/type-aliases/UpdateMutationFnParams.md b/docs/reference/type-aliases/UpdateMutationFnParams.md
index 56e33c0e0..96a812c41 100644
--- a/docs/reference/type-aliases/UpdateMutationFnParams.md
+++ b/docs/reference/type-aliases/UpdateMutationFnParams.md
@@ -9,7 +9,7 @@ title: UpdateMutationFnParams
 type UpdateMutationFnParams<T, TKey, TUtils> = object;
 ```
 
-Defined in: [packages/db/src/types.ts:362](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L362)
+Defined in: [packages/db/src/types.ts:417](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L417)
 
 ## Type Parameters
 
@@ -23,7 +23,7 @@ Defined in: [packages/db/src/types.ts:362](https://github.com/TanStack/db/blob/m
 
 ### TUtils
 
-`TUtils` *extends* [`UtilsRecord`](../UtilsRecord.md) = [`UtilsRecord`](../UtilsRecord.md)
+`TUtils` *extends* [`UtilsRecord`](UtilsRecord.md) = [`UtilsRecord`](UtilsRecord.md)
 
 ## Properties
 
@@ -33,7 +33,7 @@ Defined in: [packages/db/src/types.ts:362](https://github.com/TanStack/db/blob/m
 collection: Collection<T, TKey, TUtils>;
 ```
 
-Defined in: [packages/db/src/types.ts:368](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L368)
+Defined in: [packages/db/src/types.ts:423](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L423)
 
 ***
 
@@ -43,4 +43,4 @@ Defined in: [packages/db/src/types.ts:368](https://github.com/TanStack/db/blob/m
 transaction: TransactionWithMutations<T, "update">;
 ```
 
-Defined in: [packages/db/src/types.ts:367](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L367)
+Defined in: [packages/db/src/types.ts:422](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L422)
diff --git a/docs/reference/type-aliases/WritableDeep.md b/docs/reference/type-aliases/WritableDeep.md
index fd6c796ed..d6ffa90b2 100644
--- a/docs/reference/type-aliases/WritableDeep.md
+++ b/docs/reference/type-aliases/WritableDeep.md
@@ -9,7 +9,7 @@ title: WritableDeep
 type WritableDeep<T> = T extends BuiltIns ? T : T extends (...arguments_) => unknown ? object extends WritableObjectDeep<T> ? T : HasMultipleCallSignatures<T> extends true ? T : (...arguments_) => ReturnType<T> & WritableObjectDeep<T> : T extends ReadonlyMap<unknown, unknown> ? WritableMapDeep<T> : T extends ReadonlySet<unknown> ? WritableSetDeep<T> : T extends ReadonlyArray<unknown> ? WritableArrayDeep<T> : T extends object ? WritableObjectDeep<T> : unknown;
 ```
 
-Defined in: [packages/db/src/types.ts:840](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L840)
+Defined in: [packages/db/src/types.ts:895](https://github.com/TanStack/db/blob/main/packages/db/src/types.ts#L895)
 
 ## Type Parameters
 
diff --git a/eslint.config.js b/eslint.config.js
index 1f40676a4..5c4455420 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,7 +1,4 @@
-import prettierPlugin from "eslint-plugin-prettier"
-import prettierConfig from "eslint-config-prettier"
-import stylisticPlugin from "@stylistic/eslint-plugin"
-import { tanstackConfig } from "@tanstack/config/eslint"
+import { tanstackConfig } from '@tanstack/eslint-config'
 
 export default [
   ...tanstackConfig,
@@ -15,31 +12,24 @@ export default [
     ],
   },
   {
-    plugins: {
-      stylistic: stylisticPlugin,
-      prettier: prettierPlugin,
-    },
     settings: {
       // import-x/* settings required for import/no-cycle.
-      "import-x/resolver": { typescript: true },
-      "import-x/extensions": [".ts", ".tsx", ".js", ".jsx", ".cjs", ".mjs"],
+      'import-x/resolver': { typescript: true },
+      'import-x/extensions': ['.ts', '.tsx', '.js', '.jsx', '.cjs', '.mjs'],
     },
     rules: {
-      "prettier/prettier": `error`,
-      "stylistic/quotes": [`error`, `backtick`],
-      "pnpm/enforce-catalog": `off`,
-      "pnpm/json-enforce-catalog": `off`,
-      ...prettierConfig.rules,
+      'pnpm/enforce-catalog': `off`,
+      'pnpm/json-enforce-catalog': `off`,
     },
   },
   {
     files: [`**/*.ts`, `**/*.tsx`],
     rules: {
-      "@typescript-eslint/no-unused-vars": [
+      '@typescript-eslint/no-unused-vars': [
         `error`,
         { argsIgnorePattern: `^_`, varsIgnorePattern: `^_` },
       ],
-      "@typescript-eslint/naming-convention": [
+      '@typescript-eslint/naming-convention': [
         `error`,
         {
           selector: `typeParameter`,
@@ -47,7 +37,7 @@ export default [
           leadingUnderscore: `allow`,
         },
       ],
-      "import/no-cycle": `error`,
+      'import/no-cycle': `error`,
     },
   },
 ]
diff --git a/examples/angular/todos/.postcssrc.json b/examples/angular/todos/.postcssrc.json
index 380d67686..e092dc7c1 100644
--- a/examples/angular/todos/.postcssrc.json
+++ b/examples/angular/todos/.postcssrc.json
@@ -1,6 +1,5 @@
 {
   "plugins": {
-    "tailwindcss": {},
-    "autoprefixer": {}
+    "@tailwindcss/postcss": {}
   }
 }
diff --git a/examples/angular/todos/package.json b/examples/angular/todos/package.json
index f80286c1a..b5b2abd33 100644
--- a/examples/angular/todos/package.json
+++ b/examples/angular/todos/package.json
@@ -22,32 +22,32 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^20.3.13",
-    "@angular/compiler": "^20.3.14",
-    "@angular/core": "^20.3.14",
-    "@angular/forms": "^20.3.14",
-    "@angular/platform-browser": "^20.3.14",
-    "@angular/router": "^20.3.14",
-    "@tanstack/angular-db": ">=0.0.0 <1.0.0",
-    "@tanstack/db": ">=0.0.0 <1.0.0",
-    "rxjs": "~7.8.2",
+    "@angular/common": "^19.2.17",
+    "@angular/compiler": "^20.3.15",
+    "@angular/core": "^19.2.17",
+    "@angular/forms": "^20.3.15",
+    "@angular/platform-browser": "^19.2.17",
+    "@angular/router": "^20.3.15",
+    "@tanstack/angular-db": "^0.1.37",
+    "@tanstack/db": "^0.5.11",
+    "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
-    "zone.js": "~0.16.0"
+    "zone.js": "^0.16.0"
   },
   "devDependencies": {
-    "@angular/build": "^20.3.12",
-    "@angular/cli": "^20.3.12",
-    "@angular/compiler-cli": "^20.3.14",
+    "@angular/build": "^20.3.13",
+    "@angular/cli": "^20.3.13",
+    "@angular/compiler-cli": "^20.3.15",
+    "@tailwindcss/postcss": "^4.1.17",
     "@types/jasmine": "~5.1.13",
-    "autoprefixer": "^10.4.22",
-    "jasmine-core": "~5.12.1",
+    "jasmine-core": "~5.13.0",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
     "postcss": "^8.5.6",
-    "tailwindcss": "^3.4.18",
-    "typescript": "~5.8.2"
+    "tailwindcss": "^4.1.17",
+    "typescript": "^5.9.2"
   }
 }
diff --git a/examples/angular/todos/src/app/app.config.ts b/examples/angular/todos/src/app/app.config.ts
index 414eeaeb8..a690ebc33 100644
--- a/examples/angular/todos/src/app/app.config.ts
+++ b/examples/angular/todos/src/app/app.config.ts
@@ -2,10 +2,10 @@ import {
   ApplicationConfig,
   provideBrowserGlobalErrorListeners,
   provideZoneChangeDetection,
-} from '@angular/core';
-import { provideRouter } from '@angular/router';
+} from '@angular/core'
+import { provideRouter } from '@angular/router'
 
-import { routes } from './app.routes';
+import { routes } from './app.routes'
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -13,4 +13,4 @@ export const appConfig: ApplicationConfig = {
     provideZoneChangeDetection({ eventCoalescing: true }),
     provideRouter(routes),
   ],
-};
+}
diff --git a/examples/angular/todos/src/app/app.routes.ts b/examples/angular/todos/src/app/app.routes.ts
index c4dcbaef3..5281a3272 100644
--- a/examples/angular/todos/src/app/app.routes.ts
+++ b/examples/angular/todos/src/app/app.routes.ts
@@ -1,5 +1,5 @@
-import { Routes } from '@angular/router';
+import { Routes } from '@angular/router'
 
 export const routes: Routes = [
   // Add your routes here
-];
+]
diff --git a/examples/angular/todos/src/app/app.ts b/examples/angular/todos/src/app/app.ts
index 55c59b7f2..46b1609d0 100644
--- a/examples/angular/todos/src/app/app.ts
+++ b/examples/angular/todos/src/app/app.ts
@@ -1,9 +1,9 @@
-import { Component, signal } from '@angular/core';
-import { injectLiveQuery } from '@tanstack/angular-db';
-import { eq } from '@tanstack/db';
-import { todosCollection } from '../collections/todos-collection';
-import { FormsModule } from '@angular/forms';
-import { CommonModule } from '@angular/common';
+import { Component, signal } from '@angular/core'
+import { injectLiveQuery } from '@tanstack/angular-db'
+import { eq } from '@tanstack/db'
+import { todosCollection } from '../collections/todos-collection'
+import { FormsModule } from '@angular/forms'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'app-root',
@@ -140,20 +140,20 @@ export class App {
   projects = [
     { id: 1, name: 'Work' },
     { id: 2, name: 'Home' },
-  ];
+  ]
 
-  selectedProjectId = signal(2);
+  selectedProjectId = signal(2)
 
   todoQuery = injectLiveQuery({
     params: () => ({ projectID: this.selectedProjectId() }),
     query: ({ params, q }) =>
       q.from({ todo: todosCollection }).where(({ todo }) => eq(todo.projectID, params.projectID)),
-  });
+  })
 
-  newTodoText = '';
+  newTodoText = ''
 
   addTodo() {
-    if (!this.newTodoText.trim()) return;
+    if (!this.newTodoText.trim()) return
 
     const newTodo = {
       id: Date.now(),
@@ -161,23 +161,23 @@ export class App {
       projectID: this.selectedProjectId(),
       completed: false,
       created_at: new Date(),
-    };
+    }
 
-    todosCollection.insert(newTodo);
-    this.newTodoText = '';
+    todosCollection.insert(newTodo)
+    this.newTodoText = ''
   }
 
   toggleTodo(id: number) {
     todosCollection.update(id, (draft: any) => {
-      draft.completed = !draft.completed;
-    });
+      draft.completed = !draft.completed
+    })
   }
 
   deleteTodo(id: number) {
-    todosCollection.delete(id);
+    todosCollection.delete(id)
   }
 
   getCompletedCount(): number {
-    return this.todoQuery.data().filter((todo) => todo.completed).length;
+    return this.todoQuery.data().filter((todo) => todo.completed).length
   }
 }
diff --git a/examples/angular/todos/src/collections/todos-collection.ts b/examples/angular/todos/src/collections/todos-collection.ts
index 1aa97d796..70e2fbb89 100644
--- a/examples/angular/todos/src/collections/todos-collection.ts
+++ b/examples/angular/todos/src/collections/todos-collection.ts
@@ -1,11 +1,11 @@
-import { createCollection, localOnlyCollectionOptions } from '@tanstack/db';
+import { createCollection, localOnlyCollectionOptions } from '@tanstack/db'
 
 interface Todo {
-  id: number;
-  text: string;
-  projectID: number;
-  completed: boolean;
-  created_at: Date;
+  id: number
+  text: string
+  projectID: number
+  completed: boolean
+  created_at: Date
 }
 
 export const todosCollection = createCollection(
@@ -42,4 +42,4 @@ export const todosCollection = createCollection(
       },
     ],
   }),
-);
+)
diff --git a/examples/angular/todos/src/main.ts b/examples/angular/todos/src/main.ts
index 190f3418d..8192dca69 100644
--- a/examples/angular/todos/src/main.ts
+++ b/examples/angular/todos/src/main.ts
@@ -1,5 +1,5 @@
-import { bootstrapApplication } from '@angular/platform-browser';
-import { appConfig } from './app/app.config';
-import { App } from './app/app';
+import { bootstrapApplication } from '@angular/platform-browser'
+import { appConfig } from './app/app.config'
+import { App } from './app/app'
 
-bootstrapApplication(App, appConfig).catch((err) => console.error(err));
+bootstrapApplication(App, appConfig).catch((err) => console.error(err))
diff --git a/examples/angular/todos/src/styles.css b/examples/angular/todos/src/styles.css
index b5c61c956..d4b507858 100644
--- a/examples/angular/todos/src/styles.css
+++ b/examples/angular/todos/src/styles.css
@@ -1,3 +1 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss';
diff --git a/examples/angular/todos/tailwind.config.js b/examples/angular/todos/tailwind.config.js
deleted file mode 100644
index 0cc494f78..000000000
--- a/examples/angular/todos/tailwind.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: ['./src/**/*.{html,ts}'],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-};
diff --git a/examples/react/offline-transactions/package.json b/examples/react/offline-transactions/package.json
index 81c85c2ef..7616b0c17 100644
--- a/examples/react/offline-transactions/package.json
+++ b/examples/react/offline-transactions/package.json
@@ -9,28 +9,27 @@
     "start": "node .output/server/index.mjs"
   },
   "dependencies": {
-    "@tanstack/offline-transactions": ">=1.0.0",
-    "@tanstack/query-db-collection": ">=1.0.5",
-    "@tanstack/react-db": ">=0.1.54",
-    "@tanstack/react-query": "^5.90.11",
-    "@tanstack/react-router": "^1.139.12",
-    "@tanstack/react-router-devtools": "^1.139.12",
-    "@tanstack/react-start": "^1.139.12",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "@tanstack/offline-transactions": "^1.0.5",
+    "@tanstack/query-db-collection": "^1.0.11",
+    "@tanstack/react-db": "^0.1.59",
+    "@tanstack/react-query": "^5.90.12",
+    "@tanstack/react-router": "^1.140.0",
+    "@tanstack/react-router-devtools": "^1.140.0",
+    "@tanstack/react-start": "^1.140.0",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
     "tailwind-merge": "^2.6.0",
     "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@types/node": "^22.5.4",
+    "@tailwindcss/vite": "^4.1.17",
+    "@types/node": "^24.6.2",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.1",
-    "autoprefixer": "^10.4.22",
     "chokidar": "^4.0.3",
-    "postcss": "^8.5.6",
-    "tailwindcss": "^3.4.18",
-    "typescript": "^5.7.2",
+    "tailwindcss": "^4.1.17",
+    "typescript": "^5.9.2",
     "vite": "^7.2.6",
     "vite-tsconfig-paths": "^5.1.4"
   }
diff --git a/examples/react/offline-transactions/postcss.config.mjs b/examples/react/offline-transactions/postcss.config.mjs
deleted file mode 100644
index 2e7af2b7f..000000000
--- a/examples/react/offline-transactions/postcss.config.mjs
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}
diff --git a/examples/react/offline-transactions/src/components/DefaultCatchBoundary.tsx b/examples/react/offline-transactions/src/components/DefaultCatchBoundary.tsx
index 63e20524f..ae1b64f67 100644
--- a/examples/react/offline-transactions/src/components/DefaultCatchBoundary.tsx
+++ b/examples/react/offline-transactions/src/components/DefaultCatchBoundary.tsx
@@ -4,8 +4,8 @@ import {
   rootRouteId,
   useMatch,
   useRouter,
-} from "@tanstack/react-router"
-import type { ErrorComponentProps } from "@tanstack/react-router"
+} from '@tanstack/react-router'
+import type { ErrorComponentProps } from '@tanstack/react-router'
 
 export function DefaultCatchBoundary({ error }: ErrorComponentProps) {
   const router = useRouter()
diff --git a/examples/react/offline-transactions/src/components/NotFound.tsx b/examples/react/offline-transactions/src/components/NotFound.tsx
index b29bf8dc7..7b54fa568 100644
--- a/examples/react/offline-transactions/src/components/NotFound.tsx
+++ b/examples/react/offline-transactions/src/components/NotFound.tsx
@@ -1,4 +1,4 @@
-import { Link } from "@tanstack/react-router"
+import { Link } from '@tanstack/react-router'
 
 export function NotFound({ children }: { children?: any }) {
   return (
diff --git a/examples/react/offline-transactions/src/components/TodoDemo.tsx b/examples/react/offline-transactions/src/components/TodoDemo.tsx
index 4a4bd3259..fcdf088da 100644
--- a/examples/react/offline-transactions/src/components/TodoDemo.tsx
+++ b/examples/react/offline-transactions/src/components/TodoDemo.tsx
@@ -1,6 +1,6 @@
-import React, { useEffect, useMemo, useState } from "react"
-import { useLiveQuery } from "@tanstack/react-db"
-import { createTodoActions, todoCollection } from "~/db/todos"
+import React, { useEffect, useMemo, useState } from 'react'
+import { useLiveQuery } from '@tanstack/react-db'
+import { createTodoActions, todoCollection } from '~/db/todos'
 
 interface TodoDemoProps {
   title: string
@@ -28,7 +28,7 @@ export function TodoDemo({
   const { data: todoList = [], isLoading } = useLiveQuery((q) =>
     q
       .from({ todo: todoCollection })
-      .orderBy(({ todo }) => todo.createdAt, `desc`)
+      .orderBy(({ todo }) => todo.createdAt, `desc`),
   )
 
   // Monitor online status
diff --git a/examples/react/offline-transactions/src/db/todos.ts b/examples/react/offline-transactions/src/db/todos.ts
index bc50377f4..1d8be0340 100644
--- a/examples/react/offline-transactions/src/db/todos.ts
+++ b/examples/react/offline-transactions/src/db/todos.ts
@@ -1,14 +1,14 @@
-import { createCollection } from "@tanstack/react-db"
-import { queryCollectionOptions } from "@tanstack/query-db-collection"
+import { createCollection } from '@tanstack/react-db'
+import { queryCollectionOptions } from '@tanstack/query-db-collection'
 import {
   IndexedDBAdapter,
   LocalStorageAdapter,
   startOfflineExecutor,
-} from "@tanstack/offline-transactions"
-import { z } from "zod"
-import type { PendingMutation } from "@tanstack/db"
-import type { Todo } from "~/utils/todos"
-import { queryClient } from "~/utils/queryClient"
+} from '@tanstack/offline-transactions'
+import { z } from 'zod'
+import type { PendingMutation } from '@tanstack/db'
+import type { Todo } from '~/utils/todos'
+import { queryClient } from '~/utils/queryClient'
 
 /**
  * A utility function to fetch data from a URL with built-in retry logic for non-200 responses.
@@ -29,7 +29,7 @@ import { queryClient } from "~/utils/queryClient"
 export async function fetchWithRetry(
   url: string,
   options: RequestInit = {},
-  retryConfig: { retries?: number; delay?: number; backoff?: number } = {}
+  retryConfig: { retries?: number; delay?: number; backoff?: number } = {},
 ): Promise<Response> {
   const { retries = 6, delay = 1000, backoff = 2 } = retryConfig
 
@@ -45,7 +45,7 @@ export async function fetchWithRetry(
 
       // If it's a non-200 response, log the status and prepare to retry
       console.warn(
-        `Fetch attempt ${i + 1} failed with status: ${response.status}. Retrying...`
+        `Fetch attempt ${i + 1} failed with status: ${response.status}. Retrying...`,
       )
 
       // Wait before the next attempt, with exponential backoff
@@ -57,7 +57,7 @@ export async function fetchWithRetry(
       // Catch network errors and log a message
       console.error(
         `Fetch attempt ${i + 1} failed due to a network error:`,
-        error
+        error,
       )
 
       // Wait before the next attempt, with exponential backoff
@@ -104,7 +104,7 @@ export const todoCollection = createCollection(
     },
     getKey: (item) => item.id,
     schema: todoSchema,
-  })
+  }),
 )
 
 // API client functions
@@ -127,8 +127,8 @@ export const todoAPI = {
             const response = await fetchWithRetry(`/api/todos`, {
               method: `POST`,
               headers: {
-                "Content-Type": `application/json`,
-                "Idempotency-Key": idempotencyKey,
+                'Content-Type': `application/json`,
+                'Idempotency-Key': idempotencyKey,
               },
               body: JSON.stringify({
                 text: todoData.text,
@@ -149,14 +149,14 @@ export const todoAPI = {
               {
                 method: `PUT`,
                 headers: {
-                  "Content-Type": `application/json`,
-                  "Idempotency-Key": idempotencyKey,
+                  'Content-Type': `application/json`,
+                  'Idempotency-Key': idempotencyKey,
                 },
                 body: JSON.stringify({
                   text: todoData.text,
                   completed: todoData.completed,
                 }),
-              }
+              },
             )
 
             if (!response.ok) {
@@ -171,9 +171,9 @@ export const todoAPI = {
               {
                 method: `DELETE`,
                 headers: {
-                  "Idempotency-Key": idempotencyKey,
+                  'Idempotency-Key': idempotencyKey,
                 },
-              }
+              },
             )
 
             if (!response.ok) {
@@ -265,7 +265,7 @@ export async function createIndexedDBOfflineExecutor() {
           code: diagnostic.code,
           message: diagnostic.message,
           error: diagnostic.error,
-        }
+        },
       )
     },
   })
@@ -297,7 +297,7 @@ export async function createLocalStorageOfflineExecutor() {
           code: diagnostic.code,
           message: diagnostic.message,
           error: diagnostic.error,
-        }
+        },
       )
     },
   })
diff --git a/examples/react/offline-transactions/src/routeTree.gen.ts b/examples/react/offline-transactions/src/routeTree.gen.ts
index def28e530..d594674fe 100644
--- a/examples/react/offline-transactions/src/routeTree.gen.ts
+++ b/examples/react/offline-transactions/src/routeTree.gen.ts
@@ -8,18 +8,10 @@
 // You should NOT make any changes in this file as it will be overwritten.
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
-import { createServerRootRoute } from '@tanstack/react-start/server'
-
 import { Route as rootRouteImport } from './routes/__root'
 import { Route as LocalstorageRouteImport } from './routes/localstorage'
 import { Route as IndexeddbRouteImport } from './routes/indexeddb'
 import { Route as IndexRouteImport } from './routes/index'
-import { ServerRoute as ApiUsersServerRouteImport } from './routes/api/users'
-import { ServerRoute as ApiTodosServerRouteImport } from './routes/api/todos'
-import { ServerRoute as ApiUsersUserIdServerRouteImport } from './routes/api/users.$userId'
-import { ServerRoute as ApiTodosTodoIdServerRouteImport } from './routes/api/todos.$todoId'
-
-const rootServerRouteImport = createServerRootRoute()
 
 const LocalstorageRoute = LocalstorageRouteImport.update({
   id: '/localstorage',
@@ -36,26 +28,6 @@ const IndexRoute = IndexRouteImport.update({
   path: '/',
   getParentRoute: () => rootRouteImport,
 } as any)
-const ApiUsersServerRoute = ApiUsersServerRouteImport.update({
-  id: '/api/users',
-  path: '/api/users',
-  getParentRoute: () => rootServerRouteImport,
-} as any)
-const ApiTodosServerRoute = ApiTodosServerRouteImport.update({
-  id: '/api/todos',
-  path: '/api/todos',
-  getParentRoute: () => rootServerRouteImport,
-} as any)
-const ApiUsersUserIdServerRoute = ApiUsersUserIdServerRouteImport.update({
-  id: '/$userId',
-  path: '/$userId',
-  getParentRoute: () => ApiUsersServerRoute,
-} as any)
-const ApiTodosTodoIdServerRoute = ApiTodosTodoIdServerRouteImport.update({
-  id: '/$todoId',
-  path: '/$todoId',
-  getParentRoute: () => ApiTodosServerRoute,
-} as any)
 
 export interface FileRoutesByFullPath {
   '/': typeof IndexRoute
@@ -86,46 +58,6 @@ export interface RootRouteChildren {
   IndexeddbRoute: typeof IndexeddbRoute
   LocalstorageRoute: typeof LocalstorageRoute
 }
-export interface FileServerRoutesByFullPath {
-  '/api/todos': typeof ApiTodosServerRouteWithChildren
-  '/api/users': typeof ApiUsersServerRouteWithChildren
-  '/api/todos/$todoId': typeof ApiTodosTodoIdServerRoute
-  '/api/users/$userId': typeof ApiUsersUserIdServerRoute
-}
-export interface FileServerRoutesByTo {
-  '/api/todos': typeof ApiTodosServerRouteWithChildren
-  '/api/users': typeof ApiUsersServerRouteWithChildren
-  '/api/todos/$todoId': typeof ApiTodosTodoIdServerRoute
-  '/api/users/$userId': typeof ApiUsersUserIdServerRoute
-}
-export interface FileServerRoutesById {
-  __root__: typeof rootServerRouteImport
-  '/api/todos': typeof ApiTodosServerRouteWithChildren
-  '/api/users': typeof ApiUsersServerRouteWithChildren
-  '/api/todos/$todoId': typeof ApiTodosTodoIdServerRoute
-  '/api/users/$userId': typeof ApiUsersUserIdServerRoute
-}
-export interface FileServerRouteTypes {
-  fileServerRoutesByFullPath: FileServerRoutesByFullPath
-  fullPaths:
-    | '/api/todos'
-    | '/api/users'
-    | '/api/todos/$todoId'
-    | '/api/users/$userId'
-  fileServerRoutesByTo: FileServerRoutesByTo
-  to: '/api/todos' | '/api/users' | '/api/todos/$todoId' | '/api/users/$userId'
-  id:
-    | '__root__'
-    | '/api/todos'
-    | '/api/users'
-    | '/api/todos/$todoId'
-    | '/api/users/$userId'
-  fileServerRoutesById: FileServerRoutesById
-}
-export interface RootServerRouteChildren {
-  ApiTodosServerRoute: typeof ApiTodosServerRouteWithChildren
-  ApiUsersServerRoute: typeof ApiUsersServerRouteWithChildren
-}
 
 declare module '@tanstack/react-router' {
   interface FileRoutesByPath {
@@ -152,62 +84,6 @@ declare module '@tanstack/react-router' {
     }
   }
 }
-declare module '@tanstack/react-start/server' {
-  interface ServerFileRoutesByPath {
-    '/api/users': {
-      id: '/api/users'
-      path: '/api/users'
-      fullPath: '/api/users'
-      preLoaderRoute: typeof ApiUsersServerRouteImport
-      parentRoute: typeof rootServerRouteImport
-    }
-    '/api/todos': {
-      id: '/api/todos'
-      path: '/api/todos'
-      fullPath: '/api/todos'
-      preLoaderRoute: typeof ApiTodosServerRouteImport
-      parentRoute: typeof rootServerRouteImport
-    }
-    '/api/users/$userId': {
-      id: '/api/users/$userId'
-      path: '/$userId'
-      fullPath: '/api/users/$userId'
-      preLoaderRoute: typeof ApiUsersUserIdServerRouteImport
-      parentRoute: typeof ApiUsersServerRoute
-    }
-    '/api/todos/$todoId': {
-      id: '/api/todos/$todoId'
-      path: '/$todoId'
-      fullPath: '/api/todos/$todoId'
-      preLoaderRoute: typeof ApiTodosTodoIdServerRouteImport
-      parentRoute: typeof ApiTodosServerRoute
-    }
-  }
-}
-
-interface ApiTodosServerRouteChildren {
-  ApiTodosTodoIdServerRoute: typeof ApiTodosTodoIdServerRoute
-}
-
-const ApiTodosServerRouteChildren: ApiTodosServerRouteChildren = {
-  ApiTodosTodoIdServerRoute: ApiTodosTodoIdServerRoute,
-}
-
-const ApiTodosServerRouteWithChildren = ApiTodosServerRoute._addFileChildren(
-  ApiTodosServerRouteChildren,
-)
-
-interface ApiUsersServerRouteChildren {
-  ApiUsersUserIdServerRoute: typeof ApiUsersUserIdServerRoute
-}
-
-const ApiUsersServerRouteChildren: ApiUsersServerRouteChildren = {
-  ApiUsersUserIdServerRoute: ApiUsersUserIdServerRoute,
-}
-
-const ApiUsersServerRouteWithChildren = ApiUsersServerRoute._addFileChildren(
-  ApiUsersServerRouteChildren,
-)
 
 const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
@@ -217,10 +93,12 @@ const rootRouteChildren: RootRouteChildren = {
 export const routeTree = rootRouteImport
   ._addFileChildren(rootRouteChildren)
   ._addFileTypes<FileRouteTypes>()
-const rootServerRouteChildren: RootServerRouteChildren = {
-  ApiTodosServerRoute: ApiTodosServerRouteWithChildren,
-  ApiUsersServerRoute: ApiUsersServerRouteWithChildren,
+
+import type { getRouter } from './router.tsx'
+import type { createStart } from '@tanstack/react-start'
+declare module '@tanstack/react-start' {
+  interface Register {
+    ssr: true
+    router: Awaited<ReturnType<typeof getRouter>>
+  }
 }
-export const serverRouteTree = rootServerRouteImport
-  ._addFileChildren(rootServerRouteChildren)
-  ._addFileTypes<FileServerRouteTypes>()
diff --git a/examples/react/offline-transactions/src/router.tsx b/examples/react/offline-transactions/src/router.tsx
index e15333a99..d5579a802 100644
--- a/examples/react/offline-transactions/src/router.tsx
+++ b/examples/react/offline-transactions/src/router.tsx
@@ -1,7 +1,7 @@
-import { createRouter as createTanStackRouter } from "@tanstack/react-router"
-import { routeTree } from "./routeTree.gen"
-import { DefaultCatchBoundary } from "./components/DefaultCatchBoundary"
-import { NotFound } from "./components/NotFound"
+import { createRouter as createTanStackRouter } from '@tanstack/react-router'
+import { routeTree } from './routeTree.gen'
+import { DefaultCatchBoundary } from './components/DefaultCatchBoundary'
+import { NotFound } from './components/NotFound'
 
 export function createRouter() {
   const router = createTanStackRouter({
@@ -15,7 +15,7 @@ export function createRouter() {
   return router
 }
 
-declare module "@tanstack/react-router" {
+declare module '@tanstack/react-router' {
   interface Register {
     router: ReturnType<typeof createRouter>
   }
diff --git a/examples/react/offline-transactions/src/routes/__root.tsx b/examples/react/offline-transactions/src/routes/__root.tsx
index ae2487fb4..89588bacb 100644
--- a/examples/react/offline-transactions/src/routes/__root.tsx
+++ b/examples/react/offline-transactions/src/routes/__root.tsx
@@ -4,15 +4,15 @@ import {
   Link,
   Scripts,
   createRootRoute,
-} from "@tanstack/react-router"
-import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"
-import { QueryClientProvider } from "@tanstack/react-query"
-import * as React from "react"
-import { DefaultCatchBoundary } from "~/components/DefaultCatchBoundary"
-import { NotFound } from "~/components/NotFound"
-import appCss from "~/styles/app.css?url"
-import { seo } from "~/utils/seo"
-import { queryClient } from "~/utils/queryClient"
+} from '@tanstack/react-router'
+import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { QueryClientProvider } from '@tanstack/react-query'
+import * as React from 'react'
+import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
+import { NotFound } from '~/components/NotFound'
+import appCss from '~/styles/app.css?url'
+import { seo } from '~/utils/seo'
+import { queryClient } from '~/utils/queryClient'
 
 export const Route = createRootRoute({
   head: () => ({
diff --git a/examples/react/offline-transactions/src/routes/api/todos.$todoId.ts b/examples/react/offline-transactions/src/routes/api/todos.$todoId.ts
index e55263518..21b293645 100644
--- a/examples/react/offline-transactions/src/routes/api/todos.$todoId.ts
+++ b/examples/react/offline-transactions/src/routes/api/todos.$todoId.ts
@@ -1,7 +1,7 @@
-import { createServerFileRoute } from "@tanstack/react-start/server"
-import { json } from "@tanstack/react-start"
-import type { TodoUpdate } from "~/utils/todos"
-import { todoService } from "~/utils/todos"
+import { createServerFileRoute } from '@tanstack/react-start/server'
+import { json } from '@tanstack/react-start'
+import type { TodoUpdate } from '~/utils/todos'
+import { todoService } from '~/utils/todos'
 
 export const ServerRoute = createServerFileRoute(`/api/todos/$todoId`).methods({
   GET: async ({ params, request }) => {
@@ -45,7 +45,7 @@ export const ServerRoute = createServerFileRoute(`/api/todos/$todoId`).methods({
       if (error instanceof Error && error.message.includes(`Simulated`)) {
         return json(
           { error: `Network error - please try again` },
-          { status: 503 }
+          { status: 503 },
         )
       }
       return json({ error: `Failed to update todo` }, { status: 500 })
@@ -71,7 +71,7 @@ export const ServerRoute = createServerFileRoute(`/api/todos/$todoId`).methods({
       if (error instanceof Error && error.message.includes(`Simulated`)) {
         return json(
           { error: `Network error - please try again` },
-          { status: 503 }
+          { status: 503 },
         )
       }
       return json({ error: `Failed to delete todo` }, { status: 500 })
diff --git a/examples/react/offline-transactions/src/routes/api/todos.ts b/examples/react/offline-transactions/src/routes/api/todos.ts
index 76623dd3c..8b6d1f8d7 100644
--- a/examples/react/offline-transactions/src/routes/api/todos.ts
+++ b/examples/react/offline-transactions/src/routes/api/todos.ts
@@ -1,7 +1,7 @@
-import { createServerFileRoute } from "@tanstack/react-start/server"
-import { json } from "@tanstack/react-start"
-import type { TodoInput } from "~/utils/todos"
-import { todoService } from "~/utils/todos"
+import { createServerFileRoute } from '@tanstack/react-start/server'
+import { json } from '@tanstack/react-start'
+import type { TodoInput } from '~/utils/todos'
+import { todoService } from '~/utils/todos'
 
 export const ServerRoute = createServerFileRoute(`/api/todos`).methods({
   GET: async ({ request }) => {
@@ -43,7 +43,7 @@ export const ServerRoute = createServerFileRoute(`/api/todos`).methods({
       if (error instanceof Error && error.message.includes(`Simulated`)) {
         return json(
           { error: `Network error - please try again` },
-          { status: 503 }
+          { status: 503 },
         )
       }
       return json({ error: `Failed to create todo` }, { status: 500 })
diff --git a/examples/react/offline-transactions/src/routes/api/users.$userId.ts b/examples/react/offline-transactions/src/routes/api/users.$userId.ts
index 8f966de20..19426fbbf 100644
--- a/examples/react/offline-transactions/src/routes/api/users.$userId.ts
+++ b/examples/react/offline-transactions/src/routes/api/users.$userId.ts
@@ -1,13 +1,13 @@
-import { createServerFileRoute } from "@tanstack/react-start/server"
-import { json } from "@tanstack/react-start"
-import type { User } from "~/utils/users"
+import { createServerFileRoute } from '@tanstack/react-start/server'
+import { json } from '@tanstack/react-start'
+import type { User } from '~/utils/users'
 
 export const ServerRoute = createServerFileRoute(`/api/users/$userId`).methods({
   GET: async ({ params, request }) => {
     console.info(`Fetching users by id=${params.userId}... @`, request.url)
     try {
       const res = await fetch(
-        `https://jsonplaceholder.typicode.com/users/` + params.userId
+        `https://jsonplaceholder.typicode.com/users/` + params.userId,
       )
       if (!res.ok) {
         throw new Error(`Failed to fetch user`)
diff --git a/examples/react/offline-transactions/src/routes/api/users.ts b/examples/react/offline-transactions/src/routes/api/users.ts
index d92e39318..b627c2f1f 100644
--- a/examples/react/offline-transactions/src/routes/api/users.ts
+++ b/examples/react/offline-transactions/src/routes/api/users.ts
@@ -1,9 +1,9 @@
 import {
   createServerFileRoute,
   getRequestHeaders,
-} from "@tanstack/react-start/server"
-import { createMiddleware, json } from "@tanstack/react-start"
-import type { User } from "~/utils/users"
+} from '@tanstack/react-start/server'
+import { createMiddleware, json } from '@tanstack/react-start'
+import type { User } from '~/utils/users'
 
 const userLoggerMiddleware = createMiddleware({ type: `request` }).server(
   async ({ next, _request }) => {
@@ -13,7 +13,7 @@ const userLoggerMiddleware = createMiddleware({ type: `request` }).server(
     result.response.headers.set(`x-users`, `true`)
     console.info(`Out: /users`)
     return result
-  }
+  },
 )
 
 const testParentMiddleware = createMiddleware({ type: `request` }).server(
@@ -23,7 +23,7 @@ const testParentMiddleware = createMiddleware({ type: `request` }).server(
     result.response.headers.set(`x-test-parent`, `true`)
     console.info(`Out: testParentMiddleware`)
     return result
-  }
+  },
 )
 
 const testMiddleware = createMiddleware({ type: `request` })
diff --git a/examples/react/offline-transactions/src/routes/index.tsx b/examples/react/offline-transactions/src/routes/index.tsx
index bb1db6612..6e9141e5d 100644
--- a/examples/react/offline-transactions/src/routes/index.tsx
+++ b/examples/react/offline-transactions/src/routes/index.tsx
@@ -1,4 +1,4 @@
-import { Link, createFileRoute } from "@tanstack/react-router"
+import { Link, createFileRoute } from '@tanstack/react-router'
 
 export const Route = createFileRoute(`/`)({
   component: Home,
diff --git a/examples/react/offline-transactions/src/routes/indexeddb.tsx b/examples/react/offline-transactions/src/routes/indexeddb.tsx
index 5ab1db0d3..de3b88db9 100644
--- a/examples/react/offline-transactions/src/routes/indexeddb.tsx
+++ b/examples/react/offline-transactions/src/routes/indexeddb.tsx
@@ -1,7 +1,7 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { useEffect, useState } from "react"
-import { TodoDemo } from "~/components/TodoDemo"
-import { createIndexedDBOfflineExecutor } from "~/db/todos"
+import { createFileRoute } from '@tanstack/react-router'
+import { useEffect, useState } from 'react'
+import { TodoDemo } from '~/components/TodoDemo'
+import { createIndexedDBOfflineExecutor } from '~/db/todos'
 
 export const Route = createFileRoute(`/indexeddb`)({
   component: IndexedDBDemo,
diff --git a/examples/react/offline-transactions/src/routes/localstorage.tsx b/examples/react/offline-transactions/src/routes/localstorage.tsx
index a9db81c5c..91ee02bff 100644
--- a/examples/react/offline-transactions/src/routes/localstorage.tsx
+++ b/examples/react/offline-transactions/src/routes/localstorage.tsx
@@ -1,7 +1,7 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { useEffect, useState } from "react"
-import { TodoDemo } from "~/components/TodoDemo"
-import { createLocalStorageOfflineExecutor } from "~/db/todos"
+import { createFileRoute } from '@tanstack/react-router'
+import { useEffect, useState } from 'react'
+import { TodoDemo } from '~/components/TodoDemo'
+import { createLocalStorageOfflineExecutor } from '~/db/todos'
 
 export const Route = createFileRoute(`/localstorage`)({
   component: LocalStorageDemo,
diff --git a/examples/react/offline-transactions/src/styles/app.css b/examples/react/offline-transactions/src/styles/app.css
index c53c87066..857e5045e 100644
--- a/examples/react/offline-transactions/src/styles/app.css
+++ b/examples/react/offline-transactions/src/styles/app.css
@@ -1,6 +1,4 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss';
 
 @layer base {
   html {
diff --git a/examples/react/offline-transactions/src/utils/loggingMiddleware.tsx b/examples/react/offline-transactions/src/utils/loggingMiddleware.tsx
index 2c516283b..336587007 100644
--- a/examples/react/offline-transactions/src/utils/loggingMiddleware.tsx
+++ b/examples/react/offline-transactions/src/utils/loggingMiddleware.tsx
@@ -1,4 +1,4 @@
-import { createMiddleware } from "@tanstack/react-start"
+import { createMiddleware } from '@tanstack/react-start'
 
 const preLogMiddleware = createMiddleware({ type: `function` })
   .client(async (ctx) => {
diff --git a/examples/react/offline-transactions/src/utils/queryClient.ts b/examples/react/offline-transactions/src/utils/queryClient.ts
index 3706eed12..5ca414ef7 100644
--- a/examples/react/offline-transactions/src/utils/queryClient.ts
+++ b/examples/react/offline-transactions/src/utils/queryClient.ts
@@ -1,4 +1,4 @@
-import { QueryClient } from "@tanstack/react-query"
+import { QueryClient } from '@tanstack/react-query'
 
 export const queryClient = new QueryClient({
   defaultOptions: {
diff --git a/examples/react/offline-transactions/src/utils/todos.ts b/examples/react/offline-transactions/src/utils/todos.ts
index 935a7f565..419683556 100644
--- a/examples/react/offline-transactions/src/utils/todos.ts
+++ b/examples/react/offline-transactions/src/utils/todos.ts
@@ -28,7 +28,7 @@ export const todoService = {
   getAll(): Array<Todo> {
     return Array.from(todosStore.values()).sort(
       (a, b) =>
-        new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
+        new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
     )
   },
 
diff --git a/examples/react/offline-transactions/tailwind.config.mjs b/examples/react/offline-transactions/tailwind.config.mjs
deleted file mode 100644
index 6765f75b2..000000000
--- a/examples/react/offline-transactions/tailwind.config.mjs
+++ /dev/null
@@ -1,4 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-export default {
-  content: ["./src/**/*.{js,jsx,ts,tsx}"],
-}
diff --git a/examples/react/offline-transactions/vite.config.ts b/examples/react/offline-transactions/vite.config.ts
index f730c1bf5..402e2d611 100644
--- a/examples/react/offline-transactions/vite.config.ts
+++ b/examples/react/offline-transactions/vite.config.ts
@@ -1,9 +1,10 @@
-import path from "node:path"
-import { tanstackStart } from "@tanstack/react-start/plugin/vite"
-import { defineConfig } from "vite"
-import tsConfigPaths from "vite-tsconfig-paths"
-import viteReact from "@vitejs/plugin-react"
-import chokidar from "chokidar"
+import path from 'node:path'
+import { tanstackStart } from '@tanstack/react-start/plugin/vite'
+import { defineConfig } from 'vite'
+import tsConfigPaths from 'vite-tsconfig-paths'
+import viteReact from '@vitejs/plugin-react'
+import tailwindcss from '@tailwindcss/vite'
+import chokidar from 'chokidar'
 
 function watchWorkspacePackages() {
   return {
@@ -27,7 +28,7 @@ function watchWorkspacePackages() {
 
       watcher.on(`ready`, () => {
         console.log(
-          `[watch-workspace] Initial scan complete. Watching for changes...`
+          `[watch-workspace] Initial scan complete. Watching for changes...`,
         )
         const watchedPaths = watcher.getWatched()
         console.log(`[watch-workspace] Currently watching:`, watchedPaths)
@@ -74,5 +75,6 @@ export default defineConfig({
       mode: `spa`, // SPA mode for client-side only offline features
     }),
     viteReact(),
+    tailwindcss(),
   ],
 })
diff --git a/examples/react/paced-mutations-demo/package.json b/examples/react/paced-mutations-demo/package.json
index 347c9a369..8e8ba243b 100644
--- a/examples/react/paced-mutations-demo/package.json
+++ b/examples/react/paced-mutations-demo/package.json
@@ -9,17 +9,17 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/db": ">=0.0.0 <1.0.0",
-    "@tanstack/react-db": ">=0.0.0 <1.0.0",
+    "@tanstack/db": "^0.5.11",
+    "@tanstack/react-db": "^0.1.59",
     "mitt": "^3.0.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1"
   },
   "devDependencies": {
-    "@types/react": "^18.3.27",
-    "@types/react-dom": "^18.3.7",
-    "@vitejs/plugin-react": "^4.7.0",
-    "typescript": "^5.7.2",
-    "vite": "^6.4.1"
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
+    "@vitejs/plugin-react": "^5.1.1",
+    "typescript": "^5.9.2",
+    "vite": "^7.2.6"
   }
 }
diff --git a/examples/react/paced-mutations-demo/src/App.tsx b/examples/react/paced-mutations-demo/src/App.tsx
index 57f1ad33c..26781446c 100644
--- a/examples/react/paced-mutations-demo/src/App.tsx
+++ b/examples/react/paced-mutations-demo/src/App.tsx
@@ -1,13 +1,13 @@
-import { useEffect, useMemo, useState } from "react"
-import mitt from "mitt"
+import { useEffect, useMemo, useState } from 'react'
+import mitt from 'mitt'
 import {
   createCollection,
   debounceStrategy,
   queueStrategy,
   throttleStrategy,
   usePacedMutations,
-} from "@tanstack/react-db"
-import type { PendingMutation, Transaction } from "@tanstack/react-db"
+} from '@tanstack/react-db'
+import type { PendingMutation, Transaction } from '@tanstack/react-db'
 
 interface Item {
   id: number
@@ -86,7 +86,7 @@ export function App() {
   const [trailing, setTrailing] = useState(true)
 
   const [transactions, setTransactions] = useState<Array<TrackedTransaction>>(
-    []
+    [],
   )
   const [optimisticState, setOptimisticState] = useState<Item | null>(null)
   const [syncedState, setSyncedState] = useState<Item>(fakeServer.get(1)!)
@@ -130,7 +130,7 @@ export function App() {
             return { ...t, state: `executing` as const, executingAt }
           }
           return t
-        })
+        }),
       )
 
       // Simulate network delay to fake server (random 100-600ms)
@@ -200,7 +200,7 @@ export function App() {
               }
             }
             return t
-          })
+          }),
         )
         // Update optimistic state after completion
         setOptimisticState(itemCollection.get(1))
@@ -213,7 +213,7 @@ export function App() {
               return { ...t, state: `failed` as const, completedAt: Date.now() }
             }
             return t
-          })
+          }),
         )
         // Update optimistic state after failure
         setOptimisticState(itemCollection.get(1))
diff --git a/examples/react/paced-mutations-demo/src/index.css b/examples/react/paced-mutations-demo/src/index.css
index d863dbaf4..e315d3e3d 100644
--- a/examples/react/paced-mutations-demo/src/index.css
+++ b/examples/react/paced-mutations-demo/src/index.css
@@ -6,8 +6,8 @@
 
 body {
   font-family:
-    -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
-    "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+    'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   background: #f5f5f5;
@@ -16,7 +16,7 @@ body {
 
 code {
   font-family:
-    source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
+    source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
   background: #f0f0f0;
   padding: 2px 6px;
   border-radius: 3px;
@@ -74,7 +74,7 @@ h1 {
 }
 
 .control-group select,
-.control-group input[type="number"] {
+.control-group input[type='number'] {
   width: 100%;
   padding: 8px;
   border: 1px solid #ddd;
@@ -89,7 +89,7 @@ h1 {
   margin-bottom: 8px;
 }
 
-.checkbox-group input[type="checkbox"] {
+.checkbox-group input[type='checkbox'] {
   width: 16px;
   height: 16px;
 }
diff --git a/examples/react/paced-mutations-demo/src/main.tsx b/examples/react/paced-mutations-demo/src/main.tsx
index 8def6fa63..950701bda 100644
--- a/examples/react/paced-mutations-demo/src/main.tsx
+++ b/examples/react/paced-mutations-demo/src/main.tsx
@@ -1,10 +1,10 @@
-import React from "react"
-import ReactDOM from "react-dom/client"
-import { App } from "./App"
-import "./index.css"
+import React from 'react'
+import ReactDOM from 'react-dom/client'
+import { App } from './App'
+import './index.css'
 
 ReactDOM.createRoot(document.getElementById(`root`)!).render(
   <React.StrictMode>
     <App />
-  </React.StrictMode>
+  </React.StrictMode>,
 )
diff --git a/examples/react/paced-mutations-demo/vite.config.ts b/examples/react/paced-mutations-demo/vite.config.ts
index ea1889ae7..9ffcc6757 100644
--- a/examples/react/paced-mutations-demo/vite.config.ts
+++ b/examples/react/paced-mutations-demo/vite.config.ts
@@ -1,5 +1,5 @@
-import { defineConfig } from "vite"
-import react from "@vitejs/plugin-react"
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
 
 export default defineConfig({
   plugins: [react()],
diff --git a/examples/react/projects/.env.example b/examples/react/projects/.env.example
index 232094023..6b0e9f5f2 100644
--- a/examples/react/projects/.env.example
+++ b/examples/react/projects/.env.example
@@ -3,4 +3,4 @@
 DATABASE_URL=postgresql://postgres:password@localhost:54321/projects
 
 # Create a secret for better-auth
-BETTER_AUTH_SECRET=
+BETTER_AUTH_SECRET=example-secret-for-development-only
diff --git a/examples/react/projects/README.md b/examples/react/projects/README.md
index 3bfe71853..7a122431d 100644
--- a/examples/react/projects/README.md
+++ b/examples/react/projects/README.md
@@ -78,7 +78,7 @@ Now that you have two routes you can use a `Link` component to navigate between
 To use SPA (Single Page Application) navigation you will need to import the `Link` component from `@tanstack/react-router`.
 
 ```tsx
-import { Link } from "@tanstack/react-router"
+import { Link } from '@tanstack/react-router'
 ```
 
 Then anywhere in your JSX you can use it like so:
@@ -98,10 +98,10 @@ In the File Based Routing setup the layout is located in `src/routes/__root.tsx`
 Here is an example layout that includes a header:
 
 ```tsx
-import { Outlet, createRootRoute } from "@tanstack/react-router"
-import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"
+import { Outlet, createRootRoute } from '@tanstack/react-router'
+import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
 
-import { Link } from "@tanstack/react-router"
+import { Link } from '@tanstack/react-router'
 
 export const Route = createRootRoute({
   component: () => (
@@ -132,9 +132,9 @@ For example:
 ```tsx
 const peopleRoute = createRoute({
   getParentRoute: () => rootRoute,
-  path: "/people",
+  path: '/people',
   loader: async () => {
-    const response = await fetch("https://swapi.dev/api/people")
+    const response = await fetch('https://swapi.dev/api/people')
     return response.json() as Promise<{
       results: {
         name: string
@@ -180,16 +180,16 @@ Built on a TypeScript implementation of differential dataflow, TanStack DB provi
 This example uses Query Collections for server-state synchronization with tRPC:
 
 ```tsx
-import { createCollection } from "@tanstack/react-db"
-import { queryCollectionOptions } from "@tanstack/query-db-collection"
-import { QueryClient } from "@tanstack/query-core"
+import { createCollection } from '@tanstack/react-db'
+import { queryCollectionOptions } from '@tanstack/query-db-collection'
+import { QueryClient } from '@tanstack/query-core'
 
 const queryClient = new QueryClient()
 
 export const todoCollection = createCollection(
   queryCollectionOptions<Todo>({
-    id: "todos",
-    queryKey: ["todos"],
+    id: 'todos',
+    queryKey: ['todos'],
     queryFn: async () => {
       const todos = await trpc.todos.getAll.query()
       return todos.map((todo) => ({
@@ -224,7 +224,7 @@ const AddTodo = () => {
       onClick={() =>
         todoCollection.insert({
           id: crypto.randomUUID(),
-          text: "🔥 Make app faster",
+          text: '🔥 Make app faster',
           completed: false,
         })
       }
@@ -238,7 +238,7 @@ const AddTodo = () => {
 Use live queries to read data reactively across collections:
 
 ```tsx
-import { useLiveQuery } from "@tanstack/react-db"
+import { useLiveQuery } from '@tanstack/react-db'
 
 const Todos = () => {
   // Read data using live queries with cross-collection joins
@@ -246,12 +246,12 @@ const Todos = () => {
     query
       .from({ t: todoCollection })
       .join({
-        type: "inner",
+        type: 'inner',
         from: { l: listCollection },
         on: [`@l.id`, `=`, `@t.list_id`],
       })
-      .where("@l.active", "=", true)
-      .select("@t.id", "@t.text", "@t.status", "@l.name")
+      .where('@l.active', '=', true)
+      .select('@t.id', '@t.text', '@t.status', '@l.name')
   )
 
   return (
diff --git a/examples/react/projects/docker-compose.yaml b/examples/react/projects/docker-compose.yaml
index 6da89ad48..42a8aca0d 100644
--- a/examples/react/projects/docker-compose.yaml
+++ b/examples/react/projects/docker-compose.yaml
@@ -1,5 +1,5 @@
-version: "3.3"
-name: "tanstack-start-db-projects"
+version: '3.3'
+name: 'tanstack-start-db-projects'
 
 services:
   postgres:
diff --git a/examples/react/projects/drizzle.config.ts b/examples/react/projects/drizzle.config.ts
index 6a6f388fd..30ae9a282 100644
--- a/examples/react/projects/drizzle.config.ts
+++ b/examples/react/projects/drizzle.config.ts
@@ -1,5 +1,5 @@
-import "dotenv/config"
-import { defineConfig } from "drizzle-kit"
+import 'dotenv/config'
+import { defineConfig } from 'drizzle-kit'
 
 export default defineConfig({
   out: `./src/db/out`,
diff --git a/examples/react/projects/eslint.config.mjs b/examples/react/projects/eslint.config.mjs
index e3c217b91..29a94ce29 100644
--- a/examples/react/projects/eslint.config.mjs
+++ b/examples/react/projects/eslint.config.mjs
@@ -1,19 +1,19 @@
-import js from "@eslint/js"
-import tsParser from "@typescript-eslint/parser"
-import tsPlugin from "@typescript-eslint/eslint-plugin"
-import reactPlugin from "eslint-plugin-react"
-import prettierPlugin from "eslint-plugin-prettier"
-import prettierConfig from "eslint-config-prettier"
-import globals from "globals"
-import { includeIgnoreFile } from "@eslint/compat"
-import { fileURLToPath } from "url"
+import js from '@eslint/js'
+import tsParser from '@typescript-eslint/parser'
+import tsPlugin from '@typescript-eslint/eslint-plugin'
+import reactPlugin from 'eslint-plugin-react'
+import prettierPlugin from 'eslint-plugin-prettier'
+import prettierConfig from 'eslint-config-prettier'
+import globals from 'globals'
+import { includeIgnoreFile } from '@eslint/compat'
+import { fileURLToPath } from 'url'
 
-const gitignorePath = fileURLToPath(new URL(".gitignore", import.meta.url))
+const gitignorePath = fileURLToPath(new URL('.gitignore', import.meta.url))
 
 export default [
-  includeIgnoreFile(gitignorePath, "Imported .gitignore patterns"),
+  includeIgnoreFile(gitignorePath, 'Imported .gitignore patterns'),
   {
-    files: ["src/**/*.{js,jsx,ts,tsx,mjs}"],
+    files: ['src/**/*.{js,jsx,ts,tsx,mjs}'],
     languageOptions: {
       ecmaVersion: 2022,
       sourceType: `module`,
@@ -35,7 +35,7 @@ export default [
       },
     },
     plugins: {
-      "@typescript-eslint": tsPlugin,
+      '@typescript-eslint': tsPlugin,
       react: reactPlugin,
       prettier: prettierPlugin,
     },
@@ -44,12 +44,12 @@ export default [
       ...tsPlugin.configs.recommended.rules,
       ...reactPlugin.configs.recommended.rules,
       ...prettierConfig.rules,
-      "prettier/prettier": `error`,
-      "react/react-in-jsx-scope": `off`,
-      "react/jsx-uses-react": `off`,
-      "no-undef": `off`,
-      "@typescript-eslint/no-undef": "off",
-      "@typescript-eslint/no-unused-vars": [
+      'prettier/prettier': `error`,
+      'react/react-in-jsx-scope': `off`,
+      'react/jsx-uses-react': `off`,
+      'no-undef': `off`,
+      '@typescript-eslint/no-undef': 'off',
+      '@typescript-eslint/no-unused-vars': [
         `error`,
         {
           argsIgnorePattern: `^_`,
diff --git a/examples/react/projects/package.json b/examples/react/projects/package.json
index 8fb7374a4..70cf79649 100644
--- a/examples/react/projects/package.json
+++ b/examples/react/projects/package.json
@@ -16,25 +16,25 @@
   },
   "dependencies": {
     "@tailwindcss/vite": "^4.1.17",
-    "@tanstack/query-core": "^5.90.11",
-    "@tanstack/query-db-collection": ">=1.0.5",
-    "@tanstack/react-db": ">=0.1.54",
-    "@tanstack/react-router": "^1.139.12",
-    "@tanstack/react-router-devtools": "^1.139.12",
+    "@tanstack/query-core": "^5.90.12",
+    "@tanstack/query-db-collection": "^1.0.11",
+    "@tanstack/react-db": "^0.1.59",
+    "@tanstack/react-router": "^1.140.0",
+    "@tanstack/react-router-devtools": "^1.140.0",
     "@tanstack/react-router-with-query": "^1.130.17",
-    "@tanstack/react-start": "^1.139.12",
-    "@tanstack/router-plugin": "^1.139.12",
+    "@tanstack/react-start": "^1.140.0",
+    "@tanstack/router-plugin": "^1.140.0",
     "@trpc/client": "^11.7.2",
     "@trpc/server": "^11.7.2",
     "better-auth": "^1.3.26",
     "dotenv": "^17.2.3",
-    "drizzle-orm": "^0.44.7",
+    "drizzle-orm": "^0.45.0",
     "drizzle-zod": "^0.8.3",
     "pg": "^8.16.3",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
     "tailwindcss": "^4.1.17",
-    "vite": "^6.3.5",
+    "vite": "^7.2.6",
     "vite-tsconfig-paths": "^5.1.4",
     "zod": "^4.1.11"
   },
@@ -46,21 +46,21 @@
     "@types/pg": "^8.15.6",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "@typescript-eslint/eslint-plugin": "^8.48.0",
-    "@typescript-eslint/parser": "^8.48.0",
-    "@vitejs/plugin-react": "^5.0.4",
+    "@typescript-eslint/eslint-plugin": "^8.48.1",
+    "@typescript-eslint/parser": "^8.48.1",
+    "@vitejs/plugin-react": "^5.1.1",
     "concurrently": "^9.2.1",
-    "drizzle-kit": "^0.31.7",
+    "drizzle-kit": "^0.31.8",
     "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^16.5.0",
-    "jsdom": "^27.0.0",
-    "prettier": "^3.7.3",
+    "jsdom": "^27.2.0",
+    "prettier": "^3.7.4",
     "tsx": "^4.21.0",
     "typescript": "^5.9.2",
-    "vite": "^6.4.1",
+    "vite": "^7.2.6",
     "vitest": "^3.2.4",
     "web-vitals": "^5.1.0"
   }
diff --git a/examples/react/projects/src/db/auth-schema.ts b/examples/react/projects/src/db/auth-schema.ts
index c0ff607e2..ac78b4658 100644
--- a/examples/react/projects/src/db/auth-schema.ts
+++ b/examples/react/projects/src/db/auth-schema.ts
@@ -1,61 +1,61 @@
-import { pgTable, text, timestamp, boolean } from "drizzle-orm/pg-core"
+import { pgTable, text, timestamp, boolean } from 'drizzle-orm/pg-core'
 
-export const users = pgTable("users", {
-  id: text("id").primaryKey(),
-  name: text("name").notNull(),
-  email: text("email").notNull().unique(),
-  emailVerified: boolean("email_verified")
+export const users = pgTable('users', {
+  id: text('id').primaryKey(),
+  name: text('name').notNull(),
+  email: text('email').notNull().unique(),
+  emailVerified: boolean('email_verified')
     .$defaultFn(() => false)
     .notNull(),
-  image: text("image"),
-  createdAt: timestamp("created_at")
+  image: text('image'),
+  createdAt: timestamp('created_at')
     .$defaultFn(() => /* @__PURE__ */ new Date())
     .notNull(),
-  updatedAt: timestamp("updated_at")
+  updatedAt: timestamp('updated_at')
     .$defaultFn(() => /* @__PURE__ */ new Date())
     .notNull(),
 })
 
-export const sessions = pgTable("sessions", {
-  id: text("id").primaryKey(),
-  expiresAt: timestamp("expires_at").notNull(),
-  token: text("token").notNull().unique(),
-  createdAt: timestamp("created_at").notNull(),
-  updatedAt: timestamp("updated_at").notNull(),
-  ipAddress: text("ip_address"),
-  userAgent: text("user_agent"),
-  userId: text("user_id")
+export const sessions = pgTable('sessions', {
+  id: text('id').primaryKey(),
+  expiresAt: timestamp('expires_at').notNull(),
+  token: text('token').notNull().unique(),
+  createdAt: timestamp('created_at').notNull(),
+  updatedAt: timestamp('updated_at').notNull(),
+  ipAddress: text('ip_address'),
+  userAgent: text('user_agent'),
+  userId: text('user_id')
     .notNull()
-    .references(() => users.id, { onDelete: "cascade" }),
+    .references(() => users.id, { onDelete: 'cascade' }),
 })
 
-export const accounts = pgTable("accounts", {
-  id: text("id").primaryKey(),
-  accountId: text("account_id").notNull(),
-  providerId: text("provider_id").notNull(),
-  userId: text("user_id")
+export const accounts = pgTable('accounts', {
+  id: text('id').primaryKey(),
+  accountId: text('account_id').notNull(),
+  providerId: text('provider_id').notNull(),
+  userId: text('user_id')
     .notNull()
-    .references(() => users.id, { onDelete: "cascade" }),
-  accessToken: text("access_token"),
-  refreshToken: text("refresh_token"),
-  idToken: text("id_token"),
-  accessTokenExpiresAt: timestamp("access_token_expires_at"),
-  refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
-  scope: text("scope"),
-  password: text("password"),
-  createdAt: timestamp("created_at").notNull(),
-  updatedAt: timestamp("updated_at").notNull(),
+    .references(() => users.id, { onDelete: 'cascade' }),
+  accessToken: text('access_token'),
+  refreshToken: text('refresh_token'),
+  idToken: text('id_token'),
+  accessTokenExpiresAt: timestamp('access_token_expires_at'),
+  refreshTokenExpiresAt: timestamp('refresh_token_expires_at'),
+  scope: text('scope'),
+  password: text('password'),
+  createdAt: timestamp('created_at').notNull(),
+  updatedAt: timestamp('updated_at').notNull(),
 })
 
-export const verifications = pgTable("verifications", {
-  id: text("id").primaryKey(),
-  identifier: text("identifier").notNull(),
-  value: text("value").notNull(),
-  expiresAt: timestamp("expires_at").notNull(),
-  createdAt: timestamp("created_at").$defaultFn(
+export const verifications = pgTable('verifications', {
+  id: text('id').primaryKey(),
+  identifier: text('identifier').notNull(),
+  value: text('value').notNull(),
+  expiresAt: timestamp('expires_at').notNull(),
+  createdAt: timestamp('created_at').$defaultFn(
     () => /* @__PURE__ */ new Date()
   ),
-  updatedAt: timestamp("updated_at").$defaultFn(
+  updatedAt: timestamp('updated_at').$defaultFn(
     () => /* @__PURE__ */ new Date()
   ),
 })
diff --git a/examples/react/projects/src/db/connection.ts b/examples/react/projects/src/db/connection.ts
index 5a8ea8beb..2712baa58 100644
--- a/examples/react/projects/src/db/connection.ts
+++ b/examples/react/projects/src/db/connection.ts
@@ -1,4 +1,4 @@
-import "dotenv/config"
-import { drizzle } from "drizzle-orm/node-postgres"
+import 'dotenv/config'
+import { drizzle } from 'drizzle-orm/node-postgres'
 
 export const db = drizzle(process.env.DATABASE_URL!, { casing: `snake_case` })
diff --git a/examples/react/projects/src/db/out/meta/0000_snapshot.json b/examples/react/projects/src/db/out/meta/0000_snapshot.json
index 1adb2bfa7..37908ea08 100644
--- a/examples/react/projects/src/db/out/meta/0000_snapshot.json
+++ b/examples/react/projects/src/db/out/meta/0000_snapshot.json
@@ -64,12 +64,8 @@
           "name": "projects_owner_id_users_id_fk",
           "tableFrom": "projects",
           "tableTo": "users",
-          "columnsFrom": [
-            "owner_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["owner_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -147,12 +143,8 @@
           "name": "todos_user_id_users_id_fk",
           "tableFrom": "todos",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -160,12 +152,8 @@
           "name": "todos_project_id_projects_id_fk",
           "tableFrom": "todos",
           "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -265,12 +253,8 @@
           "name": "accounts_user_id_users_id_fk",
           "tableFrom": "accounts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -340,12 +324,8 @@
           "name": "sessions_user_id_users_id_fk",
           "tableFrom": "sessions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -355,9 +335,7 @@
         "sessions_token_unique": {
           "name": "sessions_token_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "token"
-          ]
+          "columns": ["token"]
         }
       },
       "policies": {},
@@ -418,9 +396,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -488,4 +464,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/examples/react/projects/src/db/out/meta/_journal.json b/examples/react/projects/src/db/out/meta/_journal.json
index 5f5b938e6..55bf81962 100644
--- a/examples/react/projects/src/db/out/meta/_journal.json
+++ b/examples/react/projects/src/db/out/meta/_journal.json
@@ -10,4 +10,4 @@
       "breakpoints": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/examples/react/projects/src/db/schema.ts b/examples/react/projects/src/db/schema.ts
index 34df19e6a..cdd205c0a 100644
--- a/examples/react/projects/src/db/schema.ts
+++ b/examples/react/projects/src/db/schema.ts
@@ -5,11 +5,11 @@ import {
   timestamp,
   varchar,
   text,
-} from "drizzle-orm/pg-core"
-import { createSchemaFactory } from "drizzle-zod"
-import { z } from "zod"
-export * from "./auth-schema"
-import { users } from "./auth-schema"
+} from 'drizzle-orm/pg-core'
+import { createSchemaFactory } from 'drizzle-zod'
+import { z } from 'zod'
+export * from './auth-schema'
+import { users } from './auth-schema'
 
 const { createInsertSchema, createSelectSchema, createUpdateSchema } =
   createSchemaFactory({ zodInstance: z })
@@ -18,11 +18,11 @@ export const projectsTable = pgTable(`projects`, {
   id: integer().primaryKey().generatedAlwaysAsIdentity(),
   name: varchar({ length: 255 }).notNull(),
   description: text(),
-  shared_user_ids: text("shared_user_ids").array().notNull().default([]),
+  shared_user_ids: text('shared_user_ids').array().notNull().default([]),
   created_at: timestamp({ withTimezone: true }).notNull().defaultNow(),
-  owner_id: text("owner_id")
+  owner_id: text('owner_id')
     .notNull()
-    .references(() => users.id, { onDelete: "cascade" }),
+    .references(() => users.id, { onDelete: 'cascade' }),
 })
 
 export const todosTable = pgTable(`todos`, {
@@ -30,13 +30,13 @@ export const todosTable = pgTable(`todos`, {
   text: varchar({ length: 500 }).notNull(),
   completed: boolean().notNull().default(false),
   created_at: timestamp({ withTimezone: true }).notNull().defaultNow(),
-  user_id: text("user_id")
+  user_id: text('user_id')
     .notNull()
-    .references(() => users.id, { onDelete: "cascade" }),
-  project_id: integer("project_id")
+    .references(() => users.id, { onDelete: 'cascade' }),
+  project_id: integer('project_id')
     .notNull()
-    .references(() => projectsTable.id, { onDelete: "cascade" }),
-  user_ids: text("user_ids").array().notNull().default([]),
+    .references(() => projectsTable.id, { onDelete: 'cascade' }),
+  user_ids: text('user_ids').array().notNull().default([]),
 })
 
 export const selectProjectSchema = createSelectSchema(projectsTable)
diff --git a/examples/react/projects/src/lib/auth-client.ts b/examples/react/projects/src/lib/auth-client.ts
index 8665c3b11..939114361 100644
--- a/examples/react/projects/src/lib/auth-client.ts
+++ b/examples/react/projects/src/lib/auth-client.ts
@@ -1,2 +1,2 @@
-import { createAuthClient } from "better-auth/react"
+import { createAuthClient } from 'better-auth/react'
 export const authClient = createAuthClient()
diff --git a/examples/react/projects/src/lib/auth.ts b/examples/react/projects/src/lib/auth.ts
index f423c5fdc..22426df53 100644
--- a/examples/react/projects/src/lib/auth.ts
+++ b/examples/react/projects/src/lib/auth.ts
@@ -1,11 +1,11 @@
-import { betterAuth } from "better-auth"
-import { drizzleAdapter } from "better-auth/adapters/drizzle"
-import { db } from "@/db/connection" // your drizzle instance
-import * as schema from "@/db/auth-schema"
+import { betterAuth } from 'better-auth'
+import { drizzleAdapter } from 'better-auth/adapters/drizzle'
+import { db } from '@/db/connection' // your drizzle instance
+import * as schema from '@/db/auth-schema'
 
 export const auth = betterAuth({
   database: drizzleAdapter(db, {
-    provider: "pg",
+    provider: 'pg',
     usePlural: true,
     schema,
     // debugLogs: true,
@@ -13,10 +13,10 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
     // Disable signup in production, allow in dev
-    disableSignUp: process.env.NODE_ENV === "production",
-    minPasswordLength: process.env.NODE_ENV === "production" ? 8 : 1,
+    disableSignUp: process.env.NODE_ENV === 'production',
+    minPasswordLength: process.env.NODE_ENV === 'production' ? 8 : 1,
   },
   trustedOrigins: [
-    "http://localhost:5173", // Vite dev server
+    'http://localhost:5173', // Vite dev server
   ],
 })
diff --git a/examples/react/projects/src/lib/collections.ts b/examples/react/projects/src/lib/collections.ts
index 336466dbe..235969dd2 100644
--- a/examples/react/projects/src/lib/collections.ts
+++ b/examples/react/projects/src/lib/collections.ts
@@ -1,20 +1,20 @@
-import { createCollection } from "@tanstack/react-db"
-import { queryCollectionOptions } from "@tanstack/query-db-collection"
-import { QueryClient } from "@tanstack/query-core"
+import { createCollection } from '@tanstack/react-db'
+import { queryCollectionOptions } from '@tanstack/query-db-collection'
+import { QueryClient } from '@tanstack/query-core'
 import {
   selectTodoSchema,
   selectProjectSchema,
   selectUsersSchema,
-} from "@/db/schema"
-import { trpc } from "@/lib/trpc-client"
+} from '@/db/schema'
+import { trpc } from '@/lib/trpc-client'
 
 // Create a query client for query collections
 const queryClient = new QueryClient()
 
 export const usersCollection = createCollection(
   queryCollectionOptions({
-    id: "users",
-    queryKey: ["users"],
+    id: 'users',
+    queryKey: ['users'],
     // Poll for updates every 5 seconds
     refetchInterval: 5000,
     queryFn: async () => {
@@ -32,8 +32,8 @@ export const usersCollection = createCollection(
 )
 export const projectCollection = createCollection(
   queryCollectionOptions({
-    id: "projects",
-    queryKey: ["projects"],
+    id: 'projects',
+    queryKey: ['projects'],
     // Poll for updates every 5 seconds
     refetchInterval: 5000,
     queryFn: async () => {
@@ -78,8 +78,8 @@ export const projectCollection = createCollection(
 
 export const todoCollection = createCollection(
   queryCollectionOptions({
-    id: "todos",
-    queryKey: ["todos"],
+    id: 'todos',
+    queryKey: ['todos'],
     // Poll for updates every 5 seconds
     refetchInterval: 5000,
     queryFn: async () => {
diff --git a/examples/react/projects/src/lib/trpc-client.ts b/examples/react/projects/src/lib/trpc-client.ts
index d03bf6922..11b29a321 100644
--- a/examples/react/projects/src/lib/trpc-client.ts
+++ b/examples/react/projects/src/lib/trpc-client.ts
@@ -1,13 +1,13 @@
-import { createTRPCProxyClient, httpBatchLink } from "@trpc/client"
-import type { AppRouter } from "@/routes/api/trpc/$"
+import { createTRPCProxyClient, httpBatchLink } from '@trpc/client'
+import type { AppRouter } from '@/routes/api/trpc/$'
 
 export const trpc = createTRPCProxyClient<AppRouter>({
   links: [
     httpBatchLink({
-      url: "/api/trpc",
+      url: '/api/trpc',
       async headers() {
         return {
-          cookie: typeof document !== "undefined" ? document.cookie : "",
+          cookie: typeof document !== 'undefined' ? document.cookie : '',
         }
       },
     }),
diff --git a/examples/react/projects/src/lib/trpc.ts b/examples/react/projects/src/lib/trpc.ts
index 8843140d1..98e498464 100644
--- a/examples/react/projects/src/lib/trpc.ts
+++ b/examples/react/projects/src/lib/trpc.ts
@@ -1,6 +1,6 @@
-import { initTRPC, TRPCError } from "@trpc/server"
-import { auth } from "@/lib/auth"
-import { db } from "@/db/connection"
+import { initTRPC, TRPCError } from '@trpc/server'
+import { auth } from '@/lib/auth'
+import { db } from '@/db/connection'
 
 export type Context = {
   session: Awaited<ReturnType<typeof auth.api.getSession>>
@@ -15,7 +15,7 @@ export const middleware = t.middleware
 
 export const isAuthed = middleware(async ({ ctx, next }) => {
   if (!ctx.session?.user) {
-    throw new TRPCError({ code: "UNAUTHORIZED" })
+    throw new TRPCError({ code: 'UNAUTHORIZED' })
   }
   return next({
     ctx: {
diff --git a/examples/react/projects/src/lib/trpc/projects.ts b/examples/react/projects/src/lib/trpc/projects.ts
index fd9de7132..dcf6e7a45 100644
--- a/examples/react/projects/src/lib/trpc/projects.ts
+++ b/examples/react/projects/src/lib/trpc/projects.ts
@@ -1,12 +1,12 @@
-import { router, authedProcedure } from "@/lib/trpc"
-import { z } from "zod"
-import { TRPCError } from "@trpc/server"
-import { eq, and, sql } from "drizzle-orm"
+import { router, authedProcedure } from '@/lib/trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import { eq, and, sql } from 'drizzle-orm'
 import {
   projectsTable,
   createProjectSchema,
   updateProjectSchema,
-} from "@/db/schema"
+} from '@/db/schema'
 
 export const projectsRouter = router({
   getAll: authedProcedure.query(async ({ ctx }) => {
@@ -24,8 +24,8 @@ export const projectsRouter = router({
     .mutation(async ({ ctx, input }) => {
       if (input.owner_id !== ctx.session.user.id) {
         throw new TRPCError({
-          code: "FORBIDDEN",
-          message: "You can only create projects you own",
+          code: 'FORBIDDEN',
+          message: 'You can only create projects you own',
         })
       }
 
@@ -58,9 +58,9 @@ export const projectsRouter = router({
 
       if (!updatedItem) {
         throw new TRPCError({
-          code: "NOT_FOUND",
+          code: 'NOT_FOUND',
           message:
-            "Project not found or you do not have permission to update it",
+            'Project not found or you do not have permission to update it',
         })
       }
 
@@ -82,9 +82,9 @@ export const projectsRouter = router({
 
       if (!deletedItem) {
         throw new TRPCError({
-          code: "NOT_FOUND",
+          code: 'NOT_FOUND',
           message:
-            "Project not found or you do not have permission to delete it",
+            'Project not found or you do not have permission to delete it',
         })
       }
 
diff --git a/examples/react/projects/src/lib/trpc/todos.ts b/examples/react/projects/src/lib/trpc/todos.ts
index 127d36cca..d6825804e 100644
--- a/examples/react/projects/src/lib/trpc/todos.ts
+++ b/examples/react/projects/src/lib/trpc/todos.ts
@@ -1,8 +1,8 @@
-import { router, authedProcedure } from "@/lib/trpc"
-import { z } from "zod"
-import { TRPCError } from "@trpc/server"
-import { eq, and, arrayContains } from "drizzle-orm"
-import { todosTable, createTodoSchema, updateTodoSchema } from "@/db/schema"
+import { router, authedProcedure } from '@/lib/trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import { eq, and, arrayContains } from 'drizzle-orm'
+import { todosTable, createTodoSchema, updateTodoSchema } from '@/db/schema'
 
 export const todosRouter = router({
   getAll: authedProcedure.query(async ({ ctx }) => {
@@ -44,8 +44,8 @@ export const todosRouter = router({
 
       if (!updatedItem) {
         throw new TRPCError({
-          code: "NOT_FOUND",
-          message: "Todo not found or you do not have permission to update it",
+          code: 'NOT_FOUND',
+          message: 'Todo not found or you do not have permission to update it',
         })
       }
 
@@ -67,8 +67,8 @@ export const todosRouter = router({
 
       if (!deletedItem) {
         throw new TRPCError({
-          code: "NOT_FOUND",
-          message: "Todo not found or you do not have permission to delete it",
+          code: 'NOT_FOUND',
+          message: 'Todo not found or you do not have permission to delete it',
         })
       }
 
diff --git a/examples/react/projects/src/lib/trpc/users.ts b/examples/react/projects/src/lib/trpc/users.ts
index 86f887753..13c730bdd 100644
--- a/examples/react/projects/src/lib/trpc/users.ts
+++ b/examples/react/projects/src/lib/trpc/users.ts
@@ -1,7 +1,7 @@
-import { router, authedProcedure } from "@/lib/trpc"
-import { z } from "zod"
-import { TRPCError } from "@trpc/server"
-import { users } from "@/db/schema"
+import { router, authedProcedure } from '@/lib/trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import { users } from '@/db/schema'
 
 export const usersRouter = router({
   getAll: authedProcedure.query(async ({ ctx }) => {
@@ -11,7 +11,7 @@ export const usersRouter = router({
 
   create: authedProcedure.input(z.any()).mutation(async () => {
     throw new TRPCError({
-      code: "FORBIDDEN",
+      code: 'FORBIDDEN',
       message: "Can't create new users through API",
     })
   }),
@@ -20,7 +20,7 @@ export const usersRouter = router({
     .input(z.object({ id: z.string(), data: z.any() }))
     .mutation(async () => {
       throw new TRPCError({
-        code: "FORBIDDEN",
+        code: 'FORBIDDEN',
         message: "Can't edit users through API",
       })
     }),
@@ -29,7 +29,7 @@ export const usersRouter = router({
     .input(z.object({ id: z.string() }))
     .mutation(async () => {
       throw new TRPCError({
-        code: "FORBIDDEN",
+        code: 'FORBIDDEN',
         message: "Can't delete users through API",
       })
     }),
diff --git a/examples/react/projects/src/router.tsx b/examples/react/projects/src/router.tsx
index e025c0f7f..50504c678 100644
--- a/examples/react/projects/src/router.tsx
+++ b/examples/react/projects/src/router.tsx
@@ -1,9 +1,9 @@
-import { createRouter as createTanstackRouter } from "@tanstack/react-router"
+import { createRouter as createTanstackRouter } from '@tanstack/react-router'
 
 // Import the generated route tree
-import { routeTree } from "./routeTree.gen"
+import { routeTree } from './routeTree.gen'
 
-import "./styles.css"
+import './styles.css'
 
 // Create a new router instance
 export function getRouter() {
diff --git a/examples/react/projects/src/routes/__root.tsx b/examples/react/projects/src/routes/__root.tsx
index bb4aa1c89..477a34019 100644
--- a/examples/react/projects/src/routes/__root.tsx
+++ b/examples/react/projects/src/routes/__root.tsx
@@ -1,13 +1,13 @@
-import * as React from "react"
+import * as React from 'react'
 import {
   HeadContent,
   Outlet,
   Scripts,
   createRootRoute,
-} from "@tanstack/react-router"
-import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"
+} from '@tanstack/react-router'
+import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
 
-import appCss from "../styles.css?url"
+import appCss from '../styles.css?url'
 
 export const Route = createRootRoute({
   head: () => ({
diff --git a/examples/react/projects/src/routes/_authenticated.tsx b/examples/react/projects/src/routes/_authenticated.tsx
index 749668ea4..c119ed40c 100644
--- a/examples/react/projects/src/routes/_authenticated.tsx
+++ b/examples/react/projects/src/routes/_authenticated.tsx
@@ -1,13 +1,13 @@
-import { useEffect, useState } from "react"
+import { useEffect, useState } from 'react'
 import {
   Link,
   Outlet,
   createFileRoute,
   useNavigate,
-} from "@tanstack/react-router"
-import { useLiveQuery } from "@tanstack/react-db"
-import { authClient } from "@/lib/auth-client"
-import { projectCollection } from "@/lib/collections"
+} from '@tanstack/react-router'
+import { useLiveQuery } from '@tanstack/react-db'
+import { authClient } from '@/lib/auth-client'
+import { projectCollection } from '@/lib/collections'
 
 export const Route = createFileRoute(`/_authenticated`)({
   component: AuthenticatedLayout,
diff --git a/examples/react/projects/src/routes/_authenticated/index.tsx b/examples/react/projects/src/routes/_authenticated/index.tsx
index bc3990cd2..a8f8cb9ab 100644
--- a/examples/react/projects/src/routes/_authenticated/index.tsx
+++ b/examples/react/projects/src/routes/_authenticated/index.tsx
@@ -1,8 +1,8 @@
-import { useEffect } from "react"
-import { createFileRoute, redirect, useNavigate } from "@tanstack/react-router"
-import { useLiveQuery } from "@tanstack/react-db"
-import { projectCollection, todoCollection } from "@/lib/collections"
-import { authClient } from "@/lib/auth-client"
+import { useEffect } from 'react'
+import { createFileRoute, redirect, useNavigate } from '@tanstack/react-router'
+import { useLiveQuery } from '@tanstack/react-db'
+import { projectCollection, todoCollection } from '@/lib/collections'
+import { authClient } from '@/lib/auth-client'
 
 export const Route = createFileRoute(`/_authenticated/`)({
   component: IndexRedirect,
diff --git a/examples/react/projects/src/routes/_authenticated/project/$projectId.tsx b/examples/react/projects/src/routes/_authenticated/project/$projectId.tsx
index 3a648964f..7c3084f23 100644
--- a/examples/react/projects/src/routes/_authenticated/project/$projectId.tsx
+++ b/examples/react/projects/src/routes/_authenticated/project/$projectId.tsx
@@ -1,13 +1,13 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { eq, useLiveQuery } from "@tanstack/react-db"
-import { useState } from "react"
-import type { Todo } from "@/db/schema"
-import { authClient } from "@/lib/auth-client"
+import { createFileRoute } from '@tanstack/react-router'
+import { eq, useLiveQuery } from '@tanstack/react-db'
+import { useState } from 'react'
+import type { Todo } from '@/db/schema'
+import { authClient } from '@/lib/auth-client'
 import {
   projectCollection,
   todoCollection,
   usersCollection,
-} from "@/lib/collections"
+} from '@/lib/collections'
 
 export const Route = createFileRoute(`/_authenticated/project/$projectId`)({
   component: ProjectPage,
diff --git a/examples/react/projects/src/routes/api/auth.ts b/examples/react/projects/src/routes/api/auth.ts
index c8d288f8b..4b3b9bfbf 100644
--- a/examples/react/projects/src/routes/api/auth.ts
+++ b/examples/react/projects/src/routes/api/auth.ts
@@ -1,5 +1,5 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { auth } from "@/lib/auth"
+import { createFileRoute } from '@tanstack/react-router'
+import { auth } from '@/lib/auth'
 
 const serve = ({ request }: { request: Request }) => {
   return auth.handler(request)
diff --git a/examples/react/projects/src/routes/api/trpc/$.ts b/examples/react/projects/src/routes/api/trpc/$.ts
index e7438e56b..eb6071a4a 100644
--- a/examples/react/projects/src/routes/api/trpc/$.ts
+++ b/examples/react/projects/src/routes/api/trpc/$.ts
@@ -1,11 +1,11 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { fetchRequestHandler } from "@trpc/server/adapters/fetch"
-import { router } from "@/lib/trpc"
-import { projectsRouter } from "@/lib/trpc/projects"
-import { todosRouter } from "@/lib/trpc/todos"
-import { usersRouter } from "@/lib/trpc/users"
-import { db } from "@/db/connection"
-import { auth } from "@/lib/auth"
+import { createFileRoute } from '@tanstack/react-router'
+import { fetchRequestHandler } from '@trpc/server/adapters/fetch'
+import { router } from '@/lib/trpc'
+import { projectsRouter } from '@/lib/trpc/projects'
+import { todosRouter } from '@/lib/trpc/todos'
+import { usersRouter } from '@/lib/trpc/users'
+import { db } from '@/db/connection'
+import { auth } from '@/lib/auth'
 
 export const appRouter = router({
   projects: projectsRouter,
diff --git a/examples/react/projects/src/routes/login.tsx b/examples/react/projects/src/routes/login.tsx
index 09512463c..1f2a039c1 100644
--- a/examples/react/projects/src/routes/login.tsx
+++ b/examples/react/projects/src/routes/login.tsx
@@ -1,7 +1,7 @@
-import { useState } from "react"
-import { createFileRoute } from "@tanstack/react-router"
-import type { FormEvent } from "react"
-import { authClient } from "@/lib/auth-client"
+import { useState } from 'react'
+import { createFileRoute } from '@tanstack/react-router'
+import type { FormEvent } from 'react'
+import { authClient } from '@/lib/auth-client'
 
 export const Route = createFileRoute(`/login`)({
   component: Layout,
diff --git a/examples/react/projects/src/start.tsx b/examples/react/projects/src/start.tsx
index de7b170ed..9e8694bab 100644
--- a/examples/react/projects/src/start.tsx
+++ b/examples/react/projects/src/start.tsx
@@ -1,4 +1,4 @@
-import { createStart } from "@tanstack/react-start"
+import { createStart } from '@tanstack/react-start'
 
 export const startInstance = createStart(() => {
   return {
diff --git a/examples/react/projects/src/styles.css b/examples/react/projects/src/styles.css
index 80cb92ada..06f1bca4b 100644
--- a/examples/react/projects/src/styles.css
+++ b/examples/react/projects/src/styles.css
@@ -1,15 +1,15 @@
-@import "tailwindcss";
+@import 'tailwindcss';
 
 body {
   @apply m-0;
   font-family:
-    -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
-    "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+    'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
 code {
   font-family:
-    source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
+    source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
 }
diff --git a/examples/react/projects/vite.config.ts b/examples/react/projects/vite.config.ts
index 6708900ed..7307fb0e8 100644
--- a/examples/react/projects/vite.config.ts
+++ b/examples/react/projects/vite.config.ts
@@ -1,8 +1,8 @@
-import { defineConfig } from "vite"
-import { tanstackStart } from "@tanstack/react-start/plugin/vite"
-import viteTsConfigPaths from "vite-tsconfig-paths"
-import tailwindcss from "@tailwindcss/vite"
-import react from "@vitejs/plugin-react"
+import { defineConfig } from 'vite'
+import { tanstackStart } from '@tanstack/react-start/plugin/vite'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+import tailwindcss from '@tailwindcss/vite'
+import react from '@vitejs/plugin-react'
 
 const config = defineConfig({
   plugins: [
diff --git a/examples/react/todo/docker-compose.yml b/examples/react/todo/docker-compose.yml
index 9b6ddcffe..cb03bb1b3 100644
--- a/examples/react/todo/docker-compose.yml
+++ b/examples/react/todo/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.8"
+version: '3.8'
 services:
   postgres:
     image: postgres:17-alpine
@@ -7,7 +7,7 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
     ports:
-      - "54322:5432"
+      - '54322:5432'
     volumes:
       - ./postgres.conf:/etc/postgresql/postgresql.conf:ro
     tmpfs:
@@ -18,7 +18,7 @@ services:
       - -c
       - config_file=/etc/postgresql/postgresql.conf
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ['CMD-SHELL', 'pg_isready -U postgres']
       interval: 5s
       timeout: 5s
       retries: 5
@@ -37,11 +37,11 @@ services:
   trailbase:
     image: trailbase/trailbase:latest
     ports:
-      - "${PORT:-4000}:4000"
+      - '${PORT:-4000}:4000'
     restart: unless-stopped
     volumes:
       - ./traildepot:/app/traildepot
-    command: "/app/trail --data-dir /app/traildepot run --address 0.0.0.0:4000 --dev"
+    command: '/app/trail --data-dir /app/traildepot run --address 0.0.0.0:4000 --dev'
 
 volumes:
   postgres_data:
diff --git a/examples/react/todo/drizzle.config.ts b/examples/react/todo/drizzle.config.ts
index 550633431..486be88c9 100644
--- a/examples/react/todo/drizzle.config.ts
+++ b/examples/react/todo/drizzle.config.ts
@@ -1,4 +1,4 @@
-import type { Config } from "drizzle-kit"
+import type { Config } from 'drizzle-kit'
 
 export default {
   schema: `./src/db/schema.ts`,
diff --git a/examples/react/todo/package.json b/examples/react/todo/package.json
index c7710f3d9..b40917598 100644
--- a/examples/react/todo/package.json
+++ b/examples/react/todo/package.json
@@ -3,20 +3,20 @@
   "private": true,
   "version": "0.1.24",
   "dependencies": {
-    "@tanstack/electric-db-collection": ">=0.2.0",
-    "@tanstack/query-core": "^5.90.11",
-    "@tanstack/query-db-collection": ">=1.0.0",
-    "@tanstack/react-db": ">=0.1.44",
-    "@tanstack/react-router": "^1.139.12",
-    "@tanstack/react-start": "^1.139.12",
-    "@tanstack/trailbase-db-collection": ">=0.1.44",
+    "@tanstack/electric-db-collection": "^0.2.12",
+    "@tanstack/query-core": "^5.90.12",
+    "@tanstack/query-db-collection": "^1.0.11",
+    "@tanstack/react-db": "^0.1.59",
+    "@tanstack/react-router": "^1.140.0",
+    "@tanstack/react-start": "^1.140.0",
+    "@tanstack/trailbase-db-collection": "^0.1.55",
     "cors": "^2.8.5",
-    "drizzle-orm": "^0.44.7",
+    "drizzle-orm": "^0.45.0",
     "drizzle-zod": "^0.8.3",
-    "express": "^4.21.2",
+    "express": "^4.22.1",
     "postgres": "^3.4.7",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
     "tailwindcss": "^4.1.17",
     "trailbase": "^0.8.0",
     "vite-tsconfig-paths": "^5.1.4",
@@ -27,23 +27,23 @@
     "@tailwindcss/vite": "^4.1.17",
     "@types/cors": "^2.8.19",
     "@types/express": "^4.17.25",
-    "@types/node": "^24.5.2",
+    "@types/node": "^24.6.2",
     "@types/pg": "^8.15.6",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "@typescript-eslint/eslint-plugin": "^8.48.0",
-    "@typescript-eslint/parser": "^8.48.0",
-    "@vitejs/plugin-react": "^5.0.3",
+    "@typescript-eslint/eslint-plugin": "^8.48.1",
+    "@typescript-eslint/parser": "^8.48.1",
+    "@vitejs/plugin-react": "^5.1.1",
     "concurrently": "^9.2.1",
-    "dotenv": "^17.2.2",
-    "drizzle-kit": "^0.31.7",
+    "dotenv": "^17.2.3",
+    "drizzle-kit": "^0.31.8",
     "eslint": "^9.39.1",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.24",
     "pg": "^8.16.3",
     "tsx": "^4.21.0",
     "typescript": "^5.9.2",
-    "vite": "^6.1.1"
+    "vite": "^7.2.6"
   },
   "scripts": {
     "build": "vite build",
diff --git a/examples/react/todo/scripts/migrate.ts b/examples/react/todo/scripts/migrate.ts
index ee0089f38..d58ebc44e 100644
--- a/examples/react/todo/scripts/migrate.ts
+++ b/examples/react/todo/scripts/migrate.ts
@@ -1,7 +1,7 @@
-import { drizzle } from "drizzle-orm/node-postgres"
-import { migrate } from "drizzle-orm/node-postgres/migrator"
-import pkg from "pg"
-import * as dotenv from "dotenv"
+import { drizzle } from 'drizzle-orm/node-postgres'
+import { migrate } from 'drizzle-orm/node-postgres/migrator'
+import pkg from 'pg'
+import * as dotenv from 'dotenv'
 
 dotenv.config()
 
diff --git a/examples/react/todo/src/api/server.ts b/examples/react/todo/src/api/server.ts
index 4aa55431d..948d2442e 100644
--- a/examples/react/todo/src/api/server.ts
+++ b/examples/react/todo/src/api/server.ts
@@ -1,14 +1,14 @@
-import express from "express"
-import cors from "cors"
-import { sql } from "../db/postgres"
+import express from 'express'
+import cors from 'cors'
+import { sql } from '../db/postgres'
 import {
   validateInsertConfig,
   validateInsertTodo,
   validateUpdateConfig,
   validateUpdateTodo,
-} from "../db/validation"
-import type { Express } from "express"
-import type { Txid } from "@tanstack/electric-db-collection"
+} from '../db/validation'
+import type { Express } from 'express'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Create Express app
 const app: Express = express()
diff --git a/examples/react/todo/src/components/NotFound.tsx b/examples/react/todo/src/components/NotFound.tsx
index 2e892fafd..60caed4d7 100644
--- a/examples/react/todo/src/components/NotFound.tsx
+++ b/examples/react/todo/src/components/NotFound.tsx
@@ -1,4 +1,4 @@
-import { Link } from "@tanstack/react-router"
+import { Link } from '@tanstack/react-router'
 
 export function NotFound() {
   return (
diff --git a/examples/react/todo/src/components/TodoApp.tsx b/examples/react/todo/src/components/TodoApp.tsx
index 0fbcb65ed..9a0225436 100644
--- a/examples/react/todo/src/components/TodoApp.tsx
+++ b/examples/react/todo/src/components/TodoApp.tsx
@@ -1,11 +1,11 @@
-import React, { useState } from "react"
-import { Link } from "@tanstack/react-router"
-import { debounceStrategy, usePacedMutations } from "@tanstack/react-db"
-import type { FormEvent } from "react"
-import type { Collection, Transaction } from "@tanstack/react-db"
+import React, { useState } from 'react'
+import { Link } from '@tanstack/react-router'
+import { debounceStrategy, usePacedMutations } from '@tanstack/react-db'
+import type { FormEvent } from 'react'
+import type { Collection, Transaction } from '@tanstack/react-db'
 
-import type { SelectConfig, SelectTodo } from "@/db/validation"
-import { getComplementaryColor } from "@/lib/color"
+import type { SelectConfig, SelectTodo } from '@/db/validation'
+import { getComplementaryColor } from '@/lib/color'
 
 interface TodoAppProps {
   todos: Array<SelectTodo>
@@ -165,8 +165,8 @@ export function TodoApp({
                   todosToToggle.map((todo) => todo.id),
                   (drafts) =>
                     drafts.forEach(
-                      (draft) => (draft.completed = !draft.completed)
-                    )
+                      (draft) => (draft.completed = !draft.completed),
+                    ),
                 )
               }}
             >
diff --git a/examples/react/todo/src/db/index.ts b/examples/react/todo/src/db/index.ts
index 5a856e693..fbd0af99d 100644
--- a/examples/react/todo/src/db/index.ts
+++ b/examples/react/todo/src/db/index.ts
@@ -1,6 +1,6 @@
-import { drizzle } from "drizzle-orm/node-postgres"
-import { Pool } from "pg"
-import * as schema from "./schema"
+import { drizzle } from 'drizzle-orm/node-postgres'
+import { Pool } from 'pg'
+import * as schema from './schema'
 
 // Create a PostgreSQL pool
 const pool = new Pool({
diff --git a/examples/react/todo/src/db/postgres.ts b/examples/react/todo/src/db/postgres.ts
index 674348433..9a0c0437c 100644
--- a/examples/react/todo/src/db/postgres.ts
+++ b/examples/react/todo/src/db/postgres.ts
@@ -1,4 +1,4 @@
-import postgres from "postgres"
+import postgres from 'postgres'
 
 // Create a postgres instance
 export const sql = postgres({
diff --git a/examples/react/todo/src/db/schema.ts b/examples/react/todo/src/db/schema.ts
index 4bf9e0d0a..bed8f98a8 100644
--- a/examples/react/todo/src/db/schema.ts
+++ b/examples/react/todo/src/db/schema.ts
@@ -1,4 +1,4 @@
-import { boolean, pgTable, serial, text, timestamp } from "drizzle-orm/pg-core"
+import { boolean, pgTable, serial, text, timestamp } from 'drizzle-orm/pg-core'
 
 export const todos = pgTable(`todos`, {
   id: serial(`id`).primaryKey(),
diff --git a/examples/react/todo/src/db/validation.ts b/examples/react/todo/src/db/validation.ts
index 404afd0d4..2fa8408af 100644
--- a/examples/react/todo/src/db/validation.ts
+++ b/examples/react/todo/src/db/validation.ts
@@ -1,6 +1,6 @@
-import { createInsertSchema, createSelectSchema } from "drizzle-zod"
-import { config, todos } from "./schema"
-import type { z } from "zod"
+import { createInsertSchema, createSelectSchema } from 'drizzle-zod'
+import { config, todos } from './schema'
+import type { z } from 'zod'
 
 // Auto-generated schemas from Drizzle schema (omit auto-generated fields)
 export const insertTodoSchema = createInsertSchema(todos).omit({
diff --git a/examples/react/todo/src/index.css b/examples/react/todo/src/index.css
index 5211a0414..6dafed23c 100644
--- a/examples/react/todo/src/index.css
+++ b/examples/react/todo/src/index.css
@@ -1,4 +1,4 @@
-@import "tailwindcss";
+@import 'tailwindcss';
 
 html,
 body {
@@ -21,7 +21,7 @@ button {
 
 body {
   font:
-    14px "Helvetica Neue",
+    14px 'Helvetica Neue',
     Helvetica,
     Arial,
     sans-serif;
diff --git a/examples/react/todo/src/lib/api.ts b/examples/react/todo/src/lib/api.ts
index c6e070b31..e066cdbe6 100644
--- a/examples/react/todo/src/lib/api.ts
+++ b/examples/react/todo/src/lib/api.ts
@@ -1,4 +1,4 @@
-import type { SelectConfig, SelectTodo } from "../db/validation"
+import type { SelectConfig, SelectTodo } from '../db/validation'
 
 // API helper for todos and config
 const API_BASE_URL = `/api`
@@ -19,11 +19,11 @@ export const api = {
       return response.json()
     },
     create: async (
-      todo: Partial<SelectTodo>
+      todo: Partial<SelectTodo>,
     ): Promise<{ todo: SelectTodo; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/todos`, {
         method: `POST`,
-        headers: { "Content-Type": `application/json` },
+        headers: { 'Content-Type': `application/json` },
         body: JSON.stringify(todo),
       })
       if (!response.ok)
@@ -32,11 +32,11 @@ export const api = {
     },
     update: async (
       id: unknown,
-      changes: Partial<SelectTodo>
+      changes: Partial<SelectTodo>,
     ): Promise<{ todo: SelectTodo; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/todos/${id}`, {
         method: `PUT`,
-        headers: { "Content-Type": `application/json` },
+        headers: { 'Content-Type': `application/json` },
         body: JSON.stringify(changes),
       })
       if (!response.ok)
@@ -44,7 +44,7 @@ export const api = {
       return response.json()
     },
     delete: async (
-      id: unknown
+      id: unknown,
     ): Promise<{ success: boolean; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/todos/${id}`, {
         method: `DELETE`,
@@ -70,11 +70,11 @@ export const api = {
       return response.json()
     },
     create: async (
-      config: Partial<SelectConfig>
+      config: Partial<SelectConfig>,
     ): Promise<{ config: SelectConfig; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/config`, {
         method: `POST`,
-        headers: { "Content-Type": `application/json` },
+        headers: { 'Content-Type': `application/json` },
         body: JSON.stringify(config),
       })
       if (!response.ok)
@@ -83,11 +83,11 @@ export const api = {
     },
     update: async (
       id: number,
-      changes: Partial<SelectConfig>
+      changes: Partial<SelectConfig>,
     ): Promise<{ config: SelectConfig; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/config/${id}`, {
         method: `PUT`,
-        headers: { "Content-Type": `application/json` },
+        headers: { 'Content-Type': `application/json` },
         body: JSON.stringify(changes),
       })
       if (!response.ok)
diff --git a/examples/react/todo/src/lib/collections.ts b/examples/react/todo/src/lib/collections.ts
index 5e41bac92..689372b80 100644
--- a/examples/react/todo/src/lib/collections.ts
+++ b/examples/react/todo/src/lib/collections.ts
@@ -1,12 +1,12 @@
-import { createCollection } from "@tanstack/react-db"
-import { electricCollectionOptions } from "@tanstack/electric-db-collection"
-import { queryCollectionOptions } from "@tanstack/query-db-collection"
-import { trailBaseCollectionOptions } from "@tanstack/trailbase-db-collection"
-import { QueryClient } from "@tanstack/query-core"
-import { initClient } from "trailbase"
-import { selectConfigSchema, selectTodoSchema } from "../db/validation"
-import { api } from "./api"
-import type { SelectConfig, SelectTodo } from "../db/validation"
+import { createCollection } from '@tanstack/react-db'
+import { electricCollectionOptions } from '@tanstack/electric-db-collection'
+import { queryCollectionOptions } from '@tanstack/query-db-collection'
+import { trailBaseCollectionOptions } from '@tanstack/trailbase-db-collection'
+import { QueryClient } from '@tanstack/query-core'
+import { initClient } from 'trailbase'
+import { selectConfigSchema, selectTodoSchema } from '../db/validation'
+import { api } from './api'
+import type { SelectConfig, SelectTodo } from '../db/validation'
 
 // Create a query client for query collections
 const queryClient = new QueryClient()
@@ -48,7 +48,7 @@ export const electricTodoCollection = createCollection(
           }
           const response = await api.todos.update(original.id, changes)
           return response.txid
-        })
+        }),
       )
       return { txid: txids }
     },
@@ -61,11 +61,11 @@ export const electricTodoCollection = createCollection(
           }
           const response = await api.todos.delete(original.id)
           return response.txid
-        })
+        }),
       )
       return { txid: txids }
     },
-  })
+  }),
 )
 
 // Query Todo Collection
@@ -102,7 +102,7 @@ export const queryTodoCollection = createCollection(
             throw new Error(`Original todo not found for update`)
           }
           return await api.todos.update(original.id, changes)
-        })
+        }),
       )
     },
     onDelete: async ({ transaction }) => {
@@ -113,10 +113,10 @@ export const queryTodoCollection = createCollection(
             throw new Error(`Original todo not found for delete`)
           }
           await api.todos.delete(original.id)
-        })
+        }),
       )
     },
-  })
+  }),
 )
 
 type Todo = {
@@ -143,7 +143,7 @@ export const trailBaseTodoCollection = createCollection(
       created_at: (date) => Math.floor(date.valueOf() / 1000),
       updated_at: (date) => Math.floor(date.valueOf() / 1000),
     },
-  })
+  }),
 )
 
 // Electric Config Collection
@@ -175,11 +175,11 @@ export const electricConfigCollection = createCollection(
           }
           const response = await api.config.update(original.id, changes)
           return response.txid
-        })
+        }),
       )
       return { txid: txids }
     },
-  })
+  }),
 )
 
 // Query Config Collection
@@ -213,11 +213,11 @@ export const queryConfigCollection = createCollection(
           }
           const response = await api.config.update(original.id, changes)
           return response.txid
-        })
+        }),
       )
       return { txid: txids }
     },
-  })
+  }),
 )
 
 type Config = {
@@ -244,5 +244,5 @@ export const trailBaseConfigCollection = createCollection(
       created_at: (date) => Math.floor(date.valueOf() / 1000),
       updated_at: (date) => Math.floor(date.valueOf() / 1000),
     },
-  })
+  }),
 )
diff --git a/examples/react/todo/src/main.tsx b/examples/react/todo/src/main.tsx
index 0218796d3..5368d1602 100644
--- a/examples/react/todo/src/main.tsx
+++ b/examples/react/todo/src/main.tsx
@@ -1,13 +1,13 @@
-import { StrictMode } from "react"
-import { createRoot } from "react-dom/client"
-import { RouterProvider } from "@tanstack/react-router"
-import { getRouter } from "./router"
-import "./index.css"
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import { RouterProvider } from '@tanstack/react-router'
+import { getRouter } from './router'
+import './index.css'
 
 const router = getRouter()
 
 createRoot(document.getElementById(`root`)!).render(
   <StrictMode>
     <RouterProvider router={router} />
-  </StrictMode>
+  </StrictMode>,
 )
diff --git a/examples/react/todo/src/router.tsx b/examples/react/todo/src/router.tsx
index 75e151354..e4dfe3766 100644
--- a/examples/react/todo/src/router.tsx
+++ b/examples/react/todo/src/router.tsx
@@ -1,10 +1,10 @@
-import { createRouter as createTanstackRouter } from "@tanstack/react-router"
+import { createRouter as createTanstackRouter } from '@tanstack/react-router'
 
 // Import the generated route tree
-import { routeTree } from "./routeTree.gen"
-import { NotFound } from "./components/NotFound"
+import { routeTree } from './routeTree.gen'
+import { NotFound } from './components/NotFound'
 
-import "./styles.css"
+import './styles.css'
 
 // Create a new router instance
 export function getRouter() {
diff --git a/examples/react/todo/src/routes/__root.tsx b/examples/react/todo/src/routes/__root.tsx
index 94dd0b516..e57101152 100644
--- a/examples/react/todo/src/routes/__root.tsx
+++ b/examples/react/todo/src/routes/__root.tsx
@@ -1,12 +1,12 @@
-import * as React from "react"
+import * as React from 'react'
 import {
   HeadContent,
   Outlet,
   Scripts,
   createRootRoute,
-} from "@tanstack/react-router"
+} from '@tanstack/react-router'
 
-import appCss from "../styles.css?url"
+import appCss from '../styles.css?url'
 
 export const Route = createRootRoute({
   head: () => ({
diff --git a/examples/react/todo/src/routes/api/config.$id.ts b/examples/react/todo/src/routes/api/config.$id.ts
index 9acfec234..f60ef9a64 100644
--- a/examples/react/todo/src/routes/api/config.$id.ts
+++ b/examples/react/todo/src/routes/api/config.$id.ts
@@ -1,8 +1,8 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { json } from "@tanstack/react-start"
-import { sql } from "../../db/postgres"
-import { validateUpdateConfig } from "../../db/validation"
-import type { Txid } from "@tanstack/electric-db-collection"
+import { createFileRoute } from '@tanstack/react-router'
+import { json } from '@tanstack/react-start'
+import { sql } from '../../db/postgres'
+import { validateUpdateConfig } from '../../db/validation'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Generate a transaction ID
 async function generateTxId(tx: any): Promise<Txid> {
@@ -36,7 +36,7 @@ export const Route = createFileRoute(`/api/config/$id`)({
               error: `Failed to fetch config`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
@@ -76,7 +76,7 @@ export const Route = createFileRoute(`/api/config/$id`)({
               error: `Failed to update config`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
@@ -111,7 +111,7 @@ export const Route = createFileRoute(`/api/config/$id`)({
               error: `Failed to delete config`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
diff --git a/examples/react/todo/src/routes/api/config.ts b/examples/react/todo/src/routes/api/config.ts
index 2224720c2..c4ae48cc1 100644
--- a/examples/react/todo/src/routes/api/config.ts
+++ b/examples/react/todo/src/routes/api/config.ts
@@ -1,8 +1,8 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { json } from "@tanstack/react-start"
-import { sql } from "../../db/postgres"
-import { validateInsertConfig } from "../../db/validation"
-import type { Txid } from "@tanstack/electric-db-collection"
+import { createFileRoute } from '@tanstack/react-router'
+import { json } from '@tanstack/react-start'
+import { sql } from '../../db/postgres'
+import { validateInsertConfig } from '../../db/validation'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Generate a transaction ID
 async function generateTxId(tx: any): Promise<Txid> {
@@ -30,7 +30,7 @@ export const Route = createFileRoute(`/api/config`)({
               error: `Failed to fetch config`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
@@ -59,7 +59,7 @@ export const Route = createFileRoute(`/api/config`)({
               error: `Failed to create config`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
diff --git a/examples/react/todo/src/routes/api/todos.$id.ts b/examples/react/todo/src/routes/api/todos.$id.ts
index 12b4cf9e2..5f57126cd 100644
--- a/examples/react/todo/src/routes/api/todos.$id.ts
+++ b/examples/react/todo/src/routes/api/todos.$id.ts
@@ -1,8 +1,8 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { json } from "@tanstack/react-start"
-import { sql } from "../../db/postgres"
-import { validateUpdateTodo } from "../../db/validation"
-import type { Txid } from "@tanstack/electric-db-collection"
+import { createFileRoute } from '@tanstack/react-router'
+import { json } from '@tanstack/react-start'
+import { sql } from '../../db/postgres'
+import { validateUpdateTodo } from '../../db/validation'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Generate a transaction ID
 async function generateTxId(tx: any): Promise<Txid> {
@@ -36,7 +36,7 @@ export const Route = createFileRoute(`/api/todos/$id`)({
               error: `Failed to fetch todo`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
@@ -76,7 +76,7 @@ export const Route = createFileRoute(`/api/todos/$id`)({
               error: `Failed to update todo`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
@@ -111,7 +111,7 @@ export const Route = createFileRoute(`/api/todos/$id`)({
               error: `Failed to delete todo`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
diff --git a/examples/react/todo/src/routes/api/todos.ts b/examples/react/todo/src/routes/api/todos.ts
index 72b45f3e8..22fe77953 100644
--- a/examples/react/todo/src/routes/api/todos.ts
+++ b/examples/react/todo/src/routes/api/todos.ts
@@ -1,8 +1,8 @@
-import { createFileRoute } from "@tanstack/react-router"
-import { json } from "@tanstack/react-start"
-import { sql } from "../../db/postgres"
-import { validateInsertTodo } from "../../db/validation"
-import type { Txid } from "@tanstack/electric-db-collection"
+import { createFileRoute } from '@tanstack/react-router'
+import { json } from '@tanstack/react-start'
+import { sql } from '../../db/postgres'
+import { validateInsertTodo } from '../../db/validation'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Generate a transaction ID
 async function generateTxId(tx: any): Promise<Txid> {
@@ -34,7 +34,7 @@ export const Route = createFileRoute(`/api/todos`)({
               error: `Failed to fetch todos`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
@@ -62,7 +62,7 @@ export const Route = createFileRoute(`/api/todos`)({
               error: `Failed to create todo`,
               details: error instanceof Error ? error.message : String(error),
             },
-            { status: 500 }
+            { status: 500 },
           )
         }
       },
diff --git a/examples/react/todo/src/routes/electric.tsx b/examples/react/todo/src/routes/electric.tsx
index 461af9ecb..61629b81f 100644
--- a/examples/react/todo/src/routes/electric.tsx
+++ b/examples/react/todo/src/routes/electric.tsx
@@ -1,13 +1,13 @@
-import * as React from "react"
-import { createFileRoute } from "@tanstack/react-router"
-import { useLiveQuery } from "@tanstack/react-db"
+import * as React from 'react'
+import { createFileRoute } from '@tanstack/react-router'
+import { useLiveQuery } from '@tanstack/react-db'
 import {
   electricConfigCollection,
   electricTodoCollection,
-} from "../lib/collections"
-import { TodoApp } from "../components/TodoApp"
-import { api } from "../lib/api"
-import type { Transaction } from "@tanstack/react-db"
+} from '../lib/collections'
+import { TodoApp } from '../components/TodoApp'
+import { api } from '../lib/api'
+import type { Transaction } from '@tanstack/react-db'
 
 export const Route = createFileRoute(`/electric`)({
   component: ElectricPage,
@@ -27,11 +27,11 @@ function ElectricPage() {
   const { data: todos } = useLiveQuery((q) =>
     q
       .from({ todo: electricTodoCollection })
-      .orderBy(({ todo }) => todo.created_at, `asc`)
+      .orderBy(({ todo }) => todo.created_at, `asc`),
   )
 
   const { data: configData } = useLiveQuery((q) =>
-    q.from({ config: electricConfigCollection })
+    q.from({ config: electricConfigCollection }),
   )
 
   // Electric collections use txid to track sync
@@ -57,14 +57,14 @@ function ElectricPage() {
       }
       const response = await api.config.update(
         mutation.original.id,
-        mutation.changes
+        mutation.changes,
       )
       txids.push(response.txid)
     }
 
     // Wait for all txids to sync back to the collection
     await Promise.all(
-      txids.map((txid) => electricConfigCollection.utils.awaitTxid(txid))
+      txids.map((txid) => electricConfigCollection.utils.awaitTxid(txid)),
     )
   }
 
diff --git a/examples/react/todo/src/routes/index.tsx b/examples/react/todo/src/routes/index.tsx
index 0986beb69..34e259689 100644
--- a/examples/react/todo/src/routes/index.tsx
+++ b/examples/react/todo/src/routes/index.tsx
@@ -1,5 +1,5 @@
-import * as React from "react"
-import { Link, createFileRoute } from "@tanstack/react-router"
+import * as React from 'react'
+import { Link, createFileRoute } from '@tanstack/react-router'
 
 export const Route = createFileRoute(`/`)({
   component: HomePage,
diff --git a/examples/react/todo/src/routes/query.tsx b/examples/react/todo/src/routes/query.tsx
index f6a620296..62c0ad37d 100644
--- a/examples/react/todo/src/routes/query.tsx
+++ b/examples/react/todo/src/routes/query.tsx
@@ -1,10 +1,10 @@
-import * as React from "react"
-import { createFileRoute } from "@tanstack/react-router"
-import { useLiveQuery } from "@tanstack/react-db"
-import { queryConfigCollection, queryTodoCollection } from "../lib/collections"
-import { TodoApp } from "../components/TodoApp"
-import { api } from "../lib/api"
-import type { Transaction } from "@tanstack/react-db"
+import * as React from 'react'
+import { createFileRoute } from '@tanstack/react-router'
+import { useLiveQuery } from '@tanstack/react-db'
+import { queryConfigCollection, queryTodoCollection } from '../lib/collections'
+import { TodoApp } from '../components/TodoApp'
+import { api } from '../lib/api'
+import type { Transaction } from '@tanstack/react-db'
 
 export const Route = createFileRoute(`/query`)({
   component: QueryPage,
@@ -24,11 +24,11 @@ function QueryPage() {
   const { data: todos } = useLiveQuery((q) =>
     q
       .from({ todo: queryTodoCollection })
-      .orderBy(({ todo }) => todo.created_at, `asc`)
+      .orderBy(({ todo }) => todo.created_at, `asc`),
   )
 
   const { data: configData } = useLiveQuery((q) =>
-    q.from({ config: queryConfigCollection })
+    q.from({ config: queryConfigCollection }),
   )
 
   // Query collections automatically refetch after handler completes
@@ -42,7 +42,7 @@ function QueryPage() {
     await Promise.all(
       inserts.map(async (mutation) => {
         await api.config.create(mutation.modified)
-      })
+      }),
     )
 
     // Handle updates
@@ -53,7 +53,7 @@ function QueryPage() {
           throw new Error(`Original config not found for update`)
         }
         await api.config.update(mutation.original.id, mutation.changes)
-      })
+      }),
     )
 
     // Trigger refetch to get confirmed server state
diff --git a/examples/react/todo/src/routes/trailbase.tsx b/examples/react/todo/src/routes/trailbase.tsx
index 4c4370eba..96e05e11a 100644
--- a/examples/react/todo/src/routes/trailbase.tsx
+++ b/examples/react/todo/src/routes/trailbase.tsx
@@ -1,11 +1,11 @@
-import * as React from "react"
-import { createFileRoute } from "@tanstack/react-router"
-import { useLiveQuery } from "@tanstack/react-db"
+import * as React from 'react'
+import { createFileRoute } from '@tanstack/react-router'
+import { useLiveQuery } from '@tanstack/react-db'
 import {
   trailBaseConfigCollection,
   trailBaseTodoCollection,
-} from "../lib/collections"
-import { TodoApp } from "../components/TodoApp"
+} from '../lib/collections'
+import { TodoApp } from '../components/TodoApp'
 
 export const Route = createFileRoute(`/trailbase`)({
   component: TrailBasePage,
@@ -25,11 +25,11 @@ function TrailBasePage() {
   const { data: todos } = useLiveQuery((q) =>
     q
       .from({ todo: trailBaseTodoCollection })
-      .orderBy(({ todo }) => todo.created_at, `asc`)
+      .orderBy(({ todo }) => todo.created_at, `asc`),
   )
 
   const { data: configData } = useLiveQuery((q) =>
-    q.from({ config: trailBaseConfigCollection })
+    q.from({ config: trailBaseConfigCollection }),
   )
 
   // Note: TrailBase collections use recordApi internally, which is not exposed
diff --git a/examples/react/todo/src/server.ts b/examples/react/todo/src/server.ts
index 1f8997f3e..130fbb5a9 100644
--- a/examples/react/todo/src/server.ts
+++ b/examples/react/todo/src/server.ts
@@ -1,4 +1,4 @@
-import handler from "@tanstack/react-start/server-entry"
+import handler from '@tanstack/react-start/server-entry'
 
 export default {
   fetch(request: Request) {
diff --git a/examples/react/todo/src/start.tsx b/examples/react/todo/src/start.tsx
index de7b170ed..9e8694bab 100644
--- a/examples/react/todo/src/start.tsx
+++ b/examples/react/todo/src/start.tsx
@@ -1,4 +1,4 @@
-import { createStart } from "@tanstack/react-start"
+import { createStart } from '@tanstack/react-start'
 
 export const startInstance = createStart(() => {
   return {
diff --git a/examples/react/todo/src/styles.css b/examples/react/todo/src/styles.css
index 80cb92ada..06f1bca4b 100644
--- a/examples/react/todo/src/styles.css
+++ b/examples/react/todo/src/styles.css
@@ -1,15 +1,15 @@
-@import "tailwindcss";
+@import 'tailwindcss';
 
 body {
   @apply m-0;
   font-family:
-    -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
-    "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+    'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
 code {
   font-family:
-    source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
+    source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
 }
diff --git a/examples/react/todo/vite.config.ts b/examples/react/todo/vite.config.ts
index ab0b541fd..3bf6a06e3 100644
--- a/examples/react/todo/vite.config.ts
+++ b/examples/react/todo/vite.config.ts
@@ -1,8 +1,8 @@
-import { defineConfig } from "vite"
-import react from "@vitejs/plugin-react"
-import tailwindcss from "@tailwindcss/vite"
-import { tanstackStart } from "@tanstack/react-start/plugin/vite"
-import viteTsConfigPaths from "vite-tsconfig-paths"
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+import tailwindcss from '@tailwindcss/vite'
+import { tanstackStart } from '@tanstack/react-start/plugin/vite'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
 
 // https://vitejs.dev/config/
 export default defineConfig({
diff --git a/examples/solid/todo/docker-compose.yml b/examples/solid/todo/docker-compose.yml
index 9b6ddcffe..cb03bb1b3 100644
--- a/examples/solid/todo/docker-compose.yml
+++ b/examples/solid/todo/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.8"
+version: '3.8'
 services:
   postgres:
     image: postgres:17-alpine
@@ -7,7 +7,7 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
     ports:
-      - "54322:5432"
+      - '54322:5432'
     volumes:
       - ./postgres.conf:/etc/postgresql/postgresql.conf:ro
     tmpfs:
@@ -18,7 +18,7 @@ services:
       - -c
       - config_file=/etc/postgresql/postgresql.conf
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ['CMD-SHELL', 'pg_isready -U postgres']
       interval: 5s
       timeout: 5s
       retries: 5
@@ -37,11 +37,11 @@ services:
   trailbase:
     image: trailbase/trailbase:latest
     ports:
-      - "${PORT:-4000}:4000"
+      - '${PORT:-4000}:4000'
     restart: unless-stopped
     volumes:
       - ./traildepot:/app/traildepot
-    command: "/app/trail --data-dir /app/traildepot run --address 0.0.0.0:4000 --dev"
+    command: '/app/trail --data-dir /app/traildepot run --address 0.0.0.0:4000 --dev'
 
 volumes:
   postgres_data:
diff --git a/examples/solid/todo/drizzle.config.ts b/examples/solid/todo/drizzle.config.ts
index 550633431..486be88c9 100644
--- a/examples/solid/todo/drizzle.config.ts
+++ b/examples/solid/todo/drizzle.config.ts
@@ -1,4 +1,4 @@
-import type { Config } from "drizzle-kit"
+import type { Config } from 'drizzle-kit'
 
 export default {
   schema: `./src/db/schema.ts`,
diff --git a/examples/solid/todo/package.json b/examples/solid/todo/package.json
index 7b0a7ffdc..9c2dd369b 100644
--- a/examples/solid/todo/package.json
+++ b/examples/solid/todo/package.json
@@ -3,17 +3,17 @@
   "private": true,
   "version": "0.0.33",
   "dependencies": {
-    "@tanstack/electric-db-collection": "^0.2.10",
-    "@tanstack/query-core": "^5.90.11",
-    "@tanstack/query-db-collection": ">=0.0.0 <1.0.0",
-    "@tanstack/solid-db": "^0.1.52",
-    "@tanstack/solid-router": "^1.139.12",
-    "@tanstack/solid-start": "^1.139.12",
-    "@tanstack/trailbase-db-collection": "^0.1.53",
+    "@tanstack/electric-db-collection": "^0.2.12",
+    "@tanstack/query-core": "^5.90.12",
+    "@tanstack/query-db-collection": "^1.0.11",
+    "@tanstack/solid-db": "^0.1.54",
+    "@tanstack/solid-router": "^1.140.0",
+    "@tanstack/solid-start": "^1.140.0",
+    "@tanstack/trailbase-db-collection": "^0.1.55",
     "cors": "^2.8.5",
-    "drizzle-orm": "^0.44.7",
+    "drizzle-orm": "^0.45.0",
     "drizzle-zod": "^0.8.3",
-    "express": "^4.21.2",
+    "express": "^4.22.1",
     "postgres": "^3.4.7",
     "solid-js": "^1.9.10",
     "tailwindcss": "^4.1.17",
@@ -25,19 +25,19 @@
     "@tailwindcss/vite": "^4.1.17",
     "@types/cors": "^2.8.19",
     "@types/express": "^4.17.25",
-    "@types/node": "^22.18.1",
+    "@types/node": "^24.6.2",
     "@types/pg": "^8.15.6",
-    "@typescript-eslint/eslint-plugin": "^8.48.0",
-    "@typescript-eslint/parser": "^8.48.0",
+    "@typescript-eslint/eslint-plugin": "^8.48.1",
+    "@typescript-eslint/parser": "^8.48.1",
     "concurrently": "^9.2.1",
-    "dotenv": "^16.6.1",
-    "drizzle-kit": "^0.31.7",
+    "dotenv": "^17.2.3",
+    "drizzle-kit": "^0.31.8",
     "eslint": "^9.39.1",
     "eslint-plugin-solid": "^0.14.5",
     "pg": "^8.16.3",
     "tsx": "^4.21.0",
     "typescript": "^5.9.2",
-    "vite": "^7.1.7",
+    "vite": "^7.2.6",
     "vite-plugin-solid": "^2.11.10"
   },
   "scripts": {
diff --git a/examples/solid/todo/scripts/migrate.ts b/examples/solid/todo/scripts/migrate.ts
index ee0089f38..d58ebc44e 100644
--- a/examples/solid/todo/scripts/migrate.ts
+++ b/examples/solid/todo/scripts/migrate.ts
@@ -1,7 +1,7 @@
-import { drizzle } from "drizzle-orm/node-postgres"
-import { migrate } from "drizzle-orm/node-postgres/migrator"
-import pkg from "pg"
-import * as dotenv from "dotenv"
+import { drizzle } from 'drizzle-orm/node-postgres'
+import { migrate } from 'drizzle-orm/node-postgres/migrator'
+import pkg from 'pg'
+import * as dotenv from 'dotenv'
 
 dotenv.config()
 
diff --git a/examples/solid/todo/src/api/server.ts b/examples/solid/todo/src/api/server.ts
index 4aa55431d..948d2442e 100644
--- a/examples/solid/todo/src/api/server.ts
+++ b/examples/solid/todo/src/api/server.ts
@@ -1,14 +1,14 @@
-import express from "express"
-import cors from "cors"
-import { sql } from "../db/postgres"
+import express from 'express'
+import cors from 'cors'
+import { sql } from '../db/postgres'
 import {
   validateInsertConfig,
   validateInsertTodo,
   validateUpdateConfig,
   validateUpdateTodo,
-} from "../db/validation"
-import type { Express } from "express"
-import type { Txid } from "@tanstack/electric-db-collection"
+} from '../db/validation'
+import type { Express } from 'express'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Create Express app
 const app: Express = express()
diff --git a/examples/solid/todo/src/components/NotFound.tsx b/examples/solid/todo/src/components/NotFound.tsx
index 04619d4e8..3304c4195 100644
--- a/examples/solid/todo/src/components/NotFound.tsx
+++ b/examples/solid/todo/src/components/NotFound.tsx
@@ -1,4 +1,4 @@
-import { Link } from "@tanstack/solid-router"
+import { Link } from '@tanstack/solid-router'
 
 export function NotFound() {
   return (
diff --git a/examples/solid/todo/src/components/TodoApp.tsx b/examples/solid/todo/src/components/TodoApp.tsx
index 1e69d592c..c8cc0df58 100644
--- a/examples/solid/todo/src/components/TodoApp.tsx
+++ b/examples/solid/todo/src/components/TodoApp.tsx
@@ -1,8 +1,8 @@
-import { Link } from "@tanstack/solid-router"
-import { For, Show, createSignal } from "solid-js"
-import type { JSX } from "solid-js"
-import type { Collection } from "@tanstack/solid-db"
-import type { SelectConfig, SelectTodo } from "../db/validation"
+import { Link } from '@tanstack/solid-router'
+import { For, Show, createSignal } from 'solid-js'
+import type { JSX } from 'solid-js'
+import type { Collection } from '@tanstack/solid-db'
+import type { SelectConfig, SelectTodo } from '../db/validation'
 
 interface TodoAppProps {
   todos: Array<SelectTodo>
@@ -121,7 +121,7 @@ export function TodoApp(props: TodoAppProps) {
   return (
     <div
       class="min-h-screen flex items-start justify-center overflow-auto py-8"
-      style={{ "background-color": backgroundColor }}
+      style={{ 'background-color': backgroundColor }}
     >
       <div style={{ width: `550px` }} class="mx-auto relative">
         <div class="text-center mb-8">
@@ -193,9 +193,9 @@ export function TodoApp(props: TodoAppProps) {
                     todosToToggle.map((todo) => todo.id),
                     (drafts) => {
                       drafts.forEach(
-                        (draft) => (draft.completed = !allCompleted)
+                        (draft) => (draft.completed = !allCompleted),
                       )
-                    }
+                    },
                   )
                 }}
               >
@@ -262,7 +262,7 @@ export function TodoApp(props: TodoAppProps) {
                   <button
                     onClick={() => {
                       props.todoCollection.delete(
-                        completedTodos.map((todo) => todo.id)
+                        completedTodos.map((todo) => todo.id),
                       )
                     }}
                     class="text-inherit hover:underline"
diff --git a/examples/solid/todo/src/db/index.ts b/examples/solid/todo/src/db/index.ts
index 5a856e693..fbd0af99d 100644
--- a/examples/solid/todo/src/db/index.ts
+++ b/examples/solid/todo/src/db/index.ts
@@ -1,6 +1,6 @@
-import { drizzle } from "drizzle-orm/node-postgres"
-import { Pool } from "pg"
-import * as schema from "./schema"
+import { drizzle } from 'drizzle-orm/node-postgres'
+import { Pool } from 'pg'
+import * as schema from './schema'
 
 // Create a PostgreSQL pool
 const pool = new Pool({
diff --git a/examples/solid/todo/src/db/postgres.ts b/examples/solid/todo/src/db/postgres.ts
index 674348433..9a0c0437c 100644
--- a/examples/solid/todo/src/db/postgres.ts
+++ b/examples/solid/todo/src/db/postgres.ts
@@ -1,4 +1,4 @@
-import postgres from "postgres"
+import postgres from 'postgres'
 
 // Create a postgres instance
 export const sql = postgres({
diff --git a/examples/solid/todo/src/db/schema.ts b/examples/solid/todo/src/db/schema.ts
index 4bf9e0d0a..bed8f98a8 100644
--- a/examples/solid/todo/src/db/schema.ts
+++ b/examples/solid/todo/src/db/schema.ts
@@ -1,4 +1,4 @@
-import { boolean, pgTable, serial, text, timestamp } from "drizzle-orm/pg-core"
+import { boolean, pgTable, serial, text, timestamp } from 'drizzle-orm/pg-core'
 
 export const todos = pgTable(`todos`, {
   id: serial(`id`).primaryKey(),
diff --git a/examples/solid/todo/src/db/validation.ts b/examples/solid/todo/src/db/validation.ts
index 2aaab77b5..a3e71c7af 100644
--- a/examples/solid/todo/src/db/validation.ts
+++ b/examples/solid/todo/src/db/validation.ts
@@ -1,6 +1,6 @@
-import { createInsertSchema, createSelectSchema } from "drizzle-zod"
-import { z } from "zod"
-import { config, todos } from "./schema"
+import { createInsertSchema, createSelectSchema } from 'drizzle-zod'
+import { z } from 'zod'
+import { config, todos } from './schema'
 
 // Date transformation schema - handles Date objects, ISO strings, and parseable date strings
 const dateStringToDate = z
diff --git a/examples/solid/todo/src/index.css b/examples/solid/todo/src/index.css
index 5211a0414..6dafed23c 100644
--- a/examples/solid/todo/src/index.css
+++ b/examples/solid/todo/src/index.css
@@ -1,4 +1,4 @@
-@import "tailwindcss";
+@import 'tailwindcss';
 
 html,
 body {
@@ -21,7 +21,7 @@ button {
 
 body {
   font:
-    14px "Helvetica Neue",
+    14px 'Helvetica Neue',
     Helvetica,
     Arial,
     sans-serif;
diff --git a/examples/solid/todo/src/lib/api.ts b/examples/solid/todo/src/lib/api.ts
index c6e070b31..e066cdbe6 100644
--- a/examples/solid/todo/src/lib/api.ts
+++ b/examples/solid/todo/src/lib/api.ts
@@ -1,4 +1,4 @@
-import type { SelectConfig, SelectTodo } from "../db/validation"
+import type { SelectConfig, SelectTodo } from '../db/validation'
 
 // API helper for todos and config
 const API_BASE_URL = `/api`
@@ -19,11 +19,11 @@ export const api = {
       return response.json()
     },
     create: async (
-      todo: Partial<SelectTodo>
+      todo: Partial<SelectTodo>,
     ): Promise<{ todo: SelectTodo; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/todos`, {
         method: `POST`,
-        headers: { "Content-Type": `application/json` },
+        headers: { 'Content-Type': `application/json` },
         body: JSON.stringify(todo),
       })
       if (!response.ok)
@@ -32,11 +32,11 @@ export const api = {
     },
     update: async (
       id: unknown,
-      changes: Partial<SelectTodo>
+      changes: Partial<SelectTodo>,
     ): Promise<{ todo: SelectTodo; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/todos/${id}`, {
         method: `PUT`,
-        headers: { "Content-Type": `application/json` },
+        headers: { 'Content-Type': `application/json` },
         body: JSON.stringify(changes),
       })
       if (!response.ok)
@@ -44,7 +44,7 @@ export const api = {
       return response.json()
     },
     delete: async (
-      id: unknown
+      id: unknown,
     ): Promise<{ success: boolean; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/todos/${id}`, {
         method: `DELETE`,
@@ -70,11 +70,11 @@ export const api = {
       return response.json()
     },
     create: async (
-      config: Partial<SelectConfig>
+      config: Partial<SelectConfig>,
     ): Promise<{ config: SelectConfig; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/config`, {
         method: `POST`,
-        headers: { "Content-Type": `application/json` },
+        headers: { 'Content-Type': `application/json` },
         body: JSON.stringify(config),
       })
       if (!response.ok)
@@ -83,11 +83,11 @@ export const api = {
     },
     update: async (
       id: number,
-      changes: Partial<SelectConfig>
+      changes: Partial<SelectConfig>,
     ): Promise<{ config: SelectConfig; txid: number }> => {
       const response = await fetch(`${API_BASE_URL}/config/${id}`, {
         method: `PUT`,
-        headers: { "Content-Type": `application/json` },
+        headers: { 'Content-Type': `application/json` },
         body: JSON.stringify(changes),
       })
       if (!response.ok)
diff --git a/examples/solid/todo/src/lib/collections.ts b/examples/solid/todo/src/lib/collections.ts
index 8b4aeb3f4..fa7ce9530 100644
--- a/examples/solid/todo/src/lib/collections.ts
+++ b/examples/solid/todo/src/lib/collections.ts
@@ -1,12 +1,12 @@
-import { createCollection } from "@tanstack/solid-db"
-import { electricCollectionOptions } from "@tanstack/electric-db-collection"
-import { queryCollectionOptions } from "@tanstack/query-db-collection"
-import { trailBaseCollectionOptions } from "@tanstack/trailbase-db-collection"
-import { QueryClient } from "@tanstack/query-core"
-import { initClient } from "trailbase"
-import { selectConfigSchema, selectTodoSchema } from "../db/validation"
-import { api } from "./api"
-import type { SelectConfig, SelectTodo } from "../db/validation"
+import { createCollection } from '@tanstack/solid-db'
+import { electricCollectionOptions } from '@tanstack/electric-db-collection'
+import { queryCollectionOptions } from '@tanstack/query-db-collection'
+import { trailBaseCollectionOptions } from '@tanstack/trailbase-db-collection'
+import { QueryClient } from '@tanstack/query-core'
+import { initClient } from 'trailbase'
+import { selectConfigSchema, selectTodoSchema } from '../db/validation'
+import { api } from './api'
+import type { SelectConfig, SelectTodo } from '../db/validation'
 
 // Create a query client for query collections
 const queryClient = new QueryClient()
@@ -45,7 +45,7 @@ export const electricTodoCollection = createCollection(
           const { original, changes } = mutation
           const response = await api.todos.update(original.id, changes)
           return response.txid
-        })
+        }),
       )
       return { txid: txids }
     },
@@ -55,11 +55,11 @@ export const electricTodoCollection = createCollection(
           const { original } = mutation
           const response = await api.todos.delete(original.id)
           return response.txid
-        })
+        }),
       )
       return { txid: txids }
     },
-  })
+  }),
 )
 
 // Query Todo Collection
@@ -93,7 +93,7 @@ export const queryTodoCollection = createCollection(
         transaction.mutations.map(async (mutation) => {
           const { original, changes } = mutation
           return await api.todos.update(original.id, changes)
-        })
+        }),
       )
     },
     onDelete: async ({ transaction }) => {
@@ -101,10 +101,10 @@ export const queryTodoCollection = createCollection(
         transaction.mutations.map(async (mutation) => {
           const { original } = mutation
           await api.todos.delete(original.id)
-        })
+        }),
       )
     },
-  })
+  }),
 )
 
 type Todo = {
@@ -131,7 +131,7 @@ export const trailBaseTodoCollection = createCollection(
       created_at: (date) => Math.floor(date.valueOf() / 1000),
       updated_at: (date) => Math.floor(date.valueOf() / 1000),
     },
-  })
+  }),
 )
 
 // Electric Config Collection
@@ -160,11 +160,11 @@ export const electricConfigCollection = createCollection(
           const { original, changes } = mutation
           const response = await api.config.update(original.id, changes)
           return response.txid
-        })
+        }),
       )
       return { txid: txids }
     },
-  })
+  }),
 )
 
 // Query Config Collection
@@ -195,11 +195,11 @@ export const queryConfigCollection = createCollection(
           const { original, changes } = mutation
           const response = await api.config.update(original.id, changes)
           return response.txid
-        })
+        }),
       )
       return { txid: txids }
     },
-  })
+  }),
 )
 
 type Config = {
@@ -226,5 +226,5 @@ export const trailBaseConfigCollection = createCollection(
       created_at: (date) => Math.floor(date.valueOf() / 1000),
       updated_at: (date) => Math.floor(date.valueOf() / 1000),
     },
-  })
+  }),
 )
diff --git a/examples/solid/todo/src/main.tsx b/examples/solid/todo/src/main.tsx
index c165ede70..5384d2a20 100644
--- a/examples/solid/todo/src/main.tsx
+++ b/examples/solid/todo/src/main.tsx
@@ -1,11 +1,11 @@
-import { RouterProvider } from "@tanstack/solid-router"
-import { createRouter } from "./router"
-import "./index.css"
-import { render } from "solid-js/web"
+import { RouterProvider } from '@tanstack/solid-router'
+import { createRouter } from './router'
+import './index.css'
+import { render } from 'solid-js/web'
 
 const router = createRouter()
 
 render(
   () => <RouterProvider router={router} />,
-  document.getElementById(`root`)!
+  document.getElementById(`root`)!,
 )
diff --git a/examples/solid/todo/src/router.tsx b/examples/solid/todo/src/router.tsx
index df1b297ce..7d743ad93 100644
--- a/examples/solid/todo/src/router.tsx
+++ b/examples/solid/todo/src/router.tsx
@@ -1,10 +1,10 @@
-import { createRouter as createTanstackRouter } from "@tanstack/solid-router"
+import { createRouter as createTanstackRouter } from '@tanstack/solid-router'
 
 // Import the generated route tree
-import { routeTree } from "./routeTree.gen"
-import { NotFound } from "./components/NotFound"
+import { routeTree } from './routeTree.gen'
+import { NotFound } from './components/NotFound'
 
-import "./styles.css"
+import './styles.css'
 
 // Create a new router instance
 export const createRouter = () => {
@@ -19,7 +19,7 @@ export const createRouter = () => {
 }
 
 // Register the router instance for type safety
-declare module "@tanstack/solid-router" {
+declare module '@tanstack/solid-router' {
   interface Register {
     router: ReturnType<typeof createRouter>
   }
diff --git a/examples/solid/todo/src/routes/__root.tsx b/examples/solid/todo/src/routes/__root.tsx
index 33569b3b9..cf695549c 100644
--- a/examples/solid/todo/src/routes/__root.tsx
+++ b/examples/solid/todo/src/routes/__root.tsx
@@ -1,6 +1,6 @@
-import { Outlet, createRootRoute } from "@tanstack/solid-router"
+import { Outlet, createRootRoute } from '@tanstack/solid-router'
 
-import appCss from "../styles.css?url"
+import appCss from '../styles.css?url'
 
 export const Route = createRootRoute({
   head: () => ({
diff --git a/examples/solid/todo/src/routes/api/config.$id.ts b/examples/solid/todo/src/routes/api/config.$id.ts
index 829b73dc6..e4a751091 100644
--- a/examples/solid/todo/src/routes/api/config.$id.ts
+++ b/examples/solid/todo/src/routes/api/config.$id.ts
@@ -1,8 +1,8 @@
-import { createServerFileRoute } from "@tanstack/solid-start/server"
-import { json } from "@tanstack/solid-start"
-import { sql } from "../../db/postgres"
-import { validateUpdateConfig } from "../../db/validation"
-import type { Txid } from "@tanstack/electric-db-collection"
+import { createServerFileRoute } from '@tanstack/solid-start/server'
+import { json } from '@tanstack/solid-start'
+import { sql } from '../../db/postgres'
+import { validateUpdateConfig } from '../../db/validation'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Generate a transaction ID
 async function generateTxId(tx: any): Promise<Txid> {
@@ -34,7 +34,7 @@ export const ServerRoute = createServerFileRoute(`/api/config/$id`).methods({
           error: `Failed to fetch config`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
@@ -74,7 +74,7 @@ export const ServerRoute = createServerFileRoute(`/api/config/$id`).methods({
           error: `Failed to update config`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
@@ -109,7 +109,7 @@ export const ServerRoute = createServerFileRoute(`/api/config/$id`).methods({
           error: `Failed to delete config`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
diff --git a/examples/solid/todo/src/routes/api/config.ts b/examples/solid/todo/src/routes/api/config.ts
index e5b9fd724..7d25c555b 100644
--- a/examples/solid/todo/src/routes/api/config.ts
+++ b/examples/solid/todo/src/routes/api/config.ts
@@ -1,8 +1,8 @@
-import { createServerFileRoute } from "@tanstack/solid-start/server"
-import { json } from "@tanstack/solid-start"
-import { sql } from "../../db/postgres"
-import { validateInsertConfig } from "../../db/validation"
-import type { Txid } from "@tanstack/electric-db-collection"
+import { createServerFileRoute } from '@tanstack/solid-start/server'
+import { json } from '@tanstack/solid-start'
+import { sql } from '../../db/postgres'
+import { validateInsertConfig } from '../../db/validation'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Generate a transaction ID
 async function generateTxId(tx: any): Promise<Txid> {
@@ -28,7 +28,7 @@ export const ServerRoute = createServerFileRoute(`/api/config`).methods({
           error: `Failed to fetch config`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
@@ -57,7 +57,7 @@ export const ServerRoute = createServerFileRoute(`/api/config`).methods({
           error: `Failed to create config`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
diff --git a/examples/solid/todo/src/routes/api/todos.$id.ts b/examples/solid/todo/src/routes/api/todos.$id.ts
index d1ec5c187..32d6ce9f4 100644
--- a/examples/solid/todo/src/routes/api/todos.$id.ts
+++ b/examples/solid/todo/src/routes/api/todos.$id.ts
@@ -1,8 +1,8 @@
-import { createServerFileRoute } from "@tanstack/solid-start/server"
-import { json } from "@tanstack/solid-start"
-import { sql } from "../../db/postgres"
-import { validateUpdateTodo } from "../../db/validation"
-import type { Txid } from "@tanstack/electric-db-collection"
+import { createServerFileRoute } from '@tanstack/solid-start/server'
+import { json } from '@tanstack/solid-start'
+import { sql } from '../../db/postgres'
+import { validateUpdateTodo } from '../../db/validation'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Generate a transaction ID
 async function generateTxId(tx: any): Promise<Txid> {
@@ -34,7 +34,7 @@ export const ServerRoute = createServerFileRoute(`/api/todos/$id`).methods({
           error: `Failed to fetch todo`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
@@ -74,7 +74,7 @@ export const ServerRoute = createServerFileRoute(`/api/todos/$id`).methods({
           error: `Failed to update todo`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
@@ -109,7 +109,7 @@ export const ServerRoute = createServerFileRoute(`/api/todos/$id`).methods({
           error: `Failed to delete todo`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
diff --git a/examples/solid/todo/src/routes/api/todos.ts b/examples/solid/todo/src/routes/api/todos.ts
index ab4e6aeb2..931d5996b 100644
--- a/examples/solid/todo/src/routes/api/todos.ts
+++ b/examples/solid/todo/src/routes/api/todos.ts
@@ -1,8 +1,8 @@
-import { createServerFileRoute } from "@tanstack/solid-start/server"
-import { json } from "@tanstack/solid-start"
-import { sql } from "../../db/postgres"
-import { validateInsertTodo } from "../../db/validation"
-import type { Txid } from "@tanstack/electric-db-collection"
+import { createServerFileRoute } from '@tanstack/solid-start/server'
+import { json } from '@tanstack/solid-start'
+import { sql } from '../../db/postgres'
+import { validateInsertTodo } from '../../db/validation'
+import type { Txid } from '@tanstack/electric-db-collection'
 
 // Generate a transaction ID
 async function generateTxId(tx: any): Promise<Txid> {
@@ -32,7 +32,7 @@ export const ServerRoute = createServerFileRoute(`/api/todos`).methods({
           error: `Failed to fetch todos`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
@@ -60,7 +60,7 @@ export const ServerRoute = createServerFileRoute(`/api/todos`).methods({
           error: `Failed to create todo`,
           details: error instanceof Error ? error.message : String(error),
         },
-        { status: 500 }
+        { status: 500 },
       )
     }
   },
diff --git a/examples/solid/todo/src/routes/electric.tsx b/examples/solid/todo/src/routes/electric.tsx
index 0908e09a8..2bf391cfe 100644
--- a/examples/solid/todo/src/routes/electric.tsx
+++ b/examples/solid/todo/src/routes/electric.tsx
@@ -1,10 +1,10 @@
-import { createFileRoute } from "@tanstack/solid-router"
-import { useLiveQuery } from "@tanstack/solid-db"
+import { createFileRoute } from '@tanstack/solid-router'
+import { useLiveQuery } from '@tanstack/solid-db'
 import {
   electricConfigCollection,
   electricTodoCollection,
-} from "../lib/collections"
-import { TodoApp } from "../components/TodoApp"
+} from '../lib/collections'
+import { TodoApp } from '../components/TodoApp'
 
 export const Route = createFileRoute(`/electric`)({
   component: ElectricPage,
@@ -24,11 +24,11 @@ function ElectricPage() {
   const { data: todos } = useLiveQuery((q) =>
     q
       .from({ todo: electricTodoCollection })
-      .orderBy(({ todo }) => todo.created_at, `asc`)
+      .orderBy(({ todo }) => todo.created_at, `asc`),
   )
 
   const { data: configData } = useLiveQuery((q) =>
-    q.from({ config: electricConfigCollection })
+    q.from({ config: electricConfigCollection }),
   )
 
   return (
diff --git a/examples/solid/todo/src/routes/index.tsx b/examples/solid/todo/src/routes/index.tsx
index 584243c5d..dee31989a 100644
--- a/examples/solid/todo/src/routes/index.tsx
+++ b/examples/solid/todo/src/routes/index.tsx
@@ -1,4 +1,4 @@
-import { Link, createFileRoute } from "@tanstack/solid-router"
+import { Link, createFileRoute } from '@tanstack/solid-router'
 
 export const Route = createFileRoute(`/`)({
   component: HomePage,
diff --git a/examples/solid/todo/src/routes/query.tsx b/examples/solid/todo/src/routes/query.tsx
index 8423d82b4..11448cffd 100644
--- a/examples/solid/todo/src/routes/query.tsx
+++ b/examples/solid/todo/src/routes/query.tsx
@@ -1,7 +1,7 @@
-import { createFileRoute } from "@tanstack/solid-router"
-import { useLiveQuery } from "@tanstack/solid-db"
-import { queryConfigCollection, queryTodoCollection } from "../lib/collections"
-import { TodoApp } from "../components/TodoApp"
+import { createFileRoute } from '@tanstack/solid-router'
+import { useLiveQuery } from '@tanstack/solid-db'
+import { queryConfigCollection, queryTodoCollection } from '../lib/collections'
+import { TodoApp } from '../components/TodoApp'
 
 export const Route = createFileRoute(`/query`)({
   component: QueryPage,
@@ -21,11 +21,11 @@ function QueryPage() {
   const { data: todos } = useLiveQuery((q) =>
     q
       .from({ todo: queryTodoCollection })
-      .orderBy(({ todo }) => todo.created_at, `asc`)
+      .orderBy(({ todo }) => todo.created_at, `asc`),
   )
 
   const { data: configData } = useLiveQuery((q) =>
-    q.from({ config: queryConfigCollection })
+    q.from({ config: queryConfigCollection }),
   )
 
   return (
diff --git a/examples/solid/todo/src/routes/trailbase.tsx b/examples/solid/todo/src/routes/trailbase.tsx
index ed35fca34..c9f450ea4 100644
--- a/examples/solid/todo/src/routes/trailbase.tsx
+++ b/examples/solid/todo/src/routes/trailbase.tsx
@@ -1,10 +1,10 @@
-import { createFileRoute } from "@tanstack/solid-router"
-import { useLiveQuery } from "@tanstack/solid-db"
+import { createFileRoute } from '@tanstack/solid-router'
+import { useLiveQuery } from '@tanstack/solid-db'
 import {
   trailBaseConfigCollection,
   trailBaseTodoCollection,
-} from "../lib/collections"
-import { TodoApp } from "../components/TodoApp"
+} from '../lib/collections'
+import { TodoApp } from '../components/TodoApp'
 
 export const Route = createFileRoute(`/trailbase`)({
   component: TrailBasePage,
@@ -24,11 +24,11 @@ function TrailBasePage() {
   const { data: todos } = useLiveQuery((q) =>
     q
       .from({ todo: trailBaseTodoCollection })
-      .orderBy(({ todo }) => todo.created_at, `asc`)
+      .orderBy(({ todo }) => todo.created_at, `asc`),
   )
 
   const { data: configData } = useLiveQuery((q) =>
-    q.from({ config: trailBaseConfigCollection })
+    q.from({ config: trailBaseConfigCollection }),
   )
 
   return (
diff --git a/examples/solid/todo/src/styles.css b/examples/solid/todo/src/styles.css
index 80cb92ada..06f1bca4b 100644
--- a/examples/solid/todo/src/styles.css
+++ b/examples/solid/todo/src/styles.css
@@ -1,15 +1,15 @@
-@import "tailwindcss";
+@import 'tailwindcss';
 
 body {
   @apply m-0;
   font-family:
-    -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
-    "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+    'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
 code {
   font-family:
-    source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
+    source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
 }
diff --git a/examples/solid/todo/vite.config.ts b/examples/solid/todo/vite.config.ts
index 44199b888..f66ba076c 100644
--- a/examples/solid/todo/vite.config.ts
+++ b/examples/solid/todo/vite.config.ts
@@ -1,8 +1,8 @@
-import { defineConfig } from "vite"
-import solid from "vite-plugin-solid"
-import tailwindcss from "@tailwindcss/vite"
-import { tanstackStart } from "@tanstack/solid-start/plugin/vite"
-import viteTsConfigPaths from "vite-tsconfig-paths"
+import { defineConfig } from 'vite'
+import solid from 'vite-plugin-solid'
+import tailwindcss from '@tailwindcss/vite'
+import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
 
 // https://vitejs.dev/config/
 export default defineConfig({
diff --git a/package.json b/package.json
index db07c0766..ea2f51369 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "repository": {
     "type": "git",
-    "url": "https://github.com/tanstack/db.git"
+    "url": "git+https://github.com/TanStack/db.git"
   },
   "packageManager": "pnpm@10.24.0",
   "type": "module",
@@ -13,44 +13,44 @@
     "changeset": "changeset",
     "changeset:publish": "changeset publish",
     "changeset:version": "changeset version && pnpm install --no-frozen-lockfile",
-    "docs:generate": "tsx scripts/generateDocs.ts",
-    "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,md}\"",
+    "format": "prettier --experimental-cli --ignore-unknown '**/*' --write",
     "lint": "pnpm --filter \"./packages/**\" lint",
     "lint-all": "eslint . --fix",
     "prepare": "husky",
     "test": "pnpm --filter \"./packages/**\" test",
-    "test:verify-links": "node scripts/verify-links.ts"
+    "test:docs": "node scripts/verify-links.ts",
+    "test:sherif": "sherif -i zod",
+    "generate-docs": "node scripts/generate-docs.ts"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
     "@eslint/js": "^9.39.1",
-    "@stylistic/eslint-plugin": "^4.4.1",
     "@svitejs/changesets-changelog-github-compact": "^1.2.0",
-    "@tanstack/config": "^0.22.2",
+    "@tanstack/eslint-config": "0.3.4",
+    "@tanstack/typedoc-config": "0.3.3",
+    "@tanstack/vite-config": "0.4.3",
     "@testing-library/jest-dom": "^6.9.1",
     "@types/node": "^24.6.2",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     "@types/use-sync-external-store": "^1.5.0",
-    "@typescript-eslint/eslint-plugin": "^8.48.0",
-    "@typescript-eslint/parser": "^8.48.0",
+    "@typescript-eslint/eslint-plugin": "^8.48.1",
+    "@typescript-eslint/parser": "^8.48.1",
     "@vitejs/plugin-react": "^5.1.1",
     "eslint": "^9.39.1",
-    "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react": "^7.37.5",
     "husky": "^9.1.7",
     "jsdom": "^27.2.0",
-    "knip": "^5.70.2",
+    "knip": "^5.71.0",
     "lint-staged": "^15.5.2",
     "markdown-link-extractor": "^4.0.3",
-    "mitt": "^3.0.1",
-    "prettier": "^3.7.3",
+    "prettier": "^3.7.4",
     "publint": "^0.3.15",
     "sherif": "^1.9.0",
     "shx": "^0.4.0",
     "tinyglobby": "^0.2.15",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.2",
     "vite": "^7.2.6",
     "vitest": "^3.2.4",
@@ -60,30 +60,5 @@
     "*.{ts,tsx}": [
       "eslint --fix"
     ]
-  },
-  "workspaces": [
-    "packages/*",
-    "examples/*",
-    "examples/react/*"
-  ],
-  "pnpm": {
-    "overrides": {
-      "@tanstack/angular-db": "workspace:*",
-      "@tanstack/db": "workspace:*",
-      "@tanstack/db-ivm": "workspace:*",
-      "@tanstack/electric-db-collection": "workspace:*",
-      "@tanstack/offline-transactions": "workspace:*",
-      "@tanstack/powersync-db-collection": "workspace:*",
-      "@tanstack/query-db-collection": "workspace:*",
-      "@tanstack/react-db": "workspace:*",
-      "@tanstack/rxdb-db-collection": "workspace:*",
-      "@tanstack/solid-db": "workspace:*",
-      "@tanstack/svelte-db": "workspace:*",
-      "@tanstack/trailbase-db-collection": "workspace:*",
-      "@tanstack/vue-db": "workspace:*"
-    }
-  },
-  "dependencies": {
-    "tsx": "^4.21.0"
   }
 }
diff --git a/packages/angular-db/CHANGELOG.md b/packages/angular-db/CHANGELOG.md
index 34feccfeb..9be532a27 100644
--- a/packages/angular-db/CHANGELOG.md
+++ b/packages/angular-db/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @tanstack/angular-db
 
+## 0.1.41
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.1.40
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.1.39
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.1.38
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.1.37
+
+### Patch Changes
+
+- Fixed `isReady` to return `true` for disabled queries in `useLiveQuery`/`injectLiveQuery` across all framework packages. When a query function returns `null` or `undefined` (disabling the query), there's no async operation to wait for, so the hook should be considered "ready" immediately. ([#886](https://github.com/TanStack/db/pull/886))
+
+  Additionally, all frameworks now have proper TypeScript overloads that explicitly support returning `undefined | null` from query functions, making the disabled query pattern type-safe.
+
+  This fixes the common pattern where users conditionally enable queries and don't want to show loading states when the query is disabled.
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.1.36
 
 ### Patch Changes
diff --git a/packages/angular-db/package.json b/packages/angular-db/package.json
index d5e7f24dd..201f900a8 100644
--- a/packages/angular-db/package.json
+++ b/packages/angular-db/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@tanstack/angular-db",
+  "version": "0.1.41",
   "description": "Angular integration for @tanstack/db",
-  "version": "0.1.36",
   "author": "Ethan McDaniel",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/TanStack/db.git",
+    "url": "git+https://github.com/TanStack/db.git",
     "directory": "packages/angular-db"
   },
   "homepage": "https://tanstack.com/db",
@@ -15,20 +15,16 @@
     "angular",
     "typescript"
   ],
-  "packageManager": "pnpm@10.24.0",
-  "dependencies": {
-    "@tanstack/db": "workspace:*"
-  },
-  "devDependencies": {
-    "@angular/common": "^19.2.15",
-    "@angular/compiler": "^20.0.0",
-    "@angular/core": "^19.2.16",
-    "@angular/platform-browser": "^19.2.16",
-    "@angular/platform-browser-dynamic": "^19.2.16",
-    "@vitest/coverage-istanbul": "^3.2.4",
-    "rxjs": "^7.8.2",
-    "zone.js": "^0.16.0"
+  "scripts": {
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "test": "vitest --run",
+    "lint": "eslint . --fix"
   },
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -42,23 +38,26 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
+  "dependencies": {
+    "@tanstack/db": "workspace:*"
+  },
   "peerDependencies": {
     "@angular/core": ">=16.0.0",
     "rxjs": ">=6.0.0"
   },
-  "scripts": {
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "test": "npx vitest --run",
-    "lint": "eslint . --fix"
-  },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@angular/common": "^19.2.17",
+    "@angular/compiler": "^20.3.15",
+    "@angular/core": "^19.2.17",
+    "@angular/platform-browser": "^19.2.17",
+    "@angular/platform-browser-dynamic": "^19.2.17",
+    "@vitest/coverage-istanbul": "^3.2.4",
+    "rxjs": "^7.8.2",
+    "zone.js": "^0.16.0"
+  }
 }
diff --git a/packages/angular-db/src/index.ts b/packages/angular-db/src/index.ts
index 2220dc85f..e96a70de2 100644
--- a/packages/angular-db/src/index.ts
+++ b/packages/angular-db/src/index.ts
@@ -5,8 +5,8 @@ import {
   effect,
   inject,
   signal,
-} from "@angular/core"
-import { BaseQueryBuilder, createLiveQueryCollection } from "@tanstack/db"
+} from '@angular/core'
+import { BaseQueryBuilder, createLiveQueryCollection } from '@tanstack/db'
 import type {
   ChangeMessage,
   Collection,
@@ -16,8 +16,8 @@ import type {
   InitialQueryBuilder,
   LiveQueryCollectionConfig,
   QueryBuilder,
-} from "@tanstack/db"
-import type { Signal } from "@angular/core"
+} from '@tanstack/db'
+import type { Signal } from '@angular/core'
 
 /**
  * The result of calling `injectLiveQuery`.
@@ -69,20 +69,22 @@ export function injectLiveQuery<
   }) => QueryBuilder<TContext> | undefined | null
 }): InjectLiveQueryResult<GetResult<TContext>>
 export function injectLiveQuery<TContext extends Context>(
-  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>
+  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
 ): InjectLiveQueryResult<GetResult<TContext>>
 export function injectLiveQuery<TContext extends Context>(
-  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext> | undefined | null
+  queryFn: (
+    q: InitialQueryBuilder,
+  ) => QueryBuilder<TContext> | undefined | null,
 ): InjectLiveQueryResult<GetResult<TContext>>
 export function injectLiveQuery<TContext extends Context>(
-  config: LiveQueryCollectionConfig<TContext>
+  config: LiveQueryCollectionConfig<TContext>,
 ): InjectLiveQueryResult<GetResult<TContext>>
 export function injectLiveQuery<
   TResult extends object,
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: Collection<TResult, TKey, TUtils>
+  liveQueryCollection: Collection<TResult, TKey, TUtils>,
 ): InjectLiveQueryResult<TResult, TKey, TUtils>
 export function injectLiveQuery(opts: any) {
   assertInInjectionContext(injectLiveQuery)
@@ -156,11 +158,11 @@ export function injectLiveQuery(opts: any) {
   const state = signal(new Map<string | number, any>())
   const data = signal<Array<any>>([])
   const status = signal<CollectionStatus | `disabled`>(
-    collection() ? `idle` : `disabled`
+    collection() ? `idle` : `disabled`,
   )
 
   const syncDataFromCollection = (
-    currentCollection: Collection<any, any, any>
+    currentCollection: Collection<any, any, any>,
   ) => {
     const newState = new Map(currentCollection.entries())
     const newData = Array.from(currentCollection.values())
@@ -204,7 +206,7 @@ export function injectLiveQuery(opts: any) {
     const subscription = currentCollection.subscribeChanges(
       (_: Array<ChangeMessage<any>>) => {
         syncDataFromCollection(currentCollection)
-      }
+      },
     )
     unsub = subscription.unsubscribe.bind(subscription)
 
diff --git a/packages/angular-db/tests/inject-live-query.test.ts b/packages/angular-db/tests/inject-live-query.test.ts
index 7c721b453..2f4db01ca 100644
--- a/packages/angular-db/tests/inject-live-query.test.ts
+++ b/packages/angular-db/tests/inject-live-query.test.ts
@@ -1,21 +1,21 @@
-import { DestroyRef, inject, signal } from "@angular/core"
-import { TestBed } from "@angular/core/testing"
-import { describe, expect, it } from "vitest"
+import { DestroyRef, inject, signal } from '@angular/core'
+import { TestBed } from '@angular/core/testing'
+import { describe, expect, it } from 'vitest'
 import {
   createCollection,
   createLiveQueryCollection,
   eq,
   gt,
-} from "@tanstack/db"
-import { injectLiveQuery } from "../src/index"
-import { mockSyncCollectionOptions } from "../../db/tests/utils"
+} from '@tanstack/db'
+import { injectLiveQuery } from '../src/index'
+import { mockSyncCollectionOptions } from '../../db/tests/utils'
 import type {
   Collection,
   CollectionStatus,
   Context,
   LiveQueryCollectionConfig,
   QueryBuilder,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 // Import the same test utilities as Vue
 
@@ -65,7 +65,7 @@ async function waitForAngularUpdate() {
 
 function createMockCollection<T extends object, K extends string | number>(
   initial: Array<T & Record<`id`, K>> = [],
-  initialStatus: CollectionStatus = `ready`
+  initialStatus: CollectionStatus = `ready`,
 ): Collection<T, K, Record<string, never>> & {
   __setStatus: (s: CollectionStatus) => void
   __replaceAll: (rows: Array<T & Record<`id`, K>>) => void
@@ -167,7 +167,7 @@ describe(`injectLiveQuery`, () => {
     expect(() => {
       injectLiveQuery(() => ({}) as unknown as QueryBuilder<Context>)
     }).toThrow(
-      /NG0203:|injectLiveQuery\(\) can only be used within an injection context/i
+      /NG0203:|injectLiveQuery\(\) can only be used within an injection context/i,
     )
   })
 
@@ -178,7 +178,7 @@ describe(`injectLiveQuery`, () => {
           id: `test-persons-angular`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { state, data } = injectLiveQuery((q) =>
@@ -189,7 +189,7 @@ describe(`injectLiveQuery`, () => {
             id: persons.id,
             name: persons.name,
             age: persons.age,
-          }))
+          })),
       )
 
       await waitForAngularUpdate()
@@ -210,7 +210,7 @@ describe(`injectLiveQuery`, () => {
     await TestBed.runInInjectionContext(async () => {
       const col = createMockCollection<{ id: number; name: string }, number>(
         [{ id: 1, name: `A` }],
-        `ready`
+        `ready`,
       )
 
       const result = injectLiveQuery(col)
@@ -233,7 +233,7 @@ describe(`injectLiveQuery`, () => {
     await TestBed.runInInjectionContext(async () => {
       const col = createMockCollection<{ id: number; name: string }, number>(
         [{ id: 1, name: `A` }],
-        `ready`
+        `ready`,
       )
       const result = injectLiveQuery(col)
 
@@ -266,7 +266,7 @@ describe(`injectLiveQuery`, () => {
     await TestBed.runInInjectionContext(async () => {
       const col = createMockCollection<{ id: number; name: string }, number>(
         [],
-        `idle`
+        `idle`,
       )
       const { status, isReady, isLoading, isError, isCleanedUp } =
         injectLiveQuery(col)
@@ -303,7 +303,7 @@ describe(`injectLiveQuery`, () => {
           id: `test-persons-2-angular`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { state, data } = injectLiveQuery((q) =>
@@ -314,7 +314,7 @@ describe(`injectLiveQuery`, () => {
             id: c.id,
             name: c.name,
           }))
-          .orderBy(({ collection: c }) => c.id, `asc`)
+          .orderBy(({ collection: c }) => c.id, `asc`),
       )
 
       await waitForAngularUpdate()
@@ -369,7 +369,7 @@ describe(`injectLiveQuery`, () => {
             id: `4`,
             name: `Kyle Doe`,
           }),
-        ])
+        ]),
       )
     })
   })
@@ -382,7 +382,7 @@ describe(`injectLiveQuery`, () => {
           id: `reuse-test-angular`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const config: LiveQueryCollectionConfig<Context> = {
@@ -414,7 +414,7 @@ describe(`injectLiveQuery`, () => {
       })
 
       expect(col2).toBe(col1)
-    }
+    },
   )
 
   it(`creates a new collection when deps change`, async () => {
@@ -423,7 +423,7 @@ describe(`injectLiveQuery`, () => {
         id: `deps-change-test-angular`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const config: LiveQueryCollectionConfig<Context> = {
@@ -464,7 +464,7 @@ describe(`injectLiveQuery`, () => {
     await TestBed.runInInjectionContext(async () => {
       const col = createMockCollection<{ id: number; name: string }, number>(
         [],
-        `ready`
+        `ready`,
       )
 
       const a = injectLiveQuery(col)
@@ -481,7 +481,7 @@ describe(`injectLiveQuery`, () => {
     await TestBed.runInInjectionContext(async () => {
       const col = createMockCollection<{ id: number; name: string }, number>(
         [{ id: 1, name: `A` }],
-        `ready`
+        `ready`,
       )
 
       const destroyRef = inject(DestroyRef)
@@ -500,7 +500,7 @@ describe(`injectLiveQuery`, () => {
     await TestBed.runInInjectionContext(async () => {
       const col = createMockCollection<{ id: number; name: string }, number>(
         [],
-        `ready`
+        `ready`,
       )
       const res = injectLiveQuery(col)
 
@@ -517,7 +517,7 @@ describe(`injectLiveQuery`, () => {
           id: `query-fn-test-angular`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const res = injectLiveQuery((q) =>
@@ -527,7 +527,7 @@ describe(`injectLiveQuery`, () => {
           .select(({ persons }) => ({
             id: persons.id,
             name: persons.name,
-          }))
+          })),
       )
 
       await waitForAngularUpdate()
@@ -546,7 +546,7 @@ describe(`injectLiveQuery`, () => {
           id: `config-test-angular`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const config: LiveQueryCollectionConfig<Context> = {
@@ -574,7 +574,7 @@ describe(`injectLiveQuery`, () => {
     await TestBed.runInInjectionContext(async () => {
       const col = createMockCollection<{ id: number; name: string }, number>(
         [],
-        `ready`
+        `ready`,
       )
       const res = injectLiveQuery(col)
 
@@ -591,7 +591,7 @@ describe(`injectLiveQuery`, () => {
           id: `reactive-params-test-angular`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const projectId = signal(1)
@@ -630,7 +630,7 @@ describe(`injectLiveQuery`, () => {
             name: `John Smith`,
             team: `team1`,
           }),
-        ])
+        ]),
       )
 
       projectId.set(2)
@@ -653,7 +653,7 @@ describe(`injectLiveQuery`, () => {
           id: `reactive-update-test-angular`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const selectedProjectId = signal(2)
@@ -700,7 +700,7 @@ describe(`injectLiveQuery`, () => {
             name: `John Smith`,
             team: `team1`,
           }),
-        ])
+        ]),
       )
     })
   })
@@ -712,7 +712,7 @@ describe(`injectLiveQuery`, () => {
           id: `pre-created-collection-test-angular`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       // Create a live query collection beforehand
@@ -1040,7 +1040,7 @@ describe(`injectLiveQuery`, () => {
             id: `disabled-test-undefined-angular`,
             getKey: (person: Person) => person.id,
             initialData: initialPersons,
-          })
+          }),
         )
 
         const enabled = signal(false)
@@ -1091,7 +1091,7 @@ describe(`injectLiveQuery`, () => {
             id: `disabled-test-null-angular`,
             getKey: (person: Person) => person.id,
             initialData: initialPersons,
-          })
+          }),
         )
 
         const enabled = signal(false)
diff --git a/packages/angular-db/tests/test-setup.ts b/packages/angular-db/tests/test-setup.ts
index 97e72cf84..6c5fc708c 100644
--- a/packages/angular-db/tests/test-setup.ts
+++ b/packages/angular-db/tests/test-setup.ts
@@ -1,12 +1,12 @@
-import "zone.js"
-import "zone.js/testing"
-import { getTestBed } from "@angular/core/testing"
+import 'zone.js'
+import 'zone.js/testing'
+import { getTestBed } from '@angular/core/testing'
 import {
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting,
-} from "@angular/platform-browser-dynamic/testing"
+} from '@angular/platform-browser-dynamic/testing'
 
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
 )
diff --git a/packages/angular-db/vite.config.ts b/packages/angular-db/vite.config.ts
index 9ced2401a..2ae761c92 100644
--- a/packages/angular-db/vite.config.ts
+++ b/packages/angular-db/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -18,5 +18,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/db-collection-e2e/CHANGELOG.md b/packages/db-collection-e2e/CHANGELOG.md
index 00ff7f4a7..d30a8bf19 100644
--- a/packages/db-collection-e2e/CHANGELOG.md
+++ b/packages/db-collection-e2e/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @tanstack/db-collection-e2e
 
+## 0.0.14
+
+### Patch Changes
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd), [`f458e05`](https://github.com/TanStack/db/commit/f458e05bb6f5b577ba1d1032a48b46cf860f3c9d)]:
+  - @tanstack/db@0.5.11
+  - @tanstack/query-db-collection@1.0.6
+  - @tanstack/electric-db-collection@0.2.12
+
 ## 0.0.13
 
 ### Patch Changes
diff --git a/packages/db-collection-e2e/README.md b/packages/db-collection-e2e/README.md
index 292ef31e4..b027b14c7 100644
--- a/packages/db-collection-e2e/README.md
+++ b/packages/db-collection-e2e/README.md
@@ -152,14 +152,14 @@ Create `e2e/setup.ts` in your collection package. See real examples:
 Example structure:
 
 ```typescript
-import { createCollection } from "@tanstack/db"
-import { yourCollectionOptions } from "../src"
+import { createCollection } from '@tanstack/db'
+import { yourCollectionOptions } from '../src'
 import type {
   E2ETestConfig,
   User,
   Post,
   Comment,
-} from "../../db-collection-e2e/src/types"
+} from '../../db-collection-e2e/src/types'
 
 export async function createYourE2EConfig(options: {
   schema: string
@@ -171,19 +171,19 @@ export async function createYourE2EConfig(options: {
   const eagerUsers = createCollection(
     yourCollectionOptions({
       id: `your-e2e-users-eager-${Date.now()}`,
-      syncMode: "eager",
+      syncMode: 'eager',
       getKey: (item: User) => item.id,
       startSync: false,
-    })
+    }),
   )
 
   const onDemandUsers = createCollection(
     yourCollectionOptions({
       id: `your-e2e-users-ondemand-${Date.now()}`,
-      syncMode: "on-demand",
+      syncMode: 'on-demand',
       getKey: (item: User) => item.id,
       startSync: false,
-    })
+    }),
   )
 
   // ... create posts and comments collections similarly
@@ -219,18 +219,18 @@ export async function createYourE2EConfig(options: {
 Create `e2e/your-collection.e2e.test.ts`:
 
 ```typescript
-import { describe, it, expect } from "vitest"
-import { createCollection } from "@tanstack/db"
-import { yourCollectionOptions } from "../src"
+import { describe, it, expect } from 'vitest'
+import { createCollection } from '@tanstack/db'
+import { yourCollectionOptions } from '../src'
 
-describe("Your Collection E2E", () => {
-  it("should create collection", async () => {
+describe('Your Collection E2E', () => {
+  it('should create collection', async () => {
     const collection = createCollection(
       yourCollectionOptions({
-        id: "test-collection",
+        id: 'test-collection',
         getKey: (item: any) => item.id,
         startSync: false,
-      })
+      }),
     )
 
     expect(collection).toBeDefined()
@@ -248,7 +248,7 @@ Update your `vite.config.ts` to include e2e tests:
 ```typescript
 const config = defineConfig({
   test: {
-    include: ["tests/**/*.test.ts", "e2e/**/*.e2e.test.ts"],
+    include: ['tests/**/*.test.ts', 'e2e/**/*.e2e.test.ts'],
     // Remove dir: './tests' if present
   },
 })
@@ -274,9 +274,9 @@ Tests basic where clause functionality with ~20 test scenarios:
 **Example Test:**
 
 ```typescript
-it("should filter with eq() on number field", async () => {
+it('should filter with eq() on number field', async () => {
   const query = createLiveQueryCollection((q) =>
-    q.from({ user: usersCollection }).where(({ user }) => eq(user.age, 25))
+    q.from({ user: usersCollection }).where(({ user }) => eq(user.age, 25)),
   )
   await query.preload()
 
@@ -300,14 +300,14 @@ Tests ordering and pagination with ~15 test scenarios:
 **Example Test:**
 
 ```typescript
-it("should sort ascending by single field", async () => {
+it('should sort ascending by single field', async () => {
   const query = createLiveQueryCollection((q) =>
-    q.from({ user: usersCollection }).orderBy(({ user }) => user.age, "asc")
+    q.from({ user: usersCollection }).orderBy(({ user }) => user.age, 'asc'),
   )
   await query.preload()
 
   const results = Array.from(query.state.values())
-  assertSorted(results, "age", "asc")
+  assertSorted(results, 'age', 'asc')
 })
 ```
 
@@ -326,18 +326,18 @@ Tests multi-collection joins with ~12 test scenarios:
 **Example Test:**
 
 ```typescript
-it("should join Users and Posts", async () => {
+it('should join Users and Posts', async () => {
   const query = createLiveQueryCollection((q) =>
     q
       .from({ user: usersCollection })
       .join({ post: postsCollection }, ({ user, post }) =>
-        eq(user.id, post.userId)
+        eq(user.id, post.userId),
       )
       .select(({ user, post }) => ({
         id: post.id,
         userName: user.name,
         postTitle: post.title,
-      }))
+      })),
   )
   await query.preload()
 
diff --git a/packages/db-collection-e2e/docker/docker-compose.yml b/packages/db-collection-e2e/docker/docker-compose.yml
index 4f8ee4549..441aa5e48 100644
--- a/packages/db-collection-e2e/docker/docker-compose.yml
+++ b/packages/db-collection-e2e/docker/docker-compose.yml
@@ -1,4 +1,4 @@
-name: "tanstack-db-e2e"
+name: 'tanstack-db-e2e'
 
 services:
   postgres:
@@ -8,7 +8,7 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: password
     ports:
-      - "54321:5432"
+      - '54321:5432'
     volumes:
       - ./postgres.conf:/etc/postgresql/postgresql.conf:ro
     tmpfs:
@@ -19,7 +19,7 @@ services:
       - -c
       - config_file=/etc/postgresql/postgresql.conf
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ['CMD-SHELL', 'pg_isready -U postgres']
       interval: 2s
       timeout: 10s
       retries: 5
@@ -29,13 +29,14 @@ services:
     environment:
       DATABASE_URL: postgresql://postgres:password@postgres:5432/e2e_test?sslmode=disable
       ELECTRIC_INSECURE: true
+      ELECTRIC_FEATURE_FLAGS: 'allow_subqueries,tagged_subqueries'
     ports:
-      - "3000:3000"
+      - '3000:3000'
     depends_on:
       postgres:
         condition: service_healthy
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:3000/v1/health || exit 1"]
+      test: ['CMD-SHELL', 'curl -f http://localhost:3000/v1/health || exit 1']
       interval: 2s
       timeout: 10s
       retries: 5
diff --git a/packages/db-collection-e2e/package.json b/packages/db-collection-e2e/package.json
index 7137b5910..92d451a8a 100644
--- a/packages/db-collection-e2e/package.json
+++ b/packages/db-collection-e2e/package.json
@@ -1,15 +1,14 @@
 {
   "name": "@tanstack/db-collection-e2e",
-  "version": "0.0.13",
   "private": true,
   "description": "End-to-end test suite for TanStack DB collections",
-  "type": "module",
   "scripts": {
     "test": "echo 'This package contains shared test suites. Run tests from electric-db-collection or query-db-collection packages.'",
     "docker:up": "docker compose -f docker/docker-compose.yml up -d",
     "docker:down": "docker compose -f docker/docker-compose.yml down --volumes",
     "docker:logs": "docker compose -f docker/docker-compose.yml logs -f"
   },
+  "type": "module",
   "dependencies": {
     "@tanstack/db": "workspace:*",
     "@tanstack/electric-db-collection": "workspace:*",
@@ -22,6 +21,5 @@
     "typescript": "^5.9.2",
     "vite": "^7.2.6",
     "vitest": "^3.2.4"
-  },
-  "packageManager": "pnpm@10.24.0"
+  }
 }
diff --git a/packages/db-collection-e2e/src/fixtures/seed-data.ts b/packages/db-collection-e2e/src/fixtures/seed-data.ts
index efa2de571..98b979404 100644
--- a/packages/db-collection-e2e/src/fixtures/seed-data.ts
+++ b/packages/db-collection-e2e/src/fixtures/seed-data.ts
@@ -1,4 +1,4 @@
-import type { Comment, Post, SeedDataResult, User } from "../types"
+import type { Comment, Post, SeedDataResult, User } from '../types'
 
 // Cache UUIDs for deterministic behavior across test runs
 const uuidCache = new Map<string, string>()
@@ -14,7 +14,7 @@ function generateId(prefix: string, index: number): string {
     // Create a valid UUID v4 format
     uuidCache.set(
       key,
-      `${hex.slice(0, 8)}-0000-4000-8000-${hex.padStart(12, `0`)}`
+      `${hex.slice(0, 8)}-0000-4000-8000-${hex.padStart(12, `0`)}`,
     )
   }
   return uuidCache.get(key)!
diff --git a/packages/db-collection-e2e/src/fixtures/test-schema.ts b/packages/db-collection-e2e/src/fixtures/test-schema.ts
index 9b3bbe160..c3a3605dc 100644
--- a/packages/db-collection-e2e/src/fixtures/test-schema.ts
+++ b/packages/db-collection-e2e/src/fixtures/test-schema.ts
@@ -41,7 +41,7 @@ export async function createTestTables(
     users: string
     posts: string
     comments: string
-  }
+  },
 ): Promise<void> {
   await dbClient.query(`
     CREATE TABLE IF NOT EXISTS ${tableNames.users} (${USERS_TABLE_SCHEMA});
@@ -65,7 +65,7 @@ export async function dropTestTables(
     users: string
     posts: string
     comments: string
-  }
+  },
 ): Promise<void> {
   await dbClient.query(`DROP TABLE IF EXISTS ${tableNames.comments}`)
   await dbClient.query(`DROP TABLE IF EXISTS ${tableNames.posts}`)
diff --git a/packages/db-collection-e2e/src/index.ts b/packages/db-collection-e2e/src/index.ts
index ae6031196..bccff24e2 100644
--- a/packages/db-collection-e2e/src/index.ts
+++ b/packages/db-collection-e2e/src/index.ts
@@ -4,25 +4,26 @@
  * Shared end-to-end test suite for TanStack DB collections
  */
 
-export * from "./types"
-export * from "./fixtures/test-schema"
-export * from "./fixtures/seed-data"
-export * from "./utils/helpers"
-export * from "./utils/assertions"
+export * from './types'
+export * from './fixtures/test-schema'
+export * from './fixtures/seed-data'
+export * from './utils/helpers'
+export * from './utils/assertions'
 
 // Export specific utilities for convenience
 export {
   waitFor,
   waitForQueryData,
   waitForCollectionSize,
-} from "./utils/helpers"
+} from './utils/helpers'
 
 // Export test suite creators
-export { createPredicatesTestSuite } from "./suites/predicates.suite"
-export { createPaginationTestSuite } from "./suites/pagination.suite"
-export { createJoinsTestSuite } from "./suites/joins.suite"
-export { createDeduplicationTestSuite } from "./suites/deduplication.suite"
-export { createCollationTestSuite } from "./suites/collation.suite"
-export { createMutationsTestSuite } from "./suites/mutations.suite"
-export { createLiveUpdatesTestSuite } from "./suites/live-updates.suite"
-export { createProgressiveTestSuite } from "./suites/progressive.suite"
+export { createPredicatesTestSuite } from './suites/predicates.suite'
+export { createPaginationTestSuite } from './suites/pagination.suite'
+export { createJoinsTestSuite } from './suites/joins.suite'
+export { createDeduplicationTestSuite } from './suites/deduplication.suite'
+export { createCollationTestSuite } from './suites/collation.suite'
+export { createMutationsTestSuite } from './suites/mutations.suite'
+export { createLiveUpdatesTestSuite } from './suites/live-updates.suite'
+export { createProgressiveTestSuite } from './suites/progressive.suite'
+export { createMovesTestSuite } from './suites/moves.suite'
diff --git a/packages/db-collection-e2e/src/suites/collation.suite.ts b/packages/db-collection-e2e/src/suites/collation.suite.ts
index 360f49340..52bbc873b 100644
--- a/packages/db-collection-e2e/src/suites/collation.suite.ts
+++ b/packages/db-collection-e2e/src/suites/collation.suite.ts
@@ -4,13 +4,13 @@
  * Tests string collation configuration and behavior
  */
 
-import { describe, expect, it } from "vitest"
-import { createLiveQueryCollection, eq } from "@tanstack/db"
-import { waitForQueryData } from "../utils/helpers"
-import type { E2ETestConfig } from "../types"
+import { describe, expect, it } from 'vitest'
+import { createLiveQueryCollection, eq } from '@tanstack/db'
+import { waitForQueryData } from '../utils/helpers'
+import type { E2ETestConfig } from '../types'
 
 export function createCollationTestSuite(
-  getConfig: () => Promise<E2ETestConfig>
+  getConfig: () => Promise<E2ETestConfig>,
 ) {
   describe(`Collation Suite`, () => {
     describe(`Default Collation`, () => {
@@ -21,7 +21,7 @@ export function createCollationTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .orderBy(({ user }) => user.name, `asc`)
+            .orderBy(({ user }) => user.name, `asc`),
         )
 
         await query.preload()
@@ -42,7 +42,7 @@ export function createCollationTestSuite(
           (q) =>
             q
               .from({ user: usersCollection })
-              .where(({ user }) => eq(user.name, `alice 0`)) // lowercase
+              .where(({ user }) => eq(user.name, `alice 0`)), // lowercase
         )
 
         await query.preload()
@@ -124,7 +124,7 @@ export function createCollationTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .orderBy(({ user }) => user.name, `asc`)
+            .orderBy(({ user }) => user.name, `asc`),
         )
 
         await query.preload()
diff --git a/packages/db-collection-e2e/src/suites/deduplication.suite.ts b/packages/db-collection-e2e/src/suites/deduplication.suite.ts
index c8c6a0b04..14c59d2ee 100644
--- a/packages/db-collection-e2e/src/suites/deduplication.suite.ts
+++ b/packages/db-collection-e2e/src/suites/deduplication.suite.ts
@@ -4,13 +4,13 @@
  * Tests concurrent loadSubset calls and deduplication behavior
  */
 
-import { describe, expect, it } from "vitest"
-import { createLiveQueryCollection, eq, gt, isNull, lt } from "@tanstack/db"
-import { waitForQueryData } from "../utils/helpers"
-import type { E2ETestConfig } from "../types"
+import { describe, expect, it } from 'vitest'
+import { createLiveQueryCollection, eq, gt, isNull, lt } from '@tanstack/db'
+import { waitForQueryData } from '../utils/helpers'
+import type { E2ETestConfig } from '../types'
 
 export function createDeduplicationTestSuite(
-  getConfig: () => Promise<E2ETestConfig>
+  getConfig: () => Promise<E2ETestConfig>,
 ) {
   describe(`Deduplication Suite`, () => {
     describe(`Identical Predicates`, () => {
@@ -22,13 +22,13 @@ export function createDeduplicationTestSuite(
         const query1 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.age, 25))
+            .where(({ user }) => eq(user.age, 25)),
         )
 
         const query2 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.age, 25))
+            .where(({ user }) => eq(user.age, 25)),
         )
 
         // Execute concurrently
@@ -54,8 +54,8 @@ export function createDeduplicationTestSuite(
           createLiveQueryCollection((q) =>
             q
               .from({ user: usersCollection })
-              .where(({ user }) => gt(user.age, 30))
-          )
+              .where(({ user }) => gt(user.age, 30)),
+          ),
         )
 
         // Execute all concurrently
@@ -81,14 +81,14 @@ export function createDeduplicationTestSuite(
         const query1 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 25))
+            .where(({ user }) => gt(user.age, 25)),
         )
 
         // Query 2: age > 30 (subset of Query 1)
         const query2 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 30))
+            .where(({ user }) => gt(user.age, 30)),
         )
 
         // Execute concurrently
@@ -108,14 +108,14 @@ export function createDeduplicationTestSuite(
         const query1 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 50))
+            .where(({ user }) => gt(user.age, 50)),
         )
 
         // Query 2: age < 30
         const query2 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => lt(user.age, 30))
+            .where(({ user }) => lt(user.age, 30)),
         )
 
         // Execute concurrently
@@ -142,14 +142,14 @@ export function createDeduplicationTestSuite(
         const query1 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.isActive, true))
+            .where(({ user }) => eq(user.isActive, true)),
         )
 
         // Immediately start identical second query
         const query2 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.isActive, true))
+            .where(({ user }) => eq(user.isActive, true)),
         )
 
         // Both should complete successfully
@@ -165,13 +165,13 @@ export function createDeduplicationTestSuite(
         const query1 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 25))
+            .where(({ user }) => gt(user.age, 25)),
         )
 
         const query2 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 50))
+            .where(({ user }) => gt(user.age, 50)),
         )
 
         await Promise.all([query1.preload(), query2.preload()])
@@ -193,7 +193,7 @@ export function createDeduplicationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(10)
-            .offset(0)
+            .offset(0),
         )
 
         const query2 = createLiveQueryCollection((q) =>
@@ -201,7 +201,7 @@ export function createDeduplicationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(10)
-            .offset(0)
+            .offset(0),
         )
 
         await Promise.all([query1.preload(), query2.preload()])
@@ -222,14 +222,14 @@ export function createDeduplicationTestSuite(
           q
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
-            .limit(10)
+            .limit(10),
         )
 
         const query2 = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
-            .limit(20)
+            .limit(20),
         )
 
         await Promise.all([query1.preload(), query2.preload()])
@@ -251,7 +251,7 @@ export function createDeduplicationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(10)
-            .offset(0)
+            .offset(0),
         )
 
         const query2 = createLiveQueryCollection((q) =>
@@ -259,7 +259,7 @@ export function createDeduplicationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(10)
-            .offset(10)
+            .offset(10),
         )
 
         await Promise.all([query1.preload(), query2.preload()])
@@ -288,8 +288,8 @@ export function createDeduplicationTestSuite(
           createLiveQueryCollection((q) =>
             q
               .from({ user: usersCollection })
-              .where(({ user }) => eq(user.isActive, true))
-          )
+              .where(({ user }) => eq(user.isActive, true)),
+          ),
         )
 
         // Execute all simultaneously
@@ -314,28 +314,28 @@ export function createDeduplicationTestSuite(
           createLiveQueryCollection((q) =>
             q
               .from({ user: usersCollection })
-              .where(({ user }) => eq(user.age, 25))
+              .where(({ user }) => eq(user.age, 25)),
           ),
           createLiveQueryCollection((q) =>
             q
               .from({ user: usersCollection })
-              .where(({ user }) => gt(user.age, 50))
+              .where(({ user }) => gt(user.age, 50)),
           ),
           createLiveQueryCollection((q) =>
             q
               .from({ user: usersCollection })
-              .where(({ user }) => eq(user.isActive, true))
+              .where(({ user }) => eq(user.isActive, true)),
           ),
           createLiveQueryCollection((q) =>
             q
               .from({ user: usersCollection })
-              .where(({ user }) => isNull(user.email))
+              .where(({ user }) => isNull(user.email)),
           ),
         ]
 
         await Promise.all(queries.map((q) => q.preload()))
         await Promise.all(
-          queries.map((q) => waitForQueryData(q, { minSize: 1 }))
+          queries.map((q) => waitForQueryData(q, { minSize: 1 })),
         )
 
         // Each query should have valid results
diff --git a/packages/db-collection-e2e/src/suites/joins.suite.ts b/packages/db-collection-e2e/src/suites/joins.suite.ts
index 0771e333c..5f25bb20b 100644
--- a/packages/db-collection-e2e/src/suites/joins.suite.ts
+++ b/packages/db-collection-e2e/src/suites/joins.suite.ts
@@ -4,10 +4,10 @@
  * Tests multi-collection joins with various syncMode combinations
  */
 
-import { describe, expect, it } from "vitest"
-import { createLiveQueryCollection, eq, gt, isNull } from "@tanstack/db"
-import { waitFor, waitForQueryData } from "../utils/helpers"
-import type { E2ETestConfig } from "../types"
+import { describe, expect, it } from 'vitest'
+import { createLiveQueryCollection, eq, gt, isNull } from '@tanstack/db'
+import { waitFor, waitForQueryData } from '../utils/helpers'
+import type { E2ETestConfig } from '../types'
 
 export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
   describe(`Joins Suite`, () => {
@@ -21,13 +21,13 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
           q
             .from({ user: usersCollection })
             .join({ post: postsCollection }, ({ user, post }) =>
-              eq(user.id, post.userId)
+              eq(user.id, post.userId),
             )
             .select(({ user, post }) => ({
               id: post!.id,
               userName: user.name,
               postTitle: post!.title,
-            }))
+            })),
         )
 
         await query.preload()
@@ -51,7 +51,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
             .from({ user: usersCollection })
             .where(({ user }) => eq(user.isActive, true))
             .join({ post: postsCollection }, ({ user, post }) =>
-              eq(user.id, post.userId)
+              eq(user.id, post.userId),
             )
             .where(({ post }) => gt(post!.viewCount, 10))
             .select(({ user, post }) => ({
@@ -59,7 +59,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
               userName: user.name,
               postTitle: post!.title,
               viewCount: post!.viewCount,
-            }))
+            })),
         )
 
         await query.preload()
@@ -85,13 +85,13 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
             q
               .from({ user: usersEager })
               .join({ post: postsOnDemand }, ({ user, post }) =>
-                eq(user.id, post.userId)
+                eq(user.id, post.userId),
               )
               .select(({ user, post }) => ({
                 id: post!.id,
                 userName: user.name,
                 postTitle: post!.title,
-              }))
+              })),
           )
 
           await query.preload()
@@ -103,7 +103,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
           expect(results.length).toBeGreaterThan(0)
 
           await query.cleanup()
-        }
+        },
       )
 
       it(`should join with ordering across collections`, async () => {
@@ -115,7 +115,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
           q
             .from({ user: usersCollection })
             .join({ post: postsCollection }, ({ user, post }) =>
-              eq(user.id, post.userId)
+              eq(user.id, post.userId),
             )
             .orderBy(({ post }) => post!.viewCount, `desc`)
             .select(({ user, post }) => ({
@@ -123,7 +123,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
               userName: user.name,
               postTitle: post!.title,
               viewCount: post!.viewCount,
-            }))
+            })),
         )
 
         await query.preload()
@@ -164,7 +164,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
           q
             .from({ user: usersCollection })
             .join({ post: postsCollection }, ({ user, post }) =>
-              eq(user.id, post.userId)
+              eq(user.id, post.userId),
             )
             .orderBy(({ post }) => post!.id, `asc`)
             .limit(10)
@@ -173,7 +173,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
               id: post!.id,
               userName: user.name,
               postTitle: post!.title,
-            }))
+            })),
         )
 
         await query.preload()
@@ -194,14 +194,14 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
             .from({ user: users })
             .join({ post: posts }, ({ user, post }) => eq(user.id, post.userId))
             .join({ comment: comments }, ({ post, comment }) =>
-              eq(post!.id, comment.postId)
+              eq(post!.id, comment.postId),
             )
             .select(({ user, post, comment }) => ({
               id: comment!.id,
               userName: user.name,
               postTitle: post!.title,
               commentText: comment!.text,
-            }))
+            })),
         )
 
         await query.preload()
@@ -227,7 +227,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
             .join({ post: posts }, ({ user, post }) => eq(user.id, post.userId))
             .where(({ post }) => isNull(post!.deletedAt))
             .join({ comment: comments }, ({ post, comment }) =>
-              eq(post!.id, comment.postId)
+              eq(post!.id, comment.postId),
             )
             .where(({ comment }) => isNull(comment!.deletedAt))
             .select(({ user, post, comment }) => ({
@@ -235,7 +235,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
               userName: user.name,
               postTitle: post!.title,
               commentText: comment!.text,
-            }))
+            })),
         )
 
         await query.preload()
@@ -261,17 +261,17 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
             q
               .from({ user: usersEager })
               .join({ post: postsOnDemand }, ({ user, post }) =>
-                eq(user.id, post.userId)
+                eq(user.id, post.userId),
               )
               .join({ comment: commentsOnDemand }, ({ post, comment }) =>
-                eq(post!.id, comment.postId)
+                eq(post!.id, comment.postId),
               )
               .select(({ user, post, comment }) => ({
                 id: comment!.id,
                 userName: user.name,
                 postTitle: post!.title,
                 commentText: comment!.text,
-              }))
+              })),
           )
 
           await query.preload()
@@ -283,7 +283,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
           expect(results.length).toBeGreaterThan(0)
 
           await query.cleanup()
-        }
+        },
       )
     })
 
@@ -302,7 +302,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
               userName: user.name,
               postTitle: post!.title,
               viewCount: post!.viewCount,
-            }))
+            })),
         )
 
         await query.preload()
@@ -330,7 +330,7 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
               userName: user.name,
               userAge: user.age,
               postTitle: post!.title,
-            }))
+            })),
         )
 
         await query.preload()
@@ -354,13 +354,13 @@ export function createJoinsTestSuite(getConfig: () => Promise<E2ETestConfig>) {
           q
             .from({ user: users })
             .leftJoin({ post: posts }, ({ user, post }) =>
-              eq(user.id, post.userId)
+              eq(user.id, post.userId),
             )
             .select(({ user, post }) => ({
               id: user.id,
               userName: user.name,
               postTitle: post!.title, // May be null for users without posts
-            }))
+            })),
         )
 
         await query.preload()
diff --git a/packages/db-collection-e2e/src/suites/live-updates.suite.ts b/packages/db-collection-e2e/src/suites/live-updates.suite.ts
index 10bd15b0d..5b1f790e5 100644
--- a/packages/db-collection-e2e/src/suites/live-updates.suite.ts
+++ b/packages/db-collection-e2e/src/suites/live-updates.suite.ts
@@ -4,14 +4,14 @@
  * Tests reactive updates for sync-enabled collections
  */
 
-import { randomUUID } from "node:crypto"
-import { describe, expect, it } from "vitest"
-import { createLiveQueryCollection, gt } from "@tanstack/db"
-import { waitFor, waitForQueryData } from "../utils/helpers"
-import type { E2ETestConfig } from "../types"
+import { randomUUID } from 'node:crypto'
+import { describe, expect, it } from 'vitest'
+import { createLiveQueryCollection, gt } from '@tanstack/db'
+import { waitFor, waitForQueryData } from '../utils/helpers'
+import type { E2ETestConfig } from '../types'
 
 export function createLiveUpdatesTestSuite(
-  getConfig: () => Promise<E2ETestConfig>
+  getConfig: () => Promise<E2ETestConfig>,
 ) {
   describe(`Live Updates Suite`, () => {
     describe(`Reactive Updates`, () => {
@@ -27,7 +27,7 @@ export function createLiveUpdatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 30))
+            .where(({ user }) => gt(user.age, 30)),
         )
 
         await query.preload()
@@ -66,7 +66,7 @@ export function createLiveUpdatesTestSuite(
             {
               timeout: 5000,
               message: `Deletion of user ${newUserId} did not propagate`,
-            }
+            },
           )
         }
 
@@ -85,7 +85,7 @@ export function createLiveUpdatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 30))
+            .where(({ user }) => gt(user.age, 30)),
         )
 
         await query.preload()
@@ -124,7 +124,7 @@ export function createLiveUpdatesTestSuite(
             {
               timeout: 5000,
               message: `Deletion of user ${newUserId} did not propagate`,
-            }
+            },
           )
         }
 
@@ -143,7 +143,7 @@ export function createLiveUpdatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 30))
+            .where(({ user }) => gt(user.age, 30)),
         )
 
         await query.preload()
@@ -183,7 +183,7 @@ export function createLiveUpdatesTestSuite(
         const usersCollection = config.collections.onDemand.users
 
         const query = createLiveQueryCollection((q) =>
-          q.from({ user: usersCollection })
+          q.from({ user: usersCollection }),
         )
 
         await query.preload()
@@ -227,7 +227,7 @@ export function createLiveUpdatesTestSuite(
             {
               timeout: 5000,
               message: `Deletion of user ${newUserId} did not propagate`,
-            }
+            },
           )
         }
 
@@ -246,7 +246,7 @@ export function createLiveUpdatesTestSuite(
         const usersCollection = config.collections.onDemand.users
 
         const query = createLiveQueryCollection((q) =>
-          q.from({ user: usersCollection })
+          q.from({ user: usersCollection }),
         )
 
         await query.preload()
@@ -270,7 +270,7 @@ export function createLiveUpdatesTestSuite(
               const updated = query.get(userToUpdate.id)
               return updated?.age === originalAge + 10
             },
-            { timeout: 5000, message: `Update did not sync to query` }
+            { timeout: 5000, message: `Update did not sync to query` },
           )
 
           // Verify the update
diff --git a/packages/db-collection-e2e/src/suites/moves.suite.ts b/packages/db-collection-e2e/src/suites/moves.suite.ts
new file mode 100644
index 000000000..cfc7fda40
--- /dev/null
+++ b/packages/db-collection-e2e/src/suites/moves.suite.ts
@@ -0,0 +1,756 @@
+/**
+ * Tags Test Suite
+ *
+ * Tests Electric collection tag behavior with subqueries
+ * Only Electric collection supports tags (via shapes with subqueries)
+ */
+
+import { randomUUID } from 'node:crypto'
+import { beforeAll, describe, expect, it } from 'vitest'
+import { createCollection } from '@tanstack/db'
+import { electricCollectionOptions } from '@tanstack/electric-db-collection'
+import { waitFor } from '../utils/helpers'
+import type { E2ETestConfig } from '../types'
+import type { Client } from 'pg'
+import type { Collection } from '@tanstack/db'
+import type { ElectricCollectionUtils } from '@tanstack/electric-db-collection'
+
+interface TagsTestConfig extends E2ETestConfig {
+  tagsTestSetup: {
+    dbClient: Client
+    baseUrl: string
+    testSchema: string
+    usersTable: string
+    postsTable: string
+  }
+}
+
+type SyncMode = 'eager' | 'on-demand' | 'progressive'
+
+export function createMovesTestSuite(getConfig: () => Promise<TagsTestConfig>) {
+  describe(`Moves Suite`, () => {
+    let usersTable: string
+    let postsTable: string
+    let dbClient: Client
+    let baseUrl: string
+    let testSchema: string
+    let config: TagsTestConfig
+
+    beforeAll(async () => {
+      config = await getConfig()
+      const setup = config.tagsTestSetup
+      dbClient = setup.dbClient
+      baseUrl = setup.baseUrl
+      testSchema = setup.testSchema
+      usersTable = setup.usersTable
+      postsTable = setup.postsTable
+    })
+
+    // Helper to create a collection on posts table with WHERE clause that has nested subquery
+    // This creates a shape: posts WHERE userId IN (SELECT id FROM users WHERE isActive = true)
+    // When a user's isActive changes, posts will move in/out of this shape
+    function createPostsByActiveUsersCollection(
+      syncMode: SyncMode,
+      id?: string,
+    ): Collection<any, string, ElectricCollectionUtils, any, any> {
+      // Remove quotes from table names for the WHERE clause SQL
+      const usersTableUnquoted = usersTable.replace(/"/g, ``)
+      const collectionId =
+        id || `tags-posts-active-users-${syncMode}-${Date.now()}`
+
+      return createCollection(
+        electricCollectionOptions({
+          id: collectionId,
+          shapeOptions: {
+            url: `${baseUrl}/v1/shape`,
+            params: {
+              table: `${testSchema}.${postsTable}`,
+              // WHERE clause with nested subquery
+              // Posts will move in/out when users' isActive changes
+              // Column reference should be just the column name, not the full table path
+              where: `"userId" IN (SELECT id FROM ${testSchema}.${usersTableUnquoted} WHERE "isActive" = true)`,
+            },
+          },
+          syncMode,
+          getKey: (item: any) => item.id,
+          startSync: syncMode !== 'progressive',
+        }),
+      ) as any
+    }
+
+    // Helper to wait for collection to be ready
+    async function waitForReady(
+      collection: Collection<any, any, any, any, any>,
+      syncMode: SyncMode,
+    ) {
+      if (syncMode === 'progressive') {
+        // For progressive mode, start sync explicitly
+        collection.startSyncImmediate()
+      }
+      await collection.preload()
+      await waitFor(() => collection.status === `ready`, {
+        timeout: 30000,
+        message: `Collection did not become ready`,
+      })
+    }
+
+    // Helper to wait for a specific item to appear
+    async function waitForItem(
+      collection: Collection<any, any, any, any, any>,
+      itemId: string,
+      timeout: number = 10000,
+    ) {
+      await waitFor(() => collection.has(itemId), {
+        timeout,
+        message: `Item ${itemId} did not appear in collection`,
+      })
+    }
+
+    // Helper to wait for a specific item to disappear
+    async function waitForItemRemoved(
+      collection: Collection<any, any, any, any, any>,
+      itemId: string,
+      timeout: number = 2000,
+    ) {
+      await waitFor(() => !collection.has(itemId), {
+        timeout,
+        message: `Item ${itemId} was not removed from collection`,
+      })
+    }
+
+    // Helper to wait for users to be synced to Electric/TanStack DB
+    async function waitForUsersSynced(
+      userIds: Array<string>,
+      timeout: number = 10000,
+    ) {
+      // Use eager collection since it continuously syncs all data
+      const usersCollection = config.collections.eager.users
+      await waitFor(
+        () => {
+          return userIds.every((userId) => usersCollection.has(userId))
+        },
+        {
+          timeout,
+          message: `Users ${userIds.join(', ')} did not sync to collection`,
+        },
+      )
+    }
+
+    // Helper function to run all tests for a given sync mode
+    function runTestsForSyncMode(syncMode: SyncMode) {
+      describe(`${syncMode} mode`, () => {
+        it(`Initial snapshot contains only posts from active users`, async () => {
+          // Create collection on posts with WHERE clause: userId IN (SELECT id FROM users WHERE isActive = true)
+          const collection = createPostsByActiveUsersCollection(syncMode)
+
+          if (!config.mutations) {
+            throw new Error(`Mutations not configured`)
+          }
+
+          // Insert 2 active users and 1 inactive user
+          const userId1 = randomUUID()
+          const userId2 = randomUUID()
+          const userId3 = randomUUID()
+
+          await config.mutations.insertUser({
+            id: userId1,
+            name: `Active User 1`,
+            email: `user1@test.com`,
+            age: 25,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          await config.mutations.insertUser({
+            id: userId2,
+            name: `Active User 2`,
+            email: `user2@test.com`,
+            age: 30,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          await config.mutations.insertUser({
+            id: userId3,
+            name: `Inactive User`,
+            email: `user3@test.com`,
+            age: 42,
+            isActive: false,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          // Wait for all 3 users to be synced to Electric before inserting posts
+          // This ensures the subquery in the WHERE clause can properly evaluate
+          await waitForUsersSynced([userId1, userId2, userId3])
+
+          // Insert posts for these users
+          const postId1 = randomUUID()
+          const postId2 = randomUUID()
+          const postId3 = randomUUID()
+
+          await config.mutations.insertPost({
+            id: postId1,
+            userId: userId1,
+            title: `Post 1`,
+            content: `Content 1`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          await config.mutations.insertPost({
+            id: postId2,
+            userId: userId2,
+            title: `Post 2`,
+            content: `Content 2`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          await config.mutations.insertPost({
+            id: postId3,
+            userId: userId3,
+            title: `Post 3`,
+            content: `Content 3`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          // Wait for collection to sync
+          await waitForReady(collection, syncMode)
+
+          // Wait for both posts to appear (users are active, so posts match the subquery)
+          await waitForItem(collection, postId1)
+          await waitForItem(collection, postId2)
+
+          // Verify only posts 1 and 2 are in the collection
+          expect(collection.has(postId1)).toBe(true)
+          expect(collection.has(postId2)).toBe(true)
+          expect(collection.has(postId3)).toBe(false)
+
+          // Wait a bit to make sure post 3 is not coming in later
+          await new Promise((resolve) => setTimeout(resolve, 50))
+          expect(collection.has(postId3)).toBe(false)
+
+          // Note: Tags are internal to Electric and may not be directly accessible
+          // The test verifies that posts with matching conditions appear in snapshot
+
+          // Clean up
+          await dbClient.query(`DELETE FROM ${postsTable}`)
+          await dbClient.query(`DELETE FROM ${usersTable}`)
+          await collection.cleanup()
+        })
+
+        it(`Move-in: row becomes eligible for subquery`, async () => {
+          const collection = createPostsByActiveUsersCollection(syncMode)
+          await waitForReady(collection, syncMode)
+
+          if (!config.mutations) {
+            throw new Error(`Mutations not configured`)
+          }
+
+          // Insert user with isActive = false
+          const userId = randomUUID()
+          await config.mutations.insertUser({
+            id: userId,
+            name: `Inactive User`,
+            email: `inactive@test.com`,
+            age: 25,
+            isActive: false,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          // Wait for user to be synced to Electric before inserting post
+          await waitForUsersSynced([userId])
+
+          // Insert post for this user
+          const postId = randomUUID()
+          await config.mutations.insertPost({
+            id: postId,
+            userId,
+            title: `Inactive User Post`,
+            content: `Content`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          // Wait a bit to ensure post doesn't appear (user is inactive, so post doesn't match subquery)
+          await new Promise((resolve) => setTimeout(resolve, 500))
+          expect(collection.has(postId)).toBe(false)
+
+          // Update user to isActive = true (move-in for the post)
+          await config.mutations.updateUser(userId, { isActive: true })
+
+          // Wait for post to appear (move-in)
+          await waitForItem(collection, postId, 1000)
+          expect(collection.has(postId)).toBe(true)
+          expect(collection.get(postId)?.title).toBe(`Inactive User Post`)
+
+          // Clean up
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId,
+          ])
+          await config.mutations.deleteUser(userId)
+          await collection.cleanup()
+        })
+
+        it(`Move-out: row becomes ineligible for subquery`, async () => {
+          const collection = createPostsByActiveUsersCollection(syncMode)
+          await waitForReady(collection, syncMode)
+
+          if (!config.mutations) {
+            throw new Error(`Mutations not configured`)
+          }
+
+          // Insert user with isActive = true
+          const userId = randomUUID()
+          await config.mutations.insertUser({
+            id: userId,
+            name: `Active User`,
+            email: `active@test.com`,
+            age: 25,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          // Wait for user to be synced to Electric before inserting post
+          await waitForUsersSynced([userId])
+
+          // Insert post for this user
+          const postId = randomUUID()
+          await config.mutations.insertPost({
+            id: postId,
+            userId,
+            title: `Active User Post`,
+            content: `Content`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          // Wait for post to appear (user is active, so post matches subquery)
+          await waitForItem(collection, postId)
+          expect(collection.has(postId)).toBe(true)
+
+          // Update user to isActive = false (move-out for the post)
+          await config.mutations.updateUser(userId, { isActive: false })
+
+          // Wait for post to be removed (move-out)
+          await waitForItemRemoved(collection, postId)
+          expect(collection.has(postId)).toBe(false)
+
+          // Clean up
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId,
+          ])
+          await config.mutations.deleteUser(userId)
+          await collection.cleanup()
+        })
+
+        it(`Move-out → move-in cycle`, async () => {
+          const collection = createPostsByActiveUsersCollection(syncMode)
+          await waitForReady(collection, syncMode)
+
+          if (!config.mutations) {
+            throw new Error(`Mutations not configured`)
+          }
+
+          // Insert user with isActive = true
+          const userId = randomUUID()
+          await config.mutations.insertUser({
+            id: userId,
+            name: `Flapping User`,
+            email: `flapping@test.com`,
+            age: 25,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          // Wait for user to be synced to Electric before inserting post
+          await waitForUsersSynced([userId])
+
+          // Insert post for this user
+          const postId = randomUUID()
+          await config.mutations.insertPost({
+            id: postId,
+            userId,
+            title: `Flapping Post`,
+            content: `Content`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          await waitForItem(collection, postId)
+          expect(collection.has(postId)).toBe(true)
+
+          // Move-out: isActive = false
+          await config.mutations.updateUser(userId, { isActive: false })
+          await waitForItemRemoved(collection, postId, 15000)
+          expect(collection.has(postId)).toBe(false)
+
+          // Move-in: isActive = true
+          await config.mutations.updateUser(userId, { isActive: true })
+          await waitForItem(collection, postId, 15000)
+          expect(collection.has(postId)).toBe(true)
+
+          // Clean up
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId,
+          ])
+          await config.mutations.deleteUser(userId)
+          await collection.cleanup()
+        })
+
+        it(`Tags-only update (row stays within subquery)`, async () => {
+          const collection = createPostsByActiveUsersCollection(syncMode)
+          await waitForReady(collection, syncMode)
+
+          if (!config.mutations) {
+            throw new Error(`Mutations not configured`)
+          }
+
+          // Insert user with isActive = true
+          const userId = randomUUID()
+          await config.mutations.insertUser({
+            id: userId,
+            name: `Active User`,
+            email: `active@test.com`,
+            age: 25,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          // Wait for user to be synced to Electric before inserting post
+          await waitForUsersSynced([userId])
+
+          // Insert post for this user
+          const postId = randomUUID()
+          await config.mutations.insertPost({
+            id: postId,
+            userId,
+            title: `Tagged Post`,
+            content: `Content`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          await waitForItem(collection, postId)
+          expect(collection.has(postId)).toBe(true)
+
+          // Update post title (tags might change but post stays in subquery since user is still active)
+          await dbClient.query(
+            `UPDATE ${postsTable} SET title = $1 WHERE id = $2`,
+            [`Updated Tagged Post`, postId],
+          )
+
+          // Wait a bit and verify post still exists
+          await new Promise((resolve) => setTimeout(resolve, 500))
+          expect(collection.has(postId)).toBe(true)
+          expect(collection.get(postId)?.title).toBe(`Updated Tagged Post`)
+
+          // Clean up
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId,
+          ])
+          await config.mutations.deleteUser(userId)
+          await collection.cleanup()
+        })
+
+        it(`Database DELETE leads to row being removed from collection`, async () => {
+          const collection = createPostsByActiveUsersCollection(syncMode)
+          await waitForReady(collection, syncMode)
+
+          if (!config.mutations) {
+            throw new Error(`Mutations not configured`)
+          }
+
+          // Insert user with isActive = true
+          const userId = randomUUID()
+          await config.mutations.insertUser({
+            id: userId,
+            name: `Active User`,
+            email: `active@test.com`,
+            age: 25,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          // Wait for user to be synced to Electric before inserting post
+          await waitForUsersSynced([userId])
+
+          // Insert post for this user
+          const postId = randomUUID()
+          await config.mutations.insertPost({
+            id: postId,
+            userId,
+            title: `To Be Deleted`,
+            content: `Content`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          await waitForItem(collection, postId)
+          expect(collection.has(postId)).toBe(true)
+
+          // Delete post in Postgres
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId,
+          ])
+
+          // Wait for post to be removed
+          await waitForItemRemoved(collection, postId)
+          expect(collection.has(postId)).toBe(false)
+
+          // Clean up
+          await config.mutations.deleteUser(userId)
+          await collection.cleanup()
+        })
+
+        it(`Snapshot after move-out should not re-include removed rows`, async () => {
+          if (!config.mutations) {
+            throw new Error(`Mutations not configured`)
+          }
+
+          // Create first collection
+          const collection1 = createPostsByActiveUsersCollection(syncMode)
+          await waitForReady(collection1, syncMode)
+
+          // Insert user with isActive = true
+          const userId = randomUUID()
+          await config.mutations.insertUser({
+            id: userId,
+            name: `Snapshot Test User`,
+            email: `snapshot@test.com`,
+            age: 25,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          // Wait for user to be synced to Electric before inserting post
+          await waitForUsersSynced([userId])
+
+          // Insert post for this user
+          const postId = randomUUID()
+          await config.mutations.insertPost({
+            id: postId,
+            userId,
+            title: `Snapshot Test Post`,
+            content: `Content`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          await waitForItem(collection1, postId)
+          expect(collection1.has(postId)).toBe(true)
+
+          // Update user → post moves out
+          await config.mutations.updateUser(userId, { isActive: false })
+
+          await waitForItemRemoved(collection1, postId)
+          expect(collection1.has(postId)).toBe(false)
+
+          // Clean up first collection
+          await collection1.cleanup()
+
+          // Create fresh collection (new subscription)
+          const collection2 = createPostsByActiveUsersCollection(syncMode)
+          await waitForReady(collection2, syncMode)
+
+          // Wait a bit to ensure snapshot is complete
+          await new Promise((resolve) => setTimeout(resolve, 1000))
+
+          // Snapshot should NOT include the removed post (user is inactive)
+          expect(collection2.has(postId)).toBe(false)
+
+          // Clean up
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId,
+          ])
+          await config.mutations.deleteUser(userId)
+          await collection2.cleanup()
+        })
+
+        it(`Multi-row transaction: some rows move in, some move out`, async () => {
+          const collection = createPostsByActiveUsersCollection(syncMode)
+          await waitForReady(collection, syncMode)
+
+          if (!config.mutations) {
+            throw new Error(`Mutations not configured`)
+          }
+
+          // Insert 3 users all with isActive = true
+          const userId1 = randomUUID()
+          const userId2 = randomUUID()
+          const userId3 = randomUUID()
+
+          await config.mutations.insertUser({
+            id: userId1,
+            name: `User 1`,
+            email: `user1@test.com`,
+            age: 25,
+            isActive: false,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          await config.mutations.insertUser({
+            id: userId2,
+            name: `User 2`,
+            email: `user2@test.com`,
+            age: 30,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          await config.mutations.insertUser({
+            id: userId3,
+            name: `User 3`,
+            email: `user3@test.com`,
+            age: 35,
+            isActive: true,
+            createdAt: new Date(),
+            metadata: null,
+            deletedAt: null,
+          })
+
+          // Wait for all 3 users to be synced to Electric before inserting posts
+          // This ensures the subquery in the WHERE clause can properly evaluate
+          await waitForUsersSynced([userId1, userId2, userId3])
+
+          // Insert posts for these users
+          const postId1 = randomUUID()
+          const postId2 = randomUUID()
+          const postId3 = randomUUID()
+
+          await config.mutations.insertPost({
+            id: postId1,
+            userId: userId1,
+            title: `Post 1`,
+            content: `Content 1`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          await config.mutations.insertPost({
+            id: postId2,
+            userId: userId2,
+            title: `Post 2`,
+            content: `Content 2`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          await config.mutations.insertPost({
+            id: postId3,
+            userId: userId3,
+            title: `Post 3`,
+            content: `Content 3`,
+            viewCount: 0,
+            largeViewCount: BigInt(0),
+            publishedAt: null,
+            deletedAt: null,
+          })
+
+          // Wait for posts 2 and 3 to appear
+          await waitForItem(collection, postId2)
+          await waitForItem(collection, postId3)
+
+          expect(collection.has(postId1)).toBe(false)
+
+          // In one SQL transaction:
+          // user1: isActive → true (post1 moves in)
+          // post2: title change (stays in since user2 is still active)
+          // user3: isActive → false (post3 moves out)
+          await dbClient.query(`BEGIN`)
+          try {
+            await dbClient.query(
+              `UPDATE ${usersTable} SET "isActive" = $1 WHERE id = $2`,
+              [true, userId1],
+            )
+            await dbClient.query(
+              `UPDATE ${postsTable} SET title = $1 WHERE id = $2`,
+              [`Updated Post 2`, postId2],
+            )
+            await dbClient.query(
+              `UPDATE ${usersTable} SET "isActive" = $1 WHERE id = $2`,
+              [false, userId3],
+            )
+            await dbClient.query(`COMMIT`)
+          } catch (error) {
+            await dbClient.query(`ROLLBACK`)
+            throw error
+          }
+
+          // Wait for changes to propagate
+          await waitForItemRemoved(collection, postId3)
+          await new Promise((resolve) => setTimeout(resolve, 1000))
+          expect(collection.has(postId1)).toBe(true) // post1: moved in (user1 active)
+          expect(collection.has(postId2)).toBe(true) // post2: still in (user2 active)
+          expect(collection.get(postId2)?.title).toBe(`Updated Post 2`)
+          expect(collection.has(postId3)).toBe(false) // post3: moved out (user3 inactive)
+
+          // Clean up
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId1,
+          ])
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId2,
+          ])
+          await dbClient.query(`DELETE FROM ${postsTable} WHERE id = $1`, [
+            postId3,
+          ])
+          await config.mutations.deleteUser(userId1)
+          await config.mutations.deleteUser(userId2)
+          await config.mutations.deleteUser(userId3)
+          await collection.cleanup()
+        })
+      })
+    }
+
+    // Run tests for each sync mode
+    runTestsForSyncMode('eager')
+    runTestsForSyncMode('on-demand')
+    runTestsForSyncMode('progressive')
+  })
+}
diff --git a/packages/db-collection-e2e/src/suites/mutations.suite.ts b/packages/db-collection-e2e/src/suites/mutations.suite.ts
index 955a31d7b..17a73d4c6 100644
--- a/packages/db-collection-e2e/src/suites/mutations.suite.ts
+++ b/packages/db-collection-e2e/src/suites/mutations.suite.ts
@@ -4,14 +4,14 @@
  * Tests data mutations with on-demand syncMode
  */
 
-import { randomUUID } from "node:crypto"
-import { describe, expect, it } from "vitest"
-import { createLiveQueryCollection, eq, gt, isNull } from "@tanstack/db"
-import { waitFor, waitForQueryData } from "../utils/helpers"
-import type { E2ETestConfig } from "../types"
+import { randomUUID } from 'node:crypto'
+import { describe, expect, it } from 'vitest'
+import { createLiveQueryCollection, eq, gt, isNull } from '@tanstack/db'
+import { waitFor, waitForQueryData } from '../utils/helpers'
+import type { E2ETestConfig } from '../types'
 
 export function createMutationsTestSuite(
-  getConfig: () => Promise<E2ETestConfig>
+  getConfig: () => Promise<E2ETestConfig>,
 ) {
   describe(`Mutations Suite`, () => {
     describe(`Insert Mutations`, () => {
@@ -26,7 +26,7 @@ export function createMutationsTestSuite(
 
         // Load initial data
         const query = createLiveQueryCollection((q) =>
-          q.from({ user: usersCollection })
+          q.from({ user: usersCollection }),
         )
 
         await query.preload()
@@ -82,7 +82,7 @@ export function createMutationsTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 30))
+            .where(({ user }) => gt(user.age, 30)),
         )
 
         await query.preload()
@@ -140,7 +140,7 @@ export function createMutationsTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 30))
+            .where(({ user }) => gt(user.age, 30)),
         )
 
         await query.preload()
@@ -180,7 +180,7 @@ export function createMutationsTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 30))
+            .where(({ user }) => gt(user.age, 30)),
         )
 
         await query.preload()
@@ -220,7 +220,7 @@ export function createMutationsTestSuite(
         const usersCollection = config.collections.onDemand.users
 
         const query = createLiveQueryCollection((q) =>
-          q.from({ user: usersCollection })
+          q.from({ user: usersCollection }),
         )
 
         await query.preload()
@@ -256,7 +256,7 @@ export function createMutationsTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => isNull(user.deletedAt))
+            .where(({ user }) => isNull(user.deletedAt)),
         )
 
         await query.preload()
@@ -277,7 +277,7 @@ export function createMutationsTestSuite(
         const usersCollection = config.collections.onDemand.users
 
         const query = createLiveQueryCollection((q) =>
-          q.from({ user: usersCollection })
+          q.from({ user: usersCollection }),
         )
 
         await query.preload()
@@ -303,7 +303,7 @@ export function createMutationsTestSuite(
             .from({ user: usersCollection })
             .where(({ user }) => eq(user.isActive, true))
             .orderBy(({ user }) => user.age, `asc`)
-            .limit(10)
+            .limit(10),
         )
 
         await query.preload()
diff --git a/packages/db-collection-e2e/src/suites/pagination.suite.ts b/packages/db-collection-e2e/src/suites/pagination.suite.ts
index c0b7badcb..7ccf2c60b 100644
--- a/packages/db-collection-e2e/src/suites/pagination.suite.ts
+++ b/packages/db-collection-e2e/src/suites/pagination.suite.ts
@@ -4,18 +4,18 @@
  * Tests ordering, limits, offsets, and window management
  */
 
-import { describe, expect, it } from "vitest"
-import { createLiveQueryCollection, eq } from "@tanstack/db"
+import { describe, expect, it } from 'vitest'
+import { createLiveQueryCollection, eq } from '@tanstack/db'
 import {
   assertAllItemsMatch,
   assertCollectionSize,
   assertSorted,
-} from "../utils/assertions"
-import { waitForQueryData } from "../utils/helpers"
-import type { E2ETestConfig } from "../types"
+} from '../utils/assertions'
+import { waitForQueryData } from '../utils/helpers'
+import type { E2ETestConfig } from '../types'
 
 export function createPaginationTestSuite(
-  getConfig: () => Promise<E2ETestConfig>
+  getConfig: () => Promise<E2ETestConfig>,
 ) {
   describe(`Pagination Suite`, () => {
     describe(`OrderBy`, () => {
@@ -26,7 +26,7 @@ export function createPaginationTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .orderBy(({ user }) => user.age, `asc`)
+            .orderBy(({ user }) => user.age, `asc`),
         )
 
         await query.preload()
@@ -46,7 +46,7 @@ export function createPaginationTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .orderBy(({ user }) => user.age, `desc`)
+            .orderBy(({ user }) => user.age, `desc`),
         )
 
         await query.preload()
@@ -66,7 +66,7 @@ export function createPaginationTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .orderBy(({ user }) => user.name, `asc`)
+            .orderBy(({ user }) => user.name, `asc`),
         )
 
         await query.preload()
@@ -89,7 +89,7 @@ export function createPaginationTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .orderBy(({ user }) => user.createdAt, `desc`)
+            .orderBy(({ user }) => user.createdAt, `desc`),
         )
 
         await query.preload()
@@ -109,7 +109,7 @@ export function createPaginationTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ post: postsCollection })
-            .orderBy(({ post }) => [post.userId, post.viewCount])
+            .orderBy(({ post }) => [post.userId, post.viewCount]),
         )
 
         await query.preload()
@@ -131,6 +131,586 @@ export function createPaginationTestSuite(
 
         await query.cleanup()
       })
+
+      it(`should sort by multiple fields with chained orderBy`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.isActive, `desc`)
+            .orderBy(({ user }) => user.age, `asc`),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 1 })
+
+        const results = Array.from(query.state.values())
+        expect(results.length).toBeGreaterThan(0)
+
+        // Verify multi-field sort (isActive desc first, then age asc within each isActive)
+        for (let i = 1; i < results.length; i++) {
+          const prev = results[i - 1]!
+          const curr = results[i]!
+
+          // isActive should be descending (true before false)
+          if (prev.isActive !== curr.isActive) {
+            // true (1) should come before false (0) in desc order
+            expect(prev.isActive ? 1 : 0).toBeGreaterThanOrEqual(
+              curr.isActive ? 1 : 0,
+            )
+          } else {
+            // If isActive is same, age should be ascending
+            expect(prev.age).toBeLessThanOrEqual(curr.age)
+          }
+        }
+
+        await query.cleanup()
+      })
+    })
+
+    describe(`Multi-Column OrderBy with Incremental Loading`, () => {
+      it(`should correctly paginate with multi-column orderBy and limit`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        // First page - get first 10 users sorted by isActive desc, age asc
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.isActive, `desc`)
+            .orderBy(({ user }) => user.age, `asc`)
+            .limit(10),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 10 })
+
+        const results = Array.from(query.state.values())
+        expect(results).toHaveLength(10)
+
+        // Verify the ordering is correct
+        for (let i = 1; i < results.length; i++) {
+          const prev = results[i - 1]!
+          const curr = results[i]!
+
+          if (prev.isActive !== curr.isActive) {
+            expect(prev.isActive ? 1 : 0).toBeGreaterThanOrEqual(
+              curr.isActive ? 1 : 0,
+            )
+          } else {
+            expect(prev.age).toBeLessThanOrEqual(curr.age)
+          }
+        }
+
+        await query.cleanup()
+      })
+
+      it(`should load subsequent pages correctly with multi-column orderBy`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        // Get first 15 users
+        const query1 = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.isActive, `desc`)
+            .orderBy(({ user }) => user.age, `asc`)
+            .limit(15),
+        )
+
+        await query1.preload()
+        await waitForQueryData(query1, { minSize: 15 })
+
+        const firstPage = Array.from(query1.state.values())
+        expect(firstPage).toHaveLength(15)
+
+        // Get first 30 users (expanding the window)
+        const query2 = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.isActive, `desc`)
+            .orderBy(({ user }) => user.age, `asc`)
+            .limit(30),
+        )
+
+        await query2.preload()
+        await waitForQueryData(query2, { minSize: 30 })
+
+        const expandedPage = Array.from(query2.state.values())
+        expect(expandedPage).toHaveLength(30)
+
+        // The first 15 items should be the same in both queries
+        for (let i = 0; i < 15; i++) {
+          expect(expandedPage[i]!.id).toBe(firstPage[i]!.id)
+        }
+
+        // Verify ordering is maintained throughout
+        for (let i = 1; i < expandedPage.length; i++) {
+          const prev = expandedPage[i - 1]!
+          const curr = expandedPage[i]!
+
+          if (prev.isActive !== curr.isActive) {
+            expect(prev.isActive ? 1 : 0).toBeGreaterThanOrEqual(
+              curr.isActive ? 1 : 0,
+            )
+          } else {
+            expect(prev.age).toBeLessThanOrEqual(curr.age)
+          }
+        }
+
+        await query1.cleanup()
+        await query2.cleanup()
+      })
+
+      it(`should handle multi-column orderBy with duplicate values in first column`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        // Sort by isActive (only 2 values: true/false) then by age
+        // This tests the case where many rows have the same first column value
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.isActive, `desc`)
+            .orderBy(({ user }) => user.age, `asc`)
+            .limit(50),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 50 })
+
+        const results = Array.from(query.state.values())
+        expect(results).toHaveLength(50)
+
+        // Count how many active users we got
+        const activeUsers = results.filter((u) => u.isActive)
+        const inactiveUsers = results.filter((u) => !u.isActive)
+
+        // Since isActive desc, all active users should come first
+        // All active users should be at the start
+        let foundInactive = false
+        for (const user of results) {
+          if (!user.isActive) {
+            foundInactive = true
+          } else if (foundInactive) {
+            // Found active after inactive - this is wrong
+            throw new Error(
+              `Found active user after inactive user in desc order`,
+            )
+          }
+        }
+
+        // Verify age is ascending within each group
+        if (activeUsers.length > 1) {
+          for (let i = 1; i < activeUsers.length; i++) {
+            expect(activeUsers[i - 1]!.age).toBeLessThanOrEqual(
+              activeUsers[i]!.age,
+            )
+          }
+        }
+
+        if (inactiveUsers.length > 1) {
+          for (let i = 1; i < inactiveUsers.length; i++) {
+            expect(inactiveUsers[i - 1]!.age).toBeLessThanOrEqual(
+              inactiveUsers[i]!.age,
+            )
+          }
+        }
+
+        await query.cleanup()
+      })
+
+      it(`should handle multi-column orderBy with mixed directions`, async () => {
+        const config = await getConfig()
+        const postsCollection = config.collections.onDemand.posts
+
+        // Sort by userId ascending, viewCount descending
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ post: postsCollection })
+            .orderBy(({ post }) => post.userId, `asc`)
+            .orderBy(({ post }) => post.viewCount, `desc`)
+            .limit(20),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 20 })
+
+        const results = Array.from(query.state.values())
+        expect(results).toHaveLength(20)
+
+        // Verify ordering
+        for (let i = 1; i < results.length; i++) {
+          const prev = results[i - 1]!
+          const curr = results[i]!
+
+          if (prev.userId < curr.userId) {
+            // userId ascending - this is correct
+            continue
+          } else if (prev.userId === curr.userId) {
+            // Same userId, viewCount should be descending
+            expect(prev.viewCount).toBeGreaterThanOrEqual(curr.viewCount)
+          } else {
+            // userId decreased - this is wrong
+            throw new Error(
+              `userId should be ascending but ${prev.userId} > ${curr.userId}`,
+            )
+          }
+        }
+
+        await query.cleanup()
+      })
+
+      it(`should handle three-column orderBy`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        // Sort by isActive desc, age asc, name asc
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.isActive, `desc`)
+            .orderBy(({ user }) => user.age, `asc`)
+            .orderBy(({ user }) => user.name, `asc`)
+            .limit(25),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 25 })
+
+        const results = Array.from(query.state.values())
+        expect(results).toHaveLength(25)
+
+        // Verify basic ordering (isActive desc, age asc)
+        for (let i = 1; i < results.length; i++) {
+          const prev = results[i - 1]!
+          const curr = results[i]!
+
+          if (prev.isActive !== curr.isActive) {
+            expect(prev.isActive ? 1 : 0).toBeGreaterThanOrEqual(
+              curr.isActive ? 1 : 0,
+            )
+          } else if (prev.age !== curr.age) {
+            expect(prev.age).toBeLessThanOrEqual(curr.age)
+          }
+          // For name, we don't strictly check due to collation differences
+        }
+
+        await query.cleanup()
+      })
+
+      it(`should use setWindow to page through multi-column orderBy results`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        // Create query with multi-column orderBy and limit
+        // Using age (number) and name (string) to avoid boolean comparison issues
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.age, `asc`)
+            .orderBy(({ user }) => user.name, `asc`)
+            .limit(10),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 10 })
+
+        // Get first page
+        const firstPage = Array.from(query.state.values())
+        expect(firstPage).toHaveLength(10)
+
+        // Verify first page ordering (age asc, then name asc)
+        for (let i = 1; i < firstPage.length; i++) {
+          const prev = firstPage[i - 1]!
+          const curr = firstPage[i]!
+          if (prev.age !== curr.age) {
+            expect(prev.age).toBeLessThanOrEqual(curr.age)
+          } else {
+            expect(prev.name.localeCompare(curr.name)).toBeLessThanOrEqual(0)
+          }
+        }
+
+        // Move to second page using setWindow
+        // IMPORTANT: setWindow returns a Promise when loading is required,
+        // or `true` if data is already available. We verify loading occurs.
+        const setWindowResult = query.utils.setWindow({ offset: 10, limit: 10 })
+
+        // In on-demand mode, moving to offset 10 should trigger loading
+        // since only the first 10 records were initially loaded
+        if (setWindowResult !== true) {
+          // Loading was triggered - wait for it to complete
+          await setWindowResult
+        }
+        await waitForQueryData(query, { minSize: 10 })
+
+        // Get second page
+        const secondPage = Array.from(query.state.values())
+        expect(secondPage).toHaveLength(10)
+
+        // Verify second page ordering
+        for (let i = 1; i < secondPage.length; i++) {
+          const prev = secondPage[i - 1]!
+          const curr = secondPage[i]!
+          if (prev.age !== curr.age) {
+            expect(prev.age).toBeLessThanOrEqual(curr.age)
+          } else {
+            expect(prev.name.localeCompare(curr.name)).toBeLessThanOrEqual(0)
+          }
+        }
+
+        // CRITICAL: Pages should not overlap - this proves new data was loaded
+        // If the backend didn't return new data, we'd see duplicates or missing records
+        const firstPageIds = new Set(firstPage.map((u) => u.id))
+        const secondPageIds = new Set(secondPage.map((u) => u.id))
+        for (const id of secondPageIds) {
+          expect(firstPageIds.has(id)).toBe(false)
+        }
+
+        await query.cleanup()
+      })
+
+      it(`should use setWindow to move backwards with multi-column orderBy`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        // Start at offset 20
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.age, `asc`)
+            .orderBy(({ user }) => user.name, `asc`)
+            .limit(10)
+            .offset(20),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 10 })
+
+        const laterPage = Array.from(query.state.values())
+        expect(laterPage).toHaveLength(10)
+
+        // Move backwards to offset 10
+        const setWindowResult = query.utils.setWindow({ offset: 10, limit: 10 })
+        if (setWindowResult !== true) {
+          await setWindowResult
+        }
+        await waitForQueryData(query, { minSize: 10 })
+
+        const earlierPage = Array.from(query.state.values())
+        expect(earlierPage).toHaveLength(10)
+
+        // Earlier page should have different users
+        const laterPageIds = new Set(laterPage.map((u) => u.id))
+        const earlierPageIds = new Set(earlierPage.map((u) => u.id))
+        for (const id of earlierPageIds) {
+          expect(laterPageIds.has(id)).toBe(false)
+        }
+
+        // Verify ordering on earlier page (age asc, name asc)
+        for (let i = 1; i < earlierPage.length; i++) {
+          const prev = earlierPage[i - 1]!
+          const curr = earlierPage[i]!
+          if (prev.age !== curr.age) {
+            expect(prev.age).toBeLessThanOrEqual(curr.age)
+          } else {
+            expect(prev.name.localeCompare(curr.name)).toBeLessThanOrEqual(0)
+          }
+        }
+
+        await query.cleanup()
+      })
+
+      it(`should use setWindow with mixed direction multi-column orderBy`, async () => {
+        const config = await getConfig()
+        const postsCollection = config.collections.onDemand.posts
+
+        // Sort by userId ascending, viewCount descending
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ post: postsCollection })
+            .orderBy(({ post }) => post.userId, `asc`)
+            .orderBy(({ post }) => post.viewCount, `desc`)
+            .limit(10),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 10 })
+
+        const firstPage = Array.from(query.state.values())
+        expect(firstPage).toHaveLength(10)
+
+        // Move to second page
+        const setWindowResult = query.utils.setWindow({ offset: 10, limit: 10 })
+        if (setWindowResult !== true) {
+          await setWindowResult
+        }
+        await waitForQueryData(query, { minSize: 10 })
+
+        const secondPage = Array.from(query.state.values())
+        expect(secondPage).toHaveLength(10)
+
+        // Verify ordering on second page (userId asc, viewCount desc)
+        for (let i = 1; i < secondPage.length; i++) {
+          const prev = secondPage[i - 1]!
+          const curr = secondPage[i]!
+
+          if (prev.userId < curr.userId) {
+            // userId ascending - correct
+            continue
+          } else if (prev.userId === curr.userId) {
+            // Same userId, viewCount should be descending
+            expect(prev.viewCount).toBeGreaterThanOrEqual(curr.viewCount)
+          } else {
+            throw new Error(
+              `userId should be ascending but ${prev.userId} > ${curr.userId}`,
+            )
+          }
+        }
+
+        await query.cleanup()
+      })
+
+      it(`should handle setWindow across duplicate first-column values`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        // Age has limited unique values in test data, so many duplicates in first column
+        // This tests that the composite cursor correctly handles paging across duplicates
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.age, `asc`)
+            .orderBy(({ user }) => user.name, `asc`)
+            .limit(20),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 20 })
+
+        const firstPage = Array.from(query.state.values())
+        expect(firstPage).toHaveLength(20)
+
+        // Move to second page - this crosses the boundary where first column value changes
+        const setWindowResult = query.utils.setWindow({ offset: 20, limit: 20 })
+        if (setWindowResult !== true) {
+          await setWindowResult
+        }
+        await waitForQueryData(query, { minSize: 20 })
+
+        const secondPage = Array.from(query.state.values())
+        expect(secondPage).toHaveLength(20)
+
+        // Verify ordering is maintained across the page boundary
+        for (let i = 1; i < secondPage.length; i++) {
+          const prev = secondPage[i - 1]!
+          const curr = secondPage[i]!
+          if (prev.age !== curr.age) {
+            expect(prev.age).toBeLessThanOrEqual(curr.age)
+          } else {
+            expect(prev.name.localeCompare(curr.name)).toBeLessThanOrEqual(0)
+          }
+        }
+
+        // Pages should not overlap
+        const firstPageIds = new Set(firstPage.map((u) => u.id))
+        for (const user of secondPage) {
+          expect(firstPageIds.has(user.id)).toBe(false)
+        }
+
+        // Move to third page to ensure continued paging works
+        const setWindowResult2 = query.utils.setWindow({
+          offset: 40,
+          limit: 20,
+        })
+        if (setWindowResult2 !== true) {
+          await setWindowResult2
+        }
+        await waitForQueryData(query, { minSize: 1 })
+
+        const thirdPage = Array.from(query.state.values())
+        expect(thirdPage.length).toBeGreaterThan(0)
+        expect(thirdPage.length).toBeLessThanOrEqual(20)
+
+        // Third page should not overlap with first or second
+        const secondPageIds = new Set(secondPage.map((u) => u.id))
+        for (const user of thirdPage) {
+          expect(firstPageIds.has(user.id)).toBe(false)
+          expect(secondPageIds.has(user.id)).toBe(false)
+        }
+
+        await query.cleanup()
+      })
+
+      it(`should trigger backend loading when paging with multi-column orderBy`, async () => {
+        const config = await getConfig()
+        const usersCollection = config.collections.onDemand.users
+
+        // Use a small limit to ensure we need to load more data when paging
+        const query = createLiveQueryCollection((q) =>
+          q
+            .from({ user: usersCollection })
+            .orderBy(({ user }) => user.age, `asc`)
+            .orderBy(({ user }) => user.name, `asc`)
+            .limit(5),
+        )
+
+        await query.preload()
+        await waitForQueryData(query, { minSize: 5 })
+
+        // Get first page - only 5 records loaded
+        const firstPage = Array.from(query.state.values())
+        expect(firstPage).toHaveLength(5)
+        const lastItemFirstPage = firstPage[firstPage.length - 1]!
+
+        // Move to second page - this MUST trigger backend loading
+        // since we only have 5 records and need records at offset 5
+        const setWindowResult = query.utils.setWindow({ offset: 5, limit: 5 })
+
+        // CRITICAL ASSERTION: In on-demand mode, setWindow should return a Promise
+        // when we need to load data we don't have yet. This proves loading was triggered.
+        // If it returned `true`, it would mean data was already available (no loading needed).
+        expect(
+          setWindowResult === true || setWindowResult instanceof Promise,
+        ).toBe(true)
+
+        if (setWindowResult !== true) {
+          // Wait for loading to complete
+          await setWindowResult
+        }
+        await waitForQueryData(query, { minSize: 5 })
+
+        // Get second page
+        const secondPage = Array.from(query.state.values())
+        expect(secondPage).toHaveLength(5)
+
+        // Verify we got different records (proves new data was loaded from backend)
+        const firstPageIds = new Set(firstPage.map((u) => u.id))
+        for (const user of secondPage) {
+          expect(firstPageIds.has(user.id)).toBe(false)
+        }
+
+        // Verify ordering continues correctly from where first page ended
+        const firstItemSecondPage = secondPage[0]!
+
+        // The first item of page 2 should come after the last item of page 1
+        // in the sort order (age asc, name asc)
+        if (lastItemFirstPage.age === firstItemSecondPage.age) {
+          // Same age value, so name should be greater or equal
+          expect(
+            firstItemSecondPage.name.localeCompare(lastItemFirstPage.name),
+          ).toBeGreaterThanOrEqual(0)
+        } else {
+          // Different age, page 2 first should have greater or equal age
+          expect(firstItemSecondPage.age).toBeGreaterThanOrEqual(
+            lastItemFirstPage.age,
+          )
+        }
+
+        await query.cleanup()
+      })
     })
 
     describe(`Limit`, () => {
@@ -142,7 +722,7 @@ export function createPaginationTestSuite(
           q
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
-            .limit(10)
+            .limit(10),
         )
 
         await query.preload()
@@ -161,7 +741,7 @@ export function createPaginationTestSuite(
           q
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
-            .limit(0)
+            .limit(0),
         )
 
         await query.preload()
@@ -179,7 +759,7 @@ export function createPaginationTestSuite(
           q
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
-            .limit(1000)
+            .limit(1000),
         )
 
         await query.preload()
@@ -198,7 +778,7 @@ export function createPaginationTestSuite(
           q
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.age, `asc`)
-            .limit(5)
+            .limit(5),
         )
 
         await query.preload()
@@ -222,7 +802,7 @@ export function createPaginationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(100) // Need limit with offset
-            .offset(20)
+            .offset(20),
         )
 
         await query.preload()
@@ -243,7 +823,7 @@ export function createPaginationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(10)
-            .offset(20)
+            .offset(20),
         )
 
         await query.preload()
@@ -263,7 +843,7 @@ export function createPaginationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(100)
-            .offset(200)
+            .offset(200),
         )
 
         await query.preload()
@@ -285,7 +865,7 @@ export function createPaginationTestSuite(
             .where(({ user }) => eq(user.isActive, true))
             .orderBy(({ user }) => user.age, `asc`)
             .limit(10)
-            .offset(5)
+            .offset(5),
         )
 
         await query.preload()
@@ -308,7 +888,7 @@ export function createPaginationTestSuite(
               .from({ user: usersCollection })
               .orderBy(({ user }) => user.id, `asc`)
               .limit(10)
-              .offset(95) // Last 5 records
+              .offset(95), // Last 5 records
         )
 
         await query.preload()
@@ -329,7 +909,7 @@ export function createPaginationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(1)
-            .offset(0)
+            .offset(0),
         )
 
         await query.preload()
@@ -351,7 +931,7 @@ export function createPaginationTestSuite(
             .from({ user: usersCollection })
             .orderBy(({ user }) => user.id, `asc`)
             .limit(10)
-            .offset(20)
+            .offset(20),
         )
 
         await query.preload()
diff --git a/packages/db-collection-e2e/src/suites/predicates.suite.ts b/packages/db-collection-e2e/src/suites/predicates.suite.ts
index a4f446856..0ea3a9947 100644
--- a/packages/db-collection-e2e/src/suites/predicates.suite.ts
+++ b/packages/db-collection-e2e/src/suites/predicates.suite.ts
@@ -5,7 +5,7 @@
  * across different data types.
  */
 
-import { describe, expect, it } from "vitest"
+import { describe, expect, it } from 'vitest'
 import {
   and,
   createLiveQueryCollection,
@@ -21,13 +21,13 @@ import {
   lte,
   not,
   or,
-} from "@tanstack/db"
-import { assertAllItemsMatch, assertCollectionSize } from "../utils/assertions"
-import { waitForQueryData } from "../utils/helpers"
-import type { E2ETestConfig } from "../types"
+} from '@tanstack/db'
+import { assertAllItemsMatch, assertCollectionSize } from '../utils/assertions'
+import { waitForQueryData } from '../utils/helpers'
+import type { E2ETestConfig } from '../types'
 
 export function createPredicatesTestSuite(
-  getConfig: () => Promise<E2ETestConfig>
+  getConfig: () => Promise<E2ETestConfig>,
 ) {
   describe(`Predicates Suite`, () => {
     describe(`Equality Operators`, () => {
@@ -38,7 +38,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.name, `Alice 0`))
+            .where(({ user }) => eq(user.name, `Alice 0`)),
         )
 
         await query.preload()
@@ -59,7 +59,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.age, 25))
+            .where(({ user }) => eq(user.age, 25)),
         )
 
         await query.preload()
@@ -76,7 +76,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.isActive, true))
+            .where(({ user }) => eq(user.isActive, true)),
         )
 
         await query.preload()
@@ -98,7 +98,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.id, testUserId))
+            .where(({ user }) => eq(user.id, testUserId)),
         )
 
         await query.preload()
@@ -118,7 +118,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => isNull(user.email))
+            .where(({ user }) => isNull(user.email)),
         )
 
         await query.preload()
@@ -140,7 +140,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => not(eq(user.name, `Alice 0`)))
+            .where(({ user }) => not(eq(user.name, `Alice 0`))),
         )
 
         await query.preload()
@@ -160,7 +160,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => not(isNull(user.email)))
+            .where(({ user }) => not(isNull(user.email))),
         )
 
         await query.preload()
@@ -182,7 +182,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gt(user.age, 50))
+            .where(({ user }) => gt(user.age, 50)),
         )
 
         await query.preload()
@@ -199,7 +199,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => gte(user.age, 50))
+            .where(({ user }) => gte(user.age, 50)),
         )
 
         await query.preload()
@@ -216,7 +216,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => lt(user.age, 30))
+            .where(({ user }) => lt(user.age, 30)),
         )
 
         await query.preload()
@@ -233,7 +233,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => lte(user.age, 30))
+            .where(({ user }) => lte(user.age, 30)),
         )
 
         await query.preload()
@@ -250,7 +250,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ post: postsCollection })
-            .where(({ post }) => gt(post.viewCount, 100))
+            .where(({ post }) => gt(post.viewCount, 100)),
         )
 
         await query.preload()
@@ -270,7 +270,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ post: postsCollection })
-            .where(({ post }) => eq(post.largeViewCount, targetBigInt))
+            .where(({ post }) => eq(post.largeViewCount, targetBigInt)),
         )
 
         await query.preload()
@@ -299,7 +299,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ post: postsCollection })
-            .where(({ post }) => gt(post.largeViewCount, thresholdBigInt))
+            .where(({ post }) => gt(post.largeViewCount, thresholdBigInt)),
         )
 
         await query.preload()
@@ -328,7 +328,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => like(user.name, `Alice%`))
+            .where(({ user }) => like(user.name, `Alice%`)),
         )
 
         await query.preload()
@@ -349,7 +349,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => ilike(user.name, `alice%`))
+            .where(({ user }) => ilike(user.name, `alice%`)),
         )
 
         await query.preload()
@@ -359,7 +359,7 @@ export function createPredicatesTestSuite(
         expect(results.length).toBeGreaterThan(0)
         // Should match names starting with "Alice" (case-insensitive)
         assertAllItemsMatch(query, (u) =>
-          u.name.toLowerCase().startsWith(`alice`)
+          u.name.toLowerCase().startsWith(`alice`),
         )
 
         await query.cleanup()
@@ -372,7 +372,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => like(user.email, `%@example.com`))
+            .where(({ user }) => like(user.email, `%@example.com`)),
         )
 
         await query.preload()
@@ -383,7 +383,7 @@ export function createPredicatesTestSuite(
         // Should match emails ending with @example.com
         assertAllItemsMatch(
           query,
-          (u) => u.email?.endsWith(`@example.com`) ?? false
+          (u) => u.email?.endsWith(`@example.com`) ?? false,
         )
 
         await query.cleanup()
@@ -396,7 +396,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => like(user.email, `user%0@example.com`))
+            .where(({ user }) => like(user.email, `user%0@example.com`)),
         )
 
         await query.preload()
@@ -407,7 +407,7 @@ export function createPredicatesTestSuite(
         // Should match emails like user0@example.com, user10@example.com, user20@example.com, etc.
         assertAllItemsMatch(
           query,
-          (u) => (u.email?.match(/^user.*0@example\.com$/) ?? null) !== null
+          (u) => (u.email?.match(/^user.*0@example\.com$/) ?? null) !== null,
         )
 
         await query.cleanup()
@@ -420,7 +420,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => like(lower(user.name), `%alice%`))
+            .where(({ user }) => like(lower(user.name), `%alice%`)),
         )
 
         await query.preload()
@@ -430,7 +430,7 @@ export function createPredicatesTestSuite(
         expect(results.length).toBeGreaterThan(0)
         // Should match names containing "alice" (case-insensitive via lower())
         assertAllItemsMatch(query, (u) =>
-          u.name.toLowerCase().includes(`alice`)
+          u.name.toLowerCase().includes(`alice`),
         )
 
         await query.cleanup()
@@ -443,7 +443,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => ilike(lower(user.name), `%bob%`))
+            .where(({ user }) => ilike(lower(user.name), `%bob%`)),
         )
 
         await query.preload()
@@ -472,9 +472,9 @@ export function createPredicatesTestSuite(
             .where(({ post }) =>
               or(
                 like(lower(post.title), `%${searchLower}%`),
-                like(lower(post.content ?? ``), `%${searchLower}%`)
-              )
-            )
+                like(lower(post.content ?? ``), `%${searchLower}%`),
+              ),
+            ),
         )
 
         await query.preload()
@@ -487,7 +487,7 @@ export function createPredicatesTestSuite(
           query,
           (p) =>
             p.title.toLowerCase().includes(searchLower) ||
-            (p.content?.toLowerCase().includes(searchLower) ?? false)
+            (p.content?.toLowerCase().includes(searchLower) ?? false),
         )
 
         await query.cleanup()
@@ -501,7 +501,7 @@ export function createPredicatesTestSuite(
           q
             .from({ user: usersCollection })
             .where(({ user }) => like(lower(user.name), `%alice%`))
-            .orderBy(({ user }) => user.name, `asc`)
+            .orderBy(({ user }) => user.name, `asc`),
         )
 
         await query.preload()
@@ -510,7 +510,7 @@ export function createPredicatesTestSuite(
         const results = Array.from(query.state.values())
         expect(results.length).toBeGreaterThan(0)
         assertAllItemsMatch(query, (u) =>
-          u.name.toLowerCase().includes(`alice`)
+          u.name.toLowerCase().includes(`alice`),
         )
 
         // Verify ordering
@@ -530,7 +530,7 @@ export function createPredicatesTestSuite(
             .from({ user: usersCollection })
             .where(({ user }) => like(lower(user.name), `%alice%`))
             .orderBy(({ user }) => user.name, `asc`) // Required when using LIMIT
-            .limit(5)
+            .limit(5),
         )
 
         await query.preload()
@@ -540,7 +540,7 @@ export function createPredicatesTestSuite(
         // Should respect limit
         expect(results.length).toBeLessThanOrEqual(5)
         assertAllItemsMatch(query, (u) =>
-          u.name.toLowerCase().includes(`alice`)
+          u.name.toLowerCase().includes(`alice`),
         )
 
         await query.cleanup()
@@ -553,7 +553,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => like(user.name, `NonExistent%`))
+            .where(({ user }) => like(user.name, `NonExistent%`)),
         )
 
         await query.preload()
@@ -573,8 +573,8 @@ export function createPredicatesTestSuite(
           q
             .from({ user: usersCollection })
             .where(({ user }) =>
-              inArray(user.name, [`Alice 0`, `bob 1`, `Charlie 2`])
-            )
+              inArray(user.name, [`Alice 0`, `bob 1`, `Charlie 2`]),
+            ),
         )
 
         await query.preload()
@@ -592,7 +592,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => inArray(user.age, [25, 30, 35]))
+            .where(({ user }) => inArray(user.age, [25, 30, 35])),
         )
 
         await query.preload()
@@ -616,7 +616,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => inArray(user.id, userIds))
+            .where(({ user }) => inArray(user.id, userIds)),
         )
 
         await query.preload()
@@ -634,7 +634,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => inArray(user.id, []))
+            .where(({ user }) => inArray(user.id, [])),
         )
 
         await query.preload()
@@ -658,7 +658,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ post: postsCollection })
-            .where(({ post }) => inArray(post.largeViewCount, targetBigInts))
+            .where(({ post }) => inArray(post.largeViewCount, targetBigInts)),
         )
 
         await query.preload()
@@ -689,7 +689,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => isNull(user.email))
+            .where(({ user }) => isNull(user.email)),
         )
 
         await query.preload()
@@ -709,7 +709,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => not(isNull(user.email)))
+            .where(({ user }) => not(isNull(user.email))),
         )
 
         await query.preload()
@@ -729,7 +729,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => isNull(user.deletedAt))
+            .where(({ user }) => isNull(user.deletedAt)),
         )
 
         await query.preload()
@@ -751,7 +751,9 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => and(gt(user.age, 25), eq(user.isActive, true)))
+            .where(({ user }) =>
+              and(gt(user.age, 25), eq(user.isActive, true)),
+            ),
         )
 
         await query.preload()
@@ -768,7 +770,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => or(eq(user.age, 25), eq(user.age, 30)))
+            .where(({ user }) => or(eq(user.age, 25), eq(user.age, 30))),
         )
 
         await query.preload()
@@ -788,16 +790,16 @@ export function createPredicatesTestSuite(
             .where(({ user }) =>
               and(
                 or(eq(user.age, 25), eq(user.age, 30)),
-                eq(user.isActive, true)
-              )
-            )
+                eq(user.isActive, true),
+              ),
+            ),
         )
 
         await query.preload()
 
         assertAllItemsMatch(
           query,
-          (u) => (u.age === 25 || u.age === 30) && u.isActive === true
+          (u) => (u.age === 25 || u.age === 30) && u.isActive === true,
         )
 
         await query.cleanup()
@@ -810,7 +812,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => not(eq(user.isActive, true)))
+            .where(({ user }) => not(eq(user.isActive, true))),
         )
 
         await query.preload()
@@ -829,7 +831,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.age, 25))
+            .where(({ user }) => eq(user.age, 25)),
         )
 
         await query.preload()
@@ -851,7 +853,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => isNull(user.deletedAt))
+            .where(({ user }) => isNull(user.deletedAt)),
         )
 
         await query.preload()
@@ -874,7 +876,7 @@ export function createPredicatesTestSuite(
           q
             .from({ user: usersCollection })
             .where(({ user }) => gt(user.age, 25))
-            .where(({ user }) => eq(user.isActive, true))
+            .where(({ user }) => eq(user.isActive, true)),
         )
 
         await query.preload()
@@ -896,7 +898,7 @@ export function createPredicatesTestSuite(
 
         // Query with NO where clause - loads all data
         const query = createLiveQueryCollection(
-          (q) => q.from({ user: usersCollection })
+          (q) => q.from({ user: usersCollection }),
           // No where, no limit, no orderBy
         )
 
@@ -917,7 +919,7 @@ export function createPredicatesTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.age, 999))
+            .where(({ user }) => eq(user.age, 999)),
         )
 
         await query.preload()
@@ -935,9 +937,9 @@ export function createPredicatesTestSuite(
           q.from({ user: usersCollection }).where(({ user }) =>
             and(
               eq(user.age, 25),
-              eq(user.age, 30) // Impossible: age can't be both 25 and 30
-            )
-          )
+              eq(user.age, 30), // Impossible: age can't be both 25 and 30
+            ),
+          ),
         )
 
         await query.preload()
diff --git a/packages/db-collection-e2e/src/suites/progressive.suite.ts b/packages/db-collection-e2e/src/suites/progressive.suite.ts
index 75b081778..dcfa31cfc 100644
--- a/packages/db-collection-e2e/src/suites/progressive.suite.ts
+++ b/packages/db-collection-e2e/src/suites/progressive.suite.ts
@@ -8,15 +8,15 @@
  * - Txid tracking behavior
  */
 
-import { describe, expect, it } from "vitest"
-import { createLiveQueryCollection, eq, gt } from "@tanstack/db"
-import { waitFor, waitForQueryData } from "../utils/helpers"
-import type { E2ETestConfig, User } from "../types"
-import type { Collection } from "@tanstack/db"
-import type { ElectricCollectionUtils } from "@tanstack/electric-db-collection"
+import { describe, expect, it } from 'vitest'
+import { createLiveQueryCollection, eq, gt } from '@tanstack/db'
+import { waitFor, waitForQueryData } from '../utils/helpers'
+import type { E2ETestConfig, User } from '../types'
+import type { Collection } from '@tanstack/db'
+import type { ElectricCollectionUtils } from '@tanstack/electric-db-collection'
 
 export function createProgressiveTestSuite(
-  getConfig: () => Promise<E2ETestConfig>
+  getConfig: () => Promise<E2ETestConfig>,
 ) {
   describe(`Progressive Mode Suite`, () => {
     describe(`Basic Progressive Mode`, () => {
@@ -40,7 +40,7 @@ export function createProgressiveTestSuite(
         // If already ready, we can't test the explicit transition
         if (initialStatus === `ready`) {
           console.log(
-            `Progressive collection already ready, skipping explicit transition test`
+            `Progressive collection already ready, skipping explicit transition test`,
           )
           return
         }
@@ -52,7 +52,7 @@ export function createProgressiveTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: progressiveUsers })
-            .where(({ user }) => eq(user.age, 25))
+            .where(({ user }) => eq(user.age, 25)),
         )
 
         await query.preload()
@@ -121,7 +121,7 @@ export function createProgressiveTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: progressiveUsers })
-            .where(({ user }) => eq(user.age, 25))
+            .where(({ user }) => eq(user.age, 25)),
         )
 
         await query.preload()
@@ -162,7 +162,7 @@ export function createProgressiveTestSuite(
           // All original items should still be present
           beforeSwapItems.forEach((originalUser) => {
             const stillPresent = afterSwapItems.some(
-              (u) => u.id === originalUser.id
+              (u) => u.id === originalUser.id,
             )
             expect(stillPresent).toBe(true)
           })
@@ -193,13 +193,13 @@ export function createProgressiveTestSuite(
         const query1 = createLiveQueryCollection((q) =>
           q
             .from({ user: progressiveUsers })
-            .where(({ user }) => eq(user.age, 25))
+            .where(({ user }) => eq(user.age, 25)),
         )
 
         const query2 = createLiveQueryCollection((q) =>
           q
             .from({ user: progressiveUsers })
-            .where(({ user }) => gt(user.age, 30))
+            .where(({ user }) => gt(user.age, 30)),
         )
 
         await Promise.all([query1.preload(), query2.preload()])
@@ -320,7 +320,7 @@ export function createProgressiveTestSuite(
             .from({ user: progressiveUsers })
             .where(({ user }) => gt(user.age, 25))
             .orderBy(({ user }) => [user.age, `asc`])
-            .limit(5)
+            .limit(5),
         )
 
         await query.preload()
@@ -369,8 +369,8 @@ export function createProgressiveTestSuite(
           createLiveQueryCollection((q) =>
             q
               .from({ user: progressiveUsers })
-              .where(({ user }) => eq(user.age, 30))
-          )
+              .where(({ user }) => eq(user.age, 30)),
+          ),
         )
 
         // Execute concurrently
@@ -379,8 +379,8 @@ export function createProgressiveTestSuite(
         // Wait for data
         await Promise.all(
           queries.map((q) =>
-            waitForQueryData(q, { minSize: 1, timeout: 10000 })
-          )
+            waitForQueryData(q, { minSize: 1, timeout: 10000 }),
+          ),
         )
 
         // Release initial sync to allow completion
@@ -431,7 +431,7 @@ export function createProgressiveTestSuite(
         // Should be in loading state (snapshot phase)
         if (progressiveUsers.status !== `loading`) {
           console.log(
-            `Collection already ready, cannot test snapshot phase txid behavior`
+            `Collection already ready, cannot test snapshot phase txid behavior`,
           )
           return
         }
@@ -478,7 +478,7 @@ export function createProgressiveTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: progressiveUsers })
-            .where(({ user }) => eq(user.id, snapshotPhaseUser.id))
+            .where(({ user }) => eq(user.id, snapshotPhaseUser.id)),
         )
 
         await query.preload()
@@ -559,7 +559,7 @@ export function createProgressiveTestSuite(
         const query = createLiveQueryCollection((q) =>
           q
             .from({ user: progressiveUsers })
-            .where(({ user }) => eq(user.age, 25))
+            .where(({ user }) => eq(user.age, 25)),
         )
 
         await query.preload()
diff --git a/packages/db-collection-e2e/src/types.ts b/packages/db-collection-e2e/src/types.ts
index e179a1a5d..6587dac57 100644
--- a/packages/db-collection-e2e/src/types.ts
+++ b/packages/db-collection-e2e/src/types.ts
@@ -1,4 +1,4 @@
-import type { Collection } from "@tanstack/db"
+import type { Collection } from '@tanstack/db'
 
 /**
  * Test data schema types
@@ -105,6 +105,6 @@ export interface DbClient {
   end: () => Promise<void>
   query: (
     sql: string,
-    values?: Array<unknown>
+    values?: Array<unknown>,
   ) => Promise<{ rows: Array<unknown> }>
 }
diff --git a/packages/db-collection-e2e/src/utils/assertions.ts b/packages/db-collection-e2e/src/utils/assertions.ts
index daf6f3303..b0c7afccc 100644
--- a/packages/db-collection-e2e/src/utils/assertions.ts
+++ b/packages/db-collection-e2e/src/utils/assertions.ts
@@ -1,6 +1,6 @@
-import { expect } from "vitest"
-import { getLoadedIds } from "./helpers"
-import type { Collection } from "@tanstack/db"
+import { expect } from 'vitest'
+import { getLoadedIds } from './helpers'
+import type { Collection } from '@tanstack/db'
 
 /**
  * Assert that a collection has loaded exactly the expected items (no more, no less)
@@ -8,7 +8,7 @@ import type { Collection } from "@tanstack/db"
 export function assertLoadedExactly<T extends { id: string }>(
   collection: Collection<T>,
   expectedIds: Array<string>,
-  message?: string
+  message?: string,
 ) {
   const loadedIds = getLoadedIds(collection)
   const loadedSet = new Set(loadedIds)
@@ -19,7 +19,7 @@ export function assertLoadedExactly<T extends { id: string }>(
   if (extraIds.length > 0) {
     throw new Error(
       message ??
-        `Collection has extra items: ${extraIds.join(`, `)} (expected only: ${expectedIds.join(`, `)})`
+        `Collection has extra items: ${extraIds.join(`, `)} (expected only: ${expectedIds.join(`, `)})`,
     )
   }
 
@@ -28,7 +28,7 @@ export function assertLoadedExactly<T extends { id: string }>(
   if (missingIds.length > 0) {
     throw new Error(
       message ??
-        `Collection is missing items: ${missingIds.join(`, `)} (loaded: ${loadedIds.join(`, `)})`
+        `Collection is missing items: ${missingIds.join(`, `)} (loaded: ${loadedIds.join(`, `)})`,
     )
   }
 }
@@ -39,7 +39,7 @@ export function assertLoadedExactly<T extends { id: string }>(
 export function assertLoadedAtLeast<T extends { id: string }>(
   collection: Collection<T>,
   expectedIds: Array<string>,
-  message?: string
+  message?: string,
 ) {
   const loadedIds = getLoadedIds(collection)
   const loadedSet = new Set(loadedIds)
@@ -48,7 +48,7 @@ export function assertLoadedAtLeast<T extends { id: string }>(
   if (missingIds.length > 0) {
     throw new Error(
       message ??
-        `Collection is missing items: ${missingIds.join(`, `)} (loaded: ${loadedIds.join(`, `)})`
+        `Collection is missing items: ${missingIds.join(`, `)} (loaded: ${loadedIds.join(`, `)})`,
     )
   }
 }
@@ -59,7 +59,7 @@ export function assertLoadedAtLeast<T extends { id: string }>(
 export function assertNotLoaded<T extends { id: string }>(
   collection: Collection<T>,
   forbiddenIds: Array<string>,
-  message?: string
+  message?: string,
 ) {
   const loadedIds = getLoadedIds(collection)
   const loadedSet = new Set(loadedIds)
@@ -67,7 +67,7 @@ export function assertNotLoaded<T extends { id: string }>(
   const foundIds = forbiddenIds.filter((id) => loadedSet.has(id))
   if (foundIds.length > 0) {
     throw new Error(
-      message ?? `Collection should not have loaded: ${foundIds.join(`, `)}`
+      message ?? `Collection should not have loaded: ${foundIds.join(`, `)}`,
     )
   }
 }
@@ -78,7 +78,7 @@ export function assertNotLoaded<T extends { id: string }>(
 export function assertCollectionSize<T extends object>(
   collection: Collection<T>,
   expectedSize: number,
-  message?: string
+  message?: string,
 ) {
   expect(collection.size, message).toBe(expectedSize)
 }
@@ -89,7 +89,7 @@ export function assertCollectionSize<T extends object>(
 export function assertAllItemsMatch<T extends object>(
   collection: Collection<T>,
   predicate: (item: T) => boolean,
-  message?: string
+  message?: string,
 ) {
   const items = Array.from(collection.state.values())
   const failingItems = items.filter((item) => !predicate(item))
@@ -97,7 +97,7 @@ export function assertAllItemsMatch<T extends object>(
   if (failingItems.length > 0) {
     throw new Error(
       message ??
-        `${failingItems.length} item(s) did not match predicate: ${JSON.stringify(failingItems[0])}`
+        `${failingItems.length} item(s) did not match predicate: ${JSON.stringify(failingItems[0])}`,
     )
   }
 }
@@ -109,7 +109,7 @@ export function assertSorted<T, K extends keyof T>(
   items: Array<T>,
   field: K,
   direction: `asc` | `desc` = `asc`,
-  message?: string
+  message?: string,
 ) {
   for (let i = 1; i < items.length; i++) {
     const prev = items[i - 1]![field]
@@ -119,14 +119,14 @@ export function assertSorted<T, K extends keyof T>(
       if (prev > curr) {
         throw new Error(
           message ??
-            `Items not sorted ascending by ${String(field)}: ${prev} > ${curr} at index ${i}`
+            `Items not sorted ascending by ${String(field)}: ${prev} > ${curr} at index ${i}`,
         )
       }
     } else {
       if (prev < curr) {
         throw new Error(
           message ??
-            `Items not sorted descending by ${String(field)}: ${prev} < ${curr} at index ${i}`
+            `Items not sorted descending by ${String(field)}: ${prev} < ${curr} at index ${i}`,
         )
       }
     }
@@ -140,7 +140,7 @@ export function assertSorted<T, K extends keyof T>(
 export function assertNoPushdownViolation<T extends { id: string }>(
   collection: Collection<T>,
   expectedMaxIds: Array<string>,
-  message?: string
+  message?: string,
 ) {
   const loadedIds = getLoadedIds(collection)
   const expectedSet = new Set(expectedMaxIds)
@@ -151,7 +151,7 @@ export function assertNoPushdownViolation<T extends { id: string }>(
   if (extraIds.length > 0) {
     throw new Error(
       message ??
-        `Predicate pushdown violation: Collection loaded ${extraIds.length} extra item(s) that don't match the predicate`
+        `Predicate pushdown violation: Collection loaded ${extraIds.length} extra item(s) that don't match the predicate`,
     )
   }
 }
@@ -163,7 +163,7 @@ export function assertDeduplicationOccurred(
   actualLoads: number,
   deduplicatedLoads: number,
   expectedActualLoads: number,
-  message?: string
+  message?: string,
 ) {
   expect(actualLoads, message ?? `Actual loads`).toBe(expectedActualLoads)
   expect(deduplicatedLoads, message ?? `Deduplicated loads`).toBeGreaterThan(0)
@@ -175,7 +175,7 @@ export function assertDeduplicationOccurred(
 export function assertNoDeduplication(
   actualLoads: number,
   deduplicatedLoads: number,
-  message?: string
+  message?: string,
 ) {
   expect(deduplicatedLoads, message ?? `Deduplicated loads`).toBe(0)
   expect(actualLoads, message ?? `Actual loads`).toBeGreaterThan(0)
diff --git a/packages/db-collection-e2e/src/utils/helpers.ts b/packages/db-collection-e2e/src/utils/helpers.ts
index cd5a3676f..75c590c5d 100644
--- a/packages/db-collection-e2e/src/utils/helpers.ts
+++ b/packages/db-collection-e2e/src/utils/helpers.ts
@@ -1,4 +1,4 @@
-import type { Collection } from "@tanstack/db"
+import type { Collection } from '@tanstack/db'
 
 /**
  * Wait for a condition to be true with timeout
@@ -9,7 +9,7 @@ export async function waitFor(
     timeout?: number
     interval?: number
     message?: string
-  } = {}
+  } = {},
 ): Promise<void> {
   const {
     timeout = 5000,
@@ -39,7 +39,7 @@ export function sleep(ms: number): Promise<void> {
  * Get all loaded item IDs from a collection
  */
 export function getLoadedIds<T extends { id: string }>(
-  collection: Collection<T>
+  collection: Collection<T>,
 ): Array<string> {
   return Array.from(collection.state.values()).map((item) => item.id)
 }
@@ -48,7 +48,7 @@ export function getLoadedIds<T extends { id: string }>(
  * Get count of loaded items in a collection
  */
 export function getLoadedCount<T extends object>(
-  collection: Collection<T>
+  collection: Collection<T>,
 ): number {
   return collection.size
 }
@@ -58,7 +58,7 @@ export function getLoadedCount<T extends object>(
  */
 export function hasLoadedIds<T extends { id: string }>(
   collection: Collection<T>,
-  ids: Array<string>
+  ids: Array<string>,
 ): boolean {
   const loadedIds = getLoadedIds(collection)
   return ids.every((id) => loadedIds.includes(id))
@@ -69,7 +69,7 @@ export function hasLoadedIds<T extends { id: string }>(
  */
 export function hasOnlyLoadedIds<T extends { id: string }>(
   collection: Collection<T>,
-  ids: Array<string>
+  ids: Array<string>,
 ): boolean {
   const loadedIds = getLoadedIds(collection)
   const idsSet = new Set(ids)
@@ -93,7 +93,7 @@ export function hasOnlyLoadedIds<T extends { id: string }>(
 export async function waitForCollectionSize<T extends object>(
   collection: Collection<T>,
   expectedSize: number,
-  timeout = 5000
+  timeout = 5000,
 ): Promise<void> {
   await waitFor(() => collection.size === expectedSize, {
     timeout,
@@ -106,7 +106,7 @@ export async function waitForCollectionSize<T extends object>(
  */
 export async function waitForCollectionReady<T extends object>(
   collection: Collection<T>,
-  timeout = 5000
+  timeout = 5000,
 ): Promise<void> {
   await waitFor(() => collection.status === `ready`, {
     timeout,
@@ -124,7 +124,7 @@ export async function waitForQueryData<T extends object>(
   options: {
     minSize?: number
     timeout?: number
-  } = {}
+  } = {},
 ): Promise<void> {
   const { minSize = 1, timeout = 2000 } = options
 
@@ -165,7 +165,7 @@ export function createDeduplicationCounter() {
 export function sortBy<T, K extends keyof T>(
   array: Array<T>,
   field: K,
-  direction: `asc` | `desc` = `asc`
+  direction: `asc` | `desc` = `asc`,
 ): Array<T> {
   return [...array].sort((a, b) => {
     const aVal = a[field]
@@ -182,7 +182,7 @@ export function sortBy<T, K extends keyof T>(
  */
 export function filterBy<T>(
   array: Array<T>,
-  predicate: (item: T) => boolean
+  predicate: (item: T) => boolean,
 ): Array<T> {
   return array.filter(predicate)
 }
@@ -192,7 +192,7 @@ export function filterBy<T>(
  */
 export function paginate<T>(
   array: Array<T>,
-  options: { limit?: number; offset?: number } = {}
+  options: { limit?: number; offset?: number } = {},
 ): Array<T> {
   const { limit, offset = 0 } = options
 
diff --git a/packages/db-collection-e2e/support/global-setup.ts b/packages/db-collection-e2e/support/global-setup.ts
index 4b61e3fcd..57fa7663b 100644
--- a/packages/db-collection-e2e/support/global-setup.ts
+++ b/packages/db-collection-e2e/support/global-setup.ts
@@ -1,16 +1,16 @@
-import type { GlobalSetupContext } from "vitest/node"
-import { Client, type ClientConfig } from "pg"
+import type { GlobalSetupContext } from 'vitest/node'
+import { Client, type ClientConfig } from 'pg'
 
-const ELECTRIC_URL = process.env.ELECTRIC_URL ?? "http://localhost:3000"
-const POSTGRES_HOST = process.env.POSTGRES_HOST ?? "localhost"
-const POSTGRES_PORT = parseInt(process.env.POSTGRES_PORT ?? "54321")
-const POSTGRES_USER = process.env.POSTGRES_USER ?? "postgres"
-const POSTGRES_PASSWORD = process.env.POSTGRES_PASSWORD ?? "password"
-const POSTGRES_DB = process.env.POSTGRES_DB ?? "e2e_test"
-const TEST_SCHEMA = "e2e_test"
+const ELECTRIC_URL = process.env.ELECTRIC_URL ?? 'http://localhost:3000'
+const POSTGRES_HOST = process.env.POSTGRES_HOST ?? 'localhost'
+const POSTGRES_PORT = parseInt(process.env.POSTGRES_PORT ?? '54321')
+const POSTGRES_USER = process.env.POSTGRES_USER ?? 'postgres'
+const POSTGRES_PASSWORD = process.env.POSTGRES_PASSWORD ?? 'password'
+const POSTGRES_DB = process.env.POSTGRES_DB ?? 'e2e_test'
+const TEST_SCHEMA = 'e2e_test'
 
 // Module augmentation for type-safe context injection
-declare module "vitest" {
+declare module 'vitest' {
   export interface ProvidedContext {
     baseUrl: string
     testSchema: string
@@ -53,7 +53,7 @@ async function waitForElectric(url: string): Promise<void> {
         const res = await fetch(`${url}/v1/health`)
         if (res.ok) {
           const data = (await res.json()) as { status: string }
-          if (data.status === "active") {
+          if (data.status === 'active') {
             clearTimeout(timeout)
             return resolve()
           }
@@ -74,7 +74,7 @@ async function waitForElectric(url: string): Promise<void> {
 async function waitForPostgres(client: Client): Promise<void> {
   return new Promise<void>((resolve, reject) => {
     const timeout = setTimeout(() => {
-      reject(new Error("Timed out waiting for Postgres"))
+      reject(new Error('Timed out waiting for Postgres'))
     }, 10000)
 
     const check = async (): Promise<void> => {
@@ -102,30 +102,30 @@ async function waitForPostgres(client: Client): Promise<void> {
  * 5. Returns cleanup function
  */
 export default async function ({ provide }: GlobalSetupContext) {
-  console.log("🚀 Starting e2e test suite global setup...")
+  console.log('🚀 Starting e2e test suite global setup...')
 
   // Wait for Electric server to be ready
   console.log(`⏳ Waiting for Electric at ${ELECTRIC_URL}...`)
   await waitForElectric(ELECTRIC_URL)
-  console.log("✓ Electric is ready")
+  console.log('✓ Electric is ready')
 
   // Connect to Postgres
   console.log(
-    `⏳ Connecting to Postgres at ${POSTGRES_HOST}:${POSTGRES_PORT}...`
+    `⏳ Connecting to Postgres at ${POSTGRES_HOST}:${POSTGRES_PORT}...`,
   )
   const client = makePgClient()
   await waitForPostgres(client)
-  console.log("✓ Postgres is ready")
+  console.log('✓ Postgres is ready')
 
   // Create test schema
   console.log(`⏳ Creating test schema: ${TEST_SCHEMA}...`)
   await client.query(`CREATE SCHEMA IF NOT EXISTS ${TEST_SCHEMA}`)
-  console.log("✓ Test schema created")
+  console.log('✓ Test schema created')
 
   // Provide context values to all tests
-  provide("baseUrl", ELECTRIC_URL)
-  provide("testSchema", TEST_SCHEMA)
-  provide("postgresConfig", {
+  provide('baseUrl', ELECTRIC_URL)
+  provide('testSchema', TEST_SCHEMA)
+  provide('postgresConfig', {
     host: POSTGRES_HOST,
     port: POSTGRES_PORT,
     user: POSTGRES_USER,
@@ -133,20 +133,20 @@ export default async function ({ provide }: GlobalSetupContext) {
     database: POSTGRES_DB,
   })
 
-  console.log("✅ Global setup complete\n")
+  console.log('✅ Global setup complete\n')
 
   // Return cleanup function (runs once after all tests)
   return async () => {
-    console.log("\n🧹 Running global teardown...")
+    console.log('\n🧹 Running global teardown...')
     try {
       await client.query(`DROP SCHEMA IF EXISTS ${TEST_SCHEMA} CASCADE`)
-      console.log("✓ Test schema dropped")
+      console.log('✓ Test schema dropped')
     } catch (error) {
-      console.error("Error dropping test schema:", error)
+      console.error('Error dropping test schema:', error)
     } finally {
       await client.end()
-      console.log("✓ Postgres connection closed")
-      console.log("✅ Global teardown complete")
+      console.log('✓ Postgres connection closed')
+      console.log('✅ Global teardown complete')
     }
   }
 }
diff --git a/packages/db-collection-e2e/support/test-context.ts b/packages/db-collection-e2e/support/test-context.ts
index d9183bf09..aab8f787f 100644
--- a/packages/db-collection-e2e/support/test-context.ts
+++ b/packages/db-collection-e2e/support/test-context.ts
@@ -1,8 +1,8 @@
-import { test, inject } from "vitest"
-import { Client } from "pg"
-import { makePgClient } from "./global-setup"
-import type { SeedDataResult } from "../src/types"
-import { generateSeedData } from "../src/fixtures/seed-data"
+import { test, inject } from 'vitest'
+import { Client } from 'pg'
+import { makePgClient } from './global-setup'
+import type { SeedDataResult } from '../src/types'
+import { generateSeedData } from '../src/fixtures/seed-data'
 
 /**
  * Base fixture with database client and abort controller
@@ -15,7 +15,7 @@ export const testWithDb = test.extend<{
   tableName: (base: string) => string
 }>({
   dbClient: async ({}, use) => {
-    const schema = inject("testSchema")
+    const schema = inject('testSchema')
     const client = makePgClient({
       options: `-csearch_path=${schema}`,
     })
@@ -31,21 +31,21 @@ export const testWithDb = test.extend<{
   aborter: async ({}, use) => {
     const controller = new AbortController()
     await use(controller)
-    controller.abort("Test complete")
+    controller.abort('Test complete')
   },
 
   baseUrl: async ({}, use) => {
-    await use(inject("baseUrl"))
+    await use(inject('baseUrl'))
   },
 
   testSchema: async ({}, use) => {
-    await use(inject("testSchema"))
+    await use(inject('testSchema'))
   },
 
   tableName: async ({ task }, use) => {
     // Generate unique table names based on task ID and random suffix
     await use((base: string) => {
-      const taskId = task.id.replace(/[^a-zA-Z0-9]/g, "_")
+      const taskId = task.id.replace(/[^a-zA-Z0-9]/g, '_')
       const random = Math.random().toString(16).slice(2, 8)
       return `"${base}_${taskId}_${random}"`
     })
@@ -62,9 +62,9 @@ export const testWithTables = testWithDb.extend<{
   dropTables: () => Promise<void>
 }>({
   usersTable: async ({ dbClient, tableName, task }, use) => {
-    const name = tableName("users")
-    const taskFile = task.file?.name.replace(/'/g, "`") ?? "unknown"
-    const taskName = task.name.replace(/'/g, "`")
+    const name = tableName('users')
+    const taskFile = task.file?.name.replace(/'/g, '`') ?? 'unknown'
+    const taskName = task.name.replace(/'/g, '`')
 
     await dbClient.query(`
       DROP TABLE IF EXISTS ${name};
@@ -91,9 +91,9 @@ export const testWithTables = testWithDb.extend<{
   },
 
   postsTable: async ({ dbClient, tableName, usersTable, task }, use) => {
-    const name = tableName("posts")
-    const taskFile = task.file?.name.replace(/'/g, "`") ?? "unknown"
-    const taskName = task.name.replace(/'/g, "`")
+    const name = tableName('posts')
+    const taskFile = task.file?.name.replace(/'/g, '`') ?? 'unknown'
+    const taskName = task.name.replace(/'/g, '`')
 
     await dbClient.query(`
       DROP TABLE IF EXISTS ${name};
@@ -120,11 +120,11 @@ export const testWithTables = testWithDb.extend<{
 
   commentsTable: async (
     { dbClient, tableName, postsTable, usersTable, task },
-    use
+    use,
   ) => {
-    const name = tableName("comments")
-    const taskFile = task.file?.name.replace(/'/g, "`") ?? "unknown"
-    const taskName = task.name.replace(/'/g, "`")
+    const name = tableName('comments')
+    const taskFile = task.file?.name.replace(/'/g, '`') ?? 'unknown'
+    const taskName = task.name.replace(/'/g, '`')
 
     await dbClient.query(`
       DROP TABLE IF EXISTS ${name};
@@ -150,7 +150,7 @@ export const testWithTables = testWithDb.extend<{
 
   dropTables: async (
     { dbClient, usersTable, postsTable, commentsTable },
-    use
+    use,
   ) => {
     await use(async () => {
       try {
@@ -158,7 +158,7 @@ export const testWithTables = testWithDb.extend<{
         await dbClient.query(`DROP TABLE IF EXISTS ${postsTable}`)
         await dbClient.query(`DROP TABLE IF EXISTS ${usersTable}`)
       } catch (error) {
-        console.error("Error dropping tables:", error)
+        console.error('Error dropping tables:', error)
       }
     })
   },
@@ -178,7 +178,7 @@ export const testWithSeedData = testWithTables.extend<{
 
   insertSeedData: async (
     { dbClient, usersTable, postsTable, commentsTable, seedData },
-    use
+    use,
   ) => {
     await use(async () => {
       // Insert users
@@ -195,7 +195,7 @@ export const testWithSeedData = testWithTables.extend<{
             user.createdAt,
             user.metadata ? JSON.stringify(user.metadata) : null,
             user.deletedAt,
-          ]
+          ],
         )
       }
 
@@ -212,7 +212,7 @@ export const testWithSeedData = testWithTables.extend<{
             post.viewCount,
             post.publishedAt,
             post.deletedAt,
-          ]
+          ],
         )
       }
 
@@ -228,7 +228,7 @@ export const testWithSeedData = testWithTables.extend<{
             comment.text,
             comment.createdAt,
             comment.deletedAt,
-          ]
+          ],
         )
       }
     })
diff --git a/packages/db-collection-e2e/vite.config.ts b/packages/db-collection-e2e/vite.config.ts
index a231f935d..14475c28f 100644
--- a/packages/db-collection-e2e/vite.config.ts
+++ b/packages/db-collection-e2e/vite.config.ts
@@ -1,15 +1,15 @@
-import { defineConfig } from "vitest/config"
+import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
-    globalSetup: "./support/global-setup.ts",
+    globalSetup: './support/global-setup.ts',
     fileParallelism: false, // Critical: Serial execution for shared database
     timeout: 30000,
-    environment: "jsdom",
+    environment: 'jsdom',
     coverage: {
-      provider: "istanbul",
-      reporter: ["text", "json", "html"],
-      include: ["**/src/**"],
+      provider: 'istanbul',
+      reporter: ['text', 'json', 'html'],
+      include: ['**/src/**'],
     },
   },
 })
diff --git a/packages/db-ivm/CHANGELOG.md b/packages/db-ivm/CHANGELOG.md
index 86fde439c..adcc25aba 100644
--- a/packages/db-ivm/CHANGELOG.md
+++ b/packages/db-ivm/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @tanstack/db-ivm
 
+## 0.1.14
+
+### Patch Changes
+
+- Use row keys for stable tie-breaking in ORDER BY operations instead of hash-based object IDs. ([#957](https://github.com/TanStack/db/pull/957))
+
+  Previously, when multiple rows had equal ORDER BY values, tie-breaking used `globalObjectIdGenerator.getId(key)` which could produce hash collisions and wasn't stable across page reloads for object references. Now, the row key (which is always `string | number` and unique per row) is used directly for tie-breaking, ensuring deterministic and stable ordering.
+
+  This also simplifies the internal `TaggedValue` type from a 3-tuple `[K, V, Tag]` to a 2-tuple `[K, V]`, removing unnecessary complexity.
+
 ## 0.1.13
 
 ### Patch Changes
@@ -26,9 +36,9 @@
   const users = createLiveQueryCollection((q) =>
     q
       .from({ user: usersCollection })
-      .orderBy(({ user }) => user.name, "asc")
+      .orderBy(({ user }) => user.name, 'asc')
       .limit(10)
-      .offset(0)
+      .offset(0),
   )
 
   users.utils.setWindow({ offset: 10, limit: 10 })
diff --git a/packages/db-ivm/README.md b/packages/db-ivm/README.md
index b753df6d6..17dd83440 100644
--- a/packages/db-ivm/README.md
+++ b/packages/db-ivm/README.md
@@ -11,7 +11,7 @@ The API is almost identical to D2TS, but without the need to specify a version w
 Here's a simple example that demonstrates the core concepts:
 
 ```typescript
-import { D2, map, filter, debug, MultiSet } from "@tanstack/db-ivm"
+import { D2, map, filter, debug, MultiSet } from '@tanstack/db-ivm'
 
 // Create a new D2 graph
 const graph = new D2()
@@ -28,7 +28,7 @@ const input = graph.newInput<number>()
 const output = input.pipe(
   map((x) => x + 5),
   filter((x) => x % 2 === 0),
-  debug("output")
+  debug('output'),
 )
 
 // Finalize the pipeline, after this point we can no longer add operators or
@@ -46,7 +46,7 @@ input.sendData(
     [1, 1],
     [2, 1],
     [3, 1],
-  ])
+  ]),
 )
 
 // Process the data
diff --git a/packages/db-ivm/package.json b/packages/db-ivm/package.json
index 6296fa5d4..2e84d9bb6 100644
--- a/packages/db-ivm/package.json
+++ b/packages/db-ivm/package.json
@@ -1,15 +1,33 @@
 {
   "name": "@tanstack/db-ivm",
+  "version": "0.1.14",
   "description": "Incremental View Maintenance for TanStack DB based on Differential Dataflow",
-  "version": "0.1.13",
-  "dependencies": {
-    "fractional-indexing": "^3.2.0",
-    "sorted-btree": "^1.8.1"
+  "author": "Sam Willis",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TanStack/db.git",
+    "directory": "packages/db-ivm"
   },
-  "devDependencies": {
-    "@types/debug": "^4.1.12",
-    "@vitest/coverage-istanbul": "^3.2.4"
+  "homepage": "https://tanstack.com/db",
+  "keywords": [
+    "electric",
+    "sql",
+    "optimistic",
+    "typescript",
+    "ivm",
+    "differential-dataflow"
+  ],
+  "scripts": {
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "lint": "eslint . --fix",
+    "test": "vitest --run"
   },
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -23,39 +41,20 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
-  "packageManager": "pnpm@10.24.0",
+  "dependencies": {
+    "fractional-indexing": "^3.2.0",
+    "sorted-btree": "^1.8.1"
+  },
   "peerDependencies": {
     "typescript": ">=4.7"
   },
-  "author": "Sam Willis",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/TanStack/db.git",
-    "directory": "packages/db-ivm"
-  },
-  "homepage": "https://tanstack.com/db",
-  "keywords": [
-    "electric",
-    "sql",
-    "optimistic",
-    "typescript",
-    "ivm",
-    "differential-dataflow"
-  ],
-  "scripts": {
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "lint": "eslint . --fix",
-    "test": "npx vitest --run"
-  },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@types/debug": "^4.1.12",
+    "@vitest/coverage-istanbul": "^3.2.4"
+  }
 }
diff --git a/packages/db-ivm/src/d2.ts b/packages/db-ivm/src/d2.ts
index b3149de73..8451b2aff 100644
--- a/packages/db-ivm/src/d2.ts
+++ b/packages/db-ivm/src/d2.ts
@@ -1,11 +1,11 @@
-import { DifferenceStreamWriter } from "./graph.js"
+import { DifferenceStreamWriter } from './graph.js'
 import type {
   BinaryOperator,
   DifferenceStreamReader,
   UnaryOperator,
-} from "./graph.js"
-import type { MultiSet, MultiSetArray } from "./multiset.js"
-import type { ID2, IStreamBuilder, PipedOperator } from "./types.js"
+} from './graph.js'
+import type { MultiSet, MultiSetArray } from './multiset.js'
+import type { ID2, IStreamBuilder, PipedOperator } from './types.js'
 
 export class D2 implements ID2 {
   #operators: Array<UnaryOperator<any> | BinaryOperator<any>> = []
diff --git a/packages/db-ivm/src/graph.ts b/packages/db-ivm/src/graph.ts
index a39027a64..5263bb643 100644
--- a/packages/db-ivm/src/graph.ts
+++ b/packages/db-ivm/src/graph.ts
@@ -1,10 +1,10 @@
-import { MultiSet } from "./multiset.js"
-import type { MultiSetArray } from "./multiset.js"
+import { MultiSet } from './multiset.js'
+import type { MultiSetArray } from './multiset.js'
 import type {
   IDifferenceStreamReader,
   IDifferenceStreamWriter,
   IOperator,
-} from "./types.js"
+} from './types.js'
 
 /**
  * A read handle to a dataflow edge that receives data from a writer.
@@ -61,7 +61,7 @@ export abstract class Operator<T> implements IOperator<T> {
   constructor(
     public id: number,
     inputs: Array<DifferenceStreamReader<T>>,
-    output: DifferenceStreamWriter<T>
+    output: DifferenceStreamWriter<T>,
   ) {
     this.inputs = inputs
     this.output = output
@@ -84,7 +84,7 @@ export abstract class UnaryOperator<Tin, Tout = Tin> extends Operator<
   constructor(
     public id: number,
     inputA: DifferenceStreamReader<Tin>,
-    output: DifferenceStreamWriter<Tout>
+    output: DifferenceStreamWriter<Tout>,
   ) {
     super(id, [inputA], output)
   }
@@ -103,7 +103,7 @@ export abstract class BinaryOperator<T> extends Operator<T> {
     public id: number,
     inputA: DifferenceStreamReader<T>,
     inputB: DifferenceStreamReader<T>,
-    output: DifferenceStreamWriter<T>
+    output: DifferenceStreamWriter<T>,
   ) {
     super(id, [inputA, inputB], output)
   }
diff --git a/packages/db-ivm/src/hashing/hash.ts b/packages/db-ivm/src/hashing/hash.ts
index 4ce90edd4..d1b9d0a6a 100644
--- a/packages/db-ivm/src/hashing/hash.ts
+++ b/packages/db-ivm/src/hashing/hash.ts
@@ -1,5 +1,5 @@
-import { MurmurHashStream, randomHash } from "./murmur.js"
-import type { Hasher } from "./murmur.js"
+import { MurmurHashStream, randomHash } from './murmur.js'
+import type { Hasher } from './murmur.js'
 
 /*
  * Implementation of structural hashing based on the Composites polyfill implementation:
@@ -150,7 +150,7 @@ function updateHasher(hasher: Hasher, input: unknown): void {
       return
     default:
       console.warn(
-        `Ignored input during hashing because it is of type ${typeof input} which is not supported`
+        `Ignored input during hashing because it is of type ${typeof input} which is not supported`,
       )
   }
 }
diff --git a/packages/db-ivm/src/hashing/index.ts b/packages/db-ivm/src/hashing/index.ts
index d44008b0c..ea3875536 100644
--- a/packages/db-ivm/src/hashing/index.ts
+++ b/packages/db-ivm/src/hashing/index.ts
@@ -1,2 +1,2 @@
-export { hash } from "./hash.js"
-export type { Hash, Hasher } from "./murmur.js"
+export { hash } from './hash.js'
+export type { Hash, Hasher } from './murmur.js'
diff --git a/packages/db-ivm/src/index.ts b/packages/db-ivm/src/index.ts
index 5a605a1be..3ca1f26c6 100644
--- a/packages/db-ivm/src/index.ts
+++ b/packages/db-ivm/src/index.ts
@@ -1,4 +1,5 @@
-export * from "./d2.js"
-export * from "./multiset.js"
-export * from "./operators/index.js"
-export * from "./types.js"
+export * from './d2.js'
+export * from './multiset.js'
+export * from './operators/index.js'
+export * from './types.js'
+export { compareKeys } from './utils.js'
diff --git a/packages/db-ivm/src/indexes.ts b/packages/db-ivm/src/indexes.ts
index 7dcb349ba..07c0fa5d5 100644
--- a/packages/db-ivm/src/indexes.ts
+++ b/packages/db-ivm/src/indexes.ts
@@ -33,9 +33,9 @@
  * Prefixes extracted from array values: `['prefix', 'suffix']` → prefix='prefix'
  */
 
-import { MultiSet } from "./multiset.js"
-import { hash } from "./hashing/index.js"
-import type { Hash } from "./hashing/index.js"
+import { MultiSet } from './multiset.js'
+import { hash } from './hashing/index.js'
+import type { Hash } from './hashing/index.js'
 
 // We use a symbol to represent the absence of a prefix, unprefixed values a stored
 // against this key.
@@ -183,7 +183,7 @@ export class Index<TKey, TValue, TPrefix = any> {
     return `Index(${JSON.stringify(
       [...this.entries()],
       undefined,
-      indent ? 2 : undefined
+      indent ? 2 : undefined,
     )})`
   }
 
@@ -325,7 +325,7 @@ export class Index<TKey, TValue, TPrefix = any> {
         key,
         mapOrSingleValue,
         value,
-        multiplicity
+        multiplicity,
       )
       return
     }
@@ -362,7 +362,7 @@ export class Index<TKey, TValue, TPrefix = any> {
     key: TKey,
     currentSingleValue: SingleValue<TValue>,
     newValue: TValue,
-    multiplicity: number
+    multiplicity: number,
   ) {
     const [currentValue, currentMultiplicity] = currentSingleValue
 
@@ -438,7 +438,7 @@ export class Index<TKey, TValue, TPrefix = any> {
    * @returns A multiset of the joined values.
    */
   join<TValue2>(
-    other: Index<TKey, TValue2>
+    other: Index<TKey, TValue2>,
   ): MultiSet<[TKey, [TValue, TValue2]]> {
     const result: Array<[[TKey, [TValue, TValue2]], number]> = []
     // We want to iterate over the smaller of the two indexes to reduce the
@@ -499,7 +499,7 @@ function getPrefix<TValue, TPrefix>(value: TValue): TPrefix | NO_PREFIX {
  * @returns True if the value is a single value, false otherwise.
  */
 function isSingleValue<TValue>(
-  value: SingleValue<TValue> | unknown
+  value: SingleValue<TValue> | unknown,
 ): value is SingleValue<TValue> {
   return Array.isArray(value)
 }
diff --git a/packages/db-ivm/src/multiset.ts b/packages/db-ivm/src/multiset.ts
index 44ba297ed..601e948cf 100644
--- a/packages/db-ivm/src/multiset.ts
+++ b/packages/db-ivm/src/multiset.ts
@@ -2,8 +2,8 @@ import {
   DefaultMap,
   chunkedArrayPush,
   globalObjectIdGenerator,
-} from "./utils.js"
-import { hash } from "./hashing/index.js"
+} from './utils.js'
+import { hash } from './hashing/index.js'
 
 export type MultiSetArray<T> = Array<[T, number]>
 export type KeyedData<T> = [key: string, value: T]
@@ -35,7 +35,7 @@ export class MultiSet<T> {
    */
   map<U>(f: (data: T) => U): MultiSet<U> {
     return new MultiSet(
-      this.#inner.map(([data, multiplicity]) => [f(data), multiplicity])
+      this.#inner.map(([data, multiplicity]) => [f(data), multiplicity]),
     )
   }
 
@@ -51,7 +51,7 @@ export class MultiSet<T> {
    */
   negate(): MultiSet<T> {
     return new MultiSet(
-      this.#inner.map(([data, multiplicity]) => [data, -multiplicity])
+      this.#inner.map(([data, multiplicity]) => [data, -multiplicity]),
     )
   }
 
@@ -142,7 +142,7 @@ export class MultiSet<T> {
       const compositeKey = key + `|` + valueId
       consolidated.set(
         compositeKey,
-        (consolidated.get(compositeKey) || 0) + multiplicity
+        (consolidated.get(compositeKey) || 0) + multiplicity,
       )
 
       // Store the original data for the first occurrence
diff --git a/packages/db-ivm/src/operators/concat.ts b/packages/db-ivm/src/operators/concat.ts
index 075320842..6b4be4033 100644
--- a/packages/db-ivm/src/operators/concat.ts
+++ b/packages/db-ivm/src/operators/concat.ts
@@ -1,6 +1,6 @@
-import { BinaryOperator, DifferenceStreamWriter } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
+import { BinaryOperator, DifferenceStreamWriter } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
 
 /**
  * Operator that concatenates two input streams
@@ -22,7 +22,7 @@ export class ConcatOperator<T, T2> extends BinaryOperator<T | T2> {
  * @param other - The other stream to concatenate
  */
 export function concat<T, T2>(
-  other: IStreamBuilder<T2>
+  other: IStreamBuilder<T2>,
 ): PipedOperator<T, T | T2> {
   return (stream: IStreamBuilder<T | T2>): IStreamBuilder<T | T2> => {
     if (stream.graph !== other.graph) {
@@ -30,13 +30,13 @@ export function concat<T, T2>(
     }
     const output = new StreamBuilder<T | T2>(
       stream.graph,
-      new DifferenceStreamWriter<T | T2>()
+      new DifferenceStreamWriter<T | T2>(),
     )
     const operator = new ConcatOperator<T, T2>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       other.connectReader(),
-      output.writer
+      output.writer,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/consolidate.ts b/packages/db-ivm/src/operators/consolidate.ts
index cb3b3c492..b5356b4f4 100644
--- a/packages/db-ivm/src/operators/consolidate.ts
+++ b/packages/db-ivm/src/operators/consolidate.ts
@@ -1,7 +1,7 @@
-import { DifferenceStreamWriter, UnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import { MultiSet } from "../multiset.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
+import { DifferenceStreamWriter, UnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import { MultiSet } from '../multiset.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
 
 /**
  * Operator that consolidates collections
@@ -36,12 +36,12 @@ export function consolidate<T>(): PipedOperator<T, T> {
   return (stream: IStreamBuilder<T>): IStreamBuilder<T> => {
     const output = new StreamBuilder<T>(
       stream.graph,
-      new DifferenceStreamWriter<T>()
+      new DifferenceStreamWriter<T>(),
     )
     const operator = new ConsolidateOperator<T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
-      output.writer
+      output.writer,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/count.ts b/packages/db-ivm/src/operators/count.ts
index c54ed6234..0fa79b401 100644
--- a/packages/db-ivm/src/operators/count.ts
+++ b/packages/db-ivm/src/operators/count.ts
@@ -1,8 +1,8 @@
-import { DifferenceStreamWriter } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import { ReduceOperator } from "./reduce.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { IStreamBuilder, KeyValue } from "../types.js"
+import { DifferenceStreamWriter } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import { ReduceOperator } from './reduce.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { IStreamBuilder, KeyValue } from '../types.js'
 
 /**
  * Operator that counts elements by key (version-free)
@@ -11,7 +11,7 @@ export class CountOperator<K, V> extends ReduceOperator<K, V, number> {
   constructor(
     id: number,
     inputA: DifferenceStreamReader<[K, V]>,
-    output: DifferenceStreamWriter<[K, number]>
+    output: DifferenceStreamWriter<[K, number]>,
   ) {
     const countInner = (vals: Array<[V, number]>): Array<[number, number]> => {
       let totalCount = 0
@@ -34,16 +34,16 @@ export function count<
   T,
 >() {
   return (
-    stream: IStreamBuilder<T>
+    stream: IStreamBuilder<T>,
   ): IStreamBuilder<KeyValue<KType, number>> => {
     const output = new StreamBuilder<KeyValue<KType, number>>(
       stream.graph,
-      new DifferenceStreamWriter<KeyValue<KType, number>>()
+      new DifferenceStreamWriter<KeyValue<KType, number>>(),
     )
     const operator = new CountOperator<KType, VType>(
       stream.graph.getNextOperatorId(),
       stream.connectReader() as DifferenceStreamReader<KeyValue<KType, VType>>,
-      output.writer
+      output.writer,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/debug.ts b/packages/db-ivm/src/operators/debug.ts
index 0d660c95f..56ca2177a 100644
--- a/packages/db-ivm/src/operators/debug.ts
+++ b/packages/db-ivm/src/operators/debug.ts
@@ -1,7 +1,7 @@
-import { DifferenceStreamWriter, UnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
-import type { DifferenceStreamReader } from "../graph.js"
+import { DifferenceStreamWriter, UnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
+import type { DifferenceStreamReader } from '../graph.js'
 
 /**
  * Operator that logs debug information about the stream
@@ -15,7 +15,7 @@ export class DebugOperator<T> extends UnaryOperator<T> {
     inputA: DifferenceStreamReader<T>,
     output: DifferenceStreamWriter<T>,
     name: string,
-    indent: boolean = false
+    indent: boolean = false,
   ) {
     super(id, inputA, output)
     this.#name = name
@@ -37,19 +37,19 @@ export class DebugOperator<T> extends UnaryOperator<T> {
  */
 export function debug<T>(
   name: string,
-  indent: boolean = false
+  indent: boolean = false,
 ): PipedOperator<T, T> {
   return (stream: IStreamBuilder<T>): IStreamBuilder<T> => {
     const output = new StreamBuilder<T>(
       stream.graph,
-      new DifferenceStreamWriter<T>()
+      new DifferenceStreamWriter<T>(),
     )
     const operator = new DebugOperator<T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       output.writer,
       name,
-      indent
+      indent,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/distinct.ts b/packages/db-ivm/src/operators/distinct.ts
index f1880858d..721f380c3 100644
--- a/packages/db-ivm/src/operators/distinct.ts
+++ b/packages/db-ivm/src/operators/distinct.ts
@@ -1,10 +1,10 @@
-import { DifferenceStreamWriter, UnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import { hash } from "../hashing/index.js"
-import { MultiSet } from "../multiset.js"
-import type { Hash } from "../hashing/index.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { IStreamBuilder, KeyValue } from "../types.js"
+import { DifferenceStreamWriter, UnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import { hash } from '../hashing/index.js'
+import { MultiSet } from '../multiset.js'
+import type { Hash } from '../hashing/index.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { IStreamBuilder, KeyValue } from '../types.js'
 
 type Multiplicity = number
 
@@ -23,7 +23,7 @@ export class DistinctOperator<
     id: number,
     input: DifferenceStreamReader<T>,
     output: DifferenceStreamWriter<KeyValue<number, GetValue<T>>>,
-    by: (value: T) => any = (value: T) => value
+    by: (value: T) => any = (value: T) => value,
   ) {
     super(id, input, output)
     this.#by = by
@@ -83,18 +83,18 @@ export class DistinctOperator<
  * Removes duplicate values
  */
 export function distinct<T extends KeyValue<any, any>>(
-  by: (value: T) => any = (value: T) => value
+  by: (value: T) => any = (value: T) => value,
 ) {
   return (stream: IStreamBuilder<T>): IStreamBuilder<T> => {
     const output = new StreamBuilder<T>(
       stream.graph,
-      new DifferenceStreamWriter<T>()
+      new DifferenceStreamWriter<T>(),
     )
     const operator = new DistinctOperator<T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       output.writer,
-      by
+      by,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/filter.ts b/packages/db-ivm/src/operators/filter.ts
index b34777505..9e0fccf2a 100644
--- a/packages/db-ivm/src/operators/filter.ts
+++ b/packages/db-ivm/src/operators/filter.ts
@@ -1,8 +1,8 @@
-import { DifferenceStreamWriter, LinearUnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { MultiSet } from "../multiset.js"
+import { DifferenceStreamWriter, LinearUnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { MultiSet } from '../multiset.js'
 
 /**
  * Operator that filters elements from the input stream
@@ -14,7 +14,7 @@ export class FilterOperator<T> extends LinearUnaryOperator<T, T> {
     id: number,
     inputA: DifferenceStreamReader<T>,
     output: DifferenceStreamWriter<T>,
-    f: (data: T) => boolean
+    f: (data: T) => boolean,
   ) {
     super(id, inputA, output)
     this.#f = f
@@ -33,13 +33,13 @@ export function filter<T>(f: (data: T) => boolean): PipedOperator<T, T> {
   return (stream: IStreamBuilder<T>): IStreamBuilder<T> => {
     const output = new StreamBuilder<T>(
       stream.graph,
-      new DifferenceStreamWriter<T>()
+      new DifferenceStreamWriter<T>(),
     )
     const operator = new FilterOperator<T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       output.writer,
-      f
+      f,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/filterBy.ts b/packages/db-ivm/src/operators/filterBy.ts
index d7129761f..3112c1d59 100644
--- a/packages/db-ivm/src/operators/filterBy.ts
+++ b/packages/db-ivm/src/operators/filterBy.ts
@@ -1,7 +1,7 @@
-import { map } from "./map.js"
-import { innerJoin } from "./join.js"
-import { consolidate } from "./consolidate.js"
-import type { IStreamBuilder, KeyValue, PipedOperator } from "../types.js"
+import { map } from './map.js'
+import { innerJoin } from './join.js'
+import { consolidate } from './consolidate.js'
+import type { IStreamBuilder, KeyValue, PipedOperator } from '../types.js'
 
 /**
  * Filters the elements of a keyed stream, by keys of another stream.
@@ -15,16 +15,16 @@ export function filterBy<
   V1 extends T extends KeyValue<infer _KT, infer VT> ? VT : never,
   T,
 >(
-  other: IStreamBuilder<KeyValue<K, unknown>>
+  other: IStreamBuilder<KeyValue<K, unknown>>,
 ): PipedOperator<T, KeyValue<K, V1>> {
   return (stream: IStreamBuilder<T>): IStreamBuilder<KeyValue<K, V1>> => {
     const otherKeys = other.pipe(
-      map(([key, _]) => [key, null] as KeyValue<K, null>)
+      map(([key, _]) => [key, null] as KeyValue<K, null>),
     )
     return stream.pipe(
       innerJoin(otherKeys),
       map(([key, [value, _]]) => [key, value] as KeyValue<K, V1>),
-      consolidate()
+      consolidate(),
     )
   }
 }
diff --git a/packages/db-ivm/src/operators/groupBy.ts b/packages/db-ivm/src/operators/groupBy.ts
index e931500e5..b752ae560 100644
--- a/packages/db-ivm/src/operators/groupBy.ts
+++ b/packages/db-ivm/src/operators/groupBy.ts
@@ -1,6 +1,6 @@
-import { map } from "./map.js"
-import { reduce } from "./reduce.js"
-import type { IStreamBuilder, KeyValue } from "../types.js"
+import { map } from './map.js'
+import { reduce } from './reduce.js'
+import type { IStreamBuilder, KeyValue } from '../types.js'
 
 type GroupKey = Record<string, unknown>
 
@@ -26,7 +26,7 @@ type AggregatesReturnType<T, A> = {
 }
 
 function isPipedAggregateFunction<T, R>(
-  aggregate: AggregateFunction<T, R>
+  aggregate: AggregateFunction<T, R>,
 ): aggregate is PipedAggregateFunction<T, R> {
   return `pipe` in aggregate
 }
@@ -45,20 +45,20 @@ export function groupBy<
 
   const basicAggregates = Object.fromEntries(
     Object.entries(aggregates).filter(
-      ([_, aggregate]) => !isPipedAggregateFunction(aggregate)
-    )
+      ([_, aggregate]) => !isPipedAggregateFunction(aggregate),
+    ),
   ) as Record<string, BasicAggregateFunction<T, any, any>>
 
   // @ts-expect-error - TODO: we don't use this yet, but we will
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const pipedAggregates = Object.fromEntries(
     Object.entries(aggregates).filter(([_, aggregate]) =>
-      isPipedAggregateFunction(aggregate)
-    )
+      isPipedAggregateFunction(aggregate),
+    ),
   ) as Record<string, PipedAggregateFunction<T, any>>
 
   return (
-    stream: IStreamBuilder<T>
+    stream: IStreamBuilder<T>,
   ): IStreamBuilder<KeyValue<string, ResultType>> => {
     // Special key to store the original key object
     const KEY_SENTINEL = `__original_key__`
@@ -81,7 +81,7 @@ export function groupBy<
         }
 
         return [keyString, values] as KeyValue<string, Record<string, unknown>>
-      })
+      }),
     )
 
     // Then reduce to compute aggregates
@@ -107,13 +107,13 @@ export function groupBy<
         // Apply each aggregate function
         for (const [name, aggregate] of Object.entries(basicAggregates)) {
           const preValues = values.map(
-            ([v, m]) => [v[name], m] as [any, number]
+            ([v, m]) => [v[name], m] as [any, number],
           )
           result[name] = aggregate.reduce(preValues)
         }
 
         return [[result, 1]]
-      })
+      }),
     )
 
     // Finally map to extract the key and include all values
@@ -139,7 +139,7 @@ export function groupBy<
 
         // Return with the string key instead of the object
         return [keyString, result] as KeyValue<string, ResultType>
-      })
+      }),
     )
   }
 }
@@ -148,7 +148,7 @@ export function groupBy<
  * Creates a sum aggregate function
  */
 export function sum<T>(
-  valueExtractor: (value: T) => number = (v) => v as unknown as number
+  valueExtractor: (value: T) => number = (v) => v as unknown as number,
 ): AggregateFunction<T, number, number> {
   return {
     preMap: (data: T) => valueExtractor(data),
@@ -166,7 +166,7 @@ export function sum<T>(
  * Creates a count aggregate function
  */
 export function count<T>(
-  valueExtractor: (value: T) => any = (v) => v
+  valueExtractor: (value: T) => any = (v) => v,
 ): AggregateFunction<T, number, number> {
   return {
     // Count only not-null values (the `== null` comparison gives true for both null and undefined)
@@ -185,7 +185,7 @@ export function count<T>(
  * Creates an average aggregate function
  */
 export function avg<T>(
-  valueExtractor: (value: T) => number = (v) => v as unknown as number
+  valueExtractor: (value: T) => number = (v) => v as unknown as number,
 ): AggregateFunction<T, number, { sum: number; count: number }> {
   return {
     preMap: (data: T) => ({
@@ -222,10 +222,10 @@ export function min<T extends CanMinMax>(): AggregateFunction<
   T | undefined
 >
 export function min<T, V extends CanMinMax>(
-  valueExtractor: (value: T) => V
+  valueExtractor: (value: T) => V,
 ): AggregateFunction<T, V | undefined, V | undefined>
 export function min<T, V extends CanMinMax>(
-  valueExtractor?: (value: T) => V
+  valueExtractor?: (value: T) => V,
 ): AggregateFunction<T, V | undefined, V | undefined> {
   const extractor = valueExtractor ?? ((v: T) => v as unknown as V)
   return {
@@ -252,10 +252,10 @@ export function max<T extends CanMinMax>(): AggregateFunction<
   T | undefined
 >
 export function max<T, V extends CanMinMax>(
-  valueExtractor: (value: T) => V
+  valueExtractor: (value: T) => V,
 ): AggregateFunction<T, V | undefined, V | undefined>
 export function max<T, V extends CanMinMax>(
-  valueExtractor?: (value: T) => V
+  valueExtractor?: (value: T) => V,
 ): AggregateFunction<T, V | undefined, V | undefined> {
   const extractor = valueExtractor ?? ((v: T) => v as unknown as V)
   return {
@@ -278,7 +278,7 @@ export function max<T, V extends CanMinMax>(
  * @param valueExtractor Function to extract a numeric value from each data entry
  */
 export function median<T>(
-  valueExtractor: (value: T) => number = (v) => v as unknown as number
+  valueExtractor: (value: T) => number = (v) => v as unknown as number,
 ): AggregateFunction<T, number, Array<number>> {
   return {
     preMap: (data: T) => [valueExtractor(data)],
@@ -326,7 +326,7 @@ export function median<T>(
  * @param valueExtractor Function to extract a value from each data entry
  */
 export function mode<T>(
-  valueExtractor: (value: T) => number = (v) => v as unknown as number
+  valueExtractor: (value: T) => number = (v) => v as unknown as number,
 ): AggregateFunction<T, number, Map<number, number>> {
   return {
     preMap: (data: T) => {
diff --git a/packages/db-ivm/src/operators/index.ts b/packages/db-ivm/src/operators/index.ts
index f7619dc28..7cd72f1e8 100644
--- a/packages/db-ivm/src/operators/index.ts
+++ b/packages/db-ivm/src/operators/index.ts
@@ -1,19 +1,19 @@
-export * from "./pipe.js"
-export * from "./map.js"
-export * from "./tap.js"
-export * from "./filter.js"
-export * from "./negate.js"
-export * from "./concat.js"
-export * from "./debug.js"
-export * from "./output.js"
-export * from "./consolidate.js"
-export * from "./join.js"
-export * from "./reduce.js"
-export * from "./count.js"
-export * from "./distinct.js"
-export * from "./keying.js"
-export * from "./topK.js"
-export * from "./topKWithFractionalIndex.js"
-export * from "./orderBy.js"
-export * from "./filterBy.js"
-export { groupBy, groupByOperators } from "./groupBy.js"
+export * from './pipe.js'
+export * from './map.js'
+export * from './tap.js'
+export * from './filter.js'
+export * from './negate.js'
+export * from './concat.js'
+export * from './debug.js'
+export * from './output.js'
+export * from './consolidate.js'
+export * from './join.js'
+export * from './reduce.js'
+export * from './count.js'
+export * from './distinct.js'
+export * from './keying.js'
+export * from './topK.js'
+export * from './topKWithFractionalIndex.js'
+export * from './orderBy.js'
+export * from './filterBy.js'
+export { groupBy, groupByOperators } from './groupBy.js'
diff --git a/packages/db-ivm/src/operators/join.ts b/packages/db-ivm/src/operators/join.ts
index 36f710b2f..58b62620f 100644
--- a/packages/db-ivm/src/operators/join.ts
+++ b/packages/db-ivm/src/operators/join.ts
@@ -48,12 +48,12 @@
  * - **Bag semantics**: Proper multiplicity handling including negatives
  */
 
-import { BinaryOperator, DifferenceStreamWriter } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import { MultiSet } from "../multiset.js"
-import { Index } from "../indexes.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { IStreamBuilder, KeyValue, PipedOperator } from "../types.js"
+import { BinaryOperator, DifferenceStreamWriter } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import { MultiSet } from '../multiset.js'
+import { Index } from '../indexes.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { IStreamBuilder, KeyValue, PipedOperator } from '../types.js'
 
 /**
  * Type of join to perform
@@ -75,7 +75,7 @@ export class JoinOperator<K, V1, V2> extends BinaryOperator<
     inputA: DifferenceStreamReader<[K, V1]>,
     inputB: DifferenceStreamReader<[K, V2]>,
     output: DifferenceStreamWriter<any>,
-    mode: JoinType = `inner`
+    mode: JoinType = `inner`,
   ) {
     super(id, inputA, inputB, output)
     this.#mode = mode
@@ -84,10 +84,10 @@ export class JoinOperator<K, V1, V2> extends BinaryOperator<
   run(): void {
     // Build deltas from input messages
     const deltaA = Index.fromMultiSets<K, V1>(
-      this.inputAMessages() as Array<MultiSet<[K, V1]>>
+      this.inputAMessages() as Array<MultiSet<[K, V1]>>,
     )
     const deltaB = Index.fromMultiSets<K, V2>(
-      this.inputBMessages() as Array<MultiSet<[K, V2]>>
+      this.inputBMessages() as Array<MultiSet<[K, V2]>>,
     )
 
     // Early-out if nothing changed
@@ -130,7 +130,7 @@ export class JoinOperator<K, V1, V2> extends BinaryOperator<
   private emitInnerResults(
     deltaA: Index<K, V1>,
     deltaB: Index<K, V2>,
-    results: MultiSet<any>
+    results: MultiSet<any>,
   ): void {
     // Emit the three standard delta terms: ΔA⋈B_old, A_old⋈ΔB, ΔA⋈ΔB
     if (deltaA.size > 0) results.extend(deltaA.join(this.#indexB))
@@ -141,7 +141,7 @@ export class JoinOperator<K, V1, V2> extends BinaryOperator<
   private emitLeftOuterResults(
     deltaA: Index<K, V1>,
     deltaB: Index<K, V2>,
-    results: MultiSet<any>
+    results: MultiSet<any>,
   ): void {
     // Emit unmatched left rows from deltaA
     if (deltaA.size > 0) {
@@ -184,7 +184,7 @@ export class JoinOperator<K, V1, V2> extends BinaryOperator<
           if (multiplicity !== 0) {
             results.add(
               [key, [value, null]],
-              transitioningToMatched ? -multiplicity : +multiplicity
+              transitioningToMatched ? -multiplicity : +multiplicity,
             )
           }
         }
@@ -195,7 +195,7 @@ export class JoinOperator<K, V1, V2> extends BinaryOperator<
   private emitRightOuterResults(
     deltaA: Index<K, V1>,
     deltaB: Index<K, V2>,
-    results: MultiSet<any>
+    results: MultiSet<any>,
   ): void {
     // Emit unmatched right rows from deltaB
     if (deltaB.size > 0) {
@@ -238,7 +238,7 @@ export class JoinOperator<K, V1, V2> extends BinaryOperator<
           if (multiplicity !== 0) {
             results.add(
               [key, [null, value]],
-              transitioningToMatched ? -multiplicity : +multiplicity
+              transitioningToMatched ? -multiplicity : +multiplicity,
             )
           }
         }
@@ -259,24 +259,24 @@ export function join<
   T,
 >(
   other: IStreamBuilder<KeyValue<K, V2>>,
-  type: JoinType = `inner`
+  type: JoinType = `inner`,
 ): PipedOperator<T, KeyValue<K, [V1 | null, V2 | null]>> {
   return (
-    stream: IStreamBuilder<T>
+    stream: IStreamBuilder<T>,
   ): IStreamBuilder<KeyValue<K, [V1 | null, V2 | null]>> => {
     if (stream.graph !== other.graph) {
       throw new Error(`Cannot join streams from different graphs`)
     }
     const output = new StreamBuilder<KeyValue<K, [V1 | null, V2 | null]>>(
       stream.graph,
-      new DifferenceStreamWriter<KeyValue<K, [V1 | null, V2 | null]>>()
+      new DifferenceStreamWriter<KeyValue<K, [V1 | null, V2 | null]>>(),
     )
     const operator = new JoinOperator<K, V1, V2>(
       stream.graph.getNextOperatorId(),
       stream.connectReader() as DifferenceStreamReader<KeyValue<K, V1>>,
       other.connectReader(),
       output.writer,
-      type
+      type,
     )
     stream.graph.addOperator(operator)
     return output
@@ -293,7 +293,7 @@ export function innerJoin<
   V2,
   T,
 >(
-  other: IStreamBuilder<KeyValue<K, V2>>
+  other: IStreamBuilder<KeyValue<K, V2>>,
 ): PipedOperator<T, KeyValue<K, [V1, V2]>> {
   return join(other, `inner`) as unknown as PipedOperator<
     T,
@@ -311,7 +311,7 @@ export function antiJoin<
   V2,
   T,
 >(
-  other: IStreamBuilder<KeyValue<K, V2>>
+  other: IStreamBuilder<KeyValue<K, V2>>,
 ): PipedOperator<T, KeyValue<K, [V1, null]>> {
   return join(other, `anti`) as unknown as PipedOperator<
     T,
@@ -329,7 +329,7 @@ export function leftJoin<
   V2,
   T,
 >(
-  other: IStreamBuilder<KeyValue<K, V2>>
+  other: IStreamBuilder<KeyValue<K, V2>>,
 ): PipedOperator<T, KeyValue<K, [V1, V2 | null]>> {
   return join(other, `left`) as unknown as PipedOperator<
     T,
@@ -347,7 +347,7 @@ export function rightJoin<
   V2,
   T,
 >(
-  other: IStreamBuilder<KeyValue<K, V2>>
+  other: IStreamBuilder<KeyValue<K, V2>>,
 ): PipedOperator<T, KeyValue<K, [V1 | null, V2]>> {
   return join(other, `right`) as unknown as PipedOperator<
     T,
@@ -365,7 +365,7 @@ export function fullJoin<
   V2,
   T,
 >(
-  other: IStreamBuilder<KeyValue<K, V2>>
+  other: IStreamBuilder<KeyValue<K, V2>>,
 ): PipedOperator<T, KeyValue<K, [V1 | null, V2 | null]>> {
   return join(other, `full`) as unknown as PipedOperator<
     T,
diff --git a/packages/db-ivm/src/operators/keying.ts b/packages/db-ivm/src/operators/keying.ts
index 62b67d7a1..e4387445e 100644
--- a/packages/db-ivm/src/operators/keying.ts
+++ b/packages/db-ivm/src/operators/keying.ts
@@ -1,5 +1,5 @@
-import { map } from "./map.js"
-import type { PipedOperator } from "../types.js"
+import { map } from './map.js'
+import type { PipedOperator } from '../types.js'
 
 /**
  * Type for a keyed value
@@ -11,7 +11,7 @@ export type Keyed<K, V> = [K, V]
  * @param keyFn - Function to generate the key for each value
  */
 export function keyBy<T, K>(
-  keyFn: (value: T) => K
+  keyFn: (value: T) => K,
 ): PipedOperator<T, Keyed<K, T>> {
   return map((value: T): Keyed<K, T> => [keyFn(value), value])
 }
@@ -28,7 +28,7 @@ export function unkey<K, V>(): PipedOperator<Keyed<K, V>, V> {
  * @param keyFn - Function to generate the new key for each value
  */
 export function rekey<K1, K2, V>(
-  keyFn: (value: V) => K2
+  keyFn: (value: V) => K2,
 ): PipedOperator<Keyed<K1, V>, Keyed<K2, V>> {
   return map(([_, value]: Keyed<K1, V>): Keyed<K2, V> => [keyFn(value), value])
 }
diff --git a/packages/db-ivm/src/operators/map.ts b/packages/db-ivm/src/operators/map.ts
index 2aed5b1f0..a136155b6 100644
--- a/packages/db-ivm/src/operators/map.ts
+++ b/packages/db-ivm/src/operators/map.ts
@@ -1,8 +1,8 @@
-import { DifferenceStreamWriter, LinearUnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { MultiSet } from "../multiset.js"
+import { DifferenceStreamWriter, LinearUnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { MultiSet } from '../multiset.js'
 
 /**
  * Operator that applies a function to each element in the input stream
@@ -14,7 +14,7 @@ export class MapOperator<T, U> extends LinearUnaryOperator<T, U> {
     id: number,
     inputA: DifferenceStreamReader<T>,
     output: DifferenceStreamWriter<U>,
-    f: (data: T) => U
+    f: (data: T) => U,
   ) {
     super(id, inputA, output)
     this.#f = f
@@ -33,13 +33,13 @@ export function map<T, O>(f: (data: T) => O): PipedOperator<T, O> {
   return (stream: IStreamBuilder<T>): IStreamBuilder<O> => {
     const output = new StreamBuilder<O>(
       stream.graph,
-      new DifferenceStreamWriter<O>()
+      new DifferenceStreamWriter<O>(),
     )
     const operator = new MapOperator<T, O>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       output.writer,
-      f
+      f,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/negate.ts b/packages/db-ivm/src/operators/negate.ts
index 8962c210f..d45029aba 100644
--- a/packages/db-ivm/src/operators/negate.ts
+++ b/packages/db-ivm/src/operators/negate.ts
@@ -1,7 +1,7 @@
-import { DifferenceStreamWriter, LinearUnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
-import type { MultiSet } from "../multiset.js"
+import { DifferenceStreamWriter, LinearUnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
+import type { MultiSet } from '../multiset.js'
 
 /**
  * Operator that negates the multiplicities in the input stream
@@ -19,12 +19,12 @@ export function negate<T>(): PipedOperator<T, T> {
   return (stream: IStreamBuilder<T>): IStreamBuilder<T> => {
     const output = new StreamBuilder<T>(
       stream.graph,
-      new DifferenceStreamWriter<T>()
+      new DifferenceStreamWriter<T>(),
     )
     const operator = new NegateOperator<T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
-      output.writer
+      output.writer,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/orderBy.ts b/packages/db-ivm/src/operators/orderBy.ts
index ce399b3bc..0bf7c4bef 100644
--- a/packages/db-ivm/src/operators/orderBy.ts
+++ b/packages/db-ivm/src/operators/orderBy.ts
@@ -1,9 +1,9 @@
-import { topK, topKWithIndex } from "./topK.js"
-import { topKWithFractionalIndex } from "./topKWithFractionalIndex.js"
-import { map } from "./map.js"
-import { innerJoin } from "./join.js"
-import { consolidate } from "./consolidate.js"
-import type { IStreamBuilder, KeyValue } from "../types.js"
+import { topK, topKWithIndex } from './topK.js'
+import { topKWithFractionalIndex } from './topKWithFractionalIndex.js'
+import { map } from './map.js'
+import { innerJoin } from './join.js'
+import { consolidate } from './consolidate.js'
+import type { IStreamBuilder, KeyValue } from '../types.js'
 
 export interface OrderByOptions<Ve> {
   comparator?: (a: Ve, b: Ve) => number
@@ -14,7 +14,7 @@ export interface OrderByOptions<Ve> {
 type OrderByWithFractionalIndexOptions<Ve> = OrderByOptions<Ve> & {
   setSizeCallback?: (getSize: () => number) => void
   setWindowFn?: (
-    windowFn: (options: { offset?: number; limit?: number }) => void
+    windowFn: (options: { offset?: number; limit?: number }) => void,
   ) => void
 }
 
@@ -28,9 +28,9 @@ type OrderByWithFractionalIndexOptions<Ve> = OrderByOptions<Ve> & {
  */
 export function orderBy<T extends KeyValue<unknown, unknown>, Ve = unknown>(
   valueExtractor: (
-    value: T extends KeyValue<unknown, infer V> ? V : never
+    value: T extends KeyValue<unknown, infer V> ? V : never,
   ) => Ve,
-  options?: OrderByOptions<Ve>
+  options?: OrderByOptions<Ve>,
 ) {
   const limit = options?.limit ?? Infinity
   const offset = options?.offset ?? 0
@@ -54,10 +54,10 @@ export function orderBy<T extends KeyValue<unknown, unknown>, Ve = unknown>(
             [
               key,
               valueExtractor(
-                value as T extends KeyValue<unknown, infer V> ? V : never
+                value as T extends KeyValue<unknown, infer V> ? V : never,
               ),
             ],
-          ] as KeyValue<null, [KeyType, Ve]>
+          ] as KeyValue<null, [KeyType, Ve]>,
       ),
       topK((a, b) => comparator(a[1], b[1]), { limit, offset }),
       map(([_, [key]]) => [key, null] as KeyValue<KeyType, null>),
@@ -65,7 +65,7 @@ export function orderBy<T extends KeyValue<unknown, unknown>, Ve = unknown>(
       map(([key, value]) => {
         return [key, value[1]] as T
       }),
-      consolidate()
+      consolidate(),
     )
   }
 }
@@ -84,9 +84,9 @@ export function orderByWithIndex<
   Ve = unknown,
 >(
   valueExtractor: (
-    value: T extends KeyValue<unknown, infer V> ? V : never
+    value: T extends KeyValue<unknown, infer V> ? V : never,
   ) => Ve,
-  options?: OrderByOptions<Ve>
+  options?: OrderByOptions<Ve>,
 ) {
   const limit = options?.limit ?? Infinity
   const offset = options?.offset ?? 0
@@ -100,7 +100,7 @@ export function orderByWithIndex<
     })
 
   return (
-    stream: IStreamBuilder<T>
+    stream: IStreamBuilder<T>,
   ): IStreamBuilder<
     KeyValue<
       T extends KeyValue<infer K, unknown> ? K : never,
@@ -118,10 +118,10 @@ export function orderByWithIndex<
             [
               key,
               valueExtractor(
-                value as T extends KeyValue<unknown, infer V> ? V : never
+                value as T extends KeyValue<unknown, infer V> ? V : never,
               ),
             ],
-          ] as KeyValue<null, [KeyType, Ve]>
+          ] as KeyValue<null, [KeyType, Ve]>,
       ),
       topKWithIndex((a, b) => comparator(a[1], b[1]), { limit, offset }),
       map(([_, [[key], index]]) => [key, index] as KeyValue<KeyType, number>),
@@ -129,7 +129,7 @@ export function orderByWithIndex<
       map(([key, [index, value]]) => {
         return [key, [value, index]] as KeyValue<KeyType, [ValueType, number]>
       }),
-      consolidate()
+      consolidate(),
     )
   }
 }
@@ -140,9 +140,9 @@ export function orderByWithFractionalIndexBase<
 >(
   topKFunction: typeof topKWithFractionalIndex,
   valueExtractor: (
-    value: T extends KeyValue<unknown, infer V> ? V : never
+    value: T extends KeyValue<unknown, infer V> ? V : never,
   ) => Ve,
-  options?: OrderByWithFractionalIndexOptions<Ve>
+  options?: OrderByWithFractionalIndexOptions<Ve>,
 ) {
   type KeyType = T extends KeyValue<infer K, unknown> ? K : never
   type ValueType = T extends KeyValue<unknown, infer V> ? V : never
@@ -161,7 +161,7 @@ export function orderByWithFractionalIndexBase<
     })
 
   return (
-    stream: IStreamBuilder<T>
+    stream: IStreamBuilder<T>,
   ): IStreamBuilder<[KeyType, [ValueType, string]]> => {
     return stream.pipe(
       topKFunction(
@@ -172,9 +172,9 @@ export function orderByWithFractionalIndexBase<
           offset,
           setSizeCallback,
           setWindowFn,
-        }
+        },
       ),
-      consolidate()
+      consolidate(),
     )
   }
 }
@@ -193,13 +193,13 @@ export function orderByWithFractionalIndex<
   Ve = unknown,
 >(
   valueExtractor: (
-    value: T extends KeyValue<unknown, infer V> ? V : never
+    value: T extends KeyValue<unknown, infer V> ? V : never,
   ) => Ve,
-  options?: OrderByWithFractionalIndexOptions<Ve>
+  options?: OrderByWithFractionalIndexOptions<Ve>,
 ) {
   return orderByWithFractionalIndexBase(
     topKWithFractionalIndex,
     valueExtractor,
-    options
+    options,
   )
 }
diff --git a/packages/db-ivm/src/operators/orderByBTree.ts b/packages/db-ivm/src/operators/orderByBTree.ts
index a933f1cf4..db95b2dea 100644
--- a/packages/db-ivm/src/operators/orderByBTree.ts
+++ b/packages/db-ivm/src/operators/orderByBTree.ts
@@ -1,20 +1,20 @@
-import { orderByWithFractionalIndexBase } from "./orderBy.js"
-import { topKWithFractionalIndexBTree } from "./topKWithFractionalIndexBTree.js"
-import type { KeyValue } from "../types.js"
-import type { OrderByOptions } from "./orderBy.js"
+import { orderByWithFractionalIndexBase } from './orderBy.js'
+import { topKWithFractionalIndexBTree } from './topKWithFractionalIndexBTree.js'
+import type { KeyValue } from '../types.js'
+import type { OrderByOptions } from './orderBy.js'
 
 export function orderByWithFractionalIndexBTree<
   T extends KeyValue<unknown, unknown>,
   Ve = unknown,
 >(
   valueExtractor: (
-    value: T extends KeyValue<unknown, infer V> ? V : never
+    value: T extends KeyValue<unknown, infer V> ? V : never,
   ) => Ve,
-  options?: OrderByOptions<Ve>
+  options?: OrderByOptions<Ve>,
 ) {
   return orderByWithFractionalIndexBase(
     topKWithFractionalIndexBTree,
     valueExtractor,
-    options
+    options,
   )
 }
diff --git a/packages/db-ivm/src/operators/output.ts b/packages/db-ivm/src/operators/output.ts
index 5217b3d66..2e9795e86 100644
--- a/packages/db-ivm/src/operators/output.ts
+++ b/packages/db-ivm/src/operators/output.ts
@@ -1,8 +1,8 @@
-import { DifferenceStreamWriter, UnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { MultiSet } from "../multiset.js"
+import { DifferenceStreamWriter, UnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { MultiSet } from '../multiset.js'
 
 /**
  * Operator that outputs the messages in the stream
@@ -14,7 +14,7 @@ export class OutputOperator<T> extends UnaryOperator<T> {
     id: number,
     inputA: DifferenceStreamReader<T>,
     outputWriter: DifferenceStreamWriter<T>,
-    fn: (data: MultiSet<T>) => void
+    fn: (data: MultiSet<T>) => void,
   ) {
     super(id, inputA, outputWriter)
     this.#fn = fn
@@ -33,18 +33,18 @@ export class OutputOperator<T> extends UnaryOperator<T> {
  * @param fn - The function to call with each message
  */
 export function output<T>(
-  fn: (data: MultiSet<T>) => void
+  fn: (data: MultiSet<T>) => void,
 ): PipedOperator<T, T> {
   return (stream: IStreamBuilder<T>): IStreamBuilder<T> => {
     const outputStream = new StreamBuilder<T>(
       stream.graph,
-      new DifferenceStreamWriter<T>()
+      new DifferenceStreamWriter<T>(),
     )
     const operator = new OutputOperator<T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       outputStream.writer,
-      fn
+      fn,
     )
     stream.graph.addOperator(operator)
     return outputStream
diff --git a/packages/db-ivm/src/operators/pipe.ts b/packages/db-ivm/src/operators/pipe.ts
index 68b2ba954..87efbe3ed 100644
--- a/packages/db-ivm/src/operators/pipe.ts
+++ b/packages/db-ivm/src/operators/pipe.ts
@@ -1,4 +1,4 @@
-import type { IStreamBuilder, PipedOperator } from "../types.js"
+import type { IStreamBuilder, PipedOperator } from '../types.js'
 
 // Don't judge, this is the only way to type this function.
 // rxjs has very similar code to type its pipe function
diff --git a/packages/db-ivm/src/operators/reduce.ts b/packages/db-ivm/src/operators/reduce.ts
index 4301dced5..3a8690e01 100644
--- a/packages/db-ivm/src/operators/reduce.ts
+++ b/packages/db-ivm/src/operators/reduce.ts
@@ -1,9 +1,9 @@
-import { DifferenceStreamWriter, UnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import { MultiSet } from "../multiset.js"
-import { Index } from "../indexes.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { IStreamBuilder, KeyValue } from "../types.js"
+import { DifferenceStreamWriter, UnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import { MultiSet } from '../multiset.js'
+import { Index } from '../indexes.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { IStreamBuilder, KeyValue } from '../types.js'
 
 /**
  * Base operator for reduction operations (version-free)
@@ -17,7 +17,7 @@ export class ReduceOperator<K, V1, V2> extends UnaryOperator<[K, V1], [K, V2]> {
     id: number,
     inputA: DifferenceStreamReader<[K, V1]>,
     output: DifferenceStreamWriter<[K, V2]>,
-    f: (values: Array<[V1, number]>) => Array<[V2, number]>
+    f: (values: Array<[V1, number]>) => Array<[V2, number]>,
   ) {
     super(id, inputA, output)
     this.#f = f
@@ -109,13 +109,13 @@ export function reduce<
   return (stream: IStreamBuilder<T>): IStreamBuilder<KeyValue<KType, R>> => {
     const output = new StreamBuilder<KeyValue<KType, R>>(
       stream.graph,
-      new DifferenceStreamWriter<KeyValue<KType, R>>()
+      new DifferenceStreamWriter<KeyValue<KType, R>>(),
     )
     const operator = new ReduceOperator<KType, V1Type, R>(
       stream.graph.getNextOperatorId(),
       stream.connectReader() as DifferenceStreamReader<KeyValue<KType, V1Type>>,
       output.writer,
-      f
+      f,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/tap.ts b/packages/db-ivm/src/operators/tap.ts
index 20c59fd5a..a6fb09e9f 100644
--- a/packages/db-ivm/src/operators/tap.ts
+++ b/packages/db-ivm/src/operators/tap.ts
@@ -1,8 +1,8 @@
-import { DifferenceStreamWriter, LinearUnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { MultiSet } from "../multiset.js"
+import { DifferenceStreamWriter, LinearUnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { MultiSet } from '../multiset.js'
 
 /**
  * Operator that applies a function to each multi-set in the input stream
@@ -14,7 +14,7 @@ export class TapOperator<T> extends LinearUnaryOperator<T, T> {
     id: number,
     inputA: DifferenceStreamReader<T>,
     output: DifferenceStreamWriter<T>,
-    f: (data: MultiSet<T>) => void
+    f: (data: MultiSet<T>) => void,
   ) {
     super(id, inputA, output)
     this.#f = f
@@ -36,13 +36,13 @@ export function tap<T>(f: (data: MultiSet<T>) => void): PipedOperator<T, T> {
   return (stream: IStreamBuilder<T>): IStreamBuilder<T> => {
     const output = new StreamBuilder<T>(
       stream.graph,
-      new DifferenceStreamWriter<T>()
+      new DifferenceStreamWriter<T>(),
     )
     const operator = new TapOperator<T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       output.writer,
-      f
+      f,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/operators/topK.ts b/packages/db-ivm/src/operators/topK.ts
index 77aae1bc2..6ff21d888 100644
--- a/packages/db-ivm/src/operators/topK.ts
+++ b/packages/db-ivm/src/operators/topK.ts
@@ -1,6 +1,6 @@
-import { MultiSet } from "../multiset.js"
-import { reduce } from "./reduce.js"
-import type { IStreamBuilder, KeyValue, PipedOperator } from "../types"
+import { MultiSet } from '../multiset.js'
+import { reduce } from './reduce.js'
+import type { IStreamBuilder, KeyValue, PipedOperator } from '../types'
 
 interface TopKOptions {
   limit?: number
@@ -24,7 +24,7 @@ export function topK<
   T,
 >(
   comparator: (a: V1Type, b: V1Type) => number,
-  options?: TopKOptions
+  options?: TopKOptions,
 ): PipedOperator<T, T> {
   const limit = options?.limit ?? Infinity
   const offset = options?.offset ?? 0
@@ -38,7 +38,7 @@ export function topK<
           .getInner()
           .sort((a, b) => comparator(a[0] as V1Type, b[0] as V1Type))
         return sortedValues.slice(offset, offset + limit)
-      })
+      }),
     )
     return reduced as IStreamBuilder<T>
   }
@@ -62,13 +62,13 @@ export function topKWithIndex<
   T,
 >(
   comparator: (a: V1Type, b: V1Type) => number,
-  options?: TopKOptions
+  options?: TopKOptions,
 ): PipedOperator<T, KeyValue<KType, [V1Type, number]>> {
   const limit = options?.limit ?? Infinity
   const offset = options?.offset ?? 0
 
   return (
-    stream: IStreamBuilder<T>
+    stream: IStreamBuilder<T>,
   ): IStreamBuilder<KeyValue<KType, [V1Type, number]>> => {
     const reduced = stream.pipe(
       reduce<KType, V1Type, [V1Type, number], T>((values) => {
@@ -84,7 +84,7 @@ export function topKWithIndex<
             multiplicity,
           ])
         return sortedValues
-      })
+      }),
     )
     return reduced
   }
diff --git a/packages/db-ivm/src/operators/topKWithFractionalIndex.ts b/packages/db-ivm/src/operators/topKWithFractionalIndex.ts
index 858503f6f..3609703e5 100644
--- a/packages/db-ivm/src/operators/topKWithFractionalIndex.ts
+++ b/packages/db-ivm/src/operators/topKWithFractionalIndex.ts
@@ -1,22 +1,18 @@
-import { generateKeyBetween } from "fractional-indexing"
-import { DifferenceStreamWriter, UnaryOperator } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
-import { MultiSet } from "../multiset.js"
-import {
-  binarySearch,
-  diffHalfOpen,
-  globalObjectIdGenerator,
-} from "../utils.js"
-import type { HRange } from "../utils.js"
-import type { DifferenceStreamReader } from "../graph.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
+import { generateKeyBetween } from 'fractional-indexing'
+import { DifferenceStreamWriter, UnaryOperator } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
+import { MultiSet } from '../multiset.js'
+import { binarySearch, compareKeys, diffHalfOpen } from '../utils.js'
+import type { HRange } from '../utils.js'
+import type { DifferenceStreamReader } from '../graph.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
 
 export interface TopKWithFractionalIndexOptions {
   limit?: number
   offset?: number
   setSizeCallback?: (getSize: () => number) => void
   setWindowFn?: (
-    windowFn: (options: { offset?: number; limit?: number }) => void
+    windowFn: (options: { offset?: number; limit?: number }) => void,
   ) => void
 }
 
@@ -61,7 +57,7 @@ class TopKArray<V> implements TopK<V> {
   constructor(
     offset: number,
     limit: number,
-    comparator: (a: V, b: V) => number
+    comparator: (a: V, b: V) => number,
   ) {
     this.#topKStart = offset
     this.#topKEnd = offset + limit
@@ -229,7 +225,7 @@ class TopKArray<V> implements TopK<V> {
 
   #findIndex(value: V): number {
     return binarySearch(this.#sortedValues, indexedValue(value, ``), (a, b) =>
-      this.#comparator(getValue(a), getValue(b))
+      this.#comparator(getValue(a), getValue(b)),
     )
   }
 }
@@ -239,43 +235,34 @@ class TopKArray<V> implements TopK<V> {
  * This operator maintains fractional indices for sorted elements
  * and only updates indices when elements move position
  */
-export class TopKWithFractionalIndexOperator<K, T> extends UnaryOperator<
-  [K, T],
-  [K, IndexedValue<T>]
-> {
+export class TopKWithFractionalIndexOperator<
+  K extends string | number,
+  T,
+> extends UnaryOperator<[K, T], [K, IndexedValue<T>]> {
   #index: Map<K, number> = new Map() // maps keys to their multiplicity
 
   /**
    * topK data structure that supports insertions and deletions
    * and returns changes to the topK.
+   * Elements are stored as [key, value] tuples for stable tie-breaking.
    */
-  #topK: TopK<TaggedValue<K, T>>
+  #topK: TopK<[K, T]>
 
   constructor(
     id: number,
     inputA: DifferenceStreamReader<[K, T]>,
     output: DifferenceStreamWriter<[K, IndexedValue<T>]>,
     comparator: (a: T, b: T) => number,
-    options: TopKWithFractionalIndexOptions
+    options: TopKWithFractionalIndexOptions,
   ) {
     super(id, inputA, output)
     const limit = options.limit ?? Infinity
     const offset = options.offset ?? 0
-    const compareTaggedValues = (
-      a: TaggedValue<K, T>,
-      b: TaggedValue<K, T>
-    ) => {
-      // First compare on the value
-      const valueComparison = comparator(getVal(a), getVal(b))
-      if (valueComparison !== 0) {
-        return valueComparison
-      }
-      // If the values are equal, compare on the tag (object identity)
-      const tieBreakerA = getTag(a)
-      const tieBreakerB = getTag(b)
-      return tieBreakerA - tieBreakerB
-    }
-    this.#topK = this.createTopK(offset, limit, compareTaggedValues)
+    this.#topK = this.createTopK(
+      offset,
+      limit,
+      createKeyedComparator(comparator),
+    )
     options.setSizeCallback?.(() => this.#topK.size)
     options.setWindowFn?.(this.moveTopK.bind(this))
   }
@@ -283,8 +270,8 @@ export class TopKWithFractionalIndexOperator<K, T> extends UnaryOperator<
   protected createTopK(
     offset: number,
     limit: number,
-    comparator: (a: TaggedValue<K, T>, b: TaggedValue<K, T>) => number
-  ): TopK<TaggedValue<K, T>> {
+    comparator: (a: [K, T], b: [K, T]) => number,
+  ): TopK<[K, T]> {
     return new TopKArray(offset, limit, comparator)
   }
 
@@ -295,7 +282,7 @@ export class TopKWithFractionalIndexOperator<K, T> extends UnaryOperator<
   moveTopK({ offset, limit }: { offset?: number; limit?: number }) {
     if (!(this.#topK instanceof TopKArray)) {
       throw new Error(
-        `Cannot move B+-tree implementation of TopK with fractional index`
+        `Cannot move B+-tree implementation of TopK with fractional index`,
       )
     }
 
@@ -332,24 +319,22 @@ export class TopKWithFractionalIndexOperator<K, T> extends UnaryOperator<
     key: K,
     value: T,
     multiplicity: number,
-    result: Array<[[K, IndexedValue<T>], number]>
+    result: Array<[[K, IndexedValue<T>], number]>,
   ): void {
     const { oldMultiplicity, newMultiplicity } = this.addKey(key, multiplicity)
 
-    let res: TopKChanges<TaggedValue<K, T>> = {
+    let res: TopKChanges<[K, T]> = {
       moveIn: null,
       moveOut: null,
     }
     if (oldMultiplicity <= 0 && newMultiplicity > 0) {
       // The value was invisible but should now be visible
       // Need to insert it into the array of sorted values
-      const taggedValue = tagValue(key, value)
-      res = this.#topK.insert(taggedValue)
+      res = this.#topK.insert([key, value])
     } else if (oldMultiplicity > 0 && newMultiplicity <= 0) {
       // The value was visible but should now be invisible
       // Need to remove it from the array of sorted values
-      const taggedValue = tagValue(key, value)
-      res = this.#topK.delete(taggedValue)
+      res = this.#topK.delete([key, value])
     } else {
       // The value was invisible and it remains invisible
       // or it was visible and remains visible
@@ -363,28 +348,22 @@ export class TopKWithFractionalIndexOperator<K, T> extends UnaryOperator<
   }
 
   private handleMoveIn(
-    moveIn: IndexedValue<TaggedValue<K, T>> | null,
-    result: Array<[[K, IndexedValue<T>], number]>
+    moveIn: IndexedValue<[K, T]> | null,
+    result: Array<[[K, IndexedValue<T>], number]>,
   ) {
     if (moveIn) {
-      const index = getIndex(moveIn)
-      const taggedValue = getValue(moveIn)
-      const k = getKey(taggedValue)
-      const val = getVal(taggedValue)
-      result.push([[k, [val, index]], 1])
+      const [[key, value], index] = moveIn
+      result.push([[key, [value, index]], 1])
     }
   }
 
   private handleMoveOut(
-    moveOut: IndexedValue<TaggedValue<K, T>> | null,
-    result: Array<[[K, IndexedValue<T>], number]>
+    moveOut: IndexedValue<[K, T]> | null,
+    result: Array<[[K, IndexedValue<T>], number]>,
   ) {
     if (moveOut) {
-      const index = getIndex(moveOut)
-      const taggedValue = getValue(moveOut)
-      const k = getKey(taggedValue)
-      const val = getVal(taggedValue)
-      result.push([[k, [val, index]], -1])
+      const [[key, value], index] = moveOut
+      result.push([[key, [value, index]], -1])
     }
   }
 
@@ -394,7 +373,7 @@ export class TopKWithFractionalIndexOperator<K, T> extends UnaryOperator<
 
   private addKey(
     key: K,
-    multiplicity: number
+    multiplicity: number,
   ): { oldMultiplicity: number; newMultiplicity: number } {
     const oldMultiplicity = this.getMultiplicity(key)
     const newMultiplicity = oldMultiplicity + multiplicity
@@ -417,25 +396,25 @@ export class TopKWithFractionalIndexOperator<K, T> extends UnaryOperator<
  * @param options - An optional object containing limit and offset properties
  * @returns A piped operator that orders the elements and limits the number of results
  */
-export function topKWithFractionalIndex<KType, T>(
+export function topKWithFractionalIndex<KType extends string | number, T>(
   comparator: (a: T, b: T) => number,
-  options?: TopKWithFractionalIndexOptions
+  options?: TopKWithFractionalIndexOptions,
 ): PipedOperator<[KType, T], [KType, IndexedValue<T>]> {
   const opts = options || {}
 
   return (
-    stream: IStreamBuilder<[KType, T]>
+    stream: IStreamBuilder<[KType, T]>,
   ): IStreamBuilder<[KType, IndexedValue<T>]> => {
     const output = new StreamBuilder<[KType, IndexedValue<T>]>(
       stream.graph,
-      new DifferenceStreamWriter<[KType, IndexedValue<T>]>()
+      new DifferenceStreamWriter<[KType, IndexedValue<T>]>(),
     )
     const operator = new TopKWithFractionalIndexOperator<KType, T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       output.writer,
       comparator,
-      opts
+      opts,
     )
     stream.graph.addOperator(operator)
     return output
@@ -448,7 +427,7 @@ export type IndexedValue<V> = [V, FractionalIndex]
 
 export function indexedValue<V>(
   value: V,
-  index: FractionalIndex
+  index: FractionalIndex,
 ): IndexedValue<V> {
   return [value, index]
 }
@@ -461,21 +440,21 @@ export function getIndex<V>(indexedVal: IndexedValue<V>): FractionalIndex {
   return indexedVal[1]
 }
 
-export type Tag = number
-export type TaggedValue<K, V> = [K, V, Tag]
-
-function tagValue<K, V>(key: K, value: V): TaggedValue<K, V> {
-  return [key, value, globalObjectIdGenerator.getId(key)]
-}
-
-function getKey<K, V>(tieBreakerTaggedValue: TaggedValue<K, V>): K {
-  return tieBreakerTaggedValue[0]
-}
-
-function getVal<K, V>(tieBreakerTaggedValue: TaggedValue<K, V>): V {
-  return tieBreakerTaggedValue[1]
-}
-
-function getTag<K, V>(tieBreakerTaggedValue: TaggedValue<K, V>): Tag {
-  return tieBreakerTaggedValue[2]
+/**
+ * Creates a comparator for [key, value] tuples that first compares values,
+ * then uses the row key as a stable tie-breaker.
+ */
+function createKeyedComparator<K extends string | number, T>(
+  comparator: (a: T, b: T) => number,
+): (a: [K, T], b: [K, T]) => number {
+  return ([aKey, aVal], [bKey, bVal]) => {
+    // First compare on the value
+    const valueComparison = comparator(aVal, bVal)
+    if (valueComparison !== 0) {
+      return valueComparison
+    }
+    // If the values are equal, use the row key as tie-breaker
+    // This provides stable, deterministic ordering since keys are string | number
+    return compareKeys(aKey, bKey)
+  }
 }
diff --git a/packages/db-ivm/src/operators/topKWithFractionalIndexBTree.ts b/packages/db-ivm/src/operators/topKWithFractionalIndexBTree.ts
index 7b094d7c4..8114325dc 100644
--- a/packages/db-ivm/src/operators/topKWithFractionalIndexBTree.ts
+++ b/packages/db-ivm/src/operators/topKWithFractionalIndexBTree.ts
@@ -1,20 +1,19 @@
-import { generateKeyBetween } from "fractional-indexing"
-import { DifferenceStreamWriter } from "../graph.js"
-import { StreamBuilder } from "../d2.js"
+import { generateKeyBetween } from 'fractional-indexing'
+import { DifferenceStreamWriter } from '../graph.js'
+import { StreamBuilder } from '../d2.js'
 import {
   TopKWithFractionalIndexOperator,
   getIndex,
   getValue,
   indexedValue,
-} from "./topKWithFractionalIndex.js"
-import type { IStreamBuilder, PipedOperator } from "../types.js"
+} from './topKWithFractionalIndex.js'
+import type { IStreamBuilder, PipedOperator } from '../types.js'
 import type {
   IndexedValue,
-  TaggedValue,
   TopK,
   TopKChanges,
   TopKWithFractionalIndexOptions,
-} from "./topKWithFractionalIndex.js"
+} from './topKWithFractionalIndex.js'
 
 interface BTree<Key, Value> {
   nextLowerPair: (key: Key) => [Key, Value] | undefined
@@ -30,7 +29,7 @@ interface BTreeClass {
   new <Key, Value>(
     entries?: Array<[Key, Value]>,
     compare?: (a: Key, b: Key) => number,
-    maxNodeSize?: number
+    maxNodeSize?: number,
   ): BTree<Key, Value>
 }
 
@@ -61,11 +60,11 @@ class TopKTree<V> implements TopK<V> {
   constructor(
     offset: number,
     limit: number,
-    comparator: (a: V, b: V) => number
+    comparator: (a: V, b: V) => number,
   ) {
     if (BTree === undefined) {
       throw new Error(
-        `B+ tree not loaded. You need to call loadBTree() before using TopKTree.`
+        `B+ tree not loaded. You need to call loadBTree() before using TopKTree.`,
       )
     }
 
@@ -243,17 +242,17 @@ class TopKTree<V> implements TopK<V> {
  * and only updates indices when elements move position
  */
 export class TopKWithFractionalIndexBTreeOperator<
-  K,
+  K extends string | number,
   T,
 > extends TopKWithFractionalIndexOperator<K, T> {
   protected override createTopK(
     offset: number,
     limit: number,
-    comparator: (a: TaggedValue<K, T>, b: TaggedValue<K, T>) => number
-  ): TopK<TaggedValue<K, T>> {
+    comparator: (a: [K, T], b: [K, T]) => number,
+  ): TopK<[K, T]> {
     if (BTree === undefined) {
       throw new Error(
-        `B+ tree not loaded. You need to call loadBTree() before using TopKWithFractionalIndexBTreeOperator.`
+        `B+ tree not loaded. You need to call loadBTree() before using TopKWithFractionalIndexBTreeOperator.`,
       )
     }
     return new TopKTree(offset, limit, comparator)
@@ -275,31 +274,31 @@ export class TopKWithFractionalIndexBTreeOperator<
  * @param options - An optional object containing limit and offset properties
  * @returns A piped operator that orders the elements and limits the number of results
  */
-export function topKWithFractionalIndexBTree<KType, T>(
+export function topKWithFractionalIndexBTree<KType extends string | number, T>(
   comparator: (a: T, b: T) => number,
-  options?: TopKWithFractionalIndexOptions
+  options?: TopKWithFractionalIndexOptions,
 ): PipedOperator<[KType, T], [KType, IndexedValue<T>]> {
   const opts = options || {}
 
   if (BTree === undefined) {
     throw new Error(
-      `B+ tree not loaded. You need to call loadBTree() before using topKWithFractionalIndexBTree.`
+      `B+ tree not loaded. You need to call loadBTree() before using topKWithFractionalIndexBTree.`,
     )
   }
 
   return (
-    stream: IStreamBuilder<[KType, T]>
+    stream: IStreamBuilder<[KType, T]>,
   ): IStreamBuilder<[KType, IndexedValue<T>]> => {
     const output = new StreamBuilder<[KType, IndexedValue<T>]>(
       stream.graph,
-      new DifferenceStreamWriter<[KType, IndexedValue<T>]>()
+      new DifferenceStreamWriter<[KType, IndexedValue<T>]>(),
     )
     const operator = new TopKWithFractionalIndexBTreeOperator<KType, T>(
       stream.graph.getNextOperatorId(),
       stream.connectReader(),
       output.writer,
       comparator,
-      opts
+      opts,
     )
     stream.graph.addOperator(operator)
     return output
diff --git a/packages/db-ivm/src/types.ts b/packages/db-ivm/src/types.ts
index b1a8e71d3..da36bec3f 100644
--- a/packages/db-ivm/src/types.ts
+++ b/packages/db-ivm/src/types.ts
@@ -1,10 +1,10 @@
-import type { MultiSet, MultiSetArray } from "./multiset.js"
+import type { MultiSet, MultiSetArray } from './multiset.js'
 import type {
   BinaryOperator,
   DifferenceStreamReader,
   DifferenceStreamWriter,
   UnaryOperator,
-} from "./graph.js"
+} from './graph.js'
 
 export type KeyValue<K, V> = [K, V]
 
@@ -44,25 +44,25 @@ export interface IStreamBuilder<T> {
   pipe: (<O>(o1: PipedOperator<T, O>) => IStreamBuilder<O>) &
     (<T2, O>(
       o1: PipedOperator<T, T2>,
-      o2: PipedOperator<T2, O>
+      o2: PipedOperator<T2, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, O>(
       o1: PipedOperator<T, T2>,
       o2: PipedOperator<T2, T3>,
-      o3: PipedOperator<T3, O>
+      o3: PipedOperator<T3, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, O>(
       o1: PipedOperator<T, T2>,
       o2: PipedOperator<T2, T3>,
       o3: PipedOperator<T3, T4>,
-      o4: PipedOperator<T4, O>
+      o4: PipedOperator<T4, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, O>(
       o1: PipedOperator<T, T2>,
       o2: PipedOperator<T2, T3>,
       o3: PipedOperator<T3, T4>,
       o4: PipedOperator<T4, T5>,
-      o5: PipedOperator<T5, O>
+      o5: PipedOperator<T5, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, O>(
       o1: PipedOperator<T, T2>,
@@ -70,7 +70,7 @@ export interface IStreamBuilder<T> {
       o3: PipedOperator<T3, T4>,
       o4: PipedOperator<T4, T5>,
       o5: PipedOperator<T5, T6>,
-      o6: PipedOperator<T6, O>
+      o6: PipedOperator<T6, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, O>(
       o1: PipedOperator<T, T2>,
@@ -79,7 +79,7 @@ export interface IStreamBuilder<T> {
       o4: PipedOperator<T4, T5>,
       o5: PipedOperator<T5, T6>,
       o6: PipedOperator<T6, T7>,
-      o7: PipedOperator<T7, O>
+      o7: PipedOperator<T7, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, O>(
       o1: PipedOperator<T, T2>,
@@ -89,7 +89,7 @@ export interface IStreamBuilder<T> {
       o5: PipedOperator<T5, T6>,
       o6: PipedOperator<T6, T7>,
       o7: PipedOperator<T7, T8>,
-      o8: PipedOperator<T8, O>
+      o8: PipedOperator<T8, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, T9, O>(
       o1: PipedOperator<T, T2>,
@@ -100,7 +100,7 @@ export interface IStreamBuilder<T> {
       o6: PipedOperator<T6, T7>,
       o7: PipedOperator<T7, T8>,
       o8: PipedOperator<T8, T9>,
-      o9: PipedOperator<T9, O>
+      o9: PipedOperator<T9, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, T9, T10, O>(
       o1: PipedOperator<T, T2>,
@@ -112,7 +112,7 @@ export interface IStreamBuilder<T> {
       o7: PipedOperator<T7, T8>,
       o8: PipedOperator<T8, T9>,
       o9: PipedOperator<T9, T10>,
-      o10: PipedOperator<T10, O>
+      o10: PipedOperator<T10, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, O>(
       o1: PipedOperator<T, T2>,
@@ -125,7 +125,7 @@ export interface IStreamBuilder<T> {
       o8: PipedOperator<T8, T9>,
       o9: PipedOperator<T9, T10>,
       o10: PipedOperator<T10, T11>,
-      o11: PipedOperator<T11, O>
+      o11: PipedOperator<T11, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, O>(
       o1: PipedOperator<T, T2>,
@@ -139,7 +139,7 @@ export interface IStreamBuilder<T> {
       o9: PipedOperator<T9, T10>,
       o10: PipedOperator<T10, T11>,
       o11: PipedOperator<T11, T12>,
-      o12: PipedOperator<T12, O>
+      o12: PipedOperator<T12, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, O>(
       o1: PipedOperator<T, T2>,
@@ -154,7 +154,7 @@ export interface IStreamBuilder<T> {
       o10: PipedOperator<T10, T11>,
       o11: PipedOperator<T11, T12>,
       o12: PipedOperator<T12, T13>,
-      o13: PipedOperator<T13, O>
+      o13: PipedOperator<T13, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, O>(
       o1: PipedOperator<T, T2>,
@@ -170,7 +170,7 @@ export interface IStreamBuilder<T> {
       o11: PipedOperator<T11, T12>,
       o12: PipedOperator<T12, T13>,
       o13: PipedOperator<T13, T14>,
-      o14: PipedOperator<T14, O>
+      o14: PipedOperator<T14, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, O>(
       o1: PipedOperator<T, T2>,
@@ -187,7 +187,7 @@ export interface IStreamBuilder<T> {
       o12: PipedOperator<T12, T13>,
       o13: PipedOperator<T13, T14>,
       o14: PipedOperator<T14, T15>,
-      o15: PipedOperator<T15, O>
+      o15: PipedOperator<T15, O>,
     ) => IStreamBuilder<O>) &
     (<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, O>(
       o1: PipedOperator<T, T2>,
@@ -205,7 +205,7 @@ export interface IStreamBuilder<T> {
       o13: PipedOperator<T13, T14>,
       o14: PipedOperator<T14, T15>,
       o15: PipedOperator<T15, T16>,
-      o16: PipedOperator<T16, O>
+      o16: PipedOperator<T16, O>,
     ) => IStreamBuilder<O>) &
     (<
       T2,
@@ -242,7 +242,7 @@ export interface IStreamBuilder<T> {
       o14: PipedOperator<T14, T15>,
       o15: PipedOperator<T15, T16>,
       o16: PipedOperator<T16, T17>,
-      o17: PipedOperator<T17, O>
+      o17: PipedOperator<T17, O>,
     ) => IStreamBuilder<O>) &
     (<
       T2,
@@ -281,7 +281,7 @@ export interface IStreamBuilder<T> {
       o15: PipedOperator<T15, T16>,
       o16: PipedOperator<T16, T17>,
       o17: PipedOperator<T17, T18>,
-      o18: PipedOperator<T18, O>
+      o18: PipedOperator<T18, O>,
     ) => IStreamBuilder<O>) &
     (<
       T2,
@@ -322,7 +322,7 @@ export interface IStreamBuilder<T> {
       o16: PipedOperator<T16, T17>,
       o17: PipedOperator<T17, T18>,
       o18: PipedOperator<T18, T19>,
-      o19: PipedOperator<T19, O>
+      o19: PipedOperator<T19, O>,
     ) => IStreamBuilder<O>) &
     (<
       T2,
@@ -365,11 +365,11 @@ export interface IStreamBuilder<T> {
       o17: PipedOperator<T17, T18>,
       o18: PipedOperator<T18, T19>,
       o19: PipedOperator<T19, T20>,
-      o20: PipedOperator<T20, O>
+      o20: PipedOperator<T20, O>,
     ) => IStreamBuilder<O>) &
     (<O>(...operators: Array<PipedOperator<any, any>>) => IStreamBuilder<O>)
 }
 
 export type PipedOperator<I, O> = (
-  stream: IStreamBuilder<I>
+  stream: IStreamBuilder<I>,
 ) => IStreamBuilder<O>
diff --git a/packages/db-ivm/src/utils.ts b/packages/db-ivm/src/utils.ts
index 8ba01bb52..8f931c362 100644
--- a/packages/db-ivm/src/utils.ts
+++ b/packages/db-ivm/src/utils.ts
@@ -4,7 +4,7 @@
  */
 export function assert(
   condition: unknown,
-  message?: string
+  message?: string,
 ): asserts condition {
   if (!condition) {
     throw new Error(message || `Assertion failed`)
@@ -17,7 +17,7 @@ export function assert(
 export class DefaultMap<K, V> extends Map<K, V> {
   constructor(
     private defaultValue: () => V,
-    entries?: Iterable<[K, V]>
+    entries?: Iterable<[K, V]>,
   ) {
     super(entries)
   }
@@ -60,7 +60,7 @@ export function chunkedArrayPush(array: Array<unknown>, other: Array<unknown>) {
 export function binarySearch<T>(
   array: Array<T>,
   value: T,
-  comparator: (a: T, b: T) => number
+  comparator: (a: T, b: T) => number,
 ): number {
   let low = 0
   let high = array.length
@@ -138,7 +138,7 @@ export function* concatIterable<T>(
 
 export function* mapIterable<T, U>(
   it: Iterable<T>,
-  fn: (t: T) => U
+  fn: (t: T) => U,
 ): Iterable<U> {
   for (const t of it) {
     yield fn(t)
@@ -177,3 +177,18 @@ function range(start: number, end: number): Array<number> {
   for (let i = start; i < end; i++) out.push(i)
   return out
 }
+
+/**
+ * Compares two keys (string | number) in a consistent, deterministic way.
+ * Handles mixed types by ordering strings before numbers.
+ */
+export function compareKeys(a: string | number, b: string | number): number {
+  // Same type: compare directly
+  if (typeof a === typeof b) {
+    if (a < b) return -1
+    if (a > b) return 1
+    return 0
+  }
+  // Different types: strings come before numbers
+  return typeof a === `string` ? -1 : 1
+}
diff --git a/packages/db-ivm/tests/graph.test.ts b/packages/db-ivm/tests/graph.test.ts
index 562b88d5b..b3e2de187 100644
--- a/packages/db-ivm/tests/graph.test.ts
+++ b/packages/db-ivm/tests/graph.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, test } from "vitest"
-import { DifferenceStreamWriter } from "../src/graph.js"
-import { MultiSet } from "../src/multiset.js"
-import type { DifferenceStreamReader } from "../src/graph.js"
+import { beforeEach, describe, expect, test } from 'vitest'
+import { DifferenceStreamWriter } from '../src/graph.js'
+import { MultiSet } from '../src/multiset.js'
+import type { DifferenceStreamReader } from '../src/graph.js'
 
 describe(`DifferenceStreamReader and DifferenceStreamWriter`, () => {
   let writer: DifferenceStreamWriter<number>
diff --git a/packages/db-ivm/tests/indexes.test.ts b/packages/db-ivm/tests/indexes.test.ts
index 7994cad30..cad25daad 100644
--- a/packages/db-ivm/tests/indexes.test.ts
+++ b/packages/db-ivm/tests/indexes.test.ts
@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, test } from "vitest"
-import { Index } from "../src/indexes.js"
+import { beforeEach, describe, expect, test } from 'vitest'
+import { Index } from '../src/indexes.js'
 
 describe(`Index`, () => {
   let index: Index<string, number>
diff --git a/packages/db-ivm/tests/multiset.test.ts b/packages/db-ivm/tests/multiset.test.ts
index b640452cf..7dde5d80c 100644
--- a/packages/db-ivm/tests/multiset.test.ts
+++ b/packages/db-ivm/tests/multiset.test.ts
@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, it } from "vitest"
-import { MultiSet } from "../src/multiset.js"
+import { beforeEach, describe, expect, it } from 'vitest'
+import { MultiSet } from '../src/multiset.js'
 
 describe(`MultiSet`, () => {
   describe(`basic operations`, () => {
diff --git a/packages/db-ivm/tests/operators/concat.test.ts b/packages/db-ivm/tests/operators/concat.test.ts
index 9098d4569..c940bf7d1 100644
--- a/packages/db-ivm/tests/operators/concat.test.ts
+++ b/packages/db-ivm/tests/operators/concat.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { concat, output } from "../../src/operators/index.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { concat, output } from '../../src/operators/index.js'
 
 describe(`Operators`, () => {
   describe(`Concat operation`, () => {
@@ -15,7 +15,7 @@ describe(`Operators`, () => {
         concat(input2),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -24,14 +24,14 @@ describe(`Operators`, () => {
         new MultiSet([
           [1, 1],
           [2, 1],
-        ])
+        ]),
       )
 
       input2.sendData(
         new MultiSet([
           [3, 1],
           [4, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -58,7 +58,7 @@ describe(`Operators`, () => {
         concat(input2),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -67,14 +67,14 @@ describe(`Operators`, () => {
         new MultiSet([
           [1, -1],
           [2, 2],
-        ])
+        ]),
       )
 
       input2.sendData(
         new MultiSet([
           [3, -2],
           [4, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -101,7 +101,7 @@ describe(`Operators`, () => {
         concat(input2),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -110,14 +110,14 @@ describe(`Operators`, () => {
         new MultiSet([
           [1, 1],
           [2, 1],
-        ])
+        ]),
       )
 
       input2.sendData(
         new MultiSet([
           [`a`, 1],
           [`b`, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -144,7 +144,7 @@ describe(`Operators`, () => {
         concat(input2),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -154,7 +154,7 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       input2.sendData(
@@ -162,7 +162,7 @@ describe(`Operators`, () => {
           [2, 2],
           [3, -1],
           [4, 1],
-        ])
+        ]),
       )
 
       graph.run()
diff --git a/packages/db-ivm/tests/operators/consolidate.test.ts b/packages/db-ivm/tests/operators/consolidate.test.ts
index f05104be4..cb3ecc282 100644
--- a/packages/db-ivm/tests/operators/consolidate.test.ts
+++ b/packages/db-ivm/tests/operators/consolidate.test.ts
@@ -1,8 +1,8 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { consolidate } from "../../src/operators/consolidate.js"
-import { output } from "../../src/operators/output.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { consolidate } from '../../src/operators/consolidate.js'
+import { output } from '../../src/operators/output.js'
 
 describe(`Operators`, () => {
   describe(`Consolidate operation`, () => {
@@ -20,7 +20,7 @@ function testConsolidate() {
       consolidate(),
       output((message) => {
         messages.push(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -29,19 +29,19 @@ function testConsolidate() {
       new MultiSet([
         [1, 1],
         [2, 1],
-      ])
+      ]),
     )
     input.sendData(
       new MultiSet([
         [3, 1],
         [4, 1],
-      ])
+      ]),
     )
     input.sendData(
       new MultiSet([
         [3, 2],
         [2, -1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -65,7 +65,7 @@ function testConsolidate() {
       consolidate(),
       output((message) => {
         messages.push(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -74,13 +74,13 @@ function testConsolidate() {
       new MultiSet([
         [1, 1],
         [2, 2],
-      ])
+      ]),
     )
     input.sendData(
       new MultiSet([
         [1, -1],
         [2, -2],
-      ])
+      ]),
     )
     graph.run()
 
@@ -98,7 +98,7 @@ function testConsolidate() {
       consolidate(),
       output((message) => {
         messages.push(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -107,7 +107,7 @@ function testConsolidate() {
       new MultiSet([
         [1, 1],
         [2, 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -115,7 +115,7 @@ function testConsolidate() {
       new MultiSet([
         [2, 1],
         [3, 1],
-      ])
+      ]),
     )
     graph.run()
 
diff --git a/packages/db-ivm/tests/operators/count.test.ts b/packages/db-ivm/tests/operators/count.test.ts
index a9cb74c1e..941c3a0db 100644
--- a/packages/db-ivm/tests/operators/count.test.ts
+++ b/packages/db-ivm/tests/operators/count.test.ts
@@ -1,13 +1,13 @@
-import { describe, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { count } from "../../src/operators/count.js"
-import { output } from "../../src/operators/output.js"
+import { describe, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { count } from '../../src/operators/count.js'
+import { output } from '../../src/operators/output.js'
 import {
   KeyedMessageTracker,
   assertKeyedResults,
   assertOnlyKeysAffected,
-} from "../test-utils.js"
+} from '../test-utils.js'
 
 describe(`Operators`, () => {
   describe(`Count operation`, () => {
@@ -25,7 +25,7 @@ function testCount() {
       count(),
       output((message) => {
         tracker.addMessage(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -38,7 +38,7 @@ function testCount() {
         [[2, `d`], 1],
         [[3, `x`], 1],
         [[3, `y`], -1],
-      ])
+      ]),
     )
     input.sendData(new MultiSet([[[3, `z`], 1]]))
     graph.run()
@@ -57,7 +57,7 @@ function testCount() {
         [2, 3], // 3 values for key 2
         [3, 1], // 1 value for key 3 (1 + (-1) + 1 = 1)
       ],
-      6 // Expected message count
+      6, // Expected message count
     )
   })
 
@@ -70,7 +70,7 @@ function testCount() {
       count(),
       output((message) => {
         tracker.addMessage(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -79,7 +79,7 @@ function testCount() {
       new MultiSet([
         [[1, `a`], -1],
         [[1, `b`], -2],
-      ])
+      ]),
     )
     graph.run()
 
@@ -89,7 +89,7 @@ function testCount() {
     assertOnlyKeysAffected(
       `count with all negative multiplicities`,
       result.messages,
-      [1]
+      [1],
     )
 
     // Assert the final materialized results are correct
@@ -99,7 +99,7 @@ function testCount() {
       [
         [1, -3], // -1 + (-2) = -3
       ],
-      2 // Expected message count
+      2, // Expected message count
     )
   })
 
@@ -112,7 +112,7 @@ function testCount() {
       count(),
       output((message) => {
         tracker.addMessage(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -121,7 +121,7 @@ function testCount() {
       new MultiSet([
         [[`one`, `a`], 1],
         [[`one`, `b`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -129,7 +129,7 @@ function testCount() {
       new MultiSet([
         [[`one`, `c`], 1],
         [[`two`, `a`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -149,7 +149,7 @@ function testCount() {
         [`one`, 3], // 2 + 1 = 3
         [`two`, 1], // 1
       ],
-      5 // Expected message count
+      5, // Expected message count
     )
   })
 
@@ -162,7 +162,7 @@ function testCount() {
       count(),
       output((message) => {
         tracker.addMessage(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -176,7 +176,7 @@ function testCount() {
         [[`b`, `item2`], 1],
         [[`b`, `item3`], 1],
         [[`c`, `item1`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -188,7 +188,7 @@ function testCount() {
       new MultiSet([
         [[`a`, `item3`], 1], // Add to 'a' (2 -> 3)
         [[`c`, `item1`], -1], // Remove from 'c' (1 -> 0)
-      ])
+      ]),
     )
     graph.run()
 
@@ -208,7 +208,7 @@ function testCount() {
         [`a`, 3], // Count increased from 2 to 3
         [`c`, 0], // Count decreased from 1 to 0
       ],
-      4 // Expected message count: remove old 'a', add new 'a', remove old 'c', add new 'c'
+      4, // Expected message count: remove old 'a', add new 'a', remove old 'c', add new 'c'
     )
   })
 }
diff --git a/packages/db-ivm/tests/operators/debug.test.ts b/packages/db-ivm/tests/operators/debug.test.ts
index 4fdb25aaa..765a3369b 100644
--- a/packages/db-ivm/tests/operators/debug.test.ts
+++ b/packages/db-ivm/tests/operators/debug.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test, vi } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { debug } from "../../src/operators/index.js"
+import { describe, expect, test, vi } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { debug } from '../../src/operators/index.js'
 
 describe(`Operators`, () => {
   describe(`Debug operation`, () => {
@@ -19,13 +19,13 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
 
       expect(consoleSpy).toHaveBeenCalledWith(
-        `debug test data: MultiSet([[1,1],[2,1],[3,1]])`
+        `debug test data: MultiSet([[1,1],[2,1],[3,1]])`,
       )
     })
 
@@ -43,13 +43,13 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
 
       expect(consoleSpy).toHaveBeenCalledWith(
-        `debug test data: MultiSet([\n  [\n    1,\n    1\n  ],\n  [\n    2,\n    1\n  ],\n  [\n    3,\n    1\n  ]\n])`
+        `debug test data: MultiSet([\n  [\n    1,\n    1\n  ],\n  [\n    2,\n    1\n  ],\n  [\n    3,\n    1\n  ]\n])`,
       )
     })
 
@@ -67,13 +67,13 @@ describe(`Operators`, () => {
           [1, -1],
           [2, -2],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
 
       expect(consoleSpy).toHaveBeenCalledWith(
-        `debug test data: MultiSet([[1,-1],[2,-2],[3,1]])`
+        `debug test data: MultiSet([[1,-1],[2,-2],[3,1]])`,
       )
     })
   })
diff --git a/packages/db-ivm/tests/operators/distinct.test.ts b/packages/db-ivm/tests/operators/distinct.test.ts
index aa865e25c..23f36a775 100644
--- a/packages/db-ivm/tests/operators/distinct.test.ts
+++ b/packages/db-ivm/tests/operators/distinct.test.ts
@@ -1,10 +1,10 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { distinct } from "../../src/operators/distinct.js"
-import { output } from "../../src/operators/output.js"
-import { MessageTracker, assertResults } from "../test-utils.js"
-import { hash } from "../../src/hashing/index.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { distinct } from '../../src/operators/distinct.js'
+import { output } from '../../src/operators/output.js'
+import { MessageTracker, assertResults } from '../test-utils.js'
+import { hash } from '../../src/hashing/index.js'
 
 describe(`Operators`, () => {
   describe(`Efficient distinct operation`, () => {
@@ -22,7 +22,7 @@ function testDistinct() {
       distinct(),
       output((message) => {
         messages.push(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -32,7 +32,7 @@ function testDistinct() {
         [[1, `a`], 2],
         [[2, `b`], 1],
         [[2, `c`], 2],
-      ])
+      ]),
     )
     graph.run()
 
@@ -58,7 +58,7 @@ function testDistinct() {
       distinct(([_, value]) => value.country),
       output((message) => {
         messages.push(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -70,7 +70,7 @@ function testDistinct() {
         [[2, { name: `Kevin`, country: `Belgium` }], 1],
         [[3, { name: `Garry`, country: `UK` }], 1],
         [[4, { name: `Kyle`, country: `USA` }], 1],
-      ])
+      ]),
     )
 
     graph.run()
@@ -86,7 +86,7 @@ function testDistinct() {
         [`Portugal`, 1],
         [`UK`, 1],
         [`USA`, 1],
-      ].sort()
+      ].sort(),
     )
   })
 
@@ -99,7 +99,7 @@ function testDistinct() {
       distinct(),
       output((message) => {
         tracker.addMessage(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -110,7 +110,7 @@ function testDistinct() {
         [[1, `a`], 1],
         [[1, `b`], 1],
         [[1, `a`], 1], // Duplicate, should only result in 1
-      ])
+      ]),
     )
     graph.run()
 
@@ -122,7 +122,7 @@ function testDistinct() {
         [hash([1, `a`]), `a`],
         [hash([1, `b`]), `b`],
       ], // Should have both distinct values
-      4 // Max expected messages
+      4, // Max expected messages
     )
 
     tracker.reset()
@@ -133,7 +133,7 @@ function testDistinct() {
         [[1, `b`], -1], // Remove 'b'
         [[1, `c`], 2], // Add 'c' (multiplicity should be capped at 1)
         [[1, `a`], -1], // Remove 'a'
-      ])
+      ]),
     )
     graph.run()
 
@@ -142,7 +142,7 @@ function testDistinct() {
       `distinct with updates - second batch`,
       secondResult,
       [[hash([1, `c`]), `c`]], // Should only have 'c' remaining
-      4 // Max expected messages
+      4, // Max expected messages
     )
 
     tracker.reset()
@@ -156,7 +156,7 @@ function testDistinct() {
       `distinct with updates - third batch`,
       thirdResult,
       [], // Should have no remaining distinct values
-      2 // Max expected messages
+      2, // Max expected messages
     )
   })
 
@@ -169,7 +169,7 @@ function testDistinct() {
       distinct(),
       output((message) => {
         messages.push(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -179,7 +179,7 @@ function testDistinct() {
         [[`key1`, 1], 2],
         [[`key1`, 2], 3],
         [[`key2`, 1], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -203,7 +203,7 @@ function testDistinct() {
       distinct(),
       output((message) => {
         tracker.addMessage(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -216,7 +216,7 @@ function testDistinct() {
         [[`key2`, 1], 1], // Add ['key2', 1] with multiplicity 1 -> should become 1 (distinct)
         [[`key1`, 2], -3], // Remove all ['key1', 2] (total was 3) -> should be removed from distinct
         [[`key2`, 1], 1], // Add more ['key2', 1] -> still 1 in distinct
-      ])
+      ]),
     )
     graph.run()
 
@@ -228,7 +228,7 @@ function testDistinct() {
         [hash([`key1`, 1]), 1], // Should remain (multiplicity 2 -> 1 in distinct)
         [hash([`key2`, 1]), 1], // Should remain (multiplicity 2 -> 1 in distinct)
       ],
-      6 // Max expected messages (generous upper bound)
+      6, // Max expected messages (generous upper bound)
     )
   })
 }
diff --git a/packages/db-ivm/tests/operators/filter.test.ts b/packages/db-ivm/tests/operators/filter.test.ts
index 7ba3196c5..005ddcd5c 100644
--- a/packages/db-ivm/tests/operators/filter.test.ts
+++ b/packages/db-ivm/tests/operators/filter.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { filter, map, output } from "../../src/operators/index.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { filter, map, output } from '../../src/operators/index.js'
 
 describe(`Operators`, () => {
   describe(`Filter operation`, () => {
@@ -14,7 +14,7 @@ describe(`Operators`, () => {
         filter((x) => x % 2 === 0),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -24,7 +24,7 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -41,7 +41,7 @@ describe(`Operators`, () => {
         filter((x) => x > 2 && x < 5),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -53,7 +53,7 @@ describe(`Operators`, () => {
           [3, 1],
           [4, 1],
           [5, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -76,7 +76,7 @@ describe(`Operators`, () => {
         filter((x) => x % 4 === 0),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -87,7 +87,7 @@ describe(`Operators`, () => {
           [2, 1],
           [3, 1],
           [4, 1],
-        ])
+        ]),
       )
 
       graph.run()
diff --git a/packages/db-ivm/tests/operators/filterBy.test.ts b/packages/db-ivm/tests/operators/filterBy.test.ts
index 83b908cb3..12b55234b 100644
--- a/packages/db-ivm/tests/operators/filterBy.test.ts
+++ b/packages/db-ivm/tests/operators/filterBy.test.ts
@@ -1,8 +1,8 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { filterBy, output } from "../../src/operators/index.js"
-import type { KeyValue } from "../../src/types.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { filterBy, output } from '../../src/operators/index.js'
+import type { KeyValue } from '../../src/types.js'
 
 describe(`Operators`, () => {
   describe(`FilterBy operation`, () => {
@@ -21,7 +21,7 @@ describe(`Operators`, () => {
         filterBy(inputB),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -31,7 +31,7 @@ describe(`Operators`, () => {
         new MultiSet<KeyValue<number, string>>([
           [[1, `apple`], 1],
           [[2, `banana`], 1],
-        ])
+        ]),
       )
 
       // Send filter keys to the filter stream
@@ -54,7 +54,7 @@ describe(`Operators`, () => {
         filterBy(inputB),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -64,7 +64,7 @@ describe(`Operators`, () => {
         new MultiSet<KeyValue<number, string>>([
           [[1, `apple`], 1],
           [[2, `banana`], 1],
-        ])
+        ]),
       )
 
       // Send empty filter data
@@ -86,7 +86,7 @@ describe(`Operators`, () => {
         filterBy(inputB),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -97,7 +97,7 @@ describe(`Operators`, () => {
           [[1, `apple`], 1],
           [[2, `banana`], 1],
           [[3, `cherry`], 1],
-        ])
+        ]),
       )
 
       // Send filter keys
@@ -105,7 +105,7 @@ describe(`Operators`, () => {
         new MultiSet<KeyValue<number, boolean>>([
           [[2, true], 1],
           [[3, false], 1], // Value doesn't matter, only key presence
-        ])
+        ]),
       )
 
       graph.run()
@@ -129,7 +129,7 @@ describe(`Operators`, () => {
         filterBy(inputB),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -141,7 +141,7 @@ describe(`Operators`, () => {
           [[2, `banana`], 1],
           [[3, `cherry`], 1],
           [[4, `date`], 1],
-        ])
+        ]),
       )
 
       // Send initial filter keys
@@ -149,7 +149,7 @@ describe(`Operators`, () => {
         new MultiSet<KeyValue<number, boolean>>([
           [[1, true], 1],
           [[3, true], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -167,7 +167,7 @@ describe(`Operators`, () => {
         new MultiSet<KeyValue<number, boolean>>([
           [[2, true], 1],
           [[4, true], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -191,7 +191,7 @@ describe(`Operators`, () => {
         filterBy(inputB),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -202,7 +202,7 @@ describe(`Operators`, () => {
           [[1, `apple`], 1],
           [[2, `banana`], -1],
           [[3, `cherry`], 1],
-        ])
+        ]),
       )
 
       // Send filter keys
@@ -211,7 +211,7 @@ describe(`Operators`, () => {
           [[1, true], 1],
           [[2, true], 1],
           [[3, true], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -236,7 +236,7 @@ describe(`Operators`, () => {
         filterBy(inputB),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -247,7 +247,7 @@ describe(`Operators`, () => {
           [[1, `apple`], 1],
           [[2, `banana`], 1],
           [[3, `cherry`], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -260,7 +260,7 @@ describe(`Operators`, () => {
         new MultiSet<KeyValue<number, boolean>>([
           [[2, true], 1],
           [[3, false], 1],
-        ])
+        ]),
       )
 
       graph.run()
diff --git a/packages/db-ivm/tests/operators/groupBy.test.ts b/packages/db-ivm/tests/operators/groupBy.test.ts
index 1a569dcd1..fbe50fb33 100644
--- a/packages/db-ivm/tests/operators/groupBy.test.ts
+++ b/packages/db-ivm/tests/operators/groupBy.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
 import {
   avg,
   count,
@@ -10,8 +10,8 @@ import {
   min,
   mode,
   sum,
-} from "../../src/operators/groupBy.js"
-import { output } from "../../src/operators/index.js"
+} from '../../src/operators/groupBy.js'
+import { output } from '../../src/operators/index.js'
 
 describe(`Operators`, () => {
   describe(`GroupBy operation`, () => {
@@ -27,7 +27,7 @@ describe(`Operators`, () => {
         groupBy((data) => ({ category: data.category })),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -38,7 +38,7 @@ describe(`Operators`, () => {
           [{ category: `A`, amount: 10 }, 1],
           [{ category: `A`, amount: 20 }, 1],
           [{ category: `B`, amount: 30 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -85,7 +85,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -96,7 +96,7 @@ describe(`Operators`, () => {
           [{ category: `A`, amount: 10 }, 1],
           [{ category: `A`, amount: 20 }, 1],
           [{ category: `B`, amount: 30 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -150,12 +150,12 @@ describe(`Operators`, () => {
           {
             total: sum((data) => data.amount),
             count: count(),
-          }
+          },
         ),
         output((message) => {
           latestMessage = message
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -167,7 +167,7 @@ describe(`Operators`, () => {
           [{ category: `A`, region: `East`, amount: 20 }, 1],
           [{ category: `A`, region: `West`, amount: 30 }, 1],
           [{ category: `B`, region: `East`, amount: 40 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -220,7 +220,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [{ category: `A`, region: `East`, amount: 15 }, 1],
           [{ category: `B`, region: `West`, amount: 25 }, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -270,7 +270,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [{ category: `A`, region: `East`, amount: 20 }, -1], // Remove one of the A/East records
-        ])
+        ]),
       )
       graph.run()
 
@@ -321,12 +321,12 @@ describe(`Operators`, () => {
           {
             countNotNull: count((data) => data.amount),
             count: count(),
-          }
+          },
         ),
         output((message) => {
           latestMessage = message
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -338,7 +338,7 @@ describe(`Operators`, () => {
           [{ category: `B`, amount: 10 }, 1],
           [{ category: `A`, amount: null }, 1],
           [{ category: `B`, amount: null }, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -391,7 +391,7 @@ describe(`Operators`, () => {
         output((message) => {
           latestMessage = message
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -402,7 +402,7 @@ describe(`Operators`, () => {
           [{ category: `A`, amount: 10 }, 1],
           [{ category: `A`, amount: 20 }, 1],
           [{ category: `B`, amount: 30 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -441,7 +441,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [{ category: `A`, amount: 30 }, 1],
           [{ category: `C`, amount: 50 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -487,7 +487,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [{ category: `A`, amount: 10 }, -1], // Remove the first A record
-        ])
+        ]),
       )
       graph.run()
 
@@ -537,7 +537,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -550,7 +550,7 @@ describe(`Operators`, () => {
           [{ category: `A`, amount: 5, date: new Date(`2025/12/12`) }, 1],
           [{ category: `B`, amount: 30, date: new Date(`2025/12/12`) }, 1],
           [{ category: `B`, amount: 15, date: new Date(`2025/12/13`) }, 1],
-        ])
+        ]),
       )
 
       // Run the graph to process all messages
@@ -605,7 +605,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -626,7 +626,7 @@ describe(`Operators`, () => {
           [{ category: `B`, amount: 10 }, 1],
           [{ category: `B`, amount: 15 }, 1],
           [{ category: `B`, amount: 20 }, 1],
-        ])
+        ]),
       )
 
       // Run the graph to process all messages
@@ -676,7 +676,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -688,7 +688,7 @@ describe(`Operators`, () => {
           [{ category: `A`, amount: 20 }, 1],
           [{ category: `B`, amount: 30 }, 1],
           [{ category: `C`, amount: 40 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -699,7 +699,7 @@ describe(`Operators`, () => {
 
       // Find the group for category A
       const categoryAGroup = result.find(
-        ([key]: any) => key[0] === `{"category":"A"}`
+        ([key]: any) => key[0] === `{"category":"A"}`,
       )
       expect(categoryAGroup).toBeDefined()
       expect(categoryAGroup[0][1].total).toBe(30) // Sum of 10 + 20
@@ -709,7 +709,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [{ category: `A`, amount: 10 }, -1],
           [{ category: `A`, amount: 20 }, -1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -737,7 +737,7 @@ describe(`Operators`, () => {
       // Verify no new group with total: 0 was created by checking that
       // we don't have any positive weight entries for category A
       const positiveCategoryAEntries = result.filter(
-        ([key, , weight]: any) => key[0] === `{"category":"A"}` && weight > 0
+        ([key, , weight]: any) => key[0] === `{"category":"A"}` && weight > 0,
       )
       expect(positiveCategoryAEntries).toHaveLength(0)
     })
@@ -761,11 +761,11 @@ describe(`Operators`, () => {
             total: sum((data) => data.amount),
             count: count(),
             average: avg((data) => data.amount),
-          }
+          },
         ),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -777,7 +777,7 @@ describe(`Operators`, () => {
           [{ category: `A`, region: `East`, amount: 20 }, 1],
           [{ category: `A`, region: `West`, amount: 30 }, 1],
           [{ category: `B`, region: `East`, amount: 40 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -788,7 +788,7 @@ describe(`Operators`, () => {
 
       // Find the group for category A, region East
       const categoryAEastGroup = result.find(
-        ([key]: any) => key[0] === `{"category":"A","region":"East"}`
+        ([key]: any) => key[0] === `{"category":"A","region":"East"}`,
       )
       expect(categoryAEastGroup).toBeDefined()
       expect(categoryAEastGroup[0][1]).toEqual({
@@ -804,7 +804,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [{ category: `A`, region: `East`, amount: 10 }, -1],
           [{ category: `A`, region: `East`, amount: 20 }, -1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -834,7 +834,7 @@ describe(`Operators`, () => {
       // Verify no new group with zero/empty values was created
       const positiveCategoryAEastEntries = result.filter(
         ([key, , weight]: any) =>
-          key[0] === `{"category":"A","region":"East"}` && weight > 0
+          key[0] === `{"category":"A","region":"East"}` && weight > 0,
       )
       expect(positiveCategoryAEastEntries).toHaveLength(0)
     })
@@ -853,7 +853,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -864,7 +864,7 @@ describe(`Operators`, () => {
           [{ category: `A`, amount: 10 }, 1],
           [{ category: `A`, amount: 20 }, 1],
           [{ category: `B`, amount: 30 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -875,7 +875,7 @@ describe(`Operators`, () => {
 
       // Find the group for category A
       const categoryAGroup = result.find(
-        ([key]: any) => key[0] === `{"category":"A"}`
+        ([key]: any) => key[0] === `{"category":"A"}`,
       )
       expect(categoryAGroup).toBeDefined()
       expect(categoryAGroup[0][1].total).toBe(30) // Sum of 10 + 20
@@ -885,7 +885,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [{ category: `A`, amount: 10 }, -1],
           [{ category: `A`, amount: 20 }, -1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -910,7 +910,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [{ category: `A`, amount: 50 }, 1],
           [{ category: `A`, amount: 25 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -982,11 +982,11 @@ describe(`Operators`, () => {
             average: avg((data) => data.amount),
             minimum: min((data) => data.amount),
             maximum: max((data) => data.amount),
-          }
+          },
         ),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -998,7 +998,7 @@ describe(`Operators`, () => {
           [{ category: `A`, region: `East`, amount: 20 }, 1],
           [{ category: `A`, region: `East`, amount: 30 }, 1],
           [{ category: `B`, region: `West`, amount: 100 }, 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1009,7 +1009,7 @@ describe(`Operators`, () => {
 
       // Find the group for category A, region East
       const categoryAEastGroup = result.find(
-        ([key]: any) => key[0] === `{"category":"A","region":"East"}`
+        ([key]: any) => key[0] === `{"category":"A","region":"East"}`,
       )
       expect(categoryAEastGroup).toBeDefined()
       expect(categoryAEastGroup[0][1]).toEqual({
@@ -1028,7 +1028,7 @@ describe(`Operators`, () => {
           [{ category: `A`, region: `East`, amount: 10 }, -1],
           [{ category: `A`, region: `East`, amount: 20 }, -1],
           [{ category: `A`, region: `East`, amount: 30 }, -1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1060,7 +1060,7 @@ describe(`Operators`, () => {
           [{ category: `A`, region: `East`, amount: 15 }, 1],
           [{ category: `A`, region: `East`, amount: 40 }, 1],
           [{ category: `A`, region: `East`, amount: 40 }, 1], // Duplicate to test aggregates properly
-        ])
+        ]),
       )
       graph.run()
 
@@ -1089,7 +1089,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [{ category: `A`, region: `East`, amount: 40 }, -1], // Remove one of the 40s
-        ])
+        ]),
       )
       graph.run()
 
diff --git a/packages/db-ivm/tests/operators/join-types.test.ts b/packages/db-ivm/tests/operators/join-types.test.ts
index 9fe8f5387..f0943893e 100644
--- a/packages/db-ivm/tests/operators/join-types.test.ts
+++ b/packages/db-ivm/tests/operators/join-types.test.ts
@@ -1,15 +1,15 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { join } from "../../src/operators/join.js"
-import { output } from "../../src/operators/output.js"
-import { consolidate } from "../../src/operators/consolidate.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { join } from '../../src/operators/join.js'
+import { output } from '../../src/operators/output.js'
+import { consolidate } from '../../src/operators/consolidate.js'
 import {
   KeyedMessageTracker,
   assertKeyedResults,
   assertOnlyKeysAffected,
-} from "../test-utils.js"
-import type { JoinType } from "../../src/operators/join.js"
+} from '../test-utils.js'
+import type { JoinType } from '../../src/operators/join.js'
 
 /**
  * Sort results by multiplicity and then key
@@ -18,11 +18,11 @@ function sortResults(results: Array<any>) {
   return results
     .sort(
       ([[_aKey, _aValue], aMultiplicity], [[_bKey, _bValue], bMultiplicity]) =>
-        aMultiplicity - bMultiplicity
+        aMultiplicity - bMultiplicity,
     )
     .sort(
       ([[aKey, _aValue], _aMultiplicity], [[bKey, _bValue], _bMultiplicity]) =>
-        aKey - bKey
+        aKey - bKey,
     )
 }
 
@@ -52,7 +52,7 @@ describe(`Operators`, () => {
             consolidate(),
             output((message) => {
               tracker.addMessage(message)
-            })
+            }),
           )
 
           graph.finalize()
@@ -62,7 +62,7 @@ describe(`Operators`, () => {
             new MultiSet([
               [[`batch1_item1`, `a1`], 1],
               [[`batch1_item2`, `a2`], 1],
-            ])
+            ]),
           )
 
           inputA.sendData(new MultiSet([[[`batch2_item1`, `a3`], 1]]))
@@ -71,7 +71,7 @@ describe(`Operators`, () => {
             new MultiSet([
               [[`batch3_item1`, `a4`], 1],
               [[`batch3_item2`, `a5`], 1],
-            ])
+            ]),
           )
 
           // Send corresponding data to inputB (some matches, some don't)
@@ -81,7 +81,7 @@ describe(`Operators`, () => {
               [[`batch2_item1`, `x2`], 1], // matches
               [[`batch3_item2`, `x3`], 1], // matches
               [[`non_matching`, `x4`], 1], // doesn't match any inputA
-            ])
+            ]),
           )
 
           // Run the graph - should process all batches
@@ -131,7 +131,7 @@ describe(`Operators`, () => {
           assertOnlyKeysAffected(
             `${joinType} join with multiple batches`,
             result.messages,
-            expectedKeys
+            expectedKeys,
           )
 
           // Verify that we actually got some results
@@ -157,7 +157,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         tracker.addMessage(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -166,13 +166,13 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `A`], 1],
         [[2, `B`], 1],
-      ])
+      ]),
     )
     inputB.sendData(
       new MultiSet([
         [[2, `X`], 1],
         [[3, `Y`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -210,7 +210,7 @@ function testJoin(joinType: JoinType) {
       `${joinType} join - initial join with missing rows`,
       result,
       expectedResults[joinType],
-      6 // Max expected messages (generous upper bound)
+      6, // Max expected messages (generous upper bound)
     )
   })
 
@@ -228,7 +228,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         tracker.addMessage(message)
-      })
+      }),
     )
 
     graph.finalize()
@@ -239,7 +239,7 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `X`], 1],
         [[2, `Y`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -288,7 +288,7 @@ function testJoin(joinType: JoinType) {
       `${joinType} join - insert left (initial)`,
       initialResult,
       initialExpectedResults[joinType],
-      4 // Max expected messages for initial join
+      4, // Max expected messages for initial join
     )
 
     // Clear results after initial join
@@ -341,14 +341,14 @@ function testJoin(joinType: JoinType) {
       `${joinType} join - insert left`,
       result,
       expectedResults[joinType],
-      4 // Max expected messages for incremental update
+      4, // Max expected messages for incremental update
     )
 
     // Verify only affected keys produced messages
     assertOnlyKeysAffected(
       `${joinType} join - insert left`,
       result.messages,
-      [2] // Only key 2 should be affected
+      [2], // Only key 2 should be affected
     )
   })
 
@@ -363,7 +363,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         results.push(...message.getInner())
-      })
+      }),
     )
 
     graph.finalize()
@@ -373,7 +373,7 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `A`], 1],
         [[3, `C`], 1],
-      ])
+      ]),
     )
     inputB.sendData(new MultiSet([[[1, `X`], 1]]))
     graph.run()
@@ -475,7 +475,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         results.push(...message.getInner())
-      })
+      }),
     )
 
     graph.finalize()
@@ -485,13 +485,13 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `A`], 1],
         [[2, `B`], 1],
-      ])
+      ]),
     )
     inputB.sendData(
       new MultiSet([
         [[1, `X`], 1],
         [[2, `Y`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -586,7 +586,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         results.push(...message.getInner())
-      })
+      }),
     )
 
     graph.finalize()
@@ -596,13 +596,13 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `A`], 1],
         [[2, `B`], 1],
-      ])
+      ]),
     )
     inputB.sendData(
       new MultiSet([
         [[1, `X`], 1],
         [[2, `Y`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -698,7 +698,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         results.push(...message.getInner())
-      })
+      }),
     )
 
     graph.finalize()
@@ -738,7 +738,7 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `A`], -1],
         [[1, `A-updated`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -791,7 +791,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         results.push(...message.getInner())
-      })
+      }),
     )
 
     graph.finalize()
@@ -831,7 +831,7 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `X`], -1],
         [[1, `X-updated`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -887,7 +887,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         results.push(...message.getInner())
-      })
+      }),
     )
 
     graph.finalize()
@@ -897,13 +897,13 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `A`], 1],
         [[2, `B`], 1],
-      ])
+      ]),
     )
     inputB.sendData(
       new MultiSet([
         [[1, `X`], 1],
         [[2, `Y`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -988,7 +988,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         results.push(...message.getInner())
-      })
+      }),
     )
 
     graph.finalize()
@@ -998,13 +998,13 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `A`], 1],
         [[2, `B`], 1],
-      ])
+      ]),
     )
     inputB.sendData(
       new MultiSet([
         [[1, `X`], 1],
         [[2, `Y`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -1052,7 +1052,7 @@ function testJoin(joinType: JoinType) {
       new MultiSet([
         [[1, `A`], -1],
         [[1, `A-updated`], 1],
-      ])
+      ]),
     )
     graph.run()
 
@@ -1092,7 +1092,7 @@ function testJoin(joinType: JoinType) {
     }
 
     expect(sortResults(results)).toEqual(
-      sortResults(expectedResults2[joinType])
+      sortResults(expectedResults2[joinType]),
     )
 
     results.length = 0
@@ -1136,7 +1136,7 @@ function testJoin(joinType: JoinType) {
       consolidate(),
       output((message) => {
         results.push(...message.getInner())
-      })
+      }),
     )
 
     graph.finalize()
diff --git a/packages/db-ivm/tests/operators/join.test.ts b/packages/db-ivm/tests/operators/join.test.ts
index 94d7975cf..ed356af4e 100644
--- a/packages/db-ivm/tests/operators/join.test.ts
+++ b/packages/db-ivm/tests/operators/join.test.ts
@@ -1,13 +1,13 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { join } from "../../src/operators/join.js"
-import { output } from "../../src/operators/output.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { join } from '../../src/operators/join.js'
+import { output } from '../../src/operators/output.js'
 import {
   KeyedMessageTracker,
   assertKeyedResults,
   assertOnlyKeysAffected,
-} from "../test-utils.js"
+} from '../test-utils.js'
 
 describe(`Operators`, () => {
   describe(`Join operation`, () => {
@@ -26,7 +26,7 @@ function testJoin() {
       join(inputB),
       output((message) => {
         tracker.addMessage(message as MultiSet<[number, [string, string]]>)
-      })
+      }),
     )
 
     graph.finalize()
@@ -35,7 +35,7 @@ function testJoin() {
       new MultiSet([
         [[1, `a`], 1],
         [[2, `b`], 1],
-      ])
+      ]),
     )
 
     inputB.sendData(
@@ -43,7 +43,7 @@ function testJoin() {
         [[1, `x`], 1],
         [[2, `y`], 1],
         [[3, `z`], 1], // key 3 only exists in B, so no join output expected
-      ])
+      ]),
     )
 
     graph.run()
@@ -61,7 +61,7 @@ function testJoin() {
         [1, [`a`, `x`]],
         [2, [`b`, `y`]],
       ],
-      4 // Expected message count
+      4, // Expected message count
     )
   })
 
@@ -75,7 +75,7 @@ function testJoin() {
       join(inputB),
       output((message) => {
         tracker.addMessage(message as MultiSet<[number, [string, string]]>)
-      })
+      }),
     )
 
     graph.finalize()
@@ -84,7 +84,7 @@ function testJoin() {
       new MultiSet([
         [[1, `a`], 1],
         [[2, `b`], 1],
-      ])
+      ]),
     )
 
     graph.run()
@@ -93,7 +93,7 @@ function testJoin() {
       new MultiSet([
         [[1, `x`], 1],
         [[2, `y`], 1],
-      ])
+      ]),
     )
 
     graph.run()
@@ -104,7 +104,7 @@ function testJoin() {
     assertOnlyKeysAffected(
       `join with late arriving data`,
       result.messages,
-      [1, 2]
+      [1, 2],
     )
 
     // Assert the final materialized results are correct
@@ -115,7 +115,7 @@ function testJoin() {
         [1, [`a`, `x`]],
         [2, [`b`, `y`]],
       ],
-      4 // Expected message count
+      4, // Expected message count
     )
   })
 
@@ -129,7 +129,7 @@ function testJoin() {
       join(inputB),
       output((message) => {
         tracker.addMessage(message as MultiSet<[number, [string, string]]>)
-      })
+      }),
     )
 
     graph.finalize()
@@ -138,13 +138,13 @@ function testJoin() {
       new MultiSet([
         [[1, `a`], 1],
         [[2, `b`], -1], // Negative multiplicity
-      ])
+      ]),
     )
     inputB.sendData(
       new MultiSet([
         [[1, `x`], 1],
         [[2, `y`], 1],
-      ])
+      ]),
     )
 
     graph.run()
@@ -155,12 +155,12 @@ function testJoin() {
     assertOnlyKeysAffected(
       `join with negative multiplicities`,
       result.messages,
-      [1, 2]
+      [1, 2],
     )
 
     // Verify that key 2 produces a message but with negative multiplicity
     const key2Messages = result.messages.filter(
-      ([[key, _value], _mult]) => key === 2
+      ([[key, _value], _mult]) => key === 2,
     )
     expect(key2Messages.length).toBeGreaterThan(0) // Key 2 should produce messages
     expect(key2Messages[0][1]).toBeLessThan(0) // But with negative multiplicity
@@ -172,7 +172,7 @@ function testJoin() {
       [
         [1, [`a`, `x`]], // Only key 1 should remain in final results
       ],
-      4 // Expected message count
+      4, // Expected message count
     )
   })
 
@@ -186,7 +186,7 @@ function testJoin() {
       join(inputB),
       output((message) => {
         tracker.addMessage(message as MultiSet<[string, [string, string]]>)
-      })
+      }),
     )
 
     graph.finalize()
@@ -196,14 +196,14 @@ function testJoin() {
       new MultiSet([
         [[`key1`, `batch1_a`], 1],
         [[`key2`, `batch1_b`], 1],
-      ])
+      ]),
     )
 
     inputA.sendData(
       new MultiSet([
         [[`key3`, `batch2_a`], 1],
         [[`key4`, `batch2_b`], 1],
-      ])
+      ]),
     )
 
     inputA.sendData(new MultiSet([[[`key5`, `batch3_a`], 1]]))
@@ -216,7 +216,7 @@ function testJoin() {
         [[`key3`, `x3`], 1],
         [[`key4`, `x4`], 1],
         [[`key5`, `x5`], 1],
-      ])
+      ]),
     )
 
     // Run the graph - should process all batches
@@ -229,7 +229,7 @@ function testJoin() {
     assertOnlyKeysAffected(
       `join multiple batches`,
       result.messages,
-      expectedKeys
+      expectedKeys,
     )
 
     // Assert the final materialized results are correct
@@ -243,7 +243,7 @@ function testJoin() {
         [`key4`, [`batch2_b`, `x4`]],
         [`key5`, [`batch3_a`, `x5`]],
       ],
-      10 // Expected message count
+      10, // Expected message count
     )
   })
 
@@ -258,7 +258,7 @@ function testJoin() {
       join(inputB1),
       output((message) => {
         stepTracker.addMessage(message as MultiSet<[string, [string, string]]>)
-      })
+      }),
     )
 
     graph1.finalize()
@@ -269,7 +269,7 @@ function testJoin() {
         [[`item1`, `x1`], 1],
         [[`item2`, `x2`], 1],
         [[`item3`, `x3`], 1],
-      ])
+      ]),
     )
 
     // Send and process inputA one batch at a time
@@ -292,7 +292,7 @@ function testJoin() {
       join(inputB2),
       output((message) => {
         batchTracker.addMessage(message as MultiSet<[string, [string, string]]>)
-      })
+      }),
     )
 
     graph2.finalize()
@@ -303,7 +303,7 @@ function testJoin() {
         [[`item1`, `x1`], 1],
         [[`item2`, `x2`], 1],
         [[`item3`, `x3`], 1],
-      ])
+      ]),
     )
 
     // Send all inputA batches then run once
@@ -320,12 +320,12 @@ function testJoin() {
     assertOnlyKeysAffected(
       `join step-by-step`,
       stepResult.messages,
-      expectedKeys
+      expectedKeys,
     )
     assertOnlyKeysAffected(
       `join batch processing`,
       batchResult.messages,
-      expectedKeys
+      expectedKeys,
     )
 
     // Both approaches should produce the same final materialized results
diff --git a/packages/db-ivm/tests/operators/keying-types.test.ts b/packages/db-ivm/tests/operators/keying-types.test.ts
index 3baef7e51..d7c0256c9 100644
--- a/packages/db-ivm/tests/operators/keying-types.test.ts
+++ b/packages/db-ivm/tests/operators/keying-types.test.ts
@@ -1,8 +1,8 @@
-import { describe, expectTypeOf, it } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { keyBy, rekey, unkey } from "../../src/operators/keying.js"
-import type { Keyed } from "../../src/operators/keying.js"
-import type { IStreamBuilder } from "../../src/types.js"
+import { describe, expectTypeOf, it } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { keyBy, rekey, unkey } from '../../src/operators/keying.js'
+import type { Keyed } from '../../src/operators/keying.js'
+import type { IStreamBuilder } from '../../src/types.js'
 
 interface TestItem {
   id: number
diff --git a/packages/db-ivm/tests/operators/keying.test.ts b/packages/db-ivm/tests/operators/keying.test.ts
index ec435af2f..22614e944 100644
--- a/packages/db-ivm/tests/operators/keying.test.ts
+++ b/packages/db-ivm/tests/operators/keying.test.ts
@@ -1,8 +1,8 @@
-import { describe, expect, it } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { keyBy, rekey, unkey } from "../../src/operators/keying.js"
-import { output } from "../../src/operators/index.js"
-import { MultiSet } from "../../src/multiset.js"
+import { describe, expect, it } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { keyBy, rekey, unkey } from '../../src/operators/keying.js'
+import { output } from '../../src/operators/index.js'
+import { MultiSet } from '../../src/multiset.js'
 
 interface TestItem {
   id: number
diff --git a/packages/db-ivm/tests/operators/map.test.ts b/packages/db-ivm/tests/operators/map.test.ts
index f331acfd6..39d1f1675 100644
--- a/packages/db-ivm/tests/operators/map.test.ts
+++ b/packages/db-ivm/tests/operators/map.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { map, output } from "../../src/operators/index.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { map, output } from '../../src/operators/index.js'
 
 describe(`Operators`, () => {
   describe(`Map operation`, () => {
@@ -14,7 +14,7 @@ describe(`Operators`, () => {
         map((x) => x + 5),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -24,7 +24,7 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -48,7 +48,7 @@ describe(`Operators`, () => {
         map((x) => x + 1),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -58,7 +58,7 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -81,7 +81,7 @@ describe(`Operators`, () => {
         map((x) => x + 1),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -91,7 +91,7 @@ describe(`Operators`, () => {
           [1, -1],
           [2, -2],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
diff --git a/packages/db-ivm/tests/operators/negate.test.ts b/packages/db-ivm/tests/operators/negate.test.ts
index fa3ef928c..53a793703 100644
--- a/packages/db-ivm/tests/operators/negate.test.ts
+++ b/packages/db-ivm/tests/operators/negate.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { map, negate, output } from "../../src/operators/index.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { map, negate, output } from '../../src/operators/index.js'
 
 describe(`Operators`, () => {
   describe(`Negate operation`, () => {
@@ -14,7 +14,7 @@ describe(`Operators`, () => {
         negate(),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -24,7 +24,7 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -47,7 +47,7 @@ describe(`Operators`, () => {
         negate(),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -57,7 +57,7 @@ describe(`Operators`, () => {
           [1, -1],
           [2, -2],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -80,7 +80,7 @@ describe(`Operators`, () => {
         negate(),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -90,7 +90,7 @@ describe(`Operators`, () => {
           [1, -2],
           [2, 1],
           [3, -3],
-        ])
+        ]),
       )
 
       graph.run()
@@ -115,7 +115,7 @@ describe(`Operators`, () => {
         map((x) => x + 1),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -124,7 +124,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [1, 1],
           [2, 1],
-        ])
+        ]),
       )
 
       graph.run()
diff --git a/packages/db-ivm/tests/operators/orderBy.test.ts b/packages/db-ivm/tests/operators/orderBy.test.ts
index 53ebcca0c..18ec280fd 100644
--- a/packages/db-ivm/tests/operators/orderBy.test.ts
+++ b/packages/db-ivm/tests/operators/orderBy.test.ts
@@ -1,8 +1,8 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { orderBy, output } from "../../src/operators/index.js"
-import type { KeyValue } from "../../src/types.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { orderBy, output } from '../../src/operators/index.js'
+import type { KeyValue } from '../../src/types.js'
 
 describe(`Operators`, () => {
   describe(`OrderBy operation`, () => {
@@ -23,7 +23,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -35,7 +35,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -72,7 +72,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -84,7 +84,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -119,7 +119,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value, { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -131,7 +131,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -164,7 +164,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value, { limit: 2, offset: 2 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -176,7 +176,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -208,7 +208,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.id),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -220,7 +220,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 1, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 2, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -255,7 +255,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -266,7 +266,7 @@ describe(`Operators`, () => {
           [[`key1`, { id: 1, value: `c` }], 1],
           [[`key2`, { id: 2, value: `d` }], 1],
           [[`key3`, { id: 3, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -283,7 +283,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`key4`, { id: 4, value: `a` }], 1],
           [[`key5`, { id: 5, value: `b` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -312,7 +312,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -324,7 +324,7 @@ describe(`Operators`, () => {
           [[`key2`, { id: 2, value: `b` }], 1],
           [[`key3`, { id: 3, value: `c` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -365,7 +365,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value, { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -376,7 +376,7 @@ describe(`Operators`, () => {
           [[`key1`, { id: 1, value: `c` }], 1],
           [[`key2`, { id: 2, value: `d` }], 1],
           [[`key3`, { id: 3, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -417,7 +417,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value, { limit: 2, offset: 1 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -429,7 +429,7 @@ describe(`Operators`, () => {
           [[`key2`, { id: 2, value: `b` }], 1],
           [[`key3`, { id: 3, value: `c` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -469,7 +469,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -480,7 +480,7 @@ describe(`Operators`, () => {
           [[`key1`, { id: 1, value: `a` }], 1],
           [[`key2`, { id: 2, value: `c` }], 1],
           [[`key3`, { id: 3, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -497,7 +497,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`key2`, { id: 2, value: `c` }], -1], // Remove old version
           [[`key2`, { id: 2, value: `z` }], 1], // Add new version with different value
-        ])
+        ]),
       )
       graph.run()
 
@@ -518,10 +518,10 @@ function sortResults(results: Array<any>) {
   return [...results]
     .sort(
       ([[_aKey, _aValue], aMultiplicity], [[_bKey, _bValue], bMultiplicity]) =>
-        aMultiplicity - bMultiplicity
+        aMultiplicity - bMultiplicity,
     )
     .sort(
       ([[aKey, _aValue], _aMultiplicity], [[bKey, _bValue], _bMultiplicity]) =>
-        aKey.localeCompare(bKey)
+        aKey.localeCompare(bKey),
     )
 }
diff --git a/packages/db-ivm/tests/operators/orderByWithFractionalIndex.test.ts b/packages/db-ivm/tests/operators/orderByWithFractionalIndex.test.ts
index 5cf574757..4dc16430f 100644
--- a/packages/db-ivm/tests/operators/orderByWithFractionalIndex.test.ts
+++ b/packages/db-ivm/tests/operators/orderByWithFractionalIndex.test.ts
@@ -1,14 +1,14 @@
-import { beforeAll, describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
+import { beforeAll, describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
 import {
   orderByWithFractionalIndex,
   output,
-} from "../../src/operators/index.js"
-import { orderByWithFractionalIndexBTree } from "../../src/operators/orderByBTree.js"
-import { loadBTree } from "../../src/operators/topKWithFractionalIndexBTree.js"
-import { MessageTracker, compareFractionalIndex } from "../test-utils.js"
-import type { KeyValue } from "../../src/types.js"
+} from '../../src/operators/index.js'
+import { orderByWithFractionalIndexBTree } from '../../src/operators/orderByBTree.js'
+import { loadBTree } from '../../src/operators/topKWithFractionalIndexBTree.js'
+import { MessageTracker, compareFractionalIndex } from '../test-utils.js'
+import type { KeyValue } from '../../src/types.js'
 
 const stripFractionalIndex = ([[key, [value, _index]], multiplicity]: any) => [
   key,
@@ -17,7 +17,7 @@ const stripFractionalIndex = ([[key, [value, _index]], multiplicity]: any) => [
 ]
 
 const stripFractionalIndexWithoutMultiplicity = (
-  r: [string, [{ id: number; value: string }, string]]
+  r: [string, [{ id: number; value: string }, string]],
 ) => [r[0], r[1][0]]
 
 beforeAll(async () => {
@@ -46,7 +46,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -58,7 +58,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -96,7 +96,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -108,7 +108,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -144,7 +144,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value, { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -156,7 +156,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -193,7 +193,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -205,7 +205,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -238,7 +238,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.id),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -250,7 +250,7 @@ describe(`Operators`, () => {
           [[`key1`, { id: 1, value: `a` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
           [[`key2`, { id: 2, value: `b` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -286,7 +286,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value, { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -297,7 +297,7 @@ describe(`Operators`, () => {
           [[`key1`, { id: 1, value: `a` }], 1],
           [[`key3`, { id: 3, value: `c` }], 1],
           [[`key2`, { id: 2, value: `b` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -317,7 +317,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [[`key4`, { id: 4, value: `aa` }], 1], // Should be second in order
-        ])
+        ]),
       )
       graph.run()
 
@@ -352,7 +352,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value, { limit: 3 }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -364,7 +364,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `c` }], 1],
           [[`key2`, { id: 2, value: `b` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -374,7 +374,9 @@ describe(`Operators`, () => {
       expect(initialResult.messageCount).toBeLessThanOrEqual(4) // Should be efficient
 
       expect(
-        initialResult.sortedResults.map(stripFractionalIndexWithoutMultiplicity)
+        initialResult.sortedResults.map(
+          stripFractionalIndexWithoutMultiplicity,
+        ),
       ).toEqual([
         [`key1`, { id: 1, value: `a` }],
         [`key2`, { id: 2, value: `b` }],
@@ -387,7 +389,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [[`key1`, { id: 1, value: `a` }], -1], // Remove the first item
-        ])
+        ]),
       )
       graph.run()
 
@@ -424,7 +426,7 @@ describe(`Operators`, () => {
         orderBy((item) => item.value, { limit: 3 }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -436,14 +438,16 @@ describe(`Operators`, () => {
           [[`key2`, { id: 2, value: `c` }], 1],
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
       // Should have the top 3 items by value
       const initialResult = tracker.getResult(compareFractionalIndex)
       expect(
-        initialResult.sortedResults.map(stripFractionalIndexWithoutMultiplicity)
+        initialResult.sortedResults.map(
+          stripFractionalIndexWithoutMultiplicity,
+        ),
       ).toEqual([
         [`key1`, { id: 1, value: `a` }],
         [`key3`, { id: 3, value: `b` }],
@@ -458,7 +462,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`key2`, { id: 2, value: `c` }], -1], // Remove old version
           [[`key2`, { id: 2, value: `z` }], 1], // Add new version with different value
-        ])
+        ]),
       )
       graph.run()
 
@@ -510,7 +514,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -524,7 +528,7 @@ describe(`Operators`, () => {
           [[`key4`, { id: 4, value: `d` }], 1],
           [[`key5`, { id: 5, value: `e` }], 1],
           [[`key6`, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -535,7 +539,7 @@ describe(`Operators`, () => {
 
       // Verify initial order
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`, `c`])
 
@@ -550,7 +554,7 @@ describe(`Operators`, () => {
 
       // Should now show d, e, f
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`d`, `e`, `f`])
     })
@@ -584,7 +588,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -598,7 +602,7 @@ describe(`Operators`, () => {
           [[`key4`, { id: 4, value: `d` }], 1],
           [[`key5`, { id: 5, value: `e` }], 1],
           [[`key6`, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -609,7 +613,7 @@ describe(`Operators`, () => {
 
       // Verify initial order
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`d`, `e`, `f`])
 
@@ -624,7 +628,7 @@ describe(`Operators`, () => {
 
       // Should now show a, b, c
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`a`, `b`, `c`])
     })
@@ -658,7 +662,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -671,7 +675,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `c` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
           [[`key5`, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -680,7 +684,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`])
 
@@ -691,7 +695,7 @@ describe(`Operators`, () => {
       const moveResult = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`b`, `c`])
 
@@ -702,7 +706,7 @@ describe(`Operators`, () => {
       const moveResult2 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues2 = moveResult2.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues2).toEqual([`c`, `d`])
 
@@ -713,7 +717,7 @@ describe(`Operators`, () => {
       const moveResult3 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues3 = moveResult3.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues3).toEqual([`a`, `b`])
     })
@@ -747,7 +751,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -761,7 +765,7 @@ describe(`Operators`, () => {
           [[`key4`, { id: 4, value: `d` }], 1],
           [[`key5`, { id: 5, value: `e` }], 1],
           [[`key6`, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -770,7 +774,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`b`, `c`])
 
@@ -781,7 +785,7 @@ describe(`Operators`, () => {
       const moveResult = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`b`, `c`, `d`])
 
@@ -792,7 +796,7 @@ describe(`Operators`, () => {
       const moveResult2 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues2 = moveResult2.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues2).toEqual([`b`])
     })
@@ -826,7 +830,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -837,7 +841,7 @@ describe(`Operators`, () => {
           [[`key1`, { id: 1, value: `a` }], 1],
           [[`key2`, { id: 2, value: `b` }], 1],
           [[`key3`, { id: 3, value: `c` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -846,7 +850,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`])
 
@@ -857,7 +861,7 @@ describe(`Operators`, () => {
       const moveResult = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`c`]) // Only 1 element available at offset 2
 
@@ -868,7 +872,7 @@ describe(`Operators`, () => {
       const moveResult2 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues2 = moveResult2.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues2).toEqual([]) // No elements available at offset 5
 
@@ -879,7 +883,7 @@ describe(`Operators`, () => {
       const moveResult3 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues3 = moveResult3.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues3).toEqual([])
 
@@ -890,7 +894,7 @@ describe(`Operators`, () => {
       const moveResult4 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues4 = moveResult4.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues4).toEqual([`a`, `b`])
     })
@@ -905,23 +909,23 @@ function sortByKeyAndIndex(results: Array<any>) {
     .sort(
       (
         [[_aKey, [_aValue, _aIndex]], aMultiplicity],
-        [[_bKey, [_bValue, _bIndex]], bMultiplicity]
-      ) => aMultiplicity - bMultiplicity
+        [[_bKey, [_bValue, _bIndex]], bMultiplicity],
+      ) => aMultiplicity - bMultiplicity,
     )
     .sort(
       (
         [[aKey, [_aValue, _aIndex]], _aMultiplicity],
-        [[bKey, [_bValue, _bIndex]], _bMultiplicity]
-      ) => aKey - bKey
+        [[bKey, [_bValue, _bIndex]], _bMultiplicity],
+      ) => aKey - bKey,
     )
     .sort(
       (
         [[_aKey, [_aValue, aIndex]], _aMultiplicity],
-        [[_bKey, [_bValue, bIndex]], _bMultiplicity]
+        [[_bKey, [_bValue, bIndex]], _bMultiplicity],
       ) => {
         // lexically compare the index
         // return aIndex.localeCompare(bIndex)
         return aIndex < bIndex ? -1 : aIndex > bIndex ? 1 : 0
-      }
+      },
     )
 }
diff --git a/packages/db-ivm/tests/operators/orderByWithIndex.test.ts b/packages/db-ivm/tests/operators/orderByWithIndex.test.ts
index cf7466081..09e40e673 100644
--- a/packages/db-ivm/tests/operators/orderByWithIndex.test.ts
+++ b/packages/db-ivm/tests/operators/orderByWithIndex.test.ts
@@ -1,8 +1,8 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { orderByWithIndex, output } from "../../src/operators/index.js"
-import type { KeyValue } from "../../src/types.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { orderByWithIndex, output } from '../../src/operators/index.js'
+import type { KeyValue } from '../../src/types.js'
 
 describe(`Operators`, () => {
   describe(`OrderByWithIndex operation`, () => {
@@ -23,7 +23,7 @@ describe(`Operators`, () => {
         orderByWithIndex((item) => item.value),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -35,7 +35,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -73,7 +73,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -85,7 +85,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -121,7 +121,7 @@ describe(`Operators`, () => {
         orderByWithIndex((item) => item.value, { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -133,7 +133,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -167,7 +167,7 @@ describe(`Operators`, () => {
         orderByWithIndex((item) => item.value, { limit: 2, offset: 2 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -179,7 +179,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `y` }], 1],
           [[`key5`, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -212,7 +212,7 @@ describe(`Operators`, () => {
         orderByWithIndex((item) => item.id),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -224,7 +224,7 @@ describe(`Operators`, () => {
           [[`key1`, { id: 1, value: `a` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
           [[`key2`, { id: 2, value: `b` }], 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -260,7 +260,7 @@ describe(`Operators`, () => {
         orderByWithIndex((item) => item.value, { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -271,7 +271,7 @@ describe(`Operators`, () => {
           [[`key1`, { id: 1, value: `a` }], 1],
           [[`key3`, { id: 3, value: `c` }], 1],
           [[`key2`, { id: 2, value: `b` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -290,7 +290,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [[`key4`, { id: 4, value: `aa` }], 1], // Should be second in order
-        ])
+        ]),
       )
       graph.run()
 
@@ -325,7 +325,7 @@ describe(`Operators`, () => {
         orderByWithIndex((item) => item.value, { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -337,7 +337,7 @@ describe(`Operators`, () => {
           [[`key3`, { id: 3, value: `c` }], 1],
           [[`key2`, { id: 2, value: `b` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -345,7 +345,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [[`key1`, { id: 1, value: `a` }], -1], // Remove the first item
-        ])
+        ]),
       )
       graph.run()
 
@@ -383,7 +383,7 @@ describe(`Operators`, () => {
         orderByWithIndex((item) => item.value, { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -395,7 +395,7 @@ describe(`Operators`, () => {
           [[`key2`, { id: 2, value: `c` }], 1],
           [[`key3`, { id: 3, value: `b` }], 1],
           [[`key4`, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -415,7 +415,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`key2`, { id: 2, value: `c` }], -1], // Remove old version
           [[`key2`, { id: 2, value: `z` }], 1], // Add new version with different value
-        ])
+        ]),
       )
       graph.run()
 
@@ -440,19 +440,19 @@ function sortByKeyAndIndex(results: Array<any>) {
     .sort(
       (
         [[_aKey, [_aValue, _aIndex]], aMultiplicity],
-        [[_bKey, [_bValue, _bIndex]], bMultiplicity]
-      ) => aMultiplicity - bMultiplicity
+        [[_bKey, [_bValue, _bIndex]], bMultiplicity],
+      ) => aMultiplicity - bMultiplicity,
     )
     .sort(
       (
         [[aKey, [_aValue, _aIndex]], _aMultiplicity],
-        [[bKey, [_bValue, _bIndex]], _bMultiplicity]
-      ) => aKey - bKey
+        [[bKey, [_bValue, _bIndex]], _bMultiplicity],
+      ) => aKey - bKey,
     )
     .sort(
       (
         [[_aKey, [_aValue, _aIndex]], _aMultiplicity],
-        [[_bKey, [_bValue, _bIndex]], _bMultiplicity]
-      ) => _aIndex - _bIndex
+        [[_bKey, [_bValue, _bIndex]], _bMultiplicity],
+      ) => _aIndex - _bIndex,
     )
 }
diff --git a/packages/db-ivm/tests/operators/output.test.ts b/packages/db-ivm/tests/operators/output.test.ts
index 14bfd92ab..487e04ce7 100644
--- a/packages/db-ivm/tests/operators/output.test.ts
+++ b/packages/db-ivm/tests/operators/output.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { output } from "../../src/operators/index.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { output } from '../../src/operators/index.js'
 
 describe(`Operators`, () => {
   describe(`Output operation`, () => {
@@ -13,7 +13,7 @@ describe(`Operators`, () => {
       input.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -23,7 +23,7 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
@@ -45,7 +45,7 @@ describe(`Operators`, () => {
       input.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -55,7 +55,7 @@ describe(`Operators`, () => {
           [1, -1],
           [2, -2],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
diff --git a/packages/db-ivm/tests/operators/pipe.test.ts b/packages/db-ivm/tests/operators/pipe.test.ts
index 6589780c3..70f42bb47 100644
--- a/packages/db-ivm/tests/operators/pipe.test.ts
+++ b/packages/db-ivm/tests/operators/pipe.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { map, output, pipe } from "../../src/operators/index.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { map, output, pipe } from '../../src/operators/index.js'
 
 describe(`Operators`, () => {
   describe(`Pipe operation`, () => {
@@ -13,11 +13,11 @@ describe(`Operators`, () => {
       input.pipe(
         pipe(
           map((x) => x + 5),
-          map((x) => x * 2)
+          map((x) => x * 2),
         ),
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -27,7 +27,7 @@ describe(`Operators`, () => {
           [1, 1],
           [2, 1],
           [3, 1],
-        ])
+        ]),
       )
 
       graph.run()
diff --git a/packages/db-ivm/tests/operators/reduce.test.ts b/packages/db-ivm/tests/operators/reduce.test.ts
index f1e5de511..31998920e 100644
--- a/packages/db-ivm/tests/operators/reduce.test.ts
+++ b/packages/db-ivm/tests/operators/reduce.test.ts
@@ -1,13 +1,13 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { reduce } from "../../src/operators/reduce.js"
-import { output } from "../../src/operators/output.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { reduce } from '../../src/operators/reduce.js'
+import { output } from '../../src/operators/output.js'
 import {
   KeyedMessageTracker,
   assertKeyedResults,
   assertOnlyKeysAffected,
-} from "../test-utils.js"
+} from '../test-utils.js'
 
 describe(`Operators`, () => {
   describe(`Reduce operation`, () => {
@@ -26,7 +26,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -37,7 +37,7 @@ describe(`Operators`, () => {
           [[`a`, 2], 1],
           [[`a`, 3], 1],
           [[`b`, 4], 1],
-        ])
+        ]),
       )
       input.sendData(new MultiSet([[[`b`, 5], 1]]))
       graph.run()
@@ -58,7 +58,7 @@ describe(`Operators`, () => {
           [`a`, 7], // 1*2 + 2*1 + 3*1 = 7
           [`b`, 9], // 4*1 + 5*1 = 9
         ],
-        4 // Expected message count
+        4, // Expected message count
       )
     })
 
@@ -77,7 +77,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -87,7 +87,7 @@ describe(`Operators`, () => {
           [[`a`, 1], -1],
           [[`a`, 2], 2],
           [[`b`, 3], -2],
-        ])
+        ]),
       )
       graph.run()
 
@@ -97,7 +97,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `reduce with negative multiplicities`,
         result.messages,
-        [`a`, `b`]
+        [`a`, `b`],
       )
 
       // Assert the final materialized results are correct
@@ -108,7 +108,7 @@ describe(`Operators`, () => {
           [`a`, 3], // 1*(-1) + 2*2 = 3
           [`b`, -6], // 3*(-2) = -6
         ],
-        4 // Expected message count
+        4, // Expected message count
       )
     })
 
@@ -127,7 +127,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -137,7 +137,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`a`, 1], 1],
           [[`b`, 2], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -153,7 +153,7 @@ describe(`Operators`, () => {
           [`a`, 1],
           [`b`, 2],
         ],
-        4 // Expected message count
+        4, // Expected message count
       )
 
       tracker.reset()
@@ -163,7 +163,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`a`, 3], 1],
           [[`b`, 4], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -179,7 +179,7 @@ describe(`Operators`, () => {
           [`a`, 4], // 1+3
           [`b`, 6], // 2+4
         ],
-        6 // Expected message count (old removed, new added for both keys)
+        6, // Expected message count (old removed, new added for both keys)
       )
 
       tracker.reset()
@@ -197,7 +197,7 @@ describe(`Operators`, () => {
         [
           [`a`, 3], // 4-1=3
         ],
-        3 // Expected message count (old removed, new added for key a)
+        3, // Expected message count (old removed, new added for key a)
       )
     })
 
@@ -216,7 +216,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -227,7 +227,7 @@ describe(`Operators`, () => {
           [[`a`, 5], 1],
           [[`a`, 3], 1],
           [[`b`, 10], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -236,7 +236,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`a`, 5], -1],
           [[`a`, 3], -1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -246,7 +246,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `updates that cancel out completely`,
         result.messages,
-        [`a`, `b`]
+        [`a`, `b`],
       )
 
       // Assert the final materialized results are correct
@@ -257,7 +257,7 @@ describe(`Operators`, () => {
           [`a`, 0], // 5+3-5-3 = 0
           [`b`, 10], // 10 (unchanged)
         ],
-        6 // Expected message count
+        6, // Expected message count
       )
     })
 
@@ -276,7 +276,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -287,7 +287,7 @@ describe(`Operators`, () => {
           [[`a`, 10], 1],
           [[`a`, 5], 2],
           [[`b`, 20], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -299,7 +299,7 @@ describe(`Operators`, () => {
           [[`b`, 20], -1], // Remove the 20
           [[`b`, 15], 1], // Add a 15
           [[`c`, 100], 1], // Add new key
-        ])
+        ]),
       )
       graph.run()
 
@@ -309,7 +309,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `mixed positive and negative updates`,
         result.messages,
-        [`a`, `b`, `c`]
+        [`a`, `b`, `c`],
       )
 
       // Assert the final materialized results are correct
@@ -321,7 +321,7 @@ describe(`Operators`, () => {
           [`b`, 15], // 20-20+15 = 15
           [`c`, 100], // 100
         ],
-        8 // Expected message count
+        8, // Expected message count
       )
     })
 
@@ -346,7 +346,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -356,7 +356,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`a`, { value: 10, count: 2 }], 1], // 2 values of 10
           [[`a`, { value: 20, count: 1 }], 1], // 1 value of 20
-        ])
+        ]),
       )
       graph.run()
 
@@ -365,7 +365,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`a`, { value: 30, count: 1 }], 1], // 1 value of 30
           [[`b`, { value: 50, count: 3 }], 1], // 3 values of 50
-        ])
+        ]),
       )
       graph.run()
 
@@ -373,7 +373,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [[`a`, { value: 10, count: 2 }], -1], // Remove the 2 values of 10
-        ])
+        ]),
       )
       graph.run()
 
@@ -383,7 +383,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `complex aggregation with multiple updates`,
         result.messages,
-        [`a`, `b`]
+        [`a`, `b`],
       )
 
       // Assert the final materialized results are correct
@@ -394,7 +394,7 @@ describe(`Operators`, () => {
           [`a`, { avg: 25, total: 50 }], // Final: (20*1+30*1)/(1+1) = 50/2 = 25
           [`b`, { avg: 50, total: 150 }], // Final: 50*3 = 150
         ],
-        6 // Expected message count
+        6, // Expected message count
       )
     })
 
@@ -414,7 +414,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -425,7 +425,7 @@ describe(`Operators`, () => {
           [[`a`, 5], 1],
           [[`a`, -3], 1],
           [[`b`, 10], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -443,7 +443,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `updates with zero-multiplicity results`,
         result.messages,
-        [`a`, `b`]
+        [`a`, `b`],
       )
 
       // Assert the final materialized results are correct
@@ -454,7 +454,7 @@ describe(`Operators`, () => {
           [`a`, 7], // Final: 5-3-2+7 = 7
           [`b`, 10], // Final: 10 (unchanged)
         ],
-        5 // Expected message count
+        5, // Expected message count
       )
     })
 
@@ -473,7 +473,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -487,7 +487,7 @@ describe(`Operators`, () => {
           [[`y`, 15], 1],
           [[`y`, 25], 1],
           [[`z`, 100], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -499,7 +499,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`x`, 30], 1], // Add to 'x' (30 -> 60)
           [[`z`, 100], -1], // Remove from 'z' (100 -> 0)
-        ])
+        ]),
       )
       graph.run()
 
@@ -519,7 +519,7 @@ describe(`Operators`, () => {
           [`x`, 60], // Sum increased from 30 to 60
           [`z`, 0], // Sum decreased from 100 to 0
         ],
-        4 // Expected message count: remove old 'x', add new 'x', remove old 'z', add new 'z'
+        4, // Expected message count: remove old 'x', add new 'x', remove old 'z', add new 'z'
       )
     })
 
@@ -539,7 +539,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -552,7 +552,7 @@ describe(`Operators`, () => {
           [[`b`, { id: 3, value: 100 }], 1],
           [[`c`, { id: 4, value: 5 }], 1],
           [[`c`, { id: 5, value: 15 }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -565,7 +565,7 @@ describe(`Operators`, () => {
           [[`a`, { id: 1, value: 10 }], -1], // Remove 10
           [[`a`, { id: 6, value: 10 }], 1], // Add 10 (same value, different object)
           [[`b`, { id: 3, value: 100 }], -1], // Remove from 'b' (100 -> 0)
-        ])
+        ]),
       )
       graph.run()
 
@@ -574,7 +574,7 @@ describe(`Operators`, () => {
       // With object identity: 'a' produces messages even though content is identical
       // This demonstrates the object identity issue, but keysTodo should still limit processing
       const aMessages = result.messages.filter(
-        ([[key, _value], _mult]) => key === `a`
+        ([[key, _value], _mult]) => key === `a`,
       )
       expect(aMessages.length).toBe(2) // Object identity causes 2 messages (remove + add)
 
@@ -585,7 +585,7 @@ describe(`Operators`, () => {
         [
           [`b`, { result: 0 }], // Changed from 100 to 0
         ],
-        4 // With object identity: 4 messages total (2 for 'a', 2 for 'b')
+        4, // With object identity: 4 messages total (2 for 'a', 2 for 'b')
       )
     })
   })
diff --git a/packages/db-ivm/tests/operators/topK.test.ts b/packages/db-ivm/tests/operators/topK.test.ts
index b35adf4b3..486e5469b 100644
--- a/packages/db-ivm/tests/operators/topK.test.ts
+++ b/packages/db-ivm/tests/operators/topK.test.ts
@@ -1,8 +1,8 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { topK } from "../../src/operators/topK.js"
-import { output } from "../../src/operators/output.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { topK } from '../../src/operators/topK.js'
+import { output } from '../../src/operators/output.js'
 
 describe(`Operators`, () => {
   describe(`TopK operation`, () => {
@@ -23,7 +23,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -35,7 +35,7 @@ describe(`Operators`, () => {
           [[null, { id: 3, value: `b` }], 1],
           [[null, { id: 4, value: `y` }], 1],
           [[null, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -69,7 +69,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -81,7 +81,7 @@ describe(`Operators`, () => {
           [[null, { id: 3, value: `b` }], 1],
           [[null, { id: 4, value: `y` }], 1],
           [[null, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -113,7 +113,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -130,7 +130,7 @@ describe(`Operators`, () => {
           [[`two`, { id: 8, value: `2` }], 1],
           [[`two`, { id: 9, value: `1` }], 1],
           [[`two`, { id: 10, value: `0` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -168,7 +168,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -185,7 +185,7 @@ describe(`Operators`, () => {
           [[`two`, { id: 8, value: `2` }], 1],
           [[`two`, { id: 9, value: `1` }], 1],
           [[`two`, { id: 10, value: `0` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -221,7 +221,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -232,7 +232,7 @@ describe(`Operators`, () => {
           [[null, { id: 1, value: `d` }], 1],
           [[null, { id: 2, value: `e` }], 1],
           [[null, { id: 3, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -273,7 +273,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -285,7 +285,7 @@ describe(`Operators`, () => {
           [[null, { id: 2, value: `b` }], 1],
           [[null, { id: 3, value: `c` }], 1],
           [[null, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -326,7 +326,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -337,7 +337,7 @@ describe(`Operators`, () => {
           [[null, { id: 1, value: `c` }], 1],
           [[null, { id: 2, value: `d` }], 1],
           [[null, { id: 3, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -354,7 +354,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[null, { id: 4, value: `a` }], 1],
           [[null, { id: 5, value: `b` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -388,7 +388,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -400,7 +400,7 @@ describe(`Operators`, () => {
           [[null, { id: 2, value: `b` }], 1],
           [[null, { id: 3, value: `c` }], 1],
           [[null, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -415,7 +415,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [[null, { id: 5, value: `0` }], 1], // Should be first alphabetically
-        ])
+        ]),
       )
       graph.run()
 
@@ -444,7 +444,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value), { limit: 2 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -458,7 +458,7 @@ describe(`Operators`, () => {
           [[`group2`, { id: 4, value: `a` }], 1],
           [[`group2`, { id: 5, value: `b` }], 1],
           [[`group2`, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -477,7 +477,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[`group1`, { id: 7, value: `a` }], 1], // Should be first in group1
           [[`group2`, { id: 4, value: `a` }], -1], // Remove from group2
-        ])
+        ]),
       )
       graph.run()
 
@@ -511,7 +511,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -524,7 +524,7 @@ describe(`Operators`, () => {
           [[null, { id: 3, value: `c` }], 1],
           [[null, { id: 4, value: `d` }], 1],
           [[null, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -545,7 +545,7 @@ describe(`Operators`, () => {
           [[null, { id: 3, value: `c` }], -1],
           [[null, { id: 6, value: `_` }], 1],
           [[null, { id: 7, value: `aa` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -566,7 +566,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[null, { id: 1, value: `a` }], -1],
           [[null, { id: 8, value: `z` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -590,10 +590,10 @@ function sortResults(results: Array<any>) {
   return [...results]
     .sort(
       ([_a, aMultiplicity], [_b, bMultiplicity]) =>
-        aMultiplicity - bMultiplicity
+        aMultiplicity - bMultiplicity,
     )
     .sort(
       ([[_aKey, aValue], _aMultiplicity], [[_bKey, bValue], _bMultiplicity]) =>
-        aValue.id - bValue.id
+        aValue.id - bValue.id,
     )
 }
diff --git a/packages/db-ivm/tests/operators/topKWithFractionalIndex.test.ts b/packages/db-ivm/tests/operators/topKWithFractionalIndex.test.ts
index 82a722dec..77afb3ca2 100644
--- a/packages/db-ivm/tests/operators/topKWithFractionalIndex.test.ts
+++ b/packages/db-ivm/tests/operators/topKWithFractionalIndex.test.ts
@@ -1,17 +1,17 @@
-import { beforeAll, describe, expect, it } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { topKWithFractionalIndex } from "../../src/operators/topKWithFractionalIndex.js"
+import { beforeAll, describe, expect, it } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { topKWithFractionalIndex } from '../../src/operators/topKWithFractionalIndex.js'
 import {
   loadBTree,
   topKWithFractionalIndexBTree,
-} from "../../src/operators/topKWithFractionalIndexBTree.js"
-import { output } from "../../src/operators/index.js"
+} from '../../src/operators/topKWithFractionalIndexBTree.js'
+import { output } from '../../src/operators/index.js'
 import {
   MessageTracker,
   assertOnlyKeysAffected,
   compareFractionalIndex,
-} from "../test-utils.js"
+} from '../test-utils.js'
 
 // Helper function to check if indices are in lexicographic order
 function checkLexicographicOrder(results: Array<any>) {
@@ -23,7 +23,7 @@ function checkLexicographicOrder(results: Array<any>) {
 
   // Sort by value using the same comparator as in the test
   const sortedByValue = [...valuesWithIndices].sort((a, b) =>
-    a.value.value < b.value.value ? -1 : 1
+    a.value.value < b.value.value ? -1 : 1,
   )
 
   // Check that indices are in the same order as the sorted values
@@ -87,7 +87,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value)),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -100,7 +100,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `c` }], 1],
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -113,8 +113,8 @@ describe(`Operators`, () => {
       const initialMessages = initialResult.messages
       expect(
         checkLexicographicOrder(
-          initialMessages.map(([item, mult]) => [item, mult])
-        )
+          initialMessages.map(([item, mult]) => [item, mult]),
+        ),
       ).toBe(true)
 
       tracker.reset()
@@ -124,7 +124,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[3, { id: 3, value: `c` }], -1], // Remove the old value
           [[3, { id: 3, value: `a-` }], 1], // This should now be first
-        ])
+        ]),
       )
       graph.run()
 
@@ -138,7 +138,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `topKFractional update`,
         updateResult.messages,
-        [3]
+        [3],
       )
 
       // Check that the update messages maintain lexicographic order on their own
@@ -162,7 +162,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value)),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -175,7 +175,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `c` }], 1],
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -184,8 +184,8 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(5) // Should have all 5 elements
       expect(
         checkLexicographicOrder(
-          initialResult.messages.map(([item, mult]) => [item, mult])
-        )
+          initialResult.messages.map(([item, mult]) => [item, mult]),
+        ),
       ).toBe(true)
 
       tracker.reset()
@@ -204,7 +204,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `topKFractional duplicate keys`,
         updateResult.messages,
-        [6]
+        [6],
       )
 
       // Check that the update messages maintain lexicographic order on their own
@@ -229,7 +229,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value)),
         output((message) => {
           allMessages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -242,7 +242,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `c` }], 1],
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -273,7 +273,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -286,7 +286,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `c` }], 1],
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -303,7 +303,7 @@ describe(`Operators`, () => {
       })
 
       const sortedValues = sortedByIndex.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(sortedValues).toEqual([`b`, `c`, `d`]) // Should be in correct order with offset 1, limit 3
 
@@ -315,7 +315,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [[6, { id: 6, value: `c+` }], 1], // This should be between c and d
-        ])
+        ]),
       )
       graph.run()
 
@@ -344,7 +344,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value)),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -357,7 +357,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `c` }], 1],
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -373,7 +373,7 @@ describe(`Operators`, () => {
       })
 
       const initialSortedValues = initialSortedByIndex.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`, `c`, `d`, `e`]) // Should be in lexicographic order
 
@@ -386,7 +386,7 @@ describe(`Operators`, () => {
           [[2, { id: 2, value: `d+` }], 1], // 'b' becomes 'd+'
           [[4, { id: 4, value: `d` }], -1], // Remove old 'd'
           [[4, { id: 4, value: `b+` }], 1], // 'd' becomes 'b+'
-        ])
+        ]),
       )
       graph.run()
 
@@ -399,7 +399,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `topK move positions`,
         updateResult.messages,
-        [2, 4]
+        [2, 4],
       )
 
       // For position swaps, we mainly care that the operation is incremental
@@ -418,7 +418,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value)),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -431,7 +431,7 @@ describe(`Operators`, () => {
           [[5, { id: 5, value: `e` }], 1],
           [[7, { id: 7, value: `g` }], 1],
           [[9, { id: 9, value: `i` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -448,7 +448,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[6, { id: 6, value: `f` }], 1],
           [[8, { id: 8, value: `h` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -466,7 +466,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `j` }], 1], // Move 'c' to after 'i'
           [[7, { id: 7, value: `g` }], -1], // Remove old 'g'
           [[7, { id: 7, value: `a-` }], 1], // Move 'g' to before 'a'
-        ])
+        ]),
       )
       graph.run()
 
@@ -479,7 +479,7 @@ describe(`Operators`, () => {
       assertOnlyKeysAffected(
         `topK lexicographic update2`,
         update2Result.messages,
-        [3, 7]
+        [3, 7],
       )
     })
 
@@ -494,7 +494,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value)),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -507,7 +507,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `c` }], 1],
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -523,7 +523,7 @@ describe(`Operators`, () => {
       })
 
       const initialSortedValues = initialSortedByIndex.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`, `c`, `d`, `e`]) // Should be in lexicographic order
 
@@ -534,7 +534,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[1, { id: 1, value: `a` }], -1], // Remove old 'a'
           [[1, { id: 1, value: `bb` }], 1], // Move 'a' to after 'b'
-        ])
+        ]),
       )
       graph.run()
 
@@ -550,7 +550,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[1, { id: 1, value: `bb` }], -1], // Remove old 'bb'
           [[1, { id: 1, value: `dd` }], 1], // Move to after 'd'
-        ])
+        ]),
       )
       graph.run()
 
@@ -576,7 +576,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value)),
         output((message) => {
           allMessages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -588,7 +588,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `c` }], 1],
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -609,7 +609,7 @@ describe(`Operators`, () => {
       input.sendData(
         new MultiSet([
           [[1, { id: 1, value: `a` }], 1], // This should be inserted at the start
-        ])
+        ]),
       )
       graph.run()
 
@@ -632,7 +632,7 @@ describe(`Operators`, () => {
 
       // Convert to array for lexicographic order check
       const currentStateArray = Array.from(currentState.values()).map(
-        ([value, index]) => [[null, [value, index]], 1]
+        ([value, index]) => [[null, [value, index]], 1],
       )
 
       expect(checkLexicographicOrder(currentStateArray)).toBe(true)
@@ -660,7 +660,7 @@ describe(`Operators`, () => {
         topK((a, b) => a.value.localeCompare(b.value)),
         output((message) => {
           allMessages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -672,7 +672,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -694,7 +694,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[1, { id: 1, value: `a` }], 1], // This should be inserted at the start
           [[2, { id: 2, value: `b` }], 1], // This should be inserted at the start
-        ])
+        ]),
       )
       graph.run()
 
@@ -717,7 +717,7 @@ describe(`Operators`, () => {
 
       // Convert to array for lexicographic order check
       const currentStateArray = Array.from(currentState.values()).map(
-        ([value, index]) => [[null, [value, index]], 1]
+        ([value, index]) => [[null, [value, index]], 1],
       )
 
       expect(checkLexicographicOrder(currentStateArray)).toBe(true)
@@ -752,7 +752,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -766,7 +766,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -777,7 +777,7 @@ describe(`Operators`, () => {
 
       // Verify initial order
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`, `c`])
 
@@ -794,7 +794,7 @@ describe(`Operators`, () => {
 
       // Should now show d, e, f
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`d`, `e`, `f`])
 
@@ -825,7 +825,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -839,7 +839,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -850,7 +850,7 @@ describe(`Operators`, () => {
 
       // Verify initial order
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`d`, `e`, `f`])
 
@@ -867,7 +867,7 @@ describe(`Operators`, () => {
 
       // Should now show d, e, f
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`a`, `b`, `c`])
 
@@ -898,7 +898,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -911,7 +911,7 @@ describe(`Operators`, () => {
           [[3, { id: 3, value: `c` }], 1],
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -920,7 +920,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`])
 
@@ -933,7 +933,7 @@ describe(`Operators`, () => {
       const moveResult = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`b`, `c`])
 
@@ -946,7 +946,7 @@ describe(`Operators`, () => {
       const moveResult2 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues2 = moveResult2.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues2).toEqual([`c`, `d`])
 
@@ -957,7 +957,7 @@ describe(`Operators`, () => {
       const moveResult3 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues3 = moveResult3.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues3).toEqual([`a`, `b`])
     })
@@ -983,7 +983,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -997,7 +997,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1006,7 +1006,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`b`, `c`])
 
@@ -1017,7 +1017,7 @@ describe(`Operators`, () => {
       const moveResult = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`b`, `c`, `d`])
 
@@ -1028,7 +1028,7 @@ describe(`Operators`, () => {
       const moveResult2 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues2 = moveResult2.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues2).toEqual([`b`])
     })
@@ -1054,7 +1054,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1065,7 +1065,7 @@ describe(`Operators`, () => {
           [[1, { id: 1, value: `a` }], 1],
           [[2, { id: 2, value: `b` }], 1],
           [[3, { id: 3, value: `c` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1074,7 +1074,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`])
 
@@ -1085,7 +1085,7 @@ describe(`Operators`, () => {
       const moveResult = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`c`]) // Only 1 element available at offset 2
 
@@ -1096,7 +1096,7 @@ describe(`Operators`, () => {
       const moveResult2 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues2 = moveResult2.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues2).toEqual([]) // No elements available at offset 5
 
@@ -1107,7 +1107,7 @@ describe(`Operators`, () => {
       const moveResult3 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues3 = moveResult3.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues3).toEqual([])
 
@@ -1118,7 +1118,7 @@ describe(`Operators`, () => {
       const moveResult4 = tracker.getResult(compareFractionalIndex)
 
       const moveSortedValues4 = moveResult4.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues4).toEqual([`a`, `b`])
     })
@@ -1143,7 +1143,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1157,7 +1157,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1166,7 +1166,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(6)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`, `c`, `d`, `e`, `f`])
 
@@ -1181,7 +1181,7 @@ describe(`Operators`, () => {
 
       // Should now show only first 3 elements
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`a`, `b`, `c`])
 
@@ -1210,7 +1210,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1224,7 +1224,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1240,7 +1240,7 @@ describe(`Operators`, () => {
 
       // Should now show elements c, d, e
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`c`, `d`, `e`])
 
@@ -1269,7 +1269,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1283,7 +1283,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1292,7 +1292,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(3)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`d`, `e`, `f`])
 
@@ -1304,7 +1304,7 @@ describe(`Operators`, () => {
 
       // Should now show elements b, c (offset 1, limit 2)
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`b`, `c`])
 
@@ -1333,7 +1333,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1347,7 +1347,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1356,7 +1356,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(4)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`c`, `d`, `e`, `f`])
 
@@ -1368,7 +1368,7 @@ describe(`Operators`, () => {
 
       // Should show same elements c, d, e, f (offset 2, no limit)
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`c`, `d`, `e`, `f`])
 
@@ -1397,7 +1397,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1411,7 +1411,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1420,7 +1420,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(6)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`a`, `b`, `c`, `d`, `e`, `f`])
 
@@ -1432,7 +1432,7 @@ describe(`Operators`, () => {
 
       // Should now show elements c, d, e, f (offset 2, no limit)
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`c`, `d`, `e`, `f`])
 
@@ -1461,7 +1461,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1475,7 +1475,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1484,7 +1484,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(3)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`d`, `e`, `f`])
 
@@ -1496,7 +1496,7 @@ describe(`Operators`, () => {
 
       // Should now show elements b, c, d, e, f (offset 1, no limit)
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`b`, `c`, `d`, `e`, `f`])
 
@@ -1526,7 +1526,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1540,7 +1540,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1549,7 +1549,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`c`, `d`])
 
@@ -1561,7 +1561,7 @@ describe(`Operators`, () => {
 
       // Should now show elements c, d, e, f (offset 2, no limit)
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`c`, `d`, `e`, `f`])
 
@@ -1591,7 +1591,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1605,7 +1605,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1614,7 +1614,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`b`, `c`])
 
@@ -1626,7 +1626,7 @@ describe(`Operators`, () => {
 
       // Should now show elements d, e, f (offset 3, no limit)
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`d`, `e`, `f`])
 
@@ -1656,7 +1656,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -1670,7 +1670,7 @@ describe(`Operators`, () => {
           [[4, { id: 4, value: `d` }], 1],
           [[5, { id: 5, value: `e` }], 1],
           [[6, { id: 6, value: `f` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -1679,7 +1679,7 @@ describe(`Operators`, () => {
       expect(initialResult.sortedResults.length).toBe(2)
 
       const initialSortedValues = initialResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(initialSortedValues).toEqual([`d`, `e`])
 
@@ -1691,7 +1691,7 @@ describe(`Operators`, () => {
 
       // Should now show elements b, c, d, e, f (offset 1, no limit)
       const moveSortedValues = moveResult.sortedResults.map(
-        ([_key, [value, _index]]) => value.value
+        ([_key, [value, _index]]) => value.value,
       )
       expect(moveSortedValues).toEqual([`b`, `c`, `d`, `e`, `f`])
 
diff --git a/packages/db-ivm/tests/operators/topKWithIndex.test.ts b/packages/db-ivm/tests/operators/topKWithIndex.test.ts
index 7b024e550..0a621226b 100644
--- a/packages/db-ivm/tests/operators/topKWithIndex.test.ts
+++ b/packages/db-ivm/tests/operators/topKWithIndex.test.ts
@@ -1,13 +1,13 @@
-import { describe, expect, test } from "vitest"
-import { D2 } from "../../src/d2.js"
-import { MultiSet } from "../../src/multiset.js"
-import { output } from "../../src/operators/index.js"
-import { topKWithIndex } from "../../src/operators/topK.js"
+import { describe, expect, test } from 'vitest'
+import { D2 } from '../../src/d2.js'
+import { MultiSet } from '../../src/multiset.js'
+import { output } from '../../src/operators/index.js'
+import { topKWithIndex } from '../../src/operators/topK.js'
 import {
   MessageTracker,
   assertOnlyKeysAffected,
   assertResults,
-} from "../test-utils.js"
+} from '../test-utils.js'
 
 describe(`Operators`, () => {
   describe(`TopKWithIndex operation`, () => {
@@ -28,7 +28,7 @@ describe(`Operators`, () => {
         topKWithIndex((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -40,7 +40,7 @@ describe(`Operators`, () => {
           [[null, { id: 3, value: `b` }], 1],
           [[null, { id: 4, value: `y` }], 1],
           [[null, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -75,7 +75,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -87,7 +87,7 @@ describe(`Operators`, () => {
           [[null, { id: 3, value: `b` }], 1],
           [[null, { id: 4, value: `y` }], 1],
           [[null, { id: 5, value: `c` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -120,7 +120,7 @@ describe(`Operators`, () => {
         topKWithIndex((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -137,7 +137,7 @@ describe(`Operators`, () => {
           [[`two`, { id: 8, value: `2` }], 1],
           [[`two`, { id: 9, value: `1` }], 1],
           [[`two`, { id: 10, value: `0` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -175,7 +175,7 @@ describe(`Operators`, () => {
         topKWithIndex((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           tracker.addMessage(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -187,7 +187,7 @@ describe(`Operators`, () => {
           [[null, { id: 2, value: `b` }], 1],
           [[null, { id: 3, value: `c` }], 1],
           [[null, { id: 4, value: `d` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -201,7 +201,7 @@ describe(`Operators`, () => {
           [null, [{ id: 2, value: `b` }, 1]],
           [null, [{ id: 3, value: `c` }, 2]],
         ],
-        4 // Max expected messages for initial data
+        4, // Max expected messages for initial data
       )
 
       tracker.reset()
@@ -243,7 +243,7 @@ describe(`Operators`, () => {
         topKWithIndex((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -254,7 +254,7 @@ describe(`Operators`, () => {
           [[null, { id: 1, value: `c` }], 1],
           [[null, { id: 2, value: `d` }], 1],
           [[null, { id: 3, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -272,7 +272,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[null, { id: 4, value: `a` }], 1],
           [[null, { id: 5, value: `b` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -310,7 +310,7 @@ describe(`Operators`, () => {
         topKWithIndex((a, b) => a.value.localeCompare(b.value), { limit: 3 }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -321,7 +321,7 @@ describe(`Operators`, () => {
           [[null, { id: 1, value: `a` }], 1],
           [[null, { id: 2, value: `b` }], 1],
           [[null, { id: 3, value: `c` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -339,7 +339,7 @@ describe(`Operators`, () => {
         new MultiSet([
           [[null, { id: 1, value: `a` }], -1],
           [[null, { id: 1, value: `z` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -381,7 +381,7 @@ describe(`Operators`, () => {
         }),
         output((message) => {
           latestMessage = message
-        })
+        }),
       )
 
       graph.finalize()
@@ -394,7 +394,7 @@ describe(`Operators`, () => {
           [[null, { id: 3, value: `c` }], 1],
           [[null, { id: 4, value: `d` }], 1],
           [[null, { id: 5, value: `e` }], 1],
-        ])
+        ]),
       )
       graph.run()
 
@@ -434,7 +434,7 @@ function sortByIndexAndId(results: Array<any>) {
   return [...results].sort(
     (
       [[_aKey, [aValue, aIndex]], _aMultiplicity],
-      [[_bKey, [bValue, bIndex]], _bMultiplicity]
+      [[_bKey, [bValue, bIndex]], _bMultiplicity],
     ) => {
       // First sort by index
       if (aIndex !== bIndex) {
@@ -442,7 +442,7 @@ function sortByIndexAndId(results: Array<any>) {
       }
       // Then by id if indices are the same
       return aValue.id - bValue.id
-    }
+    },
   )
 }
 
@@ -453,7 +453,7 @@ function sortByKeyIndexAndId(results: Array<any>) {
   return [...results].sort(
     (
       [[aKey, [aValue, aIndex]], _aMultiplicity],
-      [[bKey, [bValue, bIndex]], _bMultiplicity]
+      [[bKey, [bValue, bIndex]], _bMultiplicity],
     ) => {
       // First sort by key
       if (aKey !== bKey) {
@@ -465,7 +465,7 @@ function sortByKeyIndexAndId(results: Array<any>) {
       }
       // Then by id if indices are the same
       return aValue.id - bValue.id
-    }
+    },
   )
 }
 
@@ -476,7 +476,7 @@ function sortByMultiplicityIndexAndId(results: Array<any>) {
   return [...results].sort(
     (
       [[_aKey, [aValue, aIndex]], aMultiplicity],
-      [[_bKey, [bValue, bIndex]], bMultiplicity]
+      [[_bKey, [bValue, bIndex]], bMultiplicity],
     ) => {
       // First sort by multiplicity
       if (aMultiplicity !== bMultiplicity) {
@@ -488,6 +488,6 @@ function sortByMultiplicityIndexAndId(results: Array<any>) {
       }
       // Then by id if indices are the same
       return aValue.id - bValue.id
-    }
+    },
   )
 }
diff --git a/packages/db-ivm/tests/test-utils.ts b/packages/db-ivm/tests/test-utils.ts
index a7ee0f0f5..ca44e88e9 100644
--- a/packages/db-ivm/tests/test-utils.ts
+++ b/packages/db-ivm/tests/test-utils.ts
@@ -1,5 +1,5 @@
-import { expect } from "vitest"
-import { MultiSet } from "../src/multiset.js"
+import { expect } from 'vitest'
+import { MultiSet } from '../src/multiset.js'
 
 // Enable detailed logging of test results when LOG_RESULTS is set
 const LOG_RESULTS =
@@ -10,7 +10,7 @@ const LOG_RESULTS =
  * Takes an array of messages and consolidates them into a final result set
  */
 export function materializeResults<T>(
-  messages: Array<[T, number]>
+  messages: Array<[T, number]>,
 ): Map<string, T> {
   const multiSet = new MultiSet(messages)
   const consolidated = multiSet.consolidate()
@@ -32,7 +32,7 @@ export function materializeResults<T>(
  * Takes an array of keyed messages and consolidates them per key
  */
 export function materializeKeyedResults<K, V>(
-  messages: Array<[[K, V], number]>
+  messages: Array<[[K, V], number]>,
 ): Map<K, V> {
   const result = new Map<K, Map<string, { value: V; multiplicity: number }>>()
 
@@ -59,14 +59,14 @@ export function materializeKeyedResults<K, V>(
   for (const [key, valueMap] of result.entries()) {
     // Filter to only positive multiplicities
     const positiveValues = Array.from(valueMap.values()).filter(
-      (entry) => entry.multiplicity > 0
+      (entry) => entry.multiplicity > 0,
     )
 
     if (positiveValues.length === 1) {
       finalResult.set(key, positiveValues[0].value)
     } else if (positiveValues.length > 1) {
       throw new Error(
-        `Key ${key} has multiple final values: ${positiveValues.map((v) => JSON.stringify(v.value)).join(`, `)}`
+        `Key ${key} has multiple final values: ${positiveValues.map((v) => JSON.stringify(v.value)).join(`, `)}`,
       )
     }
     // If no positive values, key was completely removed
@@ -80,7 +80,7 @@ export function materializeKeyedResults<K, V>(
  */
 export function mapToSortedArray<T>(
   map: Map<string, T>,
-  compare?: (a: T, b: T) => number
+  compare?: (a: T, b: T) => number,
 ): Array<T> {
   const compareFn =
     compare ??
@@ -157,7 +157,7 @@ export class KeyedMessageTracker<K, V> {
       (a, b) => {
         // Sort by key for consistent ordering
         return JSON.stringify(a[0]).localeCompare(JSON.stringify(b[0]))
-      }
+      },
     )
 
     return {
@@ -180,14 +180,14 @@ export function assertResults<T>(
   testName: string,
   actual: TestResult<T>,
   expected: Array<T>,
-  maxExpectedMessages?: number
+  maxExpectedMessages?: number,
 ) {
   const expectedMap = createExpectedResults(expected)
   const expectedSorted = mapToSortedArray(expectedMap)
 
   if (LOG_RESULTS) {
     console.log(
-      `${testName}: ${actual.messageCount} messages, ${actual.sortedResults.length} final results`
+      `${testName}: ${actual.messageCount} messages, ${actual.sortedResults.length} final results`,
     )
     console.log(`  Messages:`, actual.messages)
     console.log(`  Final results:`, actual.sortedResults)
@@ -207,7 +207,7 @@ export function assertResults<T>(
   const reasonableThreshold = expected.length === 0 ? 2 : expected.length * 3
   if (actual.messageCount > reasonableThreshold) {
     console.warn(
-      `⚠️  ${testName}: High message count (${actual.messageCount} messages for ${expected.length} expected results)`
+      `⚠️  ${testName}: High message count (${actual.messageCount} messages for ${expected.length} expected results)`,
     )
   }
 }
@@ -219,7 +219,7 @@ export function assertKeyedResults<K, V>(
   testName: string,
   actual: KeyedTestResult<K, V>,
   expected: Array<[K, V]>,
-  maxExpectedMessages?: number
+  maxExpectedMessages?: number,
 ) {
   const expectedSorted = expected.sort((a, b) => {
     return JSON.stringify(a[0]).localeCompare(JSON.stringify(b[0]))
@@ -227,7 +227,7 @@ export function assertKeyedResults<K, V>(
 
   if (LOG_RESULTS) {
     console.log(
-      `${testName}: ${actual.messageCount} messages, ${actual.sortedResults.length} final results per key`
+      `${testName}: ${actual.messageCount} messages, ${actual.sortedResults.length} final results per key`,
     )
     console.log(`  Messages:`, actual.messages)
     console.log(`  Final results:`, actual.sortedResults)
@@ -247,17 +247,17 @@ export function assertKeyedResults<K, V>(
   const reasonableThreshold = Math.max(expected.length * 4, 2)
   if (actual.messageCount > reasonableThreshold) {
     console.warn(
-      `⚠️  ${testName}: High message count (${actual.messageCount} messages for ${expected.length} expected key-value pairs)`
+      `⚠️  ${testName}: High message count (${actual.messageCount} messages for ${expected.length} expected key-value pairs)`,
     )
   }
 
   // Log key insights
   const affectedKeys = new Set(
-    actual.messages.map(([[key, _value], _mult]) => key)
+    actual.messages.map(([[key, _value], _mult]) => key),
   )
   if (LOG_RESULTS) {
     console.log(
-      `${testName}: ✅ ${affectedKeys.size} keys affected, ${actual.sortedResults.length} final keys`
+      `${testName}: ✅ ${affectedKeys.size} keys affected, ${actual.sortedResults.length} final keys`,
     )
   }
 }
@@ -266,7 +266,7 @@ export function assertKeyedResults<K, V>(
  * Extract unique keys from messages to verify incremental behavior
  */
 export function extractMessageKeys<K, V>(
-  messages: Array<[[K, V], number]>
+  messages: Array<[[K, V], number]>,
 ): Set<K> {
   const keys = new Set<K>()
   for (const [[key, _value], _multiplicity] of messages) {
@@ -281,7 +281,7 @@ export function extractMessageKeys<K, V>(
 export function assertOnlyKeysAffected<K, V>(
   testName: string,
   messages: Array<[[K, V], number]>,
-  expectedKeys: Array<K>
+  expectedKeys: Array<K>,
 ) {
   const actualKeys = extractMessageKeys(messages)
   const expectedKeySet = new Set(expectedKeys)
@@ -295,14 +295,14 @@ export function assertOnlyKeysAffected<K, V>(
 
   if (LOG_RESULTS) {
     console.log(
-      `${testName}: ✅ Only expected keys affected: ${Array.from(actualKeys).join(`, `)}`
+      `${testName}: ✅ Only expected keys affected: ${Array.from(actualKeys).join(`, `)}`,
     )
   }
 }
 
 export const compareFractionalIndex = (
   r1: [unknown, [unknown, string]],
-  r2: [unknown, [unknown, string]]
+  r2: [unknown, [unknown, string]],
 ) => {
   const [_key1, [_value1, index1]] = r1
   const [_key2, [_value2, index2]] = r2
diff --git a/packages/db-ivm/tests/utils.test.ts b/packages/db-ivm/tests/utils.test.ts
index 4ba86d217..9f6986577 100644
--- a/packages/db-ivm/tests/utils.test.ts
+++ b/packages/db-ivm/tests/utils.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, it } from "vitest"
-import { DefaultMap } from "../src/utils.js"
-import { hash } from "../src/hashing/index.js"
+import { describe, expect, it } from 'vitest'
+import { DefaultMap } from '../src/utils.js'
+import { hash } from '../src/hashing/index.js'
 
 describe(`DefaultMap`, () => {
   it(`should return default value for missing keys`, () => {
diff --git a/packages/db-ivm/vite.config.ts b/packages/db-ivm/vite.config.ts
index c7968f28a..aa589f666 100644
--- a/packages/db-ivm/vite.config.ts
+++ b/packages/db-ivm/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -17,5 +17,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/db/CHANGELOG.md b/packages/db/CHANGELOG.md
index 437efe2b7..98213d409 100644
--- a/packages/db/CHANGELOG.md
+++ b/packages/db/CHANGELOG.md
@@ -1,5 +1,123 @@
 # @tanstack/db
 
+## 0.5.15
+
+### Patch Changes
+
+- fix: prevent duplicate inserts from reaching D2 pipeline in live queries ([#1054](https://github.com/TanStack/db/pull/1054))
+
+  Added defensive measures to prevent duplicate INSERT events from reaching the D2 (differential dataflow) pipeline, which could cause items to not disappear when deleted (due to multiplicity going from 2 to 1 instead of 1 to 0).
+
+  Changes:
+  - Added `sentToD2Keys` tracking in `CollectionSubscriber` to filter duplicate inserts at the D2 pipeline entry point
+  - Fixed `includeInitialState` handling to only pass when `true`, preventing internal lazy-loading subscriptions from incorrectly disabling filtering
+  - Clear `sentToD2Keys` on truncate to allow re-inserts after collection reset
+
+## 0.5.14
+
+### Patch Changes
+
+- Fix subscriptions not re-requesting data after truncate in on-demand sync mode. When a must-refetch occurs, subscriptions now buffer changes and re-request their previously loaded subsets, preventing a flash of missing content. ([#1043](https://github.com/TanStack/db/pull/1043))
+
+  Key improvements:
+  - Buffer changes atomically: deletes and inserts are emitted together in a single callback
+  - Correct event ordering: defers loadSubset calls to a microtask so truncate deletes are buffered before refetch inserts
+  - Gated on on-demand mode: only buffers when there's an actual loadSubset handler
+  - Fixes delete filter edge case: skips delete filter during truncate buffering when `sentKeys` is empty
+
+## 0.5.13
+
+### Patch Changes
+
+- Allow rows to be deleted by key by using the write function passed to a collection's sync function. ([#1003](https://github.com/TanStack/db/pull/1003))
+
+- fix: deleted items not disappearing from live queries with `.limit()` ([#1044](https://github.com/TanStack/db/pull/1044))
+
+  Fixed a bug where deleting an item from a live query with `.orderBy()` and `.limit()` would not remove it from the query results. The `subscribeChanges` callback would never fire with a delete event.
+
+  The issue was caused by duplicate inserts reaching the D2 pipeline, which corrupted the multiplicity tracking used by `TopKWithFractionalIndexOperator`. A delete would decrement multiplicity from 2 to 1 instead of 1 to 0, so the item remained visible.
+
+  Fixed by ensuring `sentKeys` is updated before callbacks execute (preventing race conditions) and filtering duplicate inserts in `filterAndFlipChanges`.
+
+## 0.5.12
+
+### Patch Changes
+
+- Enhanced LoadSubsetOptions with separate cursor expressions and offset for flexible pagination. ([#960](https://github.com/TanStack/db/pull/960))
+
+  **⚠️ Breaking Change for Custom Sync Layers / Query Collections:**
+
+  `LoadSubsetOptions.where` no longer includes cursor expressions for pagination. If you have a custom sync layer or query collection that implements `loadSubset`, you must now handle pagination separately:
+  - **Cursor-based pagination:** Use the new `cursor` property (`cursor.whereFrom` and `cursor.whereCurrent`) and combine them with `where` yourself
+  - **Offset-based pagination:** Use the new `offset` property
+
+  Previously, cursor expressions were baked into the `where` clause. Now they are passed separately so sync layers can choose their preferred pagination strategy.
+
+  **Changes:**
+  - Added `CursorExpressions` type with `whereFrom`, `whereCurrent`, and optional `lastKey` properties
+  - Added `cursor` to `LoadSubsetOptions` for cursor-based pagination (separate from `where`)
+  - Added `offset` to `LoadSubsetOptions` for offset-based pagination support
+  - Electric sync layer now makes two parallel `requestSnapshot` calls when cursor is present:
+    - One for `whereCurrent` (all ties at boundary, no limit)
+    - One for `whereFrom` (rows after cursor, with limit)
+  - Query collection serialization now includes `offset` for query key generation
+  - Added `truncate` event to collections, emitted when synced data is truncated (e.g., after `must-refetch`)
+  - Fixed `setWindow` pagination: cursor expressions are now correctly built when paging through results
+  - Fixed offset tracking: `loadNextItems` now passes the correct window offset to prevent incorrect deduplication
+  - `CollectionSubscriber` now listens for `truncate` events to reset cursor tracking state
+
+  **Benefits:**
+  - Sync layers can choose between cursor-based or offset-based pagination strategies
+  - Electric can efficiently handle tie-breaking with two targeted requests
+  - Better separation of concerns between filtering (`where`) and pagination (`cursor`/`offset`)
+  - `setWindow` correctly triggers backend loading for subsequent pages in multi-column orderBy queries
+  - Cursor state is properly reset after truncation, preventing stale cursor data from being used
+
+- Ensure deterministic iteration order for collections and indexes. ([#958](https://github.com/TanStack/db/pull/958))
+
+  **SortedMap improvements:**
+  - Added key-based tie-breaking when values compare as equal, ensuring deterministic ordering
+  - Optimized to skip value comparison entirely when no comparator is provided (key-only sorting)
+  - Extracted `compareKeys` utility to `utils/comparison.ts` for reuse
+
+  **BTreeIndex improvements:**
+  - Keys within the same indexed value are now returned in deterministic sorted order
+  - Optimized with fast paths for empty sets and single-key sets to avoid unnecessary allocations
+
+  **CollectionStateManager changes:**
+  - Collections now always use `SortedMap` for `syncedData`, ensuring deterministic iteration order
+  - When no `compare` function is provided, entries are sorted by key only
+
+  This ensures that live queries with `orderBy` and `limit` produce stable, deterministic results even when multiple rows have equal sort values.
+
+- Enhanced multi-column orderBy support with lazy loading and composite cursor optimization. ([#926](https://github.com/TanStack/db/pull/926))
+
+  **Changes:**
+  - Create index on first orderBy column even for multi-column orderBy queries, enabling lazy loading with first-column ordering
+  - Pass multi-column orderBy to loadSubset with precise composite cursors (e.g., `or(gt(col1, v1), and(eq(col1, v1), gt(col2, v2)))`) for backend optimization
+  - Use wide bounds (first column only) for local index operations to ensure no rows are missed
+  - Use precise composite cursor for sync layer loadSubset to minimize data transfer
+
+  **Benefits:**
+  - Multi-column orderBy queries with limit now support lazy loading (previously disabled)
+  - Sync implementations (like Electric) can optimize queries using composite indexes on the backend
+  - Local collection uses first-column index efficiently while backend gets precise cursor
+
+- Updated dependencies [[`52c29fa`](https://github.com/TanStack/db/commit/52c29fa83b390ac26341dbf93e79ce0d59543686)]:
+  - @tanstack/db-ivm@0.1.14
+
+## 0.5.11
+
+### Patch Changes
+
+- fix(db): compile filter expression once in createFilterFunctionFromExpression ([#954](https://github.com/TanStack/db/pull/954))
+
+  Fixed a performance issue in `createFilterFunctionFromExpression` where the expression was being recompiled on every filter call. This only affected realtime change event filtering for pushed-down predicates at the collection level when using orderBy + limit. The core query engine was not affected as it already compiled predicates once.
+
+- fix(query-db-collection): use deep equality for object field comparison in query observer ([#967](https://github.com/TanStack/db/pull/967))
+
+  Fixed an issue where updating object fields (non-primitives) with `refetch: false` in `onUpdate` handlers would cause the value to rollback to the previous state every other update. The query observer was using shallow equality (`===`) to compare items, which compares object properties by reference rather than by value. This caused the observer to incorrectly detect differences and write stale data back to syncedData. Now uses `deepEquals` for proper value comparison.
+
 ## 0.5.10
 
 ### Patch Changes
@@ -185,7 +303,7 @@
   **Example:**
 
   ```typescript
-  import { parseLoadSubsetOptions } from "@tanstack/db"
+  import { parseLoadSubsetOptions } from '@tanstack/db'
   // or from "@tanstack/query-db-collection" (re-exported for convenience)
 
   queryFn: async (ctx) => {
@@ -196,8 +314,8 @@
     // Build API request from parsed filters
     const params = new URLSearchParams()
     parsed.filters.forEach(({ field, operator, value }) => {
-      if (operator === "eq") {
-        params.set(field.join("."), String(value))
+      if (operator === 'eq') {
+        params.set(field.join('.'), String(value))
       }
     })
 
@@ -288,7 +406,7 @@
       q
         .from({ profile: profiles })
         .join({ user: users }, ({ profile, user }) =>
-          eq(profile.userId, user.id)
+          eq(profile.userId, user.id),
         ),
     getKey: (profile) => profile.id, // Each profile has unique ID
   })
@@ -301,7 +419,7 @@
       q
         .from({ user: users })
         .join({ comment: comments }, ({ user, comment }) =>
-          eq(user.id, comment.userId)
+          eq(user.id, comment.userId),
         ),
     getKey: (item) => item.userId, // Multiple comments share same userId!
   })
@@ -345,11 +463,11 @@
 
   // Check sync status
   if (collection.utils.isFetching) {
-    console.log("Syncing with server...")
+    console.log('Syncing with server...')
   }
 
   if (collection.utils.isRefetching) {
-    console.log("Background refresh in progress")
+    console.log('Background refresh in progress')
   }
 
   // Show last update time
@@ -358,7 +476,7 @@
 
   // Check error state (now using getters)
   if (collection.utils.isError) {
-    console.error("Sync failed:", collection.utils.lastError)
+    console.error('Sync failed:', collection.utils.lastError)
     console.log(`Failed ${collection.utils.errorCount} times`)
   }
   ```
@@ -447,7 +565,7 @@
   import {
     startOfflineExecutor,
     IndexedDBAdapter,
-  } from "@tanstack/offline-transactions"
+  } from '@tanstack/offline-transactions'
 
   const executor = startOfflineExecutor({
     collections: { todos: todoCollection },
@@ -459,18 +577,18 @@
       },
     },
     onStorageFailure: (diagnostic) => {
-      console.warn("Running in online-only mode:", diagnostic.message)
+      console.warn('Running in online-only mode:', diagnostic.message)
     },
   })
 
   // Create offline transaction
   const tx = executor.createOfflineTransaction({
-    mutationFnName: "syncTodos",
+    mutationFnName: 'syncTodos',
     autoCommit: false,
   })
 
   tx.mutate(() => {
-    todoCollection.insert({ id: "1", text: "Buy milk", completed: false })
+    todoCollection.insert({ id: '1', text: 'Buy milk', completed: false })
   })
 
   await tx.commit() // Persists to outbox and syncs when online
@@ -501,13 +619,13 @@
   ```typescript
   const collection = createCollection({
     getKey: (item) => item.id,
-    autoIndex: "eager", // default
+    autoIndex: 'eager', // default
     // ... sync config
   })
 
   // These now automatically create and use indexes:
   collection.subscribeChanges((items) => console.log(items), {
-    whereExpression: eq(row.vehicleDispatch?.date, "2024-01-01"),
+    whereExpression: eq(row.vehicleDispatch?.date, '2024-01-01'),
   })
 
   collection.subscribeChanges((items) => console.log(items), {
@@ -552,7 +670,7 @@
   **Example Usage:**
 
   ```ts
-  import { usePacedMutations, debounceStrategy } from "@tanstack/react-db"
+  import { usePacedMutations, debounceStrategy } from '@tanstack/react-db'
 
   const mutate = usePacedMutations({
     mutationFn: async ({ transaction }) => {
@@ -600,8 +718,8 @@
     if (!cache.has(id)) {
       const collection = createCollection(/* ... */)
 
-      collection.on("status:change", ({ status }) => {
-        if (status === "cleaned-up") {
+      collection.on('status:change', ({ status }) => {
+        if (status === 'cleaned-up') {
           cache.delete(id) // This now works!
         }
       })
@@ -653,9 +771,9 @@
   const users = createLiveQueryCollection((q) =>
     q
       .from({ user: usersCollection })
-      .orderBy(({ user }) => user.name, "asc")
+      .orderBy(({ user }) => user.name, 'asc')
       .limit(10)
-      .offset(0)
+      .offset(0),
   )
 
   users.utils.setWindow({ offset: 10, limit: 10 })
@@ -816,15 +934,15 @@
   ```js
   // Before - commit() didn't throw
   await tx.commit()
-  if (tx.state === "failed") {
-    console.error("Failed:", tx.error)
+  if (tx.state === 'failed') {
+    console.error('Failed:', tx.error)
   }
 
   // After - commit() now throws
   try {
     await tx.commit()
   } catch (error) {
-    console.error("Failed:", error)
+    console.error('Failed:', error)
   }
   ```
 
@@ -1164,7 +1282,7 @@
   try {
     collection.insert(data)
   } catch (error) {
-    if (error.message.includes("already exists")) {
+    if (error.message.includes('already exists')) {
       // Handle duplicate key error
     }
   }
@@ -1173,7 +1291,7 @@
   **After:**
 
   ```ts
-  import { DuplicateKeyError } from "@tanstack/db"
+  import { DuplicateKeyError } from '@tanstack/db'
 
   try {
     collection.insert(data)
@@ -1190,14 +1308,14 @@
 
   ```ts
   // Electric collection errors were imported from @tanstack/db
-  import { ElectricInsertHandlerMustReturnTxIdError } from "@tanstack/db"
+  import { ElectricInsertHandlerMustReturnTxIdError } from '@tanstack/db'
   ```
 
   **After:**
 
   ```ts
   // Now import from the specific adapter package
-  import { ElectricInsertHandlerMustReturnTxIdError } from "@tanstack/electric-db-collection"
+  import { ElectricInsertHandlerMustReturnTxIdError } from '@tanstack/electric-db-collection'
   ```
 
   ### Unified Error Handling
@@ -1205,14 +1323,14 @@
   **New:**
 
   ```ts
-  import { TanStackDBError } from "@tanstack/db"
+  import { TanStackDBError } from '@tanstack/db'
 
   try {
     // Any TanStack DB operation
   } catch (error) {
     if (error instanceof TanStackDBError) {
       // Handle all TanStack DB errors uniformly
-      console.log("TanStack DB error:", error.message)
+      console.log('TanStack DB error:', error.message)
     }
   }
   ```
diff --git a/packages/db/package.json b/packages/db/package.json
index a9cf4d7fb..d6ae8cc52 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -1,18 +1,30 @@
 {
   "name": "@tanstack/db",
+  "version": "0.5.15",
   "description": "A reactive client store for building super fast apps on sync",
-  "version": "0.5.10",
-  "dependencies": {
-    "@standard-schema/spec": "^1.0.0",
-    "@tanstack/db-ivm": "workspace:*",
-    "@tanstack/pacer-lite": "^0.1.0"
+  "author": "Kyle Mathews",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TanStack/db.git",
+    "directory": "packages/db"
   },
-  "devDependencies": {
-    "@vitest/coverage-istanbul": "^3.2.4",
-    "arktype": "^2.1.27",
-    "superjson": "^2.2.6",
-    "temporal-polyfill": "^0.3.0"
+  "homepage": "https://tanstack.com/db",
+  "keywords": [
+    "optimistic",
+    "typescript"
+  ],
+  "scripts": {
+    "build": "vite build",
+    "build:minified": "vite build --minify",
+    "dev": "vite build --watch",
+    "lint": "eslint . --fix",
+    "test": "vitest --run"
   },
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -26,36 +38,25 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
-  "packageManager": "pnpm@10.24.0",
+  "dependencies": {
+    "@standard-schema/spec": "^1.0.0",
+    "@tanstack/db-ivm": "workspace:*",
+    "@tanstack/pacer-lite": "^0.1.1"
+  },
   "peerDependencies": {
     "typescript": ">=4.7"
   },
-  "author": "Kyle Mathews",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/TanStack/db.git",
-    "directory": "packages/db"
-  },
-  "homepage": "https://tanstack.com/db",
-  "keywords": [
-    "optimistic",
-    "typescript"
-  ],
-  "scripts": {
-    "build": "vite build",
-    "build:minified": "vite build --minify",
-    "dev": "vite build --watch",
-    "lint": "eslint . --fix",
-    "test": "npx vitest --run"
-  },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@tanstack/config": "^0.22.2",
+    "@vitest/coverage-istanbul": "^3.2.4",
+    "arktype": "^2.1.28",
+    "mitt": "^3.0.1",
+    "superjson": "^2.2.6",
+    "temporal-polyfill": "^0.3.0"
+  }
 }
diff --git a/packages/db/src/SortedMap.ts b/packages/db/src/SortedMap.ts
index 268b614f0..3d59ad687 100644
--- a/packages/db/src/SortedMap.ts
+++ b/packages/db/src/SortedMap.ts
@@ -1,62 +1,81 @@
+import { compareKeys } from '@tanstack/db-ivm'
+
 /**
  * A Map implementation that keeps its entries sorted based on a comparator function
- * @template TKey - The type of keys in the map
+ * @template TKey - The type of keys in the map (must be string | number)
  * @template TValue - The type of values in the map
  */
-export class SortedMap<TKey, TValue> {
+export class SortedMap<TKey extends string | number, TValue> {
   private map: Map<TKey, TValue>
   private sortedKeys: Array<TKey>
-  private comparator: (a: TValue, b: TValue) => number
+  private comparator: ((a: TValue, b: TValue) => number) | undefined
 
   /**
    * Creates a new SortedMap instance
    *
-   * @param comparator - Optional function to compare values for sorting
+   * @param comparator - Optional function to compare values for sorting.
+   *                     If not provided, entries are sorted by key only.
    */
   constructor(comparator?: (a: TValue, b: TValue) => number) {
     this.map = new Map<TKey, TValue>()
     this.sortedKeys = []
-    this.comparator = comparator || this.defaultComparator
-  }
-
-  /**
-   * Default comparator function used when none is provided
-   *
-   * @param a - First value to compare
-   * @param b - Second value to compare
-   * @returns -1 if a < b, 1 if a > b, 0 if equal
-   */
-  private defaultComparator(a: TValue, b: TValue): number {
-    if (a < b) return -1
-    if (a > b) return 1
-    return 0
+    this.comparator = comparator
   }
 
   /**
    * Finds the index where a key-value pair should be inserted to maintain sort order.
-   * Uses binary search to find the correct position based on the value.
-   * Hence, it is in O(log n) time.
+   * Uses binary search to find the correct position based on the value (if comparator provided),
+   * with key-based tie-breaking for deterministic ordering when values compare as equal.
+   * If no comparator is provided, sorts by key only.
+   * Runs in O(log n) time.
    *
-   * @param key - The key to find position for
-   * @param value - The value to compare against
+   * @param key - The key to find position for (used as tie-breaker or primary sort when no comparator)
+   * @param value - The value to compare against (only used if comparator is provided)
    * @returns The index where the key should be inserted
    */
-  private indexOf(value: TValue): number {
+  private indexOf(key: TKey, value: TValue): number {
     let left = 0
     let right = this.sortedKeys.length
 
+    // Fast path: no comparator means sort by key only
+    if (!this.comparator) {
+      while (left < right) {
+        const mid = Math.floor((left + right) / 2)
+        const midKey = this.sortedKeys[mid]!
+        const keyComparison = compareKeys(key, midKey)
+        if (keyComparison < 0) {
+          right = mid
+        } else if (keyComparison > 0) {
+          left = mid + 1
+        } else {
+          return mid
+        }
+      }
+      return left
+    }
+
+    // With comparator: sort by value first, then key as tie-breaker
     while (left < right) {
       const mid = Math.floor((left + right) / 2)
       const midKey = this.sortedKeys[mid]!
       const midValue = this.map.get(midKey)!
-      const comparison = this.comparator(value, midValue)
+      const valueComparison = this.comparator(value, midValue)
 
-      if (comparison < 0) {
+      if (valueComparison < 0) {
         right = mid
-      } else if (comparison > 0) {
+      } else if (valueComparison > 0) {
         left = mid + 1
       } else {
-        return mid
+        // Values are equal, use key as tie-breaker for deterministic ordering
+        const keyComparison = compareKeys(key, midKey)
+        if (keyComparison < 0) {
+          right = mid
+        } else if (keyComparison > 0) {
+          left = mid + 1
+        } else {
+          // Same key (shouldn't happen during insert, but handle for lookups)
+          return mid
+        }
       }
     }
 
@@ -74,12 +93,12 @@ export class SortedMap<TKey, TValue> {
     if (this.map.has(key)) {
       // Need to remove the old key from the sorted keys array
       const oldValue = this.map.get(key)!
-      const oldIndex = this.indexOf(oldValue)
+      const oldIndex = this.indexOf(key, oldValue)
       this.sortedKeys.splice(oldIndex, 1)
     }
 
     // Insert the new key at the correct position
-    const index = this.indexOf(value)
+    const index = this.indexOf(key, value)
     this.sortedKeys.splice(index, 0, key)
 
     this.map.set(key, value)
@@ -106,7 +125,7 @@ export class SortedMap<TKey, TValue> {
   delete(key: TKey): boolean {
     if (this.map.has(key)) {
       const oldValue = this.map.get(key)
-      const index = this.indexOf(oldValue!)
+      const index = this.indexOf(key, oldValue!)
       this.sortedKeys.splice(index, 1)
       return this.map.delete(key)
     }
@@ -187,7 +206,7 @@ export class SortedMap<TKey, TValue> {
    * @param callbackfn - Function to execute for each entry
    */
   forEach(
-    callbackfn: (value: TValue, key: TKey, map: Map<TKey, TValue>) => void
+    callbackfn: (value: TValue, key: TKey, map: Map<TKey, TValue>) => void,
   ): void {
     for (const key of this.sortedKeys) {
       callbackfn(this.map.get(key)!, key, this.map)
diff --git a/packages/db/src/collection/change-events.ts b/packages/db/src/collection/change-events.ts
index 0ad3ca68b..8a422a407 100644
--- a/packages/db/src/collection/change-events.ts
+++ b/packages/db/src/collection/change-events.ts
@@ -1,27 +1,27 @@
 import {
   createSingleRowRefProxy,
   toExpression,
-} from "../query/builder/ref-proxy"
+} from '../query/builder/ref-proxy'
 import {
   compileSingleRowExpression,
   toBooleanPredicate,
-} from "../query/compiler/evaluators.js"
+} from '../query/compiler/evaluators.js'
 import {
   findIndexForField,
   optimizeExpressionWithIndexes,
-} from "../utils/index-optimization.js"
-import { ensureIndexForField } from "../indexes/auto-index.js"
-import { makeComparator } from "../utils/comparison.js"
-import { buildCompareOptions } from "../query/compiler/order-by"
+} from '../utils/index-optimization.js'
+import { ensureIndexForField } from '../indexes/auto-index.js'
+import { makeComparator } from '../utils/comparison.js'
+import { buildCompareOptions } from '../query/compiler/order-by'
 import type {
   ChangeMessage,
   CollectionLike,
   CurrentStateAsChangesOptions,
   SubscribeChangesOptions,
-} from "../types"
-import type { CollectionImpl } from "./index.js"
-import type { SingleRowRefProxy } from "../query/builder/ref-proxy"
-import type { BasicExpression, OrderBy } from "../query/ir.js"
+} from '../types'
+import type { CollectionImpl } from './index.js'
+import type { SingleRowRefProxy } from '../query/builder/ref-proxy'
+import type { BasicExpression, OrderBy } from '../query/ir.js'
 
 /**
  * Returns the current state of the collection as an array of changes
@@ -59,11 +59,11 @@ export function currentStateAsChanges<
   TKey extends string | number,
 >(
   collection: CollectionLike<T, TKey>,
-  options: CurrentStateAsChangesOptions = {}
+  options: CurrentStateAsChangesOptions = {},
 ): Array<ChangeMessage<T>> | void {
   // Helper function to collect filtered results
   const collectFilteredResults = (
-    filterFn?: (value: T) => boolean
+    filterFn?: (value: T) => boolean,
   ): Array<ChangeMessage<T>> => {
     const result: Array<ChangeMessage<T>> = []
     for (const [key, value] of collection.entries()) {
@@ -97,7 +97,7 @@ export function currentStateAsChanges<
       options.orderBy,
       options.limit,
       whereFilter,
-      options.optimizedOnly
+      options.optimizedOnly,
     )
 
     if (orderedKeys === undefined) {
@@ -133,7 +133,7 @@ export function currentStateAsChanges<
     // Try to optimize the query using indexes
     const optimizationResult = optimizeExpressionWithIndexes(
       expression,
-      collection
+      collection,
     )
 
     if (optimizationResult.canOptimize) {
@@ -162,7 +162,7 @@ export function currentStateAsChanges<
     // If anything goes wrong with the where clause, fall back to full scan
     console.warn(
       `${collection.id ? `[${collection.id}] ` : ``}Error processing where clause, falling back to full scan:`,
-      error
+      error,
     )
 
     const filterFn = createFilterFunctionFromExpression(options.where)
@@ -181,7 +181,7 @@ export function currentStateAsChanges<
  * @returns A function that takes an item and returns true if it matches the filter
  */
 export function createFilterFunction<T extends object>(
-  whereCallback: (row: SingleRowRefProxy<T>) => any
+  whereCallback: (row: SingleRowRefProxy<T>) => any,
 ): (item: T) => boolean {
   return (item: T): boolean => {
     try {
@@ -219,7 +219,7 @@ export function createFilterFunction<T extends object>(
  * @returns A function that takes an item and returns true if it matches the filter
  */
 export function createFilterFunctionFromExpression<T extends object>(
-  expression: BasicExpression<boolean>
+  expression: BasicExpression<boolean>,
 ): (item: T) => boolean {
   // Compile expression once when filter function is created, not on every invocation
   const evaluator = compileSingleRowExpression(expression)
@@ -243,7 +243,7 @@ export function createFilterFunctionFromExpression<T extends object>(
  */
 export function createFilteredCallback<T extends object>(
   originalCallback: (changes: Array<ChangeMessage<T>>) => void,
-  options: SubscribeChangesOptions
+  options: SubscribeChangesOptions,
 ): (changes: Array<ChangeMessage<T>>) => void {
   const filterFn = createFilterFunctionFromExpression(options.whereExpression!)
 
@@ -311,7 +311,7 @@ function getOrderedKeys<T extends object, TKey extends string | number>(
   orderBy: OrderBy,
   limit?: number,
   whereFilter?: (item: T) => boolean,
-  optimizedOnly?: boolean
+  optimizedOnly?: boolean,
 ): Array<TKey> | undefined {
   // For single-column orderBy on a ref expression, try index optimization
   if (orderBy.length === 1) {
@@ -328,7 +328,7 @@ function getOrderedKeys<T extends object, TKey extends string | number>(
         fieldPath[0]!,
         fieldPath,
         collection as CollectionImpl<T, TKey>,
-        compareOpts
+        compareOpts,
       )
 
       // Find the index
diff --git a/packages/db/src/collection/changes.ts b/packages/db/src/collection/changes.ts
index 2c9cccba5..a69400375 100644
--- a/packages/db/src/collection/changes.ts
+++ b/packages/db/src/collection/changes.ts
@@ -1,11 +1,11 @@
-import { NegativeActiveSubscribersError } from "../errors"
-import { CollectionSubscription } from "./subscription.js"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
-import type { ChangeMessage, SubscribeChangesOptions } from "../types"
-import type { CollectionLifecycleManager } from "./lifecycle.js"
-import type { CollectionSyncManager } from "./sync.js"
-import type { CollectionEventsManager } from "./events.js"
-import type { CollectionImpl } from "./index.js"
+import { NegativeActiveSubscribersError } from '../errors'
+import { CollectionSubscription } from './subscription.js'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+import type { ChangeMessage, SubscribeChangesOptions } from '../types'
+import type { CollectionLifecycleManager } from './lifecycle.js'
+import type { CollectionSyncManager } from './sync.js'
+import type { CollectionEventsManager } from './events.js'
+import type { CollectionImpl } from './index.js'
 
 export class CollectionChangesManager<
   TOutput extends object = Record<string, unknown>,
@@ -56,7 +56,7 @@ export class CollectionChangesManager<
    */
   public emitEvents(
     changes: Array<ChangeMessage<TOutput, TKey>>,
-    forceEmit = false
+    forceEmit = false,
   ): void {
     // Skip batching for user actions (forceEmit=true) to keep UI responsive
     if (this.shouldBatchEvents && !forceEmit) {
@@ -94,7 +94,7 @@ export class CollectionChangesManager<
    */
   public subscribeChanges(
     callback: (changes: Array<ChangeMessage<TOutput>>) => void,
-    options: SubscribeChangesOptions = {}
+    options: SubscribeChangesOptions = {},
   ): CollectionSubscription {
     // Start sync and track subscriber
     this.addSubscriber()
@@ -109,6 +109,10 @@ export class CollectionChangesManager<
 
     if (options.includeInitialState) {
       subscription.requestSnapshot({ trackLoadSubsetPromise: false })
+    } else if (options.includeInitialState === false) {
+      // When explicitly set to false (not just undefined), mark all state as "seen"
+      // so that all future changes (including deletes) pass through unfiltered.
+      subscription.markAllStateAsSeen()
     }
 
     // Add to batched listeners
@@ -135,7 +139,7 @@ export class CollectionChangesManager<
 
     this.events.emitSubscribersChange(
       this.activeSubscribersCount,
-      previousSubscriberCount
+      previousSubscriberCount,
     )
   }
 
@@ -154,7 +158,7 @@ export class CollectionChangesManager<
 
     this.events.emitSubscribersChange(
       this.activeSubscribersCount,
-      previousSubscriberCount
+      previousSubscriberCount,
     )
   }
 
diff --git a/packages/db/src/collection/events.ts b/packages/db/src/collection/events.ts
index 0f6d8cec1..f82a42f2c 100644
--- a/packages/db/src/collection/events.ts
+++ b/packages/db/src/collection/events.ts
@@ -1,6 +1,6 @@
-import { EventEmitter } from "../event-emitter.js"
-import type { Collection } from "./index.js"
-import type { CollectionStatus } from "../types.js"
+import { EventEmitter } from '../event-emitter.js'
+import type { Collection } from './index.js'
+import type { CollectionStatus } from '../types.js'
 
 /**
  * Event emitted when the collection status changes
@@ -43,10 +43,19 @@ export interface CollectionLoadingSubsetChangeEvent {
   loadingSubsetTransition: `start` | `end`
 }
 
+/**
+ * Event emitted when the collection is truncated (all data cleared)
+ */
+export interface CollectionTruncateEvent {
+  type: `truncate`
+  collection: Collection<any, any, any, any, any>
+}
+
 export type AllCollectionEvents = {
-  "status:change": CollectionStatusChangeEvent
-  "subscribers:change": CollectionSubscribersChangeEvent
-  "loadingSubset:change": CollectionLoadingSubsetChangeEvent
+  'status:change': CollectionStatusChangeEvent
+  'subscribers:change': CollectionSubscribersChangeEvent
+  'loadingSubset:change': CollectionLoadingSubsetChangeEvent
+  truncate: CollectionTruncateEvent
 } & {
   [K in CollectionStatus as `status:${K}`]: CollectionStatusEvent<K>
 }
@@ -56,9 +65,10 @@ export type CollectionEvent =
   | CollectionStatusChangeEvent
   | CollectionSubscribersChangeEvent
   | CollectionLoadingSubsetChangeEvent
+  | CollectionTruncateEvent
 
 export type CollectionEventHandler<T extends keyof AllCollectionEvents> = (
-  event: AllCollectionEvents[T]
+  event: AllCollectionEvents[T],
 ) => void
 
 export class CollectionEventsManager extends EventEmitter<AllCollectionEvents> {
@@ -78,14 +88,14 @@ export class CollectionEventsManager extends EventEmitter<AllCollectionEvents> {
    */
   emit<T extends keyof AllCollectionEvents>(
     event: T,
-    eventPayload: AllCollectionEvents[T]
+    eventPayload: AllCollectionEvents[T],
   ): void {
     this.emitInner(event, eventPayload)
   }
 
   emitStatusChange<T extends CollectionStatus>(
     status: T,
-    previousStatus: CollectionStatus
+    previousStatus: CollectionStatus,
   ) {
     this.emit(`status:change`, {
       type: `status:change`,
@@ -106,7 +116,7 @@ export class CollectionEventsManager extends EventEmitter<AllCollectionEvents> {
 
   emitSubscribersChange(
     subscriberCount: number,
-    previousSubscriberCount: number
+    previousSubscriberCount: number,
   ) {
     this.emit(`subscribers:change`, {
       type: `subscribers:change`,
diff --git a/packages/db/src/collection/index.ts b/packages/db/src/collection/index.ts
index 31d9e14e5..ecd8d70bf 100644
--- a/packages/db/src/collection/index.ts
+++ b/packages/db/src/collection/index.ts
@@ -1,20 +1,20 @@
 import {
   CollectionRequiresConfigError,
   CollectionRequiresSyncConfigError,
-} from "../errors"
-import { currentStateAsChanges } from "./change-events"
-
-import { CollectionStateManager } from "./state"
-import { CollectionChangesManager } from "./changes"
-import { CollectionLifecycleManager } from "./lifecycle.js"
-import { CollectionSyncManager } from "./sync"
-import { CollectionIndexesManager } from "./indexes"
-import { CollectionMutationsManager } from "./mutations"
-import { CollectionEventsManager } from "./events.js"
-import type { CollectionSubscription } from "./subscription"
-import type { AllCollectionEvents, CollectionEventHandler } from "./events.js"
-import type { BaseIndex, IndexResolver } from "../indexes/base-index.js"
-import type { IndexOptions } from "../indexes/index-options.js"
+} from '../errors'
+import { currentStateAsChanges } from './change-events'
+
+import { CollectionStateManager } from './state'
+import { CollectionChangesManager } from './changes'
+import { CollectionLifecycleManager } from './lifecycle.js'
+import { CollectionSyncManager } from './sync'
+import { CollectionIndexesManager } from './indexes'
+import { CollectionMutationsManager } from './mutations'
+import { CollectionEventsManager } from './events.js'
+import type { CollectionSubscription } from './subscription'
+import type { AllCollectionEvents, CollectionEventHandler } from './events.js'
+import type { BaseIndex, IndexResolver } from '../indexes/base-index.js'
+import type { IndexOptions } from '../indexes/index-options.js'
 import type {
   ChangeMessage,
   CollectionConfig,
@@ -32,11 +32,11 @@ import type {
   Transaction as TransactionType,
   UtilsRecord,
   WritableDeep,
-} from "../types"
-import type { SingleRowRefProxy } from "../query/builder/ref-proxy"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
-import type { BTreeIndex } from "../indexes/btree-index.js"
-import type { IndexProxy } from "../indexes/lazy-index.js"
+} from '../types'
+import type { SingleRowRefProxy } from '../query/builder/ref-proxy'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+import type { BTreeIndex } from '../indexes/btree-index.js'
+import type { IndexProxy } from '../indexes/lazy-index.js'
 
 /**
  * Enhanced Collection interface that includes both data type T and utilities TUtils
@@ -142,7 +142,7 @@ export function createCollection<
   > & {
     schema: T
     utils: TUtils // Required utils
-  } & NonSingleResult
+  } & NonSingleResult,
 ): Collection<InferSchemaOutput<T>, TKey, TUtils, T, InferSchemaInput<T>> &
   NonSingleResult
 
@@ -155,7 +155,7 @@ export function createCollection<
 >(
   options: CollectionConfig<InferSchemaOutput<T>, TKey, T, TUtils> & {
     schema: T
-  } & NonSingleResult
+  } & NonSingleResult,
 ): Collection<
   InferSchemaOutput<T>,
   TKey,
@@ -177,7 +177,7 @@ export function createCollection<
   > & {
     schema: T
     utils: TUtils // Required utils
-  } & SingleResult
+  } & SingleResult,
 ): Collection<InferSchemaOutput<T>, TKey, TUtils, T, InferSchemaInput<T>> &
   SingleResult
 
@@ -189,7 +189,7 @@ export function createCollection<
 >(
   options: CollectionConfig<InferSchemaOutput<T>, TKey, T, TUtils> & {
     schema: T
-  } & SingleResult
+  } & SingleResult,
 ): Collection<InferSchemaOutput<T>, TKey, TUtils, T, InferSchemaInput<T>> &
   SingleResult
 
@@ -203,7 +203,7 @@ export function createCollection<
   options: Omit<CollectionConfig<T, TKey, never, TUtils>, `utils`> & {
     schema?: never // prohibit schema if an explicit type is provided
     utils: TUtils // Required utils
-  } & NonSingleResult
+  } & NonSingleResult,
 ): Collection<T, TKey, TUtils, never, T> & NonSingleResult
 
 // Overload for when no schema is provided
@@ -215,7 +215,7 @@ export function createCollection<
 >(
   options: CollectionConfig<T, TKey, never, TUtils> & {
     schema?: never // prohibit schema if an explicit type is provided
-  } & NonSingleResult
+  } & NonSingleResult,
 ): Collection<T, TKey, TUtils, never, T> & NonSingleResult
 
 // Overload for when no schema is provided, singleResult is true, and utils is required
@@ -228,7 +228,7 @@ export function createCollection<
   options: Omit<CollectionConfig<T, TKey, never, TUtils>, `utils`> & {
     schema?: never // prohibit schema if an explicit type is provided
     utils: TUtils // Required utils
-  } & SingleResult
+  } & SingleResult,
 ): Collection<T, TKey, TUtils, never, T> & SingleResult
 
 // Overload for when no schema is provided and singleResult is true
@@ -240,17 +240,17 @@ export function createCollection<
 >(
   options: CollectionConfig<T, TKey, never, TUtils> & {
     schema?: never // prohibit schema if an explicit type is provided
-  } & SingleResult
+  } & SingleResult,
 ): Collection<T, TKey, TUtils, never, T> & SingleResult
 
 // Implementation
 export function createCollection(
   options: CollectionConfig<any, string | number, any, UtilsRecord> & {
     schema?: StandardSchemaV1
-  }
+  },
 ): Collection<any, string | number, UtilsRecord, any, any> {
   const collection = new CollectionImpl<any, string | number, any, any, any>(
-    options
+    options,
   )
 
   // Attach utils to collection
@@ -365,6 +365,7 @@ export class CollectionImpl<
       lifecycle: this._lifecycle,
       changes: this._changes,
       indexes: this._indexes,
+      events: this._events,
     })
     this._sync.setDeps({
       collection: this, // Required for passing to config.sync callback
@@ -500,7 +501,7 @@ export class CollectionImpl<
    * Execute a callback for each entry in the collection
    */
   public forEach(
-    callbackfn: (value: TOutput, key: TKey, index: number) => void
+    callbackfn: (value: TOutput, key: TKey, index: number) => void,
   ): void {
     return this._state.forEach(callbackfn)
   }
@@ -509,7 +510,7 @@ export class CollectionImpl<
    * Create a new array with the results of calling a function for each entry in the collection
    */
   public map<U>(
-    callbackfn: (value: TOutput, key: TKey, index: number) => U
+    callbackfn: (value: TOutput, key: TKey, index: number) => U,
   ): Array<U> {
     return this._state.map(callbackfn)
   }
@@ -553,7 +554,7 @@ export class CollectionImpl<
    */
   public createIndex<TResolver extends IndexResolver<TKey> = typeof BTreeIndex>(
     indexCallback: (row: SingleRowRefProxy<TOutput>) => any,
-    config: IndexOptions<TResolver> = {}
+    config: IndexOptions<TResolver> = {},
   ): IndexProxy<TKey> {
     return this._indexes.createIndex(indexCallback, config)
   }
@@ -571,7 +572,7 @@ export class CollectionImpl<
   public validateData(
     data: unknown,
     type: `insert` | `update`,
-    key?: TKey
+    key?: TKey,
   ): TOutput | never {
     return this._mutations.validateData(data, type, key)
   }
@@ -664,27 +665,27 @@ export class CollectionImpl<
   // Overload 1: Update multiple items with a callback
   update(
     key: Array<TKey | unknown>,
-    callback: (drafts: Array<WritableDeep<TInput>>) => void
+    callback: (drafts: Array<WritableDeep<TInput>>) => void,
   ): TransactionType
 
   // Overload 2: Update multiple items with config and a callback
   update(
     keys: Array<TKey | unknown>,
     config: OperationConfig,
-    callback: (drafts: Array<WritableDeep<TInput>>) => void
+    callback: (drafts: Array<WritableDeep<TInput>>) => void,
   ): TransactionType
 
   // Overload 3: Update a single item with a callback
   update(
     id: TKey | unknown,
-    callback: (draft: WritableDeep<TInput>) => void
+    callback: (draft: WritableDeep<TInput>) => void,
   ): TransactionType
 
   // Overload 4: Update a single item with config and a callback
   update(
     id: TKey | unknown,
     config: OperationConfig,
-    callback: (draft: WritableDeep<TInput>) => void
+    callback: (draft: WritableDeep<TInput>) => void,
   ): TransactionType
 
   update(
@@ -695,7 +696,7 @@ export class CollectionImpl<
       | OperationConfig,
     maybeCallback?:
       | ((draft: WritableDeep<TInput>) => void)
-      | ((drafts: Array<WritableDeep<TInput>>) => void)
+      | ((drafts: Array<WritableDeep<TInput>>) => void),
   ) {
     return this._mutations.update(keys, configOrCallback, maybeCallback)
   }
@@ -732,7 +733,7 @@ export class CollectionImpl<
    */
   delete = (
     keys: Array<TKey> | TKey,
-    config?: OperationConfig
+    config?: OperationConfig,
   ): TransactionType<any> => {
     return this._mutations.delete(keys, config)
   }
@@ -821,7 +822,7 @@ export class CollectionImpl<
    * })
    */
   public currentStateAsChanges(
-    options: CurrentStateAsChangesOptions = {}
+    options: CurrentStateAsChangesOptions = {},
   ): Array<ChangeMessage<TOutput>> | void {
     return currentStateAsChanges(this, options)
   }
@@ -867,7 +868,7 @@ export class CollectionImpl<
    */
   public subscribeChanges(
     callback: (changes: Array<ChangeMessage<TOutput>>) => void,
-    options: SubscribeChangesOptions = {}
+    options: SubscribeChangesOptions = {},
   ): CollectionSubscription {
     return this._changes.subscribeChanges(callback, options)
   }
@@ -877,7 +878,7 @@ export class CollectionImpl<
    */
   public on<T extends keyof AllCollectionEvents>(
     event: T,
-    callback: CollectionEventHandler<T>
+    callback: CollectionEventHandler<T>,
   ) {
     return this._events.on(event, callback)
   }
@@ -887,7 +888,7 @@ export class CollectionImpl<
    */
   public once<T extends keyof AllCollectionEvents>(
     event: T,
-    callback: CollectionEventHandler<T>
+    callback: CollectionEventHandler<T>,
   ) {
     return this._events.once(event, callback)
   }
@@ -897,7 +898,7 @@ export class CollectionImpl<
    */
   public off<T extends keyof AllCollectionEvents>(
     event: T,
-    callback: CollectionEventHandler<T>
+    callback: CollectionEventHandler<T>,
   ) {
     this._events.off(event, callback)
   }
@@ -907,7 +908,7 @@ export class CollectionImpl<
    */
   public waitFor<T extends keyof AllCollectionEvents>(
     event: T,
-    timeout?: number
+    timeout?: number,
   ) {
     return this._events.waitFor(event, timeout)
   }
@@ -923,7 +924,7 @@ export class CollectionImpl<
 }
 
 function buildCompareOptionsFromConfig(
-  config: CollectionConfig<any, any, any>
+  config: CollectionConfig<any, any, any>,
 ): StringCollationConfig {
   if (config.defaultStringCollation) {
     const options = config.defaultStringCollation
diff --git a/packages/db/src/collection/indexes.ts b/packages/db/src/collection/indexes.ts
index 96eba97ce..037bd126c 100644
--- a/packages/db/src/collection/indexes.ts
+++ b/packages/db/src/collection/indexes.ts
@@ -1,16 +1,16 @@
-import { IndexProxy, LazyIndexWrapper } from "../indexes/lazy-index"
+import { IndexProxy, LazyIndexWrapper } from '../indexes/lazy-index'
 import {
   createSingleRowRefProxy,
   toExpression,
-} from "../query/builder/ref-proxy"
-import { BTreeIndex } from "../indexes/btree-index"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
-import type { BaseIndex, IndexResolver } from "../indexes/base-index"
-import type { ChangeMessage } from "../types"
-import type { IndexOptions } from "../indexes/index-options"
-import type { SingleRowRefProxy } from "../query/builder/ref-proxy"
-import type { CollectionLifecycleManager } from "./lifecycle"
-import type { CollectionStateManager } from "./state"
+} from '../query/builder/ref-proxy'
+import { BTreeIndex } from '../indexes/btree-index'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+import type { BaseIndex, IndexResolver } from '../indexes/base-index'
+import type { ChangeMessage } from '../types'
+import type { IndexOptions } from '../indexes/index-options'
+import type { SingleRowRefProxy } from '../query/builder/ref-proxy'
+import type { CollectionLifecycleManager } from './lifecycle'
+import type { CollectionStateManager } from './state'
 
 export class CollectionIndexesManager<
   TOutput extends object = Record<string, unknown>,
@@ -41,7 +41,7 @@ export class CollectionIndexesManager<
    */
   public createIndex<TResolver extends IndexResolver<TKey> = typeof BTreeIndex>(
     indexCallback: (row: SingleRowRefProxy<TOutput>) => any,
-    config: IndexOptions<TResolver> = {}
+    config: IndexOptions<TResolver> = {},
   ): IndexProxy<TKey> {
     this.lifecycle.validateCollectionUsable(`createIndex`)
 
@@ -60,7 +60,7 @@ export class CollectionIndexesManager<
       config.name,
       resolver,
       config.options,
-      this.state.entries()
+      this.state.entries(),
     )
 
     this.lazyIndexes.set(indexId, lazyIndex)
@@ -109,7 +109,7 @@ export class CollectionIndexesManager<
 
         this.resolvedIndexes.set(indexId, resolvedIndex)
         return { indexId, resolvedIndex }
-      }
+      },
     )
 
     await Promise.all(resolutionPromises)
@@ -121,7 +121,7 @@ export class CollectionIndexesManager<
    */
   private async resolveSingleIndex(
     indexId: number,
-    lazyIndex: LazyIndexWrapper<TKey>
+    lazyIndex: LazyIndexWrapper<TKey>,
   ): Promise<BaseIndex<TKey>> {
     const resolvedIndex = await lazyIndex.resolve()
     resolvedIndex.build(this.state.entries())
diff --git a/packages/db/src/collection/lifecycle.ts b/packages/db/src/collection/lifecycle.ts
index 5181ab216..ee5fed5e7 100644
--- a/packages/db/src/collection/lifecycle.ts
+++ b/packages/db/src/collection/lifecycle.ts
@@ -2,19 +2,19 @@ import {
   CollectionInErrorStateError,
   CollectionStateError,
   InvalidCollectionStatusTransitionError,
-} from "../errors"
+} from '../errors'
 import {
   safeCancelIdleCallback,
   safeRequestIdleCallback,
-} from "../utils/browser-polyfills"
-import type { IdleCallbackDeadline } from "../utils/browser-polyfills"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
-import type { CollectionConfig, CollectionStatus } from "../types"
-import type { CollectionEventsManager } from "./events"
-import type { CollectionIndexesManager } from "./indexes"
-import type { CollectionChangesManager } from "./changes"
-import type { CollectionSyncManager } from "./sync"
-import type { CollectionStateManager } from "./state"
+} from '../utils/browser-polyfills'
+import type { IdleCallbackDeadline } from '../utils/browser-polyfills'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+import type { CollectionConfig, CollectionStatus } from '../types'
+import type { CollectionEventsManager } from './events'
+import type { CollectionIndexesManager } from './indexes'
+import type { CollectionChangesManager } from './changes'
+import type { CollectionSyncManager } from './sync'
+import type { CollectionStateManager } from './state'
 
 export class CollectionLifecycleManager<
   TOutput extends object = Record<string, unknown>,
@@ -64,7 +64,7 @@ export class CollectionLifecycleManager<
    */
   public validateStatusTransition(
     from: CollectionStatus,
-    to: CollectionStatus
+    to: CollectionStatus,
   ): void {
     if (from === to) {
       // Allow same state transitions
@@ -78,7 +78,7 @@ export class CollectionLifecycleManager<
       loading: [`ready`, `error`, `cleaned-up`],
       ready: [`cleaned-up`, `error`],
       error: [`cleaned-up`, `idle`],
-      "cleaned-up": [`loading`, `error`],
+      'cleaned-up': [`loading`, `error`],
     }
 
     if (!validTransitions[from].includes(to)) {
@@ -92,14 +92,14 @@ export class CollectionLifecycleManager<
    */
   public setStatus(
     newStatus: CollectionStatus,
-    allowReady: boolean = false
+    allowReady: boolean = false,
   ): void {
     if (newStatus === `ready` && !allowReady) {
       // setStatus('ready') is an internal method that should not be called directly
       // Instead, use markReady to transition to ready triggering the necessary events
       // and side effects.
       throw new CollectionStateError(
-        `You can't directly call "setStatus('ready'). You must use markReady instead.`
+        `You can't directly call "setStatus('ready'). You must use markReady instead.`,
       )
     }
     this.validateStatusTransition(this.status, newStatus)
@@ -112,7 +112,7 @@ export class CollectionLifecycleManager<
       this.indexes.resolveAllIndexes().catch((error) => {
         console.warn(
           `${this.config.id ? `[${this.config.id}] ` : ``}Failed to resolve indexes:`,
-          error
+          error,
         )
       })
     }
@@ -235,7 +235,7 @@ export class CollectionLifecycleManager<
           this.idleCallbackId = null
         }
       },
-      { timeout: 1000 }
+      { timeout: 1000 },
     )
   }
 
diff --git a/packages/db/src/collection/mutations.ts b/packages/db/src/collection/mutations.ts
index fe132df45..48e8b7b20 100644
--- a/packages/db/src/collection/mutations.ts
+++ b/packages/db/src/collection/mutations.ts
@@ -1,8 +1,9 @@
-import { withArrayChangeTracking, withChangeTracking } from "../proxy"
-import { createTransaction, getActiveTransaction } from "../transactions"
+import { withArrayChangeTracking, withChangeTracking } from '../proxy'
+import { createTransaction, getActiveTransaction } from '../transactions'
 import {
   DeleteKeyNotFoundError,
   DuplicateKeyError,
+  InvalidKeyError,
   InvalidSchemaError,
   KeyUpdateNotAllowedError,
   MissingDeleteHandlerError,
@@ -15,9 +16,9 @@ import {
   SchemaValidationError,
   UndefinedKeyError,
   UpdateKeyNotFoundError,
-} from "../errors"
-import type { Collection, CollectionImpl } from "./index.js"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from '../errors'
+import type { Collection, CollectionImpl } from './index.js'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 import type {
   CollectionConfig,
   InsertConfig,
@@ -28,9 +29,9 @@ import type {
   TransactionWithMutations,
   UtilsRecord,
   WritableDeep,
-} from "../types"
-import type { CollectionLifecycleManager } from "./lifecycle"
-import type { CollectionStateManager } from "./state"
+} from '../types'
+import type { CollectionLifecycleManager } from './lifecycle'
+import type { CollectionStateManager } from './state'
 
 export class CollectionMutationsManager<
   TOutput extends object = Record<string, unknown>,
@@ -72,7 +73,7 @@ export class CollectionMutationsManager<
   public validateData(
     data: unknown,
     type: `insert` | `update`,
-    key?: TKey
+    key?: TKey,
   ): TOutput | never {
     if (!this.config.schema) return data as TOutput
 
@@ -113,7 +114,7 @@ export class CollectionMutationsManager<
         const validatedMergedData = result.value as TOutput
         const modifiedKeys = Object.keys(data)
         const extractedChanges = Object.fromEntries(
-          modifiedKeys.map((k) => [k, validatedMergedData[k as keyof TOutput]])
+          modifiedKeys.map((k) => [k, validatedMergedData[k as keyof TOutput]]),
         ) as TOutput
 
         return extractedChanges
@@ -141,8 +142,12 @@ export class CollectionMutationsManager<
   }
 
   public generateGlobalKey(key: any, item: any): string {
-    if (typeof key === `undefined`) {
-      throw new UndefinedKeyError(item)
+    if (typeof key !== `string` && typeof key !== `number`) {
+      // Preserve specific error for undefined keys
+      if (typeof key === `undefined`) {
+        throw new UndefinedKeyError(item)
+      }
+      throw new InvalidKeyError(key, item)
     }
 
     return `KEY::${this.id}/${key}`
@@ -189,7 +194,7 @@ export class CollectionMutationsManager<
           Object.keys(item).map((k) => [
             k,
             validatedData[k as keyof typeof validatedData],
-          ])
+          ]),
         ) as TInput,
         globalKey,
         key,
@@ -255,7 +260,7 @@ export class CollectionMutationsManager<
       | OperationConfig,
     maybeCallback?:
       | ((draft: WritableDeep<TInput>) => void)
-      | ((drafts: Array<WritableDeep<TInput>>) => void)
+      | ((drafts: Array<WritableDeep<TInput>>) => void),
   ) {
     if (typeof keys === `undefined`) {
       throw new MissingUpdateArgumentError()
@@ -298,12 +303,12 @@ export class CollectionMutationsManager<
       // Use the proxy to track changes for all objects
       changesArray = withArrayChangeTracking(
         currentObjects,
-        callback as (draft: Array<TInput>) => void
+        callback as (draft: Array<TInput>) => void,
       )
     } else {
       const result = withChangeTracking(
         currentObjects[0]!,
-        callback as (draft: TInput) => void
+        callback as (draft: TInput) => void,
       )
       changesArray = [result]
     }
@@ -329,14 +334,14 @@ export class CollectionMutationsManager<
         const validatedUpdatePayload = this.validateData(
           itemChanges,
           `update`,
-          key
+          key,
         )
 
         // Construct the full modified item by applying the validated update payload to the original item
         const modifiedItem = Object.assign(
           {},
           originalItem,
-          validatedUpdatePayload
+          validatedUpdatePayload,
         )
 
         // Check if the ID of the item is being changed
@@ -361,7 +366,7 @@ export class CollectionMutationsManager<
             Object.keys(itemChanges).map((k) => [
               k,
               modifiedItem[k as keyof typeof modifiedItem],
-            ])
+            ]),
           ) as TInput,
           globalKey,
           key,
@@ -444,7 +449,7 @@ export class CollectionMutationsManager<
    */
   delete = (
     keys: Array<TKey> | TKey,
-    config?: OperationConfig
+    config?: OperationConfig,
   ): TransactionType<any> => {
     const state = this.state
     this.lifecycle.validateCollectionUsable(`delete`)
diff --git a/packages/db/src/collection/state.ts b/packages/db/src/collection/state.ts
index f7b03da33..b76580c19 100644
--- a/packages/db/src/collection/state.ts
+++ b/packages/db/src/collection/state.ts
@@ -1,16 +1,17 @@
-import { deepEquals } from "../utils"
-import { SortedMap } from "../SortedMap"
-import type { Transaction } from "../transactions"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+import { deepEquals } from '../utils'
+import { SortedMap } from '../SortedMap'
+import type { Transaction } from '../transactions'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 import type {
   ChangeMessage,
   CollectionConfig,
   OptimisticChangeMessage,
-} from "../types"
-import type { CollectionImpl } from "./index.js"
-import type { CollectionLifecycleManager } from "./lifecycle"
-import type { CollectionChangesManager } from "./changes"
-import type { CollectionIndexesManager } from "./indexes"
+} from '../types'
+import type { CollectionImpl } from './index.js'
+import type { CollectionLifecycleManager } from './lifecycle'
+import type { CollectionChangesManager } from './changes'
+import type { CollectionIndexesManager } from './indexes'
+import type { CollectionEventsManager } from './events'
 
 interface PendingSyncedTransaction<
   T extends object = Record<string, unknown>,
@@ -37,13 +38,14 @@ export class CollectionStateManager<
   public lifecycle!: CollectionLifecycleManager<TOutput, TKey, TSchema, TInput>
   public changes!: CollectionChangesManager<TOutput, TKey, TSchema, TInput>
   public indexes!: CollectionIndexesManager<TOutput, TKey, TSchema, TInput>
+  private _events!: CollectionEventsManager
 
   // Core state - make public for testing
   public transactions: SortedMap<string, Transaction<any>>
   public pendingSyncedTransactions: Array<
     PendingSyncedTransaction<TOutput, TKey>
   > = []
-  public syncedData: Map<TKey, TOutput> | SortedMap<TKey, TOutput>
+  public syncedData: SortedMap<TKey, TOutput>
   public syncedMetadata = new Map<TKey, unknown>()
 
   // Optimistic state tracking - make public for testing
@@ -66,15 +68,12 @@ export class CollectionStateManager<
   constructor(config: CollectionConfig<TOutput, TKey, TSchema>) {
     this.config = config
     this.transactions = new SortedMap<string, Transaction<any>>((a, b) =>
-      a.compareCreatedAt(b)
+      a.compareCreatedAt(b),
     )
 
-    // Set up data storage with optional comparison function
-    if (config.compare) {
-      this.syncedData = new SortedMap<TKey, TOutput>(config.compare)
-    } else {
-      this.syncedData = new Map<TKey, TOutput>()
-    }
+    // Set up data storage - always use SortedMap for deterministic iteration.
+    // If a custom compare function is provided, use it; otherwise entries are sorted by key only.
+    this.syncedData = new SortedMap<TKey, TOutput>(config.compare)
   }
 
   setDeps(deps: {
@@ -82,11 +81,13 @@ export class CollectionStateManager<
     lifecycle: CollectionLifecycleManager<TOutput, TKey, TSchema, TInput>
     changes: CollectionChangesManager<TOutput, TKey, TSchema, TInput>
     indexes: CollectionIndexesManager<TOutput, TKey, TSchema, TInput>
+    events: CollectionEventsManager
   }) {
     this.collection = deps.collection
     this.lifecycle = deps.lifecycle
     this.changes = deps.changes
     this.indexes = deps.indexes
+    this._events = deps.events
   }
 
   /**
@@ -185,7 +186,7 @@ export class CollectionStateManager<
    * Execute a callback for each entry in the collection
    */
   public forEach(
-    callbackfn: (value: TOutput, key: TKey, index: number) => void
+    callbackfn: (value: TOutput, key: TKey, index: number) => void,
   ): void {
     let index = 0
     for (const [key, value] of this.entries()) {
@@ -197,7 +198,7 @@ export class CollectionStateManager<
    * Create a new array with the results of calling a function for each entry in the collection
    */
   public map<U>(
-    callbackfn: (value: TOutput, key: TKey, index: number) => U
+    callbackfn: (value: TOutput, key: TKey, index: number) => U,
   ): Array<U> {
     const result: Array<U> = []
     let index = 0
@@ -213,7 +214,7 @@ export class CollectionStateManager<
    * @returns True if the given collection is this collection, false otherwise
    */
   private isThisCollection(
-    collection: CollectionImpl<any, any, any, any, any>
+    collection: CollectionImpl<any, any, any, any, any>,
   ): boolean {
     return collection === this.collection
   }
@@ -222,7 +223,7 @@ export class CollectionStateManager<
    * Recompute optimistic state from active transactions
    */
   public recomputeOptimisticState(
-    triggeredByUserAction: boolean = false
+    triggeredByUserAction: boolean = false,
   ): void {
     // Skip redundant recalculations when we're in the middle of committing sync transactions
     // While the sync pipeline is replaying a large batch we still want to honour
@@ -257,7 +258,7 @@ export class CollectionStateManager<
             case `update`:
               this.optimisticUpserts.set(
                 mutation.key,
-                mutation.modified as TOutput
+                mutation.modified as TOutput,
               )
               this.optimisticDeletes.delete(mutation.key)
               break
@@ -316,8 +317,8 @@ export class CollectionStateManager<
           // We can infer this by checking if we have no remaining optimistic mutations for this key
           const hasActiveOptimisticMutation = activeTransactions.some((tx) =>
             tx.mutations.some(
-              (m) => this.isThisCollection(m.collection) && m.key === event.key
-            )
+              (m) => this.isThisCollection(m.collection) && m.key === event.key,
+            ),
           )
 
           if (!hasActiveOptimisticMutation) {
@@ -348,10 +349,10 @@ export class CollectionStateManager<
   private calculateSize(): number {
     const syncedSize = this.syncedData.size
     const deletesFromSynced = Array.from(this.optimisticDeletes).filter(
-      (key) => this.syncedData.has(key) && !this.optimisticUpserts.has(key)
+      (key) => this.syncedData.has(key) && !this.optimisticUpserts.has(key),
     ).length
     const upsertsNotInSynced = Array.from(this.optimisticUpserts.keys()).filter(
-      (key) => !this.syncedData.has(key)
+      (key) => !this.syncedData.has(key),
     ).length
 
     return syncedSize - deletesFromSynced + upsertsNotInSynced
@@ -363,7 +364,7 @@ export class CollectionStateManager<
   private collectOptimisticChanges(
     previousUpserts: Map<TKey, TOutput>,
     previousDeletes: Set<TKey>,
-    events: Array<ChangeMessage<TOutput, TKey>>
+    events: Array<ChangeMessage<TOutput, TKey>>,
   ): void {
     const allKeys = new Set([
       ...previousUpserts.keys(),
@@ -377,7 +378,7 @@ export class CollectionStateManager<
       const previousValue = this.getPreviousValue(
         key,
         previousUpserts,
-        previousDeletes
+        previousDeletes,
       )
 
       if (previousValue !== undefined && currentValue === undefined) {
@@ -405,7 +406,7 @@ export class CollectionStateManager<
   private getPreviousValue(
     key: TKey,
     previousUpserts: Map<TKey, TOutput>,
-    previousDeletes: Set<TKey>
+    previousDeletes: Set<TKey>,
   ): TOutput | undefined {
     if (previousDeletes.has(key)) {
       return undefined
@@ -456,7 +457,7 @@ export class CollectionStateManager<
           PendingSyncedTransaction<TOutput, TKey>
         >,
         hasTruncateSync: false,
-      }
+      },
     )
 
     if (!hasPersistingTransaction || hasTruncateSync) {
@@ -528,6 +529,12 @@ export class CollectionStateManager<
           for (const key of changedKeys) {
             currentVisibleState.delete(key)
           }
+
+          // 4) Emit truncate event so subscriptions can reset their cursor tracking state
+          this._events.emit(`truncate`, {
+            type: `truncate`,
+            collection: this.collection,
+          })
         }
 
         for (const operation of transaction.operations) {
@@ -545,8 +552,8 @@ export class CollectionStateManager<
                 Object.assign(
                   {},
                   this.syncedMetadata.get(key),
-                  operation.metadata
-                )
+                  operation.metadata,
+                ),
               )
               break
             case `delete`:
@@ -564,7 +571,7 @@ export class CollectionStateManager<
                 const updatedValue = Object.assign(
                   {},
                   this.syncedData.get(key),
-                  operation.value
+                  operation.value,
                 )
                 this.syncedData.set(key, updatedValue)
               } else {
@@ -597,10 +604,10 @@ export class CollectionStateManager<
         // Build re-apply sets from the snapshot taken at the start of this function.
         // This prevents losing optimistic state if transactions complete during truncate processing.
         const reapplyUpserts = new Map<TKey, TOutput>(
-          truncateOptimisticSnapshot!.upserts
+          truncateOptimisticSnapshot!.upserts,
         )
         const reapplyDeletes = new Set<TKey>(
-          truncateOptimisticSnapshot!.deletes
+          truncateOptimisticSnapshot!.deletes,
         )
 
         // Emit inserts for re-applied upserts, skipping any keys that have an optimistic delete.
@@ -679,7 +686,7 @@ export class CollectionStateManager<
                 case `update`:
                   this.optimisticUpserts.set(
                     mutation.key,
-                    mutation.modified as TOutput
+                    mutation.modified as TOutput,
                   )
                   this.optimisticDeletes.delete(mutation.key)
                   break
diff --git a/packages/db/src/collection/subscription.ts b/packages/db/src/collection/subscription.ts
index 9cc3700d1..44c9af49f 100644
--- a/packages/db/src/collection/subscription.ts
+++ b/packages/db/src/collection/subscription.ts
@@ -1,14 +1,15 @@
-import { ensureIndexForExpression } from "../indexes/auto-index.js"
-import { and, eq, gt, gte, lt } from "../query/builder/functions.js"
-import { PropRef, Value } from "../query/ir.js"
-import { EventEmitter } from "../event-emitter.js"
-import { compileExpression } from "../query/compiler/evaluators.js"
+import { ensureIndexForExpression } from '../indexes/auto-index.js'
+import { and, eq, gte, lt } from '../query/builder/functions.js'
+import { PropRef, Value } from '../query/ir.js'
+import { EventEmitter } from '../event-emitter.js'
+import { compileExpression } from '../query/compiler/evaluators.js'
+import { buildCursor } from '../utils/cursor.js'
 import {
   createFilterFunctionFromExpression,
   createFilteredCallback,
-} from "./change-events.js"
-import type { BasicExpression, OrderBy } from "../query/ir.js"
-import type { IndexInterface } from "../indexes/base-index.js"
+} from './change-events.js'
+import type { BasicExpression, OrderBy } from '../query/ir.js'
+import type { IndexInterface } from '../indexes/base-index.js'
 import type {
   ChangeMessage,
   LoadSubsetOptions,
@@ -16,19 +17,26 @@ import type {
   SubscriptionEvents,
   SubscriptionStatus,
   SubscriptionUnsubscribedEvent,
-} from "../types.js"
-import type { CollectionImpl } from "./index.js"
+} from '../types.js'
+import type { CollectionImpl } from './index.js'
 
 type RequestSnapshotOptions = {
   where?: BasicExpression<boolean>
   optimizedOnly?: boolean
   trackLoadSubsetPromise?: boolean
+  /** Optional orderBy to pass to loadSubset for backend optimization */
+  orderBy?: OrderBy
+  /** Optional limit to pass to loadSubset for backend optimization */
+  limit?: number
 }
 
 type RequestLimitedSnapshotOptions = {
   orderBy: OrderBy
   limit: number
-  minValue?: any
+  /** All column values for cursor (first value used for local index, all values for sync layer) */
+  minValues?: Array<unknown>
+  /** Row offset for offset-based pagination (passed to sync layer) */
+  offset?: number
 }
 
 type CollectionSubscriptionOptions = {
@@ -45,6 +53,11 @@ export class CollectionSubscription
 {
   private loadedInitialState = false
 
+  // Flag to skip filtering in filterAndFlipChanges.
+  // This is separate from loadedInitialState because we want to allow
+  // requestSnapshot to still work even when filtering is skipped.
+  private skipFiltering = false
+
   // Flag to indicate that we have sent at least 1 snapshot.
   // While `snapshotSent` is false we filter out all changes from subscription to the collection.
   private snapshotSent = false
@@ -58,6 +71,12 @@ export class CollectionSubscription
   // Keep track of the keys we've sent (needed for join and orderBy optimizations)
   private sentKeys = new Set<string | number>()
 
+  // Track the count of rows sent via requestLimitedSnapshot for offset-based pagination
+  private limitedSnapshotRowCount = 0
+
+  // Track the last key sent via requestLimitedSnapshot for cursor-based pagination
+  private lastSentKey: string | number | undefined
+
   private filteredCallback: (changes: Array<ChangeMessage<any, any>>) => void
 
   private orderByIndex: IndexInterface<string | number> | undefined
@@ -66,6 +85,16 @@ export class CollectionSubscription
   private _status: SubscriptionStatus = `ready`
   private pendingLoadSubsetPromises: Set<Promise<void>> = new Set()
 
+  // Cleanup function for truncate event listener
+  private truncateCleanup: (() => void) | undefined
+
+  // Truncate buffering state
+  // When a truncate occurs, we buffer changes until all loadSubset refetches complete
+  // This prevents a flash of missing content between deletes and new inserts
+  private isBufferingForTruncate = false
+  private truncateBuffer: Array<Array<ChangeMessage<any, any>>> = []
+  private pendingTruncateRefetches: Set<Promise<void>> = new Set()
+
   public get status(): SubscriptionStatus {
     return this._status
   }
@@ -73,7 +102,7 @@ export class CollectionSubscription
   constructor(
     private collection: CollectionImpl<any, any, any, any, any>,
     private callback: (changes: Array<ChangeMessage<any, any>>) => void,
-    private options: CollectionSubscriptionOptions
+    private options: CollectionSubscriptionOptions,
   ) {
     super()
     if (options.onUnsubscribe) {
@@ -86,7 +115,7 @@ export class CollectionSubscription
     }
 
     const callbackWithSentKeysTracking = (
-      changes: Array<ChangeMessage<any, any>>
+      changes: Array<ChangeMessage<any, any>>,
     ) => {
       callback(changes)
       this.trackSentKeys(changes)
@@ -98,6 +127,123 @@ export class CollectionSubscription
     this.filteredCallback = options.whereExpression
       ? createFilteredCallback(this.callback, options)
       : this.callback
+
+    // Listen for truncate events to re-request data after must-refetch
+    // When a truncate happens (e.g., from a 409 must-refetch), all collection data is cleared.
+    // We need to re-request all previously loaded subsets to repopulate the data.
+    this.truncateCleanup = this.collection.on(`truncate`, () => {
+      this.handleTruncate()
+    })
+  }
+
+  /**
+   * Handle collection truncate event by resetting state and re-requesting subsets.
+   * This is called when the sync layer receives a must-refetch and clears all data.
+   *
+   * To prevent a flash of missing content, we buffer all changes (deletes from truncate
+   * and inserts from refetch) until all loadSubset promises resolve, then emit them together.
+   */
+  private handleTruncate() {
+    // Copy the loaded subsets before clearing (we'll re-request them)
+    const subsetsToReload = [...this.loadedSubsets]
+
+    // Only buffer if there's an actual loadSubset handler that can do async work.
+    // Without a loadSubset handler, there's nothing to re-request and no reason to buffer.
+    // This prevents unnecessary buffering in eager sync mode or when loadSubset isn't implemented.
+    const hasLoadSubsetHandler = this.collection._sync.syncLoadSubsetFn !== null
+
+    // If there are no subsets to reload OR no loadSubset handler, just reset state
+    if (subsetsToReload.length === 0 || !hasLoadSubsetHandler) {
+      this.snapshotSent = false
+      this.loadedInitialState = false
+      this.limitedSnapshotRowCount = 0
+      this.lastSentKey = undefined
+      this.loadedSubsets = []
+      return
+    }
+
+    // Start buffering BEFORE we receive the delete events from the truncate commit
+    // This ensures we capture both the deletes and subsequent inserts
+    this.isBufferingForTruncate = true
+    this.truncateBuffer = []
+    this.pendingTruncateRefetches.clear()
+
+    // Reset snapshot/pagination tracking state
+    // Note: We don't need to populate sentKeys here because filterAndFlipChanges
+    // will skip the delete filter when isBufferingForTruncate is true
+    this.snapshotSent = false
+    this.loadedInitialState = false
+    this.limitedSnapshotRowCount = 0
+    this.lastSentKey = undefined
+
+    // Clear the loadedSubsets array since we're re-requesting fresh
+    this.loadedSubsets = []
+
+    // Defer the loadSubset calls to a microtask so the truncate commit's delete events
+    // are buffered BEFORE the loadSubset calls potentially trigger nested commits.
+    // This ensures correct event ordering: deletes first, then inserts.
+    queueMicrotask(() => {
+      // Check if we were unsubscribed while waiting
+      if (!this.isBufferingForTruncate) {
+        return
+      }
+
+      // Re-request all previously loaded subsets and track their promises
+      for (const options of subsetsToReload) {
+        const syncResult = this.collection._sync.loadSubset(options)
+
+        // Track this loadSubset call so we can unload it later
+        this.loadedSubsets.push(options)
+        this.trackLoadSubsetPromise(syncResult)
+
+        // Track the promise for buffer flushing
+        if (syncResult instanceof Promise) {
+          this.pendingTruncateRefetches.add(syncResult)
+          syncResult
+            .catch(() => {
+              // Ignore errors - we still want to flush the buffer even if some requests fail
+            })
+            .finally(() => {
+              this.pendingTruncateRefetches.delete(syncResult)
+              this.checkTruncateRefetchComplete()
+            })
+        }
+      }
+
+      // If all loadSubset calls were synchronous (returned true), flush now
+      // At this point, delete events have already been buffered from the truncate commit
+      if (this.pendingTruncateRefetches.size === 0) {
+        this.flushTruncateBuffer()
+      }
+    })
+  }
+
+  /**
+   * Check if all truncate refetch promises have completed and flush buffer if so
+   */
+  private checkTruncateRefetchComplete() {
+    if (
+      this.pendingTruncateRefetches.size === 0 &&
+      this.isBufferingForTruncate
+    ) {
+      this.flushTruncateBuffer()
+    }
+  }
+
+  /**
+   * Flush the truncate buffer, emitting all buffered changes to the callback
+   */
+  private flushTruncateBuffer() {
+    this.isBufferingForTruncate = false
+
+    // Flatten all buffered changes into a single array for atomic emission
+    // This ensures consumers see all truncate changes (deletes + inserts) in one callback
+    const merged = this.truncateBuffer.flat()
+    if (merged.length > 0) {
+      this.filteredCallback(merged)
+    }
+
+    this.truncateBuffer = []
   }
 
   setOrderByIndex(index: IndexInterface<any>) {
@@ -161,7 +307,16 @@ export class CollectionSubscription
 
   emitEvents(changes: Array<ChangeMessage<any, any>>) {
     const newChanges = this.filterAndFlipChanges(changes)
-    this.filteredCallback(newChanges)
+
+    if (this.isBufferingForTruncate) {
+      // Buffer the changes instead of emitting immediately
+      // This prevents a flash of missing content during truncate/refetch
+      if (newChanges.length > 0) {
+        this.truncateBuffer.push(newChanges)
+      }
+    } else {
+      this.filteredCallback(newChanges)
+    }
   }
 
   /**
@@ -204,6 +359,9 @@ export class CollectionSubscription
     const loadOptions: LoadSubsetOptions = {
       where: stateOpts.where,
       subscription: this,
+      // Include orderBy and limit if provided so sync layer can optimize the query
+      orderBy: opts?.orderBy,
+      limit: opts?.limit,
     }
     const syncResult = this.collection._sync.loadSubset(loadOptions)
 
@@ -225,35 +383,53 @@ export class CollectionSubscription
 
     // Only send changes that have not been sent yet
     const filteredSnapshot = snapshot.filter(
-      (change) => !this.sentKeys.has(change.key)
+      (change) => !this.sentKeys.has(change.key),
     )
 
+    // Add keys to sentKeys BEFORE calling callback to prevent race condition.
+    // If a change event arrives while the callback is executing, it will see
+    // the keys already in sentKeys and filter out duplicates correctly.
+    for (const change of filteredSnapshot) {
+      this.sentKeys.add(change.key)
+    }
+
     this.snapshotSent = true
     this.callback(filteredSnapshot)
     return true
   }
 
   /**
-   * Sends a snapshot that fulfills the `where` clause and all rows are bigger or equal to `minValue`.
+   * Sends a snapshot that fulfills the `where` clause and all rows are bigger or equal to the cursor.
    * Requires a range index to be set with `setOrderByIndex` prior to calling this method.
    * It uses that range index to load the items in the order of the index.
-   * Note 1: it may load more rows than the provided LIMIT because it loads all values equal to `minValue` + limit values greater than `minValue`.
+   *
+   * For multi-column orderBy:
+   * - Uses first value from `minValues` for LOCAL index operations (wide bounds, ensures no missed rows)
+   * - Uses all `minValues` to build a precise composite cursor for SYNC layer loadSubset
+   *
+   * Note 1: it may load more rows than the provided LIMIT because it loads all values equal to the first cursor value + limit values greater.
    *         This is needed to ensure that it does not accidentally skip duplicate values when the limit falls in the middle of some duplicated values.
    * Note 2: it does not send keys that have already been sent before.
    */
   requestLimitedSnapshot({
     orderBy,
     limit,
-    minValue,
+    minValues,
+    offset,
   }: RequestLimitedSnapshotOptions) {
     if (!limit) throw new Error(`limit is required`)
 
     if (!this.orderByIndex) {
       throw new Error(
-        `Ordered snapshot was requested but no index was found. You have to call setOrderByIndex before requesting an ordered snapshot.`
+        `Ordered snapshot was requested but no index was found. You have to call setOrderByIndex before requesting an ordered snapshot.`,
       )
     }
 
+    // Derive first column value from minValues (used for local index operations)
+    const minValue = minValues?.[0]
+    // Cast for index operations (index expects string | number)
+    const minValueForIndex = minValue as string | number | undefined
+
     const index = this.orderByIndex
     const where = this.options.whereExpression
     const whereFilterFn = where
@@ -273,7 +449,7 @@ export class CollectionSubscription
       return whereFilterFn?.(value) ?? true
     }
 
-    let biggestObservedValue = minValue
+    let biggestObservedValue = minValueForIndex
     const changes: Array<ChangeMessage<any, string | number>> = []
 
     // If we have a minValue we need to handle the case
@@ -282,12 +458,16 @@ export class CollectionSubscription
     // so if minValue is 3 then the previous snapshot may not have included all 3s
     // e.g. if it was offset 0 and limit 3 it would only have loaded the first 3
     //      so we load all rows equal to minValue first, to be sure we don't skip any duplicate values
+    //
+    // For multi-column orderBy, we use the first column value for index operations (wide bounds)
+    // This may load some duplicates but ensures we never miss any rows.
     let keys: Array<string | number> = []
-    if (minValue !== undefined) {
-      // First, get all items with the same value as minValue
+    if (minValueForIndex !== undefined) {
+      // First, get all items with the same FIRST COLUMN value as minValue
+      // This provides wide bounds for the local index
       const { expression } = orderBy[0]!
       const allRowsWithMinValue = this.collection.currentStateAsChanges({
-        where: eq(expression, new Value(minValue)),
+        where: eq(expression, new Value(minValueForIndex)),
       })
 
       if (allRowsWithMinValue) {
@@ -301,15 +481,15 @@ export class CollectionSubscription
         // Then get items greater than minValue
         const keysGreaterThanMin = index.take(
           limit - keys.length,
-          minValue,
-          filterFn
+          minValueForIndex,
+          filterFn,
         )
         keys.push(...keysGreaterThanMin)
       } else {
-        keys = index.take(limit, minValue, filterFn)
+        keys = index.take(limit, minValueForIndex, filterFn)
       }
     } else {
-      keys = index.take(limit, minValue, filterFn)
+      keys = index.take(limit, minValueForIndex, filterFn)
     }
 
     const valuesNeeded = () => Math.max(limit - changes.length, 0)
@@ -341,76 +521,82 @@ export class CollectionSubscription
       keys = index.take(valuesNeeded(), biggestObservedValue, filterFn)
     }
 
+    // Track row count for offset-based pagination (before sending to callback)
+    // Use the current count as the offset for this load
+    const currentOffset = this.limitedSnapshotRowCount
+
+    // Add keys to sentKeys BEFORE calling callback to prevent race condition.
+    // If a change event arrives while the callback is executing, it will see
+    // the keys already in sentKeys and filter out duplicates correctly.
+    for (const change of changes) {
+      this.sentKeys.add(change.key)
+    }
+
     this.callback(changes)
 
-    let whereWithValueFilter = where
-    if (typeof minValue !== `undefined`) {
-      // Only request data that we haven't seen yet (i.e. is bigger than the minValue)
-      const { expression, compareOptions } = orderBy[0]!
-      const operator = compareOptions.direction === `asc` ? gt : lt
-      const valueFilter = operator(expression, new Value(minValue))
-      whereWithValueFilter = where ? and(where, valueFilter) : valueFilter
+    // Update the row count and last key after sending (for next call's offset/cursor)
+    this.limitedSnapshotRowCount += changes.length
+    if (changes.length > 0) {
+      this.lastSentKey = changes[changes.length - 1]!.key
+    }
+
+    // Build cursor expressions for sync layer loadSubset
+    // The cursor expressions are separate from the main where clause
+    // so the sync layer can choose cursor-based or offset-based pagination
+    let cursorExpressions:
+      | {
+          whereFrom: BasicExpression<boolean>
+          whereCurrent: BasicExpression<boolean>
+          lastKey?: string | number
+        }
+      | undefined
+
+    if (minValues !== undefined && minValues.length > 0) {
+      const whereFromCursor = buildCursor(orderBy, minValues)
+
+      if (whereFromCursor) {
+        const { expression } = orderBy[0]!
+        const minValue = minValues[0]
+
+        // Build the whereCurrent expression for the first orderBy column
+        // For Date values, we need to handle precision differences between JS (ms) and backends (μs)
+        // A JS Date represents a 1ms range, so we query for all values within that range
+        let whereCurrentCursor: BasicExpression<boolean>
+        if (minValue instanceof Date) {
+          const minValuePlus1ms = new Date(minValue.getTime() + 1)
+          whereCurrentCursor = and(
+            gte(expression, new Value(minValue)),
+            lt(expression, new Value(minValuePlus1ms)),
+          )
+        } else {
+          whereCurrentCursor = eq(expression, new Value(minValue))
+        }
+
+        cursorExpressions = {
+          whereFrom: whereFromCursor,
+          whereCurrent: whereCurrentCursor,
+          lastKey: this.lastSentKey,
+        }
+      }
     }
 
     // Request the sync layer to load more data
     // don't await it, we will load the data into the collection when it comes in
-    const loadOptions1: LoadSubsetOptions = {
-      where: whereWithValueFilter,
+    // Note: `where` does NOT include cursor expressions - they are passed separately
+    // The sync layer can choose to use cursor-based or offset-based pagination
+    const loadOptions: LoadSubsetOptions = {
+      where, // Main filter only, no cursor
       limit,
       orderBy,
+      cursor: cursorExpressions, // Cursor expressions passed separately
+      offset: offset ?? currentOffset, // Use provided offset, or auto-tracked offset
       subscription: this,
     }
-    const syncResult = this.collection._sync.loadSubset(loadOptions1)
+    const syncResult = this.collection._sync.loadSubset(loadOptions)
 
     // Track this loadSubset call
-    this.loadedSubsets.push(loadOptions1)
-
-    // Make parallel loadSubset calls for values equal to minValue and values greater than minValue
-    const promises: Array<Promise<void>> = []
-
-    // First promise: load all values equal to minValue
-    if (typeof minValue !== `undefined`) {
-      const { expression } = orderBy[0]!
-
-      // For Date values, we need to handle precision differences between JS (ms) and backends (μs)
-      // A JS Date represents a 1ms range, so we query for all values within that range
-      let exactValueFilter
-      if (minValue instanceof Date) {
-        const minValuePlus1ms = new Date(minValue.getTime() + 1)
-        exactValueFilter = and(
-          gte(expression, new Value(minValue)),
-          lt(expression, new Value(minValuePlus1ms))
-        )
-      } else {
-        exactValueFilter = eq(expression, new Value(minValue))
-      }
-
-      const loadOptions2: LoadSubsetOptions = {
-        where: exactValueFilter,
-        subscription: this,
-      }
-      const equalValueResult = this.collection._sync.loadSubset(loadOptions2)
-
-      // Track this loadSubset call
-      this.loadedSubsets.push(loadOptions2)
-
-      if (equalValueResult instanceof Promise) {
-        promises.push(equalValueResult)
-      }
-    }
-
-    // Second promise: load values greater than minValue
-    if (syncResult instanceof Promise) {
-      promises.push(syncResult)
-    }
-
-    // Track the combined promise
-    if (promises.length > 0) {
-      const combinedPromise = Promise.all(promises).then(() => {})
-      this.trackLoadSubsetPromise(combinedPromise)
-    } else {
-      this.trackLoadSubsetPromise(syncResult)
-    }
+    this.loadedSubsets.push(loadOptions)
+    this.trackLoadSubsetPromise(syncResult)
   }
 
   // TODO: also add similar test but that checks that it can also load it from the collection's loadSubset function
@@ -420,25 +606,52 @@ export class CollectionSubscription
    * Filters and flips changes for keys that have not been sent yet.
    * Deletes are filtered out for keys that have not been sent yet.
    * Updates are flipped into inserts for keys that have not been sent yet.
+   * Duplicate inserts are filtered out to prevent D2 multiplicity > 1.
    */
   private filterAndFlipChanges(changes: Array<ChangeMessage<any, any>>) {
-    if (this.loadedInitialState) {
-      // We loaded the entire initial state
+    if (this.loadedInitialState || this.skipFiltering) {
+      // We loaded the entire initial state or filtering is explicitly skipped
       // so no need to filter or flip changes
       return changes
     }
 
+    // When buffering for truncate, we need all changes (including deletes) to pass through.
+    // This is important because:
+    // 1. If loadedInitialState was previously true, sentKeys will be empty
+    //    (trackSentKeys early-returns when loadedInitialState is true)
+    // 2. The truncate deletes are for keys that WERE sent to the subscriber
+    // 3. We're collecting all changes atomically, so filtering doesn't make sense
+    const skipDeleteFilter = this.isBufferingForTruncate
+
     const newChanges = []
     for (const change of changes) {
       let newChange = change
-      if (!this.sentKeys.has(change.key)) {
+      const keyInSentKeys = this.sentKeys.has(change.key)
+
+      if (!keyInSentKeys) {
         if (change.type === `update`) {
           newChange = { ...change, type: `insert`, previousValue: undefined }
         } else if (change.type === `delete`) {
-          // filter out deletes for keys that have not been sent
-          continue
+          // Filter out deletes for keys that have not been sent,
+          // UNLESS we're buffering for truncate (where all deletes should pass through)
+          if (!skipDeleteFilter) {
+            continue
+          }
         }
         this.sentKeys.add(change.key)
+      } else {
+        // Key was already sent - handle based on change type
+        if (change.type === `insert`) {
+          // Filter out duplicate inserts - the key was already inserted.
+          // This prevents D2 multiplicity from going above 1, which would
+          // cause deletes to not properly remove items (multiplicity would
+          // go from 2 to 1 instead of 1 to 0).
+          continue
+        } else if (change.type === `delete`) {
+          // Remove from sentKeys so future inserts for this key are allowed
+          // (e.g., after truncate + reinsert)
+          this.sentKeys.delete(change.key)
+        }
       }
       newChanges.push(newChange)
     }
@@ -446,18 +659,42 @@ export class CollectionSubscription
   }
 
   private trackSentKeys(changes: Array<ChangeMessage<any, string | number>>) {
-    if (this.loadedInitialState) {
-      // No need to track sent keys if we loaded the entire state.
-      // Since we sent everything, all keys must have been observed.
+    if (this.loadedInitialState || this.skipFiltering) {
+      // No need to track sent keys if we loaded the entire state or filtering is skipped.
+      // Since filtering won't be applied, all keys are effectively "observed".
       return
     }
 
     for (const change of changes) {
-      this.sentKeys.add(change.key)
+      if (change.type === `delete`) {
+        // Remove deleted keys from sentKeys so future re-inserts are allowed
+        this.sentKeys.delete(change.key)
+      } else {
+        // For inserts and updates, track the key as sent
+        this.sentKeys.add(change.key)
+      }
     }
   }
 
+  /**
+   * Mark that the subscription should not filter any changes.
+   * This is used when includeInitialState is explicitly set to false,
+   * meaning the caller doesn't want initial state but does want ALL future changes.
+   */
+  markAllStateAsSeen() {
+    this.skipFiltering = true
+  }
+
   unsubscribe() {
+    // Clean up truncate event listener
+    this.truncateCleanup?.()
+    this.truncateCleanup = undefined
+
+    // Clean up truncate buffer state
+    this.isBufferingForTruncate = false
+    this.truncateBuffer = []
+    this.pendingTruncateRefetches.clear()
+
     // Unload all subsets that this subscription loaded
     // We pass the exact same LoadSubsetOptions we used for loadSubset
     for (const options of this.loadedSubsets) {
diff --git a/packages/db/src/collection/sync.ts b/packages/db/src/collection/sync.ts
index d0d963e85..841e76c1f 100644
--- a/packages/db/src/collection/sync.ts
+++ b/packages/db/src/collection/sync.ts
@@ -7,22 +7,23 @@ import {
   SyncCleanupError,
   SyncTransactionAlreadyCommittedError,
   SyncTransactionAlreadyCommittedWriteError,
-} from "../errors"
-import { deepEquals } from "../utils"
-import { LIVE_QUERY_INTERNAL } from "../query/live/internal.js"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from '../errors'
+import { deepEquals } from '../utils'
+import { LIVE_QUERY_INTERNAL } from '../query/live/internal.js'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 import type {
-  ChangeMessage,
+  ChangeMessageOrDeleteKeyMessage,
   CleanupFn,
   CollectionConfig,
   LoadSubsetOptions,
+  OptimisticChangeMessage,
   SyncConfigRes,
-} from "../types"
-import type { CollectionImpl } from "./index.js"
-import type { CollectionStateManager } from "./state"
-import type { CollectionLifecycleManager } from "./lifecycle"
-import type { CollectionEventsManager } from "./events.js"
-import type { LiveQueryCollectionUtils } from "../query/live/collection-config-builder.js"
+} from '../types'
+import type { CollectionImpl } from './index.js'
+import type { CollectionStateManager } from './state'
+import type { CollectionLifecycleManager } from './lifecycle'
+import type { CollectionEventsManager } from './events.js'
+import type { LiveQueryCollectionUtils } from '../query/live/collection-config-builder.js'
 
 export class CollectionSyncManager<
   TOutput extends object = Record<string, unknown>,
@@ -94,7 +95,12 @@ export class CollectionSyncManager<
               deletedKeys: new Set(),
             })
           },
-          write: (messageWithoutKey: Omit<ChangeMessage<TOutput>, `key`>) => {
+          write: (
+            messageWithOptionalKey: ChangeMessageOrDeleteKeyMessage<
+              TOutput,
+              TKey
+            >,
+          ) => {
             const pendingTransaction =
               this.state.pendingSyncedTransactions[
                 this.state.pendingSyncedTransactions.length - 1
@@ -105,12 +111,18 @@ export class CollectionSyncManager<
             if (pendingTransaction.committed) {
               throw new SyncTransactionAlreadyCommittedWriteError()
             }
-            const key = this.config.getKey(messageWithoutKey.value)
 
-            let messageType = messageWithoutKey.type
+            let key: TKey | undefined = undefined
+            if (`key` in messageWithOptionalKey) {
+              key = messageWithOptionalKey.key
+            } else {
+              key = this.config.getKey(messageWithOptionalKey.value)
+            }
+
+            let messageType = messageWithOptionalKey.type
 
             // Check if an item with this key already exists when inserting
-            if (messageWithoutKey.type === `insert`) {
+            if (messageWithOptionalKey.type === `insert`) {
               const insertingIntoExistingSynced = this.state.syncedData.has(key)
               const hasPendingDeleteForKey =
                 pendingTransaction.deletedKeys.has(key)
@@ -124,7 +136,7 @@ export class CollectionSyncManager<
                 const existingValue = this.state.syncedData.get(key)
                 if (
                   existingValue !== undefined &&
-                  deepEquals(existingValue, messageWithoutKey.value)
+                  deepEquals(existingValue, messageWithOptionalKey.value)
                 ) {
                   // The "insert" is an echo of a value we already have locally.
                   // Treat it as an update so we preserve optimistic intent without
@@ -142,11 +154,11 @@ export class CollectionSyncManager<
               }
             }
 
-            const message: ChangeMessage<TOutput> = {
-              ...messageWithoutKey,
+            const message = {
+              ...messageWithOptionalKey,
               type: messageType,
               key,
-            }
+            } as OptimisticChangeMessage<TOutput, TKey>
             pendingTransaction.operations.push(message)
 
             if (messageType === `delete`) {
@@ -202,7 +214,7 @@ export class CollectionSyncManager<
               deletes: new Set(this.state.optimisticDeletes),
             }
           },
-        })
+        }),
       )
 
       // Store cleanup function if provided
@@ -218,7 +230,7 @@ export class CollectionSyncManager<
       if (this.syncMode === `on-demand` && !this.syncLoadSubsetFn) {
         throw new CollectionConfigurationError(
           `Collection "${this.id}" is configured with syncMode "on-demand" but the sync function did not return a loadSubset handler. ` +
-            `Either provide a loadSubset handler or use syncMode "eager".`
+            `Either provide a loadSubset handler or use syncMode "eager".`,
         )
       }
     } catch (error) {
@@ -242,7 +254,7 @@ export class CollectionSyncManager<
         `${this.id ? `[${this.id}] ` : ``}Calling .preload() on a collection with syncMode "on-demand" is a no-op. ` +
           `In on-demand mode, data is only loaded when queries request it. ` +
           `Instead, create a live query and call .preload() on that to load the specific data you need. ` +
-          `See https://tanstack.com/blog/tanstack-db-0.5-query-driven-sync for more details.`
+          `See https://tanstack.com/blog/tanstack-db-0.5-query-driven-sync for more details.`,
       )
     }
 
diff --git a/packages/db/src/duplicate-instance-check.ts b/packages/db/src/duplicate-instance-check.ts
index 6dd17a360..2f38a562f 100644
--- a/packages/db/src/duplicate-instance-check.ts
+++ b/packages/db/src/duplicate-instance-check.ts
@@ -1,4 +1,4 @@
-import { DuplicateDbInstanceError } from "./errors"
+import { DuplicateDbInstanceError } from './errors'
 
 /**
  * Check if we're in a browser top-level window (not a worker, SSR, or iframe).
diff --git a/packages/db/src/errors.ts b/packages/db/src/errors.ts
index 8abc79fe5..50cd442ac 100644
--- a/packages/db/src/errors.ts
+++ b/packages/db/src/errors.ts
@@ -28,7 +28,7 @@ export class SchemaValidationError extends TanStackDBError {
       message: string
       path?: ReadonlyArray<string | number | symbol>
     }>,
-    message?: string
+    message?: string,
   ) {
     const defaultMessage = `${type === `insert` ? `Insert` : `Update`} validation failed: ${issues
       .map((issue) => `\n- ${issue.message} - path: ${issue.path}`)
@@ -61,7 +61,7 @@ export class DuplicateDbInstanceError extends TanStackDBError {
         `3. Clear node_modules and lockfile, then reinstall\n\n` +
         `To temporarily disable this check (not recommended):\n` +
         `Set environment variable: TANSTACK_DB_DISABLE_DUP_CHECK=1\n\n` +
-        `See: https://tanstack.com/db/latest/docs/troubleshooting#duplicate-instances`
+        `See: https://tanstack.com/db/latest/docs/troubleshooting#duplicate-instances`,
     )
     this.name = `DuplicateDbInstanceError`
   }
@@ -110,7 +110,7 @@ export class CollectionStateError extends TanStackDBError {
 export class CollectionInErrorStateError extends CollectionStateError {
   constructor(operation: string, collectionId: string) {
     super(
-      `Cannot perform ${operation} on collection "${collectionId}" - collection is in error state. Try calling cleanup() and restarting the collection.`
+      `Cannot perform ${operation} on collection "${collectionId}" - collection is in error state. Try calling cleanup() and restarting the collection.`,
     )
   }
 }
@@ -118,7 +118,7 @@ export class CollectionInErrorStateError extends CollectionStateError {
 export class InvalidCollectionStatusTransitionError extends CollectionStateError {
   constructor(from: string, to: string, collectionId: string) {
     super(
-      `Invalid collection status transition from "${from}" to "${to}" for collection "${collectionId}"`
+      `Invalid collection status transition from "${from}" to "${to}" for collection "${collectionId}"`,
     )
   }
 }
@@ -146,7 +146,16 @@ export class CollectionOperationError extends TanStackDBError {
 export class UndefinedKeyError extends CollectionOperationError {
   constructor(item: any) {
     super(
-      `An object was created without a defined key: ${JSON.stringify(item)}`
+      `An object was created without a defined key: ${JSON.stringify(item)}`,
+    )
+  }
+}
+
+export class InvalidKeyError extends CollectionOperationError {
+  constructor(key: unknown, item: unknown) {
+    const keyType = key === null ? `null` : typeof key
+    super(
+      `getKey returned an invalid key type. Expected string or number, but got ${keyType}: ${JSON.stringify(key)}. Item: ${JSON.stringify(item)}`,
     )
   }
 }
@@ -154,7 +163,7 @@ export class UndefinedKeyError extends CollectionOperationError {
 export class DuplicateKeyError extends CollectionOperationError {
   constructor(key: string | number) {
     super(
-      `Cannot insert document with ID "${key}" because it already exists in the collection`
+      `Cannot insert document with ID "${key}" because it already exists in the collection`,
     )
   }
 }
@@ -163,7 +172,7 @@ export class DuplicateKeySyncError extends CollectionOperationError {
   constructor(
     key: string | number,
     collectionId: string,
-    options?: { hasCustomGetKey?: boolean; hasJoins?: boolean }
+    options?: { hasCustomGetKey?: boolean; hasJoins?: boolean },
   ) {
     const baseMessage = `Cannot insert document with key "${key}" from sync because it already exists in the collection "${collectionId}"`
 
@@ -175,7 +184,7 @@ export class DuplicateKeySyncError extends CollectionOperationError {
           `Joined queries can produce multiple rows with the same key when relationships are not 1:1. ` +
           `Consider: (1) using a composite key in your getKey function (e.g., \`\${item.key1}-\${item.key2}\`), ` +
           `(2) ensuring your join produces unique rows per key, or (3) removing the custom getKey ` +
-          `to use the default composite key behavior.`
+          `to use the default composite key behavior.`,
       )
     } else {
       super(baseMessage)
@@ -198,7 +207,7 @@ export class NoKeysPassedToUpdateError extends CollectionOperationError {
 export class UpdateKeyNotFoundError extends CollectionOperationError {
   constructor(key: string | number) {
     super(
-      `The key "${key}" was passed to update but an object for this key was not found in the collection`
+      `The key "${key}" was passed to update but an object for this key was not found in the collection`,
     )
   }
 }
@@ -206,7 +215,7 @@ export class UpdateKeyNotFoundError extends CollectionOperationError {
 export class KeyUpdateNotAllowedError extends CollectionOperationError {
   constructor(originalKey: string | number, newKey: string | number) {
     super(
-      `Updating the key of an item is not allowed. Original key: "${originalKey}", Attempted new key: "${newKey}". Please delete the old item and create a new one if a key change is necessary.`
+      `Updating the key of an item is not allowed. Original key: "${originalKey}", Attempted new key: "${newKey}". Please delete the old item and create a new one if a key change is necessary.`,
     )
   }
 }
@@ -220,7 +229,7 @@ export class NoKeysPassedToDeleteError extends CollectionOperationError {
 export class DeleteKeyNotFoundError extends CollectionOperationError {
   constructor(key: string | number) {
     super(
-      `Collection.delete was called with key '${key}' but there is no item in the collection with this key`
+      `Collection.delete was called with key '${key}' but there is no item in the collection with this key`,
     )
   }
 }
@@ -236,7 +245,7 @@ export class MissingHandlerError extends TanStackDBError {
 export class MissingInsertHandlerError extends MissingHandlerError {
   constructor() {
     super(
-      `Collection.insert called directly (not within an explicit transaction) but no 'onInsert' handler is configured.`
+      `Collection.insert called directly (not within an explicit transaction) but no 'onInsert' handler is configured.`,
     )
   }
 }
@@ -244,7 +253,7 @@ export class MissingInsertHandlerError extends MissingHandlerError {
 export class MissingUpdateHandlerError extends MissingHandlerError {
   constructor() {
     super(
-      `Collection.update called directly (not within an explicit transaction) but no 'onUpdate' handler is configured.`
+      `Collection.update called directly (not within an explicit transaction) but no 'onUpdate' handler is configured.`,
     )
   }
 }
@@ -252,7 +261,7 @@ export class MissingUpdateHandlerError extends MissingHandlerError {
 export class MissingDeleteHandlerError extends MissingHandlerError {
   constructor() {
     super(
-      `Collection.delete called directly (not within an explicit transaction) but no 'onDelete' handler is configured.`
+      `Collection.delete called directly (not within an explicit transaction) but no 'onDelete' handler is configured.`,
     )
   }
 }
@@ -274,7 +283,7 @@ export class MissingMutationFunctionError extends TransactionError {
 export class OnMutateMustBeSynchronousError extends TransactionError {
   constructor() {
     super(
-      `onMutate must be synchronous and cannot return a promise. Remove async/await or returned promises from onMutate.`
+      `onMutate must be synchronous and cannot return a promise. Remove async/await or returned promises from onMutate.`,
     )
     this.name = `OnMutateMustBeSynchronousError`
   }
@@ -283,7 +292,7 @@ export class OnMutateMustBeSynchronousError extends TransactionError {
 export class TransactionNotPendingMutateError extends TransactionError {
   constructor() {
     super(
-      `You can no longer call .mutate() as the transaction is no longer pending`
+      `You can no longer call .mutate() as the transaction is no longer pending`,
     )
   }
 }
@@ -291,7 +300,7 @@ export class TransactionNotPendingMutateError extends TransactionError {
 export class TransactionAlreadyCompletedRollbackError extends TransactionError {
   constructor() {
     super(
-      `You can no longer call .rollback() as the transaction is already completed`
+      `You can no longer call .rollback() as the transaction is already completed`,
     )
   }
 }
@@ -299,7 +308,7 @@ export class TransactionAlreadyCompletedRollbackError extends TransactionError {
 export class TransactionNotPendingCommitError extends TransactionError {
   constructor() {
     super(
-      `You can no longer call .commit() as the transaction is no longer pending`
+      `You can no longer call .commit() as the transaction is no longer pending`,
     )
   }
 }
@@ -313,7 +322,7 @@ export class NoPendingSyncTransactionWriteError extends TransactionError {
 export class SyncTransactionAlreadyCommittedWriteError extends TransactionError {
   constructor() {
     super(
-      `The pending sync transaction is already committed, you can't still write to it.`
+      `The pending sync transaction is already committed, you can't still write to it.`,
     )
   }
 }
@@ -327,7 +336,7 @@ export class NoPendingSyncTransactionCommitError extends TransactionError {
 export class SyncTransactionAlreadyCommittedError extends TransactionError {
   constructor() {
     super(
-      `The pending sync transaction is already committed, you can't commit it again.`
+      `The pending sync transaction is already committed, you can't commit it again.`,
     )
   }
 }
@@ -355,7 +364,7 @@ export class SubQueryMustHaveFromClauseError extends QueryBuilderError {
 export class InvalidSourceError extends QueryBuilderError {
   constructor(alias: string) {
     super(
-      `Invalid source for live query: The value provided for alias "${alias}" is not a Collection or subquery. Live queries only accept Collection instances or subqueries. Please ensure you're passing a valid Collection or QueryBuilder, not a plain array or other data type.`
+      `Invalid source for live query: The value provided for alias "${alias}" is not a Collection or subquery. Live queries only accept Collection instances or subqueries. Please ensure you're passing a valid Collection or QueryBuilder, not a plain array or other data type.`,
     )
   }
 }
@@ -364,7 +373,7 @@ export class InvalidSourceTypeError extends QueryBuilderError {
   constructor(context: string, type: string) {
     super(
       `Invalid source for ${context}: Expected an object with a single key-value pair like { alias: collection }. ` +
-        `For example: .from({ todos: todosCollection }). Got: ${type}`
+        `For example: .from({ todos: todosCollection }). Got: ${type}`,
     )
   }
 }
@@ -404,7 +413,7 @@ export class HavingRequiresGroupByError extends QueryCompilationError {
 export class LimitOffsetRequireOrderByError extends QueryCompilationError {
   constructor() {
     super(
-      `LIMIT and OFFSET require an ORDER BY clause to ensure deterministic results`
+      `LIMIT and OFFSET require an ORDER BY clause to ensure deterministic results`,
     )
   }
 }
@@ -417,7 +426,7 @@ export class CollectionInputNotFoundError extends QueryCompilationError {
   constructor(
     alias: string,
     collectionId?: string,
-    availableKeys?: Array<string>
+    availableKeys?: Array<string>,
   ) {
     const details = collectionId
       ? `alias "${alias}" (collection "${collectionId}")`
@@ -440,7 +449,7 @@ export class DuplicateAliasInSubqueryError extends QueryCompilationError {
       `Subquery uses alias "${alias}" which is already used in the parent query. ` +
         `Each alias must be unique across parent and subquery contexts. ` +
         `Parent query aliases: ${parentAliases.join(`, `)}. ` +
-        `Please rename "${alias}" in either the parent query or subquery to avoid conflicts.`
+        `Please rename "${alias}" in either the parent query or subquery to avoid conflicts.`,
     )
   }
 }
@@ -492,7 +501,7 @@ export class UnsupportedJoinTypeError extends JoinError {
 export class InvalidJoinConditionSameSourceError extends JoinError {
   constructor(sourceAlias: string) {
     super(
-      `Invalid join condition: both expressions refer to the same source "${sourceAlias}"`
+      `Invalid join condition: both expressions refer to the same source "${sourceAlias}"`,
     )
   }
 }
@@ -506,7 +515,7 @@ export class InvalidJoinConditionSourceMismatchError extends JoinError {
 export class InvalidJoinConditionLeftSourceError extends JoinError {
   constructor(sourceAlias: string) {
     super(
-      `Invalid join condition: left expression refers to an unavailable source "${sourceAlias}"`
+      `Invalid join condition: left expression refers to an unavailable source "${sourceAlias}"`,
     )
   }
 }
@@ -514,7 +523,7 @@ export class InvalidJoinConditionLeftSourceError extends JoinError {
 export class InvalidJoinConditionRightSourceError extends JoinError {
   constructor(sourceAlias: string) {
     super(
-      `Invalid join condition: right expression does not refer to the joined source "${sourceAlias}"`
+      `Invalid join condition: right expression does not refer to the joined source "${sourceAlias}"`,
     )
   }
 }
@@ -542,7 +551,7 @@ export class GroupByError extends TanStackDBError {
 export class NonAggregateExpressionNotInGroupByError extends GroupByError {
   constructor(alias: string) {
     super(
-      `Non-aggregate expression '${alias}' in SELECT must also appear in GROUP BY clause`
+      `Non-aggregate expression '${alias}' in SELECT must also appear in GROUP BY clause`,
     )
   }
 }
@@ -556,7 +565,7 @@ export class UnsupportedAggregateFunctionError extends GroupByError {
 export class AggregateFunctionNotInSelectError extends GroupByError {
   constructor(functionName: string) {
     super(
-      `Aggregate function in HAVING clause must also be in SELECT clause: ${functionName}`
+      `Aggregate function in HAVING clause must also be in SELECT clause: ${functionName}`,
     )
   }
 }
@@ -578,7 +587,7 @@ export class StorageError extends TanStackDBError {
 export class SerializationError extends StorageError {
   constructor(operation: string, originalError: string) {
     super(
-      `Cannot ${operation} item because it cannot be JSON serialized: ${originalError}`
+      `Cannot ${operation} item because it cannot be JSON serialized: ${originalError}`,
     )
   }
 }
@@ -600,7 +609,7 @@ export class StorageKeyRequiredError extends LocalStorageCollectionError {
 export class InvalidStorageDataFormatError extends LocalStorageCollectionError {
   constructor(storageKey: string, key: string) {
     super(
-      `[LocalStorageCollection] Invalid data format in storage key "${storageKey}" for key "${key}".`
+      `[LocalStorageCollection] Invalid data format in storage key "${storageKey}" for key "${key}".`,
     )
   }
 }
@@ -608,7 +617,7 @@ export class InvalidStorageDataFormatError extends LocalStorageCollectionError {
 export class InvalidStorageObjectFormatError extends LocalStorageCollectionError {
   constructor(storageKey: string) {
     super(
-      `[LocalStorageCollection] Invalid data format in storage key "${storageKey}". Expected object format.`
+      `[LocalStorageCollection] Invalid data format in storage key "${storageKey}". Expected object format.`,
     )
   }
 }
@@ -618,7 +627,7 @@ export class SyncCleanupError extends TanStackDBError {
   constructor(collectionId: string, error: Error | string) {
     const message = error instanceof Error ? error.message : String(error)
     super(
-      `Collection "${collectionId}" sync cleanup function threw an error: ${message}`
+      `Collection "${collectionId}" sync cleanup function threw an error: ${message}`,
     )
     this.name = `SyncCleanupError`
   }
@@ -644,7 +653,7 @@ export class CannotCombineEmptyExpressionListError extends QueryOptimizerError {
 export class WhereClauseConversionError extends QueryOptimizerError {
   constructor(collectionId: string, alias: string) {
     super(
-      `Failed to convert WHERE clause to collection filter for collection '${collectionId}' alias '${alias}'. This indicates a bug in the query optimization logic.`
+      `Failed to convert WHERE clause to collection filter for collection '${collectionId}' alias '${alias}'. This indicates a bug in the query optimization logic.`,
     )
   }
 }
@@ -658,10 +667,10 @@ export class SubscriptionNotFoundError extends QueryCompilationError {
     resolvedAlias: string,
     originalAlias: string,
     collectionId: string,
-    availableAliases: Array<string>
+    availableAliases: Array<string>,
   ) {
     super(
-      `Internal error: subscription for alias '${resolvedAlias}' (remapped from '${originalAlias}', collection '${collectionId}') is missing in join pipeline. Available aliases: ${availableAliases.join(`, `)}. This indicates a bug in alias tracking.`
+      `Internal error: subscription for alias '${resolvedAlias}' (remapped from '${originalAlias}', collection '${collectionId}') is missing in join pipeline. Available aliases: ${availableAliases.join(`, `)}. This indicates a bug in alias tracking.`,
     )
   }
 }
@@ -672,7 +681,7 @@ export class SubscriptionNotFoundError extends QueryCompilationError {
 export class AggregateNotSupportedError extends QueryCompilationError {
   constructor() {
     super(
-      `Aggregate expressions are not supported in this context. Use GROUP BY clause for aggregates.`
+      `Aggregate expressions are not supported in this context. Use GROUP BY clause for aggregates.`,
     )
   }
 }
@@ -685,7 +694,7 @@ export class MissingAliasInputsError extends QueryCompilationError {
   constructor(missingAliases: Array<string>) {
     super(
       `Internal error: compiler returned aliases without inputs: ${missingAliases.join(`, `)}. ` +
-        `This indicates a bug in query compilation. Please report this issue.`
+        `This indicates a bug in query compilation. Please report this issue.`,
     )
   }
 }
@@ -697,7 +706,7 @@ export class SetWindowRequiresOrderByError extends QueryCompilationError {
   constructor() {
     super(
       `setWindow() can only be called on collections with an ORDER BY clause. ` +
-        `Add .orderBy() to your query to enable window movement.`
+        `Add .orderBy() to your query to enable window movement.`,
     )
   }
 }
diff --git a/packages/db/src/event-emitter.ts b/packages/db/src/event-emitter.ts
index 19656e573..6d7ad90aa 100644
--- a/packages/db/src/event-emitter.ts
+++ b/packages/db/src/event-emitter.ts
@@ -16,7 +16,7 @@ export class EventEmitter<TEvents extends Record<string, any>> {
    */
   on<T extends keyof TEvents>(
     event: T,
-    callback: (event: TEvents[T]) => void
+    callback: (event: TEvents[T]) => void,
   ): () => void {
     if (!this.listeners.has(event)) {
       this.listeners.set(event, new Set())
@@ -36,7 +36,7 @@ export class EventEmitter<TEvents extends Record<string, any>> {
    */
   once<T extends keyof TEvents>(
     event: T,
-    callback: (event: TEvents[T]) => void
+    callback: (event: TEvents[T]) => void,
   ): () => void {
     const unsubscribe = this.on(event, (eventPayload) => {
       callback(eventPayload)
@@ -52,7 +52,7 @@ export class EventEmitter<TEvents extends Record<string, any>> {
    */
   off<T extends keyof TEvents>(
     event: T,
-    callback: (event: TEvents[T]) => void
+    callback: (event: TEvents[T]) => void,
   ): void {
     this.listeners.get(event)?.delete(callback as (event: any) => void)
   }
@@ -65,7 +65,7 @@ export class EventEmitter<TEvents extends Record<string, any>> {
    */
   waitFor<T extends keyof TEvents>(
     event: T,
-    timeout?: number
+    timeout?: number,
   ): Promise<TEvents[T]> {
     return new Promise((resolve, reject) => {
       let timeoutId: NodeJS.Timeout | undefined
@@ -95,7 +95,7 @@ export class EventEmitter<TEvents extends Record<string, any>> {
    */
   protected emitInner<T extends keyof TEvents>(
     event: T,
-    eventPayload: TEvents[T]
+    eventPayload: TEvents[T],
   ): void {
     this.listeners.get(event)?.forEach((listener) => {
       try {
diff --git a/packages/db/src/index.ts b/packages/db/src/index.ts
index 638e21514..ccf7cbb6e 100644
--- a/packages/db/src/index.ts
+++ b/packages/db/src/index.ts
@@ -1,31 +1,32 @@
 // Re-export all public APIs
 // Re-export IR types under their own namespace
 // because custom collections need access to the IR types
-import * as IR from "./query/ir.js"
+import * as IR from './query/ir.js'
 
-export * from "./collection/index.js"
-export * from "./SortedMap"
-export * from "./transactions"
-export * from "./types"
-export * from "./proxy"
-export * from "./query/index.js"
-export * from "./optimistic-action"
-export * from "./local-only"
-export * from "./local-storage"
-export * from "./errors"
-export * from "./paced-mutations"
-export * from "./strategies/index.js"
+export * from './collection/index.js'
+export * from './SortedMap'
+export * from './transactions'
+export * from './types'
+export * from './proxy'
+export * from './query/index.js'
+export * from './optimistic-action'
+export * from './local-only'
+export * from './local-storage'
+export * from './errors'
+export { deepEquals } from './utils'
+export * from './paced-mutations'
+export * from './strategies/index.js'
 
 // Index system exports
-export * from "./indexes/base-index.js"
-export * from "./indexes/btree-index.js"
-export * from "./indexes/lazy-index.js"
-export { type IndexOptions } from "./indexes/index-options.js"
+export * from './indexes/base-index.js'
+export * from './indexes/btree-index.js'
+export * from './indexes/lazy-index.js'
+export { type IndexOptions } from './indexes/index-options.js'
 
 // Expression helpers
-export * from "./query/expression-helpers.js"
+export * from './query/expression-helpers.js'
 
 // Re-export some stuff explicitly to ensure the type & value is exported
-export type { Collection } from "./collection/index.js"
+export type { Collection } from './collection/index.js'
 export { IR }
-export { operators, type OperatorName } from "./query/builder/functions.js"
+export { operators, type OperatorName } from './query/builder/functions.js'
diff --git a/packages/db/src/indexes/auto-index.ts b/packages/db/src/indexes/auto-index.ts
index 491053af0..098c92b50 100644
--- a/packages/db/src/indexes/auto-index.ts
+++ b/packages/db/src/indexes/auto-index.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_COMPARE_OPTIONS } from "../utils"
-import { BTreeIndex } from "./btree-index"
-import type { CompareOptions } from "../query/builder/types"
-import type { BasicExpression } from "../query/ir"
-import type { CollectionImpl } from "../collection/index.js"
+import { DEFAULT_COMPARE_OPTIONS } from '../utils'
+import { BTreeIndex } from './btree-index'
+import type { CompareOptions } from '../query/builder/types'
+import type { BasicExpression } from '../query/ir'
+import type { CollectionImpl } from '../collection/index.js'
 
 export interface AutoIndexConfig {
   autoIndex?: `off` | `eager`
@@ -25,7 +25,7 @@ export function ensureIndexForField<
   fieldPath: Array<string>,
   collection: CollectionImpl<T, TKey, any, any, any>,
   compareOptions?: CompareOptions,
-  compareFn?: (a: any, b: any) => number
+  compareFn?: (a: any, b: any) => number,
 ) {
   if (!shouldAutoIndex(collection)) {
     return
@@ -39,7 +39,7 @@ export function ensureIndexForField<
   // Check if we already have an index for this field
   const existingIndex = Array.from(collection.indexes.values()).find(
     (index) =>
-      index.matchesField(fieldPath) && index.matchesCompareOptions(compareOpts)
+      index.matchesField(fieldPath) && index.matchesCompareOptions(compareOpts),
   )
 
   if (existingIndex) {
@@ -62,12 +62,12 @@ export function ensureIndexForField<
         name: `auto:${fieldPath.join(`.`)}`,
         indexType: BTreeIndex,
         options: compareFn ? { compareFn, compareOptions: compareOpts } : {},
-      }
+      },
     )
   } catch (error) {
     console.warn(
       `${collection.id ? `[${collection.id}] ` : ``}Failed to create auto-index for field path "${fieldPath.join(`.`)}":`,
-      error
+      error,
     )
   }
 }
@@ -80,7 +80,7 @@ export function ensureIndexForExpression<
   TKey extends string | number,
 >(
   expression: BasicExpression,
-  collection: CollectionImpl<T, TKey, any, any, any>
+  collection: CollectionImpl<T, TKey, any, any, any>,
 ): void {
   if (!shouldAutoIndex(collection)) {
     return
@@ -98,7 +98,7 @@ export function ensureIndexForExpression<
  * Extracts all indexable expressions from a where expression
  */
 function extractIndexableExpressions(
-  expression: BasicExpression
+  expression: BasicExpression,
 ): Array<{ fieldName: string; fieldPath: Array<string> }> {
   const results: Array<{ fieldName: string; fieldPath: Array<string> }> = []
 
diff --git a/packages/db/src/indexes/base-index.ts b/packages/db/src/indexes/base-index.ts
index 98f1471d2..18e58b7eb 100644
--- a/packages/db/src/indexes/base-index.ts
+++ b/packages/db/src/indexes/base-index.ts
@@ -1,9 +1,9 @@
-import { compileSingleRowExpression } from "../query/compiler/evaluators.js"
-import { comparisonFunctions } from "../query/builder/functions.js"
-import { DEFAULT_COMPARE_OPTIONS, deepEquals } from "../utils.js"
-import type { RangeQueryOptions } from "./btree-index.js"
-import type { CompareOptions } from "../query/builder/types.js"
-import type { BasicExpression, OrderByDirection } from "../query/ir.js"
+import { compileSingleRowExpression } from '../query/compiler/evaluators.js'
+import { comparisonFunctions } from '../query/builder/functions.js'
+import { DEFAULT_COMPARE_OPTIONS, deepEquals } from '../utils.js'
+import type { RangeQueryOptions } from './btree-index.js'
+import type { CompareOptions } from '../query/builder/types.js'
+import type { BasicExpression, OrderByDirection } from '../query/ir.js'
 
 /**
  * Operations that indexes can support, imported from available comparison functions
@@ -46,12 +46,12 @@ export interface IndexInterface<
   take: (
     n: number,
     from?: TKey,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ) => Array<TKey>
   takeReversed: (
     n: number,
     from?: TKey,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ) => Array<TKey>
 
   get keyCount(): number
@@ -90,7 +90,7 @@ export abstract class BaseIndex<
     id: number,
     expression: BasicExpression,
     name?: string,
-    options?: any
+    options?: any,
   ) {
     this.id = id
     this.expression = expression
@@ -109,12 +109,12 @@ export abstract class BaseIndex<
   abstract take(
     n: number,
     from?: TKey,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ): Array<TKey>
   abstract takeReversed(
     n: number,
     from?: TKey,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ): Array<TKey>
   abstract get keyCount(): number
   abstract equalityLookup(value: any): Set<TKey>
@@ -155,7 +155,7 @@ export abstract class BaseIndex<
 
     return deepEquals(
       thisCompareOptionsWithoutDirection,
-      compareOptionsWithoutDirection
+      compareOptionsWithoutDirection,
     )
   }
 
@@ -203,7 +203,7 @@ export type IndexConstructor<TKey extends string | number = string | number> =
     id: number,
     expression: BasicExpression,
     name?: string,
-    options?: any
+    options?: any,
   ) => BaseIndex<TKey>
 
 /**
diff --git a/packages/db/src/indexes/btree-index.ts b/packages/db/src/indexes/btree-index.ts
index 467d5e1cc..2392fbcad 100644
--- a/packages/db/src/indexes/btree-index.ts
+++ b/packages/db/src/indexes/btree-index.ts
@@ -1,9 +1,10 @@
-import { BTree } from "../utils/btree.js"
-import { defaultComparator, normalizeValue } from "../utils/comparison.js"
-import { BaseIndex } from "./base-index.js"
-import type { CompareOptions } from "../query/builder/types.js"
-import type { BasicExpression } from "../query/ir.js"
-import type { IndexOperation } from "./base-index.js"
+import { compareKeys } from '@tanstack/db-ivm'
+import { BTree } from '../utils/btree.js'
+import { defaultComparator, normalizeValue } from '../utils/comparison.js'
+import { BaseIndex } from './base-index.js'
+import type { CompareOptions } from '../query/builder/types.js'
+import type { BasicExpression } from '../query/ir.js'
+import type { IndexOperation } from './base-index.js'
 
 /**
  * Options for Ordered index
@@ -51,7 +52,7 @@ export class BTreeIndex<
     id: number,
     expression: BasicExpression,
     name?: string,
-    options?: any
+    options?: any,
   ) {
     super(id, expression, name, options)
     this.compareFn = options?.compareFn ?? defaultComparator
@@ -72,7 +73,7 @@ export class BTreeIndex<
       indexedValue = this.evaluateIndexExpression(item)
     } catch (error) {
       throw new Error(
-        `Failed to evaluate index expression for key ${key}: ${error}`
+        `Failed to evaluate index expression for key ${key}: ${error}`,
       )
     }
 
@@ -104,7 +105,7 @@ export class BTreeIndex<
     } catch (error) {
       console.warn(
         `Failed to evaluate index expression for key ${key} during removal:`,
-        error
+        error,
       )
       return
     }
@@ -238,7 +239,7 @@ export class BTreeIndex<
         if (keys) {
           keys.forEach((key) => result.add(key))
         }
-      }
+      },
     )
 
     return result
@@ -261,7 +262,8 @@ export class BTreeIndex<
     n: number,
     nextPair: (k?: any) => [any, any] | undefined,
     from?: any,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
+    reversed: boolean = false,
   ): Array<TKey> {
     const keysInResult: Set<TKey> = new Set()
     const result: Array<TKey> = []
@@ -271,10 +273,12 @@ export class BTreeIndex<
     while ((pair = nextPair(key)) !== undefined && result.length < n) {
       key = pair[0]
       const keys = this.valueMap.get(key)
-      if (keys) {
-        const it = keys.values()
-        let ks: TKey | undefined
-        while (result.length < n && (ks = it.next().value)) {
+      if (keys && keys.size > 0) {
+        // Sort keys for deterministic order, reverse if needed
+        const sorted = Array.from(keys).sort(compareKeys)
+        if (reversed) sorted.reverse()
+        for (const ks of sorted) {
+          if (result.length >= n) break
           if (!keysInResult.has(ks) && (filterFn?.(ks) ?? true)) {
             result.push(ks)
             keysInResult.add(ks)
@@ -306,10 +310,10 @@ export class BTreeIndex<
   takeReversed(
     n: number,
     from?: any,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ): Array<TKey> {
     const nextPair = (k?: any) => this.orderedEntries.nextLowerPair(k)
-    return this.takeInternal(n, nextPair, from, filterFn)
+    return this.takeInternal(n, nextPair, from, filterFn, true)
   }
 
   /**
diff --git a/packages/db/src/indexes/index-options.ts b/packages/db/src/indexes/index-options.ts
index aaf1fcd6e..6dfbc137b 100644
--- a/packages/db/src/indexes/index-options.ts
+++ b/packages/db/src/indexes/index-options.ts
@@ -1,4 +1,4 @@
-import type { IndexConstructor, IndexResolver } from "./base-index.js"
+import type { IndexConstructor, IndexResolver } from './base-index.js'
 
 /**
  * Enhanced index options that support both sync and async resolvers
@@ -11,7 +11,7 @@ export interface IndexOptions<TResolver extends IndexResolver = IndexResolver> {
         id: number,
         expr: any,
         name?: string,
-        options?: infer O
+        options?: infer O,
       ) => any
       ? O
       : never
@@ -20,7 +20,7 @@ export interface IndexOptions<TResolver extends IndexResolver = IndexResolver> {
           id: number,
           expr: any,
           name?: string,
-          options?: infer O
+          options?: infer O,
         ) => any
         ? O
         : never
diff --git a/packages/db/src/indexes/lazy-index.ts b/packages/db/src/indexes/lazy-index.ts
index bcf28f45b..ca1dc6b02 100644
--- a/packages/db/src/indexes/lazy-index.ts
+++ b/packages/db/src/indexes/lazy-index.ts
@@ -2,14 +2,14 @@ import type {
   BaseIndex,
   IndexConstructor,
   IndexResolver,
-} from "./base-index.js"
-import type { BasicExpression } from "../query/ir.js"
+} from './base-index.js'
+import type { BasicExpression } from '../query/ir.js'
 
 /**
  * Utility to determine if a resolver is a constructor or async loader
  */
 function isConstructor<TKey extends string | number>(
-  resolver: IndexResolver<TKey>
+  resolver: IndexResolver<TKey>,
 ): resolver is IndexConstructor<TKey> {
   // Check if it's a function with a prototype (constructor)
   return (
@@ -23,7 +23,7 @@ function isConstructor<TKey extends string | number>(
  * Resolve index constructor from resolver
  */
 async function resolveIndexConstructor<TKey extends string | number>(
-  resolver: IndexResolver<TKey>
+  resolver: IndexResolver<TKey>,
 ): Promise<IndexConstructor<TKey>> {
   if (isConstructor(resolver)) {
     return resolver
@@ -46,7 +46,7 @@ export class LazyIndexWrapper<TKey extends string | number = string | number> {
     private name: string | undefined,
     private resolver: IndexResolver<TKey>,
     private options: any,
-    private collectionEntries?: Iterable<[TKey, any]>
+    private collectionEntries?: Iterable<[TKey, any]>,
   ) {
     // For synchronous constructors, resolve immediately
     if (isConstructor(this.resolver)) {
@@ -54,7 +54,7 @@ export class LazyIndexWrapper<TKey extends string | number = string | number> {
         this.id,
         this.expression,
         this.name,
-        this.options
+        this.options,
       )
       // Build with initial data if provided
       if (this.collectionEntries) {
@@ -92,7 +92,7 @@ export class LazyIndexWrapper<TKey extends string | number = string | number> {
   getResolved(): BaseIndex<TKey> {
     if (!this.resolvedIndex) {
       throw new Error(
-        `Index ${this.id} has not been resolved yet. Ensure collection is synced.`
+        `Index ${this.id} has not been resolved yet. Ensure collection is synced.`,
       )
     }
     return this.resolvedIndex
@@ -131,7 +131,7 @@ export class LazyIndexWrapper<TKey extends string | number = string | number> {
 export class IndexProxy<TKey extends string | number = string | number> {
   constructor(
     private indexId: number,
-    private lazyIndex: LazyIndexWrapper<TKey>
+    private lazyIndex: LazyIndexWrapper<TKey>,
   ) {}
 
   /**
diff --git a/packages/db/src/indexes/reverse-index.ts b/packages/db/src/indexes/reverse-index.ts
index d54c082cb..6bd9de0a3 100644
--- a/packages/db/src/indexes/reverse-index.ts
+++ b/packages/db/src/indexes/reverse-index.ts
@@ -1,7 +1,7 @@
-import type { CompareOptions } from "../query/builder/types"
-import type { OrderByDirection } from "../query/ir"
-import type { IndexInterface, IndexOperation, IndexStats } from "./base-index"
-import type { RangeQueryOptions } from "./btree-index"
+import type { CompareOptions } from '../query/builder/types'
+import type { OrderByDirection } from '../query/ir'
+import type { IndexInterface, IndexOperation, IndexStats } from './base-index'
+import type { RangeQueryOptions } from './btree-index'
 
 export class ReverseIndex<
   TKey extends string | number,
@@ -43,7 +43,7 @@ export class ReverseIndex<
   takeReversed(
     n: number,
     from?: any,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ): Array<TKey> {
     return this.originalIndex.take(n, from, filterFn)
   }
diff --git a/packages/db/src/local-only.ts b/packages/db/src/local-only.ts
index 4924cc467..68168ae02 100644
--- a/packages/db/src/local-only.ts
+++ b/packages/db/src/local-only.ts
@@ -9,9 +9,9 @@ import type {
   SyncConfig,
   UpdateMutationFnParams,
   UtilsRecord,
-} from "./types"
-import type { Collection } from "./collection/index"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from './types'
+import type { Collection } from './collection/index'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 /**
  * Configuration interface for Local-only collection options
@@ -152,7 +152,7 @@ export function localOnlyCollectionOptions<
 >(
   config: LocalOnlyCollectionConfig<InferSchemaOutput<T>, T, TKey> & {
     schema: T
-  }
+  },
 ): LocalOnlyCollectionOptionsResult<InferSchemaOutput<T>, TKey, T> & {
   schema: T
 }
@@ -165,7 +165,7 @@ export function localOnlyCollectionOptions<
 >(
   config: LocalOnlyCollectionConfig<T, never, TKey> & {
     schema?: never // prohibit schema
-  }
+  },
 ): LocalOnlyCollectionOptionsResult<T, TKey> & {
   schema?: never // no schema in the result
 }
@@ -175,7 +175,7 @@ export function localOnlyCollectionOptions<
   TSchema extends StandardSchemaV1 = never,
   TKey extends string | number = string | number,
 >(
-  config: LocalOnlyCollectionConfig<T, TSchema, TKey>
+  config: LocalOnlyCollectionConfig<T, TSchema, TKey>,
 ): LocalOnlyCollectionOptionsResult<T, TKey, TSchema> & {
   schema?: StandardSchemaV1
 } {
@@ -189,7 +189,7 @@ export function localOnlyCollectionOptions<
    * Wraps the user's onInsert handler to also confirm the transaction immediately
    */
   const wrappedOnInsert = async (
-    params: InsertMutationFnParams<T, TKey, LocalOnlyCollectionUtils>
+    params: InsertMutationFnParams<T, TKey, LocalOnlyCollectionUtils>,
   ) => {
     // Call user handler first if provided
     let handlerResult
@@ -207,7 +207,7 @@ export function localOnlyCollectionOptions<
    * Wrapper for onUpdate handler that also confirms the transaction immediately
    */
   const wrappedOnUpdate = async (
-    params: UpdateMutationFnParams<T, TKey, LocalOnlyCollectionUtils>
+    params: UpdateMutationFnParams<T, TKey, LocalOnlyCollectionUtils>,
   ) => {
     // Call user handler first if provided
     let handlerResult
@@ -225,7 +225,7 @@ export function localOnlyCollectionOptions<
    * Wrapper for onDelete handler that also confirms the transaction immediately
    */
   const wrappedOnDelete = async (
-    params: DeleteMutationFnParams<T, TKey, LocalOnlyCollectionUtils>
+    params: DeleteMutationFnParams<T, TKey, LocalOnlyCollectionUtils>,
   ) => {
     // Call user handler first if provided
     let handlerResult
@@ -249,7 +249,7 @@ export function localOnlyCollectionOptions<
     const collectionMutations = transaction.mutations.filter(
       (m) =>
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        m.collection === syncResult.collection
+        m.collection === syncResult.collection,
     )
 
     if (collectionMutations.length === 0) {
@@ -258,7 +258,7 @@ export function localOnlyCollectionOptions<
 
     // Persist the mutations through sync
     syncResult.confirmOperationsSync(
-      collectionMutations as Array<PendingMutation<T>>
+      collectionMutations as Array<PendingMutation<T>>,
     )
   }
 
@@ -289,7 +289,7 @@ export function localOnlyCollectionOptions<
  * @returns Object with sync configuration and confirmOperationsSync function
  */
 function createLocalOnlySync<T extends object, TKey extends string | number>(
-  initialData?: Array<T>
+  initialData?: Array<T>,
 ) {
   // Capture sync functions and collection for transaction confirmation
   let syncBegin: (() => void) | null = null
diff --git a/packages/db/src/local-storage.ts b/packages/db/src/local-storage.ts
index 30c2146c4..3060b7ec6 100644
--- a/packages/db/src/local-storage.ts
+++ b/packages/db/src/local-storage.ts
@@ -3,7 +3,7 @@ import {
   InvalidStorageObjectFormatError,
   SerializationError,
   StorageKeyRequiredError,
-} from "./errors"
+} from './errors'
 import type {
   BaseCollectionConfig,
   CollectionConfig,
@@ -14,8 +14,8 @@ import type {
   SyncConfig,
   UpdateMutationFnParams,
   UtilsRecord,
-} from "./types"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from './types'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 /**
  * Storage API interface - subset of DOM Storage that we need
@@ -28,11 +28,11 @@ export type StorageApi = Pick<Storage, `getItem` | `setItem` | `removeItem`>
 export type StorageEventApi = {
   addEventListener: (
     type: `storage`,
-    listener: (event: StorageEvent) => void
+    listener: (event: StorageEvent) => void,
   ) => void
   removeEventListener: (
     type: `storage`,
-    listener: (event: StorageEvent) => void
+    listener: (event: StorageEvent) => void,
   ) => void
 }
 
@@ -132,14 +132,14 @@ export interface LocalStorageCollectionUtils extends UtilsRecord {
 function validateJsonSerializable(
   parser: Parser,
   value: any,
-  operation: string
+  operation: string,
 ): void {
   try {
     parser.stringify(value)
   } catch (error) {
     throw new SerializationError(
       operation,
-      error instanceof Error ? error.message : String(error)
+      error instanceof Error ? error.message : String(error),
     )
   }
 }
@@ -319,7 +319,7 @@ export function localStorageCollectionOptions<
 >(
   config: LocalStorageCollectionConfig<InferSchemaOutput<T>, T, TKey> & {
     schema: T
-  }
+  },
 ): CollectionConfig<
   InferSchemaOutput<T>,
   TKey,
@@ -339,7 +339,7 @@ export function localStorageCollectionOptions<
 >(
   config: LocalStorageCollectionConfig<T, never, TKey> & {
     schema?: never // prohibit schema
-  }
+  },
 ): CollectionConfig<T, TKey, never, LocalStorageCollectionUtils> & {
   id: string
   utils: LocalStorageCollectionUtils
@@ -347,7 +347,7 @@ export function localStorageCollectionOptions<
 }
 
 export function localStorageCollectionOptions(
-  config: LocalStorageCollectionConfig<any, any, string | number>
+  config: LocalStorageCollectionConfig<any, any, string | number>,
 ): Omit<
   CollectionConfig<any, string | number, any, LocalStorageCollectionUtils>,
   `id`
@@ -388,7 +388,7 @@ export function localStorageCollectionOptions(
     storageEventApi,
     parser,
     config.getKey,
-    lastKnownData
+    lastKnownData,
   )
 
   /**
@@ -396,7 +396,7 @@ export function localStorageCollectionOptions(
    * @param dataMap - Map of items with version tracking to save to storage
    */
   const saveToStorage = (
-    dataMap: Map<string | number, StoredItem<any>>
+    dataMap: Map<string | number, StoredItem<any>>,
   ): void => {
     try {
       // Convert Map to object format for storage
@@ -409,7 +409,7 @@ export function localStorageCollectionOptions(
     } catch (error) {
       console.error(
         `[LocalStorageCollection] Error saving data to storage key "${config.storageKey}":`,
-        error
+        error,
       )
       throw error
     }
@@ -631,7 +631,7 @@ export function localStorageCollectionOptions(
 function loadFromStorage<T extends object>(
   storageKey: string,
   storage: StorageApi,
-  parser: Parser
+  parser: Parser,
 ): Map<string | number, StoredItem<T>> {
   try {
     const rawData = storage.getItem(storageKey)
@@ -671,7 +671,7 @@ function loadFromStorage<T extends object>(
   } catch (error) {
     console.warn(
       `[LocalStorageCollection] Error loading data from storage key "${storageKey}":`,
-      error
+      error,
     )
     return new Map()
   }
@@ -693,7 +693,7 @@ function createLocalStorageSync<T extends object>(
   storageEventApi: StorageEventApi,
   parser: Parser,
   _getKey: (item: T) => string | number,
-  lastKnownData: Map<string | number, StoredItem<T>>
+  lastKnownData: Map<string | number, StoredItem<T>>,
 ): SyncConfig<T> & {
   manualTrigger?: () => void
   collection: any
@@ -710,7 +710,7 @@ function createLocalStorageSync<T extends object>(
    */
   const findChanges = (
     oldData: Map<string | number, StoredItem<T>>,
-    newData: Map<string | number, StoredItem<T>>
+    newData: Map<string | number, StoredItem<T>>,
   ): Array<{
     type: `insert` | `update` | `delete`
     key: string | number
diff --git a/packages/db/src/optimistic-action.ts b/packages/db/src/optimistic-action.ts
index 7a529f387..ff5326326 100644
--- a/packages/db/src/optimistic-action.ts
+++ b/packages/db/src/optimistic-action.ts
@@ -1,7 +1,7 @@
-import { createTransaction } from "./transactions"
-import { OnMutateMustBeSynchronousError } from "./errors"
-import { isPromiseLike } from "./utils/type-guards"
-import type { CreateOptimisticActionsOptions, Transaction } from "./types"
+import { createTransaction } from './transactions'
+import { OnMutateMustBeSynchronousError } from './errors'
+import { isPromiseLike } from './utils/type-guards'
+import type { CreateOptimisticActionsOptions, Transaction } from './types'
 
 /**
  * Creates an optimistic action function that applies local optimistic updates immediately
@@ -52,7 +52,7 @@ import type { CreateOptimisticActionsOptions, Transaction } from "./types"
  * @returns A function that accepts variables of type TVariables and returns a Transaction
  */
 export function createOptimisticAction<TVariables = unknown>(
-  options: CreateOptimisticActionsOptions<TVariables>
+  options: CreateOptimisticActionsOptions<TVariables>,
 ) {
   const { mutationFn, onMutate, ...config } = options
 
diff --git a/packages/db/src/paced-mutations.ts b/packages/db/src/paced-mutations.ts
index 02ff647f9..d1d6d9a3e 100644
--- a/packages/db/src/paced-mutations.ts
+++ b/packages/db/src/paced-mutations.ts
@@ -1,6 +1,6 @@
-import { createTransaction } from "./transactions"
-import type { MutationFn, Transaction } from "./types"
-import type { Strategy } from "./strategies/types"
+import { createTransaction } from './transactions'
+import type { MutationFn, Transaction } from './types'
+import type { Strategy } from './strategies/types'
 
 /**
  * Configuration for creating a paced mutations manager
@@ -88,7 +88,7 @@ export function createPacedMutations<
   TVariables = unknown,
   T extends object = Record<string, unknown>,
 >(
-  config: PacedMutationsConfig<TVariables, T>
+  config: PacedMutationsConfig<TVariables, T>,
 ): (variables: TVariables) => Transaction<T> {
   const { onMutate, mutationFn, strategy, ...transactionConfig } = config
 
@@ -99,13 +99,13 @@ export function createPacedMutations<
   const commitCallback = () => {
     if (!activeTransaction) {
       throw new Error(
-        `Strategy callback called but no active transaction exists. This indicates a bug in the strategy implementation.`
+        `Strategy callback called but no active transaction exists. This indicates a bug in the strategy implementation.`,
       )
     }
 
     if (activeTransaction.state !== `pending`) {
       throw new Error(
-        `Strategy callback called but active transaction is in state "${activeTransaction.state}". Expected "pending".`
+        `Strategy callback called but active transaction is in state "${activeTransaction.state}". Expected "pending".`,
       )
     }
 
diff --git a/packages/db/src/proxy.ts b/packages/db/src/proxy.ts
index 04cd84a71..57723e3cc 100644
--- a/packages/db/src/proxy.ts
+++ b/packages/db/src/proxy.ts
@@ -3,7 +3,7 @@
  * and provides a way to retrieve those changes.
  */
 
-import { deepEquals, isTemporal } from "./utils"
+import { deepEquals, isTemporal } from './utils'
 
 /**
  * Set of array methods that iterate with callbacks and may return elements.
@@ -58,7 +58,7 @@ const MAP_SET_ITERATOR_METHODS = new Set([
  * Check if a value is a proxiable object (not Date, RegExp, or Temporal)
  */
 function isProxiableObject(
-  value: unknown
+  value: unknown,
 ): value is Record<string | symbol, unknown> {
   return (
     value !== null &&
@@ -82,8 +82,8 @@ function createArrayIterationHandler<T extends object>(
     parent?: {
       tracker: ChangeTracker<Record<string | symbol, unknown>>
       prop: string | symbol
-    }
-  ) => { proxy: Record<string | symbol, unknown> }
+    },
+  ) => { proxy: Record<string | symbol, unknown> },
 ): ((...args: Array<unknown>) => unknown) | undefined {
   if (!CALLBACK_ITERATION_METHODS.has(methodName)) {
     return undefined
@@ -106,7 +106,7 @@ function createArrayIterationHandler<T extends object>(
         }
         const { proxy: elementProxy } = memoizedCreateChangeProxy(
           element,
-          nestedParent
+          nestedParent,
         )
         return elementProxy
       }
@@ -118,7 +118,7 @@ function createArrayIterationHandler<T extends object>(
       this: unknown,
       element: unknown,
       index: number,
-      array: unknown
+      array: unknown,
     ) {
       const proxiedElement = getProxiedElement(element, index)
       return callback.call(this, proxiedElement, index, array)
@@ -131,7 +131,7 @@ function createArrayIterationHandler<T extends object>(
         accumulator: unknown,
         element: unknown,
         index: number,
-        array: unknown
+        array: unknown,
       ) {
         const proxiedElement = getProxiedElement(element, index)
         return callback.call(this, accumulator, proxiedElement, index, array)
@@ -188,8 +188,8 @@ function createArrayIteratorHandler<T extends object>(
     parent?: {
       tracker: ChangeTracker<Record<string | symbol, unknown>>
       prop: string | symbol
-    }
-  ) => { proxy: Record<string | symbol, unknown> }
+    },
+  ) => { proxy: Record<string | symbol, unknown> },
 ): () => Iterator<unknown> {
   return function () {
     const array = changeTracker.copy_ as unknown as Array<unknown>
@@ -213,7 +213,7 @@ function createArrayIteratorHandler<T extends object>(
           }
           const { proxy: elementProxy } = memoizedCreateChangeProxy(
             element,
-            nestedParent
+            nestedParent,
           )
           proxiedElement = elementProxy
         }
@@ -235,7 +235,7 @@ function createArrayIteratorHandler<T extends object>(
 function createModifyingMethodHandler<T extends object>(
   methodFn: (...args: Array<unknown>) => unknown,
   changeTracker: ChangeTracker<T>,
-  markChanged: (tracker: ChangeTracker<T>) => void
+  markChanged: (tracker: ChangeTracker<T>) => void,
 ): (...args: Array<unknown>) => unknown {
   return function (...args: Array<unknown>) {
     const result = methodFn.apply(changeTracker.copy_, args)
@@ -259,9 +259,9 @@ function createMapSetIteratorHandler<T extends object>(
     parent?: {
       tracker: ChangeTracker<Record<string | symbol, unknown>>
       prop: string | symbol
-    }
+    },
   ) => { proxy: Record<string | symbol, unknown> },
-  markChanged: (tracker: ChangeTracker<T>) => void
+  markChanged: (tracker: ChangeTracker<T>) => void,
 ): ((...args: Array<unknown>) => unknown) | undefined {
   const isIteratorMethod =
     MAP_SET_ITERATOR_METHODS.has(methodName) || prop === Symbol.iterator
@@ -281,7 +281,7 @@ function createMapSetIteratorHandler<T extends object>(
           this: unknown,
           value: unknown,
           key: unknown,
-          collection: unknown
+          collection: unknown,
         ) {
           const cbresult = callback.call(this, value, key, collection)
           markChanged(changeTracker)
@@ -351,7 +351,7 @@ function createMapSetIteratorHandler<T extends object>(
                     if (changeTracker.copy_ instanceof Map) {
                       ;(changeTracker.copy_ as Map<unknown, unknown>).set(
                         mapKey,
-                        newValue
+                        newValue,
                       )
                     }
                   },
@@ -361,7 +361,7 @@ function createMapSetIteratorHandler<T extends object>(
                   mapParent as unknown as {
                     tracker: ChangeTracker<Record<string | symbol, unknown>>
                     prop: string | symbol
-                  }
+                  },
                 )
                 nextResult.value[1] = valueProxy
               }
@@ -383,7 +383,7 @@ function createMapSetIteratorHandler<T extends object>(
                       if (changeTracker.copy_ instanceof Map) {
                         ;(changeTracker.copy_ as Map<unknown, unknown>).set(
                           mapKey,
-                          newValue
+                          newValue,
                         )
                       }
                     },
@@ -393,7 +393,7 @@ function createMapSetIteratorHandler<T extends object>(
                     mapParent as unknown as {
                       tracker: ChangeTracker<Record<string | symbol, unknown>>
                       prop: string | symbol
-                    }
+                    },
                   )
                   nextResult.value = valueProxy
                 }
@@ -408,7 +408,7 @@ function createMapSetIteratorHandler<T extends object>(
                   updateSet: (newValue: unknown) => {
                     if (changeTracker.copy_ instanceof Set) {
                       ;(changeTracker.copy_ as Set<unknown>).delete(
-                        setOriginalValue
+                        setOriginalValue,
                       )
                       ;(changeTracker.copy_ as Set<unknown>).add(newValue)
                       originalToModifiedMap.set(setOriginalValue, newValue)
@@ -420,7 +420,7 @@ function createMapSetIteratorHandler<T extends object>(
                   setParent as unknown as {
                     tracker: ChangeTracker<Record<string | symbol, unknown>>
                     prop: string | symbol
-                  }
+                  },
                 )
                 nextResult.value = valueProxy
               } else {
@@ -433,7 +433,7 @@ function createMapSetIteratorHandler<T extends object>(
                       Record<string | symbol, unknown>
                     >,
                     prop: tempKey,
-                  }
+                  },
                 )
                 nextResult.value = valueProxy
               }
@@ -513,7 +513,7 @@ interface ChangeTracker<T extends object> {
 
 function deepClone<T extends unknown>(
   obj: T,
-  visited = new WeakMap<object, unknown>()
+  visited = new WeakMap<object, unknown>(),
 ): T {
   // Handle null and undefined
   if (obj === null || obj === undefined) {
@@ -552,7 +552,7 @@ function deepClone<T extends unknown>(
     // Get the constructor to create a new instance of the same type
     const TypedArrayConstructor = Object.getPrototypeOf(obj).constructor
     const clone = new TypedArrayConstructor(
-      (obj as unknown as TypedArray).length
+      (obj as unknown as TypedArray).length,
     ) as unknown as TypedArray
     visited.set(obj as object, clone)
 
@@ -596,7 +596,7 @@ function deepClone<T extends unknown>(
     if (Object.prototype.hasOwnProperty.call(obj, key)) {
       clone[key] = deepClone(
         (obj as Record<string | symbol, unknown>)[key],
-        visited
+        visited,
       )
     }
   }
@@ -605,7 +605,7 @@ function deepClone<T extends unknown>(
   for (const sym of symbolProps) {
     clone[sym] = deepClone(
       (obj as Record<string | symbol, unknown>)[sym],
-      visited
+      visited,
     )
   }
 
@@ -632,7 +632,7 @@ export function createChangeProxy<
   parent?: {
     tracker: ChangeTracker<Record<string | symbol, unknown>>
     prop: string | symbol
-  }
+  },
 ): {
   proxy: T
 
@@ -647,7 +647,7 @@ export function createChangeProxy<
     innerParent?: {
       tracker: ChangeTracker<Record<string | symbol, unknown>>
       prop: string | symbol
-    }
+    },
   ): {
     proxy: TInner
     getChanges: () => Record<string | symbol, any>
@@ -683,7 +683,7 @@ export function createChangeProxy<
   debugLog(
     `createChangeProxy called for target`,
     target,
-    changeTracker.proxyCount
+    changeTracker.proxyCount,
   )
   // Mark this object and all its ancestors as modified
   // Also propagate the actual changes up the chain
@@ -716,11 +716,11 @@ export function createChangeProxy<
 
   // Check if all properties in the current state have reverted to original values
   function checkIfReverted(
-    state: ChangeTracker<Record<string | symbol, unknown>>
+    state: ChangeTracker<Record<string | symbol, unknown>>,
   ): boolean {
     debugLog(
       `checkIfReverted called with assigned keys:`,
-      Object.keys(state.assigned_)
+      Object.keys(state.assigned_),
     )
 
     // If there are no assigned properties, object is unchanged
@@ -743,7 +743,7 @@ export function createChangeProxy<
           `Checking property ${String(prop)}, current:`,
           currentValue,
           `original:`,
-          originalValue
+          originalValue,
         )
 
         // If the value is not equal to original, something is still changed
@@ -785,7 +785,7 @@ export function createChangeProxy<
   // Update parent status based on child changes
   function checkParentStatus(
     parentState: ChangeTracker<Record<string | symbol, unknown>>,
-    childProp: string | symbol | unknown
+    childProp: string | symbol | unknown,
   ) {
     debugLog(`checkParentStatus called for child prop:`, childProp)
 
@@ -844,7 +844,7 @@ export function createChangeProxy<
               return createModifyingMethodHandler(
                 value,
                 changeTracker,
-                markChanged
+                markChanged,
               )
             }
 
@@ -853,7 +853,7 @@ export function createChangeProxy<
               methodName,
               value,
               changeTracker,
-              memoizedCreateChangeProxy
+              memoizedCreateChangeProxy,
             )
             if (iterationHandler) {
               return iterationHandler
@@ -863,7 +863,7 @@ export function createChangeProxy<
             if (prop === Symbol.iterator) {
               return createArrayIteratorHandler(
                 changeTracker,
-                memoizedCreateChangeProxy
+                memoizedCreateChangeProxy,
               )
             }
           }
@@ -876,7 +876,7 @@ export function createChangeProxy<
               return createModifyingMethodHandler(
                 value,
                 changeTracker,
-                markChanged
+                markChanged,
               )
             }
 
@@ -888,7 +888,7 @@ export function createChangeProxy<
               ptarget,
               changeTracker,
               memoizedCreateChangeProxy,
-              markChanged
+              markChanged,
             )
             if (iteratorHandler) {
               return iteratorHandler
@@ -908,7 +908,7 @@ export function createChangeProxy<
           // Create a proxy for the nested object
           const { proxy: nestedProxy } = memoizedCreateChangeProxy(
             originalValue,
-            nestedParent
+            nestedParent,
           )
 
           // Cache the proxy
@@ -926,7 +926,7 @@ export function createChangeProxy<
           `set called for property ${String(prop)}, current:`,
           currentValue,
           `new:`,
-          value
+          value,
         )
 
         // Only track the change if the value is actually different
@@ -941,7 +941,7 @@ export function createChangeProxy<
             `original:`,
             originalValue,
             `isRevertToOriginal:`,
-            isRevertToOriginal
+            isRevertToOriginal,
           )
 
           if (isRevertToOriginal) {
@@ -1128,7 +1128,7 @@ export function createChangeProxy<
  * @returns An object containing the array of proxies and a function to get all changes
  */
 export function createArrayChangeProxy<T extends object>(
-  targets: Array<T>
+  targets: Array<T>,
 ): {
   proxies: Array<T>
   getChanges: () => Array<Record<string | symbol, unknown>>
@@ -1151,7 +1151,7 @@ export function createArrayChangeProxy<T extends object>(
  */
 export function withChangeTracking<T extends object>(
   target: T,
-  callback: (proxy: T) => void
+  callback: (proxy: T) => void,
 ): Record<string | symbol, unknown> {
   const { proxy, getChanges } = createChangeProxy(target)
 
@@ -1170,7 +1170,7 @@ export function withChangeTracking<T extends object>(
  */
 export function withArrayChangeTracking<T extends object>(
   targets: Array<T>,
-  callback: (proxies: Array<T>) => void
+  callback: (proxies: Array<T>) => void,
 ): Array<Record<string | symbol, unknown>> {
   const { proxies, getChanges } = createArrayChangeProxy(targets)
 
diff --git a/packages/db/src/query/builder/functions.ts b/packages/db/src/query/builder/functions.ts
index eca3172c0..41ce11370 100644
--- a/packages/db/src/query/builder/functions.ts
+++ b/packages/db/src/query/builder/functions.ts
@@ -1,8 +1,8 @@
-import { Aggregate, Func } from "../ir"
-import { toExpression } from "./ref-proxy.js"
-import type { BasicExpression } from "../ir"
-import type { RefProxy } from "./ref-proxy.js"
-import type { RefLeaf } from "./types.js"
+import { Aggregate, Func } from '../ir'
+import { toExpression } from './ref-proxy.js'
+import type { BasicExpression } from '../ir'
+import type { RefProxy } from './ref-proxy.js'
+import type { RefLeaf } from './types.js'
 
 type StringRef =
   | RefLeaf<string>
@@ -114,11 +114,11 @@ type BinaryNumericReturnType<T1, T2> =
 
 export function eq<T>(
   left: ComparisonOperand<T>,
-  right: ComparisonOperand<T>
+  right: ComparisonOperand<T>,
 ): BasicExpression<boolean>
 export function eq<T extends string | number | boolean>(
   left: ComparisonOperandPrimitive<T>,
-  right: ComparisonOperandPrimitive<T>
+  right: ComparisonOperandPrimitive<T>,
 ): BasicExpression<boolean>
 export function eq<T>(left: Aggregate<T>, right: any): BasicExpression<boolean>
 export function eq(left: any, right: any): BasicExpression<boolean> {
@@ -127,11 +127,11 @@ export function eq(left: any, right: any): BasicExpression<boolean> {
 
 export function gt<T>(
   left: ComparisonOperand<T>,
-  right: ComparisonOperand<T>
+  right: ComparisonOperand<T>,
 ): BasicExpression<boolean>
 export function gt<T extends string | number>(
   left: ComparisonOperandPrimitive<T>,
-  right: ComparisonOperandPrimitive<T>
+  right: ComparisonOperandPrimitive<T>,
 ): BasicExpression<boolean>
 export function gt<T>(left: Aggregate<T>, right: any): BasicExpression<boolean>
 export function gt(left: any, right: any): BasicExpression<boolean> {
@@ -140,11 +140,11 @@ export function gt(left: any, right: any): BasicExpression<boolean> {
 
 export function gte<T>(
   left: ComparisonOperand<T>,
-  right: ComparisonOperand<T>
+  right: ComparisonOperand<T>,
 ): BasicExpression<boolean>
 export function gte<T extends string | number>(
   left: ComparisonOperandPrimitive<T>,
-  right: ComparisonOperandPrimitive<T>
+  right: ComparisonOperandPrimitive<T>,
 ): BasicExpression<boolean>
 export function gte<T>(left: Aggregate<T>, right: any): BasicExpression<boolean>
 export function gte(left: any, right: any): BasicExpression<boolean> {
@@ -153,11 +153,11 @@ export function gte(left: any, right: any): BasicExpression<boolean> {
 
 export function lt<T>(
   left: ComparisonOperand<T>,
-  right: ComparisonOperand<T>
+  right: ComparisonOperand<T>,
 ): BasicExpression<boolean>
 export function lt<T extends string | number>(
   left: ComparisonOperandPrimitive<T>,
-  right: ComparisonOperandPrimitive<T>
+  right: ComparisonOperandPrimitive<T>,
 ): BasicExpression<boolean>
 export function lt<T>(left: Aggregate<T>, right: any): BasicExpression<boolean>
 export function lt(left: any, right: any): BasicExpression<boolean> {
@@ -166,11 +166,11 @@ export function lt(left: any, right: any): BasicExpression<boolean> {
 
 export function lte<T>(
   left: ComparisonOperand<T>,
-  right: ComparisonOperand<T>
+  right: ComparisonOperand<T>,
 ): BasicExpression<boolean>
 export function lte<T extends string | number>(
   left: ComparisonOperandPrimitive<T>,
-  right: ComparisonOperandPrimitive<T>
+  right: ComparisonOperandPrimitive<T>,
 ): BasicExpression<boolean>
 export function lte<T>(left: Aggregate<T>, right: any): BasicExpression<boolean>
 export function lte(left: any, right: any): BasicExpression<boolean> {
@@ -180,7 +180,7 @@ export function lte(left: any, right: any): BasicExpression<boolean> {
 // Overloads for and() - support 2 or more arguments
 export function and(
   left: ExpressionLike,
-  right: ExpressionLike
+  right: ExpressionLike,
 ): BasicExpression<boolean>
 export function and(
   left: ExpressionLike,
@@ -195,14 +195,14 @@ export function and(
   const allArgs = [left, right, ...rest]
   return new Func(
     `and`,
-    allArgs.map((arg) => toExpression(arg))
+    allArgs.map((arg) => toExpression(arg)),
   )
 }
 
 // Overloads for or() - support 2 or more arguments
 export function or(
   left: ExpressionLike,
-  right: ExpressionLike
+  right: ExpressionLike,
 ): BasicExpression<boolean>
 export function or(
   left: ExpressionLike,
@@ -217,7 +217,7 @@ export function or(
   const allArgs = [left, right, ...rest]
   return new Func(
     `or`,
-    allArgs.map((arg) => toExpression(arg))
+    allArgs.map((arg) => toExpression(arg)),
   )
 }
 
@@ -236,14 +236,14 @@ export function isNull(value: ExpressionLike): BasicExpression<boolean> {
 
 export function inArray(
   value: ExpressionLike,
-  array: ExpressionLike
+  array: ExpressionLike,
 ): BasicExpression<boolean> {
   return new Func(`in`, [toExpression(value), toExpression(array)])
 }
 
 export function like(
   left: StringLike,
-  right: StringLike
+  right: StringLike,
 ): BasicExpression<boolean>
 export function like(left: any, right: any): BasicExpression<boolean> {
   return new Func(`like`, [toExpression(left), toExpression(right)])
@@ -251,7 +251,7 @@ export function like(left: any, right: any): BasicExpression<boolean> {
 
 export function ilike(
   left: StringLike,
-  right: StringLike
+  right: StringLike,
 ): BasicExpression<boolean> {
   return new Func(`ilike`, [toExpression(left), toExpression(right)])
 }
@@ -259,19 +259,19 @@ export function ilike(
 // Functions
 
 export function upper<T extends ExpressionLike>(
-  arg: T
+  arg: T,
 ): StringFunctionReturnType<T> {
   return new Func(`upper`, [toExpression(arg)]) as StringFunctionReturnType<T>
 }
 
 export function lower<T extends ExpressionLike>(
-  arg: T
+  arg: T,
 ): StringFunctionReturnType<T> {
   return new Func(`lower`, [toExpression(arg)]) as StringFunctionReturnType<T>
 }
 
 export function length<T extends ExpressionLike>(
-  arg: T
+  arg: T,
 ): NumericFunctionReturnType<T> {
   return new Func(`length`, [toExpression(arg)]) as NumericFunctionReturnType<T>
 }
@@ -281,20 +281,20 @@ export function concat(
 ): BasicExpression<string> {
   return new Func(
     `concat`,
-    args.map((arg) => toExpression(arg))
+    args.map((arg) => toExpression(arg)),
   )
 }
 
 export function coalesce(...args: Array<ExpressionLike>): BasicExpression<any> {
   return new Func(
     `coalesce`,
-    args.map((arg) => toExpression(arg))
+    args.map((arg) => toExpression(arg)),
   )
 }
 
 export function add<T1 extends ExpressionLike, T2 extends ExpressionLike>(
   left: T1,
-  right: T2
+  right: T2,
 ): BinaryNumericReturnType<T1, T2> {
   return new Func(`add`, [
     toExpression(left),
diff --git a/packages/db/src/query/builder/index.ts b/packages/db/src/query/builder/index.ts
index e25cca1f4..e7d2be0c4 100644
--- a/packages/db/src/query/builder/index.ts
+++ b/packages/db/src/query/builder/index.ts
@@ -1,4 +1,4 @@
-import { CollectionImpl } from "../../collection/index.js"
+import { CollectionImpl } from '../../collection/index.js'
 import {
   Aggregate as AggregateExpr,
   CollectionRef,
@@ -7,7 +7,7 @@ import {
   QueryRef,
   Value as ValueExpr,
   isExpressionLike,
-} from "../ir.js"
+} from '../ir.js'
 import {
   InvalidSourceError,
   InvalidSourceTypeError,
@@ -15,9 +15,9 @@ import {
   OnlyOneSourceAllowedError,
   QueryMustHaveFromClauseError,
   SubQueryMustHaveFromClauseError,
-} from "../../errors.js"
-import { createRefProxy, toExpression } from "./ref-proxy.js"
-import type { NamespacedRow, SingleResult } from "../../types.js"
+} from '../../errors.js'
+import { createRefProxy, toExpression } from './ref-proxy.js'
+import type { NamespacedRow, SingleResult } from '../../types.js'
 import type {
   Aggregate,
   BasicExpression,
@@ -25,7 +25,7 @@ import type {
   OrderBy,
   OrderByDirection,
   QueryIR,
-} from "../ir.js"
+} from '../ir.js'
 import type {
   CompareOptions,
   Context,
@@ -42,7 +42,7 @@ import type {
   Source,
   WhereCallback,
   WithResult,
-} from "./types.js"
+} from './types.js'
 
 export class BaseQueryBuilder<TContext extends Context = Context> {
   private readonly query: Partial<QueryIR> = {}
@@ -59,7 +59,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
    */
   private _createRefForSource<TSource extends Source>(
     source: TSource,
-    context: string
+    context: string,
   ): [string, CollectionRef | QueryRef] {
     // Validate source is a plain object (not null, array, string, etc.)
     // We use try-catch to handle null/undefined gracefully
@@ -127,7 +127,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
    * ```
    */
   from<TSource extends Source>(
-    source: TSource
+    source: TSource,
   ): QueryBuilder<{
     baseSchema: SchemaFromSource<TSource>
     schema: SchemaFromSource<TSource>
@@ -177,7 +177,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
     onCallback: JoinOnCallback<
       MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
     >,
-    type: TJoinType = `left` as TJoinType
+    type: TJoinType = `left` as TJoinType,
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, TJoinType>
   > {
@@ -243,7 +243,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
     source: TSource,
     onCallback: JoinOnCallback<
       MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
-    >
+    >,
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, `left`>
   > {
@@ -269,7 +269,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
     source: TSource,
     onCallback: JoinOnCallback<
       MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
-    >
+    >,
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, `right`>
   > {
@@ -295,7 +295,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
     source: TSource,
     onCallback: JoinOnCallback<
       MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
-    >
+    >,
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, `inner`>
   > {
@@ -321,7 +321,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
     source: TSource,
     onCallback: JoinOnCallback<
       MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
-    >
+    >,
   ): QueryBuilder<
     MergeContextWithJoinType<TContext, SchemaFromSource<TSource>, `full`>
   > {
@@ -445,7 +445,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
    * ```
    */
   select<TSelectObject extends SelectObject>(
-    callback: (refs: RefsForContext<TContext>) => TSelectObject
+    callback: (refs: RefsForContext<TContext>) => TSelectObject,
   ): QueryBuilder<WithResult<TContext, ResultTypeFromSelect<TSelectObject>>> {
     const aliases = this._getCurrentAliases()
     const refProxy = createRefProxy(aliases) as RefsForContext<TContext>
@@ -487,7 +487,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
    */
   orderBy(
     callback: OrderByCallback<TContext>,
-    options: OrderByDirection | OrderByOptions = `asc`
+    options: OrderByDirection | OrderByOptions = `asc`,
   ): QueryBuilder<TContext> {
     const aliases = this._getCurrentAliases()
     const refProxy = createRefProxy(aliases) as RefsForContext<TContext>
@@ -717,7 +717,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
        * ```
        */
       select<TFuncSelectResult>(
-        callback: (row: TContext[`schema`]) => TFuncSelectResult
+        callback: (row: TContext[`schema`]) => TFuncSelectResult,
       ): QueryBuilder<WithResult<TContext, TFuncSelectResult>> {
         return new BaseQueryBuilder({
           ...builder.query,
@@ -741,7 +741,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
        * ```
        */
       where(
-        callback: (row: TContext[`schema`]) => any
+        callback: (row: TContext[`schema`]) => any,
       ): QueryBuilder<TContext> {
         return new BaseQueryBuilder({
           ...builder.query,
@@ -768,7 +768,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
        * ```
        */
       having(
-        callback: (row: TContext[`schema`]) => any
+        callback: (row: TContext[`schema`]) => any,
       ): QueryBuilder<TContext> {
         return new BaseQueryBuilder({
           ...builder.query,
@@ -829,7 +829,7 @@ function buildNestedSelect(obj: any): any {
 // Internal function to build a query from a callback
 // used by liveQueryCollectionOptions.query
 export function buildQuery<TContext extends Context>(
-  fn: (builder: InitialQueryBuilder) => QueryBuilder<TContext>
+  fn: (builder: InitialQueryBuilder) => QueryBuilder<TContext>,
 ): QueryIR {
   const result = fn(new BaseQueryBuilder())
   return getQueryIR(result)
@@ -837,7 +837,7 @@ export function buildQuery<TContext extends Context>(
 
 // Internal function to get the QueryIR from a builder
 export function getQueryIR(
-  builder: BaseQueryBuilder | QueryBuilder<any> | InitialQueryBuilder
+  builder: BaseQueryBuilder | QueryBuilder<any> | InitialQueryBuilder,
 ): QueryIR {
   return (builder as unknown as BaseQueryBuilder)._getQuery()
 }
@@ -871,4 +871,4 @@ export type {
   GetResult,
   RefLeaf as Ref,
   InferResultType,
-} from "./types.js"
+} from './types.js'
diff --git a/packages/db/src/query/builder/ref-proxy.ts b/packages/db/src/query/builder/ref-proxy.ts
index 0b2296146..2f060b5f2 100644
--- a/packages/db/src/query/builder/ref-proxy.ts
+++ b/packages/db/src/query/builder/ref-proxy.ts
@@ -1,6 +1,6 @@
-import { PropRef, Value } from "../ir.js"
-import type { BasicExpression } from "../ir.js"
-import type { RefLeaf } from "./types.js"
+import { PropRef, Value } from '../ir.js'
+import type { BasicExpression } from '../ir.js'
+import type { RefLeaf } from './types.js'
 
 export interface RefProxy<T = any> {
   /** @internal */
@@ -81,7 +81,7 @@ export function createSingleRowRefProxy<
  * Used in callbacks like where, select, etc. to create type-safe references
  */
 export function createRefProxy<T extends Record<string, any>>(
-  aliases: Array<string>
+  aliases: Array<string>,
 ): RefProxy<T> & T {
   const cache = new Map<string, any>()
   let accessId = 0 // Monotonic counter to record evaluation order
diff --git a/packages/db/src/query/builder/types.ts b/packages/db/src/query/builder/types.ts
index de678282a..62130c0b3 100644
--- a/packages/db/src/query/builder/types.ts
+++ b/packages/db/src/query/builder/types.ts
@@ -1,5 +1,5 @@
-import type { CollectionImpl } from "../../collection/index.js"
-import type { SingleResult, StringCollationConfig } from "../../types.js"
+import type { CollectionImpl } from '../../collection/index.js'
+import type { SingleResult, StringCollationConfig } from '../../types.js'
 import type {
   Aggregate,
   BasicExpression,
@@ -7,8 +7,8 @@ import type {
   OrderByDirection,
   PropRef,
   Value,
-} from "../ir.js"
-import type { QueryBuilder } from "./index.js"
+} from '../ir.js'
+import type { QueryBuilder } from './index.js'
 
 /**
  * Context - The central state container for query builder operations
@@ -121,7 +121,7 @@ export type GetAliases<TContext extends Context> = keyof TContext[`schema`]
  * Example: `(refs) => eq(refs.users.age, 25)`
  */
 export type WhereCallback<TContext extends Context> = (
-  refs: RefsForContext<TContext>
+  refs: RefsForContext<TContext>,
 ) => any
 
 /**
@@ -290,7 +290,7 @@ type NeedsExtraction<T> = T extends
  * Example: `(refs) => refs.users.createdAt`
  */
 export type OrderByCallback<TContext extends Context> = (
-  refs: RefsForContext<TContext>
+  refs: RefsForContext<TContext>,
 ) => any
 
 /**
@@ -326,7 +326,7 @@ export type CompareOptions = StringCollationConfig & {
  * Example: `(refs) => refs.orders.status`
  */
 export type GroupByCallback<TContext extends Context> = (
-  refs: RefsForContext<TContext>
+  refs: RefsForContext<TContext>,
 ) => any
 
 /**
@@ -342,7 +342,7 @@ export type GroupByCallback<TContext extends Context> = (
  * Example: `(refs) => eq(refs.users.id, refs.orders.userId)`
  */
 export type JoinOnCallback<TContext extends Context> = (
-  refs: RefsForContext<TContext>
+  refs: RefsForContext<TContext>,
 ) => any
 
 /**
diff --git a/packages/db/src/query/compiler/evaluators.ts b/packages/db/src/query/compiler/evaluators.ts
index 19c69663d..8a2168781 100644
--- a/packages/db/src/query/compiler/evaluators.ts
+++ b/packages/db/src/query/compiler/evaluators.ts
@@ -2,10 +2,10 @@ import {
   EmptyReferencePathError,
   UnknownExpressionTypeError,
   UnknownFunctionError,
-} from "../../errors.js"
-import { areValuesEqual, normalizeValue } from "../../utils/comparison.js"
-import type { BasicExpression, Func, PropRef } from "../ir.js"
-import type { NamespacedRow } from "../../types.js"
+} from '../../errors.js'
+import { areValuesEqual, normalizeValue } from '../../utils/comparison.js'
+import type { BasicExpression, Func, PropRef } from '../ir.js'
+import type { NamespacedRow } from '../../types.js'
 
 /**
  * Helper function to check if a value is null or undefined (represents UNKNOWN in 3-valued logic)
@@ -46,7 +46,7 @@ export type CompiledSingleRowExpression = (item: Record<string, unknown>) => any
  */
 export function compileExpression(
   expr: BasicExpression,
-  isSingleRow: boolean = false
+  isSingleRow: boolean = false,
 ): CompiledExpression | CompiledSingleRowExpression {
   const compiledFn = compileExpressionInternal(expr, isSingleRow)
   return compiledFn
@@ -56,7 +56,7 @@ export function compileExpression(
  * Compiles a single-row expression into an optimized evaluator function.
  */
 export function compileSingleRowExpression(
-  expr: BasicExpression
+  expr: BasicExpression,
 ): CompiledSingleRowExpression {
   const compiledFn = compileExpressionInternal(expr, true)
   return compiledFn as CompiledSingleRowExpression
@@ -67,7 +67,7 @@ export function compileSingleRowExpression(
  */
 function compileExpressionInternal(
   expr: BasicExpression,
-  isSingleRow: boolean
+  isSingleRow: boolean,
 ): (data: any) => any {
   switch (expr.type) {
     case `val`: {
@@ -157,7 +157,7 @@ function compileSingleRowRef(ref: PropRef): CompiledSingleRowExpression {
 function compileFunction(func: Func, isSingleRow: boolean): (data: any) => any {
   // Pre-compile all arguments using the appropriate compiler
   const compiledArgs = func.args.map((arg) =>
-    compileExpressionInternal(arg, isSingleRow)
+    compileExpressionInternal(arg, isSingleRow),
   )
 
   switch (func.name) {
@@ -463,7 +463,7 @@ function compileFunction(func: Func, isSingleRow: boolean): (data: any) => any {
 function evaluateLike(
   value: any,
   pattern: any,
-  caseInsensitive: boolean
+  caseInsensitive: boolean,
 ): boolean {
   if (typeof value !== `string` || typeof pattern !== `string`) {
     return false
diff --git a/packages/db/src/query/compiler/expressions.ts b/packages/db/src/query/compiler/expressions.ts
index ad7e4f317..f2856ed7e 100644
--- a/packages/db/src/query/compiler/expressions.ts
+++ b/packages/db/src/query/compiler/expressions.ts
@@ -1,5 +1,5 @@
-import { Func, PropRef, Value } from "../ir.js"
-import type { BasicExpression, OrderBy } from "../ir.js"
+import { Func, PropRef, Value } from '../ir.js'
+import type { BasicExpression, OrderBy } from '../ir.js'
 
 /**
  * Normalizes a WHERE clause expression by removing table aliases from property references.
@@ -20,7 +20,7 @@ import type { BasicExpression, OrderBy } from "../ir.js"
  */
 export function normalizeExpressionPaths(
   whereClause: BasicExpression<boolean>,
-  collectionAlias: string
+  collectionAlias: string,
 ): BasicExpression<boolean> {
   const tpe = whereClause.type
   if (tpe === `val`) {
@@ -44,7 +44,7 @@ export function normalizeExpressionPaths(
     for (const arg of whereClause.args) {
       const convertedArg = normalizeExpressionPaths(
         arg as BasicExpression<boolean>,
-        collectionAlias
+        collectionAlias,
       )
       args.push(convertedArg)
     }
@@ -54,12 +54,12 @@ export function normalizeExpressionPaths(
 
 export function normalizeOrderByPaths(
   orderBy: OrderBy,
-  collectionAlias: string
+  collectionAlias: string,
 ): OrderBy {
   const normalizedOrderBy = orderBy.map((clause) => {
     const basicExp = normalizeExpressionPaths(
       clause.expression,
-      collectionAlias
+      collectionAlias,
     )
 
     return {
diff --git a/packages/db/src/query/compiler/group-by.ts b/packages/db/src/query/compiler/group-by.ts
index 5101245bb..e9c8fa436 100644
--- a/packages/db/src/query/compiler/group-by.ts
+++ b/packages/db/src/query/compiler/group-by.ts
@@ -1,20 +1,20 @@
-import { filter, groupBy, groupByOperators, map } from "@tanstack/db-ivm"
-import { Func, PropRef, getHavingExpression } from "../ir.js"
+import { filter, groupBy, groupByOperators, map } from '@tanstack/db-ivm'
+import { Func, PropRef, getHavingExpression } from '../ir.js'
 import {
   AggregateFunctionNotInSelectError,
   NonAggregateExpressionNotInGroupByError,
   UnknownHavingExpressionTypeError,
   UnsupportedAggregateFunctionError,
-} from "../../errors.js"
-import { compileExpression, toBooleanPredicate } from "./evaluators.js"
+} from '../../errors.js'
+import { compileExpression, toBooleanPredicate } from './evaluators.js'
 import type {
   Aggregate,
   BasicExpression,
   GroupBy,
   Having,
   Select,
-} from "../ir.js"
-import type { NamespacedAndKeyedStream, NamespacedRow } from "../../types.js"
+} from '../ir.js'
+import type { NamespacedAndKeyedStream, NamespacedRow } from '../../types.js'
 
 const { sum, count, avg, min, max } = groupByOperators
 
@@ -32,7 +32,7 @@ interface GroupBySelectMapping {
  */
 function validateAndCreateMapping(
   groupByClause: GroupBy,
-  selectClause?: Select
+  selectClause?: Select,
 ): GroupBySelectMapping {
   const selectToGroupByIndex = new Map<string, number>()
   const groupByExpressions = [...groupByClause]
@@ -50,7 +50,7 @@ function validateAndCreateMapping(
 
     // Non-aggregate expression must be in GROUP BY
     const groupIndex = groupByExpressions.findIndex((groupExpr) =>
-      expressionsEqual(expr, groupExpr)
+      expressionsEqual(expr, groupExpr),
     )
 
     if (groupIndex === -1) {
@@ -73,7 +73,7 @@ export function processGroupBy(
   groupByClause: GroupBy,
   havingClauses?: Array<Having>,
   selectClause?: Select,
-  fnHavingClauses?: Array<(row: any) => any>
+  fnHavingClauses?: Array<(row: any) => any>,
 ): NamespacedAndKeyedStream {
   // Handle empty GROUP BY (single-group aggregation)
   if (groupByClause.length === 0) {
@@ -95,7 +95,7 @@ export function processGroupBy(
 
     // Apply the groupBy operator with single group
     pipeline = pipeline.pipe(
-      groupBy(keyExtractor, aggregates)
+      groupBy(keyExtractor, aggregates),
     ) as NamespacedAndKeyedStream
 
     // Update __select_results to include aggregate values
@@ -123,7 +123,7 @@ export function processGroupBy(
             __select_results: finalResults,
           },
         ] as [unknown, Record<string, any>]
-      })
+      }),
     )
 
     // Apply HAVING clauses if present
@@ -132,7 +132,7 @@ export function processGroupBy(
         const havingExpression = getHavingExpression(havingClause)
         const transformedHavingClause = replaceAggregatesByRefs(
           havingExpression,
-          selectClause || {}
+          selectClause || {},
         )
         const compiledHaving = compileExpression(transformedHavingClause)
 
@@ -141,7 +141,7 @@ export function processGroupBy(
             // Create a namespaced row structure for HAVING evaluation
             const namespacedRow = { result: (row as any).__select_results }
             return toBooleanPredicate(compiledHaving(namespacedRow))
-          })
+          }),
         )
       }
     }
@@ -154,7 +154,7 @@ export function processGroupBy(
             // Create a namespaced row structure for functional HAVING evaluation
             const namespacedRow = { result: (row as any).__select_results }
             return toBooleanPredicate(fnHaving(namespacedRow))
-          })
+          }),
         )
       }
     }
@@ -168,7 +168,7 @@ export function processGroupBy(
 
   // Pre-compile groupBy expressions
   const compiledGroupByExpressions = groupByClause.map((e) =>
-    compileExpression(e)
+    compileExpression(e),
   )
 
   // Create a key extractor function using simple __key_X format
@@ -258,7 +258,7 @@ export function processGroupBy(
           __select_results: finalResults,
         },
       ] as [unknown, Record<string, any>]
-    })
+    }),
   )
 
   // Apply HAVING clauses if present
@@ -267,7 +267,7 @@ export function processGroupBy(
       const havingExpression = getHavingExpression(havingClause)
       const transformedHavingClause = replaceAggregatesByRefs(
         havingExpression,
-        selectClause || {}
+        selectClause || {},
       )
       const compiledHaving = compileExpression(transformedHavingClause)
 
@@ -276,7 +276,7 @@ export function processGroupBy(
           // Create a namespaced row structure for HAVING evaluation
           const namespacedRow = { result: (row as any).__select_results }
           return compiledHaving(namespacedRow)
-        })
+        }),
       )
     }
   }
@@ -289,7 +289,7 @@ export function processGroupBy(
           // Create a namespaced row structure for functional HAVING evaluation
           const namespacedRow = { result: (row as any).__select_results }
           return toBooleanPredicate(fnHaving(namespacedRow))
-        })
+        }),
       )
     }
   }
@@ -310,7 +310,7 @@ function expressionsEqual(expr1: any, expr2: any): boolean {
       if (!expr1.path || !expr2.path) return false
       if (expr1.path.length !== expr2.path.length) return false
       return expr1.path.every(
-        (segment: string, i: number) => segment === expr2.path[i]
+        (segment: string, i: number) => segment === expr2.path[i],
       )
     case `val`:
       return expr1.value === expr2.value
@@ -319,7 +319,7 @@ function expressionsEqual(expr1: any, expr2: any): boolean {
         expr1.name === expr2.name &&
         expr1.args?.length === expr2.args?.length &&
         (expr1.args || []).every((arg: any, i: number) =>
-          expressionsEqual(arg, expr2.args[i])
+          expressionsEqual(arg, expr2.args[i]),
         )
       )
     case `agg`:
@@ -327,7 +327,7 @@ function expressionsEqual(expr1: any, expr2: any): boolean {
         expr1.name === expr2.name &&
         expr1.args?.length === expr2.args?.length &&
         (expr1.args || []).every((arg: any, i: number) =>
-          expressionsEqual(arg, expr2.args[i])
+          expressionsEqual(arg, expr2.args[i]),
         )
       )
     default:
@@ -390,7 +390,7 @@ function getAggregateFunction(aggExpr: Aggregate) {
 export function replaceAggregatesByRefs(
   havingExpr: BasicExpression | Aggregate,
   selectClause: Select,
-  resultAlias: string = `result`
+  resultAlias: string = `result`,
 ): BasicExpression {
   switch (havingExpr.type) {
     case `agg`: {
@@ -411,7 +411,7 @@ export function replaceAggregatesByRefs(
       // Transform function arguments recursively
       const transformedArgs = funcExpr.args.map(
         (arg: BasicExpression | Aggregate) =>
-          replaceAggregatesByRefs(arg, selectClause)
+          replaceAggregatesByRefs(arg, selectClause),
       )
       return new Func(funcExpr.name, transformedArgs)
     }
diff --git a/packages/db/src/query/compiler/index.ts b/packages/db/src/query/compiler/index.ts
index 36245f75e..7d5995871 100644
--- a/packages/db/src/query/compiler/index.ts
+++ b/packages/db/src/query/compiler/index.ts
@@ -1,5 +1,5 @@
-import { distinct, filter, map } from "@tanstack/db-ivm"
-import { optimizeQuery } from "../optimizer.js"
+import { distinct, filter, map } from '@tanstack/db-ivm'
+import { optimizeQuery } from '../optimizer.js'
 import {
   CollectionInputNotFoundError,
   DistinctRequiresSelectError,
@@ -7,31 +7,31 @@ import {
   HavingRequiresGroupByError,
   LimitOffsetRequireOrderByError,
   UnsupportedFromTypeError,
-} from "../../errors.js"
-import { PropRef, Value as ValClass, getWhereExpression } from "../ir.js"
-import { compileExpression, toBooleanPredicate } from "./evaluators.js"
-import { processJoins } from "./joins.js"
-import { processGroupBy } from "./group-by.js"
-import { processOrderBy } from "./order-by.js"
-import { processSelect } from "./select.js"
-import type { CollectionSubscription } from "../../collection/subscription.js"
-import type { OrderByOptimizationInfo } from "./order-by.js"
+} from '../../errors.js'
+import { PropRef, Value as ValClass, getWhereExpression } from '../ir.js'
+import { compileExpression, toBooleanPredicate } from './evaluators.js'
+import { processJoins } from './joins.js'
+import { processGroupBy } from './group-by.js'
+import { processOrderBy } from './order-by.js'
+import { processSelect } from './select.js'
+import type { CollectionSubscription } from '../../collection/subscription.js'
+import type { OrderByOptimizationInfo } from './order-by.js'
 import type {
   BasicExpression,
   CollectionRef,
   QueryIR,
   QueryRef,
-} from "../ir.js"
-import type { LazyCollectionCallbacks } from "./joins.js"
-import type { Collection } from "../../collection/index.js"
+} from '../ir.js'
+import type { LazyCollectionCallbacks } from './joins.js'
+import type { Collection } from '../../collection/index.js'
 import type {
   KeyedStream,
   NamespacedAndKeyedStream,
   ResultStream,
-} from "../../types.js"
-import type { QueryCache, QueryMapping, WindowOptions } from "./types.js"
+} from '../../types.js'
+import type { QueryCache, QueryMapping, WindowOptions } from './types.js'
 
-export type { WindowOptions } from "./types.js"
+export type { WindowOptions } from './types.js'
 
 /**
  * Result of query compilation including both the pipeline and source-specific WHERE clauses
@@ -92,7 +92,7 @@ export function compileQuery(
   optimizableOrderByCollections: Record<string, OrderByOptimizationInfo>,
   setWindowFn: (windowFn: (options: WindowOptions) => void) => void,
   cache: QueryCache = new WeakMap(),
-  queryMapping: QueryMapping = new WeakMap()
+  queryMapping: QueryMapping = new WeakMap(),
 ): CompilationResult {
   // Check if the original raw query has already been compiled
   const cachedResult = cache.get(rawQuery)
@@ -147,7 +147,7 @@ export function compileQuery(
     cache,
     queryMapping,
     aliasToCollectionId,
-    aliasRemapping
+    aliasRemapping,
   )
   sources[mainSource] = mainInput
 
@@ -160,7 +160,7 @@ export function compileQuery(
         Record<string, typeof row>,
       ]
       return ret
-    })
+    }),
   )
 
   // Process JOIN clauses if they exist
@@ -183,7 +183,7 @@ export function compileQuery(
       rawQuery,
       compileQuery,
       aliasToCollectionId,
-      aliasRemapping
+      aliasRemapping,
     )
   }
 
@@ -196,7 +196,7 @@ export function compileQuery(
       pipeline = pipeline.pipe(
         filter(([_key, namespacedRow]) => {
           return toBooleanPredicate(compiledWhere(namespacedRow))
-        })
+        }),
       )
     }
   }
@@ -207,7 +207,7 @@ export function compileQuery(
       pipeline = pipeline.pipe(
         filter(([_key, namespacedRow]) => {
           return toBooleanPredicate(fnWhere(namespacedRow))
-        })
+        }),
       )
     }
   }
@@ -230,7 +230,7 @@ export function compileQuery(
             __select_results: selectResults,
           },
         ] as [string, typeof namespacedRow & { __select_results: any }]
-      })
+      }),
     )
   } else if (query.select) {
     pipeline = processSelect(pipeline, query.select, allInputs)
@@ -250,7 +250,7 @@ export function compileQuery(
             __select_results: selectResults,
           },
         ] as [string, typeof namespacedRow & { __select_results: any }]
-      })
+      }),
     )
   }
 
@@ -261,12 +261,12 @@ export function compileQuery(
       query.groupBy,
       query.having,
       query.select,
-      query.fnHaving
+      query.fnHaving,
     )
   } else if (query.select) {
     // Check if SELECT contains aggregates but no GROUP BY (implicit single-group aggregation)
     const hasAggregates = Object.values(query.select).some(
-      (expr) => expr.type === `agg`
+      (expr) => expr.type === `agg`,
     )
     if (hasAggregates) {
       // Handle implicit single-group aggregation
@@ -275,7 +275,7 @@ export function compileQuery(
         [], // Empty group by means single group
         query.having,
         query.select,
-        query.fnHaving
+        query.fnHaving,
       )
     }
   }
@@ -303,7 +303,7 @@ export function compileQuery(
       pipeline = pipeline.pipe(
         filter(([_key, namespacedRow]) => {
           return fnHaving(namespacedRow)
-        })
+        }),
       )
     }
   }
@@ -324,7 +324,7 @@ export function compileQuery(
       optimizableOrderByCollections,
       setWindowFn,
       query.limit,
-      query.offset
+      query.offset,
     )
 
     // Final step: extract the __select_results and include orderBy index
@@ -334,7 +334,7 @@ export function compileQuery(
         const raw = (row as any).__select_results
         const finalResults = unwrapValue(raw)
         return [key, [finalResults, orderByIndex]] as [unknown, [any, string]]
-      })
+      }),
     )
 
     const result = resultPipeline
@@ -364,7 +364,7 @@ export function compileQuery(
         unknown,
         [any, string | undefined],
       ]
-    })
+    }),
   )
 
   const result = resultPipeline
@@ -413,7 +413,7 @@ function collectDirectCollectionAliases(query: QueryIR): Set<string> {
  */
 function validateQueryStructure(
   query: QueryIR,
-  parentCollectionAliases: Set<string> = new Set()
+  parentCollectionAliases: Set<string> = new Set(),
 ): void {
   // Collect direct collection aliases from this query level
   const currentLevelAliases = collectDirectCollectionAliases(query)
@@ -423,7 +423,7 @@ function validateQueryStructure(
     if (parentCollectionAliases.has(alias)) {
       throw new DuplicateAliasInSubqueryError(
         alias,
-        Array.from(parentCollectionAliases)
+        Array.from(parentCollectionAliases),
       )
     }
   }
@@ -465,7 +465,7 @@ function processFrom(
   cache: QueryCache,
   queryMapping: QueryMapping,
   aliasToCollectionId: Record<string, string>,
-  aliasRemapping: Record<string, string>
+  aliasRemapping: Record<string, string>,
 ): { alias: string; input: KeyedStream; collectionId: string } {
   switch (from.type) {
     case `collectionRef`: {
@@ -474,7 +474,7 @@ function processFrom(
         throw new CollectionInputNotFoundError(
           from.alias,
           from.collection.id,
-          Object.keys(allInputs)
+          Object.keys(allInputs),
         )
       }
       aliasToCollectionId[from.alias] = from.collection.id
@@ -495,7 +495,7 @@ function processFrom(
         optimizableOrderByCollections,
         setWindowFn,
         cache,
-        queryMapping
+        queryMapping,
       )
 
       // Pull up alias mappings from subquery to parent scope.
@@ -519,7 +519,7 @@ function processFrom(
       const innerAlias = Object.keys(subQueryResult.aliasToCollectionId).find(
         (alias) =>
           subQueryResult.aliasToCollectionId[alias] ===
-          subQueryResult.collectionId
+          subQueryResult.collectionId,
       )
       if (innerAlias && innerAlias !== from.alias) {
         aliasRemapping[from.alias] = innerAlias
@@ -536,7 +536,7 @@ function processFrom(
           // Unwrap Value expressions that might have leaked through as the entire row
           const unwrapped = unwrapValue(value)
           return [key, unwrapped] as [unknown, any]
-        })
+        }),
       )
 
       return {
@@ -571,7 +571,7 @@ function unwrapValue(value: any): any {
 function mapNestedQueries(
   optimizedQuery: QueryIR,
   originalQuery: QueryIR,
-  queryMapping: QueryMapping
+  queryMapping: QueryMapping,
 ): void {
   // Map the FROM clause if it's a QueryRef
   if (
@@ -583,7 +583,7 @@ function mapNestedQueries(
     mapNestedQueries(
       optimizedQuery.from.query,
       originalQuery.from.query,
-      queryMapping
+      queryMapping,
     )
   }
 
@@ -606,7 +606,7 @@ function mapNestedQueries(
         mapNestedQueries(
           optimizedJoin.from.query,
           originalJoin.from.query,
-          queryMapping
+          queryMapping,
         )
       }
     }
@@ -615,7 +615,7 @@ function mapNestedQueries(
 
 function getRefFromAlias(
   query: QueryIR,
-  alias: string
+  alias: string,
 ): CollectionRef | QueryRef | void {
   if (query.from.alias === alias) {
     return query.from
@@ -636,7 +636,7 @@ function getRefFromAlias(
 export function followRef(
   query: QueryIR,
   ref: PropRef<any>,
-  collection: Collection
+  collection: Collection,
 ): { collection: Collection; path: Array<string> } | void {
   if (ref.path.length === 0) {
     return
diff --git a/packages/db/src/query/compiler/joins.ts b/packages/db/src/query/compiler/joins.ts
index 505f90bf3..afa5276b1 100644
--- a/packages/db/src/query/compiler/joins.ts
+++ b/packages/db/src/query/compiler/joins.ts
@@ -1,4 +1,4 @@
-import { filter, join as joinOperator, map, tap } from "@tanstack/db-ivm"
+import { filter, join as joinOperator, map, tap } from '@tanstack/db-ivm'
 import {
   CollectionInputNotFoundError,
   InvalidJoinCondition,
@@ -10,29 +10,29 @@ import {
   SubscriptionNotFoundError,
   UnsupportedJoinSourceTypeError,
   UnsupportedJoinTypeError,
-} from "../../errors.js"
-import { ensureIndexForField } from "../../indexes/auto-index.js"
-import { PropRef, followRef } from "../ir.js"
-import { inArray } from "../builder/functions.js"
-import { compileExpression } from "./evaluators.js"
-import type { CompileQueryFn } from "./index.js"
-import type { OrderByOptimizationInfo } from "./order-by.js"
+} from '../../errors.js'
+import { ensureIndexForField } from '../../indexes/auto-index.js'
+import { PropRef, followRef } from '../ir.js'
+import { inArray } from '../builder/functions.js'
+import { compileExpression } from './evaluators.js'
+import type { CompileQueryFn } from './index.js'
+import type { OrderByOptimizationInfo } from './order-by.js'
 import type {
   BasicExpression,
   CollectionRef,
   JoinClause,
   QueryIR,
   QueryRef,
-} from "../ir.js"
-import type { IStreamBuilder, JoinType } from "@tanstack/db-ivm"
-import type { Collection } from "../../collection/index.js"
+} from '../ir.js'
+import type { IStreamBuilder, JoinType } from '@tanstack/db-ivm'
+import type { Collection } from '../../collection/index.js'
 import type {
   KeyedStream,
   NamespacedAndKeyedStream,
   NamespacedRow,
-} from "../../types.js"
-import type { QueryCache, QueryMapping, WindowOptions } from "./types.js"
-import type { CollectionSubscription } from "../../collection/subscription.js"
+} from '../../types.js'
+import type { QueryCache, QueryMapping, WindowOptions } from './types.js'
+import type { CollectionSubscription } from '../../collection/subscription.js'
 
 /** Function type for loading specific keys into a lazy collection */
 export type LoadKeysFn = (key: Set<string | number>) => void
@@ -65,7 +65,7 @@ export function processJoins(
   rawQuery: QueryIR,
   onCompileSubquery: CompileQueryFn,
   aliasToCollectionId: Record<string, string>,
-  aliasRemapping: Record<string, string>
+  aliasRemapping: Record<string, string>,
 ): NamespacedAndKeyedStream {
   let resultPipeline = pipeline
 
@@ -88,7 +88,7 @@ export function processJoins(
       rawQuery,
       onCompileSubquery,
       aliasToCollectionId,
-      aliasRemapping
+      aliasRemapping,
     )
   }
 
@@ -117,7 +117,7 @@ function processJoin(
   rawQuery: QueryIR,
   onCompileSubquery: CompileQueryFn,
   aliasToCollectionId: Record<string, string>,
-  aliasRemapping: Record<string, string>
+  aliasRemapping: Record<string, string>,
 ): NamespacedAndKeyedStream {
   const isCollectionRef = joinClause.from.type === `collectionRef`
 
@@ -139,7 +139,7 @@ function processJoin(
     queryMapping,
     onCompileSubquery,
     aliasToCollectionId,
-    aliasRemapping
+    aliasRemapping,
   )
 
   // Add the joined source to the sources map
@@ -164,7 +164,7 @@ function processJoin(
   const { activeSource, lazySource } = getActiveAndLazySources(
     joinClause.type,
     mainCollection,
-    joinedCollection
+    joinedCollection,
   )
 
   // Analyze which source each expression refers to and swap if necessary
@@ -173,7 +173,7 @@ function processJoin(
     joinClause.left,
     joinClause.right,
     availableSources,
-    joinedSource
+    joinedSource,
   )
 
   // Pre-compile the join expressions
@@ -191,7 +191,7 @@ function processJoin(
         unknown,
         [string, typeof namespacedRow],
       ]
-    })
+    }),
   )
 
   // Prepare the joined pipeline
@@ -208,7 +208,7 @@ function processJoin(
         unknown,
         [string, typeof namespacedRow],
       ]
-    })
+    }),
   )
 
   // Apply the join operation
@@ -255,7 +255,7 @@ function processJoin(
       const followRefResult = followRef(
         rawQuery,
         lazySourceJoinExpr,
-        lazySource
+        lazySource,
       )!
       const followRefCollection = followRefResult.collection
 
@@ -264,7 +264,7 @@ function processJoin(
         ensureIndexForField(
           fieldName,
           followRefResult.path,
-          followRefCollection
+          followRefCollection,
         )
       }
 
@@ -288,7 +288,7 @@ function processJoin(
               resolvedAlias,
               lazyAlias,
               lazySource.id,
-              Object.keys(subscriptions)
+              Object.keys(subscriptions),
             )
           }
 
@@ -309,7 +309,7 @@ function processJoin(
             // Snapshot wasn't sent because it could not be loaded from the indexes
             lazySourceSubscription.requestSnapshot()
           }
-        })
+        }),
       )
 
       if (activeSource === `main`) {
@@ -322,7 +322,7 @@ function processJoin(
 
   return mainPipeline.pipe(
     joinOperator(joinedPipeline, joinClause.type as JoinType),
-    processJoinResults(joinClause.type)
+    processJoinResults(joinClause.type),
   )
 }
 
@@ -334,11 +334,11 @@ function analyzeJoinExpressions(
   left: BasicExpression,
   right: BasicExpression,
   allAvailableSourceAliases: Array<string>,
-  joinedSource: string
+  joinedSource: string,
 ): { mainExpr: BasicExpression; joinedExpr: BasicExpression } {
   // Filter out the joined source alias from the available source aliases
   const availableSources = allAvailableSourceAliases.filter(
-    (alias) => alias !== joinedSource
+    (alias) => alias !== joinedSource,
   )
 
   const leftSourceAlias = getSourceAliasFromExpression(left)
@@ -430,7 +430,7 @@ function processJoinSource(
   queryMapping: QueryMapping,
   onCompileSubquery: CompileQueryFn,
   aliasToCollectionId: Record<string, string>,
-  aliasRemapping: Record<string, string>
+  aliasRemapping: Record<string, string>,
 ): { alias: string; input: KeyedStream; collectionId: string } {
   switch (from.type) {
     case `collectionRef`: {
@@ -439,7 +439,7 @@ function processJoinSource(
         throw new CollectionInputNotFoundError(
           from.alias,
           from.collection.id,
-          Object.keys(allInputs)
+          Object.keys(allInputs),
         )
       }
       aliasToCollectionId[from.alias] = from.collection.id
@@ -460,7 +460,7 @@ function processJoinSource(
         optimizableOrderByCollections,
         setWindowFn,
         cache,
-        queryMapping
+        queryMapping,
       )
 
       // Pull up alias mappings from subquery to parent scope.
@@ -483,7 +483,7 @@ function processJoinSource(
       const innerAlias = Object.keys(subQueryResult.aliasToCollectionId).find(
         (alias) =>
           subQueryResult.aliasToCollectionId[alias] ===
-          subQueryResult.collectionId
+          subQueryResult.collectionId,
       )
       if (innerAlias && innerAlias !== from.alias) {
         aliasRemapping[from.alias] = innerAlias
@@ -498,7 +498,7 @@ function processJoinSource(
         map((data: any) => {
           const [key, [value, _orderByIndex]] = data
           return [key, value] as [unknown, any]
-        })
+        }),
       )
 
       return {
@@ -525,7 +525,7 @@ function processJoinResults(joinType: string) {
           [string, NamespacedRow] | undefined,
         ],
       ]
-    >
+    >,
   ): NamespacedAndKeyedStream {
     return pipeline.pipe(
       // Process the join result and handle nulls
@@ -574,7 +574,7 @@ function processJoinResults(joinType: string) {
         const resultKey = `[${mainKey},${joinedKey}]`
 
         return [resultKey, mergedNamespacedRow] as [string, NamespacedRow]
-      })
+      }),
     )
   }
 }
@@ -592,7 +592,7 @@ function processJoinResults(joinType: string) {
 function getActiveAndLazySources(
   joinType: JoinClause[`type`],
   leftCollection: Collection,
-  rightCollection: Collection
+  rightCollection: Collection,
 ):
   | { activeSource: `main` | `joined`; lazySource: Collection }
   | { activeSource: undefined; lazySource: undefined } {
diff --git a/packages/db/src/query/compiler/order-by.ts b/packages/db/src/query/compiler/order-by.ts
index 355f922bf..4362ff635 100644
--- a/packages/db/src/query/compiler/order-by.ts
+++ b/packages/db/src/query/compiler/order-by.ts
@@ -1,22 +1,22 @@
-import { orderByWithFractionalIndex } from "@tanstack/db-ivm"
-import { defaultComparator, makeComparator } from "../../utils/comparison.js"
-import { PropRef, followRef } from "../ir.js"
-import { ensureIndexForField } from "../../indexes/auto-index.js"
-import { findIndexForField } from "../../utils/index-optimization.js"
-import { compileExpression } from "./evaluators.js"
-import { replaceAggregatesByRefs } from "./group-by.js"
-import type { CompareOptions } from "../builder/types.js"
-import type { WindowOptions } from "./types.js"
-import type { CompiledSingleRowExpression } from "./evaluators.js"
-import type { OrderBy, OrderByClause, QueryIR, Select } from "../ir.js"
+import { orderByWithFractionalIndex } from '@tanstack/db-ivm'
+import { defaultComparator, makeComparator } from '../../utils/comparison.js'
+import { PropRef, followRef } from '../ir.js'
+import { ensureIndexForField } from '../../indexes/auto-index.js'
+import { findIndexForField } from '../../utils/index-optimization.js'
+import { compileExpression } from './evaluators.js'
+import { replaceAggregatesByRefs } from './group-by.js'
+import type { CompareOptions } from '../builder/types.js'
+import type { WindowOptions } from './types.js'
+import type { CompiledSingleRowExpression } from './evaluators.js'
+import type { OrderBy, OrderByClause, QueryIR, Select } from '../ir.js'
 import type {
   CollectionLike,
   NamespacedAndKeyedStream,
   NamespacedRow,
-} from "../../types.js"
-import type { IStreamBuilder, KeyValue } from "@tanstack/db-ivm"
-import type { IndexInterface } from "../../indexes/base-index.js"
-import type { Collection } from "../../collection/index.js"
+} from '../../types.js'
+import type { IStreamBuilder, KeyValue } from '@tanstack/db-ivm'
+import type { IndexInterface } from '../../indexes/base-index.js'
+import type { Collection } from '../../collection/index.js'
 
 export type OrderByOptimizationInfo = {
   alias: string
@@ -25,10 +25,14 @@ export type OrderByOptimizationInfo = {
   limit: number
   comparator: (
     a: Record<string, unknown> | null | undefined,
-    b: Record<string, unknown> | null | undefined
+    b: Record<string, unknown> | null | undefined,
   ) => number
-  valueExtractorForRawRow: (row: Record<string, unknown>) => any
-  index: IndexInterface<string | number>
+  /** Extracts all orderBy column values from a raw row (array for multi-column) */
+  valueExtractorForRawRow: (row: Record<string, unknown>) => unknown
+  /** Extracts only the first column value - used for index-based cursor */
+  firstColumnValueExtractor: (row: Record<string, unknown>) => unknown
+  /** Index on the first orderBy column - used for lazy loading */
+  index?: IndexInterface<string | number>
   dataNeeded?: () => number
 }
 
@@ -46,14 +50,14 @@ export function processOrderBy(
   optimizableOrderByCollections: Record<string, OrderByOptimizationInfo>,
   setWindowFn: (windowFn: (options: WindowOptions) => void) => void,
   limit?: number,
-  offset?: number
+  offset?: number,
 ): IStreamBuilder<KeyValue<unknown, [NamespacedRow, string]>> {
   // Pre-compile all order by expressions
   const compiledOrderBy = orderByClause.map((clause) => {
     const clauseWithoutAggregates = replaceAggregatesByRefs(
       clause.expression,
       selectClause,
-      `__select_results`
+      `__select_results`,
     )
 
     return {
@@ -74,7 +78,7 @@ export function processOrderBy(
     if (orderByClause.length > 1) {
       // For multiple orderBy columns, create a composite key
       return compiledOrderBy.map((compiled) =>
-        compiled.compiledExpression(orderByContext)
+        compiled.compiledExpression(orderByContext),
       )
     } else if (orderByClause.length === 1) {
       // For a single orderBy column, use the value directly
@@ -117,76 +121,165 @@ export function processOrderBy(
 
   let orderByOptimizationInfo: OrderByOptimizationInfo | undefined
 
-  // Optimize the orderBy operator to lazily load elements
-  // by using the range index of the collection.
-  // Only for orderBy clause on a single column for now (no composite ordering)
-  if (limit && orderByClause.length === 1) {
-    const clause = orderByClause[0]!
-    const orderByExpression = clause.expression
+  // When there's a limit, we create orderByOptimizationInfo to pass orderBy/limit
+  // to loadSubset so the sync layer can optimize the query.
+  // We try to use an index on the FIRST orderBy column for lazy loading,
+  // even for multi-column orderBy (using wider bounds on first column).
+  if (limit) {
+    let index: IndexInterface<string | number> | undefined
+    let followRefCollection: Collection | undefined
+    let firstColumnValueExtractor: CompiledSingleRowExpression | undefined
+    let orderByAlias: string = rawQuery.from.alias
 
-    if (orderByExpression.type === `ref`) {
+    // Try to create/find an index on the FIRST orderBy column for lazy loading
+    const firstClause = orderByClause[0]!
+    const firstOrderByExpression = firstClause.expression
+
+    if (firstOrderByExpression.type === `ref`) {
       const followRefResult = followRef(
         rawQuery,
-        orderByExpression,
-        collection
-      )!
-
-      const followRefCollection = followRefResult.collection
-      const fieldName = followRefResult.path[0]
-      const compareOpts = buildCompareOptions(clause, followRefCollection)
-      if (fieldName) {
-        ensureIndexForField(
-          fieldName,
-          followRefResult.path,
+        firstOrderByExpression,
+        collection,
+      )
+
+      if (followRefResult) {
+        followRefCollection = followRefResult.collection
+        const fieldName = followRefResult.path[0]
+        const compareOpts = buildCompareOptions(
+          firstClause,
           followRefCollection,
-          compareOpts,
-          compare
         )
-      }
 
-      const valueExtractorForRawRow = compileExpression(
-        new PropRef(followRefResult.path),
-        true
-      ) as CompiledSingleRowExpression
+        if (fieldName) {
+          ensureIndexForField(
+            fieldName,
+            followRefResult.path,
+            followRefCollection,
+            compareOpts,
+            compare,
+          )
+        }
 
-      const comparator = (
-        a: Record<string, unknown> | null | undefined,
-        b: Record<string, unknown> | null | undefined
-      ) => {
-        const extractedA = a ? valueExtractorForRawRow(a) : a
-        const extractedB = b ? valueExtractorForRawRow(b) : b
-        return compare(extractedA, extractedB)
-      }
+        // First column value extractor - used for index cursor
+        firstColumnValueExtractor = compileExpression(
+          new PropRef(followRefResult.path),
+          true,
+        ) as CompiledSingleRowExpression
 
-      const index: IndexInterface<string | number> | undefined =
-        findIndexForField(
+        index = findIndexForField(
           followRefCollection,
           followRefResult.path,
-          compareOpts
+          compareOpts,
         )
 
-      if (index && index.supports(`gt`)) {
-        // We found an index that we can use to lazily load ordered data
-        const orderByAlias =
-          orderByExpression.path.length > 1
-            ? String(orderByExpression.path[0])
+        // Only use the index if it supports range queries
+        if (!index?.supports(`gt`)) {
+          index = undefined
+        }
+
+        orderByAlias =
+          firstOrderByExpression.path.length > 1
+            ? String(firstOrderByExpression.path[0])
             : rawQuery.from.alias
+      }
+    }
 
-        orderByOptimizationInfo = {
-          alias: orderByAlias,
-          offset: offset ?? 0,
-          limit,
-          comparator,
-          valueExtractorForRawRow,
-          index,
-          orderBy: orderByClause,
+    // Only create comparator and value extractors if the first column is a ref expression
+    // For aggregate or computed expressions, we can't extract values from raw collection rows
+    if (!firstColumnValueExtractor) {
+      // Skip optimization for non-ref expressions (aggregates, computed values, etc.)
+      // The query will still work, but without lazy loading optimization
+    } else {
+      // Build value extractors for all columns (must all be ref expressions for multi-column)
+      // Check if all orderBy expressions are ref types (required for multi-column extraction)
+      const allColumnsAreRefs = orderByClause.every(
+        (clause) => clause.expression.type === `ref`,
+      )
+
+      // Create extractors for all columns if they're all refs
+      const allColumnExtractors:
+        | Array<CompiledSingleRowExpression>
+        | undefined = allColumnsAreRefs
+        ? orderByClause.map((clause) => {
+            // We know it's a ref since we checked allColumnsAreRefs
+            const refExpr = clause.expression as PropRef
+            const followResult = followRef(rawQuery, refExpr, collection)
+            if (followResult) {
+              return compileExpression(
+                new PropRef(followResult.path),
+                true,
+              ) as CompiledSingleRowExpression
+            }
+            // Fallback for refs that don't follow
+            return compileExpression(
+              clause.expression,
+              true,
+            ) as CompiledSingleRowExpression
+          })
+        : undefined
+
+      // Create a comparator for raw rows (used for tracking sent values)
+      // This compares ALL orderBy columns for proper ordering
+      const comparator = (
+        a: Record<string, unknown> | null | undefined,
+        b: Record<string, unknown> | null | undefined,
+      ) => {
+        if (orderByClause.length === 1) {
+          // Single column: extract and compare
+          const extractedA = a ? firstColumnValueExtractor(a) : a
+          const extractedB = b ? firstColumnValueExtractor(b) : b
+          return compare(extractedA, extractedB)
+        }
+        if (allColumnExtractors) {
+          // Multi-column with all refs: extract all values and compare
+          const extractAll = (
+            row: Record<string, unknown> | null | undefined,
+          ) => {
+            if (!row) return row
+            return allColumnExtractors.map((extractor) => extractor(row))
+          }
+          return compare(extractAll(a), extractAll(b))
         }
+        // Fallback: can't compare (shouldn't happen since we skip non-ref cases)
+        return 0
+      }
+
+      // Create a value extractor for raw rows that extracts ALL orderBy column values
+      // This is used for tracking sent values and building composite cursors
+      const rawRowValueExtractor = (row: Record<string, unknown>): unknown => {
+        if (orderByClause.length === 1) {
+          // Single column: return single value
+          return firstColumnValueExtractor(row)
+        }
+        if (allColumnExtractors) {
+          // Multi-column: return array of all values
+          return allColumnExtractors.map((extractor) => extractor(row))
+        }
+        // Fallback (shouldn't happen)
+        return undefined
+      }
+
+      orderByOptimizationInfo = {
+        alias: orderByAlias,
+        offset: offset ?? 0,
+        limit,
+        comparator,
+        valueExtractorForRawRow: rawRowValueExtractor,
+        firstColumnValueExtractor: firstColumnValueExtractor,
+        index,
+        orderBy: orderByClause,
+      }
 
-        optimizableOrderByCollections[followRefCollection.id] =
-          orderByOptimizationInfo
+      // Store the optimization info keyed by collection ID
+      // Use the followed collection if available, otherwise use the main collection
+      const targetCollectionId = followRefCollection?.id ?? collection.id
+      optimizableOrderByCollections[targetCollectionId] =
+        orderByOptimizationInfo
 
+      // Set up lazy loading callback if we have an index
+      if (index) {
         setSizeCallback = (getSize: () => number) => {
-          optimizableOrderByCollections[followRefCollection.id]![`dataNeeded`] =
+          optimizableOrderByCollections[targetCollectionId]![`dataNeeded`] =
             () => {
               const size = getSize()
               return Math.max(0, orderByOptimizationInfo!.limit - size)
@@ -204,7 +297,7 @@ export function processOrderBy(
       comparator: compare,
       setSizeCallback,
       setWindowFn: (
-        windowFn: (options: { offset?: number; limit?: number }) => void
+        windowFn: (options: { offset?: number; limit?: number }) => void,
       ) => {
         setWindowFn(
           // We wrap the move function such that we update the orderByOptimizationInfo
@@ -217,10 +310,10 @@ export function processOrderBy(
               orderByOptimizationInfo.limit =
                 options.limit ?? orderByOptimizationInfo.limit
             }
-          }
+          },
         )
       },
-    })
+    }),
     // orderByWithFractionalIndex returns [key, [value, index]] - we keep this format
   )
 }
@@ -231,7 +324,7 @@ export function processOrderBy(
  */
 export function buildCompareOptions(
   clause: OrderByClause,
-  collection: CollectionLike<any, any>
+  collection: CollectionLike<any, any>,
 ): CompareOptions {
   if (clause.compareOptions.stringSort !== undefined) {
     return clause.compareOptions
diff --git a/packages/db/src/query/compiler/select.ts b/packages/db/src/query/compiler/select.ts
index f036fb29c..88e7663b0 100644
--- a/packages/db/src/query/compiler/select.ts
+++ b/packages/db/src/query/compiler/select.ts
@@ -1,13 +1,13 @@
-import { map } from "@tanstack/db-ivm"
-import { PropRef, Value as ValClass, isExpressionLike } from "../ir.js"
-import { AggregateNotSupportedError } from "../../errors.js"
-import { compileExpression } from "./evaluators.js"
-import type { Aggregate, BasicExpression, Select } from "../ir.js"
+import { map } from '@tanstack/db-ivm'
+import { PropRef, Value as ValClass, isExpressionLike } from '../ir.js'
+import { AggregateNotSupportedError } from '../../errors.js'
+import { compileExpression } from './evaluators.js'
+import type { Aggregate, BasicExpression, Select } from '../ir.js'
 import type {
   KeyedStream,
   NamespacedAndKeyedStream,
   NamespacedRow,
-} from "../../types.js"
+} from '../../types.js'
 
 /**
  * Type for operations array used in select processing
@@ -34,7 +34,7 @@ function unwrapVal(input: any): any {
 function processMerge(
   op: Extract<SelectOp, { kind: `merge` }>,
   namespacedRow: NamespacedRow,
-  selectResults: Record<string, any>
+  selectResults: Record<string, any>,
 ): void {
   const value = op.source(namespacedRow)
   if (value && typeof value === `object`) {
@@ -74,7 +74,7 @@ function processMerge(
 function processNonMergeOp(
   op: Extract<SelectOp, { kind: `field` }>,
   namespacedRow: NamespacedRow,
-  selectResults: Record<string, any>
+  selectResults: Record<string, any>,
 ): void {
   // Support nested alias paths like "meta.author.name"
   const path = op.alias.split(`.`)
@@ -99,7 +99,7 @@ function processNonMergeOp(
  */
 function processRow(
   [key, namespacedRow]: [unknown, NamespacedRow],
-  ops: Array<SelectOp>
+  ops: Array<SelectOp>,
 ): [unknown, typeof namespacedRow & { __select_results: any }] {
   const selectResults: Record<string, any> = {}
 
@@ -131,7 +131,7 @@ function processRow(
 export function processSelect(
   pipeline: NamespacedAndKeyedStream,
   select: Select,
-  _allInputs: Record<string, KeyedStream>
+  _allInputs: Record<string, KeyedStream>,
 ): NamespacedAndKeyedStream {
   // Build ordered operations to preserve authoring order (spreads and fields)
   const ops: Array<SelectOp> = []
@@ -145,7 +145,7 @@ export function processSelect(
  * Helper function to check if an expression is an aggregate
  */
 function isAggregateExpression(
-  expr: BasicExpression | Aggregate
+  expr: BasicExpression | Aggregate,
 ): expr is Aggregate {
   return expr.type === `agg`
 }
@@ -155,7 +155,7 @@ function isAggregateExpression(
  */
 export function processArgument(
   arg: BasicExpression | Aggregate,
-  namespacedRow: NamespacedRow
+  namespacedRow: NamespacedRow,
 ): any {
   if (isAggregateExpression(arg)) {
     throw new AggregateNotSupportedError()
@@ -189,7 +189,7 @@ function isNestedSelectObject(obj: any): boolean {
 function addFromObject(
   prefixPath: Array<string>,
   obj: any,
-  ops: Array<SelectOp>
+  ops: Array<SelectOp>,
 ) {
   for (const [key, value] of Object.entries(obj)) {
     if (key.startsWith(`__SPREAD_SENTINEL__`)) {
diff --git a/packages/db/src/query/compiler/types.ts b/packages/db/src/query/compiler/types.ts
index f10f953c9..bbce9eaaf 100644
--- a/packages/db/src/query/compiler/types.ts
+++ b/packages/db/src/query/compiler/types.ts
@@ -1,5 +1,5 @@
-import type { QueryIR } from "../ir.js"
-import type { CompilationResult } from "./index.js"
+import type { QueryIR } from '../ir.js'
+import type { CompilationResult } from './index.js'
 
 /**
  * Cache for compiled subqueries to avoid duplicate compilation
diff --git a/packages/db/src/query/expression-helpers.ts b/packages/db/src/query/expression-helpers.ts
index dd651f396..9b79159e0 100644
--- a/packages/db/src/query/expression-helpers.ts
+++ b/packages/db/src/query/expression-helpers.ts
@@ -27,7 +27,7 @@
  * ```
  */
 
-import type { IR, OperatorName } from "../index.js"
+import type { IR, OperatorName } from '../index.js'
 
 type BasicExpression<T = any> = IR.BasicExpression<T>
 type OrderBy = IR.OrderBy
@@ -149,7 +149,7 @@ export function extractValue(expr: BasicExpression): any {
  */
 export function walkExpression(
   expr: BasicExpression | undefined | null,
-  visitor: (node: BasicExpression) => void
+  visitor: (node: BasicExpression) => void,
 ): void {
   if (!expr) return
 
@@ -200,7 +200,7 @@ export function walkExpression(
  */
 export function parseWhereExpression<T = any>(
   expr: BasicExpression<boolean> | undefined | null,
-  options: ParseWhereOptions<T>
+  options: ParseWhereOptions<T>,
 ): T | null {
   if (!expr) return null
 
@@ -226,7 +226,7 @@ export function parseWhereExpression<T = any>(
       return onUnknownOperator(name, args)
     }
     throw new Error(
-      `No handler provided for operator: ${name}. Available handlers: ${Object.keys(handlers).join(`, `)}`
+      `No handler provided for operator: ${name}. Available handlers: ${Object.keys(handlers).join(`, `)}`,
     )
   }
 
@@ -263,7 +263,7 @@ export function parseWhereExpression<T = any>(
  * ```
  */
 export function parseOrderByExpression(
-  orderBy: OrderBy | undefined | null
+  orderBy: OrderBy | undefined | null,
 ): Array<ParsedOrderBy> {
   if (!orderBy || orderBy.length === 0) {
     return []
@@ -274,7 +274,7 @@ export function parseOrderByExpression(
 
     if (!field) {
       throw new Error(
-        `ORDER BY expression must be a field reference, got: ${clause.expression.type}`
+        `ORDER BY expression must be a field reference, got: ${clause.expression.type}`,
       )
     }
 
@@ -325,7 +325,7 @@ export function parseOrderByExpression(
  * ```
  */
 export function extractSimpleComparisons(
-  expr: BasicExpression<boolean> | undefined | null
+  expr: BasicExpression<boolean> | undefined | null,
 ): Array<SimpleComparison> {
   if (!expr) return []
 
@@ -344,7 +344,7 @@ export function extractSimpleComparisons(
         const [arg] = e.args
         if (!arg || arg.type !== `func`) {
           throw new Error(
-            `extractSimpleComparisons requires a comparison or null check inside 'not' operator.`
+            `extractSimpleComparisons requires a comparison or null check inside 'not' operator.`,
           )
         }
 
@@ -362,7 +362,7 @@ export function extractSimpleComparisons(
             })
           } else {
             throw new Error(
-              `extractSimpleComparisons requires a field reference for '${arg.name}' operator.`
+              `extractSimpleComparisons requires a field reference for '${arg.name}' operator.`,
             )
           }
           return
@@ -383,7 +383,7 @@ export function extractSimpleComparisons(
             })
           } else {
             throw new Error(
-              `extractSimpleComparisons requires simple field-value comparisons. Found complex expression for 'not(${arg.name})' operator.`
+              `extractSimpleComparisons requires simple field-value comparisons. Found complex expression for 'not(${arg.name})' operator.`,
             )
           }
           return
@@ -391,7 +391,7 @@ export function extractSimpleComparisons(
 
         // NOT can only wrap simple comparisons or null checks
         throw new Error(
-          `extractSimpleComparisons does not support 'not(${arg.name})'. NOT can only wrap comparison operators (eq, gt, gte, lt, lte, in) or null checks (isNull, isUndefined).`
+          `extractSimpleComparisons does not support 'not(${arg.name})'. NOT can only wrap comparison operators (eq, gt, gte, lt, lte, in) or null checks (isNull, isUndefined).`,
         )
       }
 
@@ -414,7 +414,7 @@ export function extractSimpleComparisons(
       ]
       if (unsupportedOps.includes(e.name)) {
         throw new Error(
-          `extractSimpleComparisons does not support '${e.name}' operator. Use parseWhereExpression with custom handlers for complex expressions.`
+          `extractSimpleComparisons does not support '${e.name}' operator. Use parseWhereExpression with custom handlers for complex expressions.`,
         )
       }
 
@@ -434,7 +434,7 @@ export function extractSimpleComparisons(
           })
         } else {
           throw new Error(
-            `extractSimpleComparisons requires a field reference for '${e.name}' operator.`
+            `extractSimpleComparisons requires a field reference for '${e.name}' operator.`,
           )
         }
         return
@@ -457,13 +457,13 @@ export function extractSimpleComparisons(
           })
         } else {
           throw new Error(
-            `extractSimpleComparisons requires simple field-value comparisons. Found complex expression for '${e.name}' operator.`
+            `extractSimpleComparisons requires simple field-value comparisons. Found complex expression for '${e.name}' operator.`,
           )
         }
       } else {
         // Unknown operator
         throw new Error(
-          `extractSimpleComparisons encountered unknown operator: '${e.name}'`
+          `extractSimpleComparisons encountered unknown operator: '${e.name}'`,
         )
       }
     }
@@ -504,7 +504,7 @@ export function parseLoadSubsetOptions(
         limit?: number
       }
     | undefined
-    | null
+    | null,
 ): {
   filters: Array<SimpleComparison>
   sorts: Array<ParsedOrderBy>
diff --git a/packages/db/src/query/index.ts b/packages/db/src/query/index.ts
index cb0e3d9e0..e798b283a 100644
--- a/packages/db/src/query/index.ts
+++ b/packages/db/src/query/index.ts
@@ -10,7 +10,7 @@ export {
   type Source,
   type GetResult,
   type InferResultType,
-} from "./builder/index.js"
+} from './builder/index.js'
 
 // Expression functions exports
 export {
@@ -41,22 +41,22 @@ export {
   sum,
   min,
   max,
-} from "./builder/functions.js"
+} from './builder/functions.js'
 
 // Ref proxy utilities
-export type { Ref } from "./builder/types.js"
+export type { Ref } from './builder/types.js'
 
 // Compiler
-export { compileQuery } from "./compiler/index.js"
+export { compileQuery } from './compiler/index.js'
 
 // Live query collection utilities
 export {
   createLiveQueryCollection,
   liveQueryCollectionOptions,
-} from "./live-query-collection.js"
+} from './live-query-collection.js'
 
-export { type LiveQueryCollectionConfig } from "./live/types.js"
-export { type LiveQueryCollectionUtils } from "./live/collection-config-builder.js"
+export { type LiveQueryCollectionConfig } from './live/types.js'
+export { type LiveQueryCollectionUtils } from './live/collection-config-builder.js'
 
 // Predicate utilities for predicate push-down
 export {
@@ -65,7 +65,8 @@ export {
   minusWherePredicates,
   isOrderBySubset,
   isLimitSubset,
+  isOffsetLimitSubset,
   isPredicateSubset,
-} from "./predicate-utils.js"
+} from './predicate-utils.js'
 
-export { DeduplicatedLoadSubset } from "./subset-dedupe.js"
+export { DeduplicatedLoadSubset } from './subset-dedupe.js'
diff --git a/packages/db/src/query/ir.ts b/packages/db/src/query/ir.ts
index d493aaa64..b1e3d1e07 100644
--- a/packages/db/src/query/ir.ts
+++ b/packages/db/src/query/ir.ts
@@ -2,9 +2,9 @@
 This is the intermediate representation of the query.
 */
 
-import type { CompareOptions } from "./builder/types"
-import type { Collection, CollectionImpl } from "../collection/index.js"
-import type { NamespacedRow } from "../types"
+import type { CompareOptions } from './builder/types'
+import type { Collection, CollectionImpl } from '../collection/index.js'
+import type { NamespacedRow } from '../types'
 
 export interface QueryIR {
   from: From
@@ -73,7 +73,7 @@ export class CollectionRef extends BaseExpression {
   public type = `collectionRef` as const
   constructor(
     public collection: CollectionImpl,
-    public alias: string
+    public alias: string,
   ) {
     super()
   }
@@ -83,7 +83,7 @@ export class QueryRef extends BaseExpression {
   public type = `queryRef` as const
   constructor(
     public query: QueryIR,
-    public alias: string
+    public alias: string,
   ) {
     super()
   }
@@ -92,7 +92,7 @@ export class QueryRef extends BaseExpression {
 export class PropRef<T = any> extends BaseExpression<T> {
   public type = `ref` as const
   constructor(
-    public path: Array<string> // path to the property in the collection, with the alias as the first element
+    public path: Array<string>, // path to the property in the collection, with the alias as the first element
   ) {
     super()
   }
@@ -101,7 +101,7 @@ export class PropRef<T = any> extends BaseExpression<T> {
 export class Value<T = any> extends BaseExpression<T> {
   public type = `val` as const
   constructor(
-    public value: T // any js value
+    public value: T, // any js value
   ) {
     super()
   }
@@ -111,7 +111,7 @@ export class Func<T = any> extends BaseExpression<T> {
   public type = `func` as const
   constructor(
     public name: string, // such as eq, gt, lt, upper, lower, etc.
-    public args: Array<BasicExpression>
+    public args: Array<BasicExpression>,
   ) {
     super()
   }
@@ -126,7 +126,7 @@ export class Aggregate<T = any> extends BaseExpression<T> {
   public type = `agg` as const
   constructor(
     public name: string, // such as count, avg, sum, min, max, etc.
-    public args: Array<BasicExpression>
+    public args: Array<BasicExpression>,
   ) {
     super()
   }
@@ -163,7 +163,7 @@ export function getWhereExpression(where: Where): BasicExpression<boolean> {
  * HAVING clauses can contain aggregates, unlike regular WHERE clauses
  */
 export function getHavingExpression(
-  having: Having
+  having: Having,
 ): BasicExpression | Aggregate {
   return typeof having === `object` && `expression` in having
     ? having.expression
@@ -185,14 +185,14 @@ export function isResidualWhere(where: Where): boolean {
  * Create a residual Where clause from an expression
  */
 export function createResidualWhere(
-  expression: BasicExpression<boolean>
+  expression: BasicExpression<boolean>,
 ): Where {
   return { expression, residual: true }
 }
 
 function getRefFromAlias(
   query: QueryIR,
-  alias: string
+  alias: string,
 ): CollectionRef | QueryRef | void {
   if (query.from.alias === alias) {
     return query.from
@@ -213,7 +213,7 @@ function getRefFromAlias(
 export function followRef(
   query: QueryIR,
   ref: PropRef<any>,
-  collection: Collection
+  collection: Collection,
 ): { collection: Collection; path: Array<string> } | void {
   if (ref.path.length === 0) {
     return
diff --git a/packages/db/src/query/live-query-collection.ts b/packages/db/src/query/live-query-collection.ts
index 5e4355a48..47eceac15 100644
--- a/packages/db/src/query/live-query-collection.ts
+++ b/packages/db/src/query/live-query-collection.ts
@@ -1,21 +1,21 @@
-import { createCollection } from "../collection/index.js"
-import { CollectionConfigBuilder } from "./live/collection-config-builder.js"
+import { createCollection } from '../collection/index.js'
+import { CollectionConfigBuilder } from './live/collection-config-builder.js'
 import {
   getBuilderFromConfig,
   registerCollectionBuilder,
-} from "./live/collection-registry.js"
-import type { LiveQueryCollectionUtils } from "./live/collection-config-builder.js"
-import type { LiveQueryCollectionConfig } from "./live/types.js"
-import type { InitialQueryBuilder, QueryBuilder } from "./builder/index.js"
-import type { Collection } from "../collection/index.js"
+} from './live/collection-registry.js'
+import type { LiveQueryCollectionUtils } from './live/collection-config-builder.js'
+import type { LiveQueryCollectionConfig } from './live/types.js'
+import type { InitialQueryBuilder, QueryBuilder } from './builder/index.js'
+import type { Collection } from '../collection/index.js'
 import type {
   CollectionConfig,
   CollectionConfigSingleRowOption,
   NonSingleResult,
   SingleResult,
   UtilsRecord,
-} from "../types.js"
-import type { Context, GetResult } from "./builder/types.js"
+} from '../types.js'
+import type { Context, GetResult } from './builder/types.js'
 
 type CollectionConfigForContext<
   TContext extends Context,
@@ -63,7 +63,7 @@ export function liveQueryCollectionOptions<
   TContext extends Context,
   TResult extends object = GetResult<TContext>,
 >(
-  config: LiveQueryCollectionConfig<TContext, TResult>
+  config: LiveQueryCollectionConfig<TContext, TResult>,
 ): CollectionConfigForContext<TContext, TResult> & {
   utils: LiveQueryCollectionUtils
 } {
@@ -116,7 +116,7 @@ export function createLiveQueryCollection<
   TContext extends Context,
   TResult extends object = GetResult<TContext>,
 >(
-  query: (q: InitialQueryBuilder) => QueryBuilder<TContext>
+  query: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
 ): CollectionForContext<TContext, TResult> & {
   utils: LiveQueryCollectionUtils
 }
@@ -127,7 +127,7 @@ export function createLiveQueryCollection<
   TResult extends object = GetResult<TContext>,
   TUtils extends UtilsRecord = {},
 >(
-  config: LiveQueryCollectionConfig<TContext, TResult> & { utils?: TUtils }
+  config: LiveQueryCollectionConfig<TContext, TResult> & { utils?: TUtils },
 ): CollectionForContext<TContext, TResult> & {
   utils: LiveQueryCollectionUtils & TUtils
 }
@@ -140,7 +140,7 @@ export function createLiveQueryCollection<
 >(
   configOrQuery:
     | (LiveQueryCollectionConfig<TContext, TResult> & { utils?: TUtils })
-    | ((q: InitialQueryBuilder) => QueryBuilder<TContext>)
+    | ((q: InitialQueryBuilder) => QueryBuilder<TContext>),
 ): CollectionForContext<TContext, TResult> & {
   utils: LiveQueryCollectionUtils & TUtils
 } {
@@ -149,7 +149,7 @@ export function createLiveQueryCollection<
     // Simple query function case
     const config: LiveQueryCollectionConfig<TContext, TResult> = {
       query: configOrQuery as (
-        q: InitialQueryBuilder
+        q: InitialQueryBuilder,
       ) => QueryBuilder<TContext>,
     }
     const options = liveQueryCollectionOptions<TContext, TResult>(config)
@@ -185,7 +185,7 @@ function bridgeToCreateCollection<
   TResult extends object,
   TUtils extends UtilsRecord = {},
 >(
-  options: CollectionConfig<TResult> & { utils: TUtils }
+  options: CollectionConfig<TResult> & { utils: TUtils },
 ): Collection<TResult, string | number, TUtils> {
   const collection = createCollection(options as any) as unknown as Collection<
     TResult,
diff --git a/packages/db/src/query/live/collection-config-builder.ts b/packages/db/src/query/live/collection-config-builder.ts
index dd28be356..b663fdad5 100644
--- a/packages/db/src/query/live/collection-config-builder.ts
+++ b/packages/db/src/query/live/collection-config-builder.ts
@@ -1,22 +1,22 @@
-import { D2, output } from "@tanstack/db-ivm"
-import { compileQuery } from "../compiler/index.js"
-import { buildQuery, getQueryIR } from "../builder/index.js"
+import { D2, output } from '@tanstack/db-ivm'
+import { compileQuery } from '../compiler/index.js'
+import { buildQuery, getQueryIR } from '../builder/index.js'
 import {
   MissingAliasInputsError,
   SetWindowRequiresOrderByError,
-} from "../../errors.js"
-import { transactionScopedScheduler } from "../../scheduler.js"
-import { getActiveTransaction } from "../../transactions.js"
-import { CollectionSubscriber } from "./collection-subscriber.js"
-import { getCollectionBuilder } from "./collection-registry.js"
-import { LIVE_QUERY_INTERNAL } from "./internal.js"
-import type { LiveQueryInternalUtils } from "./internal.js"
-import type { WindowOptions } from "../compiler/index.js"
-import type { SchedulerContextId } from "../../scheduler.js"
-import type { CollectionSubscription } from "../../collection/subscription.js"
-import type { RootStreamBuilder } from "@tanstack/db-ivm"
-import type { OrderByOptimizationInfo } from "../compiler/order-by.js"
-import type { Collection } from "../../collection/index.js"
+} from '../../errors.js'
+import { transactionScopedScheduler } from '../../scheduler.js'
+import { getActiveTransaction } from '../../transactions.js'
+import { CollectionSubscriber } from './collection-subscriber.js'
+import { getCollectionBuilder } from './collection-registry.js'
+import { LIVE_QUERY_INTERNAL } from './internal.js'
+import type { LiveQueryInternalUtils } from './internal.js'
+import type { WindowOptions } from '../compiler/index.js'
+import type { SchedulerContextId } from '../../scheduler.js'
+import type { CollectionSubscription } from '../../collection/subscription.js'
+import type { RootStreamBuilder } from '@tanstack/db-ivm'
+import type { OrderByOptimizationInfo } from '../compiler/order-by.js'
+import type { Collection } from '../../collection/index.js'
 import type {
   CollectionConfigSingleRowOption,
   KeyedStream,
@@ -24,17 +24,17 @@ import type {
   StringCollationConfig,
   SyncConfig,
   UtilsRecord,
-} from "../../types.js"
-import type { Context, GetResult } from "../builder/types.js"
-import type { BasicExpression, QueryIR } from "../ir.js"
-import type { LazyCollectionCallbacks } from "../compiler/joins.js"
+} from '../../types.js'
+import type { Context, GetResult } from '../builder/types.js'
+import type { BasicExpression, QueryIR } from '../ir.js'
+import type { LazyCollectionCallbacks } from '../compiler/joins.js'
 import type {
   Changes,
   FullSyncState,
   LiveQueryCollectionConfig,
   SyncState,
-} from "./types.js"
-import type { AllCollectionEvents } from "../../collection/events.js"
+} from './types.js'
+import type { AllCollectionEvents } from '../../collection/events.js'
 
 export type LiveQueryCollectionUtils = UtilsRecord & {
   getRunCount: () => number
@@ -146,7 +146,7 @@ export class CollectionConfigBuilder<
   optimizableOrderByCollections: Record<string, OrderByOptimizationInfo> = {}
 
   constructor(
-    private readonly config: LiveQueryCollectionConfig<TContext, TResult>
+    private readonly config: LiveQueryCollectionConfig<TContext, TResult>,
   ) {
     // Generate a unique ID if not provided
     this.id = config.id || `live-query-${++liveQueryCollectionCounter}`
@@ -252,7 +252,7 @@ export class CollectionConfigBuilder<
               unsubscribe()
               resolve()
             }
-          }
+          },
         )
       })
     }
@@ -318,7 +318,7 @@ export class CollectionConfigBuilder<
     // Should only be called when sync is active
     if (!this.currentSyncConfig || !this.currentSyncState) {
       throw new Error(
-        `maybeRunGraph called without active sync session. This should not happen.`
+        `maybeRunGraph called without active sync session. This should not happen.`,
       )
     }
 
@@ -380,7 +380,7 @@ export class CollectionConfigBuilder<
       jobId?: unknown
       alias?: string
       dependencies?: Array<CollectionConfigBuilder<any, any>>
-    }
+    },
   ) {
     const contextId = options?.contextId ?? getActiveTransaction()?.id
     // Use the builder instance as the job ID for deduplication. This is memory-safe
@@ -422,7 +422,7 @@ export class CollectionConfigBuilder<
 
     if (!this.currentSyncConfig || !this.currentSyncState) {
       throw new Error(
-        `scheduleGraphRun called without active sync session. This should not happen.`
+        `scheduleGraphRun called without active sync session. This should not happen.`,
       )
     }
 
@@ -479,7 +479,7 @@ export class CollectionConfigBuilder<
    */
   private executeGraphRun(
     contextId?: SchedulerContextId,
-    pendingParam?: PendingGraphRun
+    pendingParam?: PendingGraphRun,
   ): void {
     // Get pending state: either from parameter (no context) or from map (with context)
     // Remove from map BEFORE checking sync state to prevent leaking entries when sync ends
@@ -554,7 +554,7 @@ export class CollectionConfigBuilder<
     // Extend the pipeline such that it applies the incoming changes to the collection
     const fullSyncState = this.extendPipelineWithChangeProcessing(
       config,
-      syncState
+      syncState,
     )
     this.currentSyncState = fullSyncState
 
@@ -563,12 +563,12 @@ export class CollectionConfigBuilder<
     this.unsubscribeFromSchedulerClears = transactionScopedScheduler.onClear(
       (contextId) => {
         this.clearPendingGraphRun(contextId)
-      }
+      },
     )
 
     const loadSubsetDataCallbacks = this.subscribeToAllCollections(
       config,
-      fullSyncState
+      fullSyncState,
     )
 
     this.maybeRunGraphFn = () => this.scheduleGraphRun(loadSubsetDataCallbacks)
@@ -603,7 +603,7 @@ export class CollectionConfigBuilder<
       // Clear subscription references to prevent memory leaks
       // Note: Individual subscriptions are already unsubscribed via unsubscribeCallbacks
       Object.keys(this.subscriptions).forEach(
-        (key) => delete this.subscriptions[key]
+        (key) => delete this.subscriptions[key],
       )
       this.compiledAliasToCollectionId = {}
 
@@ -623,7 +623,7 @@ export class CollectionConfigBuilder<
       Object.keys(this.collectionByAlias).map((alias) => [
         alias,
         this.graphCache!.newInput<any>(),
-      ])
+      ]),
     )
 
     const compilation = compileQuery(
@@ -636,7 +636,7 @@ export class CollectionConfigBuilder<
       this.optimizableOrderByCollections,
       (windowFn: (options: WindowOptions) => void) => {
         this.windowFn = windowFn
-      }
+      },
     )
 
     this.pipelineCache = compilation.pipeline
@@ -647,7 +647,7 @@ export class CollectionConfigBuilder<
     // This should never happen since all aliases come from user declarations,
     // but catch it early if the assumption is violated in the future.
     const missingAliases = Object.keys(this.compiledAliasToCollectionId).filter(
-      (alias) => !Object.hasOwn(this.inputsCache!, alias)
+      (alias) => !Object.hasOwn(this.inputsCache!, alias),
     )
     if (missingAliases.length > 0) {
       throw new MissingAliasInputsError(missingAliases)
@@ -667,7 +667,7 @@ export class CollectionConfigBuilder<
 
   private extendPipelineWithChangeProcessing(
     config: SyncMethods<TResult>,
-    syncState: SyncState
+    syncState: SyncState,
   ): FullSyncState {
     const { begin, commit } = config
     const { graph, inputs, pipeline } = this.maybeCompileBasePipeline()
@@ -681,11 +681,11 @@ export class CollectionConfigBuilder<
         messages
           .reduce(
             accumulateChanges<TResult>,
-            new Map<unknown, Changes<TResult>>()
+            new Map<unknown, Changes<TResult>>(),
           )
           .forEach(this.applyChanges.bind(this, config))
         commit()
-      })
+      }),
     )
 
     graph.finalize()
@@ -706,7 +706,7 @@ export class CollectionConfigBuilder<
       value: TResult
       orderByIndex: string | undefined
     },
-    key: unknown
+    key: unknown,
   ) {
     const { write, collection } = config
     const { deletes, inserts, value, orderByIndex } = changes
@@ -745,7 +745,7 @@ export class CollectionConfigBuilder<
       })
     } else {
       throw new Error(
-        `Could not apply changes: ${JSON.stringify(changes)}. This should never happen.`
+        `Could not apply changes: ${JSON.stringify(changes)}. This should never happen.`,
       )
     }
   }
@@ -756,14 +756,14 @@ export class CollectionConfigBuilder<
   private handleSourceStatusChange(
     config: SyncMethods<TResult>,
     collectionId: string,
-    event: AllCollectionEvents[`status:change`]
+    event: AllCollectionEvents[`status:change`],
   ) {
     const { status } = event
 
     // Handle error state - any source collection in error puts live query in error
     if (status === `error`) {
       this.transitionToError(
-        `Source collection '${collectionId}' entered error state`
+        `Source collection '${collectionId}' entered error state`,
       )
       return
     }
@@ -773,7 +773,7 @@ export class CollectionConfigBuilder<
     if (status === `cleaned-up`) {
       this.transitionToError(
         `Source collection '${collectionId}' was manually cleaned up while live query '${this.id}' depends on it. ` +
-          `Live queries prevent automatic GC, so this was likely a manual cleanup() call.`
+          `Live queries prevent automatic GC, so this was likely a manual cleanup() call.`,
       )
       return
     }
@@ -814,7 +814,7 @@ export class CollectionConfigBuilder<
 
   private allCollectionsReady() {
     return Object.values(this.collections).every((collection) =>
-      collection.isReady()
+      collection.isReady(),
     )
   }
 
@@ -825,14 +825,14 @@ export class CollectionConfigBuilder<
    */
   private subscribeToAllCollections(
     config: SyncMethods<TResult>,
-    syncState: FullSyncState
+    syncState: FullSyncState,
   ) {
     // Use compiled aliases as the source of truth - these include all aliases from the query
     // including those from subqueries, which may not be in collectionByAlias
     const compiledAliases = Object.entries(this.compiledAliasToCollectionId)
     if (compiledAliases.length === 0) {
       throw new Error(
-        `Compiler returned no alias metadata for query '${this.id}'. This should not happen; please report.`
+        `Compiler returned no alias metadata for query '${this.id}'. This should not happen; please report.`,
       )
     }
 
@@ -857,7 +857,7 @@ export class CollectionConfigBuilder<
         alias,
         collectionId,
         collection,
-        this
+        this,
       )
 
       // Subscribe to status changes for status flow
@@ -874,7 +874,7 @@ export class CollectionConfigBuilder<
       // Create a callback for loading more data if needed (used by OrderBy optimization)
       const loadMore = collectionSubscriber.loadMoreIfNeeded.bind(
         collectionSubscriber,
-        subscription
+        subscription,
       )
 
       return loadMore
@@ -900,7 +900,7 @@ export class CollectionConfigBuilder<
 }
 
 function buildQueryFromConfig<TContext extends Context>(
-  config: LiveQueryCollectionConfig<any, any>
+  config: LiveQueryCollectionConfig<any, any>,
 ) {
   // Build the query using the provided query builder function or instance
   if (typeof config.query === `function`) {
@@ -910,7 +910,7 @@ function buildQueryFromConfig<TContext extends Context>(
 }
 
 function createOrderByComparator<T extends object>(
-  orderByIndices: WeakMap<object, string>
+  orderByIndices: WeakMap<object, string>,
 ) {
   return (val1: T, val2: T): number => {
     // Use the orderBy index stored in the WeakMap
@@ -939,7 +939,7 @@ function createOrderByComparator<T extends object>(
  * Maps collections by their ID (not alias) as expected by the compiler
  */
 function extractCollectionsFromQuery(
-  query: any
+  query: any,
 ): Record<string, Collection<any, any, any>> {
   const collections: Record<string, any> = {}
 
@@ -991,7 +991,7 @@ function extractCollectionFromSource(query: any): Collection<any, any, any> {
   }
 
   throw new Error(
-    `Failed to extract collection. Invalid FROM clause: ${JSON.stringify(query)}`
+    `Failed to extract collection. Invalid FROM clause: ${JSON.stringify(query)}`,
   )
 }
 
@@ -1059,7 +1059,7 @@ function accumulateChanges<T>(
   [[key, tupleData], multiplicity]: [
     [unknown, [any, string | undefined]],
     number,
-  ]
+  ],
 ) {
   // All queries now consistently return [value, orderByIndex] format
   // where orderByIndex is undefined for queries without ORDER BY
diff --git a/packages/db/src/query/live/collection-registry.ts b/packages/db/src/query/live/collection-registry.ts
index 1d673a25b..d17b182f9 100644
--- a/packages/db/src/query/live/collection-registry.ts
+++ b/packages/db/src/query/live/collection-registry.ts
@@ -1,6 +1,6 @@
-import { LIVE_QUERY_INTERNAL } from "./internal.js"
-import type { Collection } from "../../collection/index.js"
-import type { CollectionConfigBuilder } from "./collection-config-builder.js"
+import { LIVE_QUERY_INTERNAL } from './internal.js'
+import type { Collection } from '../../collection/index.js'
+import type { CollectionConfigBuilder } from './collection-config-builder.js'
 
 const collectionBuilderRegistry = new WeakMap<
   Collection<any, any, any>,
@@ -14,7 +14,7 @@ const collectionBuilderRegistry = new WeakMap<
  * @returns The attached builder, or `undefined` if none exists
  */
 export function getBuilderFromConfig(
-  config: object
+  config: object,
 ): CollectionConfigBuilder<any, any> | undefined {
   return (config as any).utils?.[LIVE_QUERY_INTERNAL]?.getBuilder?.()
 }
@@ -29,7 +29,7 @@ export function getBuilderFromConfig(
  */
 export function registerCollectionBuilder(
   collection: Collection<any, any, any>,
-  builder: CollectionConfigBuilder<any, any>
+  builder: CollectionConfigBuilder<any, any>,
 ): void {
   collectionBuilderRegistry.set(collection, builder)
 }
@@ -42,7 +42,7 @@ export function registerCollectionBuilder(
  * @returns The registered builder, or `undefined` if none exists
  */
 export function getCollectionBuilder(
-  collection: Collection<any, any, any>
+  collection: Collection<any, any, any>,
 ): CollectionConfigBuilder<any, any> | undefined {
   return collectionBuilderRegistry.get(collection)
 }
diff --git a/packages/db/src/query/live/collection-subscriber.ts b/packages/db/src/query/live/collection-subscriber.ts
index 38614cb0a..303c833fc 100644
--- a/packages/db/src/query/live/collection-subscriber.ts
+++ b/packages/db/src/query/live/collection-subscriber.ts
@@ -1,19 +1,19 @@
-import { MultiSet } from "@tanstack/db-ivm"
+import { MultiSet } from '@tanstack/db-ivm'
 import {
   normalizeExpressionPaths,
   normalizeOrderByPaths,
-} from "../compiler/expressions.js"
-import type { MultiSetArray, RootStreamBuilder } from "@tanstack/db-ivm"
-import type { Collection } from "../../collection/index.js"
-import type { ChangeMessage } from "../../types.js"
-import type { Context, GetResult } from "../builder/types.js"
-import type { BasicExpression } from "../ir.js"
-import type { OrderByOptimizationInfo } from "../compiler/order-by.js"
-import type { CollectionConfigBuilder } from "./collection-config-builder.js"
-import type { CollectionSubscription } from "../../collection/subscription.js"
+} from '../compiler/expressions.js'
+import type { MultiSetArray, RootStreamBuilder } from '@tanstack/db-ivm'
+import type { Collection } from '../../collection/index.js'
+import type { ChangeMessage } from '../../types.js'
+import type { Context, GetResult } from '../builder/types.js'
+import type { BasicExpression } from '../ir.js'
+import type { OrderByOptimizationInfo } from '../compiler/order-by.js'
+import type { CollectionConfigBuilder } from './collection-config-builder.js'
+import type { CollectionSubscription } from '../../collection/subscription.js'
 
 const loadMoreCallbackSymbol = Symbol.for(
-  `@tanstack/db.collection-config-builder`
+  `@tanstack/db.collection-config-builder`,
 )
 
 export class CollectionSubscriber<
@@ -29,11 +29,16 @@ export class CollectionSubscriber<
     { resolve: () => void }
   >()
 
+  // Track keys that have been sent to the D2 pipeline to prevent duplicate inserts
+  // This is necessary because different code paths (initial load, change events)
+  // can potentially send the same item to D2 multiple times.
+  private sentToD2Keys = new Set<string | number>()
+
   constructor(
     private alias: string,
     private collectionId: string,
     private collection: Collection,
-    private collectionConfigBuilder: CollectionConfigBuilder<TContext, TResult>
+    private collectionConfigBuilder: CollectionConfigBuilder<TContext, TResult>,
   ) {}
 
   subscribe(): CollectionSubscription {
@@ -53,17 +58,17 @@ export class CollectionSubscriber<
     if (orderByInfo) {
       subscription = this.subscribeToOrderedChanges(
         whereExpression,
-        orderByInfo
+        orderByInfo,
       )
     } else {
       // If the source alias is lazy then we should not include the initial state
       const includeInitialState = !this.collectionConfigBuilder.isLazyAlias(
-        this.alias
+        this.alias,
       )
 
       subscription = this.subscribeToMatchingChanges(
         whereExpression,
-        includeInitialState
+        includeInitialState,
       )
     }
 
@@ -79,7 +84,7 @@ export class CollectionSubscriber<
           resolve: resolve!,
         })
         this.collectionConfigBuilder.liveQueryCollection!._sync.trackLoadPromise(
-          promise
+          promise,
         )
       }
     }
@@ -120,23 +125,43 @@ export class CollectionSubscriber<
     // currentSyncState is always defined when subscribe() is called
     // (called during sync session setup)
     this.collectionConfigBuilder.currentSyncState!.unsubscribeCallbacks.add(
-      unsubscribe
+      unsubscribe,
     )
     return subscription
   }
 
   private sendChangesToPipeline(
     changes: Iterable<ChangeMessage<any, string | number>>,
-    callback?: () => boolean
+    callback?: () => boolean,
   ) {
+    // Filter changes to prevent duplicate inserts to D2 pipeline.
+    // This ensures D2 multiplicity stays at 1 for visible items, so deletes
+    // properly reduce multiplicity to 0 (triggering DELETE output).
+    const changesArray = Array.isArray(changes) ? changes : [...changes]
+    const filteredChanges: Array<ChangeMessage<any, string | number>> = []
+    for (const change of changesArray) {
+      if (change.type === `insert`) {
+        if (this.sentToD2Keys.has(change.key)) {
+          // Skip duplicate insert - already sent to D2
+          continue
+        }
+        this.sentToD2Keys.add(change.key)
+      } else if (change.type === `delete`) {
+        // Remove from tracking so future re-inserts are allowed
+        this.sentToD2Keys.delete(change.key)
+      }
+      // Updates are handled as delete+insert by splitUpdates, so no special handling needed
+      filteredChanges.push(change)
+    }
+
     // currentSyncState and input are always defined when this method is called
     // (only called from active subscriptions during a sync session)
     const input =
       this.collectionConfigBuilder.currentSyncState!.inputs[this.alias]!
     const sentChanges = sendChangesToInput(
       input,
-      changes,
-      this.collection.config.getKey
+      filteredChanges,
+      this.collection.config.getKey,
     )
 
     // Do not provide the callback that loads more data
@@ -154,16 +179,21 @@ export class CollectionSubscriber<
 
   private subscribeToMatchingChanges(
     whereExpression: BasicExpression<boolean> | undefined,
-    includeInitialState: boolean = false
+    includeInitialState: boolean = false,
   ) {
     const sendChanges = (
-      changes: Array<ChangeMessage<any, string | number>>
+      changes: Array<ChangeMessage<any, string | number>>,
     ) => {
       this.sendChangesToPipeline(changes)
     }
 
+    // Only pass includeInitialState when true. When it's false, we leave it
+    // undefined so that user subscriptions with explicit `includeInitialState: false`
+    // can be distinguished from internal lazy-loading subscriptions.
+    // If we pass `false`, changes.ts would call markAllStateAsSeen() which
+    // disables filtering - but internal subscriptions still need filtering.
     const subscription = this.collection.subscribeChanges(sendChanges, {
-      includeInitialState,
+      ...(includeInitialState && { includeInitialState }),
       whereExpression,
     })
 
@@ -172,12 +202,12 @@ export class CollectionSubscriber<
 
   private subscribeToOrderedChanges(
     whereExpression: BasicExpression<boolean> | undefined,
-    orderByInfo: OrderByOptimizationInfo
+    orderByInfo: OrderByOptimizationInfo,
   ) {
     const { orderBy, offset, limit, index } = orderByInfo
 
     const sendChangesInRange = (
-      changes: Iterable<ChangeMessage<any, string | number>>
+      changes: Iterable<ChangeMessage<any, string | number>>,
     ) => {
       // Split live updates into a delete of the old value and an insert of the new value
       const splittedChanges = splitUpdates(changes)
@@ -190,17 +220,43 @@ export class CollectionSubscriber<
       whereExpression,
     })
 
-    subscription.setOrderByIndex(index)
+    // Listen for truncate events to reset cursor tracking state and sentToD2Keys
+    // This ensures that after a must-refetch/truncate, we don't use stale cursor data
+    // and allow re-inserts of previously sent keys
+    const truncateUnsubscribe = this.collection.on(`truncate`, () => {
+      this.biggest = undefined
+      this.sentToD2Keys.clear()
+    })
+
+    // Clean up truncate listener when subscription is unsubscribed
+    subscription.on(`unsubscribed`, () => {
+      truncateUnsubscribe()
+    })
 
     // Normalize the orderBy clauses such that the references are relative to the collection
     const normalizedOrderBy = normalizeOrderByPaths(orderBy, this.alias)
 
-    // Load the first `offset + limit` values from the index
-    // i.e. the K items from the collection that fall into the requested range: [offset, offset + limit[
-    subscription.requestLimitedSnapshot({
-      limit: offset + limit,
-      orderBy: normalizedOrderBy,
-    })
+    if (index) {
+      // We have an index on the first orderBy column - use lazy loading optimization
+      // This works for both single-column and multi-column orderBy:
+      // - Single-column: index provides exact ordering
+      // - Multi-column: index provides ordering on first column, secondary sort in memory
+      subscription.setOrderByIndex(index)
+
+      // Load the first `offset + limit` values from the index
+      // i.e. the K items from the collection that fall into the requested range: [offset, offset + limit[
+      subscription.requestLimitedSnapshot({
+        limit: offset + limit,
+        orderBy: normalizedOrderBy,
+      })
+    } else {
+      // No index available (e.g., non-ref expression): pass orderBy/limit to loadSubset
+      // so the sync layer can optimize if the backend supports it
+      subscription.requestSnapshot({
+        orderBy: normalizedOrderBy,
+        limit: offset + limit,
+      })
+    }
 
     return subscription
   }
@@ -220,11 +276,10 @@ export class CollectionSubscriber<
     const { dataNeeded } = orderByInfo
 
     if (!dataNeeded) {
-      // This should never happen because the topK operator should always set the size callback
-      // which in turn should lead to the orderBy operator setting the dataNeeded callback
-      throw new Error(
-        `Missing dataNeeded callback for collection ${this.collectionId}`
-      )
+      // dataNeeded is not set when there's no index (e.g., non-ref expression).
+      // In this case, we've already loaded all data via requestSnapshot
+      // and don't need to lazily load more.
+      return true
     }
 
     // `dataNeeded` probes the orderBy operator to see if it needs more data
@@ -238,7 +293,7 @@ export class CollectionSubscriber<
 
   private sendChangesToPipelineWithTracking(
     changes: Iterable<ChangeMessage<any, string | number>>,
-    subscription: CollectionSubscription
+    subscription: CollectionSubscription,
   ) {
     const orderByInfo = this.getOrderByInfo()
     if (!orderByInfo) {
@@ -262,7 +317,7 @@ export class CollectionSubscriber<
 
     this.sendChangesToPipeline(
       trackedChanges,
-      subscriptionWithLoader[loadMoreCallbackSymbol]
+      subscriptionWithLoader[loadMoreCallbackSymbol],
     )
   }
 
@@ -273,20 +328,33 @@ export class CollectionSubscriber<
     if (!orderByInfo) {
       return
     }
-    const { orderBy, valueExtractorForRawRow } = orderByInfo
+    const { orderBy, valueExtractorForRawRow, offset } = orderByInfo
     const biggestSentRow = this.biggest
-    const biggestSentValue = biggestSentRow
+
+    // Extract all orderBy column values from the biggest sent row
+    // For single-column: returns single value, for multi-column: returns array
+    const extractedValues = biggestSentRow
       ? valueExtractorForRawRow(biggestSentRow)
-      : biggestSentRow
+      : undefined
+
+    // Normalize to array format for minValues
+    const minValues =
+      extractedValues !== undefined
+        ? Array.isArray(extractedValues)
+          ? extractedValues
+          : [extractedValues]
+        : undefined
 
     // Normalize the orderBy clauses such that the references are relative to the collection
     const normalizedOrderBy = normalizeOrderByPaths(orderBy, this.alias)
 
     // Take the `n` items after the biggest sent value
+    // Pass the current window offset to ensure proper deduplication
     subscription.requestLimitedSnapshot({
       orderBy: normalizedOrderBy,
       limit: n,
-      minValue: biggestSentValue,
+      minValues,
+      offset,
     })
   }
 
@@ -312,13 +380,16 @@ export class CollectionSubscriber<
 
   private *trackSentValues(
     changes: Iterable<ChangeMessage<any, string | number>>,
-    comparator: (a: any, b: any) => number
+    comparator: (a: any, b: any) => number,
   ) {
     for (const change of changes) {
-      if (!this.biggest) {
-        this.biggest = change.value
-      } else if (comparator(this.biggest, change.value) < 0) {
-        this.biggest = change.value
+      // Only track inserts/updates for cursor positioning, not deletes
+      if (change.type !== `delete`) {
+        if (!this.biggest) {
+          this.biggest = change.value
+        } else if (comparator(this.biggest, change.value) < 0) {
+          this.biggest = change.value
+        }
       }
 
       yield change
@@ -332,7 +403,7 @@ export class CollectionSubscriber<
 function sendChangesToInput(
   input: RootStreamBuilder<unknown>,
   changes: Iterable<ChangeMessage>,
-  getKey: (item: ChangeMessage[`value`]) => any
+  getKey: (item: ChangeMessage[`value`]) => any,
 ): number {
   const multiSetArray: MultiSetArray<unknown> = []
   for (const change of changes) {
@@ -360,7 +431,7 @@ function* splitUpdates<
   T extends object = Record<string, unknown>,
   TKey extends string | number = string | number,
 >(
-  changes: Iterable<ChangeMessage<T, TKey>>
+  changes: Iterable<ChangeMessage<T, TKey>>,
 ): Generator<ChangeMessage<T, TKey>> {
   for (const change of changes) {
     if (change.type === `update`) {
diff --git a/packages/db/src/query/live/internal.ts b/packages/db/src/query/live/internal.ts
index 1de81a4ed..7ec206f20 100644
--- a/packages/db/src/query/live/internal.ts
+++ b/packages/db/src/query/live/internal.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfigBuilder } from "./collection-config-builder.js"
+import type { CollectionConfigBuilder } from './collection-config-builder.js'
 
 /**
  * Symbol for accessing internal utilities that should not be part of the public API
diff --git a/packages/db/src/query/live/types.ts b/packages/db/src/query/live/types.ts
index 74c84a05f..64a51d7ab 100644
--- a/packages/db/src/query/live/types.ts
+++ b/packages/db/src/query/live/types.ts
@@ -1,11 +1,11 @@
-import type { D2, RootStreamBuilder } from "@tanstack/db-ivm"
+import type { D2, RootStreamBuilder } from '@tanstack/db-ivm'
 import type {
   CollectionConfig,
   ResultStream,
   StringCollationConfig,
-} from "../../types.js"
-import type { InitialQueryBuilder, QueryBuilder } from "../builder/index.js"
-import type { Context, GetResult } from "../builder/types.js"
+} from '../../types.js'
+import type { InitialQueryBuilder, QueryBuilder } from '../builder/index.js'
+import type { Context, GetResult } from '../builder/types.js'
 
 export type Changes<T> = {
   deletes: number
diff --git a/packages/db/src/query/optimizer.ts b/packages/db/src/query/optimizer.ts
index b5ff6370a..e1020c284 100644
--- a/packages/db/src/query/optimizer.ts
+++ b/packages/db/src/query/optimizer.ts
@@ -120,8 +120,8 @@
  * transformed into a D2Mini pipeline.
  */
 
-import { deepEquals } from "../utils.js"
-import { CannotCombineEmptyExpressionListError } from "../errors.js"
+import { deepEquals } from '../utils.js'
+import { CannotCombineEmptyExpressionListError } from '../errors.js'
 import {
   CollectionRef as CollectionRefClass,
   Func,
@@ -130,8 +130,8 @@ import {
   createResidualWhere,
   getWhereExpression,
   isResidualWhere,
-} from "./ir.js"
-import type { BasicExpression, From, QueryIR, Select, Where } from "./ir.js"
+} from './ir.js'
+import type { BasicExpression, From, QueryIR, Select, Where } from './ir.js'
 
 /**
  * Represents a WHERE clause after source analysis
@@ -226,7 +226,7 @@ export function optimizeQuery(query: QueryIR): OptimizationResult {
  * @returns Map of source aliases to their WHERE clauses
  */
 function extractSourceWhereClauses(
-  query: QueryIR
+  query: QueryIR,
 ): Map<string, BasicExpression<boolean>> {
   const sourceWhereClauses = new Map<string, BasicExpression<boolean>>()
 
@@ -240,7 +240,7 @@ function extractSourceWhereClauses(
 
   // Analyze each WHERE clause to determine which sources it touches
   const analyzedClauses = splitWhereClauses.map((clause) =>
-    analyzeWhereClause(clause)
+    analyzeWhereClause(clause),
   )
 
   // Group clauses by single-source vs multi-source
@@ -297,7 +297,7 @@ function applyRecursiveOptimization(query: QueryIR): QueryIR {
       query.from.type === `queryRef`
         ? new QueryRefClass(
             applyRecursiveOptimization(query.from.query),
-            query.from.alias
+            query.from.alias,
           )
         : query.from,
     join: query.join?.map((joinClause) => ({
@@ -306,7 +306,7 @@ function applyRecursiveOptimization(query: QueryIR): QueryIR {
         joinClause.from.type === `queryRef`
           ? new QueryRefClass(
               applyRecursiveOptimization(joinClause.from.query),
-              joinClause.from.alias
+              joinClause.from.alias,
             )
           : joinClause.from,
     })),
@@ -346,7 +346,7 @@ function applySingleLevelOptimization(query: QueryIR): QueryIR {
 
   // Filter out residual WHERE clauses to prevent them from being optimized again
   const nonResidualWhereClauses = query.where.filter(
-    (where) => !isResidualWhere(where)
+    (where) => !isResidualWhere(where),
   )
 
   // Step 1: Split all AND clauses at the root level for granular optimization
@@ -354,7 +354,7 @@ function applySingleLevelOptimization(query: QueryIR): QueryIR {
 
   // Step 2: Analyze each WHERE clause to determine which sources it touches
   const analyzedClauses = splitWhereClauses.map((clause) =>
-    analyzeWhereClause(clause)
+    analyzeWhereClause(clause),
   )
 
   // Step 3: Group clauses by single-source vs multi-source
@@ -365,7 +365,7 @@ function applySingleLevelOptimization(query: QueryIR): QueryIR {
 
   // Add back any residual WHERE clauses that were filtered out
   const residualWhereClauses = query.where.filter((where) =>
-    isResidualWhere(where)
+    isResidualWhere(where),
   )
   if (residualWhereClauses.length > 0) {
     optimizedQuery.where = [
@@ -461,7 +461,7 @@ function isRedundantSubquery(query: QueryIR): boolean {
  * ```
  */
 function splitAndClauses(
-  whereClauses: Array<Where>
+  whereClauses: Array<Where>,
 ): Array<BasicExpression<boolean>> {
   const result: Array<BasicExpression<boolean>> = []
 
@@ -475,7 +475,7 @@ function splitAndClauses(
 
 // Helper function for recursive splitting of BasicExpression arrays
 function splitAndClausesRecursive(
-  clause: BasicExpression<boolean>
+  clause: BasicExpression<boolean>,
 ): Array<BasicExpression<boolean>> {
   if (clause.type === `func` && clause.name === `and`) {
     // Recursively split nested AND clauses to handle complex expressions
@@ -515,7 +515,7 @@ function splitAndClausesRecursive(
  * ```
  */
 function analyzeWhereClause(
-  clause: BasicExpression<boolean>
+  clause: BasicExpression<boolean>,
 ): AnalyzedWhereClause {
   // Track which table aliases this WHERE clause touches
   const touchedSources = new Set<string>()
@@ -580,7 +580,7 @@ function analyzeWhereClause(
  * @returns Grouped clauses ready for optimization
  */
 function groupWhereClauses(
-  analyzedClauses: Array<AnalyzedWhereClause>
+  analyzedClauses: Array<AnalyzedWhereClause>,
 ): GroupedWhereClauses {
   const singleSource = new Map<string, Array<BasicExpression<boolean>>>()
   const multiSource: Array<BasicExpression<boolean>> = []
@@ -630,7 +630,7 @@ function groupWhereClauses(
  */
 function applyOptimizations(
   query: QueryIR,
-  groupedClauses: GroupedWhereClauses
+  groupedClauses: GroupedWhereClauses,
 ): QueryIR {
   // Track which single-source clauses were actually optimized
   const actuallyOptimized = new Set<string>()
@@ -639,7 +639,7 @@ function applyOptimizations(
   const optimizedFrom = optimizeFromWithTracking(
     query.from,
     groupedClauses.singleSource,
-    actuallyOptimized
+    actuallyOptimized,
   )
 
   // Optimize JOIN clauses and track what was optimized
@@ -649,7 +649,7 @@ function applyOptimizations(
         from: optimizeFromWithTracking(
           joinClause.from,
           groupedClauses.singleSource,
-          actuallyOptimized
+          actuallyOptimized,
         ),
       }))
     : undefined
@@ -667,7 +667,7 @@ function applyOptimizations(
     query.join &&
     query.join.some(
       (join) =>
-        join.type === `left` || join.type === `right` || join.type === `full`
+        join.type === `left` || join.type === `right` || join.type === `full`,
     )
 
   // Add single-source clauses
@@ -690,8 +690,8 @@ function applyOptimizations(
       ? [
           combineWithAnd(
             remainingWhereClauses.flatMap((clause) =>
-              splitAndClausesRecursive(getWhereExpression(clause))
-            )
+              splitAndClausesRecursive(getWhereExpression(clause)),
+            ),
           ),
         ]
       : remainingWhereClauses
@@ -749,11 +749,11 @@ function deepCopyQuery(query: QueryIR): QueryIR {
             joinClause.from.type === `collectionRef`
               ? new CollectionRefClass(
                   joinClause.from.collection,
-                  joinClause.from.alias
+                  joinClause.from.alias,
                 )
               : new QueryRefClass(
                   deepCopyQuery(joinClause.from.query),
-                  joinClause.from.alias
+                  joinClause.from.alias,
                 ),
         }))
       : undefined,
@@ -780,7 +780,7 @@ function deepCopyQuery(query: QueryIR): QueryIR {
 function optimizeFromWithTracking(
   from: From,
   singleSourceClauses: Map<string, BasicExpression<boolean>>,
-  actuallyOptimized: Set<string>
+  actuallyOptimized: Set<string>,
 ): From {
   const whereClause = singleSourceClauses.get(from.alias)
 
@@ -833,7 +833,7 @@ function optimizeFromWithTracking(
 function unsafeSelect(
   query: QueryIR,
   whereClause: BasicExpression<boolean>,
-  outerAlias: string
+  outerAlias: string,
 ): boolean {
   if (!query.select) return false
 
@@ -870,7 +870,7 @@ function unsafeFnSelect(query: QueryIR) {
 function isSafeToPushIntoExistingSubquery(
   query: QueryIR,
   whereClause: BasicExpression<boolean>,
-  outerAlias: string
+  outerAlias: string,
 ): boolean {
   return !(
     unsafeSelect(query, whereClause, outerAlias) ||
@@ -945,7 +945,7 @@ function collectRefs(expr: any): Array<PropRef> {
 function whereReferencesComputedSelectFields(
   select: Select,
   whereClause: BasicExpression<boolean>,
-  outerAlias: string
+  outerAlias: string,
 ): boolean {
   // Build a set of computed field names at the top-level of the subquery output
   const computed = new Set<string>()
@@ -979,7 +979,7 @@ function whereReferencesComputedSelectFields(
 function referencesAliasWithRemappedSelect(
   subquery: QueryIR,
   whereClause: BasicExpression<boolean>,
-  outerAlias: string
+  outerAlias: string,
 ): boolean {
   const refs = collectRefs(whereClause)
   // Only care about clauses that actually reference the outer alias.
@@ -1046,7 +1046,7 @@ function referencesAliasWithRemappedSelect(
  * @throws Error if the expressions array is empty
  */
 function combineWithAnd(
-  expressions: Array<BasicExpression<boolean>>
+  expressions: Array<BasicExpression<boolean>>,
 ): BasicExpression<boolean> {
   if (expressions.length === 0) {
     throw new CannotCombineEmptyExpressionListError()
diff --git a/packages/db/src/query/predicate-utils.ts b/packages/db/src/query/predicate-utils.ts
index 3ab7434d2..96162e868 100644
--- a/packages/db/src/query/predicate-utils.ts
+++ b/packages/db/src/query/predicate-utils.ts
@@ -1,6 +1,6 @@
-import { Func, Value } from "./ir.js"
-import type { BasicExpression, OrderBy, PropRef } from "./ir.js"
-import type { LoadSubsetOptions } from "../types.js"
+import { Func, Value } from './ir.js'
+import type { BasicExpression, OrderBy, PropRef } from './ir.js'
+import type { LoadSubsetOptions } from '../types.js'
 
 /**
  * Check if one where clause is a logical subset of another.
@@ -20,7 +20,7 @@ import type { LoadSubsetOptions } from "../types.js"
  */
 export function isWhereSubset(
   subset: BasicExpression<boolean> | undefined,
-  superset: BasicExpression<boolean> | undefined
+  superset: BasicExpression<boolean> | undefined,
 ): boolean {
   // undefined/missing where clause means "no filter" (all data)
   // Both undefined means subset relationship holds (all data ⊆ all data)
@@ -44,7 +44,7 @@ export function isWhereSubset(
 }
 
 function makeDisjunction(
-  preds: Array<BasicExpression<boolean>>
+  preds: Array<BasicExpression<boolean>>,
 ): BasicExpression<boolean> {
   if (preds.length === 0) {
     return new Value(false)
@@ -57,14 +57,14 @@ function makeDisjunction(
 
 function convertInToOr(inField: InField) {
   const equalities = inField.values.map(
-    (value) => new Func(`eq`, [inField.ref, new Value(value)])
+    (value) => new Func(`eq`, [inField.ref, new Value(value)]),
   )
   return makeDisjunction(equalities)
 }
 
 function isWhereSubsetInternal(
   subset: BasicExpression<boolean>,
-  superset: BasicExpression<boolean>
+  superset: BasicExpression<boolean>,
 ): boolean {
   // If subset is false it is requesting no data,
   // thus the result set is empty
@@ -83,7 +83,7 @@ function isWhereSubsetInternal(
   // Example: (age > 20) ⊆ (age > 10 AND status = 'active') is false (doesn't imply status condition)
   if (superset.type === `func` && superset.name === `and`) {
     return superset.args.every((arg) =>
-      isWhereSubsetInternal(subset, arg as BasicExpression<boolean>)
+      isWhereSubsetInternal(subset, arg as BasicExpression<boolean>),
     )
   }
 
@@ -91,7 +91,7 @@ function isWhereSubsetInternal(
   if (subset.type === `func` && subset.name === `and`) {
     // For (A AND B) ⊆ C, since (A AND B) implies A, we check if any conjunct implies C
     return subset.args.some((arg) =>
-      isWhereSubsetInternal(arg as BasicExpression<boolean>, superset)
+      isWhereSubsetInternal(arg as BasicExpression<boolean>, superset),
     )
   }
 
@@ -114,7 +114,7 @@ function isWhereSubsetInternal(
   // Handle OR in subset: (A OR B) is subset of C only if both A and B are subsets of C
   if (subset.type === `func` && subset.name === `or`) {
     return subset.args.every((arg) =>
-      isWhereSubsetInternal(arg as BasicExpression<boolean>, superset)
+      isWhereSubsetInternal(arg as BasicExpression<boolean>, superset),
     )
   }
 
@@ -123,7 +123,7 @@ function isWhereSubsetInternal(
   // If subset is contained in any disjunct, it's contained in the union
   if (superset.type === `func` && superset.name === `or`) {
     return superset.args.some((arg) =>
-      isWhereSubsetInternal(subset, arg as BasicExpression<boolean>)
+      isWhereSubsetInternal(subset, arg as BasicExpression<boolean>),
     )
   }
 
@@ -145,7 +145,7 @@ function isWhereSubsetInternal(
         subsetFunc,
         subsetField.value,
         supersetFunc,
-        supersetField.value
+        supersetField.value,
       )
     }
 
@@ -205,8 +205,8 @@ function combineWherePredicates(
   predicates: Array<BasicExpression<boolean>>,
   operation: `and` | `or`,
   simplifyFn: (
-    preds: Array<BasicExpression<boolean>>
-  ) => BasicExpression<boolean> | null
+    preds: Array<BasicExpression<boolean>>,
+  ) => BasicExpression<boolean> | null,
 ): BasicExpression<boolean> {
   const emptyValue = operation === `and` ? true : false
   const identityValue = operation === `and` ? true : false
@@ -293,7 +293,7 @@ function combineWherePredicates(
  * @returns Combined predicate representing the union
  */
 export function unionWherePredicates(
-  predicates: Array<BasicExpression<boolean>>
+  predicates: Array<BasicExpression<boolean>>,
 ): BasicExpression<boolean> {
   return combineWherePredicates(predicates, `or`, unionSameFieldPredicates)
 }
@@ -337,7 +337,7 @@ export function unionWherePredicates(
  */
 export function minusWherePredicates(
   fromPredicate: BasicExpression<boolean> | undefined,
-  subtractPredicate: BasicExpression<boolean> | undefined
+  subtractPredicate: BasicExpression<boolean> | undefined,
 ): BasicExpression<boolean> | null {
   // If nothing to subtract, return the original
   if (subtractPredicate === undefined) {
@@ -367,20 +367,20 @@ export function minusWherePredicates(
   // Try to detect and handle common conditions
   const commonConditions = findCommonConditions(
     fromPredicate,
-    subtractPredicate
+    subtractPredicate,
   )
   if (commonConditions.length > 0) {
     // Extract predicates without common conditions
     const fromWithoutCommon = removeConditions(fromPredicate, commonConditions)
     const subtractWithoutCommon = removeConditions(
       subtractPredicate,
-      commonConditions
+      commonConditions,
     )
 
     // Recursively compute difference on simplified predicates
     const simplifiedDifference = minusWherePredicates(
       fromWithoutCommon,
-      subtractWithoutCommon
+      subtractWithoutCommon,
     )
 
     if (simplifiedDifference !== null) {
@@ -406,7 +406,7 @@ export function minusWherePredicates(
  */
 function minusSameFieldPredicates(
   fromPred: Func,
-  subtractPred: Func
+  subtractPred: Func,
 ): BasicExpression<boolean> | null {
   // Extract field information
   const fromField =
@@ -439,8 +439,8 @@ function minusSameFieldPredicates(
           subtractInField.values,
           v,
           subtractInField.primitiveSet ?? null,
-          subtractInField.areAllPrimitives
-        )
+          subtractInField.areAllPrimitives,
+        ),
     )
 
     if (remainingValues.length === 0) {
@@ -468,7 +468,7 @@ function minusSameFieldPredicates(
     const subtractValue = (subtractField as { ref: PropRef; value: any }).value
 
     const remainingValues = fromInField.values.filter(
-      (v) => !areValuesEqual(v, subtractValue)
+      (v) => !areValuesEqual(v, subtractValue),
     )
 
     if (remainingValues.length === 0) {
@@ -517,7 +517,7 @@ function minusSameFieldPredicates(
       fromPred,
       fromComp.value,
       subtractPred,
-      subtractComp.value
+      subtractComp.value,
     )
     return result
   }
@@ -533,7 +533,7 @@ function minusRangePredicates(
   fromFunc: Func,
   fromValue: any,
   subtractFunc: Func,
-  subtractValue: any
+  subtractValue: any,
 ): BasicExpression<boolean> | null {
   const fromOp = fromFunc.name as `gt` | `gte` | `lt` | `lte` | `eq`
   const subtractOp = subtractFunc.name as `gt` | `gte` | `lt` | `lte` | `eq`
@@ -712,7 +712,7 @@ function minusRangePredicates(
  */
 export function isOrderBySubset(
   subset: OrderBy | undefined,
-  superset: OrderBy | undefined
+  superset: OrderBy | undefined,
 ): boolean {
   // No ordering requirement is always satisfied
   if (!subset || subset.length === 0) {
@@ -742,7 +742,7 @@ export function isOrderBySubset(
     if (
       !areCompareOptionsEqual(
         subClause.compareOptions,
-        superClause.compareOptions
+        superClause.compareOptions,
       )
     ) {
       return false
@@ -756,6 +756,9 @@ export function isOrderBySubset(
  * Check if one limit is a subset of another.
  * Returns true if the subset limit requirements are satisfied by the superset limit.
  *
+ * Note: This function does NOT consider offset. For offset-aware subset checking,
+ * use `isOffsetLimitSubset` instead.
+ *
  * @example
  * isLimitSubset(10, 20) // true (requesting 10 items when 20 are available)
  * isLimitSubset(20, 10) // false (requesting 20 items when only 10 are available)
@@ -767,7 +770,7 @@ export function isOrderBySubset(
  */
 export function isLimitSubset(
   subset: number | undefined,
-  superset: number | undefined
+  superset: number | undefined,
 ): boolean {
   // Unlimited superset satisfies any limit requirement
   if (superset === undefined) {
@@ -785,7 +788,57 @@ export function isLimitSubset(
 }
 
 /**
- * Check if one predicate (where + orderBy + limit) is a subset of another.
+ * Check if one offset+limit range is a subset of another.
+ * Returns true if the subset range is fully contained within the superset range.
+ *
+ * A query with `{limit: 10, offset: 0}` loads rows [0, 10).
+ * A query with `{limit: 10, offset: 20}` loads rows [20, 30).
+ *
+ * For subset to be satisfied by superset:
+ * - Superset must start at or before subset (superset.offset <= subset.offset)
+ * - Superset must end at or after subset (superset.offset + superset.limit >= subset.offset + subset.limit)
+ *
+ * @example
+ * isOffsetLimitSubset({ offset: 0, limit: 5 }, { offset: 0, limit: 10 }) // true
+ * isOffsetLimitSubset({ offset: 5, limit: 5 }, { offset: 0, limit: 10 }) // true (rows 5-9 within 0-9)
+ * isOffsetLimitSubset({ offset: 5, limit: 10 }, { offset: 0, limit: 10 }) // false (rows 5-14 exceed 0-9)
+ * isOffsetLimitSubset({ offset: 20, limit: 10 }, { offset: 0, limit: 10 }) // false (rows 20-29 outside 0-9)
+ *
+ * @param subset - The offset+limit requirements to check
+ * @param superset - The offset+limit that might satisfy the requirements
+ * @returns true if subset range is fully contained within superset range
+ */
+export function isOffsetLimitSubset(
+  subset: { offset?: number; limit?: number },
+  superset: { offset?: number; limit?: number },
+): boolean {
+  const subsetOffset = subset.offset ?? 0
+  const supersetOffset = superset.offset ?? 0
+
+  // Superset must start at or before subset
+  if (supersetOffset > subsetOffset) {
+    return false
+  }
+
+  // If superset is unlimited, it covers everything from its offset onwards
+  if (superset.limit === undefined) {
+    return true
+  }
+
+  // If subset is unlimited but superset has a limit, subset can't be satisfied
+  if (subset.limit === undefined) {
+    return false
+  }
+
+  // Both have limits - check if subset range is within superset range
+  const subsetEnd = subsetOffset + subset.limit
+  const supersetEnd = supersetOffset + superset.limit
+
+  return subsetEnd <= supersetEnd
+}
+
+/**
+ * Check if one predicate (where + orderBy + limit + offset) is a subset of another.
  * Returns true if all aspects of the subset predicate are satisfied by the superset.
  *
  * @example
@@ -800,7 +853,7 @@ export function isLimitSubset(
  */
 export function isPredicateSubset(
   subset: LoadSubsetOptions,
-  superset: LoadSubsetOptions
+  superset: LoadSubsetOptions,
 ): boolean {
   // When the superset has a limit, we can only determine subset relationship
   // if the where clauses are equal (not just subset relationship).
@@ -813,9 +866,9 @@ export function isPredicateSubset(
   // The top 10 items matching 'search%' might include items outside the overall top 10.
   //
   // However, if the where clauses are equal, then the subset relationship can
-  // be determined by orderBy and limit alone:
-  // Example: superset = {where: status='active', limit: 10, orderBy: desc}
-  //          subset = {where: status='active', limit: 5, orderBy: desc}
+  // be determined by orderBy, limit, and offset:
+  // Example: superset = {where: status='active', limit: 10, offset: 0, orderBy: desc}
+  //          subset = {where: status='active', limit: 5, offset: 0, orderBy: desc}
   // The top 5 active items ARE contained in the top 10 active items.
   if (superset.limit !== undefined) {
     // For limited supersets, where clauses must be equal
@@ -824,15 +877,17 @@ export function isPredicateSubset(
     }
     return (
       isOrderBySubset(subset.orderBy, superset.orderBy) &&
-      isLimitSubset(subset.limit, superset.limit)
+      isOffsetLimitSubset(subset, superset)
     )
   }
 
   // For unlimited supersets, use the normal subset logic
+  // Still need to consider offset - an unlimited query with offset only covers
+  // rows from that offset onwards
   return (
     isWhereSubset(subset.where, superset.where) &&
     isOrderBySubset(subset.orderBy, superset.orderBy) &&
-    isLimitSubset(subset.limit, superset.limit)
+    isOffsetLimitSubset(subset, superset)
   )
 }
 
@@ -842,7 +897,7 @@ export function isPredicateSubset(
  */
 function areWhereClausesEqual(
   a: BasicExpression<boolean> | undefined,
-  b: BasicExpression<boolean> | undefined
+  b: BasicExpression<boolean> | undefined,
 ): boolean {
   if (a === undefined && b === undefined) {
     return true
@@ -863,7 +918,7 @@ function areWhereClausesEqual(
  */
 function findCommonConditions(
   predicate1: BasicExpression<boolean>,
-  predicate2: BasicExpression<boolean>
+  predicate2: BasicExpression<boolean>,
 ): Array<BasicExpression<boolean>> {
   const conditions1 = extractAllConditions(predicate1)
   const conditions2 = extractAllConditions(predicate2)
@@ -889,7 +944,7 @@ function findCommonConditions(
  * Extract all individual conditions from a predicate, flattening AND operations.
  */
 function extractAllConditions(
-  predicate: BasicExpression<boolean>
+  predicate: BasicExpression<boolean>,
 ): Array<BasicExpression<boolean>> {
   if (predicate.type === `func` && predicate.name === `and`) {
     const conditions: Array<BasicExpression<boolean>> = []
@@ -908,14 +963,14 @@ function extractAllConditions(
  */
 function removeConditions(
   predicate: BasicExpression<boolean>,
-  conditionsToRemove: Array<BasicExpression<boolean>>
+  conditionsToRemove: Array<BasicExpression<boolean>>,
 ): BasicExpression<boolean> | undefined {
   if (predicate.type === `func` && predicate.name === `and`) {
     const remainingArgs = predicate.args.filter(
       (arg) =>
         !conditionsToRemove.some((cond) =>
-          areExpressionsEqual(arg as BasicExpression<boolean>, cond)
-        )
+          areExpressionsEqual(arg as BasicExpression<boolean>, cond),
+        ),
     )
 
     if (remainingArgs.length === 0) {
@@ -940,7 +995,7 @@ function removeConditions(
  * Flattens nested AND operations to avoid unnecessary nesting.
  */
 function combineConditions(
-  conditions: Array<BasicExpression<boolean>>
+  conditions: Array<BasicExpression<boolean>>,
 ): BasicExpression<boolean> {
   if (conditions.length === 0) {
     return { type: `val`, value: true } as BasicExpression<boolean>
@@ -977,7 +1032,7 @@ function combineConditions(
 function findPredicateWithOperator(
   predicates: Array<BasicExpression<boolean>>,
   operator: string,
-  value: any
+  value: any,
 ): BasicExpression<boolean> | undefined {
   return predicates.find((p) => {
     if (p.type === `func`) {
@@ -1012,7 +1067,7 @@ function areExpressionsEqual(a: BasicExpression, b: BasicExpression): boolean {
       return false
     }
     return aFunc.args.every((arg, i) =>
-      areExpressionsEqual(arg, bFunc.args[i]!)
+      areExpressionsEqual(arg, bFunc.args[i]!),
     )
   }
 
@@ -1086,7 +1141,7 @@ function arrayIncludesWithSet(
   array: Array<any>,
   value: any,
   primitiveSet: Set<any> | null,
-  arrayIsAllPrimitives?: boolean
+  arrayIsAllPrimitives?: boolean,
 ): boolean {
   // Fast path: use pre-built Set for O(1) lookup
   if (primitiveSet) {
@@ -1124,7 +1179,7 @@ function minValue(a: any, b: any): any {
 
 function areCompareOptionsEqual(
   a: { direction?: `asc` | `desc`; [key: string]: any },
-  b: { direction?: `asc` | `desc`; [key: string]: any }
+  b: { direction?: `asc` | `desc`; [key: string]: any },
 ): boolean {
   // For now, just compare direction - could be enhanced for other options
   return a.direction === b.direction
@@ -1215,7 +1270,7 @@ function isComparisonSubset(
   subsetFunc: Func,
   subsetValue: any,
   supersetFunc: Func,
-  supersetValue: any
+  supersetValue: any,
 ): boolean {
   const subOp = subsetFunc.name
   const superOp = supersetFunc.name
@@ -1283,7 +1338,7 @@ function isComparisonSubset(
 }
 
 function groupPredicatesByField(
-  predicates: Array<BasicExpression<boolean>>
+  predicates: Array<BasicExpression<boolean>>,
 ): Map<string | null, Array<BasicExpression<boolean>>> {
   const groups = new Map<string | null, Array<BasicExpression<boolean>>>()
 
@@ -1310,7 +1365,7 @@ function groupPredicatesByField(
 }
 
 function unionSameFieldPredicates(
-  predicates: Array<BasicExpression<boolean>>
+  predicates: Array<BasicExpression<boolean>>,
 ): BasicExpression<boolean> | null {
   if (predicates.length === 1) {
     return predicates[0]!
@@ -1436,7 +1491,7 @@ function unionSameFieldPredicates(
           return (p as Func).name === `in`
         }
         return false
-      })!
+      })!,
     )
   }
 
diff --git a/packages/db/src/query/subset-dedupe.ts b/packages/db/src/query/subset-dedupe.ts
index 3f24154ac..4959d3cbb 100644
--- a/packages/db/src/query/subset-dedupe.ts
+++ b/packages/db/src/query/subset-dedupe.ts
@@ -3,9 +3,9 @@ import {
   isWhereSubset,
   minusWherePredicates,
   unionWherePredicates,
-} from "./predicate-utils.js"
-import type { BasicExpression } from "./ir.js"
-import type { LoadSubsetOptions } from "../types.js"
+} from './predicate-utils.js'
+import type { BasicExpression } from './ir.js'
+import type { LoadSubsetOptions } from '../types.js'
 
 /**
  * Deduplicated wrapper for a loadSubset function.
@@ -34,7 +34,7 @@ import type { LoadSubsetOptions } from "../types.js"
 export class DeduplicatedLoadSubset {
   // The underlying loadSubset function to wrap
   private readonly _loadSubset: (
-    options: LoadSubsetOptions
+    options: LoadSubsetOptions,
   ) => true | Promise<void>
 
   // An optional callback function that is invoked when a loadSubset call is deduplicated.
@@ -101,7 +101,7 @@ export class DeduplicatedLoadSubset {
     // Check against limited calls
     if (options.limit !== undefined) {
       const alreadyLoaded = this.limitedCalls.some((loaded) =>
-        isPredicateSubset(options, loaded)
+        isPredicateSubset(options, loaded),
       )
 
       if (alreadyLoaded) {
@@ -113,7 +113,7 @@ export class DeduplicatedLoadSubset {
     // Check against in-flight calls using the same subset logic as resolved calls
     // This prevents duplicate requests when concurrent calls have subset relationships
     const matchingInflight = this.inflightCalls.find((inflight) =>
-      isPredicateSubset(options, inflight.options)
+      isPredicateSubset(options, inflight.options),
     )
 
     if (matchingInflight !== undefined) {
diff --git a/packages/db/src/scheduler.ts b/packages/db/src/scheduler.ts
index 30222f9e4..8ffe8b768 100644
--- a/packages/db/src/scheduler.ts
+++ b/packages/db/src/scheduler.ts
@@ -54,7 +54,7 @@ export class Scheduler {
    * Get or create the state bucket for a context.
    */
   private getOrCreateContext(
-    contextId: SchedulerContextId
+    contextId: SchedulerContextId,
   ): SchedulerContextState {
     let context = this.contexts.get(contextId)
     if (!context) {
@@ -166,8 +166,8 @@ export class Scheduler {
       if (!ranThisPass) {
         throw new Error(
           `Scheduler detected unresolved dependencies for context ${String(
-            contextId
-          )}.`
+            contextId,
+          )}.`,
         )
       }
     }
diff --git a/packages/db/src/strategies/debounceStrategy.ts b/packages/db/src/strategies/debounceStrategy.ts
index b73b6a386..355b435c5 100644
--- a/packages/db/src/strategies/debounceStrategy.ts
+++ b/packages/db/src/strategies/debounceStrategy.ts
@@ -1,6 +1,6 @@
-import { LiteDebouncer } from "@tanstack/pacer-lite/lite-debouncer"
-import type { DebounceStrategy, DebounceStrategyOptions } from "./types"
-import type { Transaction } from "../transactions"
+import { LiteDebouncer } from '@tanstack/pacer-lite/lite-debouncer'
+import type { DebounceStrategy, DebounceStrategyOptions } from './types'
+import type { Transaction } from '../transactions'
 
 /**
  * Creates a debounce strategy that delays transaction execution until after
@@ -26,18 +26,18 @@ import type { Transaction } from "../transactions"
  * ```
  */
 export function debounceStrategy(
-  options: DebounceStrategyOptions
+  options: DebounceStrategyOptions,
 ): DebounceStrategy {
   const debouncer = new LiteDebouncer(
     (callback: () => Transaction) => callback(),
-    options
+    options,
   )
 
   return {
     _type: `debounce`,
     options,
     execute: <T extends object = Record<string, unknown>>(
-      fn: () => Transaction<T>
+      fn: () => Transaction<T>,
     ) => {
       debouncer.maybeExecute(fn as () => Transaction)
     },
diff --git a/packages/db/src/strategies/index.ts b/packages/db/src/strategies/index.ts
index 734842617..64d41acea 100644
--- a/packages/db/src/strategies/index.ts
+++ b/packages/db/src/strategies/index.ts
@@ -1,7 +1,7 @@
 // Export all strategy factories
-export { debounceStrategy } from "./debounceStrategy"
-export { queueStrategy } from "./queueStrategy"
-export { throttleStrategy } from "./throttleStrategy"
+export { debounceStrategy } from './debounceStrategy'
+export { queueStrategy } from './queueStrategy'
+export { throttleStrategy } from './throttleStrategy'
 
 // Export strategy types
 export type {
@@ -14,4 +14,4 @@ export type {
   ThrottleStrategy,
   ThrottleStrategyOptions,
   StrategyOptions,
-} from "./types"
+} from './types'
diff --git a/packages/db/src/strategies/queueStrategy.ts b/packages/db/src/strategies/queueStrategy.ts
index 1f1270a4d..2f67848f4 100644
--- a/packages/db/src/strategies/queueStrategy.ts
+++ b/packages/db/src/strategies/queueStrategy.ts
@@ -1,6 +1,6 @@
-import { LiteQueuer } from "@tanstack/pacer-lite/lite-queuer"
-import type { QueueStrategy, QueueStrategyOptions } from "./types"
-import type { Transaction } from "../transactions"
+import { LiteQueuer } from '@tanstack/pacer-lite/lite-queuer'
+import type { QueueStrategy, QueueStrategyOptions } from './types'
+import type { Transaction } from '../transactions'
 
 /**
  * Creates a queue strategy that processes all mutations in order with proper serialization.
@@ -71,14 +71,14 @@ export function queueStrategy(options?: QueueStrategyOptions): QueueStrategy {
       addItemsTo: options?.addItemsTo ?? `back`, // Default FIFO: add to back
       getItemsFrom: options?.getItemsFrom ?? `front`, // Default FIFO: get from front
       started: true, // Start processing immediately
-    }
+    },
   )
 
   return {
     _type: `queue`,
     options,
     execute: <T extends object = Record<string, unknown>>(
-      fn: () => Transaction<T>
+      fn: () => Transaction<T>,
     ) => {
       // Add the transaction-creating function to the queue
       queuer.addItem(fn as () => Transaction)
diff --git a/packages/db/src/strategies/throttleStrategy.ts b/packages/db/src/strategies/throttleStrategy.ts
index e8f3f543d..95ad510a8 100644
--- a/packages/db/src/strategies/throttleStrategy.ts
+++ b/packages/db/src/strategies/throttleStrategy.ts
@@ -1,6 +1,6 @@
-import { LiteThrottler } from "@tanstack/pacer-lite/lite-throttler"
-import type { ThrottleStrategy, ThrottleStrategyOptions } from "./types"
-import type { Transaction } from "../transactions"
+import { LiteThrottler } from '@tanstack/pacer-lite/lite-throttler'
+import type { ThrottleStrategy, ThrottleStrategyOptions } from './types'
+import type { Transaction } from '../transactions'
 
 /**
  * Creates a throttle strategy that ensures transactions are evenly spaced
@@ -46,18 +46,18 @@ import type { Transaction } from "../transactions"
  * ```
  */
 export function throttleStrategy(
-  options: ThrottleStrategyOptions
+  options: ThrottleStrategyOptions,
 ): ThrottleStrategy {
   const throttler = new LiteThrottler(
     (callback: () => Transaction) => callback(),
-    options
+    options,
   )
 
   return {
     _type: `throttle`,
     options,
     execute: <T extends object = Record<string, unknown>>(
-      fn: () => Transaction<T>
+      fn: () => Transaction<T>,
     ) => {
       throttler.maybeExecute(fn as () => Transaction)
     },
diff --git a/packages/db/src/strategies/types.ts b/packages/db/src/strategies/types.ts
index 3514fea61..70102c87a 100644
--- a/packages/db/src/strategies/types.ts
+++ b/packages/db/src/strategies/types.ts
@@ -1,4 +1,4 @@
-import type { Transaction } from "../transactions"
+import type { Transaction } from '../transactions'
 
 /**
  * Base strategy interface that all strategy implementations must conform to
@@ -13,7 +13,7 @@ export interface BaseStrategy<TName extends string = string> {
    * @returns The result of the function execution (if applicable)
    */
   execute: <T extends object = Record<string, unknown>>(
-    fn: () => Transaction<T>
+    fn: () => Transaction<T>,
   ) => void | Promise<void>
 
   /**
diff --git a/packages/db/src/transactions.ts b/packages/db/src/transactions.ts
index d92116aed..858772be2 100644
--- a/packages/db/src/transactions.ts
+++ b/packages/db/src/transactions.ts
@@ -1,20 +1,20 @@
-import { createDeferred } from "./deferred"
-import "./duplicate-instance-check"
+import { createDeferred } from './deferred'
+import './duplicate-instance-check'
 import {
   MissingMutationFunctionError,
   TransactionAlreadyCompletedRollbackError,
   TransactionNotPendingCommitError,
   TransactionNotPendingMutateError,
-} from "./errors"
-import { transactionScopedScheduler } from "./scheduler.js"
-import type { Deferred } from "./deferred"
+} from './errors'
+import { transactionScopedScheduler } from './scheduler.js'
+import type { Deferred } from './deferred'
 import type {
   MutationFn,
   PendingMutation,
   TransactionConfig,
   TransactionState,
   TransactionWithMutations,
-} from "./types"
+} from './types'
 
 const transactions: Array<Transaction<any>> = []
 let transactionStack: Array<Transaction<any>> = []
@@ -41,7 +41,7 @@ let sequenceNumber = 0
  */
 function mergePendingMutations<T extends object>(
   existing: PendingMutation<T>,
-  incoming: PendingMutation<T>
+  incoming: PendingMutation<T>,
 ): PendingMutation<T> | null {
   // Truth table implementation
   switch (`${existing.type}-${incoming.type}` as const) {
@@ -154,7 +154,7 @@ function mergePendingMutations<T extends object>(
  * await tx.commit()
  */
 export function createTransaction<T extends object = Record<string, unknown>>(
-  config: TransactionConfig<T>
+  config: TransactionConfig<T>,
 ): Transaction<T> {
   const newTransaction = new Transaction<T>(config)
   transactions.push(newTransaction)
@@ -327,7 +327,7 @@ class Transaction<T extends object = Record<string, unknown>> {
   applyMutations(mutations: Array<PendingMutation<any>>): void {
     for (const newMutation of mutations) {
       const existingIndex = this.mutations.findIndex(
-        (m) => m.globalKey === newMutation.globalKey
+        (m) => m.globalKey === newMutation.globalKey,
       )
 
       if (existingIndex >= 0) {
diff --git a/packages/db/src/types.ts b/packages/db/src/types.ts
index f41492ec7..bb78f35eb 100644
--- a/packages/db/src/types.ts
+++ b/packages/db/src/types.ts
@@ -1,9 +1,9 @@
-import type { IStreamBuilder } from "@tanstack/db-ivm"
-import type { Collection } from "./collection/index.js"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
-import type { Transaction } from "./transactions"
-import type { BasicExpression, OrderBy } from "./query/ir.js"
-import type { EventEmitter } from "./event-emitter.js"
+import type { IStreamBuilder } from '@tanstack/db-ivm'
+import type { Collection } from './collection/index.js'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+import type { Transaction } from './transactions'
+import type { BasicExpression, OrderBy } from './query/ir.js'
+import type { EventEmitter } from './event-emitter.js'
 
 /**
  * Interface for a collection-like object that provides the necessary methods
@@ -124,7 +124,7 @@ export type MutationFnParams<T extends object = Record<string, unknown>> = {
 }
 
 export type MutationFn<T extends object = Record<string, unknown>> = (
-  params: MutationFnParams<T>
+  params: MutationFnParams<T>,
 ) => Promise<any>
 
 /**
@@ -238,9 +238,9 @@ export interface SubscriptionUnsubscribedEvent {
  * All subscription events
  */
 export type SubscriptionEvents = {
-  "status:change": SubscriptionStatusChangeEvent
-  "status:ready": SubscriptionStatusEvent<`ready`>
-  "status:loadingSubset": SubscriptionStatusEvent<`loadingSubset`>
+  'status:change': SubscriptionStatusChangeEvent
+  'status:ready': SubscriptionStatusEvent<`ready`>
+  'status:loadingSubset': SubscriptionStatusEvent<`loadingSubset`>
   unsubscribed: SubscriptionUnsubscribedEvent
 }
 
@@ -253,13 +253,52 @@ export interface Subscription extends EventEmitter<SubscriptionEvents> {
   readonly status: SubscriptionStatus
 }
 
+/**
+ * Cursor expressions for pagination, passed separately from the main `where` clause.
+ * The sync layer can choose to use cursor-based pagination (combining these with the where)
+ * or offset-based pagination (ignoring these and using the `offset` parameter).
+ *
+ * Neither expression includes the main `where` clause - they are cursor-specific only.
+ */
+export type CursorExpressions = {
+  /**
+   * Expression for rows greater than (after) the cursor value.
+   * For multi-column orderBy, this is a composite cursor using OR of conditions.
+   * Example for [col1 ASC, col2 DESC] with values [v1, v2]:
+   *   or(gt(col1, v1), and(eq(col1, v1), lt(col2, v2)))
+   */
+  whereFrom: BasicExpression<boolean>
+  /**
+   * Expression for rows equal to the current cursor value (first orderBy column only).
+   * Used to handle tie-breaking/duplicates at the boundary.
+   * Example: eq(col1, v1) or for Dates: and(gte(col1, v1), lt(col1, v1+1ms))
+   */
+  whereCurrent: BasicExpression<boolean>
+  /**
+   * The key of the last item that was loaded.
+   * Can be used by sync layers for tracking or deduplication.
+   */
+  lastKey?: string | number
+}
+
 export type LoadSubsetOptions = {
-  /** The where expression to filter the data */
+  /** The where expression to filter the data (does NOT include cursor expressions) */
   where?: BasicExpression<boolean>
   /** The order by clause to sort the data */
   orderBy?: OrderBy
   /** The limit of the data to load */
   limit?: number
+  /**
+   * Cursor expressions for cursor-based pagination.
+   * These are separate from `where` - the sync layer should combine them if using cursor-based pagination.
+   * Neither expression includes the main `where` clause.
+   */
+  cursor?: CursorExpressions
+  /**
+   * Row offset for offset-based pagination.
+   * The sync layer can use this instead of `cursor` if it prefers offset-based pagination.
+   */
+  offset?: number
   /**
    * The subscription that triggered the load.
    * Advanced sync implementations can use this for:
@@ -289,7 +328,7 @@ export interface SyncConfig<
   sync: (params: {
     collection: Collection<T, TKey, any, any, any>
     begin: () => void
-    write: (message: Omit<ChangeMessage<T>, `key`>) => void
+    write: (message: ChangeMessageOrDeleteKeyMessage<T, TKey>) => void
     commit: () => void
     markReady: () => void
     truncate: () => void
@@ -322,19 +361,35 @@ export interface ChangeMessage<
   metadata?: Record<string, unknown>
 }
 
-export interface OptimisticChangeMessage<
+export type DeleteKeyMessage<TKey extends string | number = string | number> =
+  Omit<ChangeMessage<any, TKey>, `value` | `previousValue` | `type`> & {
+    type: `delete`
+  }
+
+export type ChangeMessageOrDeleteKeyMessage<
   T extends object = Record<string, unknown>,
-> extends ChangeMessage<T> {
-  // Is this change message part of an active transaction. Only applies to optimistic changes.
-  isActive?: boolean
-}
+  TKey extends string | number = string | number,
+> = Omit<ChangeMessage<T>, `key`> | DeleteKeyMessage<TKey>
+
+export type OptimisticChangeMessage<
+  T extends object = Record<string, unknown>,
+  TKey extends string | number = string | number,
+> =
+  | (ChangeMessage<T> & {
+      // Is this change message part of an active transaction. Only applies to optimistic changes.
+      isActive?: boolean
+    })
+  | (DeleteKeyMessage<TKey> & {
+      // Is this change message part of an active transaction. Only applies to optimistic changes.
+      isActive?: boolean
+    })
 
 /**
  * The Standard Schema interface.
  * This follows the standard-schema specification: https://github.com/standard-schema/standard-schema
  */
 export type StandardSchema<T> = StandardSchemaV1 & {
-  "~standard": {
+  '~standard': {
     types?: {
       input: T
       output: T
@@ -855,3 +910,6 @@ export type WritableDeep<T> = T extends BuiltIns
           : T extends object
             ? WritableObjectDeep<T>
             : unknown
+
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> &
+  Partial<Pick<T, K>>
diff --git a/packages/db/src/utils.ts b/packages/db/src/utils.ts
index 5f40934e1..248b93d36 100644
--- a/packages/db/src/utils.ts
+++ b/packages/db/src/utils.ts
@@ -2,7 +2,7 @@
  * Generic utility functions
  */
 
-import type { CompareOptions } from "./query/builder/types"
+import type { CompareOptions } from './query/builder/types'
 
 interface TypedArray {
   length: number
@@ -36,7 +36,7 @@ export function deepEquals(a: any, b: any): boolean {
 function deepEqualsInternal(
   a: any,
   b: any,
-  visited: Map<object, object>
+  visited: Map<object, object>,
 ): boolean {
   // Handle strict equality (primitives, same reference)
   if (a === b) return true
@@ -154,7 +154,7 @@ function deepEqualsInternal(
     visited.set(a, b)
 
     const result = a.every((item, index) =>
-      deepEqualsInternal(item, b[index], visited)
+      deepEqualsInternal(item, b[index], visited),
     )
     visited.delete(a)
     return result
@@ -180,7 +180,7 @@ function deepEqualsInternal(
 
     // Check if all keys exist in both objects and their values are equal
     const result = keysA.every(
-      (key) => key in b && deepEqualsInternal(a[key], b[key], visited)
+      (key) => key in b && deepEqualsInternal(a[key], b[key], visited),
     )
 
     visited.delete(a)
diff --git a/packages/db/src/utils/array-utils.ts b/packages/db/src/utils/array-utils.ts
index 55847d91f..8b2cdbefd 100644
--- a/packages/db/src/utils/array-utils.ts
+++ b/packages/db/src/utils/array-utils.ts
@@ -8,7 +8,7 @@
 export function findInsertPosition<T>(
   sortedArray: Array<[T, any]>,
   value: T,
-  compareFn: (a: T, b: T) => number
+  compareFn: (a: T, b: T) => number,
 ): number {
   let left = 0
   let right = sortedArray.length
diff --git a/packages/db/src/utils/browser-polyfills.ts b/packages/db/src/utils/browser-polyfills.ts
index f370024a6..16a021785 100644
--- a/packages/db/src/utils/browser-polyfills.ts
+++ b/packages/db/src/utils/browser-polyfills.ts
@@ -7,7 +7,7 @@ export type IdleCallbackDeadline = {
 export type IdleCallbackFunction = (deadline: IdleCallbackDeadline) => void
 
 const requestIdleCallbackPolyfill = (
-  callback: IdleCallbackFunction
+  callback: IdleCallbackFunction,
 ): number => {
   // Use a very small timeout for the polyfill to simulate idle time
   const timeout = 0
@@ -26,7 +26,7 @@ const cancelIdleCallbackPolyfill = (id: number): void => {
 
 export const safeRequestIdleCallback: (
   callback: IdleCallbackFunction,
-  options?: { timeout?: number }
+  options?: { timeout?: number },
 ) => number =
   typeof window !== `undefined` && `requestIdleCallback` in window
     ? (callback, options) =>
diff --git a/packages/db/src/utils/btree.ts b/packages/db/src/utils/btree.ts
index 30f39c42d..0d35cf7a5 100644
--- a/packages/db/src/utils/btree.ts
+++ b/packages/db/src/utils/btree.ts
@@ -117,7 +117,7 @@ export class BTree<K = any, V = any> {
   public constructor(
     compare: (a: K, b: K) => number,
     entries?: Array<[K, V]>,
-    maxNodeSize?: number
+    maxNodeSize?: number,
   ) {
     this._maxNodeSize = maxNodeSize! >= 4 ? Math.min(maxNodeSize!, 256) : 32
     this._compare = compare
@@ -230,7 +230,7 @@ export class BTree<K = any, V = any> {
       0,
       (k, _v) => {
         results.push(k)
-      }
+      },
     )
     return results
   }
@@ -250,7 +250,7 @@ export class BTree<K = any, V = any> {
       key,
       this._compare,
       false,
-      reusedArray
+      reusedArray,
     )
   }
 
@@ -306,7 +306,7 @@ export class BTree<K = any, V = any> {
     high: K,
     includeHigh: boolean,
     onFound?: (k: K, v: V, counter: number) => void,
-    initialCounter?: number
+    initialCounter?: number,
   ): number
 
   /**
@@ -331,7 +331,7 @@ export class BTree<K = any, V = any> {
     high: K,
     includeHigh: boolean,
     onFound?: (k: K, v: V, counter: number) => { break?: R } | void,
-    initialCounter?: number
+    initialCounter?: number,
   ): R | number {
     const r = this._root.forRange(
       low,
@@ -340,7 +340,7 @@ export class BTree<K = any, V = any> {
       false,
       this,
       initialCounter || 0,
-      onFound
+      onFound,
     )
     return typeof r === `number` ? r : r.break!
   }
@@ -379,7 +379,7 @@ export class BTree<K = any, V = any> {
     high: K,
     includeHigh: boolean,
     onFound: (k: K, v: V, counter: number) => EditRangeResult<V, R> | void,
-    initialCounter?: number
+    initialCounter?: number,
   ): R | number {
     let root = this._root
     if (root.isShared) this._root = root = root.clone()
@@ -391,7 +391,7 @@ export class BTree<K = any, V = any> {
         true,
         this,
         initialCounter || 0,
-        onFound
+        onFound,
       )
       return typeof r === `number` ? r : r.break!
     } finally {
@@ -500,7 +500,7 @@ class BNode<K, V> {
     key: K,
     compare: (a: K, b: K) => number,
     inclusive: boolean,
-    reusedArray: [K, V]
+    reusedArray: [K, V],
   ): [K, V] | undefined {
     const i = this.indexOf(key, -1, compare)
     const indexOrLower = i < 0 ? ~i - 1 : inclusive ? i : i - 1
@@ -516,7 +516,7 @@ class BNode<K, V> {
     key: K,
     compare: (a: K, b: K) => number,
     inclusive: boolean,
-    reusedArray: [K, V]
+    reusedArray: [K, V],
   ): [K, V] | undefined {
     const i = this.indexOf(key, -1, compare)
     const indexOrLower = i < 0 ? ~i : inclusive ? i : i + 1
@@ -536,7 +536,7 @@ class BNode<K, V> {
     key: K,
     value: V,
     overwrite: boolean | undefined,
-    tree: BTree<K, V>
+    tree: BTree<K, V>,
   ): boolean | BNode<K, V> {
     let i = this.indexOf(key, -1, tree._compare)
     if (i < 0) {
@@ -636,7 +636,7 @@ class BNode<K, V> {
     editMode: boolean,
     tree: BTree<K, V>,
     count: number,
-    onFound?: (k: K, v: V, counter: number) => EditRangeResult<V, R> | void
+    onFound?: (k: K, v: V, counter: number) => EditRangeResult<V, R> | void,
   ): EditRangeResult<V, R> | number {
     const cmp = tree._compare
     let iLow, iHigh
@@ -732,7 +732,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
     key: K,
     compare: (a: K, b: K) => number,
     inclusive: boolean,
-    reusedArray: [K, V]
+    reusedArray: [K, V],
   ): [K, V] | undefined {
     const i = this.indexOf(key, 0, compare),
       children = this.children
@@ -741,7 +741,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
       key,
       compare,
       inclusive,
-      reusedArray
+      reusedArray,
     )
     if (result === undefined && i > 0) {
       return children[i - 1]!.maxPair(reusedArray)
@@ -753,7 +753,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
     key: K,
     compare: (a: K, b: K) => number,
     inclusive: boolean,
-    reusedArray: [K, V]
+    reusedArray: [K, V],
   ): [K, V] | undefined {
     const i = this.indexOf(key, 0, compare),
       children = this.children,
@@ -763,7 +763,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
       key,
       compare,
       inclusive,
-      reusedArray
+      reusedArray,
     )
     if (result === undefined && i < length - 1) {
       return children[i + 1]!.minPair(reusedArray)
@@ -778,7 +778,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
     key: K,
     value: V,
     overwrite: boolean | undefined,
-    tree: BTree<K, V>
+    tree: BTree<K, V>,
   ): boolean | BNodeInternal<K, V> {
     const c = this.children,
       max = tree._maxNodeSize,
@@ -854,7 +854,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
     const half = this.children.length >> 1
     return new BNodeInternal<K, V>(
       this.children.splice(half),
-      this.keys.splice(half)
+      this.keys.splice(half),
     )
   }
 
@@ -887,7 +887,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
     editMode: boolean,
     tree: BTree<K, V>,
     count: number,
-    onFound?: (k: K, v: V, counter: number) => EditRangeResult<V, R> | void
+    onFound?: (k: K, v: V, counter: number) => EditRangeResult<V, R> | void,
   ): EditRangeResult<V, R> | number {
     const cmp = tree._compare
     const keys = this.keys,
@@ -896,7 +896,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
       i = iLow
     const iHigh = Math.min(
       high === low ? iLow : this.indexOf(high, 0, cmp),
-      keys.length - 1
+      keys.length - 1,
     )
     if (!editMode) {
       // Simple case
@@ -908,7 +908,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
           editMode,
           tree,
           count,
-          onFound
+          onFound,
         )
         if (typeof result !== `number`) return result
         count = result
@@ -924,7 +924,7 @@ class BNodeInternal<K, V> extends BNode<K, V> {
             editMode,
             tree,
             count,
-            onFound
+            onFound,
           )
           // Note: if children[i] is empty then keys[i]=undefined.
           //       This is an invalid state, but it is fixed below.
diff --git a/packages/db/src/utils/comparison.ts b/packages/db/src/utils/comparison.ts
index 1e4ead81f..3cf14a210 100644
--- a/packages/db/src/utils/comparison.ts
+++ b/packages/db/src/utils/comparison.ts
@@ -1,4 +1,4 @@
-import type { CompareOptions } from "../query/builder/types"
+import type { CompareOptions } from '../query/builder/types'
 
 // WeakMap to store stable IDs for objects
 const objectIds = new WeakMap<object, number>()
@@ -84,7 +84,7 @@ export const ascComparator = (a: any, b: any, opts: CompareOptions): number => {
 export const descComparator = (
   a: unknown,
   b: unknown,
-  opts: CompareOptions
+  opts: CompareOptions,
 ): number => {
   return ascComparator(b, a, {
     ...opts,
@@ -93,7 +93,7 @@ export const descComparator = (
 }
 
 export function makeComparator(
-  opts: CompareOptions
+  opts: CompareOptions,
 ): (a: any, b: any) => number {
   return (a, b) => {
     if (opts.direction === `asc`) {
diff --git a/packages/db/src/utils/cursor.ts b/packages/db/src/utils/cursor.ts
new file mode 100644
index 000000000..322a37470
--- /dev/null
+++ b/packages/db/src/utils/cursor.ts
@@ -0,0 +1,78 @@
+import { and, eq, gt, lt, or } from '../query/builder/functions.js'
+import { Value } from '../query/ir.js'
+import type { BasicExpression, OrderBy } from '../query/ir.js'
+
+/**
+ * Builds a cursor expression for paginating through ordered results.
+ * For multi-column orderBy, creates a composite cursor that respects all columns.
+ *
+ * For [col1 ASC, col2 DESC] with values [v1, v2], produces:
+ *   or(
+ *     gt(col1, v1),                         // col1 > v1
+ *     and(eq(col1, v1), lt(col2, v2))       // col1 = v1 AND col2 < v2 (DESC)
+ *   )
+ *
+ * This creates a precise cursor that works with composite indexes on the backend.
+ *
+ * @param orderBy - The order-by clauses defining sort columns and directions
+ * @param values - The cursor values corresponding to each order-by column
+ * @returns A filter expression for rows after the cursor position, or undefined if empty
+ */
+export function buildCursor(
+  orderBy: OrderBy,
+  values: Array<unknown>,
+): BasicExpression<boolean> | undefined {
+  if (values.length === 0 || orderBy.length === 0) {
+    return undefined
+  }
+
+  // For single column, just use simple gt/lt
+  if (orderBy.length === 1) {
+    const { expression, compareOptions } = orderBy[0]!
+    const operator = compareOptions.direction === `asc` ? gt : lt
+    return operator(expression, new Value(values[0]))
+  }
+
+  // For multi-column, build the composite cursor:
+  // or(
+  //   gt(col1, v1),
+  //   and(eq(col1, v1), gt(col2, v2)),
+  //   and(eq(col1, v1), eq(col2, v2), gt(col3, v3)),
+  //   ...
+  // )
+  const clauses: Array<BasicExpression<boolean>> = []
+
+  for (let i = 0; i < orderBy.length && i < values.length; i++) {
+    const clause = orderBy[i]!
+    const value = values[i]
+
+    // Build equality conditions for all previous columns
+    const eqConditions: Array<BasicExpression<boolean>> = []
+    for (let j = 0; j < i; j++) {
+      const prevClause = orderBy[j]!
+      const prevValue = values[j]
+      eqConditions.push(eq(prevClause.expression, new Value(prevValue)))
+    }
+
+    // Add the comparison for the current column (respecting direction)
+    const operator = clause.compareOptions.direction === `asc` ? gt : lt
+    const comparison = operator(clause.expression, new Value(value))
+
+    if (eqConditions.length === 0) {
+      // First column: just the comparison
+      clauses.push(comparison)
+    } else {
+      // Subsequent columns: and(eq(prev...), comparison)
+      // We need to spread into and() which expects at least 2 args
+      const allConditions = [...eqConditions, comparison]
+      clauses.push(allConditions.reduce((acc, cond) => and(acc, cond)))
+    }
+  }
+
+  // Combine all clauses with OR
+  if (clauses.length === 1) {
+    return clauses[0]!
+  }
+  // Use reduce to combine with or() which expects exactly 2 args
+  return clauses.reduce((acc, clause) => or(acc, clause))
+}
diff --git a/packages/db/src/utils/index-optimization.ts b/packages/db/src/utils/index-optimization.ts
index a42b5086c..f6c26ff91 100644
--- a/packages/db/src/utils/index-optimization.ts
+++ b/packages/db/src/utils/index-optimization.ts
@@ -15,12 +15,12 @@
  * - Optimizes IN array expressions
  */
 
-import { DEFAULT_COMPARE_OPTIONS } from "../utils.js"
-import { ReverseIndex } from "../indexes/reverse-index.js"
-import type { CompareOptions } from "../query/builder/types.js"
-import type { IndexInterface, IndexOperation } from "../indexes/base-index.js"
-import type { BasicExpression } from "../query/ir.js"
-import type { CollectionLike } from "../types.js"
+import { DEFAULT_COMPARE_OPTIONS } from '../utils.js'
+import { ReverseIndex } from '../indexes/reverse-index.js'
+import type { CompareOptions } from '../query/builder/types.js'
+import type { IndexInterface, IndexOperation } from '../indexes/base-index.js'
+import type { BasicExpression } from '../query/ir.js'
+import type { CollectionLike } from '../types.js'
 
 /**
  * Result of index-based query optimization
@@ -36,7 +36,7 @@ export interface OptimizationResult<TKey> {
 export function findIndexForField<TKey extends string | number>(
   collection: CollectionLike<any, TKey>,
   fieldPath: Array<string>,
-  compareOptions?: CompareOptions
+  compareOptions?: CompareOptions,
 ): IndexInterface<TKey> | undefined {
   const compareOpts = compareOptions ?? {
     ...DEFAULT_COMPARE_OPTIONS,
@@ -98,7 +98,7 @@ export function optimizeExpressionWithIndexes<
   TKey extends string | number,
 >(
   expression: BasicExpression,
-  collection: CollectionLike<T, TKey>
+  collection: CollectionLike<T, TKey>,
 ): OptimizationResult<TKey> {
   return optimizeQueryRecursive(expression, collection)
 }
@@ -108,7 +108,7 @@ export function optimizeExpressionWithIndexes<
  */
 function optimizeQueryRecursive<T extends object, TKey extends string | number>(
   expression: BasicExpression,
-  collection: CollectionLike<T, TKey>
+  collection: CollectionLike<T, TKey>,
 ): OptimizationResult<TKey> {
   if (expression.type === `func`) {
     switch (expression.name) {
@@ -172,7 +172,7 @@ function optimizeCompoundRangeQuery<
   TKey extends string | number,
 >(
   expression: BasicExpression,
-  collection: CollectionLike<T, TKey>
+  collection: CollectionLike<T, TKey>,
 ): OptimizationResult<TKey> {
   if (expression.type !== `func` || expression.args.length < 2) {
     return { canOptimize: false, matchingKeys: new Set() }
@@ -305,7 +305,7 @@ function optimizeSimpleComparison<
   TKey extends string | number,
 >(
   expression: BasicExpression,
-  collection: CollectionLike<T, TKey>
+  collection: CollectionLike<T, TKey>,
 ): OptimizationResult<TKey> {
   if (expression.type !== `func` || expression.args.length !== 2) {
     return { canOptimize: false, matchingKeys: new Set() }
@@ -405,7 +405,7 @@ function canOptimizeSimpleComparison<
  */
 function optimizeAndExpression<T extends object, TKey extends string | number>(
   expression: BasicExpression,
-  collection: CollectionLike<T, TKey>
+  collection: CollectionLike<T, TKey>,
 ): OptimizationResult<TKey> {
   if (expression.type !== `func` || expression.args.length < 2) {
     return { canOptimize: false, matchingKeys: new Set() }
@@ -457,7 +457,7 @@ function canOptimizeAndExpression<
  */
 function optimizeOrExpression<T extends object, TKey extends string | number>(
   expression: BasicExpression,
-  collection: CollectionLike<T, TKey>
+  collection: CollectionLike<T, TKey>,
 ): OptimizationResult<TKey> {
   if (expression.type !== `func` || expression.args.length < 2) {
     return { canOptimize: false, matchingKeys: new Set() }
@@ -506,7 +506,7 @@ function optimizeInArrayExpression<
   TKey extends string | number,
 >(
   expression: BasicExpression,
-  collection: CollectionLike<T, TKey>
+  collection: CollectionLike<T, TKey>,
 ): OptimizationResult<TKey> {
   if (expression.type !== `func` || expression.args.length !== 2) {
     return { canOptimize: false, matchingKeys: new Set() }
diff --git a/packages/db/tests/SortedMap.test.ts b/packages/db/tests/SortedMap.test.ts
index 27ce7be13..e2a46da61 100644
--- a/packages/db/tests/SortedMap.test.ts
+++ b/packages/db/tests/SortedMap.test.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from "vitest"
-import { SortedMap } from "../src/SortedMap"
+import { describe, expect, it } from 'vitest'
+import { SortedMap } from '../src/SortedMap'
 
 describe(`SortedMap`, () => {
   it(`maintains sorted order by values`, () => {
diff --git a/packages/db/tests/apply-mutations.test.ts b/packages/db/tests/apply-mutations.test.ts
index 325abfbf8..3e4931d5f 100644
--- a/packages/db/tests/apply-mutations.test.ts
+++ b/packages/db/tests/apply-mutations.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, it } from "vitest"
-import { createTransaction } from "../src/transactions"
-import { createCollection } from "../src/collection"
+import { describe, expect, it } from 'vitest'
+import { createTransaction } from '../src/transactions'
+import { createCollection } from '../src/collection'
 
 describe(`applyMutations merge logic`, () => {
   // Create a shared collection for all tests
diff --git a/packages/db/tests/collection-auto-index.test.ts b/packages/db/tests/collection-auto-index.test.ts
index 3047a4d3e..f40db1e61 100644
--- a/packages/db/tests/collection-auto-index.test.ts
+++ b/packages/db/tests/collection-auto-index.test.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from "vitest"
-import { createCollection } from "../src/collection/index.js"
+import { describe, expect, it } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
 import {
   and,
   eq,
@@ -8,15 +8,15 @@ import {
   lte,
   not,
   or,
-} from "../src/query/builder/functions"
-import { createSingleRowRefProxy } from "../src/query/builder/ref-proxy"
-import { createLiveQueryCollection } from "../src"
-import { PropRef } from "../src/query/ir"
+} from '../src/query/builder/functions'
+import { createSingleRowRefProxy } from '../src/query/builder/ref-proxy'
+import { createLiveQueryCollection } from '../src'
+import { PropRef } from '../src/query/ir'
 import {
   createIndexUsageTracker,
   expectIndexUsage,
   withIndexTracking,
-} from "./utils"
+} from './utils'
 
 // Global row proxy for expressions
 const row = createSingleRowRefProxy<TestItem>()
@@ -112,7 +112,7 @@ describe(`Collection Auto-Indexing`, () => {
       {
         includeInitialState: true,
         whereExpression: eq(row.status, `active`),
-      }
+      },
     )
 
     // Should still have no indexes after subscription
@@ -154,7 +154,7 @@ describe(`Collection Auto-Indexing`, () => {
       {
         includeInitialState: true,
         whereExpression: eq(row.status, `active`),
-      }
+      },
     )
 
     // Should have created an auto-index for the status field (default is eager)
@@ -201,7 +201,7 @@ describe(`Collection Auto-Indexing`, () => {
       {
         includeInitialState: true,
         whereExpression: eq(row.status, `active`),
-      }
+      },
     )
 
     // Should have created an auto-index for the status field
@@ -302,7 +302,7 @@ describe(`Collection Auto-Indexing`, () => {
     expect(autoIndexCollection.indexes.size).toBe(3)
 
     const indexPaths = Array.from(autoIndexCollection.indexes.values()).map(
-      (index) => (index.expression as any).path
+      (index) => (index.expression as any).path,
     )
 
     expect(indexPaths).toContainEqual([`status`])
@@ -345,7 +345,7 @@ describe(`Collection Auto-Indexing`, () => {
     expect(autoIndexCollection.indexes.size).toBe(2)
 
     const indexPaths = Array.from(autoIndexCollection.indexes.values()).map(
-      (index) => (index.expression as any).path
+      (index) => (index.expression as any).path,
     )
 
     expect(indexPaths).toContainEqual([`status`])
@@ -414,7 +414,7 @@ describe(`Collection Auto-Indexing`, () => {
       whereExpression: and(
         eq(row.status, `active`),
         gt(row.age, 25),
-        lte(row.score, 90)
+        lte(row.score, 90),
       ),
     })
 
@@ -422,7 +422,7 @@ describe(`Collection Auto-Indexing`, () => {
     expect(autoIndexCollection.indexes.size).toBe(3)
 
     const indexPaths = Array.from(autoIndexCollection.indexes.values()).map(
-      (index) => (index.expression as any).path
+      (index) => (index.expression as any).path,
     )
 
     expect(indexPaths).toContainEqual([`status`])
@@ -495,7 +495,7 @@ describe(`Collection Auto-Indexing`, () => {
           .join(
             { other: rightCollection },
             ({ item, other }: any) => eq(item.id, other.id2),
-            `left`
+            `left`,
           )
           .select(({ item, other }: any) => ({
             id: item.id,
@@ -614,7 +614,7 @@ describe(`Collection Auto-Indexing`, () => {
                 })),
             },
             ({ item, other }: any) => eq(item.id, other.id2),
-            `left`
+            `left`,
           )
           .select(({ item, other }: any) => ({
             id: item.id,
@@ -831,7 +831,7 @@ describe(`Collection Auto-Indexing`, () => {
       {
         includeInitialState: true,
         whereExpression: gt(new PropRef([`profile`, `score`]), 80),
-      }
+      },
     )
 
     // Should have created an auto-index for profile.score
@@ -840,7 +840,7 @@ describe(`Collection Auto-Indexing`, () => {
         index.expression.type === `ref` &&
         (index.expression as any).path.length === 2 &&
         (index.expression as any).path[0] === `profile` &&
-        (index.expression as any).path[1] === `score`
+        (index.expression as any).path[1] === `score`,
     )
     expect(profileScoreIndex).toBeDefined()
 
@@ -858,7 +858,7 @@ describe(`Collection Auto-Indexing`, () => {
       {
         includeInitialState: true,
         whereExpression: eq(new PropRef([`metadata`, `stats`, `views`]), 200),
-      }
+      },
     )
 
     // Should have created an auto-index for metadata.stats.views
@@ -868,7 +868,7 @@ describe(`Collection Auto-Indexing`, () => {
         (index.expression as any).path.length === 3 &&
         (index.expression as any).path[0] === `metadata` &&
         (index.expression as any).path[1] === `stats` &&
-        (index.expression as any).path[2] === `views`
+        (index.expression as any).path[2] === `views`,
     )
     expect(viewsIndex).toBeDefined()
 
diff --git a/packages/db/tests/collection-change-events.test.ts b/packages/db/tests/collection-change-events.test.ts
index 25b7dbb1f..be59dde14 100644
--- a/packages/db/tests/collection-change-events.test.ts
+++ b/packages/db/tests/collection-change-events.test.ts
@@ -1,8 +1,8 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import { createCollection } from "../src/collection/index.js"
-import { currentStateAsChanges } from "../src/collection/change-events.js"
-import { Func, PropRef, Value } from "../src/query/ir.js"
-import { DEFAULT_COMPARE_OPTIONS } from "../src/utils.js"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
+import { currentStateAsChanges } from '../src/collection/change-events.js'
+import { Func, PropRef, Value } from '../src/query/ir.js'
+import { DEFAULT_COMPARE_OPTIONS } from '../src/utils.js'
 
 interface TestUser {
   id: string
@@ -33,7 +33,7 @@ describe(`currentStateAsChanges`, () => {
 
   // Helper function to create and populate collection with test data
   async function createAndPopulateCollection(
-    autoIndex: `eager` | `off` = `eager`
+    autoIndex: `eager` | `off` = `eager`,
   ) {
     const collection = createCollection<TestUser>({
       id: `test-collection-${autoIndex}`,
@@ -69,7 +69,7 @@ describe(`currentStateAsChanges`, () => {
     describe(`where clause without orderBy or limit`, () => {
       it(`should return all items when no where clause is provided`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection)
@@ -86,7 +86,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should filter items based on where clause`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -103,7 +103,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should filter items based on numeric where clause`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -122,7 +122,7 @@ describe(`currentStateAsChanges`, () => {
     describe(`orderBy without limit and no where clause`, () => {
       it(`should return all items ordered by name ascending`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -146,7 +146,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should return all items ordered by score descending`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -170,7 +170,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should return all items ordered by age ascending`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -196,7 +196,7 @@ describe(`currentStateAsChanges`, () => {
     describe(`orderBy with limit and no where clause`, () => {
       it(`should return top 3 items ordered by score descending`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -221,7 +221,7 @@ describe(`currentStateAsChanges`, () => {
     describe(`orderBy with limit and where clause`, () => {
       it(`should return top active users ordered by score descending`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -244,7 +244,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should return top users over 25 ordered by age ascending`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -267,7 +267,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should handle multi-column orderBy with where clause`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -297,7 +297,7 @@ describe(`currentStateAsChanges`, () => {
     describe(`error cases`, () => {
       it(`should throw error when limit is provided without orderBy`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         expect(() => {
@@ -309,7 +309,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should throw error when limit is provided without orderBy even with where clause`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         expect(() => {
@@ -394,7 +394,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should handle limit larger than collection size`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
@@ -419,7 +419,7 @@ describe(`currentStateAsChanges`, () => {
 
       it(`should handle limit of 0`, async () => {
         const collection = await createAndPopulateCollection(
-          autoIndex as `eager` | `off`
+          autoIndex as `eager` | `off`,
         )
 
         const result = currentStateAsChanges(collection, {
diff --git a/packages/db/tests/collection-errors.test.ts b/packages/db/tests/collection-errors.test.ts
index 53ede7f0d..f4bdae52d 100644
--- a/packages/db/tests/collection-errors.test.ts
+++ b/packages/db/tests/collection-errors.test.ts
@@ -1,10 +1,10 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import { createCollection } from "../src/collection/index.js"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
 import {
   CollectionInErrorStateError,
   InvalidCollectionStatusTransitionError,
   SyncCleanupError,
-} from "../src/errors"
+} from '../src/errors'
 
 describe(`Collection Error Handling`, () => {
   let originalQueueMicrotask: typeof queueMicrotask
@@ -69,7 +69,7 @@ describe(`Collection Error Handling`, () => {
 
       expect(caughtError).toBeInstanceOf(SyncCleanupError)
       expect(caughtError?.message).toBe(
-        `Collection "error-test-collection" sync cleanup function threw an error: Sync cleanup failed`
+        `Collection "error-test-collection" sync cleanup function threw an error: Sync cleanup failed`,
       )
     })
 
@@ -114,7 +114,7 @@ describe(`Collection Error Handling`, () => {
       // Verify the re-thrown error has proper context and preserved stack
       expect(caughtError).toBeDefined()
       expect(caughtError!.message).toBe(
-        `Collection "stack-trace-test" sync cleanup function threw an error: Original sync error`
+        `Collection "stack-trace-test" sync cleanup function threw an error: Original sync error`,
       )
       expect(caughtError!.stack).toBe(originalStack) // Original stack preserved
       expect(caughtError!.cause).toBe(originalError) // Original error chained
@@ -159,7 +159,7 @@ describe(`Collection Error Handling`, () => {
       // Verify non-Error values are handled properly
       expect(caughtError).toBeDefined()
       expect(caughtError!.message).toBe(
-        `Collection "non-error-test" sync cleanup function threw an error: String error message`
+        `Collection "non-error-test" sync cleanup function threw an error: String error message`,
       )
 
       // No cause or stack preservation for non-Error values
@@ -240,7 +240,7 @@ describe(`Collection Error Handling`, () => {
 
         expect(caughtError).toBeInstanceOf(SyncCleanupError)
         expect(caughtError?.message).toBe(
-          `Collection "multiple-cleanup-test" sync cleanup function threw an error: Cleanup error`
+          `Collection "multiple-cleanup-test" sync cleanup function threw an error: Cleanup error`,
         )
       }
     })
@@ -325,7 +325,7 @@ describe(`Collection Error Handling`, () => {
               markReady()
             },
           },
-        }
+        },
       )
 
       // Wait for initial sync and then cleanup
@@ -399,77 +399,80 @@ describe(`Collection Error Handling`, () => {
 
       // Valid transitions from idle
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`idle`, `loading`)
+        collectionImpl._lifecycle.validateStatusTransition(`idle`, `loading`),
       ).not.toThrow()
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`idle`, `error`)
+        collectionImpl._lifecycle.validateStatusTransition(`idle`, `error`),
       ).not.toThrow()
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`idle`, `cleaned-up`)
+        collectionImpl._lifecycle.validateStatusTransition(
+          `idle`,
+          `cleaned-up`,
+        ),
       ).not.toThrow()
 
       // Valid transitions from loading
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`loading`, `ready`)
+        collectionImpl._lifecycle.validateStatusTransition(`loading`, `ready`),
       ).not.toThrow()
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`loading`, `error`)
+        collectionImpl._lifecycle.validateStatusTransition(`loading`, `error`),
       ).not.toThrow()
       expect(() =>
         collectionImpl._lifecycle.validateStatusTransition(
           `loading`,
-          `cleaned-up`
-        )
+          `cleaned-up`,
+        ),
       ).not.toThrow()
 
       // Valid transitions from ready
       expect(() =>
         collectionImpl._lifecycle.validateStatusTransition(
           `ready`,
-          `cleaned-up`
-        )
+          `cleaned-up`,
+        ),
       ).not.toThrow()
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`ready`, `error`)
+        collectionImpl._lifecycle.validateStatusTransition(`ready`, `error`),
       ).not.toThrow()
 
       // Valid transitions from error (allow recovery)
       expect(() =>
         collectionImpl._lifecycle.validateStatusTransition(
           `error`,
-          `cleaned-up`
-        )
+          `cleaned-up`,
+        ),
       ).not.toThrow()
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`error`, `idle`)
+        collectionImpl._lifecycle.validateStatusTransition(`error`, `idle`),
       ).not.toThrow()
 
       // Valid transitions from cleaned-up (allow restart)
       expect(() =>
         collectionImpl._lifecycle.validateStatusTransition(
           `cleaned-up`,
-          `loading`
-        )
+          `loading`,
+        ),
       ).not.toThrow()
       expect(() =>
         collectionImpl._lifecycle.validateStatusTransition(
           `cleaned-up`,
-          `error`
-        )
+          `error`,
+        ),
       ).not.toThrow()
 
       // Allow same-state transitions (idempotent operations)
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`idle`, `idle`)
+        collectionImpl._lifecycle.validateStatusTransition(`idle`, `idle`),
       ).not.toThrow()
       expect(() =>
-        collectionImpl._lifecycle.validateStatusTransition(`ready`, `ready`)
+        collectionImpl._lifecycle.validateStatusTransition(`ready`, `ready`),
       ).not.toThrow()
       expect(() =>
         collectionImpl._lifecycle.validateStatusTransition(
           `cleaned-up`,
-          `cleaned-up`
-        )
+          `cleaned-up`,
+        ),
       ).not.toThrow()
     })
   })
diff --git a/packages/db/tests/collection-events.test.ts b/packages/db/tests/collection-events.test.ts
index 494d5a3e8..e9f988548 100644
--- a/packages/db/tests/collection-events.test.ts
+++ b/packages/db/tests/collection-events.test.ts
@@ -1,6 +1,6 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import { createCollection } from "../src/collection/index.js"
-import type { Collection } from "../src/collection/index.js"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
+import type { Collection } from '../src/collection/index.js'
 
 describe(`Collection Events System`, () => {
   let collection: Collection
@@ -149,7 +149,7 @@ describe(`Collection Events System`, () => {
       vi.advanceTimersByTime(1001)
 
       await expect(waitPromise).rejects.toThrow(
-        `Timeout waiting for event status:change`
+        `Timeout waiting for event status:change`,
       )
 
       vi.useRealTimers()
diff --git a/packages/db/tests/collection-getters.test.ts b/packages/db/tests/collection-getters.test.ts
index da9f73004..f5f8dda41 100644
--- a/packages/db/tests/collection-getters.test.ts
+++ b/packages/db/tests/collection-getters.test.ts
@@ -1,8 +1,8 @@
-import { beforeEach, describe, expect, it, vi } from "vitest"
-import { createTransaction } from "../src/transactions"
-import { createCollection } from "../src/collection/index.js"
-import type { CollectionImpl } from "../src/collection/index.js"
-import type { SyncConfig } from "../src/types"
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createTransaction } from '../src/transactions'
+import { createCollection } from '../src/collection/index.js'
+import type { CollectionImpl } from '../src/collection/index.js'
+import type { SyncConfig } from '../src/types'
 
 type Item = { id: string; name: string }
 
@@ -141,7 +141,7 @@ describe(`Collection getters`, () => {
       tx.mutate(() =>
         collection.update(`item1`, (draft) => {
           draft.name = `Updated Item 1`
-        })
+        }),
       )
 
       expect(collection.size).toBe(2) // Size should remain the same for updates
@@ -212,7 +212,7 @@ describe(`Collection getters`, () => {
       tx.mutate(() =>
         collection.update(`item1`, (draft) => {
           draft.name = `Updated Item 1`
-        })
+        }),
       )
 
       const key = `item1`
@@ -294,7 +294,7 @@ describe(`Collection getters`, () => {
       tx.mutate(() =>
         collection.update(`item1`, (draft) => {
           draft.name = `Updated Item 1`
-        })
+        }),
       )
 
       const values = Array.from(collection.values())
@@ -343,7 +343,7 @@ describe(`Collection getters`, () => {
       tx.mutate(() =>
         collection.update(`item1`, (draft) => {
           draft.name = `Updated Item 1`
-        })
+        }),
       )
 
       const entries = Array.from(collection.entries())
@@ -398,7 +398,7 @@ describe(`Collection getters`, () => {
       tx.mutate(() =>
         collection.update(`item1`, (draft) => {
           draft.name = `Updated Item 1`
-        })
+        }),
       )
 
       const key = `item1`
diff --git a/packages/db/tests/collection-indexes.test.ts b/packages/db/tests/collection-indexes.test.ts
index 533ecfce5..a8e3896fd 100644
--- a/packages/db/tests/collection-indexes.test.ts
+++ b/packages/db/tests/collection-indexes.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, it } from "vitest"
-import mitt from "mitt"
-import { createCollection } from "../src/collection/index.js"
-import { createTransaction } from "../src/transactions"
+import { beforeEach, describe, expect, it } from 'vitest'
+import mitt from 'mitt'
+import { createCollection } from '../src/collection/index.js'
+import { createTransaction } from '../src/transactions'
 import {
   and,
   eq,
@@ -12,11 +12,11 @@ import {
   lt,
   lte,
   or,
-} from "../src/query/builder/functions"
-import { PropRef } from "../src/query/ir"
-import { expectIndexUsage, withIndexTracking } from "./utils"
-import type { Collection } from "../src/collection/index.js"
-import type { MutationFn, PendingMutation } from "../src/types"
+} from '../src/query/builder/functions'
+import { PropRef } from '../src/query/ir'
+import { expectIndexUsage, withIndexTracking } from './utils'
+import type { Collection } from '../src/collection/index.js'
+import type { MutationFn, PendingMutation } from '../src/types'
 
 interface TestItem {
   id: string
@@ -231,7 +231,7 @@ describe(`Collection Indexes`, () => {
         },
         {
           includeInitialState: true,
-        }
+        },
       )
 
       // Clear the changes array
@@ -242,7 +242,7 @@ describe(`Collection Indexes`, () => {
         collection.update(`1`, (draft) => {
           draft.status = `inactive`
           draft.age = 26
-        })
+        }),
       )
       await tx.isPersisted.promise
 
@@ -271,7 +271,7 @@ describe(`Collection Indexes`, () => {
         collection.update(`1`, (draft) => {
           draft.status = `inactive`
           draft.age = 26
-        })
+        }),
       )
       await tx.isPersisted.promise
 
@@ -297,7 +297,7 @@ describe(`Collection Indexes`, () => {
         },
         {
           includeInitialState: true,
-        }
+        },
       )
 
       // Clear the changes
@@ -318,7 +318,7 @@ describe(`Collection Indexes`, () => {
 
       // Ensure all events are the same delete event
       const deleteEvents = changes.filter(
-        (c) => c.type === `delete` && c.key === `1`
+        (c) => c.type === `delete` && c.key === `1`,
       )
       expect(deleteEvents.length).toBe(changes.length) // All events should be the same delete
 
@@ -356,7 +356,7 @@ describe(`Collection Indexes`, () => {
         {
           whereExpression: eq(new PropRef([`status`]), `active`),
           includeInitialState: true,
-        }
+        },
       )
 
       // Clear the changes
@@ -367,7 +367,7 @@ describe(`Collection Indexes`, () => {
       tx1.mutate(() =>
         collection.update(`2`, (draft) => {
           draft.status = `active`
-        })
+        }),
       )
       await tx1.isPersisted.promise
 
@@ -380,7 +380,7 @@ describe(`Collection Indexes`, () => {
       tx2.mutate(() =>
         collection.update(`1`, (draft) => {
           draft.status = `inactive`
-        })
+        }),
       )
       await tx2.isPersisted.promise
 
@@ -402,7 +402,7 @@ describe(`Collection Indexes`, () => {
         },
         {
           whereExpression: eq(new PropRef([`status`]), `active`),
-        }
+        },
       )
 
       // Change inactive item to active (should trigger)
@@ -410,7 +410,7 @@ describe(`Collection Indexes`, () => {
       tx1.mutate(() =>
         collection.update(`2`, (draft) => {
           draft.status = `active`
-        })
+        }),
       )
       await tx1.isPersisted.promise
 
@@ -423,7 +423,7 @@ describe(`Collection Indexes`, () => {
       tx2.mutate(() =>
         collection.update(`1`, (draft) => {
           draft.status = `inactive`
-        })
+        }),
       )
       await tx2.isPersisted.promise
 
@@ -688,7 +688,7 @@ describe(`Collection Indexes`, () => {
         const result = collection.currentStateAsChanges({
           where: and(
             gt(new PropRef([`age`]), 25),
-            lt(new PropRef([`age`]), 35)
+            lt(new PropRef([`age`]), 35),
           ),
         })!
 
@@ -720,7 +720,7 @@ describe(`Collection Indexes`, () => {
         const result = collection.currentStateAsChanges({
           where: and(
             eq(new PropRef([`status`]), `active`),
-            gte(new PropRef([`age`]), 25)
+            gte(new PropRef([`age`]), 25),
           ),
         })!
 
@@ -823,7 +823,7 @@ describe(`Collection Indexes`, () => {
         const result = collection.currentStateAsChanges({
           where: or(
             and(gte(new PropRef([`age`]), 25), lte(new PropRef([`age`]), 30)),
-            eq(new PropRef([`status`]), `pending`)
+            eq(new PropRef([`status`]), `pending`),
           ),
         })!
 
@@ -862,7 +862,7 @@ describe(`Collection Indexes`, () => {
         const result = collection.currentStateAsChanges({
           where: and(
             eq(new PropRef([`status`]), `active`), // Can optimize with index
-            gt(new PropRef([`age`]), 24) // Can also optimize - will be AND combined
+            gt(new PropRef([`age`]), 24), // Can also optimize - will be AND combined
           ),
         })!
 
@@ -886,7 +886,7 @@ describe(`Collection Indexes`, () => {
         const result = collection.currentStateAsChanges({
           where: and(
             eq(new PropRef([`age`]), 25), // Has index
-            eq(new PropRef([`name`]), `Alice`) // No index on name
+            eq(new PropRef([`name`]), `Alice`), // No index on name
           ),
         })!
 
@@ -930,7 +930,7 @@ describe(`Collection Indexes`, () => {
         const result = collection.currentStateAsChanges({
           where: and(
             gt(length(new PropRef([`name`])), 4), // Complex - can't optimize (Alice=5, Charlie=7, Diana=5)
-            gt(length(new PropRef([`status`])), 6) // Complex - can't optimize (only "inactive" = 8 > 6)
+            gt(length(new PropRef([`status`])), 6), // Complex - can't optimize (only "inactive" = 8 > 6)
           ),
         })!
 
@@ -954,7 +954,7 @@ describe(`Collection Indexes`, () => {
         const result = collection.currentStateAsChanges({
           where: or(
             gt(length(new PropRef([`name`])), 6), // Complex - can't optimize (only Charlie has name length 7 > 6)
-            gt(length(new PropRef([`status`])), 7) // Complex - can't optimize (only Bob has status "inactive" = 8 > 7)
+            gt(length(new PropRef([`status`])), 7), // Complex - can't optimize (only Bob has status "inactive" = 8 > 7)
           ),
         })!
 
@@ -978,7 +978,7 @@ describe(`Collection Indexes`, () => {
         const result = collection.currentStateAsChanges({
           where: and(
             eq(new PropRef([`name`]), `Alice`),
-            eq(new PropRef([`score`]), 95)
+            eq(new PropRef([`score`]), 95),
           ),
         })!
 
@@ -1003,7 +1003,7 @@ describe(`Collection Indexes`, () => {
         const result1 = collection.currentStateAsChanges({
           where: and(
             eq(new PropRef([`age`]), 25), // Can optimize - has index
-            eq(new PropRef([`name`]), `Alice`) // Can't optimize - no index
+            eq(new PropRef([`name`]), `Alice`), // Can't optimize - no index
           ),
         })
 
@@ -1021,7 +1021,7 @@ describe(`Collection Indexes`, () => {
         const result2 = collection.currentStateAsChanges({
           where: and(
             eq(new PropRef([`name`]), `Alice`), // Can't optimize - no index
-            gt(length(new PropRef([`name`])), 3) // Can't optimize - complex expression
+            gt(length(new PropRef([`name`])), 3), // Can't optimize - complex expression
           ),
         })
 
@@ -1108,7 +1108,7 @@ describe(`Collection Indexes`, () => {
           {
             includeInitialState: true,
             whereExpression: eq(new PropRef([`status`]), `active`),
-          }
+          },
         )
 
         expect(changes).toHaveLength(3) // Initial active items
@@ -1143,7 +1143,7 @@ describe(`Collection Indexes`, () => {
           {
             includeInitialState: true,
             whereExpression: eq(new PropRef([`status`]), `active`),
-          }
+          },
         )
 
         expect(changes).toHaveLength(3) // Initial active items
@@ -1171,7 +1171,7 @@ describe(`Collection Indexes`, () => {
             age: 40,
             status: `active`,
             createdAt: new Date(),
-          })
+          }),
         )
         await tx1.isPersisted.promise
 
@@ -1188,7 +1188,7 @@ describe(`Collection Indexes`, () => {
             age: 35,
             status: `inactive`,
             createdAt: new Date(),
-          })
+          }),
         )
         await tx2.isPersisted.promise
 
@@ -1200,7 +1200,7 @@ describe(`Collection Indexes`, () => {
         tx3.mutate(() =>
           collection.update(`1`, (draft) => {
             draft.status = `inactive`
-          })
+          }),
         )
         await tx3.isPersisted.promise
 
@@ -1224,7 +1224,7 @@ describe(`Collection Indexes`, () => {
           {
             includeInitialState: true,
             whereExpression: gte(new PropRef([`age`]), 30),
-          }
+          },
         )
 
         expect(changes).toHaveLength(2) // Bob (30) and Charlie (35)
@@ -1247,7 +1247,7 @@ describe(`Collection Indexes`, () => {
         tx.mutate(() =>
           collection.update(`4`, (draft) => {
             draft.age = 32
-          })
+          }),
         )
         await tx.isPersisted.promise
 
@@ -1271,7 +1271,7 @@ describe(`Collection Indexes`, () => {
           {
             includeInitialState: true,
             whereExpression: eq(new PropRef([`status`]), `active`),
-          }
+          },
         )
 
         expect(changes).toHaveLength(3) // Initial active items
@@ -1407,14 +1407,14 @@ describe(`Collection Indexes`, () => {
           age: 50,
           status: `active`,
           createdAt: new Date(),
-        })
+        }),
       )
 
       const tx2 = createTransaction({ mutationFn })
       tx2.mutate(() =>
         collection.update(`1`, (draft) => {
           draft.age = 99
-        })
+        }),
       )
 
       const tx3 = createTransaction({ mutationFn })
diff --git a/packages/db/tests/collection-lifecycle.test.ts b/packages/db/tests/collection-lifecycle.test.ts
index 4094ee813..ef5a04a98 100644
--- a/packages/db/tests/collection-lifecycle.test.ts
+++ b/packages/db/tests/collection-lifecycle.test.ts
@@ -1,5 +1,5 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import { createCollection } from "../src/collection/index.js"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
 
 // Mock setTimeout and clearTimeout for testing GC behavior
 const originalSetTimeout = global.setTimeout
diff --git a/packages/db/tests/collection-schema.test.ts b/packages/db/tests/collection-schema.test.ts
index 0db0bddfc..70030beb3 100644
--- a/packages/db/tests/collection-schema.test.ts
+++ b/packages/db/tests/collection-schema.test.ts
@@ -1,14 +1,14 @@
-import { type } from "arktype"
-import { describe, expect, expectTypeOf, it } from "vitest"
-import { z } from "zod"
-import { createCollection } from "../src/collection/index.js"
-import { SchemaValidationError } from "../src/errors"
-import { createTransaction } from "../src/transactions"
+import { type } from 'arktype'
+import { describe, expect, expectTypeOf, it } from 'vitest'
+import { z } from 'zod'
+import { createCollection } from '../src/collection/index.js'
+import { SchemaValidationError } from '../src/errors'
+import { createTransaction } from '../src/transactions'
 import type {
   OperationType,
   PendingMutation,
   ResolveTransactionChanges,
-} from "../src/types"
+} from '../src/types'
 
 describe(`Collection Schema Validation`, () => {
   it(`should apply transformations for both insert and update operations`, () => {
@@ -75,7 +75,7 @@ describe(`Collection Schema Validation`, () => {
     const validatedUpdate = updateCollection.validateData(
       updateData,
       `update`,
-      `1`
+      `1`,
     )
 
     // Verify that the updated data has been transformed
@@ -199,7 +199,7 @@ describe(`Collection Schema Validation`, () => {
     const validatedUpdateWithTimestamp = collection.validateData(
       updateDataWithTimestamp,
       `update`,
-      `1`
+      `1`,
     )
 
     // Verify that both modified fields are returned with transformations applied
@@ -276,7 +276,7 @@ describe(`Collection with schema validation`, () => {
     const userSchema = type({
       name: `string > 0`,
       age: `number.integer > 0`,
-      "email?": `string.email`,
+      'email?': `string.email`,
     })
 
     // Create a collection with the schema
@@ -323,13 +323,13 @@ describe(`Collection with schema validation`, () => {
         expect(error.issues.length).toBeGreaterThan(0)
         // Check that we have validation errors for each invalid field
         expect(error.issues.some((issue) => issue.path?.includes(`name`))).toBe(
-          true
+          true,
         )
         expect(error.issues.some((issue) => issue.path?.includes(`age`))).toBe(
-          true
+          true,
         )
         expect(
-          error.issues.some((issue) => issue.path?.includes(`email`))
+          error.issues.some((issue) => issue.path?.includes(`email`)),
         ).toBe(true)
       }
     }
@@ -339,7 +339,7 @@ describe(`Collection with schema validation`, () => {
     tx3.mutate(() =>
       collection.update(`Alice`, (draft) => {
         draft.age = 31
-      })
+      }),
     )
 
     // Partial updates should fail with invalid data
@@ -348,7 +348,7 @@ describe(`Collection with schema validation`, () => {
       tx4.mutate(() =>
         collection.update(`Alice`, (draft) => {
           draft.age = -1
-        })
+        }),
       )
       // Should not reach here
       expect(true).toBe(false)
@@ -358,7 +358,7 @@ describe(`Collection with schema validation`, () => {
         expect(error.type).toBe(`update`)
         expect(error.issues.length).toBeGreaterThan(0)
         expect(error.issues.some((issue) => issue.path?.includes(`age`))).toBe(
-          true
+          true,
         )
       }
     }
@@ -416,13 +416,13 @@ describe(`Collection with schema validation`, () => {
         expect(error.issues.length).toBeGreaterThan(0)
         // Check that we have validation errors for each invalid field
         expect(error.issues.some((issue) => issue.path?.includes(`name`))).toBe(
-          true
+          true,
         )
         expect(error.issues.some((issue) => issue.path?.includes(`age`))).toBe(
-          true
+          true,
         )
         expect(
-          error.issues.some((issue) => issue.path?.includes(`email`))
+          error.issues.some((issue) => issue.path?.includes(`email`)),
         ).toBe(true)
       }
     }
@@ -432,7 +432,7 @@ describe(`Collection with schema validation`, () => {
     tx3.mutate(() =>
       collection.update(`Alice`, (draft) => {
         draft.age = 31
-      })
+      }),
     )
 
     // Partial updates should fail with invalid data
@@ -441,7 +441,7 @@ describe(`Collection with schema validation`, () => {
       tx4.mutate(() =>
         collection.update(`Alice`, (draft) => {
           draft.age = -1
-        })
+        }),
       )
       // Should not reach here
       expect(true).toBe(false)
@@ -451,7 +451,7 @@ describe(`Collection with schema validation`, () => {
         expect(error.type).toBe(`update`)
         expect(error.issues.length).toBeGreaterThan(0)
         expect(error.issues.some((issue) => issue.path?.includes(`age`))).toBe(
-          true
+          true,
         )
       }
     }
@@ -555,7 +555,7 @@ describe(`Collection with schema validation`, () => {
         completed: true,
         createdAt: new Date(`2023-01-01T00:00:00Z`),
         updatedAt: new Date(`2023-01-01T00:00:00Z`),
-      })
+      }),
     )
     insertedItems = Array.from(collection.state.values())
     expect(insertedItems).toHaveLength(3)
@@ -702,7 +702,7 @@ describe(`Collection with schema validation`, () => {
         draft.updated_at = `2023-01-02T00:00:00.000Z`
         draft.tags = [`IMPORTANT`, `ADMIN`]
         draft.metadata = { role: `admin` } as Record<string, string>
-      })
+      }),
     )
 
     // Verify that transformations were applied and only modified fields are returned
@@ -798,7 +798,7 @@ describe(`Collection with schema validation`, () => {
     expect((insertMutation.modified as any).preferences.theme).toBe(`dark`)
     expect((insertMutation.modified as any).preferences.version).toBe(`1.0`)
     expect((insertMutation.modified as any).preferences.notifications).toBe(
-      true
+      true,
     )
 
     // Now test update with the same schema that can handle existing transformed data
@@ -813,7 +813,7 @@ describe(`Collection with schema validation`, () => {
             city: z.string(),
             country: z.string().transform((val) => val.toUpperCase()),
             normalized: z.boolean().optional(),
-          })
+          }),
         )
         .transform((val) => val.map((addr) => ({ ...addr, normalized: true }))),
       preferences: z
@@ -859,7 +859,7 @@ describe(`Collection with schema validation`, () => {
           theme: `LIGHT`,
           notifications: false,
         }
-      })
+      }),
     )
 
     // Verify update transformations
@@ -878,7 +878,7 @@ describe(`Collection with schema validation`, () => {
     expect((updateMutation.changes as any).preferences.theme).toBe(`light`)
     expect((updateMutation.changes as any).preferences.version).toBe(`1.0`)
     expect((updateMutation.changes as any).preferences.notifications).toBe(
-      false
+      false,
     )
   })
 })
diff --git a/packages/db/tests/collection-subscribe-changes.test.ts b/packages/db/tests/collection-subscribe-changes.test.ts
index 816fbc85c..f3f4b1cce 100644
--- a/packages/db/tests/collection-subscribe-changes.test.ts
+++ b/packages/db/tests/collection-subscribe-changes.test.ts
@@ -1,16 +1,16 @@
-import { describe, expect, it, vi } from "vitest"
-import mitt from "mitt"
-import { createCollection } from "../src/collection/index.js"
-import { createTransaction } from "../src/transactions"
-import { eq } from "../src/query/builder/functions"
-import { PropRef } from "../src/query/ir"
+import { describe, expect, it, vi } from 'vitest'
+import mitt from 'mitt'
+import { createCollection } from '../src/collection/index.js'
+import { createTransaction } from '../src/transactions'
+import { eq } from '../src/query/builder/functions'
+import { PropRef } from '../src/query/ir'
 import type {
   ChangeMessage,
   ChangesPayload,
   MutationFn,
   PendingMutation,
   SyncConfig,
-} from "../src/types"
+} from '../src/types'
 
 // Helper function to wait for changes to be processed
 const waitForChanges = () => new Promise((resolve) => setTimeout(resolve, 10))
@@ -294,7 +294,7 @@ describe(`Collection.subscribeChanges`, () => {
       collection.update(item.id, (draft) => {
         draft.value = `updated optimistic value`
         draft.updated = true
-      })
+      }),
     )
 
     // Verify that update was emitted
@@ -437,7 +437,7 @@ describe(`Collection.subscribeChanges`, () => {
     updateTx.mutate(() =>
       collection.update(optItem.id, (draft) => {
         draft.value = `updated optimistic value`
-      })
+      }),
     )
 
     // Verify the optimistic update was emitted
@@ -557,7 +557,7 @@ describe(`Collection.subscribeChanges`, () => {
         { id: 3, value: `batch1` },
         { id: 4, value: `batch2` },
         { id: 5, value: `batch3` },
-      ])
+      ]),
     )
 
     // Verify only the 3 new items were emitted, not the existing ones
@@ -587,7 +587,7 @@ describe(`Collection.subscribeChanges`, () => {
     tx2.mutate(() =>
       collection.update(itemToUpdate.id, (draft) => {
         draft.value = `updated value`
-      })
+      }),
     )
 
     // Verify only the updated item was emitted
@@ -734,7 +734,7 @@ describe(`Collection.subscribeChanges`, () => {
     tx1.mutate(() =>
       collection.update(1, (draft) => {
         draft.status = `active`
-      })
+      }),
     )
 
     // Should emit an insert event for the newly active item
@@ -757,7 +757,7 @@ describe(`Collection.subscribeChanges`, () => {
     tx2.mutate(() =>
       collection.update(2, (draft) => {
         draft.status = `inactive`
-      })
+      }),
     )
 
     // Should emit a delete event for the newly inactive item
@@ -780,7 +780,7 @@ describe(`Collection.subscribeChanges`, () => {
     tx3.mutate(() =>
       collection.update(1, (draft) => {
         draft.value = `updated item1`
-      })
+      }),
     )
 
     // Should emit an update event for the active item
@@ -803,7 +803,7 @@ describe(`Collection.subscribeChanges`, () => {
     tx4.mutate(() =>
       collection.update(2, (draft) => {
         draft.value = `updated inactive item`
-      })
+      }),
     )
 
     // Should not emit any events for inactive items
@@ -849,7 +849,7 @@ describe(`Collection.subscribeChanges`, () => {
       },
       {
         includeInitialState: true,
-      }
+      },
     )
 
     await collection.stateWhenReady()
@@ -926,7 +926,7 @@ describe(`Collection.subscribeChanges`, () => {
       },
       {
         includeInitialState: true,
-      }
+      },
     )
 
     await collection.stateWhenReady()
@@ -1042,7 +1042,7 @@ describe(`Collection.subscribeChanges`, () => {
       },
       {
         includeInitialState: true,
-      }
+      },
     )
 
     await collection.stateWhenReady()
@@ -1182,7 +1182,7 @@ describe(`Collection.subscribeChanges`, () => {
     tx.mutate(() =>
       collection.update(1, (draft) => {
         draft.value = `client-update`
-      })
+      }),
     )
 
     changeEvents.length = 0
@@ -1193,8 +1193,10 @@ describe(`Collection.subscribeChanges`, () => {
     f.write({ type: `insert`, value: { id: 1, value: `server-after` } })
     f.commit()
 
-    // Expect delete, insert with optimistic value, and an empty event from markReady
-    expect(changeEvents.length).toBe(3)
+    // Expect delete and insert with optimistic value
+    // Note: Previously there was a duplicate insert event that was incorrectly
+    // being sent, causing 3 events. Now duplicates are filtered correctly.
+    expect(changeEvents.length).toBe(2)
     expect(changeEvents[0]).toEqual({
       type: `delete`,
       key: 1,
@@ -1352,15 +1354,15 @@ describe(`Collection.subscribeChanges`, () => {
 
     // Expect delete for id 1, and insert for id 2
     expect(changeEvents.some((e) => e.type === `delete` && e.key === 1)).toBe(
-      true
+      true,
     )
     expect(
       changeEvents.some(
         (e) =>
           e.type === `insert` &&
           e.key === 2 &&
-          e.value.value === `client-insert`
-      )
+          e.value.value === `client-insert`,
+      ),
     ).toBe(true)
     expect(collection.state.get(2)).toEqual({ id: 2, value: `client-insert` })
   })
@@ -1392,7 +1394,7 @@ describe(`Collection.subscribeChanges`, () => {
     tx.mutate(() =>
       collection.update(1, (draft) => {
         draft.value = `client-update`
-      })
+      }),
     )
 
     changeEvents.length = 0
@@ -1407,7 +1409,7 @@ describe(`Collection.subscribeChanges`, () => {
     const inserts = changeEvents.filter((e) => e.type === `insert`)
     expect(deletes.some((e) => e.key === 1)).toBe(true)
     expect(
-      inserts.some((e) => e.key === 1 && e.value.value === `client-update`)
+      inserts.some((e) => e.key === 1 && e.value.value === `client-update`),
     ).toBe(true)
     expect(collection.state.get(1)).toEqual({ id: 1, value: `client-update` })
   })
@@ -1840,7 +1842,7 @@ describe(`Collection.subscribeChanges`, () => {
       },
       {
         whereExpression: eq(new PropRef([`active`]), true),
-      }
+      },
     )
 
     const { begin, write, commit, markReady } = testSyncFunctions
diff --git a/packages/db/tests/collection-subscriber-duplicate-inserts.test.ts b/packages/db/tests/collection-subscriber-duplicate-inserts.test.ts
new file mode 100644
index 000000000..5657eb206
--- /dev/null
+++ b/packages/db/tests/collection-subscriber-duplicate-inserts.test.ts
@@ -0,0 +1,452 @@
+import { describe, expect, it } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
+import { createLiveQueryCollection, eq } from '../src/query/index.js'
+import { mockSyncCollectionOptions } from './utils.js'
+import type { ChangeMessage } from '../src/types.js'
+
+/**
+ * Tests for duplicate insert prevention in the D2 pipeline.
+ *
+ * The issue: When using live queries with orderBy + limit, the D2 pipeline
+ * uses multiplicity tracking. Each insert adds 1 to multiplicity, each delete
+ * subtracts 1. For an item to disappear, multiplicity must go from 1 to 0.
+ *
+ * If duplicate inserts reach D2, multiplicity becomes > 1, and deletes won't
+ * properly remove items (multiplicity goes from 2 to 1, not triggering removal).
+ *
+ * The fix: CollectionSubscriber tracks keys sent to D2 (sentToD2Keys) and
+ * filters out duplicate inserts before they reach the pipeline.
+ *
+ * Additionally, for JOIN queries with lazy sources:
+ * - The includeInitialState fix ensures internal lazy-loading subscriptions
+ *   don't trigger markAllStateAsSeen() which would disable filtering.
+ */
+
+type TestItem = {
+  id: string
+  value: number
+}
+
+type User = {
+  id: string
+  name: string
+}
+
+type Order = {
+  id: string
+  userId: string
+  amount: number
+}
+
+describe(`CollectionSubscriber duplicate insert prevention`, () => {
+  it(`should properly delete items from live query with orderBy + limit`, async () => {
+    // This test verifies that items can be properly deleted from a live query
+    // with orderBy + limit. If duplicate inserts reach D2, the delete won't work.
+
+    const initialData: Array<TestItem> = [
+      { id: `1`, value: 100 },
+      { id: `2`, value: 90 },
+      { id: `3`, value: 80 },
+    ]
+
+    const sourceCollection = createCollection(
+      mockSyncCollectionOptions({
+        id: `duplicate-d2-source`,
+        getKey: (item: TestItem) => item.id,
+        initialData,
+      }),
+    )
+
+    await sourceCollection.preload()
+
+    // Create live query with orderBy + limit (uses TopKWithFractionalIndexOperator)
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(2)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+        })),
+    )
+
+    await liveQueryCollection.preload()
+
+    // Verify initial results
+    const initialResults = Array.from(liveQueryCollection.values())
+    expect(initialResults).toHaveLength(2)
+    expect(initialResults.map((r) => r.id)).toEqual([`1`, `2`])
+
+    // Subscribe to changes to verify events
+    const allChanges: Array<ChangeMessage<TestItem>> = []
+    const subscription = liveQueryCollection.subscribeChanges(
+      (changes) => {
+        allChanges.push(...changes)
+      },
+      { includeInitialState: true },
+    )
+
+    // Wait for initial state
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Clear changes
+    allChanges.length = 0
+
+    // Delete item 2 (which is in the visible set)
+    sourceCollection.delete(`2`)
+
+    // Wait for delete to propagate
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    // Verify delete event was emitted
+    const deleteEvents = allChanges.filter((c) => c.type === `delete`)
+    expect(
+      deleteEvents.some((e) => e.key === `2`),
+      `Expected delete event for key 2, but got: ${JSON.stringify(allChanges.map((c) => ({ type: c.type, key: c.key })))}`,
+    ).toBe(true)
+
+    // Verify item 3 moved into the visible set
+    const insertEvents = allChanges.filter((c) => c.type === `insert`)
+    expect(
+      insertEvents.some((e) => e.key === `3`),
+      `Expected insert event for key 3, but got: ${JSON.stringify(allChanges.map((c) => ({ type: c.type, key: c.key })))}`,
+    ).toBe(true)
+
+    // Verify final state
+    const finalResults = Array.from(liveQueryCollection.values())
+    expect(finalResults).toHaveLength(2)
+    expect(finalResults.map((r) => r.id)).toEqual([`1`, `3`])
+
+    subscription.unsubscribe()
+  })
+
+  it(`should not emit duplicate inserts to live query subscribers`, async () => {
+    // This test checks that live query subscribers don't receive duplicate inserts
+    // which would indicate D2 multiplicity issues
+
+    const initialData: Array<TestItem> = [
+      { id: `1`, value: 100 },
+      { id: `2`, value: 90 },
+    ]
+
+    const sourceCollection = createCollection(
+      mockSyncCollectionOptions({
+        id: `duplicate-d2-count`,
+        getKey: (item: TestItem) => item.id,
+        initialData,
+      }),
+    )
+
+    await sourceCollection.preload()
+
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(2)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+        })),
+    )
+
+    await liveQueryCollection.preload()
+
+    const allChanges: Array<ChangeMessage<TestItem>> = []
+    const subscription = liveQueryCollection.subscribeChanges(
+      (changes) => {
+        allChanges.push(...changes)
+      },
+      { includeInitialState: true },
+    )
+
+    // Wait for initial state
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Count inserts per key
+    const insertCounts = new Map<string, number>()
+    for (const change of allChanges) {
+      if (change.type === `insert`) {
+        insertCounts.set(
+          change.key as string,
+          (insertCounts.get(change.key as string) || 0) + 1,
+        )
+      }
+    }
+
+    // Each key should only have ONE insert
+    for (const [key, count] of insertCounts) {
+      expect(
+        count,
+        `Key ${key} should only have 1 insert after initial state, got ${count}. ` +
+          `This indicates duplicate inserts are reaching D2.`,
+      ).toBe(1)
+    }
+
+    subscription.unsubscribe()
+  })
+
+  it(`should handle rapid updates without duplicate inserts`, async () => {
+    // This test simulates rapid updates that could cause race conditions
+    // leading to duplicate inserts
+
+    const initialData: Array<TestItem> = [
+      { id: `1`, value: 100 },
+      { id: `2`, value: 90 },
+    ]
+
+    const sourceCollection = createCollection(
+      mockSyncCollectionOptions({
+        id: `duplicate-d2-rapid`,
+        getKey: (item: TestItem) => item.id,
+        initialData,
+      }),
+    )
+
+    await sourceCollection.preload()
+
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(2)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+        })),
+    )
+
+    await liveQueryCollection.preload()
+
+    const allChanges: Array<ChangeMessage<TestItem>> = []
+    const subscription = liveQueryCollection.subscribeChanges(
+      (changes) => {
+        allChanges.push(...changes)
+      },
+      { includeInitialState: true },
+    )
+
+    // Wait for initial state
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Clear changes
+    allChanges.length = 0
+
+    // Rapid updates to simulate potential race conditions
+    for (let i = 0; i < 5; i++) {
+      sourceCollection.update(`1`, (draft) => {
+        draft.value = 100 + i
+      })
+    }
+
+    // Wait for updates to propagate
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    // Should have update events, not duplicate inserts
+    const insertCounts = new Map<string, number>()
+    for (const change of allChanges) {
+      if (change.type === `insert`) {
+        insertCounts.set(
+          change.key as string,
+          (insertCounts.get(change.key as string) || 0) + 1,
+        )
+      }
+    }
+
+    // No duplicate inserts should occur during updates
+    for (const [key, count] of insertCounts) {
+      expect(
+        count,
+        `Key ${key} should not have duplicate inserts during updates, got ${count}.`,
+      ).toBeLessThanOrEqual(1)
+    }
+
+    subscription.unsubscribe()
+  })
+
+  it(`should handle mutation during live query subscription setup`, async () => {
+    // This test checks for race conditions where a mutation occurs
+    // during live query subscription initialization
+
+    const initialData: Array<TestItem> = [
+      { id: `1`, value: 100 },
+      { id: `2`, value: 90 },
+    ]
+
+    const sourceCollection = createCollection(
+      mockSyncCollectionOptions({
+        id: `duplicate-d2-mutation-during-setup`,
+        getKey: (item: TestItem) => item.id,
+        initialData,
+      }),
+    )
+
+    await sourceCollection.preload()
+
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(2)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+        })),
+    )
+
+    await liveQueryCollection.preload()
+
+    const allChanges: Array<ChangeMessage<TestItem>> = []
+
+    // Subscribe and immediately mutate the source
+    const subscription = liveQueryCollection.subscribeChanges(
+      (changes) => {
+        allChanges.push(...changes)
+
+        // Trigger mutation during callback (similar to race condition test)
+        const firstInsert = changes.find(
+          (c) => c.type === `insert` && c.key === `1`,
+        )
+        if (firstInsert) {
+          sourceCollection.update(`1`, (draft) => {
+            draft.value = 101
+          })
+        }
+      },
+      { includeInitialState: true },
+    )
+
+    // Wait for everything to settle
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    // Count inserts per key
+    const insertCounts = new Map<string, number>()
+    for (const change of allChanges) {
+      if (change.type === `insert`) {
+        insertCounts.set(
+          change.key as string,
+          (insertCounts.get(change.key as string) || 0) + 1,
+        )
+      }
+    }
+
+    console.log(
+      `Insert counts:`,
+      Object.fromEntries(insertCounts),
+      `All changes:`,
+      allChanges.map((c) => ({ type: c.type, key: c.key })),
+    )
+
+    // Each key should only have ONE insert initially
+    // (updates after initial insert are ok, but not duplicate inserts)
+    for (const [key, count] of insertCounts) {
+      expect(
+        count,
+        `Key ${key} should only have 1 insert, got ${count}. ` +
+          `Duplicate inserts indicate D2 multiplicity issues.`,
+      ).toBe(1)
+    }
+
+    // Verify we can still delete items (multiplicity is correct)
+    allChanges.length = 0
+    sourceCollection.delete(`2`)
+
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    const deleteEvents = allChanges.filter((c) => c.type === `delete`)
+    expect(deleteEvents.some((e) => e.key === `2`)).toBe(true)
+
+    subscription.unsubscribe()
+  })
+
+  it(`should properly handle deletes in join queries with lazy sources`, async () => {
+    // This test verifies that items can be properly deleted from a live query
+    // with a join where one collection is loaded lazily.
+    // The bug: includeInitialState: false was being passed to lazy sources,
+    // which triggered markAllStateAsSeen(), disabling filtering.
+
+    const users: Array<User> = [
+      { id: `u1`, name: `Alice` },
+      { id: `u2`, name: `Bob` },
+    ]
+
+    const orders: Array<Order> = [
+      { id: `o1`, userId: `u1`, amount: 100 },
+      { id: `o2`, userId: `u1`, amount: 200 },
+      { id: `o3`, userId: `u2`, amount: 150 },
+    ]
+
+    const usersCollection = createCollection(
+      mockSyncCollectionOptions({
+        id: `join-lazy-users`,
+        getKey: (item: User) => item.id,
+        initialData: users,
+      }),
+    )
+
+    const ordersCollection = createCollection(
+      mockSyncCollectionOptions({
+        id: `join-lazy-orders`,
+        getKey: (item: Order) => item.id,
+        initialData: orders,
+      }),
+    )
+
+    await Promise.all([usersCollection.preload(), ordersCollection.preload()])
+
+    // Create a join query - the orders collection should be lazy loaded
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ users: usersCollection })
+        .join({ orders: ordersCollection }, ({ users, orders }) =>
+          eq(users.id, orders.userId),
+        )
+        .select(({ users, orders }) => ({
+          orderId: orders!.id,
+          userName: users.name,
+          amount: orders!.amount,
+        })),
+    )
+
+    await liveQueryCollection.preload()
+
+    // Verify initial results
+    const initialResults = Array.from(liveQueryCollection.values())
+    expect(initialResults).toHaveLength(3)
+
+    // Subscribe to changes
+    const allChanges: Array<ChangeMessage<any>> = []
+    const subscription = liveQueryCollection.subscribeChanges(
+      (changes) => {
+        allChanges.push(...changes)
+      },
+      { includeInitialState: true },
+    )
+
+    // Wait for initial state
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    // Clear changes
+    allChanges.length = 0
+
+    // Delete an order
+    ordersCollection.delete(`o1`)
+
+    // Wait for delete to propagate
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    // Verify delete event was emitted
+    const deleteEvents = allChanges.filter((c) => c.type === `delete`)
+    expect(
+      deleteEvents.length,
+      `Expected at least 1 delete event, but got: ${JSON.stringify(allChanges.map((c) => ({ type: c.type, key: c.key })))}`,
+    ).toBeGreaterThan(0)
+
+    // Verify final state
+    const finalResults = Array.from(liveQueryCollection.values())
+    expect(finalResults).toHaveLength(2)
+
+    subscription.unsubscribe()
+  })
+})
diff --git a/packages/db/tests/collection-subscription.test.ts b/packages/db/tests/collection-subscription.test.ts
index 0b9e09384..65465a6a8 100644
--- a/packages/db/tests/collection-subscription.test.ts
+++ b/packages/db/tests/collection-subscription.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, it } from "vitest"
-import { createCollection } from "../src/collection/index.js"
-import { flushPromises } from "./utils"
+import { describe, expect, it } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
+import { flushPromises } from './utils'
 
 describe(`CollectionSubscription status tracking`, () => {
   it(`subscription starts with status 'ready'`, () => {
diff --git a/packages/db/tests/collection-truncate.test.ts b/packages/db/tests/collection-truncate.test.ts
index f3630d0aa..1e12b0416 100644
--- a/packages/db/tests/collection-truncate.test.ts
+++ b/packages/db/tests/collection-truncate.test.ts
@@ -1,6 +1,6 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import { createCollection } from "../src/collection/index.js"
-import type { SyncConfig } from "../src/types"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
+import type { LoadSubsetOptions, SyncConfig } from '../src/types'
 
 describe(`Collection truncate operations`, () => {
   beforeEach(() => {
@@ -81,7 +81,7 @@ describe(`Collection truncate operations`, () => {
 
     // Verify only one insert event for the optimistic item
     const key3Inserts = changeEvents.filter(
-      (e) => e.type === `insert` && e.key === 3
+      (e) => e.type === `insert` && e.key === 3,
     )
     expect(key3Inserts.length).toBe(1)
   })
@@ -198,7 +198,7 @@ describe(`Collection truncate operations`, () => {
 
     // Should not have duplicate insert events
     const insertCount = changeEvents.filter(
-      (e) => e.type === `insert` && e.key === 1
+      (e) => e.type === `insert` && e.key === 1,
     ).length
     expect(insertCount).toBeLessThanOrEqual(1)
   })
@@ -706,4 +706,428 @@ describe(`Collection truncate operations`, () => {
     expect(collection.state.has(2)).toBe(true)
     expect(collection.state.get(2)).toEqual({ id: 2, value: `optimistic` })
   })
+
+  it(`should buffer subscription changes during truncate until loadSubset refetch completes`, async () => {
+    // This test verifies that when a truncate occurs:
+    // 1. The subscription buffers delete events from the truncate
+    // 2. The subscription re-requests its previously loaded subsets
+    // 3. Insert events from the refetch are also buffered
+    // 4. All buffered events are emitted together when loadSubset completes
+    // This prevents a flash of missing content during must-refetch scenarios
+
+    const changeEvents: Array<any> = []
+    let syncOps:
+      | Parameters<SyncConfig<{ id: number; value: string }, number>[`sync`]>[0]
+      | undefined
+    let loadSubsetResolver: (() => void) | undefined
+    let loadSubsetCallCount = 0
+
+    const collection = createCollection<{ id: number; value: string }, number>({
+      id: `truncate-buffering-test`,
+      getKey: (item) => item.id,
+      startSync: true,
+      syncMode: `on-demand`,
+      sync: {
+        sync: (cfg) => {
+          syncOps = cfg
+          cfg.markReady()
+
+          return {
+            loadSubset: (_options: LoadSubsetOptions) => {
+              loadSubsetCallCount++
+
+              // Return a promise that we control
+              return new Promise<void>((resolve) => {
+                loadSubsetResolver = () => {
+                  // When resolved, write some data
+                  cfg.begin()
+                  cfg.write({
+                    type: `insert`,
+                    value: { id: 1, value: `refetched-1` },
+                  })
+                  cfg.write({
+                    type: `insert`,
+                    value: { id: 2, value: `refetched-2` },
+                  })
+                  cfg.commit()
+                  resolve()
+                }
+              })
+            },
+          }
+        },
+      },
+    })
+
+    await collection.stateWhenReady()
+
+    // Subscribe with includeInitialState to trigger loadSubset
+    const subscription = collection.subscribeChanges(
+      (changes) => {
+        changeEvents.push(...changes)
+      },
+      {
+        includeInitialState: true,
+      },
+    )
+
+    // Initially empty, waiting for loadSubset
+    expect(changeEvents.length).toBe(0)
+    expect(loadSubsetCallCount).toBe(1)
+
+    // Resolve the first loadSubset to get initial data
+    loadSubsetResolver!()
+    await vi.waitFor(() => expect(changeEvents.length).toBe(2))
+
+    // Verify initial data arrived
+    expect(changeEvents).toEqual([
+      { type: `insert`, key: 1, value: { id: 1, value: `refetched-1` } },
+      { type: `insert`, key: 2, value: { id: 2, value: `refetched-2` } },
+    ])
+
+    // Clear events for next phase
+    changeEvents.length = 0
+    loadSubsetCallCount = 0
+
+    // Now trigger a truncate (simulating must-refetch)
+    syncOps!.begin()
+    syncOps!.truncate()
+    syncOps!.commit()
+
+    // The truncate event should trigger the subscription to buffer and re-request
+    // loadSubset should be called again
+    await vi.waitFor(() => expect(loadSubsetCallCount).toBe(1))
+
+    // Changes should be buffered - subscriber should NOT see deletes yet
+    // (The subscription is buffering until loadSubset completes)
+    expect(changeEvents.length).toBe(0)
+
+    // Now resolve the loadSubset - this should flush the buffer
+    loadSubsetResolver!()
+
+    // Wait for buffered events to be flushed
+    await vi.waitFor(() => expect(changeEvents.length).toBeGreaterThan(0))
+
+    // Verify we got all events in one batch (deletes + inserts)
+    // The subscription should have received:
+    // - Delete events for the old data (from truncate)
+    // - Insert events for the new data (from refetch)
+    const deletes = changeEvents.filter((e) => e.type === `delete`)
+    const inserts = changeEvents.filter((e) => e.type === `insert`)
+
+    expect(deletes.length).toBe(2) // Deleted the old items
+    expect(inserts.length).toBe(2) // Inserted the refetched items
+
+    // Verify final state is correct
+    expect(collection.state.size).toBe(2)
+    expect(collection.state.get(1)).toEqual({ id: 1, value: `refetched-1` })
+    expect(collection.state.get(2)).toEqual({ id: 2, value: `refetched-2` })
+
+    subscription.unsubscribe()
+  })
+
+  it(`should not buffer changes when there are no subsets to reload`, async () => {
+    // When a subscription has no previously loaded subsets,
+    // it should not enter buffering mode during truncate
+
+    const changeEvents: Array<any> = []
+    let syncOps:
+      | Parameters<SyncConfig<{ id: number; value: string }, number>[`sync`]>[0]
+      | undefined
+
+    const collection = createCollection<{ id: number; value: string }, number>({
+      id: `truncate-no-buffer-test`,
+      getKey: (item) => item.id,
+      startSync: true,
+      sync: {
+        sync: (cfg) => {
+          syncOps = cfg
+          cfg.begin()
+          cfg.write({ type: `insert`, value: { id: 1, value: `initial` } })
+          cfg.commit()
+          cfg.markReady()
+        },
+      },
+    })
+
+    await collection.stateWhenReady()
+
+    // Subscribe WITHOUT includeInitialState - no loadSubset is called
+    collection.subscribeChanges((changes) => {
+      changeEvents.push(...changes)
+    })
+
+    // No initial events since includeInitialState is false
+    expect(changeEvents.length).toBe(0)
+
+    // Trigger truncate
+    syncOps!.begin()
+    syncOps!.truncate()
+    syncOps!.write({
+      type: `insert`,
+      value: { id: 1, value: `after-truncate` },
+    })
+    syncOps!.commit()
+
+    // Since there were no loaded subsets, changes should be emitted immediately
+    // (no buffering because there's nothing to refetch)
+    expect(changeEvents.length).toBeGreaterThan(0)
+  })
+
+  it(`should handle unsubscribe during truncate buffering`, async () => {
+    // Verifies that unsubscribing while buffering cleans up properly
+
+    let syncOps:
+      | Parameters<SyncConfig<{ id: number; value: string }, number>[`sync`]>[0]
+      | undefined
+    let loadSubsetResolver: (() => void) | undefined
+
+    const collection = createCollection<{ id: number; value: string }, number>({
+      id: `truncate-unsubscribe-during-buffer`,
+      getKey: (item) => item.id,
+      startSync: true,
+      syncMode: `on-demand`,
+      sync: {
+        sync: (cfg) => {
+          syncOps = cfg
+          cfg.markReady()
+
+          return {
+            loadSubset: (_options: LoadSubsetOptions) => {
+              return new Promise<void>((resolve) => {
+                loadSubsetResolver = () => {
+                  cfg.begin()
+                  cfg.write({
+                    type: `insert`,
+                    value: { id: 1, value: `data` },
+                  })
+                  cfg.commit()
+                  resolve()
+                }
+              })
+            },
+          }
+        },
+      },
+    })
+
+    await collection.stateWhenReady()
+
+    const changeEvents: Array<any> = []
+    const subscription = collection.subscribeChanges(
+      (changes) => {
+        changeEvents.push(...changes)
+      },
+      { includeInitialState: true },
+    )
+
+    // Resolve initial load
+    loadSubsetResolver!()
+    await vi.waitFor(() => expect(changeEvents.length).toBe(1))
+    changeEvents.length = 0
+
+    // Trigger truncate
+    syncOps!.begin()
+    syncOps!.truncate()
+    syncOps!.commit()
+
+    // Unsubscribe before loadSubset completes
+    subscription.unsubscribe()
+
+    // Resolve the loadSubset - should not cause errors
+    loadSubsetResolver!()
+
+    // Give it time to process
+    await vi.advanceTimersByTimeAsync(10)
+
+    // No additional events should have been emitted to the unsubscribed callback
+    expect(changeEvents.length).toBe(0)
+  })
+
+  it(`should emit delete events after truncate when loadedInitialState was true`, async () => {
+    // This test specifically validates the edge case where:
+    // 1. requestSnapshot() is called without options (sets loadedInitialState = true)
+    // 2. When loadedInitialState is true, trackSentKeys early-returns, leaving sentKeys empty
+    // 3. On truncate, we must populate sentKeys BEFORE setting loadedInitialState = false
+    //    Otherwise, delete events would be filtered out by filterAndFlipChanges
+    //
+    // This is the scenario the reviewer identified where sentKeys could be empty.
+
+    const changeEvents: Array<any> = []
+    let syncOps:
+      | Parameters<SyncConfig<{ id: number; value: string }, number>[`sync`]>[0]
+      | undefined
+    let loadSubsetResolver: (() => void) | undefined
+    let loadSubsetCallCount = 0
+
+    const collection = createCollection<{ id: number; value: string }, number>({
+      id: `truncate-loadedInitialState-test`,
+      getKey: (item) => item.id,
+      startSync: true,
+      syncMode: `on-demand`,
+      sync: {
+        sync: (cfg) => {
+          syncOps = cfg
+          cfg.markReady()
+
+          return {
+            loadSubset: (_options: LoadSubsetOptions) => {
+              loadSubsetCallCount++
+
+              return new Promise<void>((resolve) => {
+                loadSubsetResolver = () => {
+                  cfg.begin()
+                  cfg.write({
+                    type: `insert`,
+                    value: { id: 1, value: `item-1` },
+                  })
+                  cfg.write({
+                    type: `insert`,
+                    value: { id: 2, value: `item-2` },
+                  })
+                  cfg.commit()
+                  resolve()
+                }
+              })
+            },
+          }
+        },
+      },
+    })
+
+    await collection.stateWhenReady()
+
+    // Create subscription WITHOUT includeInitialState
+    // Then manually call requestSnapshot() without options to set loadedInitialState = true
+    const subscription = collection.subscribeChanges((changes) => {
+      changeEvents.push(...changes)
+    })
+
+    // Manually trigger requestSnapshot() without options
+    // This sets loadedInitialState = true and sentKeys stays empty
+    // (This mimics the lazy join fallback path in joins.ts line 310)
+    subscription.requestSnapshot()
+    expect(loadSubsetCallCount).toBe(1)
+
+    // Resolve the loadSubset promise
+    loadSubsetResolver!()
+    await vi.waitFor(() => expect(changeEvents.length).toBe(2))
+
+    // Verify initial data arrived
+    expect(changeEvents[0]).toMatchObject({ type: `insert`, key: 1 })
+    expect(changeEvents[1]).toMatchObject({ type: `insert`, key: 2 })
+
+    changeEvents.length = 0
+    const previousLoadSubsetCount = loadSubsetCallCount
+
+    // Now trigger a truncate
+    syncOps!.begin()
+    syncOps!.truncate()
+    syncOps!.commit()
+
+    // Wait for loadSubset to be called again
+    await vi.waitFor(() =>
+      expect(loadSubsetCallCount).toBeGreaterThan(previousLoadSubsetCount),
+    )
+
+    // Resolve the new loadSubset promise
+    loadSubsetResolver!()
+
+    // Wait for events to be emitted
+    await vi.waitFor(() => expect(changeEvents.length).toBeGreaterThan(0))
+
+    // The key assertion: we should have received delete events
+    // Without the fix, sentKeys would be empty and deletes would be filtered out
+    const deletes = changeEvents.filter((e) => e.type === `delete`)
+    expect(deletes.length).toBe(2) // Must have delete events!
+
+    subscription.unsubscribe()
+  })
+
+  it(`should buffer truncate deletes even when loadSubset is synchronous`, async () => {
+    // This test verifies that even when loadSubset returns synchronously (true),
+    // we still capture the truncate delete events in the buffer.
+    // The truncate event is emitted BEFORE delete events are sent, so if we
+    // flush immediately, we'd miss the deletes.
+
+    const changeEvents: Array<any> = []
+    let syncOps:
+      | Parameters<SyncConfig<{ id: number; value: string }, number>[`sync`]>[0]
+      | undefined
+
+    const collection = createCollection<{ id: number; value: string }, number>({
+      id: `truncate-sync-loadSubset-test`,
+      getKey: (item) => item.id,
+      startSync: true,
+      syncMode: `on-demand`,
+      sync: {
+        sync: (cfg) => {
+          syncOps = cfg
+          cfg.markReady()
+
+          return {
+            // loadSubset returns true (synchronous) - data already available
+            loadSubset: (_options: LoadSubsetOptions) => {
+              // Synchronously write data
+              cfg.begin()
+              cfg.write({
+                type: `insert`,
+                value: { id: 1, value: `sync-item-1` },
+              })
+              cfg.write({
+                type: `insert`,
+                value: { id: 2, value: `sync-item-2` },
+              })
+              cfg.commit()
+              return true // Synchronous return
+            },
+          }
+        },
+      },
+    })
+
+    await collection.stateWhenReady()
+
+    // Subscribe with includeInitialState to trigger loadSubset
+    const subscription = collection.subscribeChanges(
+      (changes) => {
+        changeEvents.push(...changes)
+      },
+      { includeInitialState: true },
+    )
+
+    // Wait for initial data
+    await vi.waitFor(() => expect(changeEvents.length).toBe(2))
+    expect(collection.state.size).toBe(2)
+
+    changeEvents.length = 0
+
+    // Trigger truncate - loadSubset will return synchronously
+    syncOps!.begin()
+    syncOps!.truncate()
+    syncOps!.commit()
+
+    // Wait for events to settle
+    await vi.advanceTimersByTimeAsync(10)
+
+    // We should have received delete events even though loadSubset was sync
+    const deletes = changeEvents.filter((e) => e.type === `delete`)
+    const inserts = changeEvents.filter((e) => e.type === `insert`)
+
+    expect(deletes.length).toBe(2) // Should have 2 deletes
+    expect(inserts.length).toBe(2) // Should have 2 inserts
+
+    // Verify correct ordering: deletes should come before inserts
+    // (truncate clears old data, then refetch adds new data)
+    const firstDeleteIdx = changeEvents.findIndex((e) => e.type === `delete`)
+    const firstInsertIdx = changeEvents.findIndex((e) => e.type === `insert`)
+    expect(firstDeleteIdx).toBeLessThan(firstInsertIdx)
+
+    // Verify collection state is correct
+    expect(collection.state.size).toBe(2)
+    expect(collection.state.get(1)).toEqual({ id: 1, value: `sync-item-1` })
+    expect(collection.state.get(2)).toEqual({ id: 2, value: `sync-item-2` })
+
+    subscription.unsubscribe()
+  })
 })
diff --git a/packages/db/tests/collection.test-d.ts b/packages/db/tests/collection.test-d.ts
index d70d53e19..832e3b3cd 100644
--- a/packages/db/tests/collection.test-d.ts
+++ b/packages/db/tests/collection.test-d.ts
@@ -1,8 +1,8 @@
-import { assertType, describe, expectTypeOf, it } from "vitest"
-import { z } from "zod"
-import { createCollection } from "../src/collection/index.js"
-import type { OperationConfig } from "../src/types"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+import { assertType, describe, expectTypeOf, it } from 'vitest'
+import { z } from 'zod'
+import { createCollection } from '../src/collection/index.js'
+import type { OperationConfig } from '../src/types'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 describe(`Collection.update type tests`, () => {
   type TypeTestItem = { id: string; value: number; optional?: boolean }
diff --git a/packages/db/tests/collection.test.ts b/packages/db/tests/collection.test.ts
index 237446805..ecb60361d 100644
--- a/packages/db/tests/collection.test.ts
+++ b/packages/db/tests/collection.test.ts
@@ -1,21 +1,22 @@
-import mitt from "mitt"
-import { describe, expect, it, vi } from "vitest"
-import { createCollection } from "../src/collection/index.js"
+import mitt from 'mitt'
+import { describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
 import {
   CollectionRequiresConfigError,
   DuplicateKeyError,
+  InvalidKeyError,
   KeyUpdateNotAllowedError,
   MissingDeleteHandlerError,
   MissingInsertHandlerError,
   MissingUpdateHandlerError,
-} from "../src/errors"
-import { createTransaction } from "../src/transactions"
+} from '../src/errors'
+import { createTransaction } from '../src/transactions'
 import {
   flushPromises,
   mockSyncCollectionOptionsNoInitialState,
   withExpectedRejection,
-} from "./utils"
-import type { ChangeMessage, MutationFn, PendingMutation } from "../src/types"
+} from './utils'
+import type { ChangeMessage, MutationFn, PendingMutation } from '../src/types'
 
 describe(`Collection`, () => {
   it(`should throw if there's no sync config`, () => {
@@ -213,13 +214,13 @@ describe(`Collection`, () => {
 
     // The merged value should immediately contain the new insert
     expect(collection.state).toEqual(
-      new Map([[insertedKey, { id: 1, value: `bar` }]])
+      new Map([[insertedKey, { id: 1, value: `bar` }]]),
     )
 
     // check there's a transaction in peristing state
     expect(
       // @ts-expect-error possibly undefined is ok in test
-      tx.mutations[0].changes
+      tx.mutations[0].changes,
     ).toEqual({
       id: 1,
       value: `bar`,
@@ -264,7 +265,7 @@ describe(`Collection`, () => {
     // optimistic update is gone & synced data & combined state are all updated.
     expect(collection._state.transactions.size).toEqual(0) // Transaction should be cleaned up
     expect(collection.state).toEqual(
-      new Map([[insertedKey, { id: 1, value: `bar` }]])
+      new Map([[insertedKey, { id: 1, value: `bar` }]]),
     )
     expect(collection._state.optimisticUpserts.size).toEqual(0)
 
@@ -297,7 +298,7 @@ describe(`Collection`, () => {
       collection.update([1], (item) => {
         // @ts-expect-error possibly undefined is ok in test
         item[0].value = `bar2`
-      })
+      }),
     )
 
     // The merged value should contain the update.
@@ -313,8 +314,8 @@ describe(`Collection`, () => {
         (item) => {
           item.value = `bar3`
           item.newProp = `new value`
-        }
-      )
+        },
+      ),
     )
 
     // The merged value should contain the update
@@ -336,7 +337,7 @@ describe(`Collection`, () => {
         (item) => {
           item.value = `bar3.1`
           item.newProp = `new value.1`
-        }
+        },
       )
       collection.update(
         insertedKey,
@@ -344,7 +345,7 @@ describe(`Collection`, () => {
         (item) => {
           item.value = `bar3`
           item.newProp = `new value`
-        }
+        },
       )
     })
 
@@ -369,8 +370,8 @@ describe(`Collection`, () => {
             draft.value += `-updated`
             draft.boolean = true
           })
-        }
-      )
+        },
+      ),
     )
 
     // Check bulk updates
@@ -405,7 +406,7 @@ describe(`Collection`, () => {
     tx8.mutate(() =>
       collection.delete(tx8insertKey, {
         metadata: { reason: `test delete` },
-      })
+      }),
     )
     expect(tx8.mutations[0]?.metadata).toEqual({ reason: `test delete` })
     expect(collection.state.has(tx8insertKey)).toBe(false)
@@ -471,7 +472,7 @@ describe(`Collection`, () => {
       collection.insert({
         id: 1,
         value: `bar`,
-      })
+      }),
     )
 
     // The merged value should immediately contain the new insert
@@ -481,7 +482,7 @@ describe(`Collection`, () => {
     expect(
       // @ts-expect-error possibly undefined is ok in test
       Array.from(collection._state.transactions.values())[0].mutations[0]
-        .changes
+        .changes,
     ).toEqual({
       id: 1,
       value: `bar`,
@@ -523,7 +524,7 @@ describe(`Collection`, () => {
     // Throw when trying to delete a non-existent ID
     const tx2 = createTransaction({ mutationFn })
     expect(() =>
-      tx2.mutate(() => collection.delete(`non-existent-id`))
+      tx2.mutate(() => collection.delete(`non-existent-id`)),
     ).toThrow()
 
     // Should not throw when deleting by ID
@@ -592,7 +593,7 @@ describe(`Collection`, () => {
         collection.insert([
           { id: 1, value: `first` },
           { id: 1, value: `second` }, // Same ID - should throw
-        ])
+        ]),
       )
     }).toThrow(DuplicateKeyError)
 
@@ -603,7 +604,7 @@ describe(`Collection`, () => {
         collection.insert([
           { id: 2, value: `first` },
           { id: 3, value: `second` },
-        ])
+        ]),
       )
     }).not.toThrow()
 
@@ -612,6 +613,151 @@ describe(`Collection`, () => {
     expect(collection.state.get(3)).toEqual({ id: 3, value: `second` })
   })
 
+  it(`should throw InvalidKeyError when getKey returns null`, async () => {
+    const collection = createCollection<{ id: null; value: string }>({
+      id: `null-key-test`,
+      // @ts-expect-error - testing runtime behavior when getKey returns null
+      getKey: (item) => item.id,
+      startSync: true,
+      sync: {
+        sync: ({ begin, commit, markReady }) => {
+          begin()
+          commit()
+          markReady()
+        },
+      },
+    })
+
+    await collection.stateWhenReady()
+
+    const mutationFn = async () => {}
+    const tx = createTransaction({ mutationFn })
+
+    expect(() => {
+      tx.mutate(() => collection.insert({ id: null, value: `test` }))
+    }).toThrow(InvalidKeyError)
+  })
+
+  it(`should throw InvalidKeyError when getKey returns an object`, async () => {
+    const collection = createCollection<{
+      id: { nested: string }
+      value: string
+    }>({
+      id: `object-key-test`,
+      // @ts-expect-error - testing runtime behavior when getKey returns an object
+      getKey: (item) => item.id,
+      startSync: true,
+      sync: {
+        sync: ({ begin, commit, markReady }) => {
+          begin()
+          commit()
+          markReady()
+        },
+      },
+    })
+
+    await collection.stateWhenReady()
+
+    const mutationFn = async () => {}
+    const tx = createTransaction({ mutationFn })
+
+    expect(() => {
+      tx.mutate(() =>
+        collection.insert({ id: { nested: `value` }, value: `test` }),
+      )
+    }).toThrow(InvalidKeyError)
+  })
+
+  it(`should throw InvalidKeyError when getKey returns a boolean`, async () => {
+    const collection = createCollection<{ id: boolean; value: string }>({
+      id: `boolean-key-test`,
+      // @ts-expect-error - testing runtime behavior when getKey returns a boolean
+      getKey: (item) => item.id,
+      startSync: true,
+      sync: {
+        sync: ({ begin, commit, markReady }) => {
+          begin()
+          commit()
+          markReady()
+        },
+      },
+    })
+
+    await collection.stateWhenReady()
+
+    const mutationFn = async () => {}
+    const tx = createTransaction({ mutationFn })
+
+    expect(() => {
+      tx.mutate(() => collection.insert({ id: true, value: `test` }))
+    }).toThrow(InvalidKeyError)
+  })
+
+  it(`should accept valid string and number keys`, async () => {
+    const stringKeyCollection = createCollection<{ id: string; value: string }>(
+      {
+        id: `string-key-test`,
+        getKey: (item) => item.id,
+        startSync: true,
+        sync: {
+          sync: ({ begin, commit, markReady }) => {
+            begin()
+            commit()
+            markReady()
+          },
+        },
+      },
+    )
+
+    const numberKeyCollection = createCollection<{ id: number; value: string }>(
+      {
+        id: `number-key-test`,
+        getKey: (item) => item.id,
+        startSync: true,
+        sync: {
+          sync: ({ begin, commit, markReady }) => {
+            begin()
+            commit()
+            markReady()
+          },
+        },
+      },
+    )
+
+    await Promise.all([
+      stringKeyCollection.stateWhenReady(),
+      numberKeyCollection.stateWhenReady(),
+    ])
+
+    const mutationFn = async () => {}
+
+    // String key should work
+    const tx1 = createTransaction({ mutationFn })
+    expect(() => {
+      tx1.mutate(() =>
+        stringKeyCollection.insert({ id: `string-id`, value: `test` }),
+      )
+    }).not.toThrow()
+
+    // Number key should work
+    const tx2 = createTransaction({ mutationFn })
+    expect(() => {
+      tx2.mutate(() => numberKeyCollection.insert({ id: 123, value: `test` }))
+    }).not.toThrow()
+
+    // Empty string key should work
+    const tx3 = createTransaction({ mutationFn })
+    expect(() => {
+      tx3.mutate(() => stringKeyCollection.insert({ id: ``, value: `empty` }))
+    }).not.toThrow()
+
+    // Zero key should work
+    const tx4 = createTransaction({ mutationFn })
+    expect(() => {
+      tx4.mutate(() => numberKeyCollection.insert({ id: 0, value: `zero` }))
+    }).not.toThrow()
+  })
+
   it(`should support operation handler functions`, async () => {
     // Create mock handler functions
     const onInsertMock = vi.fn()
@@ -652,7 +798,7 @@ describe(`Collection`, () => {
     tx.mutate(() =>
       collection.update(1, (draft) => {
         draft.value = `updated value`
-      })
+      }),
     )
 
     // Test delete handler
@@ -827,7 +973,7 @@ describe(`Collection`, () => {
     // Test non-optimistic insert
     const nonOptimisticInsertTx = collection.insert(
       { id: 2, value: `non-optimistic insert` },
-      { optimistic: false }
+      { optimistic: false },
     )
 
     // Debug: Check the mutation was created with optimistic: false
@@ -855,7 +1001,7 @@ describe(`Collection`, () => {
       { optimistic: false },
       (draft) => {
         draft.value = `non-optimistic update`
-      }
+      },
     )
 
     // The original value should still be there immediately
@@ -946,7 +1092,7 @@ describe(`Collection`, () => {
     // Test explicit optimistic: true
     const explicitOptimisticTx = collection.insert(
       { id: 3, value: `explicit optimistic` },
-      { optimistic: true }
+      { optimistic: true },
     )
 
     // The item should appear immediately
@@ -965,7 +1111,7 @@ describe(`Collection`, () => {
       { optimistic: true },
       (draft) => {
         draft.value = `optimistic update`
-      }
+      },
     )
 
     // The update should be reflected immediately
@@ -1257,7 +1403,7 @@ describe(`Collection`, () => {
       mockSyncCollectionOptionsNoInitialState<Row>({
         id: `repro-truncate-open-transaction`,
         getKey: (r) => r.id,
-      })
+      }),
     )
     const preloadPromise = collection.preload()
 
@@ -1400,6 +1546,116 @@ describe(`Collection`, () => {
     const state = await collection.stateWhenReady()
     expect(state.size).toBe(3)
   })
+
+  it(`should allow deleting a row by passing only the key to write function`, async () => {
+    let testSyncFunctions: any = null
+
+    const collection = createCollection<{ id: number; value: string }>({
+      id: `delete-by-key`,
+      getKey: (item) => item.id,
+      startSync: true,
+      sync: {
+        sync: ({ begin, write, commit, markReady }) => {
+          // Store the sync functions for testing
+          testSyncFunctions = { begin, write, commit, markReady }
+        },
+      },
+    })
+
+    // Collection should start in loading state
+    expect(collection.status).toBe(`loading`)
+    expect(collection.size).toBe(0)
+
+    const { begin, write, commit, markReady } = testSyncFunctions
+
+    // Insert some initial data
+    begin()
+    write({ type: `insert`, value: { id: 1, value: `item 1` } })
+    write({ type: `insert`, value: { id: 2, value: `item 2` } })
+    write({ type: `insert`, value: { id: 3, value: `item 3` } })
+    commit()
+
+    // Verify data was inserted
+    expect(collection.size).toBe(3)
+    expect(collection.state.get(1)).toEqual({ id: 1, value: `item 1` })
+    expect(collection.state.get(2)).toEqual({ id: 2, value: `item 2` })
+    expect(collection.state.get(3)).toEqual({ id: 3, value: `item 3` })
+
+    // Delete a row by passing only the key (no value)
+    begin()
+    write({ type: `delete`, key: 2 })
+    commit()
+
+    // Verify the row is gone
+    expect(collection.size).toBe(2)
+    expect(collection.state.get(1)).toEqual({ id: 1, value: `item 1` })
+    expect(collection.state.get(2)).toBeUndefined()
+    expect(collection.state.get(3)).toEqual({ id: 3, value: `item 3` })
+
+    // Delete another row by key only
+    begin()
+    write({ type: `delete`, key: 1 })
+    commit()
+
+    // Verify both rows are gone
+    expect(collection.size).toBe(1)
+    expect(collection.state.get(1)).toBeUndefined()
+    expect(collection.state.get(2)).toBeUndefined()
+    expect(collection.state.get(3)).toEqual({ id: 3, value: `item 3` })
+
+    // Mark as ready
+    markReady()
+
+    // Verify final state
+    expect(collection.status).toBe(`ready`)
+    expect(collection.size).toBe(1)
+    expect(Array.from(collection.state.keys())).toEqual([3])
+  })
+
+  it(`should allow deleting a row by key with string keys`, async () => {
+    let testSyncFunctions: any = null
+
+    const collection = createCollection<{ id: string; name: string }>({
+      id: `delete-by-string-key`,
+      getKey: (item) => item.id,
+      startSync: true,
+      sync: {
+        sync: ({ begin, write, commit, markReady }) => {
+          // Store the sync functions for testing
+          testSyncFunctions = { begin, write, commit, markReady }
+        },
+      },
+    })
+
+    const { begin, write, commit, markReady } = testSyncFunctions
+
+    // Insert initial data
+    begin()
+    write({ type: `insert`, value: { id: `a`, name: `Alice` } })
+    write({ type: `insert`, value: { id: `b`, name: `Bob` } })
+    write({ type: `insert`, value: { id: `c`, name: `Charlie` } })
+    commit()
+
+    // Verify data was inserted
+    expect(collection.size).toBe(3)
+    expect(collection.state.get(`a`)).toEqual({ id: `a`, name: `Alice` })
+    expect(collection.state.get(`b`)).toEqual({ id: `b`, name: `Bob` })
+    expect(collection.state.get(`c`)).toEqual({ id: `c`, name: `Charlie` })
+
+    // Delete by key only
+    begin()
+    write({ type: `delete`, key: `b` })
+    commit()
+
+    // Verify the row is gone
+    expect(collection.size).toBe(2)
+    expect(collection.state.get(`a`)).toEqual({ id: `a`, name: `Alice` })
+    expect(collection.state.get(`b`)).toBeUndefined()
+    expect(collection.state.get(`c`)).toEqual({ id: `c`, name: `Charlie` })
+
+    markReady()
+    expect(collection.status).toBe(`ready`)
+  })
 })
 
 describe(`Collection isLoadingSubset property`, () => {
diff --git a/packages/db/tests/cursor.test.ts b/packages/db/tests/cursor.test.ts
new file mode 100644
index 000000000..5d8f4a2f4
--- /dev/null
+++ b/packages/db/tests/cursor.test.ts
@@ -0,0 +1,226 @@
+import { describe, expect, it } from 'vitest'
+import { buildCursor } from '../src/utils/cursor.js'
+import { Func, PropRef, Value } from '../src/query/ir.js'
+import type { OrderBy, OrderByClause } from '../src/query/ir.js'
+import type { CompareOptions } from '../src/query/builder/types.js'
+
+// Helper to create an OrderByClause for testing
+function createOrderByClause(
+  path: string,
+  direction: `asc` | `desc`,
+): OrderByClause {
+  const compareOptions: CompareOptions = {
+    direction,
+    nulls: direction === `asc` ? `first` : `last`,
+  }
+  return {
+    expression: new PropRef([`t`, path]),
+    compareOptions,
+  }
+}
+
+// Helper to check if a Func has the expected structure
+function isFuncWithName(expr: unknown, name: string): expr is Func {
+  return expr instanceof Func && expr.name === name
+}
+
+describe(`buildCursor`, () => {
+  describe(`edge cases`, () => {
+    it(`returns undefined for empty values array`, () => {
+      const orderBy: OrderBy = [createOrderByClause(`col1`, `asc`)]
+      expect(buildCursor(orderBy, [])).toBeUndefined()
+    })
+
+    it(`returns undefined for empty orderBy array`, () => {
+      expect(buildCursor([], [1, 2, 3])).toBeUndefined()
+    })
+
+    it(`returns undefined for both empty`, () => {
+      expect(buildCursor([], [])).toBeUndefined()
+    })
+  })
+
+  describe(`single column`, () => {
+    it(`produces gt() for ASC direction`, () => {
+      const orderBy: OrderBy = [createOrderByClause(`col1`, `asc`)]
+      const result = buildCursor(orderBy, [10])
+
+      expect(result).toBeInstanceOf(Func)
+      expect(isFuncWithName(result, `gt`)).toBe(true)
+
+      const func = result as Func
+      expect(func.args).toHaveLength(2)
+      expect(func.args[0]).toBeInstanceOf(PropRef)
+      expect((func.args[0] as PropRef).path).toEqual([`t`, `col1`])
+      expect(func.args[1]).toBeInstanceOf(Value)
+      expect((func.args[1] as Value).value).toBe(10)
+    })
+
+    it(`produces lt() for DESC direction`, () => {
+      const orderBy: OrderBy = [createOrderByClause(`col1`, `desc`)]
+      const result = buildCursor(orderBy, [10])
+
+      expect(result).toBeInstanceOf(Func)
+      expect(isFuncWithName(result, `lt`)).toBe(true)
+
+      const func = result as Func
+      expect(func.args).toHaveLength(2)
+      expect(func.args[0]).toBeInstanceOf(PropRef)
+      expect((func.args[0] as PropRef).path).toEqual([`t`, `col1`])
+      expect(func.args[1]).toBeInstanceOf(Value)
+      expect((func.args[1] as Value).value).toBe(10)
+    })
+
+    it(`handles string cursor values`, () => {
+      const orderBy: OrderBy = [createOrderByClause(`name`, `asc`)]
+      const result = buildCursor(orderBy, [`alice`])
+
+      expect(result).toBeInstanceOf(Func)
+      const func = result as Func
+      expect(func.args[1]).toBeInstanceOf(Value)
+      expect((func.args[1] as Value).value).toBe(`alice`)
+    })
+
+    it(`handles null cursor values`, () => {
+      const orderBy: OrderBy = [createOrderByClause(`col1`, `asc`)]
+      const result = buildCursor(orderBy, [null])
+
+      expect(result).toBeInstanceOf(Func)
+      const func = result as Func
+      expect((func.args[1] as Value).value).toBeNull()
+    })
+  })
+
+  describe(`multi-column composite cursor`, () => {
+    it(`produces or(gt(col1), and(eq(col1), gt(col2))) for two ASC columns`, () => {
+      const orderBy: OrderBy = [
+        createOrderByClause(`col1`, `asc`),
+        createOrderByClause(`col2`, `asc`),
+      ]
+      const result = buildCursor(orderBy, [10, 20])
+
+      // Should be: or(gt(col1, 10), and(eq(col1, 10), gt(col2, 20)))
+      expect(result).toBeInstanceOf(Func)
+      expect(isFuncWithName(result, `or`)).toBe(true)
+
+      const orFunc = result as Func
+      expect(orFunc.args).toHaveLength(2)
+
+      // First arg: gt(col1, 10)
+      const gtCol1 = orFunc.args[0]
+      expect(isFuncWithName(gtCol1, `gt`)).toBe(true)
+      expect((gtCol1 as Func).args[0]).toBeInstanceOf(PropRef)
+      expect(((gtCol1 as Func).args[0] as PropRef).path).toEqual([`t`, `col1`])
+      expect(((gtCol1 as Func).args[1] as Value).value).toBe(10)
+
+      // Second arg: and(eq(col1, 10), gt(col2, 20))
+      const andClause = orFunc.args[1]
+      expect(isFuncWithName(andClause, `and`)).toBe(true)
+      const andFunc = andClause as Func
+      expect(andFunc.args).toHaveLength(2)
+
+      // eq(col1, 10)
+      expect(isFuncWithName(andFunc.args[0], `eq`)).toBe(true)
+      const eqCol1 = andFunc.args[0] as Func
+      expect((eqCol1.args[0] as PropRef).path).toEqual([`t`, `col1`])
+      expect((eqCol1.args[1] as Value).value).toBe(10)
+
+      // gt(col2, 20)
+      expect(isFuncWithName(andFunc.args[1], `gt`)).toBe(true)
+      const gtCol2 = andFunc.args[1] as Func
+      expect((gtCol2.args[0] as PropRef).path).toEqual([`t`, `col2`])
+      expect((gtCol2.args[1] as Value).value).toBe(20)
+    })
+
+    it(`handles mixed ASC/DESC directions`, () => {
+      const orderBy: OrderBy = [
+        createOrderByClause(`col1`, `asc`),
+        createOrderByClause(`col2`, `desc`),
+      ]
+      const result = buildCursor(orderBy, [10, 20])
+
+      // Should be: or(gt(col1, 10), and(eq(col1, 10), lt(col2, 20)))
+      expect(isFuncWithName(result, `or`)).toBe(true)
+
+      const orFunc = result as Func
+      const andClause = orFunc.args[1] as Func
+
+      // Second column should use lt() for DESC
+      expect(isFuncWithName(andClause.args[1], `lt`)).toBe(true)
+    })
+
+    it(`handles three columns correctly`, () => {
+      const orderBy: OrderBy = [
+        createOrderByClause(`col1`, `asc`),
+        createOrderByClause(`col2`, `asc`),
+        createOrderByClause(`col3`, `desc`),
+      ]
+      const result = buildCursor(orderBy, [1, 2, 3])
+
+      // Should be: or(
+      //   gt(col1, 1),
+      //   and(eq(col1, 1), gt(col2, 2)),
+      //   and(eq(col1, 1), eq(col2, 2), lt(col3, 3))
+      // )
+      expect(isFuncWithName(result, `or`)).toBe(true)
+
+      const outerOr = result as Func
+      // The structure is: or(or(gt, and), and) due to reduce
+      expect(outerOr.args).toHaveLength(2)
+
+      // First arg is or(gt(col1, 1), and(eq(col1, 1), gt(col2, 2)))
+      const innerOr = outerOr.args[0]
+      expect(isFuncWithName(innerOr, `or`)).toBe(true)
+
+      // Second arg is and(and(eq(col1, 1), eq(col2, 2)), lt(col3, 3))
+      const thirdClause = outerOr.args[1]
+      expect(isFuncWithName(thirdClause, `and`)).toBe(true)
+
+      // The innermost and should have eq conditions and lt for col3
+      const innerAnd = thirdClause as Func
+      // Due to reduce, the structure is nested: and(and(eq, eq), lt)
+      expect(isFuncWithName(innerAnd.args[1], `lt`)).toBe(true)
+      const ltCol3 = innerAnd.args[1] as Func
+      expect((ltCol3.args[0] as PropRef).path).toEqual([`t`, `col3`])
+      expect((ltCol3.args[1] as Value).value).toBe(3)
+    })
+  })
+
+  describe(`partial values`, () => {
+    it(`handles fewer values than orderBy columns`, () => {
+      const orderBy: OrderBy = [
+        createOrderByClause(`col1`, `asc`),
+        createOrderByClause(`col2`, `asc`),
+        createOrderByClause(`col3`, `asc`),
+      ]
+      const result = buildCursor(orderBy, [10, 20])
+
+      // Should only use first two columns
+      expect(isFuncWithName(result, `or`)).toBe(true)
+
+      const orFunc = result as Func
+      expect(orFunc.args).toHaveLength(2)
+
+      // First clause: gt(col1, 10)
+      expect(isFuncWithName(orFunc.args[0], `gt`)).toBe(true)
+
+      // Second clause: and(eq(col1, 10), gt(col2, 20))
+      expect(isFuncWithName(orFunc.args[1], `and`)).toBe(true)
+    })
+
+    it(`handles single value for multi-column orderBy`, () => {
+      const orderBy: OrderBy = [
+        createOrderByClause(`col1`, `asc`),
+        createOrderByClause(`col2`, `asc`),
+      ]
+      const result = buildCursor(orderBy, [10])
+
+      // Should just be gt(col1, 10) since only one value provided
+      expect(isFuncWithName(result, `gt`)).toBe(true)
+
+      const gtFunc = result as Func
+      expect((gtFunc.args[0] as PropRef).path).toEqual([`t`, `col1`])
+      expect((gtFunc.args[1] as Value).value).toBe(10)
+    })
+  })
+})
diff --git a/packages/db/tests/deferred.test.ts b/packages/db/tests/deferred.test.ts
index ad5b285e3..4897e30ed 100644
--- a/packages/db/tests/deferred.test.ts
+++ b/packages/db/tests/deferred.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, it } from "vitest"
-import { createDeferred } from "../src/deferred"
-import type { Deferred } from "../src/deferred"
+import { describe, expect, it } from 'vitest'
+import { createDeferred } from '../src/deferred'
+import type { Deferred } from '../src/deferred'
 
 describe(`Deferred`, () => {
   it(`should create a deferred object with the correct shape`, () => {
diff --git a/packages/db/tests/deterministic-ordering.test.ts b/packages/db/tests/deterministic-ordering.test.ts
new file mode 100644
index 000000000..f25e3db93
--- /dev/null
+++ b/packages/db/tests/deterministic-ordering.test.ts
@@ -0,0 +1,398 @@
+import { describe, expect, it } from 'vitest'
+import { SortedMap } from '../src/SortedMap'
+import { BTreeIndex } from '../src/indexes/btree-index'
+import { createCollection } from '../src/collection/index.js'
+import { PropRef } from '../src/query/ir'
+import { mockSyncCollectionOptions } from './utils'
+
+/**
+ * These tests verify deterministic ordering behavior when values compare as equal.
+ *
+ * The issue: When multiple items have the same "sort value" (e.g., same priority),
+ * their relative ordering should be deterministic and stable based on their key.
+ * Without key-based tie-breaking, the order depends on insertion order, which
+ * can vary between page loads, sync operations, etc.
+ */
+
+describe(`Deterministic Ordering`, () => {
+  describe(`SortedMap`, () => {
+    it(`should maintain deterministic order when values are equal`, () => {
+      // All values are the same (priority = 1), so they compare as equal
+      const map = new SortedMap<string, { priority: number }>(
+        (a, b) => a.priority - b.priority,
+      )
+
+      // Insert in "random" order
+      map.set(`c`, { priority: 1 })
+      map.set(`a`, { priority: 1 })
+      map.set(`b`, { priority: 1 })
+
+      // With key-based tie-breaking, should always iterate in key order: a, b, c
+      const keys = Array.from(map.keys())
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+
+    it(`should maintain deterministic order with mixed equal and different values`, () => {
+      const map = new SortedMap<string, { priority: number }>(
+        (a, b) => a.priority - b.priority,
+      )
+
+      // Mix of equal and different priorities
+      map.set(`d`, { priority: 2 })
+      map.set(`c`, { priority: 1 })
+      map.set(`a`, { priority: 1 })
+      map.set(`e`, { priority: 2 })
+      map.set(`b`, { priority: 1 })
+
+      // Expected: priority 1 items (a, b, c) sorted by key, then priority 2 items (d, e) sorted by key
+      const keys = Array.from(map.keys())
+      expect(keys).toEqual([`a`, `b`, `c`, `d`, `e`])
+    })
+
+    it(`should maintain deterministic order with numeric keys`, () => {
+      const map = new SortedMap<number, { priority: number }>(
+        (a, b) => a.priority - b.priority,
+      )
+
+      map.set(30, { priority: 1 })
+      map.set(10, { priority: 1 })
+      map.set(20, { priority: 1 })
+
+      const keys = Array.from(map.keys())
+      expect(keys).toEqual([10, 20, 30])
+    })
+
+    it(`should maintain deterministic order after updates`, () => {
+      const map = new SortedMap<string, { priority: number }>(
+        (a, b) => a.priority - b.priority,
+      )
+
+      map.set(`c`, { priority: 1 })
+      map.set(`a`, { priority: 1 })
+      map.set(`b`, { priority: 1 })
+
+      // Update 'b' with same priority
+      map.set(`b`, { priority: 1 })
+
+      const keys = Array.from(map.keys())
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+
+    it(`should maintain deterministic order after delete and re-insert`, () => {
+      const map = new SortedMap<string, { priority: number }>(
+        (a, b) => a.priority - b.priority,
+      )
+
+      map.set(`c`, { priority: 1 })
+      map.set(`a`, { priority: 1 })
+      map.set(`b`, { priority: 1 })
+
+      map.delete(`b`)
+      map.set(`b`, { priority: 1 })
+
+      const keys = Array.from(map.keys())
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+
+    it(`should use key as tie-breaker even without custom comparator`, () => {
+      // When no comparator is provided, all items have "equal" sort value (default behavior)
+      // They should still be ordered by key
+      const map = new SortedMap<string, { name: string }>()
+
+      map.set(`c`, { name: `Charlie` })
+      map.set(`a`, { name: `Alice` })
+      map.set(`b`, { name: `Bob` })
+
+      const keys = Array.from(map.keys())
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+  })
+
+  describe(`BTreeIndex`, () => {
+    it(`should return keys in deterministic order when indexed values are equal`, () => {
+      const index = new BTreeIndex<string>(
+        1,
+        new PropRef([`priority`]),
+        `priority_index`,
+      )
+
+      // All have same priority
+      index.add(`c`, { priority: 1 })
+      index.add(`a`, { priority: 1 })
+      index.add(`b`, { priority: 1 })
+
+      // take() should return keys in key-sorted order when priorities are equal
+      const keys = index.take(3)
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+
+    it(`should return keys in deterministic order with mixed equal and different values`, () => {
+      const index = new BTreeIndex<string>(
+        1,
+        new PropRef([`priority`]),
+        `priority_index`,
+      )
+
+      index.add(`d`, { priority: 2 })
+      index.add(`c`, { priority: 1 })
+      index.add(`a`, { priority: 1 })
+      index.add(`e`, { priority: 2 })
+      index.add(`b`, { priority: 1 })
+
+      // take() should return priority 1 keys sorted by key, then priority 2 keys sorted by key
+      const keys = index.take(5)
+      expect(keys).toEqual([`a`, `b`, `c`, `d`, `e`])
+    })
+
+    it(`should return keys in deterministic order with numeric keys`, () => {
+      const index = new BTreeIndex<number>(
+        1,
+        new PropRef([`priority`]),
+        `priority_index`,
+      )
+
+      index.add(30, { priority: 1 })
+      index.add(10, { priority: 1 })
+      index.add(20, { priority: 1 })
+
+      const keys = index.take(3)
+      expect(keys).toEqual([10, 20, 30])
+    })
+
+    it(`should return keys in deterministic order for takeReversed`, () => {
+      const index = new BTreeIndex<string>(
+        1,
+        new PropRef([`priority`]),
+        `priority_index`,
+      )
+
+      index.add(`c`, { priority: 1 })
+      index.add(`a`, { priority: 1 })
+      index.add(`b`, { priority: 1 })
+
+      // takeReversed should return keys in reverse key order when priorities are equal
+      const keys = index.takeReversed(3)
+      expect(keys).toEqual([`c`, `b`, `a`])
+    })
+
+    it(`should maintain deterministic order after remove and re-add`, () => {
+      const index = new BTreeIndex<string>(
+        1,
+        new PropRef([`priority`]),
+        `priority_index`,
+      )
+
+      index.add(`c`, { priority: 1 })
+      index.add(`a`, { priority: 1 })
+      index.add(`b`, { priority: 1 })
+
+      index.remove(`b`, { priority: 1 })
+      index.add(`b`, { priority: 1 })
+
+      const keys = index.take(3)
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+
+    it(`should return keys in deterministic order with take from cursor across different values`, () => {
+      const index = new BTreeIndex<string>(
+        1,
+        new PropRef([`priority`]),
+        `priority_index`,
+      )
+
+      // Add keys with different priorities
+      index.add(`e`, { priority: 2 })
+      index.add(`c`, { priority: 1 })
+      index.add(`a`, { priority: 1 })
+      index.add(`f`, { priority: 2 })
+      index.add(`d`, { priority: 2 })
+      index.add(`b`, { priority: 1 })
+
+      // First batch - should get priority 1 keys in key order
+      const firstBatch = index.take(3)
+      expect(firstBatch).toEqual([`a`, `b`, `c`])
+
+      // Continue from cursor value 1 (exclusive) - should get priority 2 keys in key order
+      const secondBatch = index.take(3, 1)
+      expect(secondBatch).toEqual([`d`, `e`, `f`])
+    })
+  })
+
+  describe(`Collection iteration`, () => {
+    it(`should iterate in deterministic order when compare function returns equal`, () => {
+      type Item = { id: string; priority: number }
+
+      const options = mockSyncCollectionOptions<Item>({
+        id: `test-collection`,
+        getKey: (item) => item.id,
+        initialData: [],
+      })
+
+      const collection = createCollection({
+        ...options,
+        // Compare by priority only - items with same priority compare as equal
+        compare: (a, b) => a.priority - b.priority,
+      })
+
+      // Insert via sync in "random" order
+      options.utils.begin()
+      options.utils.write({ type: `insert`, value: { id: `c`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `a`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `b`, priority: 1 } })
+      options.utils.commit()
+
+      // Should iterate in key order when priorities are equal
+      const keys = [...collection.keys()]
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+
+    it(`should iterate in deterministic order with mixed priorities`, () => {
+      type Item = { id: string; priority: number }
+
+      const options = mockSyncCollectionOptions<Item>({
+        id: `test-collection-mixed`,
+        getKey: (item) => item.id,
+        initialData: [],
+      })
+
+      const collection = createCollection({
+        ...options,
+        compare: (a, b) => a.priority - b.priority,
+      })
+
+      options.utils.begin()
+      options.utils.write({ type: `insert`, value: { id: `d`, priority: 2 } })
+      options.utils.write({ type: `insert`, value: { id: `c`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `a`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `e`, priority: 2 } })
+      options.utils.write({ type: `insert`, value: { id: `b`, priority: 1 } })
+      options.utils.commit()
+
+      // Priority 1 items sorted by key, then priority 2 items sorted by key
+      const keys = [...collection.keys()]
+      expect(keys).toEqual([`a`, `b`, `c`, `d`, `e`])
+    })
+
+    it(`should maintain deterministic order after incremental sync`, () => {
+      type Item = { id: string; priority: number }
+
+      const options = mockSyncCollectionOptions<Item>({
+        id: `test-collection-incremental`,
+        getKey: (item) => item.id,
+        initialData: [],
+      })
+
+      const collection = createCollection({
+        ...options,
+        compare: (a, b) => a.priority - b.priority,
+      })
+
+      // First sync batch
+      options.utils.begin()
+      options.utils.write({ type: `insert`, value: { id: `c`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `a`, priority: 1 } })
+      options.utils.commit()
+
+      // Second sync batch (simulating incremental load)
+      options.utils.begin()
+      options.utils.write({ type: `insert`, value: { id: `b`, priority: 1 } })
+      options.utils.commit()
+
+      // Order should be deterministic regardless of sync batch order
+      const keys = [...collection.keys()]
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+
+    it(`should maintain deterministic order when collection has no compare function`, () => {
+      // Even without a compare function, iteration order should be deterministic (by key)
+      type Item = { id: string; name: string }
+
+      const options = mockSyncCollectionOptions<Item>({
+        id: `test-collection-no-compare`,
+        getKey: (item) => item.id,
+        initialData: [],
+      })
+
+      const collection = createCollection(options)
+
+      options.utils.begin()
+      options.utils.write({
+        type: `insert`,
+        value: { id: `c`, name: `Charlie` },
+      })
+      options.utils.write({ type: `insert`, value: { id: `a`, name: `Alice` } })
+      options.utils.write({ type: `insert`, value: { id: `b`, name: `Bob` } })
+      options.utils.commit()
+
+      // Without compare function, should still iterate in key order
+      const keys = [...collection.keys()]
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+  })
+
+  describe(`Collection currentStateAsChanges with orderBy`, () => {
+    it(`should return changes in deterministic order when orderBy values are equal`, () => {
+      type Item = { id: string; priority: number }
+
+      const options = mockSyncCollectionOptions<Item>({
+        id: `test-collection-changes`,
+        getKey: (item) => item.id,
+        initialData: [],
+      })
+
+      const collection = createCollection(options)
+
+      options.utils.begin()
+      options.utils.write({ type: `insert`, value: { id: `c`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `a`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `b`, priority: 1 } })
+      options.utils.commit()
+
+      const changes = collection.currentStateAsChanges({
+        orderBy: [
+          {
+            expression: new PropRef([`priority`]),
+            compareOptions: { direction: `asc`, nulls: `last` },
+          },
+        ],
+      })
+
+      const keys = changes?.map((c) => c.key)
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+
+    it(`should return changes in deterministic order with limit`, () => {
+      type Item = { id: string; priority: number }
+
+      const options = mockSyncCollectionOptions<Item>({
+        id: `test-collection-changes-limit`,
+        getKey: (item) => item.id,
+        initialData: [],
+      })
+
+      const collection = createCollection(options)
+
+      options.utils.begin()
+      options.utils.write({ type: `insert`, value: { id: `e`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `c`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `a`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `d`, priority: 1 } })
+      options.utils.write({ type: `insert`, value: { id: `b`, priority: 1 } })
+      options.utils.commit()
+
+      const changes = collection.currentStateAsChanges({
+        orderBy: [
+          {
+            expression: new PropRef([`priority`]),
+            compareOptions: { direction: `asc`, nulls: `last` },
+          },
+        ],
+        limit: 3,
+      })
+
+      // First 3 in key order: a, b, c
+      const keys = changes?.map((c) => c.key)
+      expect(keys).toEqual([`a`, `b`, `c`])
+    })
+  })
+})
diff --git a/packages/db/tests/errors.test.ts b/packages/db/tests/errors.test.ts
index 4f21eb655..9972d0a47 100644
--- a/packages/db/tests/errors.test.ts
+++ b/packages/db/tests/errors.test.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from "vitest"
-import { NonRetriableError } from "../src/errors"
+import { describe, expect, it } from 'vitest'
+import { NonRetriableError } from '../src/errors'
 
 describe(`Errors`, () => {
   it(`should create a NonRetriableError with the correct name and message`, () => {
diff --git a/packages/db/tests/integration/uint8array-id-comparison.test.ts b/packages/db/tests/integration/uint8array-id-comparison.test.ts
index 38653c9d3..7b13c04f6 100644
--- a/packages/db/tests/integration/uint8array-id-comparison.test.ts
+++ b/packages/db/tests/integration/uint8array-id-comparison.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from "vitest"
-import { createCollection, eq } from "../../src/index.js"
-import { createLiveQueryCollection } from "../../src/query/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expect, it } from 'vitest'
+import { createCollection, eq } from '../../src/index.js'
+import { createLiveQueryCollection } from '../../src/query/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 interface Item {
   id: Uint8Array
@@ -17,7 +17,7 @@ describe(`Uint8Array ID comparison (user reproduction)`, () => {
       (_, index): Item => ({
         id: new Uint8Array(index), // Creates arrays of different lengths
         name: makeItemName(index),
-      })
+      }),
     )
 
     const itemCollection = createCollection(
@@ -26,7 +26,7 @@ describe(`Uint8Array ID comparison (user reproduction)`, () => {
         getKey: (item) => item.id.toString(),
         initialData: data,
         autoIndex: `eager`, // Enable auto-indexing to test index lookups
-      })
+      }),
     )
 
     const selectedItemIndex = 5
@@ -36,7 +36,7 @@ describe(`Uint8Array ID comparison (user reproduction)`, () => {
       q
         .from({ item: itemCollection })
         .where(({ item }) => eq(item.id, new Uint8Array(selectedItemIndex)))
-        .findOne()
+        .findOne(),
     )
 
     await queryCollection.preload()
@@ -53,7 +53,7 @@ describe(`Uint8Array ID comparison (user reproduction)`, () => {
       q
         .from({ item: itemCollection })
         .where(({ item }) => eq(item.id, new Uint8Array(0)))
-        .findOne()
+        .findOne(),
     )
 
     await queryCollection2.preload()
@@ -68,7 +68,7 @@ describe(`Uint8Array ID comparison (user reproduction)`, () => {
       q
         .from({ item: itemCollection })
         .where(({ item }) => eq(item.name, makeItemName(selectedItemIndex)))
-        .findOne()
+        .findOne(),
     )
 
     await queryByName.preload()
@@ -99,7 +99,7 @@ describe(`Uint8Array ID comparison (user reproduction)`, () => {
         getKey: (item) => item.name,
         initialData: data,
         autoIndex: `eager`,
-      })
+      }),
     )
 
     // Query with the exact same reference - this should work
@@ -107,7 +107,7 @@ describe(`Uint8Array ID comparison (user reproduction)`, () => {
       q
         .from({ item: collection })
         .where(({ item }) => eq(item.id, largeId))
-        .findOne()
+        .findOne(),
     )
 
     await queryWithSameRef.preload()
@@ -124,12 +124,12 @@ describe(`Uint8Array ID comparison (user reproduction)`, () => {
       q
         .from({ item: collection })
         .where(({ item }) => eq(item.id, differentInstance))
-        .findOne()
+        .findOne(),
     )
 
     await queryWithDifferentRef.preload()
     const resultWithDifferentRef = Array.from(
-      queryWithDifferentRef.entries()
+      queryWithDifferentRef.entries(),
     )[0]?.[1]
 
     // Should NOT find the item because large arrays use reference equality
diff --git a/packages/db/tests/local-only.test-d.ts b/packages/db/tests/local-only.test-d.ts
index 512903713..471a266b3 100644
--- a/packages/db/tests/local-only.test-d.ts
+++ b/packages/db/tests/local-only.test-d.ts
@@ -1,7 +1,7 @@
-import { describe, expectTypeOf, it } from "vitest"
-import { z } from "zod"
-import { createCollection } from "../src/index"
-import { localOnlyCollectionOptions } from "../src/local-only"
+import { describe, expectTypeOf, it } from 'vitest'
+import { z } from 'zod'
+import { createCollection } from '../src/index'
+import { localOnlyCollectionOptions } from '../src/local-only'
 
 interface TestItem extends Record<string, unknown> {
   id: number
@@ -158,19 +158,19 @@ describe(`LocalOnly Collection Types`, () => {
       schema: testSchema,
       onInsert: (params) => {
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExpectedType>()
         return Promise.resolve()
       },
       onUpdate: (params) => {
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExpectedType>()
         return Promise.resolve()
       },
       onDelete: (params) => {
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExpectedType>()
         return Promise.resolve()
       },
@@ -215,23 +215,23 @@ describe(`LocalOnly Collection Types`, () => {
         schema: testSchema,
         onInsert: (params) => {
           expectTypeOf(
-            params.transaction.mutations[0].modified
+            params.transaction.mutations[0].modified,
           ).toEqualTypeOf<ExpectedType>()
           return Promise.resolve()
         },
         onUpdate: (params) => {
           expectTypeOf(
-            params.transaction.mutations[0].modified
+            params.transaction.mutations[0].modified,
           ).toEqualTypeOf<ExpectedType>()
           return Promise.resolve()
         },
         onDelete: (params) => {
           expectTypeOf(
-            params.transaction.mutations[0].modified
+            params.transaction.mutations[0].modified,
           ).toEqualTypeOf<ExpectedType>()
           return Promise.resolve()
         },
-      })
+      }),
     )
 
     collection.insert({
diff --git a/packages/db/tests/local-only.test.ts b/packages/db/tests/local-only.test.ts
index 94c29a8fa..1eb8ac0b5 100644
--- a/packages/db/tests/local-only.test.ts
+++ b/packages/db/tests/local-only.test.ts
@@ -1,10 +1,10 @@
-import { beforeEach, describe, expect, it, vi } from "vitest"
-import { createCollection, liveQueryCollectionOptions } from "../src/index"
-import { sum } from "../src/query/builder/functions"
-import { localOnlyCollectionOptions } from "../src/local-only"
-import { createTransaction } from "../src/transactions"
-import type { LocalOnlyCollectionUtils } from "../src/local-only"
-import type { Collection } from "../src/index"
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection, liveQueryCollectionOptions } from '../src/index'
+import { sum } from '../src/query/builder/functions'
+import { localOnlyCollectionOptions } from '../src/local-only'
+import { createTransaction } from '../src/transactions'
+import type { LocalOnlyCollectionUtils } from '../src/local-only'
+import type { Collection } from '../src/index'
 
 interface TestItem extends Record<string, unknown> {
   id: number
@@ -22,7 +22,7 @@ describe(`LocalOnly Collection`, () => {
       localOnlyCollectionOptions({
         id: `test-local-only`,
         getKey: (item: TestItem) => item.id,
-      })
+      }),
     )
   })
 
@@ -161,7 +161,7 @@ describe(`LocalOnly Collection`, () => {
         { id: 1, name: `Item 1` },
         { id: 2, name: `Item 2` },
         { id: 3, name: `Item 3` },
-      ])
+      ]),
     )
   })
 
@@ -179,7 +179,7 @@ describe(`LocalOnly Collection`, () => {
       expect.arrayContaining([
         [1, { id: 1, name: `Item 1` }],
         [2, { id: 2, name: `Item 2` }],
-      ])
+      ]),
     )
 
     // Test values iteration
@@ -234,7 +234,7 @@ describe(`LocalOnly Collection`, () => {
         localOnlyCollectionOptions({
           id: `test-schema`,
           getKey: (item: TestItem) => item.id,
-        })
+        }),
       )
 
       // Basic operations should still work
@@ -259,7 +259,7 @@ describe(`LocalOnly Collection`, () => {
           id: `test-custom-callbacks`,
           getKey: (item: TestItem) => item.id,
           onInsert: onInsertSpy,
-        })
+        }),
       )
 
       testCollection.insert({ id: 1, name: `Test Item` })
@@ -275,7 +275,7 @@ describe(`LocalOnly Collection`, () => {
               }),
             ]),
           }),
-        })
+        }),
       )
 
       // Collection should still work normally
@@ -290,7 +290,7 @@ describe(`LocalOnly Collection`, () => {
           id: `test-custom-update`,
           getKey: (item: TestItem) => item.id,
           onUpdate: onUpdateSpy,
-        })
+        }),
       )
 
       testCollection.insert({ id: 1, name: `Test Item` })
@@ -309,7 +309,7 @@ describe(`LocalOnly Collection`, () => {
               }),
             ]),
           }),
-        })
+        }),
       )
 
       // Collection should still work normally
@@ -324,7 +324,7 @@ describe(`LocalOnly Collection`, () => {
           id: `test-custom-delete`,
           getKey: (item: TestItem) => item.id,
           onDelete: onDeleteSpy,
-        })
+        }),
       )
 
       testCollection.insert({ id: 1, name: `Test Item` })
@@ -341,7 +341,7 @@ describe(`LocalOnly Collection`, () => {
               }),
             ]),
           }),
-        })
+        }),
       )
 
       // Collection should still work normally
@@ -353,7 +353,7 @@ describe(`LocalOnly Collection`, () => {
         localOnlyCollectionOptions({
           id: `test-no-callbacks`,
           getKey: (item: TestItem) => item.id,
-        })
+        }),
       )
 
       // Should work normally without callbacks
@@ -380,7 +380,7 @@ describe(`LocalOnly Collection`, () => {
           id: `test-initial-data`,
           getKey: (item: TestItem) => item.id,
           initialData: initialItems,
-        })
+        }),
       )
 
       // Collection should be populated with initial data
@@ -396,7 +396,7 @@ describe(`LocalOnly Collection`, () => {
           id: `test-empty-initial-data`,
           getKey: (item: TestItem) => item.id,
           initialData: [],
-        })
+        }),
       )
 
       // Collection should be empty
@@ -408,7 +408,7 @@ describe(`LocalOnly Collection`, () => {
         localOnlyCollectionOptions({
           id: `test-no-initial-data`,
           getKey: (item: TestItem) => item.id,
-        })
+        }),
       )
 
       // Collection should be empty
@@ -423,7 +423,7 @@ describe(`LocalOnly Collection`, () => {
           id: `test-initial-plus-more`,
           getKey: (item: TestItem) => item.id,
           initialData: initialItems,
-        })
+        }),
       )
 
       // Should start with initial data
@@ -459,7 +459,7 @@ describe(`LocalOnly Collection`, () => {
             return Promise.resolve()
           },
           autoIndex: `off`,
-        })
+        }),
       )
 
       const query = createCollection(
@@ -469,7 +469,7 @@ describe(`LocalOnly Collection`, () => {
             q.from({ numbers: testCollection }).select(({ numbers }) => ({
               totalNumber: sum(numbers.number),
             })),
-        })
+        }),
       )
 
       testCollection.delete(0)
@@ -517,7 +517,7 @@ describe(`LocalOnly Collection`, () => {
         localOnlyCollectionOptions({
           id: `other-collection`,
           getKey: (item) => item.id,
-        })
+        }),
       )
 
       const tx = createTransaction({
diff --git a/packages/db/tests/local-storage.test-d.ts b/packages/db/tests/local-storage.test-d.ts
index aaf48049b..3321b2e66 100644
--- a/packages/db/tests/local-storage.test-d.ts
+++ b/packages/db/tests/local-storage.test-d.ts
@@ -1,12 +1,12 @@
-import { describe, expectTypeOf, it } from "vitest"
-import { z } from "zod"
-import { createCollection } from "../src/index"
-import { localStorageCollectionOptions } from "../src/local-storage"
+import { describe, expectTypeOf, it } from 'vitest'
+import { z } from 'zod'
+import { createCollection } from '../src/index'
+import { localStorageCollectionOptions } from '../src/local-storage'
 import type {
   LocalStorageCollectionConfig,
   StorageApi,
   StorageEventApi,
-} from "../src/local-storage"
+} from '../src/local-storage'
 
 type ItemOf<T> = T extends Array<infer U> ? U : T
 
@@ -173,21 +173,21 @@ describe(`LocalStorage collection type resolution tests`, () => {
       onInsert: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve({ success: true })
       },
       onUpdate: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve({ success: true })
       },
       onDelete: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].original
+          params.transaction.mutations[0].original,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve({ success: true })
       },
@@ -286,11 +286,11 @@ describe(`LocalStorage collection type resolution tests`, () => {
     const windowEventApi: {
       addEventListener: (
         type: `storage`,
-        listener: (event: StorageEvent) => void
+        listener: (event: StorageEvent) => void,
       ) => void
       removeEventListener: (
         type: `storage`,
-        listener: (event: StorageEvent) => void
+        listener: (event: StorageEvent) => void,
       ) => void
     } = {
       addEventListener: () => {},
@@ -323,23 +323,23 @@ describe(`LocalStorage collection type resolution tests`, () => {
         schema: testSchemaWithSchema,
         onInsert: (params) => {
           expectTypeOf(
-            params.transaction.mutations[0].modified
+            params.transaction.mutations[0].modified,
           ).toEqualTypeOf<ExpectedType>()
           return Promise.resolve()
         },
         onUpdate: (params) => {
           expectTypeOf(
-            params.transaction.mutations[0].modified
+            params.transaction.mutations[0].modified,
           ).toEqualTypeOf<ExpectedType>()
           return Promise.resolve()
         },
         onDelete: (params) => {
           expectTypeOf(
-            params.transaction.mutations[0].modified
+            params.transaction.mutations[0].modified,
           ).toEqualTypeOf<ExpectedType>()
           return Promise.resolve()
         },
-      })
+      }),
     )
 
     collection.insert({
diff --git a/packages/db/tests/local-storage.test.ts b/packages/db/tests/local-storage.test.ts
index 245174f55..878e570ea 100644
--- a/packages/db/tests/local-storage.test.ts
+++ b/packages/db/tests/local-storage.test.ts
@@ -1,10 +1,10 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import superjson from "superjson"
-import { createCollection } from "../src/index"
-import { localStorageCollectionOptions } from "../src/local-storage"
-import { createTransaction } from "../src/transactions"
-import { StorageKeyRequiredError } from "../src/errors"
-import type { StorageEventApi } from "../src/local-storage"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import superjson from 'superjson'
+import { createCollection } from '../src/index'
+import { localStorageCollectionOptions } from '../src/local-storage'
+import { createTransaction } from '../src/transactions'
+import { StorageKeyRequiredError } from '../src/errors'
+import type { StorageEventApi } from '../src/local-storage'
 
 // Mock storage implementation for testing that properly implements Storage interface
 class MockStorage implements Storage {
@@ -42,14 +42,14 @@ class MockStorageEventApi implements StorageEventApi {
 
   addEventListener(
     type: `storage`,
-    listener: (event: StorageEvent) => void
+    listener: (event: StorageEvent) => void,
   ): void {
     this.listeners.push(listener)
   }
 
   removeEventListener(
     type: `storage`,
-    listener: (event: StorageEvent) => void
+    listener: (event: StorageEvent) => void,
   ): void {
     const index = this.listeners.indexOf(listener)
     if (index > -1) {
@@ -93,7 +93,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       expect(collection).toBeDefined()
@@ -131,7 +131,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (item: any) => item.id,
-        })
+        }),
       ).toThrow(StorageKeyRequiredError)
     })
 
@@ -185,7 +185,7 @@ describe(`localStorage collection`, () => {
           storageEventApi: mockStorageEventApi,
           getKey: (item) => item.id,
           parser: superjson,
-        })
+        }),
       )
 
       const todo: Todo = {
@@ -203,7 +203,7 @@ describe(`localStorage collection`, () => {
       expect(storedData).toBeDefined()
 
       const parsed = superjson.parse<Record<string, { data: Todo }>>(
-        storedData!
+        storedData!,
       )
 
       expect(parsed[`s:1`]?.data.title).toBe(`superjson`)
@@ -216,7 +216,7 @@ describe(`localStorage collection`, () => {
     it(`should load existing data from storage on initialization`, () => {
       // Pre-populate storage with new versioned format
       const existingTodos = {
-        "s:1": {
+        's:1': {
           versionKey: `test-version-1`,
           data: {
             id: `1`,
@@ -235,7 +235,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Subscribe to trigger sync
@@ -258,7 +258,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Should initialize with empty collection
@@ -272,7 +272,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Should initialize with empty collection
@@ -289,7 +289,7 @@ describe(`localStorage collection`, () => {
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
           // No onInsert, onUpdate, or onDelete handlers provided
-        })
+        }),
       )
 
       // Subscribe to trigger sync
@@ -351,7 +351,7 @@ describe(`localStorage collection`, () => {
           onInsert: insertSpy,
           onUpdate: updateSpy,
           onDelete: deleteSpy,
-        })
+        }),
       )
 
       // Subscribe to trigger sync
@@ -407,7 +407,7 @@ describe(`localStorage collection`, () => {
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
           onInsert: () => Promise.resolve({ success: true }),
-        })
+        }),
       )
 
       const todo: Todo = {
@@ -438,7 +438,7 @@ describe(`localStorage collection`, () => {
     it(`should perform update operations and update storage`, async () => {
       // Pre-populate storage
       const initialData = {
-        "s:1": {
+        's:1': {
           versionKey: `initial-version`,
           data: {
             id: `1`,
@@ -457,7 +457,7 @@ describe(`localStorage collection`, () => {
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
           onUpdate: () => Promise.resolve({ success: true }),
-        })
+        }),
       )
 
       // Subscribe to trigger sync
@@ -483,7 +483,7 @@ describe(`localStorage collection`, () => {
     it(`should perform delete operations and update storage`, async () => {
       // Pre-populate storage
       const initialData = {
-        "s:1": {
+        's:1': {
           versionKey: `test-version`,
           data: {
             id: `1`,
@@ -502,7 +502,7 @@ describe(`localStorage collection`, () => {
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
           onDelete: () => Promise.resolve({ success: true }),
-        })
+        }),
       )
 
       // Subscribe to trigger sync
@@ -531,7 +531,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Subscribe to trigger sync
@@ -539,7 +539,7 @@ describe(`localStorage collection`, () => {
 
       // Simulate data being added from another tab
       const newTodoData = {
-        "1": {
+        '1': {
           versionKey: `from-other-tab`,
           data: {
             id: `1`,
@@ -580,7 +580,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Create a mock storage event for different key
@@ -609,7 +609,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Create a mock storage event from different storage area
@@ -640,7 +640,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       collection.utils.clearStorage()
@@ -655,7 +655,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       expect(collection.utils.getStorageSize()).toBe(0)
@@ -689,7 +689,7 @@ describe(`localStorage collection`, () => {
     it(`should detect version key changes for updates`, () => {
       // Pre-populate storage
       const initialData = {
-        "s:1": {
+        's:1': {
           versionKey: `version-1`,
           data: {
             id: `1`,
@@ -707,7 +707,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Subscribe to trigger sync
@@ -718,7 +718,7 @@ describe(`localStorage collection`, () => {
 
       // Simulate change from another tab with different version key but same data
       const updatedData = {
-        "s:1": {
+        's:1': {
           versionKey: `version-2`, // Different version key
           data: {
             id: `1`,
@@ -755,7 +755,7 @@ describe(`localStorage collection`, () => {
 
       // Pre-populate storage
       const initialData = {
-        "s:1": {
+        's:1': {
           versionKey: `version-1`,
           data: {
             id: `1`,
@@ -773,7 +773,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Subscribe to changes to monitor
@@ -781,7 +781,7 @@ describe(`localStorage collection`, () => {
 
       // Simulate "change" from another tab with same version key
       const sameData = {
-        "s:1": {
+        's:1': {
           versionKey: `version-1`, // Same version key
           data: {
             id: `1`,
@@ -819,7 +819,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       // Subscribe to trigger sync
@@ -882,7 +882,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const collection2 = createCollection(
@@ -891,7 +891,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription1 = collection1.subscribeChanges(() => {})
@@ -944,7 +944,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1002,7 +1002,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1050,7 +1050,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1104,7 +1104,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1152,7 +1152,7 @@ describe(`localStorage collection`, () => {
             storage: mockStorage,
             storageEventApi: mockStorageEventApi,
             getKey: (todo) => todo.id,
-          })
+          }),
         )
 
         const subscription = collection.subscribeChanges(() => {})
@@ -1215,7 +1215,7 @@ describe(`localStorage collection`, () => {
             storage: mockStorage,
             storageEventApi: mockStorageEventApi,
             getKey: (todo) => todo.id,
-          })
+          }),
         )
 
         const subscription = collection.subscribeChanges(() => {})
@@ -1272,7 +1272,7 @@ describe(`localStorage collection`, () => {
             storage: mockStorage,
             storageEventApi: mockStorageEventApi,
             getKey: (todo) => todo.id,
-          })
+          }),
         )
 
         const subscription = collection.subscribeChanges(() => {})
@@ -1287,7 +1287,7 @@ describe(`localStorage collection`, () => {
 
         // Simulate another tab making a change while local mutation is in progress
         const remoteData = {
-          "s:local": {
+          's:local': {
             versionKey: `local-version`,
             data: {
               id: `local`,
@@ -1296,7 +1296,7 @@ describe(`localStorage collection`, () => {
               createdAt: new Date(),
             },
           },
-          "s:remote": {
+          's:remote': {
             versionKey: `remote-version`,
             data: {
               id: `remote`,
@@ -1337,7 +1337,7 @@ describe(`localStorage collection`, () => {
             storage: mockStorage,
             storageEventApi: mockStorageEventApi,
             getKey: (todo) => todo.id,
-          })
+          }),
         )
 
         const subscription = collection.subscribeChanges(() => {})
@@ -1353,7 +1353,7 @@ describe(`localStorage collection`, () => {
 
         // Simulate another tab updating the item
         const remoteData = {
-          "s:1": {
+          's:1': {
             versionKey: `remote-version-1`,
             data: {
               id: `1`,
@@ -1402,7 +1402,7 @@ describe(`localStorage collection`, () => {
             storage: mockStorage,
             storageEventApi: mockStorageEventApi,
             getKey: (todo) => todo.id,
-          })
+          }),
         )
 
         // Don't subscribe - collection sync may not be initialized yet
@@ -1449,7 +1449,7 @@ describe(`localStorage collection`, () => {
             storage: mockStorage,
             storageEventApi: mockStorageEventApi,
             getKey: (todo) => todo.id,
-          })
+          }),
         )
 
         const subscription = collection.subscribeChanges(() => {})
@@ -1528,7 +1528,7 @@ describe(`localStorage collection`, () => {
             storage: failingStorage,
             storageEventApi: mockStorageEventApi,
             getKey: (todo) => todo.id,
-          })
+          }),
         )
 
         const subscription = collection.subscribeChanges(() => {})
@@ -1556,7 +1556,7 @@ describe(`localStorage collection`, () => {
             storage: mockStorage,
             storageEventApi: mockStorageEventApi,
             getKey: (todo) => todo.id,
-          })
+          }),
         )
 
         const subscription = collection.subscribeChanges(() => {})
@@ -1631,7 +1631,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1690,7 +1690,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1753,7 +1753,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1815,7 +1815,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1872,15 +1872,15 @@ describe(`localStorage collection`, () => {
       // Pre-populate storage with numeric IDs (simulating existing data)
       // Numeric keys are stored with "n:" prefix
       const existingData = {
-        "n:1": {
+        'n:1': {
           versionKey: `version-1`,
           data: { id: 1, title: `First Todo`, completed: false },
         },
-        "n:2": {
+        'n:2': {
           versionKey: `version-2`,
           data: { id: 2, title: `Second Todo`, completed: false },
         },
-        "n:3": {
+        'n:3': {
           versionKey: `version-3`,
           data: { id: 3, title: `Third Todo`, completed: false },
         },
@@ -1894,7 +1894,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -1937,22 +1937,22 @@ describe(`localStorage collection`, () => {
       // Pre-populate storage with numeric IDs (simulating existing data)
       // Numeric keys are stored with "n:" prefix
       const existingData = {
-        "n:1": {
+        'n:1': {
           versionKey: `version-1`,
           data: { id: 1, title: `First Todo`, completed: false },
         },
-        "n:2": {
+        'n:2': {
           versionKey: `version-2`,
           data: { id: 2, title: `Second Todo`, completed: false },
         },
-        "n:3": {
+        'n:3': {
           versionKey: `version-3`,
           data: { id: 3, title: `Third Todo`, completed: false },
         },
       }
       mockStorage.setItem(
         `numeric-todos-reload-delete`,
-        JSON.stringify(existingData)
+        JSON.stringify(existingData),
       )
 
       // Create collection - this will load the existing data
@@ -1962,7 +1962,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -2005,7 +2005,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
@@ -2060,7 +2060,7 @@ describe(`localStorage collection`, () => {
           storage: mockStorage,
           storageEventApi: mockStorageEventApi,
           getKey: (todo) => todo.id,
-        })
+        }),
       )
 
       const subscription = collection.subscribeChanges(() => {})
diff --git a/packages/db/tests/optimistic-action.test.ts b/packages/db/tests/optimistic-action.test.ts
index 95f43c242..5b2572bc9 100644
--- a/packages/db/tests/optimistic-action.test.ts
+++ b/packages/db/tests/optimistic-action.test.ts
@@ -1,10 +1,10 @@
-import { describe, expect, expectTypeOf, it, vi } from "vitest"
-import { createCollection, createOptimisticAction } from "../src"
+import { describe, expect, expectTypeOf, it, vi } from 'vitest'
+import { createCollection, createOptimisticAction } from '../src'
 import type {
   MutationFnParams,
   Transaction,
   TransactionWithMutations,
-} from "../src"
+} from '../src'
 
 describe(`createOptimisticAction`, () => {
   // Runtime tests
@@ -79,7 +79,7 @@ describe(`createOptimisticAction`, () => {
     })
 
     expect(() => addTodo(`Async Todo`)).toThrowError(
-      `onMutate must be synchronous`
+      `onMutate must be synchronous`,
     )
   })
 
@@ -165,7 +165,7 @@ describe(`createOptimisticAction`, () => {
         expectTypeOf(text).toBeString()
         expectTypeOf(params).toEqualTypeOf<MutationFnParams>()
         expectTypeOf(
-          params.transaction
+          params.transaction,
         ).toEqualTypeOf<TransactionWithMutations>()
         return Promise.resolve({ success: true })
       },
@@ -196,7 +196,7 @@ describe(`createOptimisticAction`, () => {
         expectTypeOf(user.id).toBeNumber()
         expectTypeOf(params).toEqualTypeOf<MutationFnParams>()
         expectTypeOf(
-          params.transaction
+          params.transaction,
         ).toEqualTypeOf<TransactionWithMutations>()
         return Promise.resolve({ success: true })
       },
diff --git a/packages/db/tests/paced-mutations.test.ts b/packages/db/tests/paced-mutations.test.ts
index 1944969d5..026ed314a 100644
--- a/packages/db/tests/paced-mutations.test.ts
+++ b/packages/db/tests/paced-mutations.test.ts
@@ -1,12 +1,12 @@
-import { describe, expect, it, vi } from "vitest"
-import { createCollection } from "../src/collection"
-import { createPacedMutations } from "../src/paced-mutations"
+import { describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../src/collection'
+import { createPacedMutations } from '../src/paced-mutations'
 import {
   debounceStrategy,
   queueStrategy,
   throttleStrategy,
-} from "../src/strategies"
-import { mockSyncCollectionOptionsNoInitialState } from "./utils"
+} from '../src/strategies'
+import { mockSyncCollectionOptionsNoInitialState } from './utils'
 
 type Item = {
   id: number
@@ -22,7 +22,7 @@ async function createReadyCollection<T extends object>(opts: {
   getKey: (item: T) => string | number
 }) {
   const collection = createCollection(
-    mockSyncCollectionOptionsNoInitialState<T>(opts)
+    mockSyncCollectionOptionsNoInitialState<T>(opts),
   )
 
   const preloadPromise = collection.preload()
diff --git a/packages/db/tests/proxy.test.ts b/packages/db/tests/proxy.test.ts
index 2f7cbff1b..40b5da5a3 100644
--- a/packages/db/tests/proxy.test.ts
+++ b/packages/db/tests/proxy.test.ts
@@ -1,11 +1,11 @@
-import { describe, expect, it } from "vitest"
-import { Temporal } from "temporal-polyfill"
+import { describe, expect, it } from 'vitest'
+import { Temporal } from 'temporal-polyfill'
 import {
   createArrayChangeProxy,
   createChangeProxy,
   withArrayChangeTracking,
   withChangeTracking,
-} from "../src/proxy"
+} from '../src/proxy'
 
 describe(`Proxy Library`, () => {
   describe(`createChangeProxy`, () => {
@@ -139,7 +139,7 @@ describe(`Proxy Library`, () => {
       obj.self = obj // Create circular reference
 
       const { proxy, getChanges } = createChangeProxy(
-        obj as Record<string | symbol, any>
+        obj as Record<string | symbol, any>,
       )
 
       proxy.name = `Jane`
@@ -707,7 +707,7 @@ describe(`Proxy Library`, () => {
         expect.arrayContaining([
           { id: 1, value: `modified` },
           { id: 2, value: `two` },
-        ])
+        ]),
       )
     })
 
@@ -775,7 +775,7 @@ describe(`Proxy Library`, () => {
         expect.arrayContaining([
           { id: 1, value: `one` },
           { id: 2, value: `modified two` },
-        ])
+        ]),
       )
     })
 
@@ -859,7 +859,7 @@ describe(`Proxy Library`, () => {
         expect.arrayContaining([
           { id: 1, value: `modified` },
           { id: 2, value: `two` },
-        ])
+        ]),
       )
       expect(obj1.value).toBe(`one`) // Original unchanged
     })
@@ -924,7 +924,7 @@ describe(`Proxy Library`, () => {
         expect.arrayContaining([
           { id: 1, name: `Alice Admin` },
           { id: 2, name: `Bob` },
-        ])
+        ]),
       )
     })
   })
@@ -1830,7 +1830,7 @@ describe(`Proxy Library`, () => {
 
         // Use find() to get an array item and modify it
         const order = proxy.job.orders.find(
-          (order) => order.orderId === `order-1`
+          (order) => order.orderId === `order-1`,
         )
         if (order) {
           order.orderBinInt = 99
diff --git a/packages/db/tests/query/basic.test-d.ts b/packages/db/tests/query/basic.test-d.ts
index 1817cd124..f4923172f 100644
--- a/packages/db/tests/query/basic.test-d.ts
+++ b/packages/db/tests/query/basic.test-d.ts
@@ -1,9 +1,9 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { z } from "zod"
-import { type } from "arktype"
-import { createLiveQueryCollection, eq, gt } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { z } from 'zod'
+import { type } from 'arktype'
+import { createLiveQueryCollection, eq, gt } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample user type for tests
 type User = {
@@ -26,7 +26,7 @@ function createUsersCollection() {
       id: `test-users`,
       getKey: (user) => user.id,
       initialData: sampleUsers,
-    })
+    }),
   )
 }
 
@@ -65,7 +65,7 @@ describe(`Query Basic Types`, () => {
         age: user.age,
         email: user.email,
         active: user.active,
-      }))
+      })),
     )
 
     const results = liveCollection.toArray
@@ -212,7 +212,7 @@ describe(`Query Basic Types`, () => {
 
   test(`query function syntax with no select returns original type`, () => {
     const liveCollection = createLiveQueryCollection((q) =>
-      q.from({ user: usersCollection }).where(({ user }) => gt(user.age, 20))
+      q.from({ user: usersCollection }).where(({ user }) => gt(user.age, 20)),
     )
 
     const results = liveCollection.toArray
@@ -233,7 +233,7 @@ describe(`Query Basic Types`, () => {
         id: `test-users-optional`,
         getKey: (user) => user.id,
         initialData: [],
-      })
+      }),
     )
 
     const liveCollection = createLiveQueryCollection({
@@ -330,7 +330,7 @@ describe(`Query Basic Types with ArkType Schemas`, () => {
     const userWithOptionalSchema = type({
       id: `number`,
       name: `string`,
-      "inserted_at?": `Date`, // Optional using "field?"
+      'inserted_at?': `Date`, // Optional using "field?"
     })
 
     const usersWithOptionalCollection = createCollection({
@@ -365,7 +365,7 @@ describe(`Query Basic Types with ArkType Schemas`, () => {
     const userWithUnionSchema = type({
       id: `number`,
       name: `string`,
-      "status?": `"active" | "inactive"`, // Union type with optional
+      'status?': `"active" | "inactive"`, // Union type with optional
     })
 
     const usersWithUnionCollection = createCollection({
@@ -402,7 +402,7 @@ describe(`Query Basic Types with ArkType Schemas`, () => {
     const userWithArraySchema = type({
       id: `number`,
       name: `string`,
-      "tags?": `string[]`, // Array type with optional
+      'tags?': `string[]`, // Array type with optional
     })
 
     const usersWithArrayCollection = createCollection({
@@ -440,7 +440,7 @@ describe(`Query Basic Types with ArkType Schemas`, () => {
       id: `number`,
       name: `string > 0`,
       age: `number.integer > 0`,
-      "email?": `string.email`,
+      'email?': `string.email`,
     })
 
     const usersCollection = createCollection({
diff --git a/packages/db/tests/query/basic.test.ts b/packages/db/tests/query/basic.test.ts
index dccb0eab0..1ca9c07d7 100644
--- a/packages/db/tests/query/basic.test.ts
+++ b/packages/db/tests/query/basic.test.ts
@@ -1,13 +1,13 @@
-import { beforeEach, describe, expect, test } from "vitest"
+import { beforeEach, describe, expect, test } from 'vitest'
 import {
   concat,
   createLiveQueryCollection,
   eq,
   gt,
   upper,
-} from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+} from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample user type for tests
 type User = {
@@ -102,7 +102,7 @@ function createUsersCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (user) => user.id,
       initialData: sampleUsers,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -131,7 +131,7 @@ function createBasicTests(autoIndex: `off` | `eager`) {
 
       expect(results).toHaveLength(4)
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Bob`, `Charlie`, `Dave`])
+        expect.arrayContaining([`Alice`, `Bob`, `Charlie`, `Dave`]),
       )
 
       // Insert a new user
@@ -184,7 +184,7 @@ function createBasicTests(autoIndex: `off` | `eager`) {
           age: user.age,
           email: user.email,
           active: user.active,
-        }))
+        })),
       )
 
       await liveCollection.preload()
@@ -193,7 +193,7 @@ function createBasicTests(autoIndex: `off` | `eager`) {
 
       expect(results).toHaveLength(4)
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Bob`, `Charlie`, `Dave`])
+        expect.arrayContaining([`Alice`, `Bob`, `Charlie`, `Dave`]),
       )
 
       // Insert a new user
@@ -257,7 +257,7 @@ function createBasicTests(autoIndex: `off` | `eager`) {
       expect(results).toHaveLength(3)
       expect(results.every((u) => u.active)).toBe(true)
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Bob`, `Dave`])
+        expect.arrayContaining([`Alice`, `Bob`, `Dave`]),
       )
 
       // Insert a new active user
@@ -354,7 +354,7 @@ function createBasicTests(autoIndex: `off` | `eager`) {
       })
 
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Charlie`, `Dave`])
+        expect.arrayContaining([`Alice`, `Charlie`, `Dave`]),
       )
 
       // Insert a new user over 20 (should be included)
@@ -615,7 +615,7 @@ function createBasicTests(autoIndex: `off` | `eager`) {
       })
 
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Bob`, `Dave`])
+        expect.arrayContaining([`Alice`, `Bob`, `Dave`]),
       )
 
       // Insert a new active user
@@ -659,7 +659,7 @@ function createBasicTests(autoIndex: `off` | `eager`) {
 
     test(`should return original collection type with query function syntax and no select`, async () => {
       const liveCollection = createLiveQueryCollection((q) =>
-        q.from({ user: usersCollection }).where(({ user }) => gt(user.age, 20))
+        q.from({ user: usersCollection }).where(({ user }) => gt(user.age, 20)),
       )
 
       await liveCollection.preload()
@@ -679,7 +679,7 @@ function createBasicTests(autoIndex: `off` | `eager`) {
       })
 
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Charlie`, `Dave`])
+        expect.arrayContaining([`Alice`, `Charlie`, `Dave`]),
       )
     })
 
@@ -712,12 +712,12 @@ function createBasicTests(autoIndex: `off` | `eager`) {
 
       // Verify that the computed field is correctly applied
       expect(results.map((u) => u.name_upper)).toEqual(
-        expect.arrayContaining([`ALICE`, `CHARLIE`, `DAVE`])
+        expect.arrayContaining([`ALICE`, `CHARLIE`, `DAVE`]),
       )
 
       // Verify original names are preserved
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Charlie`, `Dave`])
+        expect.arrayContaining([`Alice`, `Charlie`, `Dave`]),
       )
 
       // Test specific user data
@@ -787,7 +787,10 @@ function createBasicTests(autoIndex: `off` | `eager`) {
           q
             .from({ user: usersCollection })
             .where(({ user }) =>
-              eq(user.profile?.bio, `Software engineer with 5 years experience`)
+              eq(
+                user.profile?.bio,
+                `Software engineer with 5 years experience`,
+              ),
             )
             .select(({ user }) => ({
               id: user.id,
diff --git a/packages/db/tests/query/builder/buildQuery.test.ts b/packages/db/tests/query/builder/buildQuery.test.ts
index 9450c0656..431fbde06 100644
--- a/packages/db/tests/query/builder/buildQuery.test.ts
+++ b/packages/db/tests/query/builder/buildQuery.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { buildQuery } from "../../../src/query/builder/index.js"
-import { and, eq, gt, or } from "../../../src/query/builder/functions.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { buildQuery } from '../../../src/query/builder/index.js'
+import { and, eq, gt, or } from '../../../src/query/builder/functions.js'
 
 /**
  * This is a set of tests for the buildQuery function.
@@ -46,7 +46,7 @@ describe(`buildQuery function`, () => {
         .select(({ employees }) => ({
           id: employees.id,
           name: employees.name,
-        }))
+        })),
     )
 
     // buildQuery returns Query IR directly
@@ -63,12 +63,12 @@ describe(`buildQuery function`, () => {
         .join(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
         .select(({ employees, departments }) => ({
           employee_name: employees.name,
           department_name: departments?.name,
-        }))
+        })),
     )
 
     expect(query.from).toBeDefined()
@@ -82,7 +82,7 @@ describe(`buildQuery function`, () => {
       q
         .from({ employees: employeesCollection })
         .where(({ employees }) =>
-          and(eq(employees.active, true), gt(employees.salary, 50000))
+          and(eq(employees.active, true), gt(employees.salary, 50000)),
         )
         .orderBy(({ employees }) => employees.name)
         .limit(10)
@@ -90,7 +90,7 @@ describe(`buildQuery function`, () => {
           id: employees.id,
           name: employees.name,
           salary: employees.salary,
-        }))
+        })),
     )
 
     expect(query.from).toBeDefined()
@@ -122,7 +122,7 @@ describe(`buildQuery function`, () => {
       q
         .from({ comment: commentsCollection })
         .join({ user: usersCollection }, ({ comment, user }) =>
-          eq(comment.user_id, user.id)
+          eq(comment.user_id, user.id),
         )
         .where(({ comment }) => or(eq(comment.id, 1), eq(comment.id, 2)))
         .orderBy(({ comment }) => comment.date, `desc`)
@@ -130,7 +130,7 @@ describe(`buildQuery function`, () => {
           id: comment.id,
           content: comment.content,
           user,
-        }))
+        })),
     )
 
     expect(query.from).toBeDefined()
diff --git a/packages/db/tests/query/builder/callback-types.test-d.ts b/packages/db/tests/query/builder/callback-types.test-d.ts
index e45b76bfa..95c2c13ce 100644
--- a/packages/db/tests/query/builder/callback-types.test-d.ts
+++ b/packages/db/tests/query/builder/callback-types.test-d.ts
@@ -1,7 +1,7 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { createCollection } from "../../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../../utils.js"
-import { Query } from "../../../src/query/builder/index.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { createCollection } from '../../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../../utils.js'
+import { Query } from '../../../src/query/builder/index.js'
 import {
   add,
   and,
@@ -24,9 +24,9 @@ import {
   or,
   sum,
   upper,
-} from "../../../src/query/builder/functions.js"
-import type { RefLeaf } from "../../../src/query/builder/types.js"
-import type { Aggregate, BasicExpression } from "../../../src/query/ir.js"
+} from '../../../src/query/builder/functions.js'
+import type { RefLeaf } from '../../../src/query/builder/types.js'
+import type { Aggregate, BasicExpression } from '../../../src/query/ir.js'
 
 // Sample data types for comprehensive callback type testing
 type User = {
@@ -64,7 +64,7 @@ function createTestCollections() {
       id: `test-users`,
       getKey: (user) => user.id,
       initialData: [],
-    })
+    }),
   )
 
   const departmentsCollection = createCollection(
@@ -72,7 +72,7 @@ function createTestCollections() {
       id: `test-departments`,
       getKey: (dept) => dept.id,
       initialData: [],
-    })
+    }),
   )
 
   const projectsCollection = createCollection(
@@ -80,7 +80,7 @@ function createTestCollections() {
       id: `test-projects`,
       getKey: (project) => project.id,
       initialData: [],
-    })
+    }),
   )
 
   return { usersCollection, departmentsCollection, projectsCollection }
@@ -115,12 +115,12 @@ describe(`Query Builder Callback Types`, () => {
       new Query()
         .from({ user: usersCollection })
         .join({ dept: departmentsCollection }, ({ user, dept }) =>
-          eq(user.department_id, dept.id)
+          eq(user.department_id, dept.id),
         )
         .select(({ user, dept }) => {
           // Test cross-table property access
           expectTypeOf(
-            user.department_id
+            user.department_id,
           ).toEqualTypeOf<RefLeaf<number> | null>()
           expectTypeOf(dept?.id).toEqualTypeOf<RefLeaf<number> | undefined>()
           expectTypeOf(dept?.name).toEqualTypeOf<RefLeaf<string> | undefined>()
@@ -229,7 +229,7 @@ describe(`Query Builder Callback Types`, () => {
         return and(
           eq(user.active, true),
           gt(user.age, 25),
-          like(user.email, `%@company.com`)
+          like(user.email, `%@company.com`),
         )
       })
     })
@@ -238,10 +238,10 @@ describe(`Query Builder Callback Types`, () => {
       new Query().from({ user: usersCollection }).where(({ user }) => {
         // Test logical operators
         expectTypeOf(
-          and(eq(user.active, true), gt(user.age, 25))
+          and(eq(user.active, true), gt(user.age, 25)),
         ).toEqualTypeOf<BasicExpression<boolean>>()
         expectTypeOf(
-          or(eq(user.active, false), lt(user.age, 18))
+          or(eq(user.active, false), lt(user.age, 18)),
         ).toEqualTypeOf<BasicExpression<boolean>>()
         expectTypeOf(not(eq(user.active, false))).toEqualTypeOf<
           BasicExpression<boolean>
@@ -250,7 +250,7 @@ describe(`Query Builder Callback Types`, () => {
         return and(
           eq(user.active, true),
           or(gt(user.age, 30), gte(user.salary, 75000)),
-          not(eq(user.department_id, null))
+          not(eq(user.department_id, null)),
         )
       })
     })
@@ -259,7 +259,7 @@ describe(`Query Builder Callback Types`, () => {
       new Query()
         .from({ user: usersCollection })
         .join({ dept: departmentsCollection }, ({ user, dept }) =>
-          eq(user.department_id, dept.id)
+          eq(user.department_id, dept.id),
         )
         .where(({ user, dept }) => {
           expectTypeOf(user.active).toEqualTypeOf<RefLeaf<boolean>>()
@@ -273,7 +273,7 @@ describe(`Query Builder Callback Types`, () => {
           return and(
             eq(user.active, true),
             eq(dept?.active, true),
-            gt(dept?.budget, 100000)
+            gt(dept?.budget, 100000),
           )
         })
     })
@@ -286,7 +286,7 @@ describe(`Query Builder Callback Types`, () => {
         .join({ dept: departmentsCollection }, ({ user, dept }) => {
           // Test property access for join conditions
           expectTypeOf(
-            user.department_id
+            user.department_id,
           ).toEqualTypeOf<RefLeaf<number> | null>()
           expectTypeOf(dept.id).toEqualTypeOf<RefLeaf<number>>()
 
@@ -300,7 +300,7 @@ describe(`Query Builder Callback Types`, () => {
         .join({ dept: departmentsCollection }, ({ user, dept }) => {
           // Test complex join conditions with multiple operators
           expectTypeOf(
-            and(eq(user.department_id, dept.id), eq(dept.active, true))
+            and(eq(user.department_id, dept.id), eq(dept.active, true)),
           ).toEqualTypeOf<BasicExpression<boolean>>()
 
           return and(eq(user.department_id, dept.id), eq(dept.active, true))
@@ -311,7 +311,7 @@ describe(`Query Builder Callback Types`, () => {
       new Query()
         .from({ user: usersCollection })
         .join({ dept: departmentsCollection }, ({ user, dept }) =>
-          eq(user.department_id, dept.id)
+          eq(user.department_id, dept.id),
         )
         .join({ project: projectsCollection }, ({ user, dept, project }) => {
           expectTypeOf(user.id).toEqualTypeOf<RefLeaf<number>>()
@@ -321,7 +321,7 @@ describe(`Query Builder Callback Types`, () => {
 
           return and(
             eq(project.user_id, user.id),
-            eq(project.department_id, dept?.id)
+            eq(project.department_id, dept?.id),
           )
         })
     })
@@ -356,7 +356,7 @@ describe(`Query Builder Callback Types`, () => {
       new Query()
         .from({ user: usersCollection })
         .join({ dept: departmentsCollection }, ({ user, dept }) =>
-          eq(user.department_id, dept.id)
+          eq(user.department_id, dept.id),
         )
         .orderBy(({ user, dept }) => {
           expectTypeOf(user.id).toEqualTypeOf<RefLeaf<number>>()
@@ -396,7 +396,7 @@ describe(`Query Builder Callback Types`, () => {
       new Query()
         .from({ user: usersCollection })
         .join({ dept: departmentsCollection }, ({ user, dept }) =>
-          eq(user.department_id, dept.id)
+          eq(user.department_id, dept.id),
         )
         .groupBy(({ user, dept }) => {
           expectTypeOf(user.id).toEqualTypeOf<RefLeaf<number>>()
@@ -418,7 +418,7 @@ describe(`Query Builder Callback Types`, () => {
         .having(({ user }) => {
           expectTypeOf(user.id).toEqualTypeOf<RefLeaf<number>>()
           expectTypeOf(
-            user.department_id
+            user.department_id,
           ).toEqualTypeOf<RefLeaf<number> | null>()
 
           return gt(count(user.id), 5)
@@ -432,7 +432,7 @@ describe(`Query Builder Callback Types`, () => {
         .having(({ user }) => {
           expectTypeOf(user.id).toEqualTypeOf<RefLeaf<number>>()
           expectTypeOf(
-            user.department_id
+            user.department_id,
           ).toEqualTypeOf<RefLeaf<number> | null>()
           // Test aggregate functions in having
           expectTypeOf(count(user.id)).toEqualTypeOf<Aggregate<number>>()
@@ -444,7 +444,7 @@ describe(`Query Builder Callback Types`, () => {
           return and(
             gt(count(user.id), 5),
             gt(avg(user.age), 30),
-            gt(sum(user.salary), 300000)
+            gt(sum(user.salary), 300000),
           )
         })
     })
@@ -479,7 +479,7 @@ describe(`Query Builder Callback Types`, () => {
       new Query()
         .from({ user: usersCollection })
         .join({ dept: departmentsCollection }, ({ user, dept }) =>
-          eq(user.department_id, dept.id)
+          eq(user.department_id, dept.id),
         )
         .groupBy(({ dept }) => dept?.location)
         .having(({ user, dept }) => {
@@ -529,7 +529,7 @@ describe(`Query Builder Callback Types`, () => {
           return and(
             eq(user.active, true),
             eq(dept?.active, true),
-            eq(project?.status, `active`)
+            eq(project?.status, `active`),
           )
         })
         .groupBy(({ dept }) => {
diff --git a/packages/db/tests/query/builder/from.test.ts b/packages/db/tests/query/builder/from.test.ts
index 6e4ec2f64..1f03a41d2 100644
--- a/packages/db/tests/query/builder/from.test.ts
+++ b/packages/db/tests/query/builder/from.test.ts
@@ -1,12 +1,12 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
-import { eq } from "../../../src/query/builder/functions.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
+import { eq } from '../../../src/query/builder/functions.js'
 import {
   InvalidSourceTypeError,
   OnlyOneSourceAllowedError,
   QueryMustHaveFromClauseError,
-} from "../../../src/errors"
+} from '../../../src/errors'
 
 // Test schema
 interface Employee {
@@ -120,7 +120,7 @@ describe(`QueryBuilder.from`, () => {
     expect(() => {
       builder.from(`employees` as any)
     }).toThrow(
-      /Invalid source for from clause: Expected an object with a single key-value pair/
+      /Invalid source for from clause: Expected an object with a single key-value pair/,
     )
   })
 
@@ -134,7 +134,7 @@ describe(`QueryBuilder.from`, () => {
     expect(() => {
       builder.from(null as any)
     }).toThrow(
-      /Invalid source for from clause: Expected an object with a single key-value pair/
+      /Invalid source for from clause: Expected an object with a single key-value pair/,
     )
   })
 
@@ -148,7 +148,7 @@ describe(`QueryBuilder.from`, () => {
     expect(() => {
       builder.from([employeesCollection] as any)
     }).toThrow(
-      /Invalid source for from clause: Expected an object with a single key-value pair/
+      /Invalid source for from clause: Expected an object with a single key-value pair/,
     )
   })
 
@@ -162,7 +162,7 @@ describe(`QueryBuilder.from`, () => {
     expect(() => {
       builder.from(undefined as any)
     }).toThrow(
-      /Invalid source for from clause: Expected an object with a single key-value pair/
+      /Invalid source for from clause: Expected an object with a single key-value pair/,
     )
   })
 })
diff --git a/packages/db/tests/query/builder/functional-variants.test.ts b/packages/db/tests/query/builder/functional-variants.test.ts
index 0ce18cf86..f39f914f7 100644
--- a/packages/db/tests/query/builder/functional-variants.test.ts
+++ b/packages/db/tests/query/builder/functional-variants.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
-import { eq, gt } from "../../../src/query/builder/functions.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
+import { eq, gt } from '../../../src/query/builder/functions.js'
 
 // Test schema
 interface Employee {
@@ -75,7 +75,7 @@ describe(`QueryBuilder functional variants (fn)`, () => {
         .join(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
         .fn.select((row) => ({
           employeeName: row.employees.name,
@@ -132,7 +132,7 @@ describe(`QueryBuilder functional variants (fn)`, () => {
             row.employees.active &&
             row.employees.salary > 60000 &&
             (row.employees.department_id === 1 ||
-              row.employees.department_id === 2)
+              row.employees.department_id === 2),
         )
 
       const builtQuery = getQueryIR(query)
@@ -145,13 +145,13 @@ describe(`QueryBuilder functional variants (fn)`, () => {
         .join(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
         .fn.where(
           (row) =>
             row.employees.active &&
             row.departments !== undefined &&
-            row.departments.name !== `HR`
+            row.departments.name !== `HR`,
         )
 
       const builtQuery = getQueryIR(query)
@@ -219,14 +219,14 @@ describe(`QueryBuilder functional variants (fn)`, () => {
         .join(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
         .groupBy(({ departments }) => departments?.name)
         .fn.having(
           (row) =>
             row.employees.salary > 60000 &&
             row.departments !== undefined &&
-            row.departments.name !== `Temp`
+            row.departments.name !== `Temp`,
         )
 
       const builtQuery = getQueryIR(query)
@@ -241,7 +241,7 @@ describe(`QueryBuilder functional variants (fn)`, () => {
         .join(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
         .fn.where((row) => row.employees.active)
         .fn.where((row) => row.employees.salary > 40000)
diff --git a/packages/db/tests/query/builder/functions.test.ts b/packages/db/tests/query/builder/functions.test.ts
index 383771c7e..fb6cb4f35 100644
--- a/packages/db/tests/query/builder/functions.test.ts
+++ b/packages/db/tests/query/builder/functions.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
 import {
   add,
   and,
@@ -23,7 +23,7 @@ import {
   or,
   sum,
   upper,
-} from "../../../src/query/builder/functions.js"
+} from '../../../src/query/builder/functions.js'
 
 // Test schema
 interface Employee {
@@ -97,7 +97,7 @@ describe(`QueryBuilder Functions`, () => {
       const query = new Query()
         .from({ employees: employeesCollection })
         .where(({ employees }) =>
-          and(eq(employees.active, true), gt(employees.salary, 50000))
+          and(eq(employees.active, true), gt(employees.salary, 50000)),
         )
 
       const builtQuery = getQueryIR(query)
@@ -108,7 +108,7 @@ describe(`QueryBuilder Functions`, () => {
       const query = new Query()
         .from({ employees: employeesCollection })
         .where(({ employees }) =>
-          or(eq(employees.department_id, 1), eq(employees.department_id, 2))
+          or(eq(employees.department_id, 1), eq(employees.department_id, 2)),
         )
 
       const builtQuery = getQueryIR(query)
diff --git a/packages/db/tests/query/builder/group-by.test.ts b/packages/db/tests/query/builder/group-by.test.ts
index 3cbb9632f..3bec25303 100644
--- a/packages/db/tests/query/builder/group-by.test.ts
+++ b/packages/db/tests/query/builder/group-by.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
-import { avg, count, eq, sum } from "../../../src/query/builder/functions.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
+import { avg, count, eq, sum } from '../../../src/query/builder/functions.js'
 
 // Test schema
 interface Employee {
diff --git a/packages/db/tests/query/builder/join.test.ts b/packages/db/tests/query/builder/join.test.ts
index 470ee3853..db75e3cbc 100644
--- a/packages/db/tests/query/builder/join.test.ts
+++ b/packages/db/tests/query/builder/join.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
-import { and, eq, gt } from "../../../src/query/builder/functions.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
+import { and, eq, gt } from '../../../src/query/builder/functions.js'
 
 // Test schema
 interface Employee {
@@ -39,7 +39,7 @@ describe(`QueryBuilder.join`, () => {
       .join(
         { departments: departmentsCollection },
         ({ employees, departments }) =>
-          eq(employees.department_id, departments.id)
+          eq(employees.department_id, departments.id),
       )
 
     const builtQuery = getQueryIR(query)
@@ -72,10 +72,10 @@ describe(`QueryBuilder.join`, () => {
       .join(
         { departments: departmentsCollection },
         ({ employees, departments }) =>
-          eq(employees.department_id, departments.id)
+          eq(employees.department_id, departments.id),
       )
       .join({ projects: projectsCollection }, ({ departments, projects }) =>
-        eq(departments?.id, projects.department_id)
+        eq(departments?.id, projects.department_id),
       )
 
     const builtQuery = getQueryIR(query)
@@ -96,7 +96,7 @@ describe(`QueryBuilder.join`, () => {
       .join(
         { departments: departmentsCollection },
         ({ employees, departments }) =>
-          eq(employees.department_id, departments.id)
+          eq(employees.department_id, departments.id),
       )
       .select(({ employees, departments }) => ({
         id: employees.id,
@@ -120,7 +120,7 @@ describe(`QueryBuilder.join`, () => {
       .join(
         { departments: departmentsCollection },
         ({ employees, departments }) =>
-          eq(employees.department_id, departments.id)
+          eq(employees.department_id, departments.id),
       )
       .where(({ departments }) => gt(departments?.budget, 1000000))
 
@@ -138,7 +138,7 @@ describe(`QueryBuilder.join`, () => {
     const query = builder
       .from({ employees: employeesCollection })
       .join({ bigDepts: subQuery as any }, ({ employees, bigDepts }) =>
-        eq(employees.department_id, (bigDepts as any).id)
+        eq(employees.department_id, (bigDepts as any).id),
       )
 
     const builtQuery = getQueryIR(query)
@@ -157,10 +157,10 @@ describe(`QueryBuilder.join`, () => {
       .join(
         { departments: departmentsCollection },
         ({ employees, departments }) =>
-          eq(employees.department_id, departments.id)
+          eq(employees.department_id, departments.id),
       )
       .where(({ employees, departments }) =>
-        and(gt(employees.salary, 50000), gt(departments?.budget, 1000000))
+        and(gt(employees.salary, 50000), gt(departments?.budget, 1000000)),
       )
       .select(({ employees, departments }) => ({
         id: employees.id,
@@ -196,10 +196,10 @@ describe(`QueryBuilder.join`, () => {
       .join(
         { departments: departmentsCollection },
         ({ employees, departments }) =>
-          eq(employees.department_id, departments.id)
+          eq(employees.department_id, departments.id),
       )
       .join({ users: usersCollection }, ({ employees, users }) =>
-        eq(employees.id, users.employee_id)
+        eq(employees.id, users.employee_id),
       )
 
     const builtQuery = getQueryIR(query)
@@ -220,7 +220,7 @@ describe(`QueryBuilder.join`, () => {
       .join(
         { departments: departmentsCollection },
         ({ employees, departments }) =>
-          eq(employees.department_id, departments.id)
+          eq(employees.department_id, departments.id),
       )
       .select(({ employees, departments }) => ({
         employee: employees,
@@ -242,7 +242,7 @@ describe(`QueryBuilder.join`, () => {
           { departments: departmentsCollection },
           ({ employees, departments }) =>
             eq(employees.department_id, departments.id),
-          `left`
+          `left`,
         )
 
       const aliasQuery = builder
@@ -250,7 +250,7 @@ describe(`QueryBuilder.join`, () => {
         .leftJoin(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
 
       const explicitQueryIR = getQueryIR(explicitQuery)
@@ -268,7 +268,7 @@ describe(`QueryBuilder.join`, () => {
           { departments: departmentsCollection },
           ({ employees, departments }) =>
             eq(employees.department_id, departments.id),
-          `right`
+          `right`,
         )
 
       const aliasQuery = builder
@@ -276,7 +276,7 @@ describe(`QueryBuilder.join`, () => {
         .rightJoin(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
 
       const explicitQueryIR = getQueryIR(explicitQuery)
@@ -294,7 +294,7 @@ describe(`QueryBuilder.join`, () => {
           { departments: departmentsCollection },
           ({ employees, departments }) =>
             eq(employees.department_id, departments.id),
-          `inner`
+          `inner`,
         )
 
       const aliasQuery = builder
@@ -302,7 +302,7 @@ describe(`QueryBuilder.join`, () => {
         .innerJoin(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
 
       const explicitQueryIR = getQueryIR(explicitQuery)
@@ -320,7 +320,7 @@ describe(`QueryBuilder.join`, () => {
           { departments: departmentsCollection },
           ({ employees, departments }) =>
             eq(employees.department_id, departments.id),
-          `full`
+          `full`,
         )
 
       const aliasQuery = builder
@@ -328,7 +328,7 @@ describe(`QueryBuilder.join`, () => {
         .fullJoin(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
 
       const explicitQueryIR = getQueryIR(explicitQuery)
@@ -355,12 +355,12 @@ describe(`QueryBuilder.join`, () => {
         .leftJoin(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
         .innerJoin(
           { projects: projectsCollection },
           ({ departments, projects }) =>
-            eq(departments?.id, projects.department_id)
+            eq(departments?.id, projects.department_id),
         )
 
       const builtQuery = getQueryIR(query)
@@ -383,7 +383,7 @@ describe(`QueryBuilder.join`, () => {
         .innerJoin(
           { departments: departmentsCollection },
           ({ employees, departments }) =>
-            eq(employees.department_id, departments.id)
+            eq(employees.department_id, departments.id),
         )
         .where(({ departments }) => gt(departments.budget, 1000000))
         .select(({ employees, departments }) => ({
diff --git a/packages/db/tests/query/builder/order-by.test.ts b/packages/db/tests/query/builder/order-by.test.ts
index 51f7c075a..10e23ce49 100644
--- a/packages/db/tests/query/builder/order-by.test.ts
+++ b/packages/db/tests/query/builder/order-by.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
-import { eq, upper } from "../../../src/query/builder/functions.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
+import { eq, upper } from '../../../src/query/builder/functions.js'
 
 // Test schema
 interface Employee {
@@ -162,7 +162,7 @@ describe(`QueryBuilder.orderBy`, () => {
     expect(builtQuery.orderBy![0]!.compareOptions.stringSort).toBe(`locale`)
     expect((builtQuery.orderBy![0]!.compareOptions as any).locale).toBe(`de-DE`)
     expect(
-      (builtQuery.orderBy![0]!.compareOptions as any).localeOptions
+      (builtQuery.orderBy![0]!.compareOptions as any).localeOptions,
     ).toEqual({
       sensitivity: `base`,
     })
diff --git a/packages/db/tests/query/builder/ref-proxy.test.ts b/packages/db/tests/query/builder/ref-proxy.test.ts
index d979e0935..ec41351da 100644
--- a/packages/db/tests/query/builder/ref-proxy.test.ts
+++ b/packages/db/tests/query/builder/ref-proxy.test.ts
@@ -1,11 +1,11 @@
-import { describe, expect, it } from "vitest"
+import { describe, expect, it } from 'vitest'
 import {
   createRefProxy,
   isRefProxy,
   toExpression,
   val,
-} from "../../../src/query/builder/ref-proxy.js"
-import { PropRef, Value } from "../../../src/query/ir.js"
+} from '../../../src/query/builder/ref-proxy.js'
+import { PropRef, Value } from '../../../src/query/ir.js'
 
 describe(`ref-proxy`, () => {
   describe(`createRefProxy`, () => {
@@ -100,7 +100,7 @@ describe(`ref-proxy`, () => {
 
       const nonexistentDesc = Object.getOwnPropertyDescriptor(
         proxy,
-        `nonexistent`
+        `nonexistent`,
       )
       expect(nonexistentDesc).toBeUndefined()
     })
@@ -114,7 +114,7 @@ describe(`ref-proxy`, () => {
       const keys = Object.getOwnPropertyNames((proxy as any).users)
       // table spread sentinel should exist on table proxy
       expect(keys.some((k) => k.startsWith(`__SPREAD_SENTINEL__users__`))).toBe(
-        true
+        true,
       )
     })
 
diff --git a/packages/db/tests/query/builder/select.test.ts b/packages/db/tests/query/builder/select.test.ts
index 3c8ae4352..53d9c134e 100644
--- a/packages/db/tests/query/builder/select.test.ts
+++ b/packages/db/tests/query/builder/select.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
 import {
   avg,
   count,
@@ -9,7 +9,7 @@ import {
   length,
   not,
   upper,
-} from "../../../src/query/builder/functions.js"
+} from '../../../src/query/builder/functions.js'
 
 // Test schema
 interface Employee {
diff --git a/packages/db/tests/query/builder/subqueries.test-d.ts b/packages/db/tests/query/builder/subqueries.test-d.ts
index 88fdedd47..f8343e395 100644
--- a/packages/db/tests/query/builder/subqueries.test-d.ts
+++ b/packages/db/tests/query/builder/subqueries.test-d.ts
@@ -1,9 +1,9 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { Query } from "../../../src/query/builder/index.js"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { avg, count, eq } from "../../../src/query/builder/functions.js"
-import type { ExtractContext } from "../../../src/query/builder/index.js"
-import type { GetResult } from "../../../src/query/builder/types.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { Query } from '../../../src/query/builder/index.js'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { avg, count, eq } from '../../../src/query/builder/functions.js'
+import type { ExtractContext } from '../../../src/query/builder/index.js'
+import type { GetResult } from '../../../src/query/builder/types.js'
 
 // Test schema types
 interface Issue {
@@ -114,7 +114,7 @@ describe(`Subquery Types`, () => {
       const _query = new Query()
         .from({ issue: issuesCollection })
         .join({ activeUser: activeUsersQuery }, ({ issue, activeUser }) =>
-          eq(issue.userId, activeUser.id)
+          eq(issue.userId, activeUser.id),
         )
         .select(({ issue, activeUser }) => ({
           issueId: issue.id,
@@ -144,7 +144,7 @@ describe(`Subquery Types`, () => {
       const _query = new Query()
         .from({ issue: issuesCollection })
         .join({ activeUser: userNamesQuery }, ({ issue, activeUser }) =>
-          eq(issue.userId, activeUser.id)
+          eq(issue.userId, activeUser.id),
         )
         .select(({ issue, activeUser }) => ({
           issueId: issue.id,
@@ -246,7 +246,7 @@ describe(`Subquery Types`, () => {
       const _query = new Query()
         .from({ issue: issuesCollection })
         .join({ activeUser: activeUsers }, ({ issue, activeUser }) =>
-          eq(issue.userId, activeUser.id)
+          eq(issue.userId, activeUser.id),
         )
         .select(({ issue, activeUser }) => ({
           issueId: issue.id,
@@ -270,7 +270,7 @@ describe(`Subquery Types`, () => {
       const _query = new Query()
         .from({ issue: filteredIssues })
         .join({ user: usersCollection }, ({ issue, user }) =>
-          eq(issue.userId, user.id)
+          eq(issue.userId, user.id),
         )
         .select(({ issue, user }) => ({
           issueId: issue.id,
diff --git a/packages/db/tests/query/builder/where.test.ts b/packages/db/tests/query/builder/where.test.ts
index 7021cc790..e6aebb3af 100644
--- a/packages/db/tests/query/builder/where.test.ts
+++ b/packages/db/tests/query/builder/where.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, it } from "vitest"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
+import { describe, expect, it } from 'vitest'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
 import {
   and,
   eq,
@@ -12,7 +12,7 @@ import {
   lte,
   not,
   or,
-} from "../../../src/query/builder/functions.js"
+} from '../../../src/query/builder/functions.js'
 
 // Test schema
 interface Employee {
@@ -80,7 +80,7 @@ describe(`QueryBuilder.where`, () => {
     const andQuery = builder
       .from({ employees: employeesCollection })
       .where(({ employees }) =>
-        and(eq(employees.active, true), gt(employees.salary, 50000))
+        and(eq(employees.active, true), gt(employees.salary, 50000)),
       )
     expect((getQueryIR(andQuery).where as any)[0]?.name).toBe(`and`)
 
@@ -88,7 +88,7 @@ describe(`QueryBuilder.where`, () => {
     const orQuery = builder
       .from({ employees: employeesCollection })
       .where(({ employees }) =>
-        or(eq(employees.department_id, 1), eq(employees.department_id, 2))
+        or(eq(employees.department_id, 1), eq(employees.department_id, 2)),
       )
     expect((getQueryIR(orQuery).where as any)[0]?.name).toBe(`or`)
 
@@ -146,8 +146,8 @@ describe(`QueryBuilder.where`, () => {
       .where(({ employees }) =>
         and(
           eq(employees.active, true),
-          or(gt(employees.salary, 75000), eq(employees.department_id, 1))
-        )
+          or(gt(employees.salary, 75000), eq(employees.department_id, 1)),
+        ),
       )
 
     const builtQuery = getQueryIR(query)
diff --git a/packages/db/tests/query/compiler/basic.test.ts b/packages/db/tests/query/compiler/basic.test.ts
index 32c548d8e..66b7a1514 100644
--- a/packages/db/tests/query/compiler/basic.test.ts
+++ b/packages/db/tests/query/compiler/basic.test.ts
@@ -1,9 +1,9 @@
-import { describe, expect, test } from "vitest"
-import { D2, MultiSet, output } from "@tanstack/db-ivm"
-import { compileQuery } from "../../../src/query/compiler/index.js"
-import { CollectionRef, Func, PropRef, Value } from "../../../src/query/ir.js"
-import type { QueryIR } from "../../../src/query/ir.js"
-import type { CollectionImpl } from "../../../src/collection/index.js"
+import { describe, expect, test } from 'vitest'
+import { D2, MultiSet, output } from '@tanstack/db-ivm'
+import { compileQuery } from '../../../src/query/compiler/index.js'
+import { CollectionRef, Func, PropRef, Value } from '../../../src/query/ir.js'
+import type { QueryIR } from '../../../src/query/ir.js'
+import type { CollectionImpl } from '../../../src/collection/index.js'
 
 // Sample user type for tests
 type User = {
@@ -51,20 +51,20 @@ describe(`Query2 Compiler`, () => {
         {},
         new Set(),
         {},
-        () => {}
+        () => {},
       )
 
       const messages: Array<MultiSet<any>> = []
       pipeline.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
 
       input.sendData(
-        new MultiSet(sampleUsers.map((user) => [[user.id, user], 1]))
+        new MultiSet(sampleUsers.map((user) => [[user.id, user], 1])),
       )
 
       graph.run()
@@ -107,20 +107,20 @@ describe(`Query2 Compiler`, () => {
         {},
         new Set(),
         {},
-        () => {}
+        () => {},
       )
 
       const messages: Array<MultiSet<any>> = []
       pipeline.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
 
       input.sendData(
-        new MultiSet(sampleUsers.map((user) => [[user.id, user], 1]))
+        new MultiSet(sampleUsers.map((user) => [[user.id, user], 1])),
       )
 
       graph.run()
@@ -185,20 +185,20 @@ describe(`Query2 Compiler`, () => {
         {},
         new Set(),
         {},
-        () => {}
+        () => {},
       )
 
       const messages: Array<MultiSet<any>> = []
       pipeline.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
 
       input.sendData(
-        new MultiSet(sampleUsers.map((user) => [[user.id, user], 1]))
+        new MultiSet(sampleUsers.map((user) => [[user.id, user], 1])),
       )
 
       graph.run()
@@ -251,20 +251,20 @@ describe(`Query2 Compiler`, () => {
         {},
         new Set(),
         {},
-        () => {}
+        () => {},
       )
 
       const messages: Array<MultiSet<any>> = []
       pipeline.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
 
       input.sendData(
-        new MultiSet(sampleUsers.map((user) => [[user.id, user], 1]))
+        new MultiSet(sampleUsers.map((user) => [[user.id, user], 1])),
       )
 
       graph.run()
diff --git a/packages/db/tests/query/compiler/evaluators.test.ts b/packages/db/tests/query/compiler/evaluators.test.ts
index 64a867196..68e08d7ea 100644
--- a/packages/db/tests/query/compiler/evaluators.test.ts
+++ b/packages/db/tests/query/compiler/evaluators.test.ts
@@ -1,14 +1,14 @@
-import { describe, expect, it } from "vitest"
-import { compileExpression } from "../../../src/query/compiler/evaluators.js"
-import { Func, PropRef, Value } from "../../../src/query/ir.js"
-import type { NamespacedRow } from "../../../src/types.js"
+import { describe, expect, it } from 'vitest'
+import { compileExpression } from '../../../src/query/compiler/evaluators.js'
+import { Func, PropRef, Value } from '../../../src/query/ir.js'
+import type { NamespacedRow } from '../../../src/types.js'
 
 describe(`evaluators`, () => {
   describe(`compileExpression`, () => {
     it(`handles unknown expression type`, () => {
       const unknownExpr = { type: `unknown` } as any
       expect(() => compileExpression(unknownExpr)).toThrow(
-        `Unknown expression type: unknown`
+        `Unknown expression type: unknown`,
       )
     })
 
@@ -16,7 +16,7 @@ describe(`evaluators`, () => {
       it(`throws error for empty reference path`, () => {
         const emptyRef = new PropRef([])
         expect(() => compileExpression(emptyRef)).toThrow(
-          `Reference path cannot be empty`
+          `Reference path cannot be empty`,
         )
       })
 
@@ -75,7 +75,7 @@ describe(`evaluators`, () => {
       it(`throws error for unknown function`, () => {
         const unknownFunc = new Func(`unknownFunc`, [])
         expect(() => compileExpression(unknownFunc)).toThrow(
-          `Unknown function: unknownFunc`
+          `Unknown function: unknownFunc`,
         )
       })
 
@@ -506,6 +506,36 @@ describe(`evaluators`, () => {
             }
           })
 
+          it(`handles eq with Date objects (should compare by getTime(), not reference)`, () => {
+            // Create two Date objects with the same time value
+            // They are different object instances but represent the same moment
+            const date1 = new Date(`2024-01-15T10:30:45.123Z`)
+            const date2 = new Date(`2024-01-15T10:30:45.123Z`)
+
+            // Verify they are different object references
+            expect(date1).not.toBe(date2)
+            // But they have the same time value
+            expect(date1.getTime()).toBe(date2.getTime())
+
+            const func = new Func(`eq`, [new Value(date1), new Value(date2)])
+            const compiled = compileExpression(func)
+
+            // Should return true because they represent the same time
+            // Currently this fails because eq() does referential comparison
+            expect(compiled({})).toBe(true)
+          })
+
+          it(`handles eq with Date objects with different times`, () => {
+            const date1 = new Date(`2024-01-15T10:30:45.123Z`)
+            const date2 = new Date(`2024-01-15T10:30:45.124Z`) // 1ms later
+
+            const func = new Func(`eq`, [new Value(date1), new Value(date2)])
+            const compiled = compileExpression(func)
+
+            // Should return false because they represent different times
+            expect(compiled({})).toBe(false)
+          })
+
           it(`handles eq with Uint8Arrays created with length (repro case)`, () => {
             // Reproduction of user's issue: new Uint8Array(5) creates [0,0,0,0,0]
             const array1 = new Uint8Array(5) // Creates array of length 5, all zeros
diff --git a/packages/db/tests/query/compiler/group-by.test.ts b/packages/db/tests/query/compiler/group-by.test.ts
index 56ac3611d..c34282d44 100644
--- a/packages/db/tests/query/compiler/group-by.test.ts
+++ b/packages/db/tests/query/compiler/group-by.test.ts
@@ -1,11 +1,11 @@
-import { describe, expect, it } from "vitest"
-import { Aggregate, Func, PropRef, Value } from "../../../src/query/ir.js"
+import { describe, expect, it } from 'vitest'
+import { Aggregate, Func, PropRef, Value } from '../../../src/query/ir.js'
 
 // Import the validation function that we want to test directly
 // Since we can't easily mock the D2 streams, we'll test the validation logic separately
 function validateSelectAgainstGroupBy(
   groupByClause: Array<any>,
-  selectClause: any
+  selectClause: any,
 ): void {
   // This is the same validation logic from group-by.ts
   for (const [alias, expr] of Object.entries(selectClause)) {
@@ -16,12 +16,12 @@ function validateSelectAgainstGroupBy(
 
     // Non-aggregate expression must be in GROUP BY
     const groupIndex = groupByClause.findIndex((groupExpr) =>
-      expressionsEqual(expr, groupExpr)
+      expressionsEqual(expr, groupExpr),
     )
 
     if (groupIndex === -1) {
       throw new Error(
-        `Non-aggregate expression '${alias}' in SELECT must also appear in GROUP BY clause`
+        `Non-aggregate expression '${alias}' in SELECT must also appear in GROUP BY clause`,
       )
     }
   }
@@ -44,7 +44,7 @@ function expressionsEqual(expr1: any, expr2: any): boolean {
       expr1.name === expr2.name &&
       expr1.args.length === expr2.args.length &&
       expr1.args.every((arg: any, i: number) =>
-        expressionsEqual(arg, expr2.args[i])
+        expressionsEqual(arg, expr2.args[i]),
       )
     )
   }
@@ -65,7 +65,7 @@ describe(`group-by compiler`, () => {
         expect(() => {
           validateSelectAgainstGroupBy(groupByClause, selectClause)
         }).toThrow(
-          `Non-aggregate expression 'invalidField' in SELECT must also appear in GROUP BY clause`
+          `Non-aggregate expression 'invalidField' in SELECT must also appear in GROUP BY clause`,
         )
       })
 
diff --git a/packages/db/tests/query/compiler/select.test.ts b/packages/db/tests/query/compiler/select.test.ts
index ab60c7d2a..820209b09 100644
--- a/packages/db/tests/query/compiler/select.test.ts
+++ b/packages/db/tests/query/compiler/select.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, it } from "vitest"
-import { processArgument } from "../../../src/query/compiler/select.js"
-import { Aggregate, Func, PropRef, Value } from "../../../src/query/ir.js"
+import { describe, expect, it } from 'vitest'
+import { processArgument } from '../../../src/query/compiler/select.js'
+import { Aggregate, Func, PropRef, Value } from '../../../src/query/ir.js'
 
 describe(`select compiler`, () => {
   // Note: Most of the select compilation logic is tested through the full integration
@@ -39,7 +39,7 @@ describe(`select compiler`, () => {
       expect(() => {
         processArgument(arg, namespacedRow)
       }).toThrow(
-        `Aggregate expressions are not supported in this context. Use GROUP BY clause for aggregates.`
+        `Aggregate expressions are not supported in this context. Use GROUP BY clause for aggregates.`,
       )
     })
 
diff --git a/packages/db/tests/query/compiler/subqueries.test.ts b/packages/db/tests/query/compiler/subqueries.test.ts
index f06e7b7f0..4b41eec18 100644
--- a/packages/db/tests/query/compiler/subqueries.test.ts
+++ b/packages/db/tests/query/compiler/subqueries.test.ts
@@ -1,10 +1,10 @@
-import { describe, expect, it } from "vitest"
-import { D2, MultiSet, output } from "@tanstack/db-ivm"
-import { Query, getQueryIR } from "../../../src/query/builder/index.js"
-import { compileQuery } from "../../../src/query/compiler/index.js"
-import { CollectionImpl } from "../../../src/collection/index.js"
-import { avg, count, eq } from "../../../src/query/builder/functions.js"
-import type { CollectionSubscription } from "../../../src/collection/subscription.js"
+import { describe, expect, it } from 'vitest'
+import { D2, MultiSet, output } from '@tanstack/db-ivm'
+import { Query, getQueryIR } from '../../../src/query/builder/index.js'
+import { compileQuery } from '../../../src/query/compiler/index.js'
+import { CollectionImpl } from '../../../src/collection/index.js'
+import { avg, count, eq } from '../../../src/query/builder/functions.js'
+import type { CollectionSubscription } from '../../../src/collection/subscription.js'
 
 // Test schema types
 interface Issue {
@@ -105,8 +105,8 @@ const sendIssueData = (input: any, issues: Array<Issue>) => {
       issues.map((issue) => [
         [issue.id, issue as unknown as Record<string, unknown>],
         1,
-      ])
-    )
+      ]),
+    ),
   )
 }
 
@@ -116,8 +116,8 @@ const sendUserData = (input: any, users: Array<User>) => {
       users.map((user) => [
         [user.id, user as unknown as Record<string, unknown>],
         1,
-      ])
-    )
+      ]),
+    ),
   )
 }
 
@@ -178,14 +178,14 @@ describe(`Query2 Subqueries`, () => {
         {},
         new Set(),
         {},
-        () => {}
+        () => {},
       )
 
       const messages: Array<MultiSet<any>> = []
       pipeline.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -227,7 +227,7 @@ describe(`Query2 Subqueries`, () => {
       const query = new Query()
         .from({ issue: issuesCollection })
         .join({ activeUser: activeUsersQuery }, ({ issue, activeUser }) =>
-          eq(issue.userId, activeUser.id)
+          eq(issue.userId, activeUser.id),
         )
         .select(({ issue, activeUser }) => ({
           issueId: issue.id,
@@ -262,7 +262,7 @@ describe(`Query2 Subqueries`, () => {
       const query = new Query()
         .from({ issue: issuesCollection })
         .join({ activeUser: activeUsersQuery }, ({ issue, activeUser }) =>
-          eq(issue.userId, activeUser.id)
+          eq(issue.userId, activeUser.id),
         )
         .select(({ issue, activeUser }) => ({
           issueId: issue.id,
@@ -297,7 +297,7 @@ describe(`Query2 Subqueries`, () => {
         { issue: dummyCallbacks, user: dummyCallbacks },
         lazySources,
         {},
-        () => {}
+        () => {},
       )
       const { pipeline } = compilation
 
@@ -310,7 +310,7 @@ describe(`Query2 Subqueries`, () => {
       pipeline.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
@@ -358,7 +358,7 @@ describe(`Query2 Subqueries`, () => {
       const outerQuery = new Query()
         .from({ issue: issuesCollection })
         .join({ userInfo: middleQuery }, ({ issue, userInfo }) =>
-          eq(issue.userId, userInfo.id)
+          eq(issue.userId, userInfo.id),
         )
         .select(({ issue, userInfo }) => ({
           issueId: issue.id,
@@ -398,7 +398,7 @@ describe(`Query2 Subqueries`, () => {
         { issue: dummyCallbacks, user: dummyCallbacks },
         lazyCollections,
         {},
-        () => {}
+        () => {},
       )
 
       // Verify that alias metadata includes aliases from the query
@@ -443,14 +443,14 @@ describe(`Query2 Subqueries`, () => {
         {},
         new Set(),
         {},
-        () => {}
+        () => {},
       )
 
       const messages: Array<MultiSet<any>> = []
       pipeline.pipe(
         output((message) => {
           messages.push(message)
-        })
+        }),
       )
 
       graph.finalize()
diff --git a/packages/db/tests/query/compiler/subquery-caching.test.ts b/packages/db/tests/query/compiler/subquery-caching.test.ts
index 5360ce55c..769cd7e7a 100644
--- a/packages/db/tests/query/compiler/subquery-caching.test.ts
+++ b/packages/db/tests/query/compiler/subquery-caching.test.ts
@@ -1,9 +1,9 @@
-import { describe, expect, it } from "vitest"
-import { D2 } from "@tanstack/db-ivm"
-import { compileQuery } from "../../../src/query/compiler/index.js"
-import { CollectionRef, PropRef, QueryRef } from "../../../src/query/ir.js"
-import type { QueryIR } from "../../../src/query/ir.js"
-import type { CollectionImpl } from "../../../src/collection/index.js"
+import { describe, expect, it } from 'vitest'
+import { D2 } from '@tanstack/db-ivm'
+import { compileQuery } from '../../../src/query/compiler/index.js'
+import { CollectionRef, PropRef, QueryRef } from '../../../src/query/ir.js'
+import type { QueryIR } from '../../../src/query/ir.js'
+import type { CollectionImpl } from '../../../src/collection/index.js'
 
 // Helper to create a minimal mock collection for compiler tests
 function createMockCollection(id: string): CollectionImpl {
@@ -70,7 +70,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       cache1,
-      queryMapping1
+      queryMapping1,
     )
 
     // Verify subquery is in first cache
@@ -90,7 +90,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       cache2,
-      queryMapping2
+      queryMapping2,
     )
 
     // Results should be different objects (different compilation)
@@ -111,7 +111,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       cache2,
-      new WeakMap()
+      new WeakMap(),
     )
 
     // Result should be the same object as #2 (reused from cache)
@@ -132,7 +132,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       cache2,
-      new WeakMap()
+      new WeakMap(),
     )
     const subqueryResult2 = compileQuery(
       subquery,
@@ -144,7 +144,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       cache2,
-      new WeakMap()
+      new WeakMap(),
     )
 
     // Both subquery compilations should return the same cached result
@@ -180,7 +180,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       sharedCache,
-      new WeakMap()
+      new WeakMap(),
     )
     expect(sharedCache.has(subquery)).toBe(true)
 
@@ -195,7 +195,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       sharedCache,
-      new WeakMap()
+      new WeakMap(),
     )
     expect(result1).toBe(result2) // Should be the exact same object reference
   })
@@ -240,7 +240,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       sharedCache,
-      new WeakMap()
+      new WeakMap(),
     )
     const result2 = compileQuery(
       subquery,
@@ -252,7 +252,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       sharedCache,
-      new WeakMap()
+      new WeakMap(),
     )
 
     // Should have different results since they are different objects
@@ -315,7 +315,7 @@ describe(`Subquery Caching`, () => {
       {},
       () => {},
       sharedCache,
-      new WeakMap()
+      new WeakMap(),
     )
     expect(result).toBeDefined()
 
diff --git a/packages/db/tests/query/composables.test.ts b/packages/db/tests/query/composables.test.ts
index a6bd43d10..e5744dde6 100644
--- a/packages/db/tests/query/composables.test.ts
+++ b/packages/db/tests/query/composables.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, test } from "vitest"
+import { beforeEach, describe, expect, test } from 'vitest'
 import {
   Query,
   and,
@@ -9,10 +9,10 @@ import {
   lt,
   lte,
   upper,
-} from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
-import type { Ref } from "../../src/query/index.js"
+} from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import type { Ref } from '../../src/query/index.js'
 
 // Sample user type for tests
 type User = {
@@ -90,7 +90,7 @@ function createUsersCollection() {
       id: `test-users`,
       getKey: (user) => user.id,
       initialData: sampleUsers,
-    })
+    }),
   )
 }
 
@@ -100,7 +100,7 @@ function createPostsCollection() {
       id: `test-posts`,
       getKey: (post) => post.id,
       initialData: samplePosts,
-    })
+    }),
   )
 }
 
@@ -139,10 +139,10 @@ describe(`Composables`, () => {
       // Should return Bob (19) and Dave (22) - both adult, active, and young
       expect(results).toHaveLength(2)
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Bob`, `Dave`])
+        expect.arrayContaining([`Bob`, `Dave`]),
       )
       expect(results.every((u) => u.age > 18 && u.age < 25 && u.active)).toBe(
-        true
+        true,
       )
     })
 
@@ -224,7 +224,7 @@ describe(`Composables`, () => {
 
       expect(results).toHaveLength(3) // Alice (25), Charlie (30), Dave (22)
       expect(results.map((u) => u.displayName)).toEqual(
-        expect.arrayContaining([`ALICE`, `CHARLIE`, `DAVE`])
+        expect.arrayContaining([`ALICE`, `CHARLIE`, `DAVE`]),
       )
 
       // Test that we can create a new query that combines the components differently
@@ -272,7 +272,7 @@ describe(`Composables`, () => {
             .join(
               { post: postsCollection },
               ({ user, post }) => eq(user.id, post.authorId),
-              `inner`
+              `inner`,
             )
             .where(userIsActive)
             .where(postIsPublished)
@@ -319,8 +319,8 @@ describe(`Composables`, () => {
               and(
                 userIsActive({ user }),
                 userIsAdult({ user }),
-                userIsYoung({ user })
-              )
+                userIsYoung({ user }),
+              ),
             ),
         startSync: true,
       })
@@ -377,7 +377,7 @@ describe(`Composables`, () => {
       expect(results).toHaveLength(3)
       expect(results.every((u) => u.category === `junior`)).toBe(true)
       expect(results.map((u) => u.userName)).toEqual(
-        expect.arrayContaining([`ALICE`, `BOB`, `DAVE`])
+        expect.arrayContaining([`ALICE`, `BOB`, `DAVE`]),
       )
     })
 
@@ -426,7 +426,7 @@ describe(`Composables`, () => {
             .join(
               { p: postsCollection },
               ({ u, p }) => eq(u.id, p.authorId),
-              `inner`
+              `inner`,
             )
             .where(joinedUserPostPredicate)
             .select(joinedSelect),
@@ -477,7 +477,7 @@ describe(`Composables`, () => {
       expect(results.every((u) => typeof u.name === `string`)).toBe(true)
       expect(results.every((u) => typeof u.email === `string`)).toBe(true)
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Bob`, `Dave`])
+        expect.arrayContaining([`Alice`, `Bob`, `Dave`]),
       )
 
       // Insert a new active user
diff --git a/packages/db/tests/query/distinct.test.ts b/packages/db/tests/query/distinct.test.ts
index 0d3b480fc..1979b03e4 100644
--- a/packages/db/tests/query/distinct.test.ts
+++ b/packages/db/tests/query/distinct.test.ts
@@ -1,9 +1,9 @@
-import { beforeEach, describe, expect, test } from "vitest"
-import { concat, createLiveQueryCollection } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
-import { DistinctRequiresSelectError } from "../../src/errors"
-import { count, eq, gte, not } from "../../src/query/builder/functions.js"
+import { beforeEach, describe, expect, test } from 'vitest'
+import { concat, createLiveQueryCollection } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import { DistinctRequiresSelectError } from '../../src/errors'
+import { count, eq, gte, not } from '../../src/query/builder/functions.js'
 
 // Sample data types for comprehensive DISTINCT testing
 type User = {
@@ -117,7 +117,7 @@ function createUsersCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (user) => user.id,
       initialData: sampleUsers,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -143,7 +143,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctCountries.size).toBe(3) // USA, Canada, UK
 
         const countries = Array.from(distinctCountries.values()).map(
-          (user) => user.country
+          (user) => user.country,
         )
         expect(countries).toContain(`USA`)
         expect(countries).toContain(`Canada`)
@@ -172,7 +172,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctRoleSalary.size).toBe(4)
 
         const combinations = Array.from(distinctRoleSalary.values()).map(
-          (user) => `${user.role}-${user.salary}`
+          (user) => `${user.role}-${user.salary}`,
         )
         expect(combinations).toContain(`Developer-75000`)
         expect(combinations).toContain(`Developer-80000`)
@@ -186,7 +186,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
           createLiveQueryCollection({
             startSync: true,
             query: (q) => q.from({ users: usersCollection }).distinct(),
-          })
+          }),
         ).toThrow(DistinctRequiresSelectError)
       })
     })
@@ -218,7 +218,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctSalaryRanges.size).toBe(3) // High, Medium, Low
 
         const ranges = Array.from(distinctSalaryRanges.values()).map(
-          (user) => user.salary_range
+          (user) => user.salary_range,
         )
         expect(ranges).toContain(`High`)
         expect(ranges).toContain(`Medium`)
@@ -240,7 +240,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctFullNames.size).toBe(3) // All unique combinations of department and role
 
         const fullNames = Array.from(distinctFullNames.values()).map(
-          (user) => user.full_name
+          (user) => user.full_name,
         )
 
         expect(fullNames).toContain(`Engineering - Developer`)
@@ -309,7 +309,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctDepartments.size).toBe(4)
 
         const departments = Array.from(distinctDepartments.values()).map(
-          (user) => user.department
+          (user) => user.department,
         )
         expect(departments).toContain(`HR`)
       })
@@ -340,7 +340,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctCountries.size).toBe(4)
 
         const countries = Array.from(distinctCountries.values()).map(
-          (user) => user.country
+          (user) => user.country,
         )
         expect(countries).toContain(`Germany`)
 
@@ -359,7 +359,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctCountries.size).toBe(3)
 
         const finalCountries = Array.from(distinctCountries.values()).map(
-          (user) => user.country
+          (user) => user.country,
         )
         expect(finalCountries).not.toContain(`Germany`)
         expect(finalCountries).toContain(`Canada`)
@@ -391,7 +391,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctCities.size).toBe(4)
 
         const cities = Array.from(distinctCities.values()).map(
-          (user) => user.city
+          (user) => user.city,
         )
         expect(cities).not.toContain(`New York`)
       })
@@ -434,7 +434,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctDepartments.size).toBe(4) // Engineering, Marketing, Sales, null
 
         const departments = Array.from(distinctDepartments.values()).map(
-          (user) => user.department
+          (user) => user.department,
         )
         expect(departments).toContain(null)
       })
@@ -445,7 +445,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
             id: `empty-users`,
             getKey: (user) => user.id,
             initialData: [],
-          })
+          }),
         )
 
         const emptyDistinct = createLiveQueryCollection({
@@ -494,7 +494,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctActiveStatus.size).toBe(2) // true, false
 
         const statuses = Array.from(distinctActiveStatus.values()).map(
-          (user) => user.active
+          (user) => user.active,
         )
         expect(statuses).toContain(true)
         expect(statuses).toContain(false)
@@ -517,7 +517,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         // However, in this case each role has a salary range and those salary ranges don't overlap so it is deterministic
         // So we expect the results to be:  manager, developer, representative
         const distinctOrderedRoles = distinctOrderedData.toArray.map(
-          (r) => r.role
+          (r) => r.role,
         )
         expect(distinctOrderedRoles).toEqual([
           `Manager`,
@@ -541,7 +541,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctComputed.size).toBe(2)
 
         const locations = Array.from(distinctComputed.values()).map(
-          (user) => user.salary_tier
+          (user) => user.salary_tier,
         )
         expect(locations).toContain(`Senior`)
         expect(locations).toContain(`Junior`)
@@ -580,7 +580,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
 
         // Check that counts are correct
         const engineeringGroup = departments.find(
-          (d) => d.department === `Engineering`
+          (d) => d.department === `Engineering`,
         )
         expect(engineeringGroup?.user_count).toBe(5) // John, Jane, Alice, Diana, Frank
       })
@@ -599,7 +599,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctFilteredUsers.size).toBe(2)
 
         const countries = Array.from(distinctFilteredUsers.values()).map(
-          (u) => u.country
+          (u) => u.country,
         )
         expect(countries).toContain(`Canada`)
         expect(countries).toContain(`UK`)
@@ -619,7 +619,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(distinctOrderedCountries.size).toBe(3)
 
         const orderedCountries = distinctOrderedCountries.toArray.map(
-          (u) => u.country
+          (u) => u.country,
         )
         expect(orderedCountries).toEqual([`Canada`, `UK`, `USA`])
       })
@@ -666,7 +666,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
         expect(groupedDistinctSalaries.size).toBe(3)
 
         const counts = Array.from(groupedDistinctSalaries.values()).map(
-          (result) => result.count
+          (result) => result.count,
         )
 
         // All average salaries should be unique (distinct)
@@ -688,7 +688,7 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
             getKey: (dept) => dept.id,
             initialData: departmentsData,
             autoIndex,
-          })
+          }),
         )
 
         const distinctJoinedData = createLiveQueryCollection({
@@ -698,7 +698,8 @@ function createDistinctTests(autoIndex: `off` | `eager`): void {
               .from({ users: usersCollection })
               .join(
                 { departments: departmentsCollection },
-                ({ users, departments }) => eq(users.department, departments.id)
+                ({ users, departments }) =>
+                  eq(users.department, departments.id),
               )
               .where(({ users }) => eq(users.active, true))
               .select(({ departments }) => ({
diff --git a/packages/db/tests/query/expression-helpers.test.ts b/packages/db/tests/query/expression-helpers.test.ts
index 33fcbbcac..af5c06d1a 100644
--- a/packages/db/tests/query/expression-helpers.test.ts
+++ b/packages/db/tests/query/expression-helpers.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest"
+import { describe, expect, it } from 'vitest'
 import {
   extractFieldPath,
   extractSimpleComparisons,
@@ -7,9 +7,9 @@ import {
   parseOrderByExpression,
   parseWhereExpression,
   walkExpression,
-} from "../../src/query/expression-helpers"
-import { Func, PropRef, Value } from "../../src/query/ir.js"
-import type { IR } from "../../src/index.js"
+} from '../../src/query/expression-helpers'
+import { Func, PropRef, Value } from '../../src/query/ir.js'
+import type { IR } from '../../src/index.js'
 
 type OrderBy = IR.OrderBy
 
@@ -168,7 +168,7 @@ describe(`Expression Helpers`, () => {
           },
         })
       }).toThrow(
-        `No handler provided for operator: customOp. Available handlers: eq`
+        `No handler provided for operator: customOp. Available handlers: eq`,
       )
     })
 
@@ -324,7 +324,7 @@ describe(`Expression Helpers`, () => {
       ]
 
       expect(() => parseOrderByExpression(orderBy)).toThrow(
-        `ORDER BY expression must be a field reference, got: val`
+        `ORDER BY expression must be a field reference, got: val`,
       )
     })
   })
@@ -412,7 +412,7 @@ describe(`Expression Helpers`, () => {
 
       // OR is not supported by extractSimpleComparisons, so it throws
       expect(() => extractSimpleComparisons(expr)).toThrow(
-        `extractSimpleComparisons does not support 'or' operator`
+        `extractSimpleComparisons does not support 'or' operator`,
       )
     })
 
@@ -506,7 +506,7 @@ describe(`Expression Helpers`, () => {
       ])
 
       expect(() => extractSimpleComparisons(expr)).toThrow(
-        `extractSimpleComparisons does not support 'not(and)'`
+        `extractSimpleComparisons does not support 'not(and)'`,
       )
     })
   })
diff --git a/packages/db/tests/query/findone-joins.test-d.ts b/packages/db/tests/query/findone-joins.test-d.ts
index 7d76a686f..849a7811d 100644
--- a/packages/db/tests/query/findone-joins.test-d.ts
+++ b/packages/db/tests/query/findone-joins.test-d.ts
@@ -1,7 +1,7 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { createLiveQueryCollection, eq } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { createLiveQueryCollection, eq } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 type Todo = {
   id: string
@@ -20,7 +20,7 @@ const todoCollection = createCollection(
     id: `test-todos-findone-joins`,
     getKey: (todo) => todo.id,
     initialData: [],
-  })
+  }),
 )
 
 const todoOptionsCollection = createCollection(
@@ -28,7 +28,7 @@ const todoOptionsCollection = createCollection(
     id: `test-todo-options-findone-joins`,
     getKey: (opt) => opt.id,
     initialData: [],
-  })
+  }),
 )
 
 describe(`findOne() with joins`, () => {
@@ -41,7 +41,7 @@ describe(`findOne() with joins`, () => {
           .orderBy(({ todo }) => todo.order, `asc`)
           .leftJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           )
           .findOne(),
     })
@@ -62,7 +62,7 @@ describe(`findOne() with joins`, () => {
           .where(({ todo }) => eq(todo.id, `test-id`))
           .innerJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           )
           .findOne(),
     })
@@ -84,7 +84,7 @@ describe(`findOne() with joins`, () => {
           .findOne()
           .leftJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           ),
     })
 
@@ -104,7 +104,7 @@ describe(`findOne() with joins`, () => {
           .where(({ todo }) => eq(todo.id, `test-id`))
           .rightJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           )
           .findOne(),
     })
@@ -125,7 +125,7 @@ describe(`findOne() with joins`, () => {
           .where(({ todo }) => eq(todo.id, `test-id`))
           .fullJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           )
           .findOne(),
     })
@@ -150,7 +150,7 @@ describe(`findOne() with joins`, () => {
         id: `test-todo-tags-findone-multi`,
         getKey: (tag) => tag.id,
         initialData: [],
-      })
+      }),
     )
 
     const query = createLiveQueryCollection({
@@ -159,10 +159,10 @@ describe(`findOne() with joins`, () => {
           .from({ todo: todoCollection })
           .leftJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           )
           .innerJoin({ tag: todoTagsCollection }, ({ todo, tag }) =>
-            eq(todo.id, tag.todoId)
+            eq(todo.id, tag.todoId),
           )
           .findOne(),
     })
@@ -183,7 +183,7 @@ describe(`findOne() with joins`, () => {
           .from({ todo: todoCollection })
           .leftJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           )
           .select(({ todo, todoOptions }) => ({
             todoText: todo.text,
@@ -207,7 +207,7 @@ describe(`findOne() with joins`, () => {
           .from({ todo: todoCollection })
           .leftJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           )
           .findOne()
           .select(({ todo, todoOptions }) => ({
@@ -233,7 +233,7 @@ describe(`findOne() with joins`, () => {
           .orderBy(({ todo }) => todo.order, `asc`)
           .leftJoin(
             { todoOptions: todoOptionsCollection },
-            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId)
+            ({ todo, todoOptions }) => eq(todo.id, todoOptions.todoId),
           )
           .limit(1),
     })
diff --git a/packages/db/tests/query/functional-variants.test-d.ts b/packages/db/tests/query/functional-variants.test-d.ts
index 51e6628d8..61b571c5f 100644
--- a/packages/db/tests/query/functional-variants.test-d.ts
+++ b/packages/db/tests/query/functional-variants.test-d.ts
@@ -1,12 +1,12 @@
-import { describe, expectTypeOf, test } from "vitest"
+import { describe, expectTypeOf, test } from 'vitest'
 import {
   count,
   createLiveQueryCollection,
   eq,
   gt,
-} from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+} from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample user type for tests
 type User = {
@@ -57,7 +57,7 @@ function createUsersCollection() {
       id: `test-users`,
       getKey: (user) => user.id,
       initialData: sampleUsers,
-    })
+    }),
   )
 }
 
@@ -67,7 +67,7 @@ function createDepartmentsCollection() {
       id: `test-departments`,
       getKey: (dept) => dept.id,
       initialData: sampleDepartments,
-    })
+    }),
   )
 }
 
@@ -204,7 +204,7 @@ describe(`Functional Variants Types`, () => {
         q
           .from({ user: usersCollection })
           .join({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           )
           .fn.select((row) => ({
             employeeInfo: `${row.user.name} works in ${row.dept?.name || `Unknown`}`,
@@ -237,11 +237,11 @@ describe(`Functional Variants Types`, () => {
         q
           .from({ user: usersCollection })
           .join({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           )
           .fn.where(
             (row) =>
-              row.user.active && (row.dept?.name === `Engineering` || false)
+              row.user.active && (row.dept?.name === `Engineering` || false),
           ),
     })
 
@@ -261,7 +261,7 @@ describe(`Functional Variants Types`, () => {
         q
           .from({ user: usersCollection })
           .join({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           )
           .fn.where((row) => row.user.active)
           .fn.where((row) => row.user.salary > 60000)
@@ -410,7 +410,7 @@ describe(`Functional Variants Types`, () => {
         .fn.select((row) => ({
           name: row.user.name,
           isActive: row.user.active,
-        }))
+        })),
     )
 
     const results = liveCollection.toArray
@@ -448,7 +448,7 @@ describe(`Functional Variants Types`, () => {
         q
           .from({ user: usersCollection })
           .join({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           )
           .groupBy(({ dept }) => dept?.name)
           .fn.having((row) => row.dept?.name !== `HR`)
diff --git a/packages/db/tests/query/functional-variants.test.ts b/packages/db/tests/query/functional-variants.test.ts
index 2c12e020e..5878d2490 100644
--- a/packages/db/tests/query/functional-variants.test.ts
+++ b/packages/db/tests/query/functional-variants.test.ts
@@ -1,12 +1,12 @@
-import { beforeEach, describe, expect, test } from "vitest"
+import { beforeEach, describe, expect, test } from 'vitest'
 import {
   count,
   createLiveQueryCollection,
   eq,
   gt,
-} from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+} from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample user type for tests
 type User = {
@@ -85,7 +85,7 @@ function createUsersCollection() {
       id: `test-users`,
       getKey: (user) => user.id,
       initialData: sampleUsers,
-    })
+    }),
   )
 }
 
@@ -95,7 +95,7 @@ function createDepartmentsCollection() {
       id: `test-departments`,
       getKey: (dept) => dept.id,
       initialData: sampleDepartments,
-    })
+    }),
   )
 }
 
@@ -190,7 +190,7 @@ describe(`Functional Variants Query`, () => {
           q
             .from({ user: usersCollection })
             .join({ dept: departmentsCollection }, ({ user, dept }) =>
-              eq(user.department_id, dept.id)
+              eq(user.department_id, dept.id),
             )
             .fn.select((row) => ({
               employeeInfo: `${row.user.name} works in ${row.dept?.name || `Unknown`}`,
@@ -241,7 +241,7 @@ describe(`Functional Variants Query`, () => {
 
       expect(results).toHaveLength(2) // Alice (25, active) and Eve (28, active)
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Eve`])
+        expect.arrayContaining([`Alice`, `Eve`]),
       )
 
       // Insert user that meets criteria
@@ -310,7 +310,7 @@ describe(`Functional Variants Query`, () => {
       // Should only include: Alice (active, 75k, dept 1), Dave (active, 65k, dept 2)
       expect(results).toHaveLength(2)
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Dave`])
+        expect.arrayContaining([`Alice`, `Dave`]),
       )
 
       // All results should meet all criteria
@@ -337,7 +337,7 @@ describe(`Functional Variants Query`, () => {
       // Should include: Alice (25, active, 75k), Dave (22, active, 65k)
       expect(results).toHaveLength(2)
       expect(results.map((u) => u.name)).toEqual(
-        expect.arrayContaining([`Alice`, `Dave`])
+        expect.arrayContaining([`Alice`, `Dave`]),
       )
 
       results.forEach((user) => {
@@ -494,7 +494,7 @@ describe(`Functional Variants Query`, () => {
           q
             .from({ user: usersCollection })
             .join({ dept: departmentsCollection }, ({ user, dept }) =>
-              eq(user.department_id, dept.id)
+              eq(user.department_id, dept.id),
             )
             .fn.where((row) => row.user.active)
             .fn.where((row) => row.user.salary > 60000)
diff --git a/packages/db/tests/query/group-by.test-d.ts b/packages/db/tests/query/group-by.test-d.ts
index 4d7aac0c9..2f6a4c8c3 100644
--- a/packages/db/tests/query/group-by.test-d.ts
+++ b/packages/db/tests/query/group-by.test-d.ts
@@ -1,7 +1,7 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { createLiveQueryCollection } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { createLiveQueryCollection } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 import {
   and,
   avg,
@@ -14,7 +14,7 @@ import {
   min,
   or,
   sum,
-} from "../../src/query/builder/functions.js"
+} from '../../src/query/builder/functions.js'
 
 // Sample data types for comprehensive GROUP BY testing
 type Order = {
@@ -64,7 +64,7 @@ function createOrdersCollection() {
       id: `test-orders`,
       getKey: (order) => order.id,
       initialData: sampleOrders,
-    })
+    }),
   )
 }
 
@@ -300,7 +300,7 @@ describe(`Query GROUP BY Types`, () => {
             avg_amount: avg(orders.amount),
           }))
           .having(({ orders }) =>
-            and(gt(count(orders.id), 1), gte(sum(orders.amount), 450))
+            and(gt(count(orders.id), 1), gte(sum(orders.amount), 450)),
           ),
     })
 
@@ -329,7 +329,7 @@ describe(`Query GROUP BY Types`, () => {
             min_amount: min(orders.amount),
           }))
           .having(({ orders }) =>
-            or(gt(count(orders.id), 2), lt(min(orders.amount), 100))
+            or(gt(count(orders.id), 2), lt(min(orders.amount), 100)),
           ),
     })
 
diff --git a/packages/db/tests/query/group-by.test.ts b/packages/db/tests/query/group-by.test.ts
index aec23a9f8..e21f7be2c 100644
--- a/packages/db/tests/query/group-by.test.ts
+++ b/packages/db/tests/query/group-by.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, test } from "vitest"
-import { createLiveQueryCollection } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { beforeEach, describe, expect, test } from 'vitest'
+import { createLiveQueryCollection } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 import {
   and,
   avg,
@@ -16,7 +16,7 @@ import {
   not,
   or,
   sum,
-} from "../../src/query/builder/functions.js"
+} from '../../src/query/builder/functions.js'
 
 // Sample data types for comprehensive GROUP BY testing
 type Order = {
@@ -215,7 +215,7 @@ function createOrdersCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (order) => order.id,
       initialData: sampleOrders,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -259,10 +259,10 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
         expect(customer1?.min_amount).toBe(100)
         expect(customer1?.max_amount).toBe(400)
         expect(customer1?.min_date.toISOString()).toBe(
-          new Date(`2023-01-01`).toISOString()
+          new Date(`2023-01-01`).toISOString(),
         )
         expect(customer1?.max_date.toISOString()).toBe(
-          new Date(`2023-03-01`).toISOString()
+          new Date(`2023-03-01`).toISOString(),
         )
 
         // Customer 2: orders 3, 4 (amounts: 150, 300)
@@ -275,10 +275,10 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
         expect(customer2?.min_amount).toBe(150)
         expect(customer2?.max_amount).toBe(300)
         expect(customer2?.min_date.toISOString()).toBe(
-          new Date(`2023-01-20`).toISOString()
+          new Date(`2023-01-20`).toISOString(),
         )
         expect(customer2?.max_date.toISOString()).toBe(
-          new Date(`2023-02-01`).toISOString()
+          new Date(`2023-02-01`).toISOString(),
         )
 
         // Customer 3: orders 5, 6 (amounts: 250, 75)
@@ -291,10 +291,10 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
         expect(customer3?.min_amount).toBe(75)
         expect(customer3?.max_amount).toBe(250)
         expect(customer3?.min_date.toISOString()).toBe(
-          new Date(`2023-02-10`).toISOString()
+          new Date(`2023-02-10`).toISOString(),
         )
         expect(customer3?.max_date.toISOString()).toBe(
-          new Date(`2023-02-15`).toISOString()
+          new Date(`2023-02-15`).toISOString(),
         )
       })
 
@@ -484,7 +484,7 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
 
         // Completed electronics: orders 1, 2, 4
         const completedElectronics = statusCategorySummary.get(
-          `["completed","electronics"]`
+          `["completed","electronics"]`,
         )
         expect(completedElectronics?.status).toBe(`completed`)
         expect(completedElectronics?.product_category).toBe(`electronics`)
@@ -542,9 +542,9 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
                   gt(orders.amount, 150),
                   or(
                     eq(orders.status, `completed`),
-                    eq(orders.status, `pending`)
-                  )
-                )
+                    eq(orders.status, `pending`),
+                  ),
+                ),
               )
               .groupBy(({ orders }) => orders.product_category)
               .select(({ orders }) => ({
@@ -669,7 +669,7 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
                 avg_amount: avg(orders.amount),
               }))
               .having(({ orders }) =>
-                and(gt(count(orders.id), 1), gte(sum(orders.amount), 450))
+                and(gt(count(orders.id), 1), gte(sum(orders.amount), 450)),
               ),
         })
 
@@ -699,7 +699,7 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
                 min_amount: min(orders.amount),
               }))
               .having(({ orders }) =>
-                or(gt(count(orders.id), 2), lt(min(orders.amount), 100))
+                or(gt(count(orders.id), 2), lt(min(orders.amount), 100)),
               ),
         })
 
@@ -761,8 +761,8 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
                 and(
                   gte(min(orders.amount), 75),
                   gte(max(orders.amount), 300),
-                  gte(max(orders.date), new Date(`2020-09-17`))
-                )
+                  gte(max(orders.date), new Date(`2020-09-17`)),
+                ),
               ),
         })
 
@@ -1032,7 +1032,7 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
             id: `empty-orders`,
             getKey: (order) => order.id,
             initialData: [],
-          })
+          }),
         )
 
         const emptyGroupBy = createLiveQueryCollection({
@@ -1218,8 +1218,8 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
               .where(({ orders }) =>
                 and(
                   not(isUndefined(orders.customer)),
-                  not(isUndefined(orders.shipping))
-                )
+                  not(isUndefined(orders.shipping)),
+                ),
               )
               .groupBy(({ orders }) => orders.customer?.tier)
               .groupBy(({ orders }) => orders.shipping?.method)
@@ -1236,14 +1236,14 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
 
         // Should have groups for each tier-method combination
         const goldExpress = results.find(
-          (r) => r.tier === `gold` && r.method === `express`
+          (r) => r.tier === `gold` && r.method === `express`,
         )
         expect(goldExpress).toBeDefined()
         expect(goldExpress?.order_count).toBe(1)
         expect(goldExpress?.total_amount).toBe(100)
 
         const goldStandard = results.find(
-          (r) => r.tier === `gold` && r.method === `standard`
+          (r) => r.tier === `gold` && r.method === `standard`,
         )
         expect(goldStandard).toBeDefined()
         expect(goldStandard?.order_count).toBe(1)
@@ -1257,7 +1257,7 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
             q
               .from({ orders: ordersCollection })
               .where(({ orders }) =>
-                not(isUndefined(orders.customer?.preferences))
+                not(isUndefined(orders.customer?.preferences)),
               )
               .groupBy(({ orders }) => orders.customer?.preferences.newsletter)
               .select(({ orders }) => ({
@@ -1272,14 +1272,14 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
         expect(results).toHaveLength(2) // true and false
 
         const subscribedUsers = results.find(
-          (r) => r.newsletter_subscribed === true
+          (r) => r.newsletter_subscribed === true,
         )
         expect(subscribedUsers).toBeDefined()
         expect(subscribedUsers?.order_count).toBe(2) // Orders from John Doe (gold tier)
         expect(subscribedUsers?.total_amount).toBe(300) // 100 + 200
 
         const unsubscribedUsers = results.find(
-          (r) => r.newsletter_subscribed === false
+          (r) => r.newsletter_subscribed === false,
         )
         expect(unsubscribedUsers).toBeDefined()
         expect(unsubscribedUsers?.order_count).toBe(1) // Order from Jane Smith
@@ -1293,7 +1293,7 @@ function createGroupByTests(autoIndex: `off` | `eager`): void {
             q
               .from({ orders: ordersCollection })
               .groupBy(({ orders }) =>
-                not(isUndefined(orders.shipping?.tracking))
+                not(isUndefined(orders.shipping?.tracking)),
               )
               .select(({ orders }) => ({
                 tracking_status: not(isUndefined(orders.shipping?.tracking)),
diff --git a/packages/db/tests/query/indexes.test.ts b/packages/db/tests/query/indexes.test.ts
index 4fdf16e0c..9b221443c 100644
--- a/packages/db/tests/query/indexes.test.ts
+++ b/packages/db/tests/query/indexes.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, it } from "vitest"
-import { createCollection } from "../../src/collection/index.js"
+import { beforeEach, describe, expect, it } from 'vitest'
+import { createCollection } from '../../src/collection/index.js'
 
-import { createLiveQueryCollection } from "../../src/query/live-query-collection"
+import { createLiveQueryCollection } from '../../src/query/live-query-collection'
 import {
   and,
   count,
@@ -11,8 +11,8 @@ import {
   inArray,
   length,
   or,
-} from "../../src/query/builder/functions"
-import { mockSyncCollectionOptions } from "../utils"
+} from '../../src/query/builder/functions'
+import { mockSyncCollectionOptions } from '../utils'
 
 interface TestItem {
   id: string
@@ -57,7 +57,7 @@ function createIndexUsageTracker(collection: any): {
   // Mock the indexes getter to intercept index access
   const originalIndexesGetter = Object.getOwnPropertyDescriptor(
     Object.getPrototypeOf(collection),
-    `indexes`
+    `indexes`,
   )?.get
   Object.defineProperty(collection, `indexes`, {
     get: function () {
@@ -138,7 +138,7 @@ function expectIndexUsage(
     shouldUseFullScan?: boolean
     indexCallCount?: number
     fullScanCallCount?: number
-  }
+  },
 ) {
   if (expectations.shouldUseIndex) {
     expect(stats.rangeQueryCalls).toBeGreaterThan(0)
@@ -168,7 +168,7 @@ function expectIndexUsage(
 // Helper to run a test with index usage tracking (automatically handles setup/cleanup)
 function withIndexTracking(
   collection: any,
-  testFn: (tracker: { stats: IndexUsageStats }) => void | Promise<void>
+  testFn: (tracker: { stats: IndexUsageStats }) => void | Promise<void>,
 ): void | Promise<void> {
   const tracker = createIndexUsageTracker(collection)
 
@@ -234,7 +234,7 @@ function createTestItemCollection(autoIndex: `off` | `eager` = `off`) {
       getKey: (item) => item.id,
       initialData: testData,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -344,7 +344,7 @@ describe(`Query Index Optimization`, () => {
             q
               .from({ item: collection })
               .where(({ item }: any) =>
-                and(eq(item.status, `active`), gte(item.age, 25))
+                and(eq(item.status, `active`), gte(item.age, 25)),
               )
               .select(({ item }: any) => ({
                 id: item.id,
@@ -441,7 +441,7 @@ describe(`Query Index Optimization`, () => {
             q
               .from({ item: collection })
               .where(({ item }: any) =>
-                inArray(item.status, [`active`, `pending`])
+                inArray(item.status, [`active`, `pending`]),
               )
               .select(({ item }: any) => ({
                 id: item.id,
@@ -537,7 +537,7 @@ describe(`Query Index Optimization`, () => {
             q
               .from({ item: collection })
               .join({ other: secondCollection }, ({ item, other }: any) =>
-                eq(item.status, other.status)
+                eq(item.status, other.status),
               )
               .where(({ item }: any) => eq(item.age, 25))
               .select(({ item, other }: any) => ({
@@ -645,10 +645,10 @@ describe(`Query Index Optimization`, () => {
             q
               .from({ item: collection })
               .join({ other: secondCollection }, ({ item, other }: any) =>
-                eq(item.id, other.id)
+                eq(item.id, other.id),
               )
               .where(({ item, other }: any) =>
-                and(eq(item.status, `active`), eq(other.status, `active`))
+                and(eq(item.status, `active`), eq(other.status, `active`)),
               )
               .select(({ item, other }: any) => ({
                 id: item.id,
@@ -749,10 +749,10 @@ describe(`Query Index Optimization`, () => {
               .join(
                 { other: secondCollection },
                 ({ item, other }: any) => eq(item.id, other.id2),
-                `inner`
+                `inner`,
               )
               .where(({ item, other }: any) =>
-                and(eq(item.status, `active`), eq(other.status, `active`))
+                and(eq(item.status, `active`), eq(other.status, `active`)),
               )
               .select(({ item, other }: any) => ({
                 id: item.id,
@@ -848,10 +848,10 @@ describe(`Query Index Optimization`, () => {
               .join(
                 { other: secondCollection },
                 ({ item, other }: any) => eq(item.id, other.id2),
-                `inner`
+                `inner`,
               )
               .where(({ item, other }: any) =>
-                and(eq(item.status, `active`), eq(other.status, `active`))
+                and(eq(item.status, `active`), eq(other.status, `active`)),
               )
               .select(({ item, other }: any) => ({
                 id: item.id,
@@ -941,10 +941,10 @@ describe(`Query Index Optimization`, () => {
               .join(
                 { other: secondCollection },
                 ({ item, other }: any) => eq(item.id, other.id2),
-                `left`
+                `left`,
               )
               .where(({ item, other }: any) =>
-                and(eq(item.status, `active`), eq(other.status, `active`))
+                and(eq(item.status, `active`), eq(other.status, `active`)),
               )
               .select(({ item, other }: any) => ({
                 id: item.id,
@@ -1060,10 +1060,10 @@ describe(`Query Index Optimization`, () => {
               .join(
                 { other: secondCollection },
                 ({ item, other }: any) => eq(item.id, other.id2),
-                `left`
+                `left`,
               )
               .where(({ item, other }: any) =>
-                and(eq(item.status, `active`), eq(other.status, `active`))
+                and(eq(item.status, `active`), eq(other.status, `active`)),
               )
               .select(({ item, other }: any) => ({
                 id: item.id,
@@ -1157,10 +1157,10 @@ describe(`Query Index Optimization`, () => {
               .join(
                 { other: secondCollection },
                 ({ item, other }: any) => eq(item.id, other.id2),
-                `right`
+                `right`,
               )
               .where(({ item, other }: any) =>
-                and(eq(item.status, `active`), eq(other.status, `active`))
+                and(eq(item.status, `active`), eq(other.status, `active`)),
               )
               .select(({ item, other }: any) => ({
                 id: item.id,
@@ -1253,10 +1253,10 @@ describe(`Query Index Optimization`, () => {
               .join(
                 { other: secondCollection },
                 ({ item, other }: any) => eq(item.id, other.id2),
-                `right`
+                `right`,
               )
               .where(({ item, other }: any) =>
-                and(eq(item.status, `active`), eq(other.status, `active`))
+                and(eq(item.status, `active`), eq(other.status, `active`)),
               )
               .select(({ item, other }: any) => ({
                 id: item.id,
diff --git a/packages/db/tests/query/join-subquery.test-d.ts b/packages/db/tests/query/join-subquery.test-d.ts
index f529d0e99..29d411854 100644
--- a/packages/db/tests/query/join-subquery.test-d.ts
+++ b/packages/db/tests/query/join-subquery.test-d.ts
@@ -1,7 +1,7 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { createLiveQueryCollection, eq, gt } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { createLiveQueryCollection, eq, gt } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample data types for join-subquery testing
 type Issue = {
@@ -67,7 +67,7 @@ function createIssuesCollection() {
       id: `join-subquery-test-issues-types`,
       getKey: (issue) => issue.id,
       initialData: sampleIssues,
-    })
+    }),
   )
 }
 
@@ -77,7 +77,7 @@ function createUsersCollection() {
       id: `join-subquery-test-users-types`,
       getKey: (user) => user.id,
       initialData: sampleUsers,
-    })
+    }),
   )
 }
 
@@ -101,7 +101,7 @@ describe(`Join Subquery Types`, () => {
             .join(
               { user: usersCollection },
               ({ issue, user }) => eq(issue.userId, user.id),
-              `inner`
+              `inner`,
             )
             .select(({ issue, user }) => ({
               issue_title: issue.title,
@@ -138,7 +138,7 @@ describe(`Join Subquery Types`, () => {
             .join(
               { activeUser: activeUsers },
               ({ issue, activeUser }) => eq(issue.userId, activeUser.id),
-              `left`
+              `left`,
             )
         },
       })
@@ -173,7 +173,7 @@ describe(`Join Subquery Types`, () => {
               { activeUser: activeUsers },
               ({ longIssue, activeUser }) =>
                 eq(longIssue.userId, activeUser.id),
-              `inner`
+              `inner`,
             )
             .select(({ longIssue, activeUser }) => ({
               issue_title: longIssue.title,
@@ -211,7 +211,7 @@ describe(`Join Subquery Types`, () => {
             .join(
               { engUser: engineeringUsers },
               ({ issue, engUser }) => eq(issue.userId, engUser.id),
-              `inner`
+              `inner`,
             )
             .select(({ issue, engUser }) => ({
               issue_title: issue.title,
@@ -245,7 +245,7 @@ describe(`Join Subquery Types`, () => {
             .join(
               { activeUser: activeUsers },
               ({ issue, activeUser }) => eq(issue.userId, activeUser.id),
-              `left`
+              `left`,
             )
         },
       })
@@ -292,7 +292,7 @@ describe(`Join Subquery Types`, () => {
             .join(
               { profile: userProfiles },
               ({ task, profile }) => eq(task.assigneeId, profile.profileId),
-              `inner`
+              `inner`,
             )
             .select(({ task, profile }) => ({
               id: task.taskId,
@@ -336,7 +336,7 @@ describe(`Join Subquery Types`, () => {
             .join(
               { user: usersCollection },
               ({ issue, user }) => eq(issue.userId, user.id),
-              `inner`
+              `inner`,
             )
             .select(({ issue, user }) => ({
               // Should have access to all original Issue properties
@@ -382,7 +382,7 @@ describe(`Join Subquery Types`, () => {
             .join(
               { activeUser: activeUsers },
               ({ issue, activeUser }) => eq(issue.userId, activeUser.id),
-              `left`
+              `left`,
             )
             .select(({ issue, activeUser }) => ({
               issue_title: issue.title,
diff --git a/packages/db/tests/query/join-subquery.test.ts b/packages/db/tests/query/join-subquery.test.ts
index bb7092d63..259fac7e2 100644
--- a/packages/db/tests/query/join-subquery.test.ts
+++ b/packages/db/tests/query/join-subquery.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, test } from "vitest"
-import { createLiveQueryCollection, eq, gt } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { beforeEach, describe, expect, test } from 'vitest'
+import { createLiveQueryCollection, eq, gt } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample data types for join-subquery testing
 type Issue = {
@@ -151,7 +151,7 @@ function createIssuesCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (issue) => issue.id,
       initialData: sampleIssues,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -162,7 +162,7 @@ function createUsersCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (user) => user.id,
       initialData: sampleUsers,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -173,7 +173,7 @@ function createProfilesCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (profile) => profile.id,
       initialData: sampleProfiles,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -184,7 +184,7 @@ function createProductsCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (product) => product.id,
       initialData: sampleProducts,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -195,7 +195,7 @@ function createTrialsCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (item) => `${item.productId}-${item.userId}`,
       initialData: sampleTrials,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -225,7 +225,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { user: usersCollection },
                 ({ issue, user }) => eq(issue.userId, user.id),
-                `inner`
+                `inner`,
               )
               .select(({ issue, user }) => ({
                 issue_title: issue.title,
@@ -264,7 +264,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { activeUser: activeUsers },
                 ({ issue, activeUser }) => eq(issue.userId, activeUser.id),
-                `left`
+                `left`,
               )
               .select(({ issue, activeUser }) => ({
                 issue_title: issue.title,
@@ -279,7 +279,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
 
         // Issues with active users should have user_name
         const activeUserIssues = results.filter(
-          (r) => r.user_name !== undefined
+          (r) => r.user_name !== undefined,
         )
         expect(activeUserIssues).toHaveLength(4) // Issues 1, 2, 3, 5 have active users
 
@@ -313,7 +313,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
                 { activeUser: activeUsers },
                 ({ longIssue, activeUser }) =>
                   eq(longIssue.userId, activeUser.id),
-                `inner`
+                `inner`,
               )
               .select(({ longIssue, activeUser }) => ({
                 issue_title: longIssue.title,
@@ -371,7 +371,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { engUser: engineeringUsers },
                 ({ issue, engUser }) => eq(issue.userId, engUser.id),
-                `inner`
+                `inner`,
               )
               .select(({ issue, engUser }) => ({
                 issue_title: issue.title,
@@ -407,7 +407,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { activeUser: activeUsers },
                 ({ issue, activeUser }) => eq(issue.userId, activeUser.id),
-                `left`
+                `left`,
               )
               .select(({ issue, activeUser }) => ({
                 issue_title: issue.title,
@@ -423,7 +423,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
 
         // Issues with active users should have user data
         const activeUserIssues = results.filter(
-          (r) => r.user_name !== undefined
+          (r) => r.user_name !== undefined,
         )
         expect(activeUserIssues).toHaveLength(4) // Issues 1, 2, 3, 5
 
@@ -449,7 +449,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
                     .where(({ tried }) => eq(tried.userId, 1)),
                 },
                 ({ tried, product }) => eq(tried.productId, product.id),
-                `left`
+                `left`,
               )
               .where(({ product }) => eq(product.id, 1))
               .select(({ product, tried }) => ({
@@ -485,7 +485,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
                     .limit(1),
                 },
                 ({ issue, users }) => eq(issue.userId, users.id),
-                `left`
+                `left`,
               )
               .orderBy(({ issue }) => issue.id, `desc`)
               .limit(1)
@@ -523,7 +523,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { issue: issuesCollection },
                 ({ issue, users }) => eq(issue.userId, users.id),
-                `right`
+                `right`,
               )
               .orderBy(({ issue }) => issue.id, `desc`)
               .limit(1)
@@ -580,7 +580,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { profile: userProfiles },
                 ({ task, profile }) => eq(task.assigneeId, profile.profileId),
-                `inner`
+                `inner`,
               )
               .select(({ task, profile }) => ({
                 id: task.taskId,
@@ -665,7 +665,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { profile: profilesCollection },
                 ({ user, profile }) => eq(user.id, profile.userId),
-                `inner`
+                `inner`,
               )
               .where(({ user }) => eq(user.status, `active`))
               .select(({ user, profile }) => ({
@@ -684,7 +684,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { issue: issuesCollection },
                 ({ activeUser, issue }) => eq(issue.userId, activeUser.userId),
-                `inner`
+                `inner`,
               )
               .select(({ activeUser, issue }) => ({
                 issue_title: issue.title,
@@ -703,7 +703,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
         expect(results).toHaveLength(4)
 
         const sortedResults = results.sort((a, b) =>
-          a.issue_title.localeCompare(b.issue_title)
+          a.issue_title.localeCompare(b.issue_title),
         )
 
         // Verify structure - should have both user data AND profile data
@@ -748,7 +748,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { profile: profilesCollection },
                 ({ user, profile }) => eq(user.id, profile.userId),
-                `inner`
+                `inner`,
               )
               .where(({ user }) => eq(user.status, `active`))
               .select(({ user, profile }) => ({
@@ -765,7 +765,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { author: usersWithProfiles },
                 ({ issue, author }) => eq(issue.userId, author.userId),
-                `left`
+                `left`,
               )
               .select(({ issue, author }) => ({
                 issue_id: issue.id,
@@ -802,7 +802,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { profile: profilesCollection },
                 ({ user, profile }) => eq(user.id, profile.userId),
-                `inner`
+                `inner`,
               )
               .select(({ user, profile }) => ({
                 userId: user.id,
@@ -829,7 +829,7 @@ function createJoinSubqueryTests(autoIndex: `off` | `eager`): void {
               .join(
                 { author: activeUsersWithProfiles },
                 ({ issue, author }) => eq(issue.userId, author.id),
-                `inner`
+                `inner`,
               )
               .select(({ issue, author }) => ({
                 issue_title: issue.title,
diff --git a/packages/db/tests/query/join.test-d.ts b/packages/db/tests/query/join.test-d.ts
index f453465c9..9fc1a6bde 100644
--- a/packages/db/tests/query/join.test-d.ts
+++ b/packages/db/tests/query/join.test-d.ts
@@ -1,9 +1,9 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { z } from "zod"
-import { type } from "arktype"
-import { createLiveQueryCollection, eq } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { z } from 'zod'
+import { type } from 'arktype'
+import { createLiveQueryCollection, eq } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample data types for join type testing
 type User = {
@@ -25,7 +25,7 @@ function createUsersCollection() {
       id: `test-users`,
       getKey: (user) => user.id,
       initialData: [],
-    })
+    }),
   )
 }
 
@@ -35,7 +35,7 @@ function createDepartmentsCollection() {
       id: `test-departments`,
       getKey: (dept) => dept.id,
       initialData: [],
-    })
+    }),
   )
 }
 
@@ -51,7 +51,7 @@ describe(`Join Types - Type Safety`, () => {
           .join(
             { dept: departmentsCollection },
             ({ user, dept }) => eq(user.department_id, dept.id),
-            `inner`
+            `inner`,
           ),
     })
 
@@ -77,7 +77,7 @@ describe(`Join Types - Type Safety`, () => {
           .join(
             { dept: departmentsCollection },
             ({ user, dept }) => eq(user.department_id, dept.id),
-            `left`
+            `left`,
           ),
     })
 
@@ -103,7 +103,7 @@ describe(`Join Types - Type Safety`, () => {
           .join(
             { dept: departmentsCollection },
             ({ user, dept }) => eq(user.department_id, dept.id),
-            `right`
+            `right`,
           ),
     })
 
@@ -129,7 +129,7 @@ describe(`Join Types - Type Safety`, () => {
           .join(
             { dept: departmentsCollection },
             ({ user, dept }) => eq(user.department_id, dept.id),
-            `full`
+            `full`,
           ),
     })
 
@@ -160,7 +160,7 @@ describe(`Join Types - Type Safety`, () => {
         id: `test-projects`,
         getKey: (project) => project.id,
         initialData: [],
-      })
+      }),
     )
 
     const multipleJoinQuery = createLiveQueryCollection({
@@ -170,12 +170,12 @@ describe(`Join Types - Type Safety`, () => {
           .join(
             { dept: departmentsCollection },
             ({ user, dept }) => eq(user.department_id, dept.id),
-            `left` // dept is optional
+            `left`, // dept is optional
           )
           .join(
             { project: projectsCollection },
             ({ user, project }) => eq(user.id, project.user_id),
-            `right` // user becomes optional, project required
+            `right`, // user becomes optional, project required
           ),
     })
 
@@ -205,7 +205,7 @@ describe(`Join Types - Type Safety`, () => {
           .join(
             { dept: departmentsCollection },
             ({ user, dept }) => eq(user.department_id, dept.id),
-            `left`
+            `left`,
           )
           .select(({ user, dept }) => ({
             userName: user.name,
@@ -237,7 +237,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         q
           .from({ user: usersCollection })
           .leftJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           ),
     })
 
@@ -261,7 +261,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         q
           .from({ user: usersCollection })
           .rightJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           ),
     })
 
@@ -285,7 +285,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         q
           .from({ user: usersCollection })
           .innerJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           ),
     })
 
@@ -309,7 +309,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         q
           .from({ user: usersCollection })
           .fullJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           ),
     })
 
@@ -340,7 +340,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         id: `test-projects`,
         getKey: (project) => project.id,
         initialData: [],
-      })
+      }),
     )
 
     const multipleJoinQuery = createLiveQueryCollection({
@@ -348,10 +348,10 @@ describe(`Join Alias Methods - Type Safety`, () => {
         q
           .from({ user: usersCollection })
           .leftJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           )
           .rightJoin({ project: projectsCollection }, ({ user, project }) =>
-            eq(user.id, project.user_id)
+            eq(user.id, project.user_id),
           ),
     })
 
@@ -379,7 +379,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         q
           .from({ user: usersCollection })
           .leftJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           )
           .select(({ user, dept }) => ({
             userName: user.name,
@@ -409,7 +409,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         q
           .from({ user: usersCollection })
           .innerJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           )
           .select(({ user, dept }) => ({
             userName: user.name,
@@ -445,7 +445,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         id: `test-projects`,
         getKey: (project) => project.id,
         initialData: [],
-      })
+      }),
     )
 
     const mixedJoinQuery = createLiveQueryCollection({
@@ -453,12 +453,12 @@ describe(`Join Alias Methods - Type Safety`, () => {
         q
           .from({ user: usersCollection })
           .leftJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-            eq(user.department_id, dept.id)
+            eq(user.department_id, dept.id),
           )
           .join(
             { project: projectsCollection },
             ({ dept, project }) => eq(dept?.id, project.department_id),
-            `inner`
+            `inner`,
           ),
     })
 
@@ -495,7 +495,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         id: `test-users-join-optional`,
         getKey: (user) => user.id,
         initialData: [],
-      })
+      }),
     )
 
     const eventCollection = createCollection(
@@ -503,7 +503,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
         id: `test-events-join-optional`,
         getKey: (event) => event.id,
         initialData: [],
-      })
+      }),
     )
 
     // This should not cause TypeScript errors - optional field as first argument
@@ -513,7 +513,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
           .from({ event: eventCollection })
           .innerJoin(
             { user: userCollection },
-            ({ event, user }) => eq(event.user_id, user.id) // Should work with optional field
+            ({ event, user }) => eq(event.user_id, user.id), // Should work with optional field
           )
           .select(({ event, user }) => ({
             eventTitle: event.title,
@@ -528,7 +528,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
           .from({ event: eventCollection })
           .innerJoin(
             { user: userCollection },
-            ({ event, user }) => eq(user.id, event.user_id) // Swapped argument order
+            ({ event, user }) => eq(user.id, event.user_id), // Swapped argument order
           )
           .select(({ event, user }) => ({
             eventTitle: event.title,
@@ -598,7 +598,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
           .from({ event: eventCollection })
           .innerJoin(
             { user: userCollection },
-            ({ event, user }) => eq(event.user_id, user.id) // Should work with optional field
+            ({ event, user }) => eq(event.user_id, user.id), // Should work with optional field
           )
           .select(({ event, user }) => ({
             eventTitle: event.title,
@@ -613,7 +613,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
           .from({ event: eventCollection })
           .innerJoin(
             { user: userCollection },
-            ({ event, user }) => eq(user.id, event.user_id) // Swapped argument order
+            ({ event, user }) => eq(user.id, event.user_id), // Swapped argument order
           )
           .select(({ event, user }) => ({
             eventTitle: event.title,
@@ -683,7 +683,7 @@ describe(`Join Alias Methods - Type Safety`, () => {
           .from({ post: postCollection })
           .leftJoin(
             { user: userCollection },
-            ({ post, user }) => eq(post.author_id, user.id) // Should work with nullable field
+            ({ post, user }) => eq(post.author_id, user.id), // Should work with nullable field
           )
           .select(({ post, user }) => ({
             postTitle: post.title,
@@ -711,7 +711,7 @@ describe(`Join with ArkType Schemas`, () => {
 
     const eventSchema = type({
       id: `string.uuid`,
-      "user_id?": `string.uuid`, // Optional foreign key using "field?"
+      'user_id?': `string.uuid`, // Optional foreign key using "field?"
       title: `string`,
     })
 
@@ -746,7 +746,7 @@ describe(`Join with ArkType Schemas`, () => {
           .from({ event: eventCollection })
           .innerJoin(
             { user: userCollection },
-            ({ event, user }) => eq(event.user_id, user.id) // Should work with optional field
+            ({ event, user }) => eq(event.user_id, user.id), // Should work with optional field
           )
           .select(({ event, user }) => ({
             eventTitle: event.title,
@@ -761,7 +761,7 @@ describe(`Join with ArkType Schemas`, () => {
           .from({ event: eventCollection })
           .innerJoin(
             { user: userCollection },
-            ({ event, user }) => eq(user.id, event.user_id) // Swapped argument order
+            ({ event, user }) => eq(user.id, event.user_id), // Swapped argument order
           )
           .select(({ event, user }) => ({
             eventTitle: event.title,
@@ -831,7 +831,7 @@ describe(`Join with ArkType Schemas`, () => {
           .from({ post: postCollection })
           .leftJoin(
             { user: userCollection },
-            ({ post, user }) => eq(post.author_id, user.id) // Should work with nullable field
+            ({ post, user }) => eq(post.author_id, user.id), // Should work with nullable field
           )
           .select(({ post, user }) => ({
             postTitle: post.title,
@@ -854,7 +854,7 @@ describe(`Join with ArkType Schemas`, () => {
       id: `number`,
       name: `string > 0`,
       email: `string.email`,
-      "status?": `"active" | "inactive"`,
+      'status?': `"active" | "inactive"`,
     })
 
     const postSchema = type({
@@ -862,7 +862,7 @@ describe(`Join with ArkType Schemas`, () => {
       title: `string > 0`,
       content: `string > 10`,
       user_id: `number`,
-      "category?": `"tech" | "lifestyle" | "news"`,
+      'category?': `"tech" | "lifestyle" | "news"`,
     })
 
     const userCollection = createCollection({
@@ -895,7 +895,7 @@ describe(`Join with ArkType Schemas`, () => {
         q
           .from({ post: postCollection })
           .innerJoin({ user: userCollection }, ({ post, user }) =>
-            eq(post.user_id, user.id)
+            eq(post.user_id, user.id),
           )
           .select(({ post, user }) => ({
             postTitle: post.title,
diff --git a/packages/db/tests/query/join.test.ts b/packages/db/tests/query/join.test.ts
index 67d302293..edb632c30 100644
--- a/packages/db/tests/query/join.test.ts
+++ b/packages/db/tests/query/join.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, test } from "vitest"
+import { beforeEach, describe, expect, test } from 'vitest'
 import {
   concat,
   createLiveQueryCollection,
@@ -9,9 +9,9 @@ import {
   lt,
   not,
   or,
-} from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+} from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample data types for join testing
 type User = {
@@ -49,7 +49,7 @@ function createUsersCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (user) => user.id,
       initialData: sampleUsers,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -60,7 +60,7 @@ function createDepartmentsCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (dept) => dept.id,
       initialData: sampleDepartments,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -115,7 +115,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
             .join(
               { dept: departmentsCollection },
               ({ user, dept }) => eq(user.department_id, dept.id),
-              joinType
+              joinType,
             )
             .select(({ user, dept }) => ({
               user_name: user?.name,
@@ -203,7 +203,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
             .join(
               { dept: departmentsCollection },
               ({ user, dept }) => eq(user.department_id, dept.id),
-              joinType
+              joinType,
             ),
       })
 
@@ -296,7 +296,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
             .join(
               { dept: departmentsCollection },
               ({ user, dept }) => eq(user.department_id, dept.id),
-              joinType
+              joinType,
             )
             .select(({ user, dept }) => ({
               user_name: user?.name,
@@ -339,7 +339,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
             .join(
               { dept: departmentsCollection },
               ({ user, dept }) => eq(user.department_id, dept.id),
-              joinType
+              joinType,
             )
             .select(({ user, dept }) => ({
               user_name: user?.name,
@@ -378,7 +378,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
               .join(
                 { dept: departmentsCollection },
                 ({ user, dept }) => eq(user.department_id, dept.id),
-                joinType
+                joinType,
               )
               .select(({ user, dept }) => ({
                 user_name: user?.name,
@@ -427,7 +427,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
               .join(
                 { dept: departmentsCollection },
                 ({ user, dept }) => eq(user.department_id, dept.id),
-                joinType
+                joinType,
               )
               .select(({ user, dept }) => ({
                 user_name: user?.name,
@@ -437,7 +437,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
 
         // Initially Marketing has no users
         const marketingResults = joinQuery.toArray.filter(
-          (r) => r.department_name === `Marketing`
+          (r) => r.department_name === `Marketing`,
         )
         expect(marketingResults).toHaveLength(1)
         expect(marketingResults[0]?.user_name).toBeUndefined()
@@ -456,7 +456,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
 
         // Should now have Eve in Marketing instead of null
         const updatedMarketingResults = joinQuery.toArray.filter(
-          (r) => r.department_name === `Marketing`
+          (r) => r.department_name === `Marketing`,
         )
         expect(updatedMarketingResults).toHaveLength(1)
         expect(updatedMarketingResults[0]).toMatchObject({
@@ -504,7 +504,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
           getKey: (team) => team.id,
           initialData: teams,
           autoIndex,
-        })
+        }),
       )
 
       const teamMembersCollection = createCollection(
@@ -513,7 +513,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
           getKey: (member) => member.id,
           initialData: teamMembers,
           autoIndex,
-        })
+        }),
       )
 
       // Test WHERE clause that filters on the nullable side based on join type
@@ -528,7 +528,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
             q
               .from({ team: teamsCollection })
               .leftJoin({ member: teamMembersCollection }, ({ team, member }) =>
-                eq(team.id, member.team_id)
+                eq(team.id, member.team_id),
               )
               .where(({ member }) => eq(member?.user_id, 100))
               .select(({ team, member }) => ({
@@ -548,7 +548,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
               .from({ team: teamsCollection })
               .rightJoin(
                 { member: teamMembersCollection },
-                ({ team, member }) => eq(team.id, member.team_id)
+                ({ team, member }) => eq(team.id, member.team_id),
               )
               .where(({ team }) => eq(team?.active, true))
               .select(({ team, member }) => ({
@@ -567,7 +567,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
             q
               .from({ team: teamsCollection })
               .fullJoin({ member: teamMembersCollection }, ({ team, member }) =>
-                eq(team.id, member.team_id)
+                eq(team.id, member.team_id),
               )
               .where(({ member }) => eq(member?.role, `admin`))
               .select(({ team, member }) => ({
@@ -587,7 +587,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
               .from({ team: teamsCollection })
               .innerJoin(
                 { member: teamMembersCollection },
-                ({ team, member }) => eq(team.id, member.team_id)
+                ({ team, member }) => eq(team.id, member.team_id),
               )
               .where(({ member }) => eq(member.user_id, 100))
               .select(({ team, member }) => ({
@@ -698,7 +698,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
           getKey: (company) => company.id,
           initialData: companies,
           autoIndex,
-        })
+        }),
       )
 
       const projectsCollection = createCollection(
@@ -707,7 +707,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
           getKey: (project) => project.id,
           initialData: projects,
           autoIndex,
-        })
+        }),
       )
 
       const tasksCollection = createCollection(
@@ -716,7 +716,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
           getKey: (task) => task.id,
           initialData: tasks,
           autoIndex,
-        })
+        }),
       )
 
       // Create chained join query: Company -> Project -> Task
@@ -729,12 +729,12 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
             .join(
               { project: projectsCollection },
               ({ company, project }) => eq(project.company_id, company.id),
-              joinType
+              joinType,
             )
             .join(
               { task: tasksCollection },
               ({ task, project }) => eq(task.project_id, project?.id),
-              joinType
+              joinType,
             )
             .select(({ company, project, task }) => ({
               company_name: company?.name,
@@ -753,13 +753,13 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
         (r) =>
           r.company_name === `TechCorp` &&
           r.project_name === `Website` &&
-          r.task_name === `Design`
+          r.task_name === `Design`,
       )
       const dataIncChain = results.find(
         (r) =>
           r.company_name === `DataInc` &&
           r.project_name === `Analytics` &&
-          r.task_name === `Research`
+          r.task_name === `Research`,
       )
 
       expect(techCorpChain).toBeDefined()
@@ -784,7 +784,7 @@ function testJoinType(joinType: JoinType, autoIndex: `off` | `eager`) {
       expect(resultsAfterInsert.length).toBeGreaterThanOrEqual(initialCount)
 
       const newTaskResult = resultsAfterInsert.find(
-        (r) => r.task_name === `New Task`
+        (r) => r.task_name === `New Task`,
       )
       expect(newTaskResult).toBeDefined()
       expect(newTaskResult!.project_name).toBe(`Website`)
@@ -818,7 +818,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
               .join(
                 { dept: departmentsCollection },
                 ({ user, dept }) => eq(user.department_id, dept.id),
-                `inner`
+                `inner`,
               )
               .select(({ user, dept }) => ({
                 user_name: user.name,
@@ -868,7 +868,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
         expect(resultNames).toEqual([`Bob`, `Charlie`, `Dave`, `Eve`])
 
         const daveResult = innerJoinQuery.toArray.find(
-          (r) => r.user_name === `Dave`
+          (r) => r.user_name === `Dave`,
         )
         expect(daveResult).toMatchObject({
           user_name: `Dave`,
@@ -882,7 +882,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             id: `empty-users`,
             getKey: (user) => user.id,
             initialData: [],
-          })
+          }),
         )
 
         const innerJoinQuery = createLiveQueryCollection({
@@ -893,7 +893,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
               .join(
                 { dept: departmentsCollection },
                 ({ user, dept }) => eq(user.department_id, dept.id),
-                `inner`
+                `inner`,
               )
               .select(({ user, dept }) => ({
                 user_name: user.name,
@@ -932,7 +932,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
               .join(
                 { dept: departmentsCollection },
                 ({ user, dept }) => eq(user.department_id, dept.id),
-                `left`
+                `left`,
               )
               .select(({ user, dept }) => ({
                 user_id: user.id,
@@ -970,9 +970,9 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
                 ({ user, dept }) =>
                   eq(
                     concat(`dept`, user.department_id),
-                    concat(`dept`, dept.id)
+                    concat(`dept`, dept.id),
                   ),
-                `inner`
+                `inner`,
               )
               .select(({ user, dept }) => ({
                 user_name: user.name,
@@ -1030,7 +1030,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           getKey: (player) => player.name,
           initialData: samplePlayers,
           autoIndex,
-        })
+        }),
       )
 
       const clientsCollection = createCollection(
@@ -1039,7 +1039,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           getKey: (client) => client.name,
           initialData: sampleClients,
           autoIndex,
-        })
+        }),
       )
 
       const balancesCollection = createCollection(
@@ -1048,7 +1048,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           getKey: (balance) => balance.name,
           initialData: sampleBalances,
           autoIndex,
-        })
+        }),
       )
 
       // Create chained join query: Player -> Client -> Balance
@@ -1061,10 +1061,10 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           q
             .from({ player: playersCollection })
             .innerJoin({ client: clientsCollection }, ({ client, player }) =>
-              eq(client.player, player.name)
+              eq(client.player, player.name),
             )
             .innerJoin({ balance: balancesCollection }, ({ balance, client }) =>
-              eq(balance.client, client.name)
+              eq(balance.client, client.name),
             )
             .select(({ player, client, balance }) => ({
               player_name: player.name,
@@ -1101,7 +1101,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
       expect(resultsAfterClientUpdate).toHaveLength(3)
 
       const updatedResult1 = resultsAfterClientUpdate.find(
-        (r) => r.player_name === `player1`
+        (r) => r.player_name === `player1`,
       )
       expect(updatedResult1!.client_email).toBe(`updated-client1@example.com`)
       expect(updatedResult1!.balance_amount).toBe(1000) // Balance should remain the same
@@ -1124,7 +1124,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
       expect(resultsAfterBalanceUpdate).toHaveLength(3)
 
       const updatedResult2 = resultsAfterBalanceUpdate.find(
-        (r) => r.player_name === `player2`
+        (r) => r.player_name === `player2`,
       )
       expect(updatedResult2!.balance_amount).toBe(3000) // Updated amount
       expect(updatedResult2!.client_name).toBe(`client2`) // Client should remain the same
@@ -1160,7 +1160,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
       expect(resultsAfterBalanceInsert).toHaveLength(4)
 
       const newResult = resultsAfterBalanceInsert.find(
-        (r) => r.client_name === `client4`
+        (r) => r.client_name === `client4`,
       )
       expect(newResult).toBeDefined()
       expect(newResult!.player_name).toBe(`player1`)
@@ -1175,7 +1175,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
       const resultsAfterClientDelete = chainedJoinQuery.toArray
       expect(resultsAfterClientDelete).toHaveLength(3)
       expect(
-        resultsAfterClientDelete.find((r) => r.client_name === `client4`)
+        resultsAfterClientDelete.find((r) => r.client_name === `client4`),
       ).toBeUndefined()
     })
 
@@ -1200,7 +1200,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           id: `test-users-self-join`,
           getKey: (user) => user.id,
           initialData: selfJoinSampleUsers,
-        })
+        }),
       )
 
       const selfJoinQuery = createLiveQueryCollection({
@@ -1211,7 +1211,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             .join(
               { parentUsers: selfJoinUsersCollection },
               ({ users, parentUsers }) => eq(users.parentId, parentUsers.id),
-              `inner`
+              `inner`,
             )
             .select(({ users, parentUsers }) => ({
               user_id: users.id,
@@ -1271,7 +1271,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           id: `test-users-bidirectional`,
           getKey: (user) => user.id,
           initialData: bidirectionalSampleUsers,
-        })
+        }),
       )
 
       // Test forward direction: eq(users.parentId, parentUsers.id)
@@ -1283,7 +1283,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             .join(
               { parentUsers: bidirectionalUsersCollection },
               ({ users, parentUsers }) => eq(users.parentId, parentUsers.id),
-              `inner`
+              `inner`,
             )
             .select(({ users, parentUsers }) => ({
               user_name: users.name,
@@ -1303,7 +1303,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             .join(
               { parentUsers: bidirectionalUsersCollection },
               ({ users, parentUsers }) => eq(parentUsers.id, users.parentId),
-              `inner`
+              `inner`,
             )
             .select(({ users, parentUsers }) => ({
               user_name: users.name,
@@ -1333,7 +1333,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           id: `test-users-same-table`,
           getKey: (user) => user.id,
           initialData: sampleUsers,
-        })
+        }),
       )
 
       const departmentsCollection = createDepartmentsCollection(autoIndex)
@@ -1345,11 +1345,11 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             q.from({ user: usersCollection }).join(
               { dept: departmentsCollection },
               ({ user }) => eq(user.id, user.department_id), // Both refer to 'user' table
-              `inner`
+              `inner`,
             ),
         })
       }).toThrow(
-        `Invalid join condition: both expressions refer to the same source "user"`
+        `Invalid join condition: both expressions refer to the same source "user"`,
       )
     })
 
@@ -1359,7 +1359,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           id: `test-users-no-refs`,
           getKey: (user) => user.id,
           initialData: sampleUsers,
-        })
+        }),
       )
 
       const departmentsCollection = createDepartmentsCollection(autoIndex)
@@ -1371,11 +1371,11 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             q.from({ user: usersCollection }).join(
               { dept: departmentsCollection },
               () => eq(1, 2), // Constants, no table references
-              `inner`
+              `inner`,
             ),
         })
       }).toThrow(
-        `Invalid join condition: expressions must reference source aliases`
+        `Invalid join condition: expressions must reference source aliases`,
       )
     })
 
@@ -1385,7 +1385,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           id: `test-users-no-refs`,
           getKey: (user) => user.id,
           initialData: sampleUsers,
-        })
+        }),
       )
 
       const departmentsCollection = createDepartmentsCollection(autoIndex)
@@ -1401,16 +1401,16 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
               .join(
                 { dept: departmentsCollection },
                 ({ user, dept }) => eq(dept.id, user.department_id),
-                `inner`
+                `inner`,
               )
               .join(
                 { dept2: departmentsCollection2 },
                 ({ user, dept }) => eq(dept.id, user.department_id),
-                `inner`
+                `inner`,
               ),
         })
       }).toThrow(
-        `Invalid join condition: right expression does not refer to the joined source "dept2"`
+        `Invalid join condition: right expression does not refer to the joined source "dept2"`,
       )
     })
 
@@ -1420,7 +1420,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           id: `test-users-mixed-refs`,
           getKey: (user) => user.id,
           initialData: sampleUsers,
-        })
+        }),
       )
 
       const departmentsCollection = createDepartmentsCollection(autoIndex)
@@ -1432,11 +1432,11 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             q.from({ user: usersCollection }).join(
               { dept: departmentsCollection },
               ({ user }) => eq(user.id, user.department_id), // Both refer to 'user' table
-              `inner`
+              `inner`,
             ),
         })
       }).toThrow(
-        `Invalid join condition: both expressions refer to the same source "user"`
+        `Invalid join condition: both expressions refer to the same source "user"`,
       )
     })
 
@@ -1447,7 +1447,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           id: `special-users`,
           getKey: (user) => user.id,
           initialData: [{ id: 1, special: true }],
-        })
+        }),
       )
 
       const joinQuery = createLiveQueryCollection({
@@ -1457,7 +1457,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             .from({ user: usersCollection })
             .leftJoin(
               { special: specialUsersCollection },
-              ({ user, special }) => eq(user.id, special.id)
+              ({ user, special }) => eq(user.id, special.id),
             )
             .where(({ special }) => isUndefined(special)),
       })
@@ -1514,7 +1514,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           getKey: (event) => event.id,
           initialData: sampleEvents,
           autoIndex,
-        })
+        }),
       )
 
       const queryWithWhere = createLiveQueryCollection({
@@ -1523,12 +1523,12 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           q
             .from({ event: eventCollection })
             .where(({ event }) =>
-              eq(event.id, `3770a4a6-3260-4566-9f79-f50864ebdd46`)
+              eq(event.id, `3770a4a6-3260-4566-9f79-f50864ebdd46`),
             )
             .join(
               { parent: eventCollection },
               ({ event, parent }) => eq(parent.id, event.parent_id),
-              `left`
+              `left`,
             )
             .select(({ event, parent }) => ({
               id: event.id,
@@ -1546,13 +1546,13 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
       expect(childEventWithWhere).toBeDefined()
 
       expect(childEventWithWhere.id).toBe(
-        `3770a4a6-3260-4566-9f79-f50864ebdd46`
+        `3770a4a6-3260-4566-9f79-f50864ebdd46`,
       )
       expect(childEventWithWhere.parent_id).toBe(
-        `ba224e71-a464-418d-a0a9-5959b490775d`
+        `ba224e71-a464-418d-a0a9-5959b490775d`,
       )
       expect(childEventWithWhere.parent.id).toBe(
-        `ba224e71-a464-418d-a0a9-5959b490775d`
+        `ba224e71-a464-418d-a0a9-5959b490775d`,
       )
     })
 
@@ -1580,7 +1580,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
           getKey: (person) => person.id,
           initialData: samplePeople,
           autoIndex,
-        })
+        }),
       )
 
       // Query: Find employees aged > 30 and their managers aged > 35
@@ -1593,10 +1593,10 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
             .join(
               { manager: peopleCollection },
               ({ employee, manager }) => eq(employee.manager_id, manager.id),
-              `left`
+              `left`,
             )
             .where(({ manager }) =>
-              or(isNull(manager?.id), gt(manager?.age, 35))
+              or(isNull(manager?.id), gt(manager?.age, 35)),
             )
             .select(({ employee, manager }) => ({
               employeeId: employee.id,
@@ -1664,7 +1664,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
         getKey: (item) => item.id,
         initialData: collection1Data,
         autoIndex,
-      })
+      }),
     )
 
     const collection2 = createCollection(
@@ -1673,7 +1673,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
         getKey: (item) => item.id,
         initialData: collection2Data,
         autoIndex,
-      })
+      }),
     )
 
     const multipleJoinQuery = createLiveQueryCollection({
@@ -1688,7 +1688,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
                 .where(({ join1 }) => not(gt(join1.other, 20))),
             },
             ({ main, join1 }) => eq(main.value, join1.value),
-            `left`
+            `left`,
           )
           .join(
             {
@@ -1697,7 +1697,7 @@ function createJoinTests(autoIndex: `off` | `eager`): void {
                 .where(({ join2 }) => not(lt(join2.other, 20))),
             },
             ({ main, join2 }) => eq(main.value, join2.value),
-            `left`
+            `left`,
           ),
     })
 
diff --git a/packages/db/tests/query/live-query-collection.test.ts b/packages/db/tests/query/live-query-collection.test.ts
index ff90f6d5d..8c10c3eb8 100644
--- a/packages/db/tests/query/live-query-collection.test.ts
+++ b/packages/db/tests/query/live-query-collection.test.ts
@@ -1,21 +1,21 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import { Temporal } from "temporal-polyfill"
-import { createCollection } from "../../src/collection/index.js"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { Temporal } from 'temporal-polyfill'
+import { createCollection } from '../../src/collection/index.js'
 import {
   and,
   createLiveQueryCollection,
   eq,
   ilike,
   liveQueryCollectionOptions,
-} from "../../src/query/index.js"
-import { Query } from "../../src/query/builder/index.js"
+} from '../../src/query/index.js'
+import { Query } from '../../src/query/builder/index.js'
 import {
   flushPromises,
   mockSyncCollectionOptions,
   mockSyncCollectionOptionsNoInitialState,
-} from "../utils.js"
-import { createDeferred } from "../../src/deferred"
-import type { ChangeMessage, LoadSubsetOptions } from "../../src/types.js"
+} from '../utils.js'
+import { createDeferred } from '../../src/deferred'
+import type { ChangeMessage, LoadSubsetOptions } from '../../src/types.js'
 
 // Sample user type for tests
 type User = {
@@ -37,7 +37,7 @@ function createUsersCollection() {
       id: `test-users`,
       getKey: (user) => user.id,
       initialData: sampleUsers,
-    })
+    }),
   )
 }
 
@@ -52,7 +52,7 @@ describe(`createLiveQueryCollection`, () => {
     const activeUsers = createLiveQueryCollection((q) =>
       q
         .from({ user: usersCollection })
-        .where(({ user }) => eq(user.active, true))
+        .where(({ user }) => eq(user.active, true)),
     )
 
     await activeUsers.preload()
@@ -81,7 +81,7 @@ describe(`createLiveQueryCollection`, () => {
     const activeUsers1 = createLiveQueryCollection((q) =>
       q
         .from({ user: usersCollection })
-        .where(({ user }) => eq(user.active, true))
+        .where(({ user }) => eq(user.active, true)),
     )
 
     // Test with QueryBuilder instance via config
@@ -113,12 +113,12 @@ describe(`createLiveQueryCollection`, () => {
           defaultStringCollation: {
             stringSort: `lexical`,
           },
-        })
+        }),
       )
 
       // Create a live query collection from the source collection
       const liveQuery = createLiveQueryCollection((q) =>
-        q.from({ user: sourceCollection })
+        q.from({ user: sourceCollection }),
       )
 
       // The live query should inherit the compareOptions from the source collection
@@ -141,7 +141,7 @@ describe(`createLiveQueryCollection`, () => {
             stringSort: `locale`,
             locale: `de-DE`,
           },
-        })
+        }),
       )
 
       // Create a live query collection with a subquery
@@ -175,7 +175,7 @@ describe(`createLiveQueryCollection`, () => {
           getKey: (user) => user.id,
           initialData: sampleUsers,
           // No compareOptions specified - uses defaults
-        })
+        }),
       )
 
       // Create a live query collection with a subquery
@@ -209,7 +209,7 @@ describe(`createLiveQueryCollection`, () => {
           defaultStringCollation: {
             stringSort: `lexical`,
           },
-        })
+        }),
       )
 
       // Create a live query collection with explicitly provided compareOptions
@@ -242,14 +242,14 @@ describe(`createLiveQueryCollection`, () => {
         id: `empty-test-users`,
         getKey: (user) => user.id,
         initialData: [], // Empty initial data
-      })
+      }),
     )
 
     // Create a live query collection that depends on the empty source collection
     const liveQuery = createLiveQueryCollection((q) =>
       q
         .from({ user: emptyUsersCollection })
-        .where(({ user }) => eq(user.active, true))
+        .where(({ user }) => eq(user.active, true)),
     )
 
     // This should resolve and not hang, even though the source collection is empty
@@ -277,7 +277,7 @@ describe(`createLiveQueryCollection`, () => {
 
     // Create a live query collection that depends on the problematic source collection
     const liveQuery = createLiveQueryCollection((q) =>
-      q.from({ user: problemCollection })
+      q.from({ user: problemCollection }),
     )
 
     // This should resolve and not hang, even though the source collection doesn't commit data
@@ -307,7 +307,7 @@ describe(`createLiveQueryCollection`, () => {
     const liveQuery = createLiveQueryCollection((q) =>
       q
         .from({ user: problemCollection })
-        .where(({ user }) => eq(user.active, true))
+        .where(({ user }) => eq(user.active, true)),
     )
 
     // This should resolve and not hang, even though the source collection doesn't commit data
@@ -379,7 +379,7 @@ describe(`createLiveQueryCollection`, () => {
     const liveQuery = createLiveQueryCollection((q) =>
       q
         .from({ user: sourceCollection })
-        .where(({ user }) => eq(user.active, true))
+        .where(({ user }) => eq(user.active, true)),
     )
 
     // Initially, the live query should be in idle state (default startSync: false)
@@ -470,7 +470,7 @@ describe(`createLiveQueryCollection`, () => {
           { id: `t1`, last_email_id: `e1`, last_sent_at: 3 },
           { id: `t2`, last_email_id: `e2`, last_sent_at: 2 },
         ],
-      })
+      }),
     )
 
     const labelsByEmail = createCollection(
@@ -481,7 +481,7 @@ describe(`createLiveQueryCollection`, () => {
           { email_id: `e1`, label: `inbox` },
           { email_id: `e2`, label: `work` },
         ],
-      })
+      }),
     )
 
     // Source live query (pre-created)
@@ -509,7 +509,7 @@ describe(`createLiveQueryCollection`, () => {
               { label: labelsByEmail },
               ({ thread, label }: any) =>
                 eq(thread.last_email_id, label.email_id),
-              `inner`
+              `inner`,
             )
             .orderBy(({ thread }: any) => thread.last_sent_at, {
               direction: `desc`,
@@ -599,12 +599,12 @@ describe(`createLiveQueryCollection`, () => {
         id: `test-tasks`,
         getKey: (task) => task.id,
         initialData: [initialTask],
-      })
+      }),
     )
 
     // Create a live query collection that includes the temporal value
     const liveQuery = createLiveQueryCollection((q) =>
-      q.from({ task: taskCollection })
+      q.from({ task: taskCollection }),
     )
 
     await liveQuery.preload()
@@ -649,7 +649,7 @@ describe(`createLiveQueryCollection`, () => {
           id: `player`,
           getKey: (post) => post.id,
           autoIndex,
-        })
+        }),
       )
 
       const challenge1Collection = createCollection(
@@ -657,7 +657,7 @@ describe(`createLiveQueryCollection`, () => {
           id: `challenge1`,
           getKey: (post) => post.id,
           autoIndex,
-        })
+        }),
       )
 
       const challenge2Collection = createCollection(
@@ -665,7 +665,7 @@ describe(`createLiveQueryCollection`, () => {
           id: `challenge2`,
           getKey: (post) => post.id,
           autoIndex,
-        })
+        }),
       )
 
       const liveQuery = createLiveQueryCollection((q) =>
@@ -673,12 +673,12 @@ describe(`createLiveQueryCollection`, () => {
           .from({ player: playerCollection })
           .leftJoin(
             { challenge1: challenge1Collection },
-            ({ player, challenge1 }) => eq(player.id, challenge1.id)
+            ({ player, challenge1 }) => eq(player.id, challenge1.id),
           )
           .leftJoin(
             { challenge2: challenge2Collection },
-            ({ player, challenge2 }) => eq(player.id, challenge2.id)
-          )
+            ({ player, challenge2 }) => eq(player.id, challenge2.id),
+          ),
       )
 
       // Start the query, but don't wait it, we are doing to write the data to the
@@ -743,7 +743,7 @@ describe(`createLiveQueryCollection`, () => {
         id: `test-tasks`,
         getKey: (task) => `source:${task.id}`,
         initialData: [initialTask],
-      })
+      }),
     )
 
     const liveQuery = createLiveQueryCollection({
@@ -902,7 +902,7 @@ describe(`createLiveQueryCollection`, () => {
           base.insert({
             id: `${index + 1}`,
             created_at: Date.now() + index,
-          })
+          }),
         )
 
         await vi.advanceTimersByTimeAsync(5000)
@@ -947,7 +947,7 @@ describe(`createLiveQueryCollection`, () => {
                 write({
                   type: `insert`,
                   value: todo,
-                })
+                }),
               )
               commit()
               markReady()
@@ -1087,7 +1087,7 @@ describe(`createLiveQueryCollection`, () => {
       })
 
       const liveQuery = createLiveQueryCollection((q) =>
-        q.from({ item: sourceCollection })
+        q.from({ item: sourceCollection }),
       )
 
       await liveQuery.preload()
@@ -1178,7 +1178,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 5, name: `Eve`, active: true },
             { id: 6, name: `Frank`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1187,7 +1187,7 @@ describe(`createLiveQueryCollection`, () => {
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `desc`)
           .limit(3)
-          .offset(0)
+          .offset(0),
       )
 
       await activeUsers.preload()
@@ -1228,7 +1228,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 5, name: `Eve`, active: true },
             { id: 6, name: `Frank`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1237,7 +1237,7 @@ describe(`createLiveQueryCollection`, () => {
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `asc`)
           .limit(3)
-          .offset(3)
+          .offset(3),
       )
 
       await activeUsers.preload()
@@ -1277,7 +1277,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 4, name: `David`, active: true },
             { id: 5, name: `Eve`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1286,7 +1286,7 @@ describe(`createLiveQueryCollection`, () => {
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `asc`)
           .limit(2)
-          .offset(0)
+          .offset(0),
       )
 
       await activeUsers.preload()
@@ -1337,7 +1337,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 5, name: `Eve`, active: true },
             { id: 6, name: `Frank`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1346,7 +1346,7 @@ describe(`createLiveQueryCollection`, () => {
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `asc`)
           .limit(2)
-          .offset(1)
+          .offset(1),
       )
 
       await activeUsers.preload()
@@ -1391,7 +1391,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 4, name: `David`, active: true },
             { id: 5, name: `Eve`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1400,7 +1400,7 @@ describe(`createLiveQueryCollection`, () => {
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `asc`)
           .limit(2)
-          .offset(0)
+          .offset(0),
       )
 
       await activeUsers.preload()
@@ -1442,7 +1442,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 5, name: `Eve`, active: true },
             { id: 6, name: `Frank`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1451,7 +1451,7 @@ describe(`createLiveQueryCollection`, () => {
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `asc`)
           .limit(2)
-          .offset(1)
+          .offset(1),
       )
 
       await activeUsers.preload()
@@ -1495,7 +1495,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 2, name: `Bob`, active: true },
             { id: 3, name: `Charlie`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1504,7 +1504,7 @@ describe(`createLiveQueryCollection`, () => {
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `asc`)
           .limit(2)
-          .offset(0)
+          .offset(0),
       )
 
       await activeUsers.preload()
@@ -1564,7 +1564,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 5, name: `Eve`, active: true },
             { id: 6, name: `Frank`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1573,7 +1573,7 @@ describe(`createLiveQueryCollection`, () => {
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `desc`)
           .limit(3)
-          .offset(0)
+          .offset(0),
       )
 
       await activeUsers.preload()
@@ -1606,7 +1606,7 @@ describe(`createLiveQueryCollection`, () => {
         (q) =>
           q
             .from({ user: usersCollection })
-            .where(({ user }) => eq(user.active, true))
+            .where(({ user }) => eq(user.active, true)),
         // No orderBy clause
       )
 
@@ -1619,7 +1619,7 @@ describe(`createLiveQueryCollection`, () => {
       expect(() => {
         activeUsers.utils.setWindow({ offset: 1, limit: 1 })
       }).toThrow(
-        /setWindow\(\) can only be called on collections with an ORDER BY clause/
+        /setWindow\(\) can only be called on collections with an ORDER BY clause/,
       )
     })
 
@@ -1643,7 +1643,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 5, title: `Post E`, authorId: 1, published: true },
             { id: 6, title: `Post F`, authorId: 2, published: true },
           ],
-        })
+        }),
       )
 
       const userPosts = createLiveQueryCollection((q) =>
@@ -1652,14 +1652,14 @@ describe(`createLiveQueryCollection`, () => {
           .join(
             { post: posts },
             ({ user, post }) => eq(user.id, post.authorId),
-            `inner`
+            `inner`,
           )
           .where(({ user, post }) =>
-            and(eq(user.active, true), eq(post.published, true))
+            and(eq(user.active, true), eq(post.published, true)),
           )
           .orderBy(({ post }) => post.title, `asc`)
           .limit(3)
-          .offset(0)
+          .offset(0),
       )
 
       await userPosts.preload()
@@ -1697,7 +1697,7 @@ describe(`createLiveQueryCollection`, () => {
             { id: 2, name: `Bob`, active: true },
             { id: 3, name: `Charlie`, active: true },
           ],
-        })
+        }),
       )
 
       const activeUsers = createLiveQueryCollection((q) =>
@@ -1705,7 +1705,7 @@ describe(`createLiveQueryCollection`, () => {
           .from({ user: extendedUsers })
           .where(({ user }) => eq(user.active, true))
           .orderBy(({ user }) => user.name, `asc`)
-          .limit(2)
+          .limit(2),
       )
 
       await activeUsers.preload()
@@ -1851,7 +1851,7 @@ describe(`createLiveQueryCollection`, () => {
           id: `base-with-custom-key`,
           getKey: (item) => item.id,
           initialData: [{ id: `1`, name: `Item 1` }],
-        })
+        }),
       )
 
       const related = createCollection(
@@ -1859,7 +1859,7 @@ describe(`createLiveQueryCollection`, () => {
           id: `related-with-custom-key`,
           getKey: (item) => item.id,
           initialData: [{ id: `1`, value: 100 }],
-        })
+        }),
       )
 
       // Custom getKey is allowed - error only occurs if actual duplicates happen
@@ -1970,7 +1970,7 @@ describe(`createLiveQueryCollection`, () => {
       // Create a live query collection with a where clause
       // This will go through convertToBasicExpression
       const liveQueryCollection = createLiveQueryCollection((q) =>
-        q.from({ item: baseCollection }).where(({ item }) => eq(item.id, 2))
+        q.from({ item: baseCollection }).where(({ item }) => eq(item.id, 2)),
       )
 
       // Trigger sync which will call loadSubset
@@ -2019,7 +2019,7 @@ describe(`createLiveQueryCollection`, () => {
       const liveQueryCollection = createLiveQueryCollection((q) =>
         q
           .from({ item: baseCollection })
-          .where(({ item }) => ilike(item.name, `%test%`))
+          .where(({ item }) => ilike(item.name, `%test%`)),
       )
 
       // Trigger sync which will call loadSubset
@@ -2041,5 +2041,121 @@ describe(`createLiveQueryCollection`, () => {
       resolveLoadSubset!()
       await flushPromises()
     })
+
+    it(`passes single orderBy clause to loadSubset when using limit`, async () => {
+      const capturedOptions: Array<LoadSubsetOptions> = []
+      let resolveLoadSubset: () => void
+      const loadSubsetPromise = new Promise<void>((resolve) => {
+        resolveLoadSubset = resolve
+      })
+
+      const baseCollection = createCollection<{
+        id: number
+        name: string
+        age: number
+      }>({
+        id: `test-base-orderby`,
+        getKey: (item) => item.id,
+        syncMode: `on-demand`,
+        sync: {
+          sync: ({ markReady }) => {
+            markReady()
+            return {
+              loadSubset: (options: LoadSubsetOptions) => {
+                capturedOptions.push(options)
+                return loadSubsetPromise
+              },
+            }
+          },
+        },
+      })
+
+      // Create a live query collection with orderBy and limit
+      const liveQueryCollection = createLiveQueryCollection((q) =>
+        q
+          .from({ item: baseCollection })
+          .orderBy(({ item }) => item.age, `asc`)
+          .limit(10),
+      )
+
+      // Trigger sync which will call loadSubset
+      await liveQueryCollection.preload()
+      await flushPromises()
+
+      expect(capturedOptions.length).toBeGreaterThan(0)
+
+      // Find the call that has orderBy (the limited snapshot request)
+      const callWithOrderBy = capturedOptions.find(
+        (opt) => opt.orderBy !== undefined,
+      )
+      expect(callWithOrderBy).toBeDefined()
+      expect(callWithOrderBy?.orderBy).toHaveLength(1)
+      expect(callWithOrderBy?.orderBy?.[0]?.expression.type).toBe(`ref`)
+      expect(callWithOrderBy?.limit).toBe(10)
+
+      resolveLoadSubset!()
+      await flushPromises()
+    })
+
+    it(`passes multiple orderBy columns to loadSubset when using limit`, async () => {
+      const capturedOptions: Array<LoadSubsetOptions> = []
+      let resolveLoadSubset: () => void
+      const loadSubsetPromise = new Promise<void>((resolve) => {
+        resolveLoadSubset = resolve
+      })
+
+      const baseCollection = createCollection<{
+        id: number
+        name: string
+        age: number
+        department: string
+      }>({
+        id: `test-base-multi-orderby`,
+        getKey: (item) => item.id,
+        syncMode: `on-demand`,
+        sync: {
+          sync: ({ markReady }) => {
+            markReady()
+            return {
+              loadSubset: (options: LoadSubsetOptions) => {
+                capturedOptions.push(options)
+                return loadSubsetPromise
+              },
+            }
+          },
+        },
+      })
+
+      // Create a live query collection with multiple orderBy columns and limit
+      const liveQueryCollection = createLiveQueryCollection((q) =>
+        q
+          .from({ item: baseCollection })
+          .orderBy(({ item }) => item.department, `asc`)
+          .orderBy(({ item }) => item.age, `desc`)
+          .limit(10),
+      )
+
+      // Trigger sync which will call loadSubset
+      await liveQueryCollection.preload()
+      await flushPromises()
+
+      expect(capturedOptions.length).toBeGreaterThan(0)
+
+      // Find the call that has orderBy with multiple columns
+      const callWithMultiOrderBy = capturedOptions.find(
+        (opt) => opt.orderBy !== undefined && opt.orderBy.length > 1,
+      )
+
+      // Multi-column orderBy should be passed to loadSubset so the sync layer
+      // can optimize the query if the backend supports composite ordering
+      expect(callWithMultiOrderBy).toBeDefined()
+      expect(callWithMultiOrderBy?.orderBy).toHaveLength(2)
+      expect(callWithMultiOrderBy?.orderBy?.[0]?.expression.type).toBe(`ref`)
+      expect(callWithMultiOrderBy?.orderBy?.[1]?.expression.type).toBe(`ref`)
+      expect(callWithMultiOrderBy?.limit).toBe(10)
+
+      resolveLoadSubset!()
+      await flushPromises()
+    })
   })
 })
diff --git a/packages/db/tests/query/nested-props.test-d.ts b/packages/db/tests/query/nested-props.test-d.ts
index 801b099c1..6fbe2d56c 100644
--- a/packages/db/tests/query/nested-props.test-d.ts
+++ b/packages/db/tests/query/nested-props.test-d.ts
@@ -1,13 +1,13 @@
-import { describe, expectTypeOf, test } from "vitest"
+import { describe, expectTypeOf, test } from 'vitest'
 import {
   and,
   createLiveQueryCollection,
   eq,
   gt,
   or,
-} from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+} from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Complex nested type for testing with optional properties
 type Person = {
@@ -69,7 +69,7 @@ function createPersonsCollection() {
       id: `test-persons`,
       getKey: (person) => person.id,
       initialData: samplePersons,
-    })
+    }),
   )
 }
 
@@ -149,9 +149,9 @@ describe(`Nested Properties Types`, () => {
               gt(persons.profile?.score, 90),
               and(
                 gt(persons.profile?.stats.tasksCompleted, 100),
-                gt(persons.profile?.stats.rating, 4.5)
-              )
-            )
+                gt(persons.profile?.stats.rating, 4.5),
+              ),
+            ),
           )
           .select(({ persons }) => ({
             id: persons.id,
diff --git a/packages/db/tests/query/optimistic-delete-with-limit.test.ts b/packages/db/tests/query/optimistic-delete-with-limit.test.ts
new file mode 100644
index 000000000..2eec67d7b
--- /dev/null
+++ b/packages/db/tests/query/optimistic-delete-with-limit.test.ts
@@ -0,0 +1,596 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import { createLiveQueryCollection } from '../../src/query/live-query-collection.js'
+import { like } from '../../src/query/builder/functions.js'
+import type { ChangeMessage } from '../../src/types.js'
+import type { Collection } from '../../src/collection/index.js'
+
+type Item = {
+  id: string
+  value: number
+  name: string
+}
+
+const initialData: Array<Item> = [
+  { id: `1`, value: 100, name: `Item A` },
+  { id: `2`, value: 90, name: `Item B` },
+  { id: `3`, value: 80, name: `Item C` },
+  { id: `4`, value: 70, name: `Item D` },
+  { id: `5`, value: 60, name: `Item E` },
+]
+
+describe(`Optimistic delete with limit`, () => {
+  let sourceCollection: Collection<Item>
+
+  beforeEach(async () => {
+    sourceCollection = createCollection(
+      mockSyncCollectionOptions({
+        id: `items`,
+        getKey: (item: Item) => item.id,
+        initialData,
+      }),
+    )
+
+    // Wait for the collection to be ready
+    await sourceCollection.preload()
+  })
+
+  it(`should emit delete event with limit`, async () => {
+    // Create a live query with orderBy and limit (matching the user's pattern)
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(3)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+          name: items.name,
+        })),
+    )
+
+    // Wait for the live query collection to be ready
+    await liveQueryCollection.preload()
+
+    // Check initial results
+    const initialResults = Array.from(liveQueryCollection.values())
+    expect(initialResults).toHaveLength(3)
+    expect(initialResults.map((r) => r.id)).toEqual([`1`, `2`, `3`])
+
+    // Subscribe to changes on the live query collection
+    const changeCallback = vi.fn()
+    const subscription = liveQueryCollection.subscribeChanges(changeCallback, {
+      includeInitialState: false,
+    })
+
+    // Clear any initial calls from subscription setup
+    changeCallback.mockClear()
+
+    // Optimistically delete item 2 (which is in the visible top 3)
+    sourceCollection.delete(`2`)
+
+    // Wait for microtasks to process
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // The callback should have been called with the delete event
+    expect(changeCallback).toHaveBeenCalled()
+
+    // Get the changes from all calls
+    const allChanges = changeCallback.mock.calls.flatMap((call) => call[0])
+    console.log(
+      `All changes (with limit):`,
+      JSON.stringify(allChanges, null, 2),
+    )
+
+    // Should have a delete for item 2
+    const deleteEvents = allChanges.filter(
+      (c: ChangeMessage<Item>) => c.type === `delete`,
+    )
+    expect(deleteEvents.length).toBeGreaterThan(0)
+    expect(deleteEvents.some((e: ChangeMessage<Item>) => e.key === `2`)).toBe(
+      true,
+    )
+
+    subscription.unsubscribe()
+  })
+
+  it(`should emit delete event without limit (baseline)`, async () => {
+    // Create a live query WITHOUT limit (for comparison)
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+          name: items.name,
+        })),
+    )
+
+    // Wait for the live query collection to be ready
+    await liveQueryCollection.preload()
+
+    // Check initial results
+    const initialResults = Array.from(liveQueryCollection.values())
+    expect(initialResults).toHaveLength(5)
+
+    // Subscribe to changes on the live query collection
+    const changeCallback = vi.fn()
+    const subscription = liveQueryCollection.subscribeChanges(changeCallback, {
+      includeInitialState: false,
+    })
+
+    // Clear any initial calls from subscription setup
+    changeCallback.mockClear()
+
+    // Optimistically delete item 2
+    sourceCollection.delete(`2`)
+
+    // Wait for microtasks to process
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // The callback should have been called with the delete event
+    expect(changeCallback).toHaveBeenCalled()
+
+    // Get the changes from all calls
+    const allChanges = changeCallback.mock.calls.flatMap((call) => call[0])
+    console.log(
+      `All changes (without limit):`,
+      JSON.stringify(allChanges, null, 2),
+    )
+
+    // Should have a delete for item 2
+    const deleteEvents = allChanges.filter(
+      (c: ChangeMessage<Item>) => c.type === `delete`,
+    )
+    expect(deleteEvents.length).toBeGreaterThan(0)
+    expect(deleteEvents.some((e: ChangeMessage<Item>) => e.key === `2`)).toBe(
+      true,
+    )
+
+    subscription.unsubscribe()
+  })
+
+  it(`should emit delete event with limit and includeInitialState: true`, async () => {
+    // Create a live query with orderBy and limit (matching the user's exact pattern)
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(3)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+          name: items.name,
+        })),
+    )
+
+    // Wait for the live query collection to be ready
+    await liveQueryCollection.preload()
+
+    // Check initial results
+    const initialResults = Array.from(liveQueryCollection.values())
+    expect(initialResults).toHaveLength(3)
+    expect(initialResults.map((r) => r.id)).toEqual([`1`, `2`, `3`])
+
+    // Subscribe to changes on the live query collection with includeInitialState: true
+    // This is what the user is doing
+    const changeCallback = vi.fn()
+    const subscription = liveQueryCollection.subscribeChanges(changeCallback, {
+      includeInitialState: true,
+    })
+
+    // Wait for initial state to be sent
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Clear initial state calls
+    changeCallback.mockClear()
+
+    // Optimistically delete item 2 (which is in the visible top 3)
+    sourceCollection.delete(`2`)
+
+    // Wait for microtasks to process
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // The callback should have been called with the delete event
+    expect(changeCallback).toHaveBeenCalled()
+
+    // Get the changes from all calls
+    const allChanges = changeCallback.mock.calls.flatMap((call) => call[0])
+    console.log(
+      `All changes (with limit, includeInitialState: true):`,
+      JSON.stringify(allChanges, null, 2),
+    )
+
+    // Should have a delete for item 2
+    const deleteEvents = allChanges.filter(
+      (c: ChangeMessage<Item>) => c.type === `delete`,
+    )
+    expect(deleteEvents.length).toBeGreaterThan(0)
+    expect(deleteEvents.some((e: ChangeMessage<Item>) => e.key === `2`)).toBe(
+      true,
+    )
+
+    subscription.unsubscribe()
+  })
+
+  it(`should emit delete event with limit and offset`, async () => {
+    // Create a live query with orderBy, limit AND offset (matching the user's exact pattern)
+    const pageSize = 2
+    const pageIndex = 0
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(pageSize)
+        .offset(pageIndex * pageSize)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+          name: items.name,
+        })),
+    )
+
+    // Wait for the live query collection to be ready
+    await liveQueryCollection.preload()
+
+    // Check initial results - should be items 1 and 2 (highest values)
+    const initialResults = Array.from(liveQueryCollection.values())
+    expect(initialResults).toHaveLength(2)
+    expect(initialResults.map((r) => r.id)).toEqual([`1`, `2`])
+
+    // Subscribe to changes with includeInitialState: true (same as user)
+    const changeCallback = vi.fn()
+    const subscription = liveQueryCollection.subscribeChanges(changeCallback, {
+      includeInitialState: true,
+    })
+
+    // Wait for initial state to be sent
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Clear initial state calls
+    changeCallback.mockClear()
+
+    // Delete item 2 (which is in the visible page)
+    sourceCollection.delete(`2`)
+
+    // Wait for microtasks to process
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // The callback should have been called with the delete event
+    console.log(
+      `All changes (with limit+offset, includeInitialState: true):`,
+      JSON.stringify(
+        changeCallback.mock.calls.flatMap((call) => call[0]),
+        null,
+        2,
+      ),
+    )
+    expect(changeCallback).toHaveBeenCalled()
+
+    // Get the changes from all calls
+    const allChanges = changeCallback.mock.calls.flatMap((call) => call[0])
+
+    // Should have a delete for item 2
+    const deleteEvents = allChanges.filter(
+      (c: ChangeMessage<Item>) => c.type === `delete`,
+    )
+    expect(deleteEvents.length).toBeGreaterThan(0)
+    expect(deleteEvents.some((e: ChangeMessage<Item>) => e.key === `2`)).toBe(
+      true,
+    )
+
+    subscription.unsubscribe()
+  })
+
+  it(`should emit delete event with where clause, limit and offset (matching user's exact pattern)`, async () => {
+    // Create a live query that matches the user's pattern:
+    // query.where(...).orderBy(...).limit(pageSize).offset(pageIndex * pageSize)
+    const pageSize = 2
+    const pageIndex = 0
+    const search = `Item` // Simulating their search filter
+
+    const liveQueryCollection = createLiveQueryCollection((q) => {
+      let query = q.from({ items: sourceCollection })
+      // Add a where clause like the user does
+      query = query.where(({ items }) => like(items.name, `%${search}%`))
+      return query
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(pageSize)
+        .offset(pageIndex * pageSize)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+          name: items.name,
+        }))
+    })
+
+    // Wait for the live query collection to be ready
+    await liveQueryCollection.preload()
+
+    // Check initial results - should be items 1 and 2 (highest values matching search)
+    const initialResults = Array.from(liveQueryCollection.values())
+    console.log(
+      `Initial results (where + limit + offset):`,
+      JSON.stringify(initialResults, null, 2),
+    )
+    expect(initialResults).toHaveLength(2)
+    expect(initialResults.map((r) => r.id)).toEqual([`1`, `2`])
+
+    // Subscribe to changes with includeInitialState: true (same as user)
+    const changeCallback = vi.fn()
+    const subscription = liveQueryCollection.subscribeChanges(changeCallback, {
+      includeInitialState: true,
+    })
+
+    // Wait for initial state to be sent
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Clear initial state calls
+    changeCallback.mockClear()
+
+    // Delete item 2 (which is in the visible page)
+    sourceCollection.delete(`2`)
+
+    // Wait for microtasks to process
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // The callback should have been called with the delete event
+    console.log(
+      `All changes (where + limit + offset, includeInitialState: true):`,
+      JSON.stringify(
+        changeCallback.mock.calls.flatMap((call) => call[0]),
+        null,
+        2,
+      ),
+    )
+    expect(changeCallback).toHaveBeenCalled()
+
+    // Get the changes from all calls
+    const allChanges = changeCallback.mock.calls.flatMap((call) => call[0])
+
+    // Should have a delete for item 2
+    const deleteEvents = allChanges.filter(
+      (c: ChangeMessage<Item>) => c.type === `delete`,
+    )
+    expect(deleteEvents.length).toBeGreaterThan(0)
+    expect(deleteEvents.some((e: ChangeMessage<Item>) => e.key === `2`)).toBe(
+      true,
+    )
+
+    subscription.unsubscribe()
+  })
+
+  it(`should emit delete and update when deleting from different page (page 1 delete while viewing page 2)`, async () => {
+    // This test captures the scenario from Marius's environment:
+    // - Viewing page 2 (items 3 and 4 with offset=2, limit=2)
+    // - Delete an item from page 1 (item 2)
+    // - The live query should update because items shift:
+    //   - After delete, sorted order is: 1, 3, 4, 5
+    //   - Page 2 (offset=2, limit=2) should now show items 4 and 5
+    //   - So: item 3 should be deleted from result, item 5 should be inserted
+
+    const pageSize = 2
+    const pageIndex = 1 // page 2 (0-indexed)
+
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(pageSize)
+        .offset(pageIndex * pageSize)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+          name: items.name,
+        })),
+    )
+
+    // Wait for the live query collection to be ready
+    await liveQueryCollection.preload()
+
+    // Check initial results - page 2 should show items 3 and 4 (offset 2, limit 2)
+    // Sorted by value desc: 1 (100), 2 (90), 3 (80), 4 (70), 5 (60)
+    // Page 2 = offset 2 = items 3 and 4
+    const initialResults = Array.from(liveQueryCollection.values())
+    console.log(
+      `Initial results (page 2):`,
+      JSON.stringify(initialResults, null, 2),
+    )
+    expect(initialResults).toHaveLength(2)
+    expect(initialResults.map((r) => r.id)).toEqual([`3`, `4`])
+
+    // Subscribe to changes with includeInitialState: true
+    const changeCallback = vi.fn()
+    const subscription = liveQueryCollection.subscribeChanges(changeCallback, {
+      includeInitialState: true,
+    })
+
+    // Wait for initial state to be sent
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Clear initial state calls
+    changeCallback.mockClear()
+
+    // Delete item 2 (which is on page 1, NOT in current view)
+    console.log(`Deleting item 2 (on page 1, not visible on page 2)...`)
+    sourceCollection.delete(`2`)
+
+    // Wait for microtasks to process
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    // After deleting item 2:
+    // - Sorted order becomes: 1 (100), 3 (80), 4 (70), 5 (60)
+    // - Page 2 (offset 2, limit 2) should now show items 4 and 5
+    // - So: item 3 should be deleted from result, item 5 should be inserted
+
+    // Check the state after delete
+    const resultsAfterDelete = Array.from(liveQueryCollection.values())
+    console.log(
+      `Results after delete:`,
+      JSON.stringify(resultsAfterDelete, null, 2),
+    )
+
+    // The live query collection should now show items 4 and 5
+    expect(resultsAfterDelete).toHaveLength(2)
+    expect(resultsAfterDelete.map((r) => r.id)).toEqual([`4`, `5`])
+
+    // Check that we got the expected change events
+    console.log(
+      `All changes (page 2 after deleting from page 1):`,
+      JSON.stringify(
+        changeCallback.mock.calls.flatMap((call) => call[0]),
+        null,
+        2,
+      ),
+    )
+
+    // We should have received change events (delete for item 3, insert for item 5)
+    expect(changeCallback).toHaveBeenCalled()
+
+    const allChanges = changeCallback.mock.calls.flatMap((call) => call[0])
+
+    // Should have a delete for item 3 (shifted out of page 2)
+    const deleteEvents = allChanges.filter(
+      (c: ChangeMessage<Item>) => c.type === `delete`,
+    )
+    expect(deleteEvents.some((e: ChangeMessage<Item>) => e.key === `3`)).toBe(
+      true,
+    )
+
+    // Should have an insert for item 5 (shifted into page 2)
+    const insertEvents = allChanges.filter(
+      (c: ChangeMessage<Item>) => c.type === `insert`,
+    )
+    expect(insertEvents.some((e: ChangeMessage<Item>) => e.key === `5`)).toBe(
+      true,
+    )
+
+    subscription.unsubscribe()
+  })
+
+  it(`should NOT update when deleting item beyond TopK window (no-op case)`, async () => {
+    // Test scenario: delete an item that's AFTER the TopK window
+    // - Page 1: items 1 and 2 (offset=0, limit=2)
+    // - Delete item 5 (which is on page 3)
+    // - Page 1 should NOT change (items 1 and 2 are still there)
+
+    const pageSize = 2
+    const pageIndex = 0 // page 1
+
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(pageSize)
+        .offset(pageIndex * pageSize)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+          name: items.name,
+        })),
+    )
+
+    // Wait for the live query collection to be ready
+    await liveQueryCollection.preload()
+
+    // Check initial results - page 1 should show items 1 and 2
+    const initialResults = Array.from(liveQueryCollection.values())
+    console.log(
+      `Initial results (page 1 for no-op test):`,
+      JSON.stringify(initialResults, null, 2),
+    )
+    expect(initialResults).toHaveLength(2)
+    expect(initialResults.map((r) => r.id)).toEqual([`1`, `2`])
+
+    // Subscribe to changes
+    const changeCallback = vi.fn()
+    const subscription = liveQueryCollection.subscribeChanges(changeCallback, {
+      includeInitialState: true,
+    })
+
+    // Wait for initial state to be sent
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Clear initial state calls
+    changeCallback.mockClear()
+
+    // Delete item 5 (which is on page 3, beyond the TopK window)
+    console.log(`Deleting item 5 (on page 3, beyond TopK window)...`)
+    sourceCollection.delete(`5`)
+
+    // Wait for microtasks to process
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    // After deleting item 5:
+    // - Sorted order becomes: 1 (100), 2 (90), 3 (80), 4 (70)
+    // - Page 1 (offset 0, limit 2) still shows items 1 and 2
+    // - No change to page 1
+
+    // Check the state after delete
+    const resultsAfterDelete = Array.from(liveQueryCollection.values())
+    console.log(
+      `Results after delete (no-op):`,
+      JSON.stringify(resultsAfterDelete, null, 2),
+    )
+
+    // The live query collection should still show items 1 and 2
+    expect(resultsAfterDelete).toHaveLength(2)
+    expect(resultsAfterDelete.map((r) => r.id)).toEqual([`1`, `2`])
+
+    // Check that we did NOT receive any change events
+    console.log(
+      `Change events (should be empty):`,
+      JSON.stringify(
+        changeCallback.mock.calls.flatMap((call) => call[0]),
+        null,
+        2,
+      ),
+    )
+
+    // No changes expected since item 5 is outside the window
+    const allChanges = changeCallback.mock.calls.flatMap((call) => call[0])
+    expect(allChanges).toHaveLength(0)
+
+    subscription.unsubscribe()
+  })
+
+  it(`should update state correctly after delete with limit`, async () => {
+    // Create a live query with orderBy and limit
+    const liveQueryCollection = createLiveQueryCollection((q) =>
+      q
+        .from({ items: sourceCollection })
+        .orderBy(({ items }) => items.value, `desc`)
+        .limit(3)
+        .select(({ items }) => ({
+          id: items.id,
+          value: items.value,
+          name: items.name,
+        })),
+    )
+
+    // Wait for the live query collection to be ready
+    await liveQueryCollection.preload()
+
+    // Check initial results
+    let results = Array.from(liveQueryCollection.values())
+    expect(results.map((r) => r.id)).toEqual([`1`, `2`, `3`])
+
+    // Subscribe to changes
+    liveQueryCollection.subscribeChanges(() => {}, {
+      includeInitialState: false,
+    })
+
+    // Optimistically delete item 2 (which is in the visible top 3)
+    sourceCollection.delete(`2`)
+
+    // Wait for microtasks to process
+    await new Promise((resolve) => setTimeout(resolve, 10))
+
+    // Check that the state is updated
+    // Item 2 should be gone, and item 4 should move into the top 3
+    results = Array.from(liveQueryCollection.values())
+    expect(results.map((r) => r.id)).toEqual([`1`, `3`, `4`])
+  })
+})
diff --git a/packages/db/tests/query/optimizer.test.ts b/packages/db/tests/query/optimizer.test.ts
index 3748be66d..77ff8cbed 100644
--- a/packages/db/tests/query/optimizer.test.ts
+++ b/packages/db/tests/query/optimizer.test.ts
@@ -1,5 +1,5 @@
-import { describe, expect, test } from "vitest"
-import { optimizeQuery } from "../../src/query/optimizer.js"
+import { describe, expect, test } from 'vitest'
+import { optimizeQuery } from '../../src/query/optimizer.js'
 import {
   Aggregate,
   CollectionRef,
@@ -7,8 +7,8 @@ import {
   PropRef,
   QueryRef,
   Value,
-} from "../../src/query/ir.js"
-import type { QueryIR } from "../../src/query/ir.js"
+} from '../../src/query/ir.js'
+import type { QueryIR } from '../../src/query/ir.js'
 
 // Mock collection for testing
 const mockCollection = {
@@ -131,7 +131,7 @@ describe(`Query Optimizer`, () => {
       if (optimized.from.type === `queryRef`) {
         expect(optimized.from.query.where).toHaveLength(1)
         expect(optimized.from.query.where![0]).toEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
     })
@@ -198,7 +198,7 @@ describe(`Query Optimizer`, () => {
       if (optimized.from.type === `queryRef`) {
         expect(optimized.from.query.where).toHaveLength(1)
         expect(optimized.from.query.where![0]).toEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
 
@@ -210,7 +210,7 @@ describe(`Query Optimizer`, () => {
           expect(joinClause.from.query.where).toHaveLength(1)
           if (joinClause.from.query.where) {
             expect(joinClause.from.query.where[0]).toEqual(
-              createGt(createPropRef(`p`, `views`), createValue(100))
+              createGt(createPropRef(`p`, `views`), createValue(100)),
             )
           }
         }
@@ -239,7 +239,7 @@ describe(`Query Optimizer`, () => {
       // The main query should have the multi-source where clause
       expect(optimized.where).toHaveLength(1)
       expect(optimized.where![0]).toEqual(
-        createEq(createPropRef(`u`, `id`), createPropRef(`p`, `user_id`))
+        createEq(createPropRef(`u`, `id`), createPropRef(`p`, `user_id`)),
       )
 
       // The from should be a QueryRef with the single-source where clause
@@ -247,7 +247,7 @@ describe(`Query Optimizer`, () => {
       if (optimized.from.type === `queryRef`) {
         expect(optimized.from.query.where).toHaveLength(1)
         expect(optimized.from.query.where![0]).toEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
     })
@@ -268,7 +268,7 @@ describe(`Query Optimizer`, () => {
         where: [
           createAnd(
             createEq(createPropRef(`u`, `department_id`), createValue(1)),
-            createGt(createPropRef(`u`, `id`), createValue(100))
+            createGt(createPropRef(`u`, `id`), createValue(100)),
           ),
         ],
       }
@@ -303,7 +303,7 @@ describe(`Query Optimizer`, () => {
         where: [
           createOr(
             createEq(createPropRef(`u`, `department_id`), createValue(1)),
-            createEq(createPropRef(`u`, `department_id`), createValue(2))
+            createEq(createPropRef(`u`, `department_id`), createValue(2)),
           ),
         ],
       }
@@ -339,9 +339,9 @@ describe(`Query Optimizer`, () => {
           createAnd(
             createAnd(
               createEq(createPropRef(`u`, `department_id`), createValue(1)),
-              createGt(createPropRef(`u`, `id`), createValue(100))
+              createGt(createPropRef(`u`, `id`), createValue(100)),
             ),
-            createLt(createPropRef(`u`, `age`), createValue(65))
+            createLt(createPropRef(`u`, `age`), createValue(65)),
           ),
         ],
       }
@@ -385,7 +385,7 @@ describe(`Query Optimizer`, () => {
         having: [
           createGt(
             createAgg(`count`, createPropRef(`p`, `id`)),
-            createValue(5)
+            createValue(5),
           ),
         ],
         orderBy: [
@@ -448,7 +448,7 @@ describe(`Query Optimizer`, () => {
       if (optimized.from.type === `queryRef`) {
         expect(optimized.from.query.where).toHaveLength(1)
         expect(optimized.from.query.where![0]).toEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
     })
@@ -467,7 +467,7 @@ describe(`Query Optimizer`, () => {
         where: [
           createGt(
             createAgg(`count`, createPropRef(`p`, `id`)),
-            createValue(5)
+            createValue(5),
           ),
         ],
       }
@@ -485,8 +485,8 @@ describe(`Query Optimizer`, () => {
           expect(joinClause.from.query.where![0]).toEqual(
             createGt(
               createAgg(`count`, createPropRef(`p`, `id`)),
-              createValue(5)
-            )
+              createValue(5),
+            ),
           )
         }
       }
@@ -507,7 +507,7 @@ describe(`Query Optimizer`, () => {
           createEq(createPropRef(`u`, `id`), createPropRef(`p`, `user_id`)),
           createGt(
             createPropRef(`u`, `created_at`),
-            createPropRef(`p`, `created_at`)
+            createPropRef(`p`, `created_at`),
           ),
         ],
       }
@@ -566,7 +566,7 @@ describe(`Query Optimizer`, () => {
             from: new CollectionRef(mockCollection, `u`),
             where: [createGt(createPropRef(`u`, `id`), createValue(10))],
           },
-          `u`
+          `u`,
         ),
         where: [createLt(createPropRef(`u`, `age`), createValue(50))],
       }
@@ -641,7 +641,7 @@ describe(`Query Optimizer`, () => {
       // Multi-source clause should remain in main query
       expect(optimized.where).toHaveLength(1)
       expect(optimized.where![0]).toEqual(
-        createEq(createPropRef(`u`, `id`), createPropRef(`p`, `user_id`))
+        createEq(createPropRef(`u`, `id`), createPropRef(`p`, `user_id`)),
       )
 
       // Single-source clauses should be moved to subqueries
@@ -714,7 +714,7 @@ describe(`Query Optimizer`, () => {
       if (optimized.from.type === `queryRef`) {
         expect(optimized.from.query.where).toHaveLength(1)
         expect(optimized.from.query.where![0]).toEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
     })
@@ -745,7 +745,7 @@ describe(`Query Optimizer`, () => {
       if (optimized.from.type === `queryRef`) {
         expect(optimized.from.query.where).toHaveLength(1)
         expect(optimized.from.query.where![0]).toEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
     })
@@ -760,7 +760,7 @@ describe(`Query Optimizer`, () => {
             from: new CollectionRef(mockCollection, `u`),
             where: [createGt(createPropRef(`u`, `id`), createValue(10))],
           },
-          `u`
+          `u`,
         ),
         join: [
           {
@@ -802,11 +802,11 @@ describe(`Query Optimizer`, () => {
                 from: new CollectionRef(mockCollection, `u`),
                 where: [createGt(createPropRef(`u`, `id`), createValue(10))],
               },
-              `u`
+              `u`,
             ),
             where: [createLt(createPropRef(`u`, `age`), createValue(50))],
           },
-          `u`
+          `u`,
         ),
         join: [
           {
@@ -835,10 +835,10 @@ describe(`Query Optimizer`, () => {
         // Verify both conditions are in the combined expression
         const combinedWhere = innerQuery.where![0] as any
         expect(combinedWhere.args).toContainEqual(
-          createLt(createPropRef(`u`, `age`), createValue(50))
+          createLt(createPropRef(`u`, `age`), createValue(50)),
         )
         expect(combinedWhere.args).toContainEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
     })
@@ -852,10 +852,10 @@ describe(`Query Optimizer`, () => {
               {
                 from: new CollectionRef(mockCollection, `u`),
               },
-              `u`
+              `u`,
             ),
           },
-          `u`
+          `u`,
         ),
         join: [
           {
@@ -869,7 +869,7 @@ describe(`Query Optimizer`, () => {
       }
 
       const { optimizedQuery: optimized } = optimizeQuery(
-        queryWithRedundantSubqueries
+        queryWithRedundantSubqueries,
       )
 
       // Redundant nested subqueries should be removed, leaving a direct reference to the collection
@@ -878,7 +878,7 @@ describe(`Query Optimizer`, () => {
         expect(optimized.from.query.from.type).toBe(`collectionRef`)
         expect(optimized.from.query.where).toHaveLength(1)
         expect(optimized.from.query.where![0]).toEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
     })
@@ -890,7 +890,7 @@ describe(`Query Optimizer`, () => {
             from: new CollectionRef(mockCollection, `u`),
             where: [createGt(createPropRef(`u`, `age`), createValue(25))],
           },
-          `u`
+          `u`,
         ),
         join: [
           {
@@ -899,7 +899,7 @@ describe(`Query Optimizer`, () => {
                 from: new CollectionRef(mockCollection, `p`),
                 where: [createGt(createPropRef(`p`, `views`), createValue(50))],
               },
-              `p`
+              `p`,
             ),
             type: `inner`,
             left: createPropRef(`u`, `id`),
@@ -918,7 +918,7 @@ describe(`Query Optimizer`, () => {
       // Multi-source clause should remain in main query
       expect(optimized.where).toHaveLength(1)
       expect(optimized.where![0]).toEqual(
-        createEq(createPropRef(`u`, `id`), createPropRef(`p`, `author_id`))
+        createEq(createPropRef(`u`, `id`), createPropRef(`p`, `author_id`)),
       )
 
       // Single-source clauses should be pushed to their respective subqueries and combined
@@ -964,11 +964,11 @@ describe(`Query Optimizer`, () => {
                 from: new CollectionRef(mockCollection, `u`),
                 where: [createGt(createPropRef(`u`, `id`), createValue(10))],
               },
-              `u`
+              `u`,
             ),
             select: { name: createPropRef(`u`, `name`) }, // This makes the subquery non-redundant
           },
-          `u`
+          `u`,
         ),
         join: [
           {
@@ -982,7 +982,7 @@ describe(`Query Optimizer`, () => {
       }
 
       const { optimizedQuery: optimized } = optimizeQuery(
-        queryWithMeaningfulSubqueries
+        queryWithMeaningfulSubqueries,
       )
 
       // Should preserve the subquery with SELECT clause and push WHERE clause down at least one level
@@ -992,7 +992,7 @@ describe(`Query Optimizer`, () => {
         expect(optimized.from.query.select).toBeDefined()
         // The new WHERE clause should be pushed to this level or deeper
         expect(optimized.from.query.where).toContainEqual(
-          createEq(createPropRef(`u`, `department_id`), createValue(1))
+          createEq(createPropRef(`u`, `department_id`), createValue(1)),
         )
       }
     })
@@ -1060,7 +1060,7 @@ describe(`Query Optimizer`, () => {
             from: new CollectionRef(mockCollection, `u`),
             where: [createGt(createPropRef(`u`, `age`), createValue(18))],
           },
-          `u`
+          `u`,
         ),
         join: [
           {
@@ -1075,8 +1075,8 @@ describe(`Query Optimizer`, () => {
             createEq(createPropRef(`u`, `department_id`), createValue(1)),
             createOr(
               createGt(createPropRef(`u`, `salary`), createValue(50000)),
-              createEq(createPropRef(`u`, `role`), createValue(`manager`))
-            )
+              createEq(createPropRef(`u`, `role`), createValue(`manager`)),
+            ),
           ),
         ],
       }
@@ -1096,7 +1096,7 @@ describe(`Query Optimizer`, () => {
         // Verify it contains the original condition and the new conditions
         const combinedWhere = optimized.from.query.where![0] as any
         expect(combinedWhere.args).toContainEqual(
-          createGt(createPropRef(`u`, `age`), createValue(18))
+          createGt(createPropRef(`u`, `age`), createValue(18)),
         )
       }
     })
@@ -1127,11 +1127,11 @@ describe(`Query Optimizer`, () => {
         where: [
           createEq(
             createPropRef(`main_users`, `department_id`),
-            createValue(1)
+            createValue(1),
           ), // Should only affect main_users context
           createEq(
             createPropRef(`other_users`, `department_id`),
-            createValue(2)
+            createValue(2),
           ), // Should only affect other_users context
         ],
       }
@@ -1145,7 +1145,10 @@ describe(`Query Optimizer`, () => {
       expect(optimized.from.type).toBe(`queryRef`)
       if (optimized.from.type === `queryRef`) {
         expect(optimized.from.query.where).toContainEqual(
-          createEq(createPropRef(`main_users`, `department_id`), createValue(1))
+          createEq(
+            createPropRef(`main_users`, `department_id`),
+            createValue(1),
+          ),
         )
       }
 
@@ -1158,8 +1161,8 @@ describe(`Query Optimizer`, () => {
           expect(joinClause.from.query.where).toContainEqual(
             createEq(
               createPropRef(`other_users`, `department_id`),
-              createValue(2)
-            )
+              createValue(2),
+            ),
           )
         }
       }
@@ -1196,7 +1199,7 @@ describe(`Query Optimizer`, () => {
       // would change the aggregation results
       expect(optimized.where).toHaveLength(1)
       expect(optimized.where![0]).toEqual(
-        createGt(createPropRef(`stats`, `user_count`), createValue(5))
+        createGt(createPropRef(`stats`, `user_count`), createValue(5)),
       )
     })
 
@@ -1237,7 +1240,7 @@ describe(`Query Optimizer`, () => {
       // would change which users are in the "top 10"
       expect(optimized.where).toHaveLength(1)
       expect(optimized.where![0]).toEqual(
-        createEq(createPropRef(`top_users`, `department_id`), createValue(1))
+        createEq(createPropRef(`top_users`, `department_id`), createValue(1)),
       )
     })
 
@@ -1264,7 +1267,7 @@ describe(`Query Optimizer`, () => {
         where: [
           createEq(
             createPropRef(`filtered_users`, `department_id`),
-            createValue(1)
+            createValue(1),
           ), // Can be pushed down safely
         ],
       }
@@ -1278,8 +1281,8 @@ describe(`Query Optimizer`, () => {
         expect(optimized.from.query.where).toContainEqual(
           createEq(
             createPropRef(`filtered_users`, `department_id`),
-            createValue(1)
-          )
+            createValue(1),
+          ),
         )
       }
     })
@@ -1295,7 +1298,7 @@ describe(`Query Optimizer`, () => {
         having: [
           createGt(
             createAgg(`avg`, createPropRef(`u`, `salary`)),
-            createValue(50000)
+            createValue(50000),
           ),
         ],
       }
@@ -1313,7 +1316,7 @@ describe(`Query Optimizer`, () => {
         where: [
           createGt(
             createPropRef(`dept_stats`, `avg_salary`),
-            createValue(60000)
+            createValue(60000),
           ),
         ],
       }
@@ -1323,7 +1326,7 @@ describe(`Query Optimizer`, () => {
       // Should not optimize due to HAVING clause
       expect(optimized.where).toHaveLength(1)
       expect(optimized.where![0]).toEqual(
-        createGt(createPropRef(`dept_stats`, `avg_salary`), createValue(60000))
+        createGt(createPropRef(`dept_stats`, `avg_salary`), createValue(60000)),
       )
     })
 
@@ -1346,7 +1349,7 @@ describe(`Query Optimizer`, () => {
         where: [
           createEq(
             createPropRef(`computed_users`, `department_id`),
-            createValue(1)
+            createValue(1),
           ),
         ],
       }
@@ -1358,8 +1361,8 @@ describe(`Query Optimizer`, () => {
       expect(optimized.where![0]).toEqual(
         createEq(
           createPropRef(`computed_users`, `department_id`),
-          createValue(1)
-        )
+          createValue(1),
+        ),
       )
     })
 
@@ -1392,7 +1395,7 @@ describe(`Query Optimizer`, () => {
         where: [
           createEq(
             createPropRef(`sorted_users`, `department_id`),
-            createValue(1)
+            createValue(1),
           ),
         ],
       }
@@ -1406,8 +1409,8 @@ describe(`Query Optimizer`, () => {
         expect(optimized.from.query.where).toContainEqual(
           createEq(
             createPropRef(`sorted_users`, `department_id`),
-            createValue(1)
-          )
+            createValue(1),
+          ),
         )
       }
     })
@@ -1453,14 +1456,14 @@ describe(`Query Optimizer`, () => {
       // Only the unsafe clause should remain
       expect(optimized.where).toHaveLength(1)
       expect(optimized.where![0]).toEqual(
-        createGt(createPropRef(`dept_stats`, `user_count`), createValue(10))
+        createGt(createPropRef(`dept_stats`, `user_count`), createValue(10)),
       )
 
       // Safe subquery should be optimized
       expect(optimized.from.type).toBe(`queryRef`)
       if (optimized.from.type === `queryRef`) {
         expect(optimized.from.query.where).toContainEqual(
-          createEq(createPropRef(`users`, `department_id`), createValue(1))
+          createEq(createPropRef(`users`, `department_id`), createValue(1)),
         )
       }
     })
@@ -1492,7 +1495,7 @@ describe(`Query Optimizer`, () => {
           createGt(createPropRef(`p`, `views`), createValue(100)), // Can push down
           createEq(
             createPropRef(`stats`, `department_id`),
-            createPropRef(`p`, `author_dept`)
+            createPropRef(`p`, `author_dept`),
           ), // Multi-source
         ],
       }
@@ -1511,7 +1514,7 @@ describe(`Query Optimizer`, () => {
       // The stats clause and multi-source clause should remain BUT be combined into ONE
       console.log(
         `Remaining WHERE clauses: ${optimized.where?.length || 0}`,
-        JSON.stringify(optimized.where, null, 2)
+        JSON.stringify(optimized.where, null, 2),
       )
       expect(optimized.where).toBeDefined()
       // This is the KEY assertion - all remaining clauses should be combined
@@ -1549,12 +1552,12 @@ describe(`Query Optimizer`, () => {
           // This is an AND expression that can't be pushed down
           createAnd(
             createGt(createPropRef(`stats`, `user_count`), createValue(5)),
-            createEq(createPropRef(`stats`, `department_id`), createValue(1))
+            createEq(createPropRef(`stats`, `department_id`), createValue(1)),
           ),
           createGt(createPropRef(`p`, `views`), createValue(100)), // Can push down
           createEq(
             createPropRef(`stats`, `department_id`),
-            createPropRef(`p`, `author_dept`)
+            createPropRef(`p`, `author_dept`),
           ), // Multi-source
         ],
       }
@@ -1651,7 +1654,7 @@ describe(`Query Optimizer`, () => {
       expect(optimizedQuery.where![0]).toEqual({
         expression: createEq(
           createPropRef(`teamMember`, `user_id`),
-          createValue(100)
+          createValue(100),
         ),
         residual: true,
       })
@@ -1669,7 +1672,7 @@ describe(`Query Optimizer`, () => {
           expect(optimizedQuery.where).toContainEqual({
             expression: createEq(
               createPropRef(`teamMember`, `user_id`),
-              createValue(100)
+              createValue(100),
             ),
             residual: true,
           })
@@ -1717,7 +1720,7 @@ describe(`Query Optimizer`, () => {
       expect(optimizedQuery.where![0]).toEqual({
         expression: createEq(
           createPropRef(`user`, `department_id`),
-          createValue(1)
+          createValue(1),
         ),
         residual: true,
       })
@@ -1732,7 +1735,7 @@ describe(`Query Optimizer`, () => {
           expect(optimizedQuery.where).toContainEqual({
             expression: createEq(
               createPropRef(`user`, `department_id`),
-              createValue(1)
+              createValue(1),
             ),
             residual: true,
           })
@@ -1780,7 +1783,7 @@ describe(`Query Optimizer`, () => {
       expect(optimizedQuery.where![0]).toEqual({
         expression: createGt(
           createPropRef(`payment`, `amount`),
-          createValue(100)
+          createValue(100),
         ),
         residual: true,
       })
@@ -1798,7 +1801,7 @@ describe(`Query Optimizer`, () => {
           expect(optimizedQuery.where).toContainEqual({
             expression: createGt(
               createPropRef(`payment`, `amount`),
-              createValue(100)
+              createValue(100),
             ),
             residual: true,
           })
@@ -1848,7 +1851,7 @@ describe(`Query Optimizer`, () => {
       if (optimizedQuery.join![0]?.from.type === `queryRef`) {
         const deptSubquery = optimizedQuery.join![0].from.query
         expect(deptSubquery.where).toContainEqual(
-          createEq(createPropRef(`dept`, `budget`), createValue(100000))
+          createEq(createPropRef(`dept`, `budget`), createValue(100000)),
         )
       }
     })
diff --git a/packages/db/tests/query/optional-fields-negative.test-d.ts b/packages/db/tests/query/optional-fields-negative.test-d.ts
index 153361b68..56436d10c 100644
--- a/packages/db/tests/query/optional-fields-negative.test-d.ts
+++ b/packages/db/tests/query/optional-fields-negative.test-d.ts
@@ -1,7 +1,7 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { createLiveQueryCollection, eq, gt } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { createLiveQueryCollection, eq, gt } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Test types with optional fields
 type UserWithOptional = {
@@ -24,7 +24,7 @@ function createUsersCollection() {
       id: `test-users`,
       getKey: (user) => user.id,
       initialData: [],
-    })
+    }),
   )
 }
 
@@ -34,7 +34,7 @@ function createDepartmentsCollection() {
       id: `test-departments`,
       getKey: (dept) => dept.id,
       initialData: [],
-    })
+    }),
   )
 }
 
@@ -80,7 +80,7 @@ describe(`Optional Fields - Type Safety Tests`, () => {
             // This should work correctly - department_id is optional but can be used in join
             return eq(user.department_id, dept.id)
           },
-          `inner`
+          `inner`,
         ),
     })
 
@@ -149,7 +149,7 @@ describe(`Optional Fields - Type Safety Tests`, () => {
           .join(
             { dept: departmentsCollection },
             ({ user, dept }) => eq(user.department_id, dept.id),
-            `left`
+            `left`,
           )
           .select(({ user, dept }) => ({
             user_name: user.name,
diff --git a/packages/db/tests/query/optional-fields-runtime.test.ts b/packages/db/tests/query/optional-fields-runtime.test.ts
index 41fa4888d..158df33bf 100644
--- a/packages/db/tests/query/optional-fields-runtime.test.ts
+++ b/packages/db/tests/query/optional-fields-runtime.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from "vitest"
-import { createLiveQueryCollection, eq } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expect, it } from 'vitest'
+import { createLiveQueryCollection, eq } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Test types with optional fields
 type UserWithOptional = {
@@ -46,7 +46,7 @@ function createUsersCollection() {
           department_id: `dept2`,
         },
       ],
-    })
+    }),
   )
 }
 
@@ -67,7 +67,7 @@ function createDepartmentsCollection() {
           budget: 50000,
         },
       ],
-    })
+    }),
   )
 }
 
@@ -162,7 +162,7 @@ describe(`Optional Fields - Runtime Tests`, () => {
           .join(
             { dept: departmentsCollection },
             ({ user, dept }) => eq(user.department_id, dept.id),
-            `left`
+            `left`,
           )
           .select(({ user, dept }) => ({
             user_name: user.name,
@@ -207,7 +207,7 @@ describe(`Optional Fields - Runtime Tests`, () => {
 
     // Check that we have a group for undefined department_id (Bob)
     const undefinedDeptGroup = groupByResults.find(
-      (r) => r.department_id === undefined
+      (r) => r.department_id === undefined,
     )
     expect(undefinedDeptGroup).toBeDefined()
 
diff --git a/packages/db/tests/query/order-by.test.ts b/packages/db/tests/query/order-by.test.ts
index 82afec689..c35760599 100644
--- a/packages/db/tests/query/order-by.test.ts
+++ b/packages/db/tests/query/order-by.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, it } from "vitest"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
-import { createLiveQueryCollection } from "../../src/query/live-query-collection.js"
+import { beforeEach, describe, expect, it } from 'vitest'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import { createLiveQueryCollection } from '../../src/query/live-query-collection.js'
 import {
   eq,
   gt,
@@ -9,8 +9,8 @@ import {
   lt,
   max,
   not,
-} from "../../src/query/builder/functions.js"
-import { createFilterFunctionFromExpression } from "../../src/collection/change-events.js"
+} from '../../src/query/builder/functions.js'
+import { createFilterFunctionFromExpression } from '../../src/collection/change-events.js'
 
 type Person = {
   id: string
@@ -225,7 +225,7 @@ function createEmployeesCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (employee) => employee.id,
       initialData: employeeData,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -236,12 +236,12 @@ function createDepartmentsCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (department) => department.id,
       initialData: departmentData,
       autoIndex,
-    })
+    }),
   )
 }
 
 function createEmployeesWithNullableCollection(
-  autoIndex: `off` | `eager` = `eager`
+  autoIndex: `off` | `eager` = `eager`,
 ) {
   return createCollection(
     mockSyncCollectionOptions<EmployeeWithNullableFields>({
@@ -249,7 +249,7 @@ function createEmployeesWithNullableCollection(
       getKey: (employee) => employee.id,
       initialData: employeeWithNullableData,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -272,7 +272,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ employees }) => ({
               id: employees.id,
               name: employees.name,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -297,7 +297,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -317,7 +317,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ employees }) => ({
               id: employees.id,
               name: employees.name,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -340,7 +340,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               name: employees.name,
               department_id: employees.department_id,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -352,7 +352,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
         // Department 1: Charlie (55000), Eve (52000), Alice (50000)
         // Department 2: Diana (65000), Bob (60000)
         expect(
-          results.map((r) => ({ dept: r.department_id, salary: r.salary }))
+          results.map((r) => ({ dept: r.department_id, salary: r.salary })),
         ).toEqual([
           { dept: 1, salary: 55000 }, // Charlie
           { dept: 1, salary: 52000 }, // Eve
@@ -372,7 +372,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               hire_date: employees.hire_date,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -396,7 +396,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -416,7 +416,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -437,7 +437,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -456,10 +456,10 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               .select(({ employees }) => ({
                 id: employees.id,
                 name: employees.name,
-              }))
+              })),
           )
         }).toThrow(
-          `LIMIT and OFFSET require an ORDER BY clause to ensure deterministic results`
+          `LIMIT and OFFSET require an ORDER BY clause to ensure deterministic results`,
         )
       })
 
@@ -474,7 +474,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -521,7 +521,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -568,7 +568,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -619,7 +619,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -662,7 +662,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -705,7 +705,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -744,7 +744,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -775,7 +775,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .join(
               { departments: departmentsCollection },
               ({ employees, departments }) =>
-                eq(employees.department_id, departments.id)
+                eq(employees.department_id, departments.id),
             )
             .orderBy(({ departments }) => departments?.name, `asc`)
             .orderBy(({ employees }) => employees.salary, `desc`)
@@ -784,7 +784,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               employee_name: employees.name,
               department_name: departments?.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -796,7 +796,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
         // Engineering: Charlie (55000), Eve (52000), Alice (50000)
         // Sales: Diana (65000), Bob (60000)
         expect(
-          results.map((r) => ({ dept: r.department_name, salary: r.salary }))
+          results.map((r) => ({ dept: r.department_name, salary: r.salary })),
         ).toEqual([
           { dept: `Engineering`, salary: 55000 }, // Charlie
           { dept: `Engineering`, salary: 52000 }, // Eve
@@ -827,7 +827,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             getKey: (doc) => doc.id,
             autoIndex: `eager`,
             initialData: vehicleDocumentsData,
-          })
+          }),
         )
 
         const liveQuery = createLiveQueryCollection({
@@ -883,7 +883,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             getKey: (doc) => doc.id,
             autoIndex: `eager`,
             initialData: vehicleDocumentsData,
-          })
+          }),
         )
 
         const liveQuery = createLiveQueryCollection({
@@ -938,7 +938,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -959,7 +959,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -981,7 +981,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1003,7 +1003,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1048,7 +1048,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1083,7 +1083,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1110,7 +1110,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             id: `test-string-id-sequence`,
             getKey: (person: Person) => person.id,
             initialData: initialPersons,
-          })
+          }),
         )
 
         const liveQuery = createLiveQueryCollection((q) =>
@@ -1120,7 +1120,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: c.id,
               name: c.name,
             }))
-            .orderBy(({ collection: c }) => c.id, `asc`)
+            .orderBy(({ collection: c }) => c.id, `asc`),
         )
         await liveQuery.preload()
 
@@ -1203,7 +1203,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             id: `test-empty-employees`,
             getKey: (employee) => employee.id,
             initialData: [],
-          })
+          }),
         )
 
         const collection = createLiveQueryCollection((q) =>
@@ -1213,7 +1213,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ employees }) => ({
               id: employees.id,
               name: employees.name,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1245,7 +1245,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               },
             ],
             autoIndex,
-          })
+          }),
         )
 
         // When autoIndex is `eager` this creates an index on the date field
@@ -1253,7 +1253,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
           q
             .from({ numbers: dateCollection })
             .orderBy(({ numbers }) => numbers.date, `asc`)
-            .limit(1)
+            .limit(1),
         )
         await firstQuery.preload()
 
@@ -1262,7 +1262,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
           q
             .from({ numbers: dateCollection })
             .orderBy(({ numbers }) => numbers.value, `asc`)
-            .limit(1)
+            .limit(1),
         )
         await orderByQuery.preload()
 
@@ -1302,7 +1302,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               },
             ],
             autoIndex,
-          })
+          }),
         )
 
         // When autoIndex is `eager` this creates an index on the date field
@@ -1314,7 +1314,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ numbers }) => ({
               id: numbers.id,
               date: numbers.date,
-            }))
+            })),
         )
         await firstQuery.preload()
 
@@ -1327,7 +1327,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ numbers }) => ({
               id: numbers.id,
               date: numbers.date,
-            }))
+            })),
         )
         await orderByQuery.preload()
 
@@ -1363,7 +1363,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               },
             ],
             autoIndex,
-          })
+          }),
         )
 
         // When autoIndex is `eager` this creates an index on the date field
@@ -1374,7 +1374,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               direction: `asc`,
               nulls: `last`,
             })
-            .limit(3)
+            .limit(3),
         )
         await query1.preload()
 
@@ -1386,7 +1386,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
         const query2 = createLiveQueryCollection((q) =>
           q
             .from({ persons: personsCollection })
-            .where(({ persons }) => lt(persons.age, 18))
+            .where(({ persons }) => lt(persons.age, 18)),
         )
         await query2.preload()
 
@@ -1401,7 +1401,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
         const query3 = createLiveQueryCollection((q) =>
           q
             .from({ persons: personsCollection })
-            .where(({ persons }) => gt(persons.age, 18))
+            .where(({ persons }) => gt(persons.age, 18)),
         )
         await query3.preload()
 
@@ -1436,7 +1436,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               },
             ],
             autoIndex,
-          })
+          }),
         )
 
         // When autoIndex is `eager` this creates an index on the date field
@@ -1447,7 +1447,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               direction: `asc`,
               stringSort: `lexical`,
             })
-            .limit(2)
+            .limit(2),
         )
         await query1.preload()
 
@@ -1463,7 +1463,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               stringSort: `locale`,
               locale: `en-US`,
             })
-            .limit(2)
+            .limit(2),
         )
         await query2.preload()
 
@@ -1500,7 +1500,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               },
             ],
             autoIndex,
-          })
+          }),
         )
 
         // When autoIndex is `eager` this creates an index on the value field with nulls first
@@ -1515,7 +1515,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ items }) => ({
               id: items.id,
               value: items.value,
-            }))
+            })),
         )
         await query1.preload()
 
@@ -1534,7 +1534,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ items }) => ({
               id: items.id,
               value: items.value,
-            }))
+            })),
         )
         await query2.preload()
 
@@ -1565,7 +1565,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1596,7 +1596,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1627,7 +1627,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1658,7 +1658,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1694,7 +1694,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               name: employees.name,
               department_id: employees.department_id,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1707,7 +1707,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
         // Department 1: Alice (50000), Eve (52000)
         // Department 2: Diana (65000), Bob (null)
         expect(
-          results.map((r) => ({ dept: r.department_id, salary: r.salary }))
+          results.map((r) => ({ dept: r.department_id, salary: r.salary })),
         ).toEqual([
           { dept: null, salary: 55000 }, // Charlie
           { dept: null, salary: null }, // Frank
@@ -1730,7 +1730,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: employees.id,
               name: employees.name,
               salary: employees.salary,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -1806,7 +1806,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
                   id: employees.id,
                   name: employees.name,
                   salary: employees.salary,
-                }))
+                })),
             )
 
             await collection.preload()
@@ -1814,12 +1814,12 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             const builder = (collection as any).config.__builder
             expect(builder).toBeTruthy()
             expect(
-              Object.keys(builder.optimizableOrderByCollections)
+              Object.keys(builder.optimizableOrderByCollections),
             ).toContain(employeesCollection.id)
           } finally {
             CollectionConfigBuilder.prototype.getConfig = originalGetConfig
           }
-        }
+        },
       )
 
       itWhenAutoIndex(
@@ -1844,7 +1844,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
                 .join(
                   { departments: departmentsCollection },
                   ({ employees, departments }) =>
-                    eq(employees.department_id, departments.id)
+                    eq(employees.department_id, departments.id),
                 )
                 .orderBy(({ departments }) => departments?.name, `asc`)
                 .limit(5)
@@ -1852,7 +1852,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
                   employeeId: employees.id,
                   employeeName: employees.name,
                   departmentName: departments?.name,
-                }))
+                })),
             )
 
             await collection.preload()
@@ -1862,7 +1862,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
 
             // Verify that the order-by optimization is scoped to the departments alias
             const orderByInfo = Object.values(
-              builder.optimizableOrderByCollections
+              builder.optimizableOrderByCollections,
             )[0] as any
             expect(orderByInfo).toBeDefined()
             expect(orderByInfo.alias).toBe(`departments`)
@@ -1871,7 +1871,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
           } finally {
             CollectionConfigBuilder.prototype.getConfig = originalGetConfig
           }
-        }
+        },
       )
 
       itWhenAutoIndex(
@@ -1899,7 +1899,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
                   id: employees.id,
                   name: employees.name,
                   salary: employees.salary,
-                }))
+                })),
             )
 
             await collection.preload()
@@ -1907,12 +1907,12 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             const builder = (collection as any).config.__builder
             expect(builder).toBeTruthy()
             expect(
-              Object.keys(builder.optimizableOrderByCollections)
+              Object.keys(builder.optimizableOrderByCollections),
             ).toContain(employeesCollection.id)
           } finally {
             CollectionConfigBuilder.prototype.getConfig = originalGetConfig
           }
-        }
+        },
       )
     })
 
@@ -1948,7 +1948,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             getKey: (employee) => employee.id,
             initialData: numericEmployees,
             autoIndex,
-          })
+          }),
         )
 
         // Test lexical sorting (should sort by character code)
@@ -1962,7 +1962,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ employees }) => ({
               id: employees.id,
               name: employees.name,
-            }))
+            })),
         )
         await lexicalCollection.preload()
 
@@ -1982,7 +1982,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             .select(({ employees }) => ({
               id: employees.id,
               name: employees.name,
-            }))
+            })),
         )
         await localeCollection.preload()
 
@@ -2003,7 +2003,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
             getKey: (person) => person.id,
             initialData: initialPersons,
             autoIndex,
-          })
+          }),
         )
       }
 
@@ -2022,7 +2022,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: persons.id,
               name: persons.name,
               score: persons.profile?.score,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -2045,7 +2045,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: persons.id,
               name: persons.name,
               score: persons.profile?.score,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -2069,7 +2069,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               name: persons.name,
               rating: persons.profile?.stats.rating,
               tasksCompleted: persons.profile?.stats.tasksCompleted,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -2094,7 +2094,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               name: persons.name,
               team: persons.team,
               score: persons.profile?.score,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -2124,7 +2124,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               name: persons.name,
               city: persons.address?.city,
               lat: persons.address?.coordinates.lat,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -2160,7 +2160,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: persons.id,
               name: persons.name,
               score: persons.profile?.score,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -2181,7 +2181,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: persons.id,
               name: persons.name,
               score: persons.profile?.score,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -2229,7 +2229,7 @@ function createOrderByTests(autoIndex: `off` | `eager`): void {
               id: persons.id,
               name: persons.name,
               city: persons.address?.city,
-            }))
+            })),
         )
         await collection.preload()
 
@@ -2280,7 +2280,7 @@ describe(`OrderBy with collection-level StringSortOpts`, () => {
         defaultStringCollation: {
           stringSort: `lexical`,
         },
-      })
+      }),
     )
 
     // Query without specifying stringSort should use collection's lexical default
@@ -2291,7 +2291,7 @@ describe(`OrderBy with collection-level StringSortOpts`, () => {
         .select(({ items }) => ({
           id: items.id,
           name: items.name,
-        }))
+        })),
     )
     await lexicalQuery.preload()
 
@@ -2314,7 +2314,7 @@ describe(`OrderBy with collection-level StringSortOpts`, () => {
         defaultStringCollation: {
           stringSort: `lexical`,
         },
-      })
+      }),
     )
 
     // Query with explicit locale stringSort should override collection's lexical default
@@ -2329,7 +2329,7 @@ describe(`OrderBy with collection-level StringSortOpts`, () => {
         .select(({ items }) => ({
           id: items.id,
           name: items.name,
-        }))
+        })),
     )
     await localeQuery.preload()
 
@@ -2352,7 +2352,7 @@ describe(`OrderBy with collection-level StringSortOpts`, () => {
         defaultStringCollation: {
           stringSort: `lexical`,
         },
-      })
+      }),
     )
 
     // First query without specifying stringSort should use collection's lexical default
@@ -2363,7 +2363,7 @@ describe(`OrderBy with collection-level StringSortOpts`, () => {
         .select(({ items }) => ({
           id: items.id,
           name: items.name,
-        }))
+        })),
     )
     await firstQuery.preload()
 
@@ -2383,7 +2383,7 @@ describe(`OrderBy with collection-level StringSortOpts`, () => {
         .select(({ items }) => ({
           id: items.id,
           name: items.name,
-        }))
+        })),
     )
     await secondQuery.preload()
 
@@ -2403,7 +2403,7 @@ describe(`OrderBy with collection-level StringSortOpts`, () => {
         .select(({ items }) => ({
           id: items.id,
           name: items.name,
-        }))
+        })),
     )
     await thirdQuery.preload()
 
@@ -2527,7 +2527,7 @@ describe(`OrderBy with duplicate values`, () => {
             getKey: (item) => item.id,
             initialData: duplicateTestData,
             autoIndex,
-          })
+          }),
         )
 
         // Create a live query with offset 0, limit 5 (first page)
@@ -2542,13 +2542,13 @@ describe(`OrderBy with duplicate values`, () => {
               id: items.id,
               a: items.a,
               keep: items.keep,
-            }))
+            })),
         )
         await collection.preload()
 
         // First page should return items 1-5
         let results = Array.from(collection.values()).sort(
-          (a, b) => a.id - b.id
+          (a, b) => a.id - b.id,
         )
         expect(results).toEqual([
           { id: 1, a: 1, keep: true },
@@ -2600,6 +2600,7 @@ describe(`OrderBy with duplicate values`, () => {
       it(`should correctly advance window when there are duplicate values loaded from sync layer`, async () => {
         // Create test data that reproduces the specific bug described:
         // Items with many duplicates at value 5, then normal progression
+        // Note: loadSubset now receives cursor expressions (whereFrom/whereCurrent) separately from where
         const allTestData: Array<TestItem> = [
           { id: 1, a: 1, keep: true },
           { id: 2, a: 2, keep: true },
@@ -2622,6 +2623,7 @@ describe(`OrderBy with duplicate values`, () => {
         // Start with only the first 5 items in the local collection
         const initialData = allTestData.slice(0, 5)
         let loadSubsetCallCount = 0
+        const loadSubsetCursors: Array<unknown> = []
 
         const duplicateCollection = createCollection(
           mockSyncCollectionOptions<TestItem>({
@@ -2646,6 +2648,7 @@ describe(`OrderBy with duplicate values`, () => {
                 return {
                   loadSubset: (options) => {
                     loadSubsetCallCount++
+                    loadSubsetCursors.push(options.cursor)
 
                     // Simulate async loading from remote source
                     return new Promise<void>((resolve) => {
@@ -2654,7 +2657,7 @@ describe(`OrderBy with duplicate values`, () => {
 
                         // Order all test data by field 'a' in ascending order
                         const sortedData = [...allTestData].sort(
-                          (a, b) => a.a - b.a
+                          (a, b) => a.a - b.a,
                         )
 
                         // Apply where clause filter if present
@@ -2662,7 +2665,7 @@ describe(`OrderBy with duplicate values`, () => {
                         if (options.where) {
                           try {
                             const filterFn = createFilterFunctionFromExpression(
-                              options.where
+                              options.where,
                             )
                             filteredData = sortedData.filter(filterFn)
                           } catch (error) {
@@ -2672,11 +2675,57 @@ describe(`OrderBy with duplicate values`, () => {
                           }
                         }
 
-                        // Return a slice from 0 to limit
+                        // Apply cursor expressions if present (cursor-based pagination)
+                        // For proper cursor-based pagination:
+                        // - whereCurrent should load ALL ties (no limit)
+                        // - whereFrom should load with remaining limit
+                        if (options.cursor) {
+                          const { whereFrom, whereCurrent } = options.cursor
+                          const { limit } = options
+                          try {
+                            // Get ALL rows matching whereCurrent (no limit for ties)
+                            const whereCurrentFn =
+                              createFilterFunctionFromExpression(whereCurrent)
+                            const currentData =
+                              filteredData.filter(whereCurrentFn)
+
+                            // Get rows matching whereFrom with limit (for next page data)
+                            const whereFromFn =
+                              createFilterFunctionFromExpression(whereFrom)
+                            const fromData = filteredData.filter(whereFromFn)
+                            const limitedFromData = limit
+                              ? fromData.slice(0, limit)
+                              : fromData
+
+                            // Combine: current rows + from rows (deduplicated)
+                            const seenIds = new Set<number>()
+                            filteredData = []
+                            for (const item of currentData) {
+                              if (!seenIds.has(item.id)) {
+                                seenIds.add(item.id)
+                                filteredData.push(item)
+                              }
+                            }
+                            for (const item of limitedFromData) {
+                              if (!seenIds.has(item.id)) {
+                                seenIds.add(item.id)
+                                filteredData.push(item)
+                              }
+                            }
+                            // Re-sort after combining
+                            filteredData.sort((a, b) => a.a - b.a)
+                          } catch (error) {
+                            console.log(`Error applying cursor:`, error)
+                          }
+                        }
+
+                        // Apply limit for initial page load (no cursor).
+                        // When cursor is present, limit was already applied in the cursor block above.
                         const { limit } = options
-                        const dataToLoad = limit
-                          ? filteredData.slice(0, limit)
-                          : filteredData
+                        const dataToLoad =
+                          limit && !options.cursor
+                            ? filteredData.slice(0, limit)
+                            : filteredData
 
                         dataToLoad.forEach((item) => {
                           write({
@@ -2693,7 +2742,7 @@ describe(`OrderBy with duplicate values`, () => {
                 }
               },
             },
-          })
+          }),
         )
 
         // Create a live query with offset 0, limit 5 (first page)
@@ -2708,13 +2757,13 @@ describe(`OrderBy with duplicate values`, () => {
               id: items.id,
               a: items.a,
               keep: items.keep,
-            }))
+            })),
         )
         await collection.preload()
 
         // First page should return items 1-5 (all local data)
         let results = Array.from(collection.values()).sort(
-          (a, b) => a.id - b.id
+          (a, b) => a.id - b.id,
         )
         expect(results).toEqual([
           { id: 1, a: 1, keep: true },
@@ -2724,8 +2773,10 @@ describe(`OrderBy with duplicate values`, () => {
           { id: 5, a: 5, keep: true },
         ])
         expect(loadSubsetCallCount).toBe(1)
+        // First loadSubset call (initial page at offset 0) has no cursor
+        expect(loadSubsetCursors[0]).toBeUndefined()
 
-        // Now move to next page (offset 5, limit 5) - this should trigger loadSubset
+        // Now move to next page (offset 5, limit 5) - this should trigger loadSubset with a cursor
         const moveToSecondPage = collection.utils.setWindow({
           offset: 5,
           limit: 5,
@@ -2742,8 +2793,12 @@ describe(`OrderBy with duplicate values`, () => {
           { id: 9, a: 5, keep: true },
           { id: 10, a: 5, keep: true },
         ])
-        // we expect 2 new loadSubset calls (1 for data equal to max value and one for data greater than max value)
-        expect(loadSubsetCallCount).toBe(3)
+        // we expect 1 new loadSubset call (cursor expressions for whereFrom/whereCurrent are now combined in single call)
+        expect(loadSubsetCallCount).toBe(2)
+        // Second loadSubset call (pagination) has a cursor with whereFrom and whereCurrent
+        expect(loadSubsetCursors[1]).toBeDefined()
+        expect(loadSubsetCursors[1]).toHaveProperty(`whereFrom`)
+        expect(loadSubsetCursors[1]).toHaveProperty(`whereCurrent`)
 
         // Now move to third page (offset 10, limit 5)
         // It should advance past the duplicate 5s
@@ -2771,12 +2826,13 @@ describe(`OrderBy with duplicate values`, () => {
         // We expect no more loadSubset calls because when we loaded the previous page
         // we asked for all data equal to max value and LIMIT values greater than max value
         // and the LIMIT values greater than max value already loaded the next page
-        expect(loadSubsetCallCount).toBe(3)
+        expect(loadSubsetCallCount).toBe(2)
       })
 
       it(`should correctly advance window when there are duplicate values loaded from both local collection and sync layer`, async () => {
         // Create test data that reproduces the specific bug described:
         // Items with many duplicates at value 5, then normal progression
+        // Note: loadSubset now receives cursor expressions (whereFrom/whereCurrent) separately from where
         const allTestData: Array<TestItem> = [
           { id: 1, a: 1, keep: true },
           { id: 2, a: 2, keep: true },
@@ -2796,9 +2852,10 @@ describe(`OrderBy with duplicate values`, () => {
           { id: 16, a: 16, keep: true },
         ]
 
-        // Start with only the first 5 items in the local collection
+        // Start with the first 10 items in the local collection (includes all duplicates)
         const initialData = allTestData.slice(0, 10)
         let loadSubsetCallCount = 0
+        const loadSubsetCursors: Array<unknown> = []
 
         const duplicateCollection = createCollection(
           mockSyncCollectionOptions<TestItem>({
@@ -2823,6 +2880,7 @@ describe(`OrderBy with duplicate values`, () => {
                 return {
                   loadSubset: (options) => {
                     loadSubsetCallCount++
+                    loadSubsetCursors.push(options.cursor)
 
                     // Simulate async loading from remote source
                     return new Promise<void>((resolve) => {
@@ -2831,7 +2889,7 @@ describe(`OrderBy with duplicate values`, () => {
 
                         // Order all test data by field 'a' in ascending order
                         const sortedData = [...allTestData].sort(
-                          (a, b) => a.a - b.a
+                          (a, b) => a.a - b.a,
                         )
 
                         // Apply where clause filter if present
@@ -2839,7 +2897,7 @@ describe(`OrderBy with duplicate values`, () => {
                         if (options.where) {
                           try {
                             const filterFn = createFilterFunctionFromExpression(
-                              options.where
+                              options.where,
                             )
                             filteredData = sortedData.filter(filterFn)
                           } catch (error) {
@@ -2849,11 +2907,57 @@ describe(`OrderBy with duplicate values`, () => {
                           }
                         }
 
-                        // Return a slice from 0 to limit
+                        // Apply cursor expressions if present (cursor-based pagination)
+                        // For proper cursor-based pagination:
+                        // - whereCurrent should load ALL ties (no limit)
+                        // - whereFrom should load with remaining limit
+                        if (options.cursor) {
+                          const { whereFrom, whereCurrent } = options.cursor
+                          const { limit } = options
+                          try {
+                            // Get ALL rows matching whereCurrent (no limit for ties)
+                            const whereCurrentFn =
+                              createFilterFunctionFromExpression(whereCurrent)
+                            const currentData =
+                              filteredData.filter(whereCurrentFn)
+
+                            // Get rows matching whereFrom with limit (for next page data)
+                            const whereFromFn =
+                              createFilterFunctionFromExpression(whereFrom)
+                            const fromData = filteredData.filter(whereFromFn)
+                            const limitedFromData = limit
+                              ? fromData.slice(0, limit)
+                              : fromData
+
+                            // Combine: current rows + from rows (deduplicated)
+                            const seenIds = new Set<number>()
+                            filteredData = []
+                            for (const item of currentData) {
+                              if (!seenIds.has(item.id)) {
+                                seenIds.add(item.id)
+                                filteredData.push(item)
+                              }
+                            }
+                            for (const item of limitedFromData) {
+                              if (!seenIds.has(item.id)) {
+                                seenIds.add(item.id)
+                                filteredData.push(item)
+                              }
+                            }
+                            // Re-sort after combining
+                            filteredData.sort((a, b) => a.a - b.a)
+                          } catch (error) {
+                            console.log(`Error applying cursor:`, error)
+                          }
+                        }
+
+                        // Apply limit for initial page load (no cursor).
+                        // When cursor is present, limit was already applied in the cursor block above.
                         const { limit } = options
-                        const dataToLoad = limit
-                          ? filteredData.slice(0, limit)
-                          : filteredData
+                        const dataToLoad =
+                          limit && !options.cursor
+                            ? filteredData.slice(0, limit)
+                            : filteredData
 
                         dataToLoad.forEach((item) => {
                           write({
@@ -2870,7 +2974,7 @@ describe(`OrderBy with duplicate values`, () => {
                 }
               },
             },
-          })
+          }),
         )
 
         // Create a live query with offset 0, limit 5 (first page)
@@ -2885,13 +2989,13 @@ describe(`OrderBy with duplicate values`, () => {
               id: items.id,
               a: items.a,
               keep: items.keep,
-            }))
+            })),
         )
         await collection.preload()
 
         // First page should return items 1-5 (all local data)
         let results = Array.from(collection.values()).sort(
-          (a, b) => a.id - b.id
+          (a, b) => a.id - b.id,
         )
         expect(results).toEqual([
           { id: 1, a: 1, keep: true },
@@ -2901,8 +3005,10 @@ describe(`OrderBy with duplicate values`, () => {
           { id: 5, a: 5, keep: true },
         ])
         expect(loadSubsetCallCount).toBe(1)
+        // First loadSubset call (initial page at offset 0) has no cursor
+        expect(loadSubsetCursors[0]).toBeUndefined()
 
-        // Now move to next page (offset 5, limit 5) - this should trigger loadSubset
+        // Now move to next page (offset 5, limit 5) - this should trigger loadSubset with a cursor
         const moveToSecondPage = collection.utils.setWindow({
           offset: 5,
           limit: 5,
@@ -2919,8 +3025,12 @@ describe(`OrderBy with duplicate values`, () => {
           { id: 9, a: 5, keep: true },
           { id: 10, a: 5, keep: true },
         ])
-        // we expect 2 new loadSubset calls (1 for data equal to max value and one for data greater than max value)
-        expect(loadSubsetCallCount).toBe(3)
+        // we expect 1 new loadSubset call (cursor expressions for whereFrom/whereCurrent are now combined in single call)
+        expect(loadSubsetCallCount).toBe(2)
+        // Second loadSubset call (pagination) has a cursor with whereFrom and whereCurrent
+        expect(loadSubsetCursors[1]).toBeDefined()
+        expect(loadSubsetCursors[1]).toHaveProperty(`whereFrom`)
+        expect(loadSubsetCursors[1]).toHaveProperty(`whereCurrent`)
 
         // Now move to third page (offset 10, limit 5)
         // It should advance past the duplicate 5s
@@ -2948,7 +3058,7 @@ describe(`OrderBy with duplicate values`, () => {
         // We expect no more loadSubset calls because when we loaded the previous page
         // we asked for all data equal to max value and LIMIT values greater than max value
         // and the LIMIT values greater than max value already loaded the next page
-        expect(loadSubsetCallCount).toBe(3)
+        expect(loadSubsetCallCount).toBe(2)
       })
     })
   }
@@ -2992,8 +3102,9 @@ describe(`OrderBy with Date values and precision differences`, () => {
 
     const initialData = testData.slice(0, 5)
 
-    // Track the WHERE clauses sent to loadSubset
-    const loadSubsetWhereClauses: Array<any> = []
+    // Track the cursor expressions sent to loadSubset
+    // Note: cursor expressions are now passed separately from where (whereFrom/whereCurrent/lastKey)
+    const loadSubsetCursors: Array<any> = []
 
     const sourceCollection = createCollection(
       mockSyncCollectionOptions<TestItemWithDate>({
@@ -3013,21 +3124,21 @@ describe(`OrderBy with Date values and precision differences`, () => {
 
             return {
               loadSubset: (options) => {
-                // Capture the WHERE clause for inspection
-                loadSubsetWhereClauses.push(options.where)
+                // Capture the cursor for inspection (now contains whereFrom/whereCurrent/lastKey)
+                loadSubsetCursors.push(options.cursor)
 
                 return new Promise<void>((resolve) => {
                   setTimeout(() => {
                     begin()
                     const sortedData = [...testData].sort(
-                      (a, b) => a.createdAt.getTime() - b.createdAt.getTime()
+                      (a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
                     )
 
                     let filteredData = sortedData
                     if (options.where) {
                       try {
                         const filterFn = createFilterFunctionFromExpression(
-                          options.where
+                          options.where,
                         )
                         filteredData = sortedData.filter(filterFn)
                       } catch {
@@ -3035,6 +3146,42 @@ describe(`OrderBy with Date values and precision differences`, () => {
                       }
                     }
 
+                    // Apply cursor expressions if present
+                    if (options.cursor) {
+                      const { whereFrom, whereCurrent } = options.cursor
+                      try {
+                        const whereFromFn =
+                          createFilterFunctionFromExpression(whereFrom)
+                        const fromData = filteredData.filter(whereFromFn)
+
+                        const whereCurrentFn =
+                          createFilterFunctionFromExpression(whereCurrent)
+                        const currentData = filteredData.filter(whereCurrentFn)
+
+                        // Combine and deduplicate
+                        const seenIds = new Set<number>()
+                        filteredData = []
+                        for (const item of currentData) {
+                          if (!seenIds.has(item.id)) {
+                            seenIds.add(item.id)
+                            filteredData.push(item)
+                          }
+                        }
+                        for (const item of fromData) {
+                          if (!seenIds.has(item.id)) {
+                            seenIds.add(item.id)
+                            filteredData.push(item)
+                          }
+                        }
+                        filteredData.sort(
+                          (a, b) =>
+                            a.createdAt.getTime() - b.createdAt.getTime(),
+                        )
+                      } catch (error) {
+                        console.log(`Error applying cursor:`, error)
+                      }
+                    }
+
                     const { limit } = options
                     const dataToLoad = limit
                       ? filteredData.slice(0, limit)
@@ -3052,7 +3199,7 @@ describe(`OrderBy with Date values and precision differences`, () => {
             }
           },
         },
-      })
+      }),
     )
 
     const collection = createLiveQueryCollection((q) =>
@@ -3066,7 +3213,7 @@ describe(`OrderBy with Date values and precision differences`, () => {
           id: items.id,
           createdAt: items.createdAt,
           keep: items.keep,
-        }))
+        })),
     )
     await collection.preload()
 
@@ -3074,21 +3221,22 @@ describe(`OrderBy with Date values and precision differences`, () => {
     const results = Array.from(collection.values()).sort((a, b) => a.id - b.id)
     expect(results.map((r) => r.id)).toEqual([1, 2, 3, 4, 5])
 
-    // Clear tracked clauses before moving to next page
-    loadSubsetWhereClauses.length = 0
+    // Clear tracked cursors before moving to next page
+    loadSubsetCursors.length = 0
 
     // Move to next page - this should trigger the Date precision handling
     const moveToSecondPage = collection.utils.setWindow({ offset: 5, limit: 5 })
     await moveToSecondPage
 
-    // Find the WHERE clause that queries for the "equal values" (the minValue query)
-    // With the fix, this should be: and(gte(createdAt, baseTime), lt(createdAt, baseTime+1ms))
+    // Find the cursor that contains the "whereCurrent" expression (the minValue query)
+    // With the fix, whereCurrent should be: and(gte(createdAt, baseTime), lt(createdAt, baseTime+1ms))
     // Without the fix, this would be: eq(createdAt, baseTime)
-    const equalValuesQuery = loadSubsetWhereClauses.find((clause) => {
-      if (!clause) return false
-      // Check if it's an 'and' with 'gte' and 'lt' (the fix)
-      if (clause.name === `and` && clause.args?.length === 2) {
-        const [first, second] = clause.args
+    const cursorWithDateRange = loadSubsetCursors.find((cursor) => {
+      if (!cursor?.whereCurrent) return false
+      const whereCurrent = cursor.whereCurrent
+      // Check if whereCurrent is an 'and' with 'gte' and 'lt' (the fix)
+      if (whereCurrent.name === `and` && whereCurrent.args?.length === 2) {
+        const [first, second] = whereCurrent.args
         return first?.name === `gte` && second?.name === `lt`
       }
       return false
@@ -3096,7 +3244,8 @@ describe(`OrderBy with Date values and precision differences`, () => {
 
     // The fix should produce a range query (and(gte, lt)) for Date values
     // instead of an exact equality query (eq)
-    expect(equalValuesQuery).toBeDefined()
+    expect(cursorWithDateRange).toBeDefined()
+    const equalValuesQuery = cursorWithDateRange.whereCurrent
     expect(equalValuesQuery.name).toBe(`and`)
     expect(equalValuesQuery.args[0].name).toBe(`gte`)
     expect(equalValuesQuery.args[1].name).toBe(`lt`)
diff --git a/packages/db/tests/query/predicate-utils.test.ts b/packages/db/tests/query/predicate-utils.test.ts
index b390ea4bf..0cb14ec20 100644
--- a/packages/db/tests/query/predicate-utils.test.ts
+++ b/packages/db/tests/query/predicate-utils.test.ts
@@ -1,19 +1,20 @@
-import { describe, expect, it } from "vitest"
+import { describe, expect, it } from 'vitest'
 import {
   isLimitSubset,
+  isOffsetLimitSubset,
   isOrderBySubset,
   isPredicateSubset,
   isWhereSubset,
   minusWherePredicates,
   unionWherePredicates,
-} from "../../src/query/predicate-utils"
-import { Func, PropRef, Value } from "../../src/query/ir"
+} from '../../src/query/predicate-utils'
+import { Func, PropRef, Value } from '../../src/query/ir'
 import type {
   BasicExpression,
   OrderBy,
   OrderByClause,
-} from "../../src/query/ir"
-import type { LoadSubsetOptions } from "../../src/types"
+} from '../../src/query/ir'
+import type { LoadSubsetOptions } from '../../src/types'
 
 // Helper functions to build expressions more easily
 function ref(path: string | Array<string>): PropRef {
@@ -62,7 +63,7 @@ function inOp(left: BasicExpression, values: Array<any>): Func {
 
 function orderByClause(
   expression: BasicExpression,
-  direction: `asc` | `desc` = `asc`
+  direction: `asc` | `desc` = `asc`,
 ): OrderByClause {
   return {
     expression,
@@ -97,7 +98,7 @@ describe(`isWhereSubset`, () => {
 
     it(`should return true for structurally equal expressions`, () => {
       expect(
-        isWhereSubset(gt(ref(`age`), val(10)), gt(ref(`age`), val(10)))
+        isWhereSubset(gt(ref(`age`), val(10)), gt(ref(`age`), val(10))),
       ).toBe(true)
     })
 
@@ -111,76 +112,76 @@ describe(`isWhereSubset`, () => {
   describe(`comparison operators`, () => {
     it(`should handle gt: age > 20 is subset of age > 10`, () => {
       expect(
-        isWhereSubset(gt(ref(`age`), val(20)), gt(ref(`age`), val(10)))
+        isWhereSubset(gt(ref(`age`), val(20)), gt(ref(`age`), val(10))),
       ).toBe(true)
     })
 
     it(`should handle gt: age > 10 is NOT subset of age > 20`, () => {
       expect(
-        isWhereSubset(gt(ref(`age`), val(10)), gt(ref(`age`), val(20)))
+        isWhereSubset(gt(ref(`age`), val(10)), gt(ref(`age`), val(20))),
       ).toBe(false)
     })
 
     it(`should handle gte: age >= 20 is subset of age >= 10`, () => {
       expect(
-        isWhereSubset(gte(ref(`age`), val(20)), gte(ref(`age`), val(10)))
+        isWhereSubset(gte(ref(`age`), val(20)), gte(ref(`age`), val(10))),
       ).toBe(true)
     })
 
     it(`should handle lt: age < 10 is subset of age < 20`, () => {
       expect(
-        isWhereSubset(lt(ref(`age`), val(10)), lt(ref(`age`), val(20)))
+        isWhereSubset(lt(ref(`age`), val(10)), lt(ref(`age`), val(20))),
       ).toBe(true)
     })
 
     it(`should handle lt: age < 20 is NOT subset of age < 10`, () => {
       expect(
-        isWhereSubset(lt(ref(`age`), val(20)), lt(ref(`age`), val(10)))
+        isWhereSubset(lt(ref(`age`), val(20)), lt(ref(`age`), val(10))),
       ).toBe(false)
     })
 
     it(`should handle lte: age <= 10 is subset of age <= 20`, () => {
       expect(
-        isWhereSubset(lte(ref(`age`), val(10)), lte(ref(`age`), val(20)))
+        isWhereSubset(lte(ref(`age`), val(10)), lte(ref(`age`), val(20))),
       ).toBe(true)
     })
 
     it(`should handle eq: age = 15 is subset of age > 10`, () => {
       expect(
-        isWhereSubset(eq(ref(`age`), val(15)), gt(ref(`age`), val(10)))
+        isWhereSubset(eq(ref(`age`), val(15)), gt(ref(`age`), val(10))),
       ).toBe(true)
     })
 
     it(`should handle eq: age = 5 is NOT subset of age > 10`, () => {
       expect(
-        isWhereSubset(eq(ref(`age`), val(5)), gt(ref(`age`), val(10)))
+        isWhereSubset(eq(ref(`age`), val(5)), gt(ref(`age`), val(10))),
       ).toBe(false)
     })
 
     it(`should handle eq: age = 15 is subset of age >= 15`, () => {
       expect(
-        isWhereSubset(eq(ref(`age`), val(15)), gte(ref(`age`), val(15)))
+        isWhereSubset(eq(ref(`age`), val(15)), gte(ref(`age`), val(15))),
       ).toBe(true)
     })
 
     it(`should handle eq: age = 15 is subset of age < 20`, () => {
       expect(
-        isWhereSubset(eq(ref(`age`), val(15)), lt(ref(`age`), val(20)))
+        isWhereSubset(eq(ref(`age`), val(15)), lt(ref(`age`), val(20))),
       ).toBe(true)
     })
 
     it(`should handle mixed operators: gt vs gte`, () => {
       expect(
-        isWhereSubset(gt(ref(`age`), val(10)), gte(ref(`age`), val(10)))
+        isWhereSubset(gt(ref(`age`), val(10)), gte(ref(`age`), val(10))),
       ).toBe(true)
     })
 
     it(`should handle mixed operators: gte vs gt`, () => {
       expect(
-        isWhereSubset(gte(ref(`age`), val(11)), gt(ref(`age`), val(10)))
+        isWhereSubset(gte(ref(`age`), val(11)), gt(ref(`age`), val(10))),
       ).toBe(true)
       expect(
-        isWhereSubset(gte(ref(`age`), val(10)), gt(ref(`age`), val(10)))
+        isWhereSubset(gte(ref(`age`), val(10)), gt(ref(`age`), val(10))),
       ).toBe(false)
     })
   })
@@ -188,73 +189,73 @@ describe(`isWhereSubset`, () => {
   describe(`IN operator`, () => {
     it(`should handle eq vs in: age = 5 is subset of age IN [5, 10, 15]`, () => {
       expect(
-        isWhereSubset(eq(ref(`age`), val(5)), inOp(ref(`age`), [5, 10, 15]))
+        isWhereSubset(eq(ref(`age`), val(5)), inOp(ref(`age`), [5, 10, 15])),
       ).toBe(true)
     })
 
     it(`should handle eq vs in: age = 20 is NOT subset of age IN [5, 10, 15]`, () => {
       expect(
-        isWhereSubset(eq(ref(`age`), val(20)), inOp(ref(`age`), [5, 10, 15]))
+        isWhereSubset(eq(ref(`age`), val(20)), inOp(ref(`age`), [5, 10, 15])),
       ).toBe(false)
     })
 
     it(`should handle in vs in: [5, 10] is subset of [5, 10, 15]`, () => {
       expect(
-        isWhereSubset(inOp(ref(`age`), [5, 10]), inOp(ref(`age`), [5, 10, 15]))
+        isWhereSubset(inOp(ref(`age`), [5, 10]), inOp(ref(`age`), [5, 10, 15])),
       ).toBe(true)
     })
 
     it(`should handle in vs in: [5, 20] is NOT subset of [5, 10, 15]`, () => {
       expect(
-        isWhereSubset(inOp(ref(`age`), [5, 20]), inOp(ref(`age`), [5, 10, 15]))
+        isWhereSubset(inOp(ref(`age`), [5, 20]), inOp(ref(`age`), [5, 10, 15])),
       ).toBe(false)
     })
 
     it(`should handle empty IN array: age IN [] is subset of age IN []`, () => {
       expect(isWhereSubset(inOp(ref(`age`), []), inOp(ref(`age`), []))).toBe(
-        true
+        true,
       )
     })
 
     it(`should handle empty IN array: age IN [] is subset of age IN [5, 10]`, () => {
       expect(
-        isWhereSubset(inOp(ref(`age`), []), inOp(ref(`age`), [5, 10]))
+        isWhereSubset(inOp(ref(`age`), []), inOp(ref(`age`), [5, 10])),
       ).toBe(true)
     })
 
     it(`should handle empty IN array: age IN [5, 10] is NOT subset of age IN []`, () => {
       expect(
-        isWhereSubset(inOp(ref(`age`), [5, 10]), inOp(ref(`age`), []))
+        isWhereSubset(inOp(ref(`age`), [5, 10]), inOp(ref(`age`), [])),
       ).toBe(false)
     })
 
     it(`should handle singleton IN array: age = 5 is subset of age IN [5]`, () => {
       expect(isWhereSubset(eq(ref(`age`), val(5)), inOp(ref(`age`), [5]))).toBe(
-        true
+        true,
       )
     })
 
     it(`should handle singleton IN array: age = 10 is NOT subset of age IN [5]`, () => {
       expect(
-        isWhereSubset(eq(ref(`age`), val(10)), inOp(ref(`age`), [5]))
+        isWhereSubset(eq(ref(`age`), val(10)), inOp(ref(`age`), [5])),
       ).toBe(false)
     })
 
     it(`should handle singleton IN array: age IN [5] is subset of age IN [5, 10, 15]`, () => {
       expect(
-        isWhereSubset(inOp(ref(`age`), [5]), inOp(ref(`age`), [5, 10, 15]))
+        isWhereSubset(inOp(ref(`age`), [5]), inOp(ref(`age`), [5, 10, 15])),
       ).toBe(true)
     })
 
     it(`should handle singleton IN array: age IN [20] is NOT subset of age IN [5, 10, 15]`, () => {
       expect(
-        isWhereSubset(inOp(ref(`age`), [20]), inOp(ref(`age`), [5, 10, 15]))
+        isWhereSubset(inOp(ref(`age`), [20]), inOp(ref(`age`), [5, 10, 15])),
       ).toBe(false)
     })
 
     it(`should handle singleton IN array: age IN [5, 10, 15] is NOT subset of age IN [5]`, () => {
       expect(
-        isWhereSubset(inOp(ref(`age`), [5, 10, 15]), inOp(ref(`age`), [5]))
+        isWhereSubset(inOp(ref(`age`), [5, 10, 15]), inOp(ref(`age`), [5])),
       ).toBe(false)
     })
   })
@@ -264,8 +265,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           and(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`))),
-          gt(ref(`age`), val(10))
-        )
+          gt(ref(`age`), val(10)),
+        ),
       ).toBe(true)
     })
 
@@ -273,8 +274,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           and(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`))),
-          eq(ref(`name`), val(`John`))
-        )
+          eq(ref(`name`), val(`John`)),
+        ),
       ).toBe(false)
     })
 
@@ -282,8 +283,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           gt(ref(`age`), val(10)),
-          and(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`)))
-        )
+          and(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`))),
+        ),
       ).toBe(false)
     })
 
@@ -291,8 +292,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           and(gt(ref(`age`), val(20)), eq(ref(`status`), val(`active`))),
-          and(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`)))
-        )
+          and(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`))),
+        ),
       ).toBe(true)
     })
   })
@@ -302,8 +303,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           gt(ref(`age`), val(10)),
-          or(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`)))
-        )
+          or(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`))),
+        ),
       ).toBe(true)
     })
 
@@ -311,8 +312,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           eq(ref(`age`), val(10)),
-          or(gt(ref(`age`), val(10)), lt(ref(`age`), val(5)))
-        )
+          or(gt(ref(`age`), val(10)), lt(ref(`age`), val(5))),
+        ),
       ).toBe(false)
     })
 
@@ -320,8 +321,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           or(gt(ref(`age`), val(20)), gt(ref(`age`), val(30))),
-          gt(ref(`age`), val(10))
-        )
+          gt(ref(`age`), val(10)),
+        ),
       ).toBe(true)
     })
 
@@ -329,8 +330,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           or(gt(ref(`age`), val(20)), eq(ref(`status`), val(`active`))),
-          or(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`)))
-        )
+          or(gt(ref(`age`), val(10)), eq(ref(`status`), val(`active`))),
+        ),
       ).toBe(true)
     })
 
@@ -338,8 +339,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           or(gt(ref(`age`), val(20)), lt(ref(`age`), val(5))),
-          gt(ref(`age`), val(10))
-        )
+          gt(ref(`age`), val(10)),
+        ),
       ).toBe(false)
     })
   })
@@ -347,7 +348,7 @@ describe(`isWhereSubset`, () => {
   describe(`different fields`, () => {
     it(`should return false for different fields with no relationship`, () => {
       expect(
-        isWhereSubset(gt(ref(`age`), val(20)), gt(ref(`salary`), val(1000)))
+        isWhereSubset(gt(ref(`age`), val(20)), gt(ref(`salary`), val(1000))),
       ).toBe(false)
     })
   })
@@ -361,8 +362,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           eq(ref(`createdAt`), val(date2)),
-          eq(ref(`createdAt`), val(date2))
-        )
+          eq(ref(`createdAt`), val(date2)),
+        ),
       ).toBe(true)
     })
 
@@ -370,8 +371,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           gt(ref(`createdAt`), val(date2)),
-          gt(ref(`createdAt`), val(date1))
-        )
+          gt(ref(`createdAt`), val(date1)),
+        ),
       ).toBe(true)
     })
 
@@ -379,8 +380,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           lt(ref(`createdAt`), val(date2)),
-          lt(ref(`createdAt`), val(date3))
-        )
+          lt(ref(`createdAt`), val(date3)),
+        ),
       ).toBe(true)
     })
 
@@ -388,8 +389,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           eq(ref(`createdAt`), val(date2)),
-          gt(ref(`createdAt`), val(date1))
-        )
+          gt(ref(`createdAt`), val(date1)),
+        ),
       ).toBe(true)
     })
 
@@ -397,8 +398,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           eq(ref(`createdAt`), val(date2)),
-          inOp(ref(`createdAt`), [date1, date2, date3])
-        )
+          inOp(ref(`createdAt`), [date1, date2, date3]),
+        ),
       ).toBe(true)
     })
 
@@ -406,8 +407,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           inOp(ref(`createdAt`), [date1, date2]),
-          inOp(ref(`createdAt`), [date1, date2, date3])
-        )
+          inOp(ref(`createdAt`), [date1, date2, date3]),
+        ),
       ).toBe(true)
     })
 
@@ -415,8 +416,8 @@ describe(`isWhereSubset`, () => {
       expect(
         isWhereSubset(
           eq(ref(`createdAt`), val(date1)),
-          inOp(ref(`createdAt`), [date2, date3])
-        )
+          inOp(ref(`createdAt`), [date2, date3]),
+        ),
       ).toBe(false)
     })
   })
@@ -647,6 +648,86 @@ describe(`isLimitSubset`, () => {
   })
 })
 
+describe(`isOffsetLimitSubset`, () => {
+  it(`should return true when subset range is within superset range (same offset)`, () => {
+    expect(
+      isOffsetLimitSubset({ offset: 0, limit: 5 }, { offset: 0, limit: 10 }),
+    ).toBe(true)
+    expect(
+      isOffsetLimitSubset({ offset: 0, limit: 10 }, { offset: 0, limit: 10 }),
+    ).toBe(true)
+  })
+
+  it(`should return true when subset starts later but is still within superset range`, () => {
+    // superset loads rows [0, 10), subset loads rows [5, 10) - subset is within superset
+    expect(
+      isOffsetLimitSubset({ offset: 5, limit: 5 }, { offset: 0, limit: 10 }),
+    ).toBe(true)
+  })
+
+  it(`should return false when subset extends beyond superset range`, () => {
+    // superset loads rows [0, 10), subset loads rows [5, 15) - subset extends beyond
+    expect(
+      isOffsetLimitSubset({ offset: 5, limit: 10 }, { offset: 0, limit: 10 }),
+    ).toBe(false)
+  })
+
+  it(`should return false when subset is completely outside superset range`, () => {
+    // superset loads rows [0, 10), subset loads rows [20, 30) - no overlap
+    expect(
+      isOffsetLimitSubset({ offset: 20, limit: 10 }, { offset: 0, limit: 10 }),
+    ).toBe(false)
+  })
+
+  it(`should return false when superset starts after subset`, () => {
+    // superset loads rows [10, 20), subset loads rows [0, 10) - superset starts too late
+    expect(
+      isOffsetLimitSubset({ offset: 0, limit: 10 }, { offset: 10, limit: 10 }),
+    ).toBe(false)
+  })
+
+  it(`should return true when superset is unlimited`, () => {
+    expect(isOffsetLimitSubset({ offset: 0, limit: 10 }, { offset: 0 })).toBe(
+      true,
+    )
+    expect(isOffsetLimitSubset({ offset: 20, limit: 10 }, { offset: 0 })).toBe(
+      true,
+    )
+  })
+
+  it(`should return false when superset is unlimited but starts after subset`, () => {
+    // superset loads rows [10, ∞), subset loads rows [0, 10) - superset starts too late
+    expect(isOffsetLimitSubset({ offset: 0, limit: 10 }, { offset: 10 })).toBe(
+      false,
+    )
+  })
+
+  it(`should return false when subset is unlimited but superset has a limit`, () => {
+    expect(isOffsetLimitSubset({ offset: 0 }, { offset: 0, limit: 10 })).toBe(
+      false,
+    )
+  })
+
+  it(`should return true when both are unlimited and superset starts at or before subset`, () => {
+    expect(isOffsetLimitSubset({ offset: 10 }, { offset: 0 })).toBe(true)
+    expect(isOffsetLimitSubset({ offset: 10 }, { offset: 10 })).toBe(true)
+  })
+
+  it(`should return false when both are unlimited but superset starts after subset`, () => {
+    expect(isOffsetLimitSubset({ offset: 0 }, { offset: 10 })).toBe(false)
+  })
+
+  it(`should default offset to 0 when undefined`, () => {
+    expect(isOffsetLimitSubset({ limit: 5 }, { limit: 10 })).toBe(true)
+    expect(isOffsetLimitSubset({ offset: 0, limit: 5 }, { limit: 10 })).toBe(
+      true,
+    )
+    expect(isOffsetLimitSubset({ limit: 5 }, { offset: 0, limit: 10 })).toBe(
+      true,
+    )
+  })
+})
+
 describe(`isPredicateSubset`, () => {
   it(`should check all components for unlimited superset`, () => {
     // For unlimited supersets, where-subset logic applies
@@ -756,6 +837,138 @@ describe(`isPredicateSubset`, () => {
     }
     expect(isPredicateSubset(subset, superset)).toBe(false)
   })
+
+  describe(`with offset`, () => {
+    it(`should return true when subset offset+limit is within superset range`, () => {
+      const sameWhere = gt(ref(`age`), val(10))
+      const subset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 5,
+        limit: 5,
+      }
+      const superset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 0,
+        limit: 10,
+      }
+      // subset loads rows [5, 10), superset loads rows [0, 10) - subset is within
+      expect(isPredicateSubset(subset, superset)).toBe(true)
+    })
+
+    it(`should return false when subset is at different offset outside superset range`, () => {
+      const sameWhere = gt(ref(`age`), val(10))
+      const subset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 20,
+        limit: 10,
+      }
+      const superset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 0,
+        limit: 10,
+      }
+      // subset loads rows [20, 30), superset loads rows [0, 10) - no overlap
+      expect(isPredicateSubset(subset, superset)).toBe(false)
+    })
+
+    it(`should return false when subset extends beyond superset even with same where`, () => {
+      const sameWhere = gt(ref(`age`), val(10))
+      const subset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 5,
+        limit: 10,
+      }
+      const superset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 0,
+        limit: 10,
+      }
+      // subset loads rows [5, 15), superset loads rows [0, 10) - subset extends beyond
+      expect(isPredicateSubset(subset, superset)).toBe(false)
+    })
+
+    it(`should return true for unlimited superset with any subset offset`, () => {
+      const sameWhere = gt(ref(`age`), val(10))
+      const subset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 100,
+        limit: 10,
+      }
+      const superset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        // No limit - unlimited
+      }
+      expect(isPredicateSubset(subset, superset)).toBe(true)
+    })
+
+    it(`should return false when superset has offset that starts after subset needs`, () => {
+      const sameWhere = gt(ref(`age`), val(10))
+      const subset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 0,
+        limit: 10,
+      }
+      const superset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 5,
+        limit: 10,
+      }
+      // subset needs rows [0, 10), superset only has rows [5, 15)
+      expect(isPredicateSubset(subset, superset)).toBe(false)
+    })
+
+    it(`should handle pagination correctly - page 2 not subset of page 1`, () => {
+      const sameWhere = gt(ref(`age`), val(10))
+      // Page 1: offset 0, limit 10
+      const page1: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 0,
+        limit: 10,
+      }
+      // Page 2: offset 10, limit 10
+      const page2: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 10,
+        limit: 10,
+      }
+      // Page 2 is NOT a subset of page 1 (different rows)
+      expect(isPredicateSubset(page2, page1)).toBe(false)
+      // Page 1 is NOT a subset of page 2 (different rows)
+      expect(isPredicateSubset(page1, page2)).toBe(false)
+    })
+
+    it(`should return true when superset covers multiple pages`, () => {
+      const sameWhere = gt(ref(`age`), val(10))
+      // Superset: offset 0, limit 30 (covers pages 1-3)
+      const superset: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 0,
+        limit: 30,
+      }
+      // Page 2: offset 10, limit 10
+      const page2: LoadSubsetOptions = {
+        where: sameWhere,
+        orderBy: [orderByClause(ref(`age`), `asc`)],
+        offset: 10,
+        limit: 10,
+      }
+      // Page 2 IS a subset of superset (rows 10-19 within 0-29)
+      expect(isPredicateSubset(page2, superset)).toBe(true)
+    })
+  })
 })
 
 describe(`minusWherePredicates`, () => {
@@ -1011,11 +1224,11 @@ describe(`minusWherePredicates`, () => {
     it(`should handle common conditions: (age > 10 AND status = 'active') - (age > 20 AND status = 'active') = (age > 10 AND age <= 20 AND status = 'active')`, () => {
       const from = and(
         gt(ref(`age`), val(10)),
-        eq(ref(`status`), val(`active`))
+        eq(ref(`status`), val(`active`)),
       )
       const subtract = and(
         gt(ref(`age`), val(20)),
-        eq(ref(`status`), val(`active`))
+        eq(ref(`status`), val(`active`)),
       )
       const result = minusWherePredicates(from, subtract)
 
@@ -1034,12 +1247,12 @@ describe(`minusWherePredicates`, () => {
       const from = and(
         gt(ref(`age`), val(10)),
         eq(ref(`status`), val(`active`)),
-        eq(ref(`department`), val(`engineering`))
+        eq(ref(`department`), val(`engineering`)),
       )
       const subtract = and(
         gt(ref(`age`), val(20)),
         eq(ref(`status`), val(`active`)),
-        eq(ref(`department`), val(`engineering`))
+        eq(ref(`department`), val(`engineering`)),
       )
       const result = minusWherePredicates(from, subtract)
 
@@ -1058,11 +1271,11 @@ describe(`minusWherePredicates`, () => {
     it(`should handle IN with common conditions: (age IN [10,20,30] AND status = 'active') - (age IN [20,30] AND status = 'active') = (age IN [10] AND status = 'active')`, () => {
       const from = and(
         inOp(ref(`age`), [10, 20, 30]),
-        eq(ref(`status`), val(`active`))
+        eq(ref(`status`), val(`active`)),
       )
       const subtract = and(
         inOp(ref(`age`), [20, 30]),
-        eq(ref(`status`), val(`active`))
+        eq(ref(`status`), val(`active`)),
       )
       const result = minusWherePredicates(from, subtract)
 
@@ -1083,11 +1296,11 @@ describe(`minusWherePredicates`, () => {
     it(`should return null when common conditions exist but remaining difference cannot be simplified`, () => {
       const from = and(
         gt(ref(`age`), val(10)),
-        eq(ref(`status`), val(`active`))
+        eq(ref(`status`), val(`active`)),
       )
       const subtract = and(
         gt(ref(`name`), val(`Z`)),
-        eq(ref(`status`), val(`active`))
+        eq(ref(`status`), val(`active`)),
       )
       const result = minusWherePredicates(from, subtract)
 
diff --git a/packages/db/tests/query/query-while-syncing.test.ts b/packages/db/tests/query/query-while-syncing.test.ts
index 81c57da3e..5616e08a8 100644
--- a/packages/db/tests/query/query-while-syncing.test.ts
+++ b/packages/db/tests/query/query-while-syncing.test.ts
@@ -1,7 +1,7 @@
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
-import { createLiveQueryCollection, eq, gt } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { createTransaction } from "../../src/transactions.js"
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
+import { createLiveQueryCollection, eq, gt } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { createTransaction } from '../../src/transactions.js'
 
 // Sample user type for tests
 type User = {
@@ -303,7 +303,7 @@ describe(`Query while syncing`, () => {
               .join(
                 { dept: departmentsCollection },
                 ({ user, dept }) => eq(user.department_id, dept.id),
-                `inner`
+                `inner`,
               )
               .select(({ user, dept }) => ({
                 user_name: user.name,
@@ -423,7 +423,7 @@ describe(`Query while syncing`, () => {
             q
               .from({ user: usersCollection })
               .leftJoin({ dept: departmentsCollection }, ({ user, dept }) =>
-                eq(user.department_id, dept.id)
+                eq(user.department_id, dept.id),
               )
               .select(({ user, dept }) => ({
                 user_name: user.name,
@@ -551,12 +551,12 @@ describe(`Query while syncing`, () => {
               .join(
                 { c2: collection2 },
                 ({ c1, c2 }) => eq(c1.id, c2.id),
-                `inner`
+                `inner`,
               )
               .join(
                 { c3: collection3 },
                 ({ c1, c3 }) => eq(c1.id, c3.id),
-                `inner`
+                `inner`,
               )
               .select(({ c1 }) => ({
                 id: c1.id,
@@ -882,7 +882,7 @@ describe(`Query while syncing`, () => {
               .join(
                 { dept: departmentsCollection },
                 ({ user, dept }) => eq(user.department_id, dept.id),
-                `inner`
+                `inner`,
               )
               .select(({ user, dept }) => ({
                 user_name: user.name,
diff --git a/packages/db/tests/query/scheduler.test.ts b/packages/db/tests/query/scheduler.test.ts
index 5088a8a2c..adb85c979 100644
--- a/packages/db/tests/query/scheduler.test.ts
+++ b/packages/db/tests/query/scheduler.test.ts
@@ -1,13 +1,13 @@
-import { afterEach, describe, expect, it, vi } from "vitest"
-import { createCollection } from "../../src/collection/index.js"
-import { createLiveQueryCollection, eq, isNull } from "../../src/query/index.js"
-import { createTransaction } from "../../src/transactions.js"
-import { createOptimisticAction } from "../../src/optimistic-action.js"
-import { transactionScopedScheduler } from "../../src/scheduler.js"
-import { CollectionConfigBuilder } from "../../src/query/live/collection-config-builder.js"
-import { mockSyncCollectionOptions } from "../utils.js"
-import type { FullSyncState } from "../../src/query/live/types.js"
-import type { SyncConfig } from "../../src/types.js"
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '../../src/collection/index.js'
+import { createLiveQueryCollection, eq, isNull } from '../../src/query/index.js'
+import { createTransaction } from '../../src/transactions.js'
+import { createOptimisticAction } from '../../src/optimistic-action.js'
+import { transactionScopedScheduler } from '../../src/scheduler.js'
+import { CollectionConfigBuilder } from '../../src/query/live/collection-config-builder.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import type { FullSyncState } from '../../src/query/live/types.js'
+import type { SyncConfig } from '../../src/types.js'
 
 interface ChangeMessageLike {
   type: string
@@ -274,7 +274,7 @@ describe(`live query scheduler`, () => {
           .join(
             { right: liveQueryB },
             ({ left, right }) => eq(left.id, right.id),
-            `full`
+            `full`,
           )
           .select(({ left, right }) => ({
             left: left?.value,
@@ -361,7 +361,7 @@ describe(`live query scheduler`, () => {
           .join(
             { right: collectionB },
             ({ left, right }) => eq(left.id, right.id),
-            `full`
+            `full`,
           )
           .select(({ left, right }) => ({
             left: left?.value,
@@ -444,7 +444,7 @@ describe(`live query scheduler`, () => {
           .join(
             { right: collectionB },
             ({ left, right }) => eq(left.id, right.id),
-            `full`
+            `full`,
           )
           .select(({ left, right }) => ({
             left: left?.value,
@@ -563,7 +563,7 @@ describe(`live query scheduler`, () => {
         initialData: [
           { id: `account-1`, user_id: `user-1`, name: `Account 1` },
         ],
-      })
+      }),
     )
 
     const users = createCollection<UserProfile>(
@@ -571,7 +571,7 @@ describe(`live query scheduler`, () => {
         id: `left-join-bug-users`,
         getKey: (user) => user.id,
         initialData: [{ id: `user-1`, profile: `Profile 1` }],
-      })
+      }),
     )
 
     const teams = createCollection<Team>(
@@ -585,7 +585,7 @@ describe(`live query scheduler`, () => {
             deleted_ts: null as string | null,
           },
         ],
-      })
+      }),
     )
 
     // Create nested live query collections similar to the bug report
@@ -596,7 +596,7 @@ describe(`live query scheduler`, () => {
         q
           .from({ account: accounts })
           .join({ user: users }, ({ user, account }) =>
-            eq(user.id, account.user_id)
+            eq(user.id, account.user_id),
           )
           .select(({ account, user }) => ({
             account: account,
@@ -621,7 +621,7 @@ describe(`live query scheduler`, () => {
         q
           .from({ accountWithUser: accountsWithUsers })
           .leftJoin({ team: activeTeams }, ({ accountWithUser, team }) =>
-            eq(team.team.account_id, accountWithUser.account.id)
+            eq(team.team.account_id, accountWithUser.account.id),
           )
           .select(({ accountWithUser, team }) => ({
             account: accountWithUser.account,
@@ -685,7 +685,7 @@ describe(`live query scheduler`, () => {
         id: `race-base`,
         getKey: (item) => item.id,
         initialData: [{ id: `1`, value: 10 }],
-      })
+      }),
     )
 
     // QueryA: depends on base
diff --git a/packages/db/tests/query/select-spread.test-d.ts b/packages/db/tests/query/select-spread.test-d.ts
index a578a6401..272c42afb 100644
--- a/packages/db/tests/query/select-spread.test-d.ts
+++ b/packages/db/tests/query/select-spread.test-d.ts
@@ -1,8 +1,8 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { createCollection } from "../../src/collection/index.js"
-import { createLiveQueryCollection } from "../../src/query/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
-import { add, length, upper } from "../../src/query/builder/functions.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { createCollection } from '../../src/collection/index.js'
+import { createLiveQueryCollection } from '../../src/query/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import { add, length, upper } from '../../src/query/builder/functions.js'
 
 // Base type used in bug report
 type Message = {
@@ -22,7 +22,7 @@ function createMessagesCollection() {
       id: `messages`,
       getKey: (m) => m.id,
       initialData: initialMessages,
-    })
+    }),
   )
 }
 
diff --git a/packages/db/tests/query/select-spread.test.ts b/packages/db/tests/query/select-spread.test.ts
index ee713c667..30665f0fe 100644
--- a/packages/db/tests/query/select-spread.test.ts
+++ b/packages/db/tests/query/select-spread.test.ts
@@ -1,8 +1,8 @@
-import { beforeEach, describe, expect, it } from "vitest"
-import { createCollection } from "../../src/collection/index.js"
-import { createLiveQueryCollection } from "../../src/query/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
-import { add, eq, upper } from "../../src/query/builder/functions.js"
+import { beforeEach, describe, expect, it } from 'vitest'
+import { createCollection } from '../../src/collection/index.js'
+import { createLiveQueryCollection } from '../../src/query/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import { add, eq, upper } from '../../src/query/builder/functions.js'
 
 // Base type used in bug report
 interface Message {
@@ -22,7 +22,7 @@ function createMessagesCollection() {
       id: `messages-select-spread`,
       getKey: (m) => m.id,
       initialData: initialMessages,
-    })
+    }),
   )
 }
 
@@ -58,7 +58,7 @@ function createMessagesWithMetaCollection() {
       id: `messages-select-spread-nested`,
       getKey: (m) => m.id,
       initialData: nestedMessages,
-    })
+    }),
   )
 }
 
@@ -79,7 +79,7 @@ function createUsersCollection() {
       id: `users-select-spread`,
       getKey: (u) => u.id,
       initialData: usersData,
-    })
+    }),
   )
 }
 
@@ -94,7 +94,7 @@ describe(`select spreads (runtime)`, () => {
     const collection = createLiveQueryCollection((q) =>
       q.from({ message: messagesCollection }).select(({ message }) => ({
         ...message,
-      }))
+      })),
     )
     await collection.preload()
 
@@ -112,7 +112,7 @@ describe(`select spreads (runtime)`, () => {
         ...message,
         idPlusOne: add(message.id, 1),
         upperText: upper(message.text),
-      }))
+      })),
     )
     await collection.preload()
 
@@ -134,7 +134,7 @@ describe(`select spreads (runtime)`, () => {
       q.from({ message: messagesCollection }).select(({ message }) => ({
         ...message,
         user: upper(message.user),
-      }))
+      })),
     )
     await collection.preload()
 
@@ -149,7 +149,7 @@ describe(`select spreads (runtime)`, () => {
         // @ts-expect-error - user is overridden by spread
         user: upper(message.user),
         ...message,
-      }))
+      })),
     )
     await collection.preload()
 
@@ -163,7 +163,7 @@ describe(`select spreads (runtime)`, () => {
     const collection = createLiveQueryCollection((q) =>
       q.from({ message: messagesCollection }).select(({ message }) => ({
         ...message,
-      }))
+      })),
     )
     await collection.preload()
 
@@ -185,7 +185,7 @@ describe(`select spreads (runtime)`, () => {
     const collection = createLiveQueryCollection((q) =>
       q.from({ m: messagesNested }).select(({ m }) => ({
         ...m,
-      }))
+      })),
     )
     await collection.preload()
 
@@ -207,7 +207,7 @@ describe(`select spreads (runtime)`, () => {
         ...message,
         // and a final override wins over the last spread
         text: upper(message.text),
-      }))
+      })),
     )
     await collection.preload()
 
@@ -227,7 +227,7 @@ describe(`select spreads (runtime)`, () => {
         .select(({ m, u }) => ({
           ...m,
           ...u,
-        }))
+        })),
     )
     await collection.preload()
 
@@ -248,7 +248,7 @@ describe(`select spreads (runtime)`, () => {
           // desired: spread meta fields under meta key
           ...m.meta,
         },
-      }))
+      })),
     )
     await collection.preload()
 
@@ -270,7 +270,7 @@ describe(`select spreads (runtime)`, () => {
           // last spread restores original author
           ...m.meta,
         },
-      }))
+      })),
     )
     await collection.preload()
 
diff --git a/packages/db/tests/query/select.test-d.ts b/packages/db/tests/query/select.test-d.ts
index b41bb60a6..97549ee4c 100644
--- a/packages/db/tests/query/select.test-d.ts
+++ b/packages/db/tests/query/select.test-d.ts
@@ -1,8 +1,8 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { createCollection } from "../../src/collection/index.js"
-import { createLiveQueryCollection } from "../../src/query/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
-import { upper } from "../../src/query/builder/functions.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { createCollection } from '../../src/collection/index.js'
+import { createLiveQueryCollection } from '../../src/query/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import { upper } from '../../src/query/builder/functions.js'
 
 type User = {
   id: number
@@ -31,7 +31,7 @@ function createUsers() {
       id: `nested-select-users-type`,
       getKey: (u) => u.id,
       initialData: [],
-    })
+    }),
   )
 }
 
@@ -42,7 +42,7 @@ describe(`select types`, () => {
       q.from({ u: users }).select(({ u }) => ({
         id: u.id,
         nameUpper: upper(u.name),
-      }))
+      })),
     )
 
     type Expected = {
@@ -63,7 +63,7 @@ describe(`select types`, () => {
         joinedDate: u.joinedDate,
         name: u.name,
         something: u.something,
-      }))
+      })),
     )
 
     type Expected = {
@@ -87,7 +87,7 @@ describe(`select types`, () => {
           city: u.address?.city,
           coords: u.address?.coordinates,
         },
-      }))
+      })),
     )
 
     type Expected = {
diff --git a/packages/db/tests/query/select.test.ts b/packages/db/tests/query/select.test.ts
index 0a14e1b18..79dd481bb 100644
--- a/packages/db/tests/query/select.test.ts
+++ b/packages/db/tests/query/select.test.ts
@@ -1,8 +1,8 @@
-import { beforeEach, describe, expect, it } from "vitest"
-import { createCollection } from "../../src/collection/index.js"
-import { createLiveQueryCollection } from "../../src/query/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
-import { upper } from "../../src/query/builder/functions.js"
+import { beforeEach, describe, expect, it } from 'vitest'
+import { createCollection } from '../../src/collection/index.js'
+import { createLiveQueryCollection } from '../../src/query/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
+import { upper } from '../../src/query/builder/functions.js'
 
 type User = {
   id: number
@@ -49,7 +49,7 @@ function createUsers() {
       id: `nested-select-users`,
       getKey: (u) => u.id,
       initialData: data,
-    })
+    }),
   )
 }
 
@@ -68,7 +68,7 @@ describe(`nested select projections`, () => {
           city: u.address?.city,
           coords: u.address?.coordinates,
         },
-      }))
+      })),
     )
 
     await collection.preload()
@@ -93,7 +93,7 @@ describe(`nested select projections`, () => {
           // spread all preference fields under preferences
           ...u.profile.preferences,
         },
-      }))
+      })),
     )
 
     await collection.preload()
@@ -115,7 +115,7 @@ describe(`nested select projections`, () => {
             ...u.profile,
           },
         },
-      }))
+      })),
     )
 
     await collection.preload()
diff --git a/packages/db/tests/query/subquery.test-d.ts b/packages/db/tests/query/subquery.test-d.ts
index 5c169eeb4..c3906da01 100644
--- a/packages/db/tests/query/subquery.test-d.ts
+++ b/packages/db/tests/query/subquery.test-d.ts
@@ -1,7 +1,7 @@
-import { describe, expectTypeOf, test } from "vitest"
-import { createLiveQueryCollection, eq, gt } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { describe, expectTypeOf, test } from 'vitest'
+import { createLiveQueryCollection, eq, gt } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample types for subquery testing
 type Issue = {
@@ -51,7 +51,7 @@ function createIssuesCollection() {
       id: `subquery-test-issues-types`,
       getKey: (issue) => issue.id,
       initialData: sampleIssues,
-    })
+    }),
   )
 }
 
diff --git a/packages/db/tests/query/subquery.test.ts b/packages/db/tests/query/subquery.test.ts
index 80b5bdd15..e7049a182 100644
--- a/packages/db/tests/query/subquery.test.ts
+++ b/packages/db/tests/query/subquery.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, test } from "vitest"
-import { createLiveQueryCollection, eq, gt } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { beforeEach, describe, expect, test } from 'vitest'
+import { createLiveQueryCollection, eq, gt } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 // Sample types for subquery testing
 type Issue = {
@@ -70,7 +70,7 @@ function createIssuesCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (issue) => issue.id,
       initialData: sampleIssues,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -106,7 +106,7 @@ function createSubqueryTests(autoIndex: `off` | `eager`): void {
 
         expect(results.map((r) => r.id).sort()).toEqual([1, 2, 3, 5])
         expect(results.map((r) => r.title)).toEqual(
-          expect.arrayContaining([`Bug 1`, `Bug 2`, `Feature 1`, `Feature 2`])
+          expect.arrayContaining([`Bug 1`, `Bug 2`, `Feature 1`, `Feature 2`]),
         )
       })
 
@@ -130,8 +130,8 @@ function createSubqueryTests(autoIndex: `off` | `eager`): void {
         expect(results.map((r) => r.id).sort()).toEqual([1, 4])
         expect(
           results.every(
-            (r) => sampleIssues.find((i) => i.id === r.id)?.status === `open`
-          )
+            (r) => sampleIssues.find((i) => i.id === r.id)?.status === `open`,
+          ),
         ).toBe(true)
       })
 
diff --git a/packages/db/tests/query/subset-dedupe.test.ts b/packages/db/tests/query/subset-dedupe.test.ts
index f1c1a956e..9067c931f 100644
--- a/packages/db/tests/query/subset-dedupe.test.ts
+++ b/packages/db/tests/query/subset-dedupe.test.ts
@@ -1,12 +1,12 @@
-import { describe, expect, it, vi } from "vitest"
+import { describe, expect, it, vi } from 'vitest'
 import {
   DeduplicatedLoadSubset,
   cloneOptions,
-} from "../../src/query/subset-dedupe"
-import { Func, PropRef, Value } from "../../src/query/ir"
-import { minusWherePredicates } from "../../src/query/predicate-utils"
-import type { BasicExpression, OrderBy } from "../../src/query/ir"
-import type { LoadSubsetOptions } from "../../src/types"
+} from '../../src/query/subset-dedupe'
+import { Func, PropRef, Value } from '../../src/query/ir'
+import { minusWherePredicates } from '../../src/query/predicate-utils'
+import type { BasicExpression, OrderBy } from '../../src/query/ir'
+import type { LoadSubsetOptions } from '../../src/types'
 
 // Helper functions to build expressions more easily
 function ref(path: string | Array<string>): PropRef {
@@ -505,7 +505,7 @@ describe(`createDeduplicatedLoadSubset`, () => {
       // First call: age > 20 AND status = 'active'
       const firstPredicate = and(
         gt(ref(`age`), val(20)),
-        eq(ref(`status`), val(`active`))
+        eq(ref(`status`), val(`active`)),
       )
       await deduplicated.loadSubset({ where: firstPredicate })
       expect(callCount).toBe(1)
@@ -514,7 +514,7 @@ describe(`createDeduplicatedLoadSubset`, () => {
       // Second call: age > 10 AND status = 'active' (should request only age > 10 AND age <= 20 AND status = 'active')
       const secondPredicate = and(
         gt(ref(`age`), val(10)),
-        eq(ref(`status`), val(`active`))
+        eq(ref(`status`), val(`active`)),
       )
 
       const test = minusWherePredicates(secondPredicate, firstPredicate)
@@ -526,7 +526,7 @@ describe(`createDeduplicatedLoadSubset`, () => {
         where: and(
           eq(ref(`status`), val(`active`)),
           gt(ref(`age`), val(10)),
-          lte(ref(`age`), val(20))
+          lte(ref(`age`), val(20)),
         ),
       })
     })
diff --git a/packages/db/tests/query/validate-aliases.test.ts b/packages/db/tests/query/validate-aliases.test.ts
index 9e7ed9978..b4c29da38 100644
--- a/packages/db/tests/query/validate-aliases.test.ts
+++ b/packages/db/tests/query/validate-aliases.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, test } from "vitest"
-import { createLiveQueryCollection, eq } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { beforeEach, describe, expect, test } from 'vitest'
+import { createLiveQueryCollection, eq } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 
 type Lock = { _id: number; name: string }
 type Vote = { _id: number; lockId: number; percent: number }
@@ -25,7 +25,7 @@ function createTestCollections() {
         getKey: (lock) => lock._id,
         initialData: locks,
         autoIndex: `eager`,
-      })
+      }),
     ),
     votesCollection: createCollection(
       mockSyncCollectionOptions<Vote>({
@@ -33,7 +33,7 @@ function createTestCollections() {
         getKey: (vote) => vote._id,
         initialData: votes,
         autoIndex: `eager`,
-      })
+      }),
     ),
   }
 }
@@ -60,7 +60,7 @@ describe(`Alias validation in subqueries`, () => {
           const locksAgg = q
             .from({ lock: locksCollection })
             .join({ vote: votesCollection }, ({ lock, vote }) =>
-              eq(lock._id, vote.lockId)
+              eq(lock._id, vote.lockId),
             )
             .select(({ lock }) => ({
               _id: lock._id,
@@ -70,7 +70,7 @@ describe(`Alias validation in subqueries`, () => {
           return q
             .from({ vote: votesCollection }) // Reuses "vote" alias from subquery
             .join({ lock: locksAgg }, ({ vote, lock }) =>
-              eq(lock._id, vote.lockId)
+              eq(lock._id, vote.lockId),
             )
             .select(({ vote, lock }) => ({
               voteId: vote._id,
@@ -89,7 +89,7 @@ describe(`Alias validation in subqueries`, () => {
           .from({ lock: locksCollection })
           .join(
             { v: votesCollection }, // Uses unique alias "v" instead of "vote"
-            ({ lock, v }) => eq(lock._id, v.lockId)
+            ({ lock, v }) => eq(lock._id, v.lockId),
           )
           .select(({ lock }) => ({
             _id: lock._id,
@@ -99,7 +99,7 @@ describe(`Alias validation in subqueries`, () => {
         return q
           .from({ vote: votesCollection })
           .join({ lock: locksAgg }, ({ vote, lock }) =>
-            eq(lock._id, vote.lockId)
+            eq(lock._id, vote.lockId),
           )
           .select(({ vote, lock }) => ({
             voteId: vote._id,
diff --git a/packages/db/tests/query/where.test.ts b/packages/db/tests/query/where.test.ts
index e68f04417..2e20da187 100644
--- a/packages/db/tests/query/where.test.ts
+++ b/packages/db/tests/query/where.test.ts
@@ -1,7 +1,7 @@
-import { beforeEach, describe, expect, test } from "vitest"
-import { createLiveQueryCollection } from "../../src/query/index.js"
-import { createCollection } from "../../src/collection/index.js"
-import { mockSyncCollectionOptions } from "../utils.js"
+import { beforeEach, describe, expect, test } from 'vitest'
+import { createLiveQueryCollection } from '../../src/query/index.js'
+import { createCollection } from '../../src/collection/index.js'
+import { mockSyncCollectionOptions } from '../utils.js'
 import {
   add,
   and,
@@ -21,7 +21,7 @@ import {
   not,
   or,
   upper,
-} from "../../src/query/builder/functions.js"
+} from '../../src/query/builder/functions.js'
 
 // Sample data types for comprehensive testing
 type Employee = {
@@ -228,7 +228,7 @@ function createEmployeesCollection(autoIndex: `off` | `eager` = `eager`) {
       getKey: (emp) => emp.id,
       initialData: sampleEmployees,
       autoIndex,
-    })
+    }),
   )
 }
 
@@ -339,7 +339,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
 
         expect(highEarners.size).toBe(3) // Alice (75k), Charlie (85k), Diana (95k)
         expect(highEarners.toArray.every((emp) => emp.salary > 70000)).toBe(
-          true
+          true,
         )
 
         // Test with age
@@ -430,7 +430,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
         })
 
         expect(exactMatch.toArray.some((emp) => emp.salary === 65000)).toBe(
-          true
+          true,
         ) // Bob
       })
 
@@ -450,7 +450,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
 
         expect(juniorSalary.size).toBe(2) // Eve (55k), Frank (45k)
         expect(juniorSalary.toArray.every((emp) => emp.salary < 60000)).toBe(
-          true
+          true,
         )
 
         // Test with age
@@ -505,12 +505,12 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
 
         expect(modestSalary.size).toBe(3) // Bob, Eve, Frank
         expect(modestSalary.toArray.every((emp) => emp.salary <= 65000)).toBe(
-          true
+          true,
         )
 
         // Test boundary condition
         expect(modestSalary.toArray.some((emp) => emp.salary === 65000)).toBe(
-          true
+          true,
         ) // Bob
       })
     })
@@ -529,7 +529,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
             q
               .from({ emp: employeesCollection })
               .where(({ emp }) =>
-                and(eq(emp.active, true), gt(emp.salary, 70000))
+                and(eq(emp.active, true), gt(emp.salary, 70000)),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -542,8 +542,8 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
         expect(activeHighEarners.size).toBe(2) // Alice (75k), Diana (95k)
         expect(
           activeHighEarners.toArray.every(
-            (emp) => emp.active && emp.salary > 70000
-          )
+            (emp) => emp.active && emp.salary > 70000,
+          ),
         ).toBe(true)
 
         // Test with three conditions
@@ -556,8 +556,8 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
                 and(
                   eq(emp.active, true),
                   gte(emp.age, 25),
-                  lte(emp.salary, 75000)
-                )
+                  lte(emp.salary, 75000),
+                ),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -594,7 +594,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
             q
               .from({ emp: employeesCollection })
               .where(({ emp }) =>
-                or(eq(emp.department_id, 1), eq(emp.department_id, 3))
+                or(eq(emp.department_id, 1), eq(emp.department_id, 3)),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -639,7 +639,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
 
         expect(notHighEarners.size).toBe(3) // Bob, Eve, Frank
         expect(notHighEarners.toArray.every((emp) => emp.salary <= 70000)).toBe(
-          true
+          true,
         )
       })
 
@@ -654,9 +654,9 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
                   eq(emp.active, true),
                   or(
                     and(eq(emp.department_id, 1), gt(emp.salary, 70000)),
-                    and(eq(emp.department_id, 2), lt(emp.age, 30))
-                  )
-                )
+                    and(eq(emp.department_id, 2), lt(emp.age, 30)),
+                  ),
+                ),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -753,8 +753,8 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
         expect(specificDepartments.size).toBe(4) // Alice, Bob, Charlie, Eve
         expect(
           specificDepartments.toArray.every(
-            (emp) => emp.department_id === 1 || emp.department_id === 2
-          )
+            (emp) => emp.department_id === 1 || emp.department_id === 2,
+          ),
         ).toBe(true)
 
         // Test with specific IDs
@@ -913,7 +913,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
 
         expect(shortNames.size).toBe(2) // Bob (3), Eve (3)
         expect(
-          shortNames.toArray.every((emp) => emp.first_name.length < 4)
+          shortNames.toArray.every((emp) => emp.first_name.length < 4),
         ).toBe(true)
 
         const longNames = createLiveQueryCollection({
@@ -939,7 +939,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
             q
               .from({ emp: employeesCollection })
               .where(({ emp }) =>
-                eq(concat(emp.first_name, ` `, emp.last_name), `Alice Johnson`)
+                eq(concat(emp.first_name, ` `, emp.last_name), `Alice Johnson`),
               )
               .select(({ emp }) => ({ id: emp.id, name: emp.name })),
         })
@@ -955,7 +955,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
             q
               .from({ emp: employeesCollection })
               .where(({ emp }) =>
-                like(coalesce(emp.email, `no-email@company.com`), `%no-email%`)
+                like(coalesce(emp.email, `no-email@company.com`), `%no-email%`),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -992,7 +992,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
 
         expect(salaryPlusBonus.size).toBe(3) // Alice (85k), Charlie (95k), Diana (105k)
         expect(
-          salaryPlusBonus.toArray.every((emp) => emp.salary + 10000 > 80000)
+          salaryPlusBonus.toArray.every((emp) => emp.salary + 10000 > 80000),
         ).toBe(true)
 
         // Test age calculation
@@ -1032,9 +1032,9 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
                   eq(emp.active, true),
                   or(
                     and(gte(emp.salary, 70000), lt(emp.age, 35)),
-                    eq(emp.department_id, 2)
-                  )
-                )
+                    eq(emp.department_id, 2),
+                  ),
+                ),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -1217,7 +1217,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
             id: `empty-employees`,
             getKey: (emp) => emp.id,
             initialData: [],
-          })
+          }),
         )
 
         const emptyQuery = createLiveQueryCollection({
@@ -1259,7 +1259,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
             q
               .from({ emp: employeesCollection })
               .where(({ emp }) =>
-                and(gte(emp.salary, 60000), lte(emp.salary, 80000))
+                and(gte(emp.salary, 60000), lte(emp.salary, 80000)),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -1271,8 +1271,8 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
         expect(salaryRange.size).toBe(2) // Bob (65k), Alice (75k)
         expect(
           salaryRange.toArray.every(
-            (emp) => emp.salary >= 60000 && emp.salary <= 80000
-          )
+            (emp) => emp.salary >= 60000 && emp.salary <= 80000,
+          ),
         ).toBe(true)
       })
 
@@ -1288,11 +1288,11 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
                     eq(emp.active, true),
                     or(
                       and(eq(emp.department_id, 1), gt(emp.salary, 70000)),
-                      and(eq(emp.department_id, 2), lt(emp.age, 30))
-                    )
+                      and(eq(emp.department_id, 2), lt(emp.age, 30)),
+                    ),
                   ),
-                  and(eq(emp.active, false), gt(emp.age, 35))
-                )
+                  and(eq(emp.active, false), gt(emp.age, 35)),
+                ),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -1332,7 +1332,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
 
         const resultArray = result.toArray
         expect(
-          resultArray.every((emp) => emp.active && emp.salary > 70000)
+          resultArray.every((emp) => emp.active && emp.salary > 70000),
         ).toBe(true)
 
         const names = resultArray.map((emp) => emp.name).sort()
@@ -1365,8 +1365,8 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
         const resultArray = result.toArray
         expect(
           resultArray.every(
-            (emp) => emp.active && emp.salary >= 65000 && emp.age < 35
-          )
+            (emp) => emp.active && emp.salary >= 65000 && emp.age < 35,
+          ),
         ).toBe(true)
 
         const names = resultArray.map((emp) => emp.name).sort()
@@ -1470,7 +1470,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
             q
               .from({ emp: employeesCollection })
               .where(({ emp }) =>
-                eq(emp.contact?.address?.city, `San Francisco`)
+                eq(emp.contact?.address?.city, `San Francisco`),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -1481,7 +1481,7 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
 
         expect(sfEmployees.size).toBe(2) // Alice and Diana
         expect(
-          sfEmployees.toArray.every((e) => e.city === `San Francisco`)
+          sfEmployees.toArray.every((e) => e.city === `San Francisco`),
         ).toBe(true)
       })
 
@@ -1534,8 +1534,8 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
                 and(
                   eq(emp.active, true),
                   eq(emp.contact?.address?.state, `CA`),
-                  gte(emp.profile?.experience.years, 5)
-                )
+                  gte(emp.profile?.experience.years, 5),
+                ),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -1562,8 +1562,8 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
               .where(({ emp }) =>
                 and(
                   gt(emp.salary, 60000),
-                  inArray(`Python`, emp.profile?.skills)
-                )
+                  inArray(`Python`, emp.profile?.skills),
+                ),
               )
               .select(({ emp }) => ({
                 id: emp.id,
@@ -1694,8 +1694,8 @@ function createWhereTests(autoIndex: `off` | `eager`): void {
               .where(({ emp }) =>
                 or(
                   eq(emp.contact?.address?.city, `San Francisco`),
-                  inArray(`Python`, emp.profile?.skills)
-                )
+                  inArray(`Python`, emp.profile?.skills),
+                ),
               )
               .select(({ emp }) => ({
                 id: emp.id,
diff --git a/packages/db/tests/test-setup.ts b/packages/db/tests/test-setup.ts
index b9e762299..a9d0dd31a 100644
--- a/packages/db/tests/test-setup.ts
+++ b/packages/db/tests/test-setup.ts
@@ -1 +1 @@
-import "@testing-library/jest-dom/vitest"
+import '@testing-library/jest-dom/vitest'
diff --git a/packages/db/tests/transaction-types.test.ts b/packages/db/tests/transaction-types.test.ts
index d69e80f73..0efc4498e 100644
--- a/packages/db/tests/transaction-types.test.ts
+++ b/packages/db/tests/transaction-types.test.ts
@@ -1,11 +1,11 @@
-import { describe, expect, it } from "vitest"
-import type { Collection } from "../src/collection/index.js"
+import { describe, expect, it } from 'vitest'
+import type { Collection } from '../src/collection/index.js'
 import type {
   MutationFn,
   PendingMutation,
   Transaction,
   TransactionConfig,
-} from "../src/types"
+} from '../src/types'
 
 describe(`Transaction Types`, () => {
   it(`should validate PendingMutation structure with collection`, () => {
diff --git a/packages/db/tests/transactions.test.ts b/packages/db/tests/transactions.test.ts
index 8e7fb4344..a0c716052 100644
--- a/packages/db/tests/transactions.test.ts
+++ b/packages/db/tests/transactions.test.ts
@@ -1,12 +1,12 @@
-import { describe, expect, it } from "vitest"
-import { createTransaction } from "../src/transactions"
-import { createCollection } from "../src/collection/index.js"
+import { describe, expect, it } from 'vitest'
+import { createTransaction } from '../src/transactions'
+import { createCollection } from '../src/collection/index.js'
 import {
   MissingMutationFunctionError,
   TransactionAlreadyCompletedRollbackError,
   TransactionNotPendingCommitError,
   TransactionNotPendingMutateError,
-} from "../src/errors"
+} from '../src/errors'
 
 describe(`Transactions`, () => {
   it(`calling createTransaction creates a transaction`, () => {
@@ -39,13 +39,13 @@ describe(`Transactions`, () => {
     await transaction.commit()
 
     await expect(transaction.commit()).rejects.toThrow(
-      TransactionNotPendingCommitError
+      TransactionNotPendingCommitError,
     )
     expect(() => transaction.rollback()).toThrow(
-      TransactionAlreadyCompletedRollbackError
+      TransactionAlreadyCompletedRollbackError,
     )
     expect(() => transaction.mutate(() => {})).toThrow(
-      TransactionNotPendingMutateError
+      TransactionNotPendingMutateError,
     )
   })
   it(`should allow manually controlling the transaction lifecycle`, () => {
diff --git a/packages/db/tests/utility-exposure.test.ts b/packages/db/tests/utility-exposure.test.ts
index 4412443db..9a4ab7ed7 100644
--- a/packages/db/tests/utility-exposure.test.ts
+++ b/packages/db/tests/utility-exposure.test.ts
@@ -1,6 +1,6 @@
-import { describe, expect, test } from "vitest"
-import { createCollection } from "../src/collection/index.js"
-import type { CollectionConfig, SyncConfig, UtilsRecord } from "../src/types"
+import { describe, expect, test } from 'vitest'
+import { createCollection } from '../src/collection/index.js'
+import type { CollectionConfig, SyncConfig, UtilsRecord } from '../src/types'
 
 // Mock utility functions for testing
 interface TestUtils extends UtilsRecord {
@@ -87,7 +87,7 @@ describe(`Utility exposure pattern`, () => {
 
     // Create collection with utilities
     const collection = createCollection<TestItem, string | number, TestUtils>(
-      options
+      options,
     )
 
     // Let's verify utilities work with the collection
diff --git a/packages/db/tests/utils.test.ts b/packages/db/tests/utils.test.ts
index 6cd35cc1a..d6bb5e368 100644
--- a/packages/db/tests/utils.test.ts
+++ b/packages/db/tests/utils.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from "vitest"
-import { Temporal } from "temporal-polyfill"
-import { deepEquals } from "../src/utils"
-import { isPromiseLike } from "../src/utils/type-guards"
+import { describe, expect, it } from 'vitest'
+import { Temporal } from 'temporal-polyfill'
+import { deepEquals } from '../src/utils'
+import { isPromiseLike } from '../src/utils/type-guards'
 
 describe(`deepEquals`, () => {
   describe(`primitives`, () => {
diff --git a/packages/db/tests/utils.ts b/packages/db/tests/utils.ts
index 26dad9c22..49b48db95 100644
--- a/packages/db/tests/utils.ts
+++ b/packages/db/tests/utils.ts
@@ -1,10 +1,10 @@
-import { expect } from "vitest"
+import { expect } from 'vitest'
 import type {
   CollectionConfig,
   MutationFnParams,
   StringCollationConfig,
   SyncConfig,
-} from "../src/index.js"
+} from '../src/index.js'
 
 // Index usage tracking utilities
 export interface IndexUsageStats {
@@ -127,7 +127,7 @@ export function expectIndexUsage(
     shouldUseFullScan?: boolean
     indexCallCount?: number
     fullScanCallCount?: number
-  }
+  },
 ) {
   if (expectations.shouldUseIndex) {
     expect(stats.rangeQueryCalls).toBeGreaterThan(0)
@@ -157,7 +157,7 @@ export function expectIndexUsage(
 // Helper to run a test with index usage tracking (automatically handles setup/cleanup)
 export function withIndexTracking(
   collection: any,
-  testFn: (tracker: { stats: IndexUsageStats }) => void | Promise<void>
+  testFn: (tracker: { stats: IndexUsageStats }) => void | Promise<void>,
 ): void | Promise<void> {
   const tracker = createIndexUsageTracker(collection)
 
@@ -381,7 +381,7 @@ export const flushPromises = () =>
  */
 export function withExpectedRejection<T>(
   expectedMessage: string,
-  testFn: () => T | Promise<T>
+  testFn: () => T | Promise<T>,
 ): Promise<T> {
   return new Promise((resolve, reject) => {
     // Find and temporarily remove the vitest unhandled rejection handler
@@ -413,8 +413,8 @@ export function withExpectedRejection<T>(
         if (!expectedRejectionCaught) {
           reject(
             new Error(
-              `Expected rejection with message "${expectedMessage}" was not caught`
-            )
+              `Expected rejection with message "${expectedMessage}" was not caught`,
+            ),
           )
           return
         }
diff --git a/packages/db/vite.config.ts b/packages/db/vite.config.ts
index 840a0f7b9..62e1a9df2 100644
--- a/packages/db/vite.config.ts
+++ b/packages/db/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -18,5 +18,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/electric-db-collection/CHANGELOG.md b/packages/electric-db-collection/CHANGELOG.md
index 3dbbb8924..258964695 100644
--- a/packages/electric-db-collection/CHANGELOG.md
+++ b/packages/electric-db-collection/CHANGELOG.md
@@ -1,5 +1,111 @@
 # @tanstack/electric-db-collection
 
+## 0.2.19
+
+### Patch Changes
+
+- Fix slow onInsert awaitMatch performance issue ([#1062](https://github.com/TanStack/db/pull/1062))
+
+  The message buffer was being cleared at the start of each new batch, causing messages to be lost when multiple batches (including heartbeats) arrived before `awaitMatch` was called. This resulted in `awaitMatch` timing out (~3-5s per attempt) and transaction rollbacks.
+
+  The fix removes the buffer clearing between batches. Messages are now preserved until the buffer reaches MAX_BATCH_MESSAGES (1000), at which point the oldest messages are dropped. This ensures `awaitMatch` can find messages even when sync activity arrives before the API call completes.
+
+## 0.2.18
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.2.17
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.2.16
+
+### Patch Changes
+
+- Adds support for the new subset-end message introduced in Electric. ([#1004](https://github.com/TanStack/db/pull/1004))
+
+- Support tagged rows and move out events in Electric collection. ([#942](https://github.com/TanStack/db/pull/942))
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.2.15
+
+### Patch Changes
+
+- Don't pin @electric-sql/client version ([#1031](https://github.com/TanStack/db/pull/1031))
+
+## 0.2.14
+
+### Patch Changes
+
+- Fix awaitMatch race condition on inserts and export isChangeMessage/isControlMessage. ([#1000](https://github.com/TanStack/db/pull/1000))
+
+  **Bug fixes:**
+  - Fixed race condition where `awaitMatch` would timeout on inserts when Electric synced faster than the API call
+  - Messages are now preserved in buffer until next batch arrives, allowing `awaitMatch` to find them
+  - Added `batchCommitted` flag to track commit state, consistent with `awaitTxId` semantics
+  - Fixed `batchCommitted` to also trigger on `snapshot-end` in `on-demand` mode (matching "ready" semantics)
+
+  **Export fixes:**
+  - `isChangeMessage` and `isControlMessage` are now exported from the package index as documented
+
+- Fix invalid Electric proxy queries with missing params for null/undefined values ([#951](https://github.com/TanStack/db/pull/951))
+
+  When comparison operators were used with null/undefined values, the SQL compiler would generate placeholders ($1, $2) in the WHERE clause but skip adding the params to the dictionary. This resulted in invalid queries being sent to Electric.
+
+  Now all comparison operators (eq, gt, lt, gte, lte, like, ilike) throw a clear error when used with null/undefined values, since comparisons with NULL always evaluate to UNKNOWN in SQL. Users should use `isNull()` or `isUndefined()` to check for null values instead.
+
+## 0.2.13
+
+### Patch Changes
+
+- Enhanced LoadSubsetOptions with separate cursor expressions and offset for flexible pagination. ([#960](https://github.com/TanStack/db/pull/960))
+
+  **⚠️ Breaking Change for Custom Sync Layers / Query Collections:**
+
+  `LoadSubsetOptions.where` no longer includes cursor expressions for pagination. If you have a custom sync layer or query collection that implements `loadSubset`, you must now handle pagination separately:
+  - **Cursor-based pagination:** Use the new `cursor` property (`cursor.whereFrom` and `cursor.whereCurrent`) and combine them with `where` yourself
+  - **Offset-based pagination:** Use the new `offset` property
+
+  Previously, cursor expressions were baked into the `where` clause. Now they are passed separately so sync layers can choose their preferred pagination strategy.
+
+  **Changes:**
+  - Added `CursorExpressions` type with `whereFrom`, `whereCurrent`, and optional `lastKey` properties
+  - Added `cursor` to `LoadSubsetOptions` for cursor-based pagination (separate from `where`)
+  - Added `offset` to `LoadSubsetOptions` for offset-based pagination support
+  - Electric sync layer now makes two parallel `requestSnapshot` calls when cursor is present:
+    - One for `whereCurrent` (all ties at boundary, no limit)
+    - One for `whereFrom` (rows after cursor, with limit)
+  - Query collection serialization now includes `offset` for query key generation
+  - Added `truncate` event to collections, emitted when synced data is truncated (e.g., after `must-refetch`)
+  - Fixed `setWindow` pagination: cursor expressions are now correctly built when paging through results
+  - Fixed offset tracking: `loadNextItems` now passes the correct window offset to prevent incorrect deduplication
+  - `CollectionSubscriber` now listens for `truncate` events to reset cursor tracking state
+
+  **Benefits:**
+  - Sync layers can choose between cursor-based or offset-based pagination strategies
+  - Electric can efficiently handle tie-breaking with two targeted requests
+  - Better separation of concerns between filtering (`where`) and pagination (`cursor`/`offset`)
+  - `setWindow` correctly triggers backend loading for subsequent pages in multi-column orderBy queries
+  - Cursor state is properly reset after truncation, preventing stale cursor data from being used
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.2.12
+
+### Patch Changes
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.2.11
 
 ### Patch Changes
@@ -130,7 +236,7 @@
         // Specify custom timeout (in milliseconds)
         return { txid: result.txid, timeout: 10000 }
       },
-    })
+    }),
   )
   ```
 
@@ -255,7 +361,7 @@
   **Example Usage:**
 
   ```typescript
-  import { isChangeMessage } from "@tanstack/electric-db-collection"
+  import { isChangeMessage } from '@tanstack/electric-db-collection'
 
   const todosCollection = createCollection(
     electricCollectionOptions({
@@ -267,12 +373,12 @@
         await collection.utils.awaitMatch(
           (message) =>
             isChangeMessage(message) &&
-            message.headers.operation === "insert" &&
+            message.headers.operation === 'insert' &&
             message.value.text === newItem.text,
-          5000 // timeout in ms (optional, defaults to 5000)
+          5000, // timeout in ms (optional, defaults to 5000)
         )
       },
-    })
+    }),
   )
   ```
 
@@ -604,7 +710,7 @@
   try {
     collection.insert(data)
   } catch (error) {
-    if (error.message.includes("already exists")) {
+    if (error.message.includes('already exists')) {
       // Handle duplicate key error
     }
   }
@@ -613,7 +719,7 @@
   **After:**
 
   ```ts
-  import { DuplicateKeyError } from "@tanstack/db"
+  import { DuplicateKeyError } from '@tanstack/db'
 
   try {
     collection.insert(data)
@@ -630,14 +736,14 @@
 
   ```ts
   // Electric collection errors were imported from @tanstack/db
-  import { ElectricInsertHandlerMustReturnTxIdError } from "@tanstack/db"
+  import { ElectricInsertHandlerMustReturnTxIdError } from '@tanstack/db'
   ```
 
   **After:**
 
   ```ts
   // Now import from the specific adapter package
-  import { ElectricInsertHandlerMustReturnTxIdError } from "@tanstack/electric-db-collection"
+  import { ElectricInsertHandlerMustReturnTxIdError } from '@tanstack/electric-db-collection'
   ```
 
   ### Unified Error Handling
@@ -645,14 +751,14 @@
   **New:**
 
   ```ts
-  import { TanStackDBError } from "@tanstack/db"
+  import { TanStackDBError } from '@tanstack/db'
 
   try {
     // Any TanStack DB operation
   } catch (error) {
     if (error instanceof TanStackDBError) {
       // Handle all TanStack DB errors uniformly
-      console.log("TanStack DB error:", error.message)
+      console.log('TanStack DB error:', error.message)
     }
   }
   ```
diff --git a/packages/electric-db-collection/e2e/electric.e2e.test.ts b/packages/electric-db-collection/e2e/electric.e2e.test.ts
index 67154bf21..cb41e26da 100644
--- a/packages/electric-db-collection/e2e/electric.e2e.test.ts
+++ b/packages/electric-db-collection/e2e/electric.e2e.test.ts
@@ -4,26 +4,27 @@
  * end-to-end tests using actual Postgres + Electric sync
  */
 
-import { afterAll, afterEach, beforeAll, describe, inject } from "vitest"
-import { createCollection } from "@tanstack/db"
-import { ELECTRIC_TEST_HOOKS, electricCollectionOptions } from "../src/electric"
-import { makePgClient } from "../../db-collection-e2e/support/global-setup"
+import { afterAll, afterEach, beforeAll, describe, inject } from 'vitest'
+import { createCollection } from '@tanstack/db'
+import { ELECTRIC_TEST_HOOKS, electricCollectionOptions } from '../src/electric'
+import { makePgClient } from '../../db-collection-e2e/support/global-setup'
 import {
   createCollationTestSuite,
   createDeduplicationTestSuite,
   createJoinsTestSuite,
   createLiveUpdatesTestSuite,
+  createMovesTestSuite,
   createMutationsTestSuite,
   createPaginationTestSuite,
   createPredicatesTestSuite,
   createProgressiveTestSuite,
   generateSeedData,
-} from "../../db-collection-e2e/src/index"
-import { waitFor } from "../../db-collection-e2e/src/utils/helpers"
-import type { E2ETestConfig } from "../../db-collection-e2e/src/types"
-import type { Client } from "pg"
+} from '../../db-collection-e2e/src/index'
+import { waitFor } from '../../db-collection-e2e/src/utils/helpers'
+import type { E2ETestConfig } from '../../db-collection-e2e/src/types'
+import type { Client } from 'pg'
 
-declare module "vitest" {
+declare module 'vitest' {
   export interface ProvidedContext {
     baseUrl: string
     testSchema: string
@@ -31,7 +32,15 @@ declare module "vitest" {
 }
 
 describe(`Electric Collection E2E Tests`, () => {
-  let config: E2ETestConfig
+  let config: E2ETestConfig & {
+    tagsTestSetup?: {
+      dbClient: Client
+      baseUrl: string
+      testSchema: string
+      usersTable: string
+      postsTable: string
+    }
+  }
   let dbClient: Client
   let usersTable: string
   let postsTable: string
@@ -106,7 +115,7 @@ describe(`Electric Collection E2E Tests`, () => {
           user.createdAt,
           user.metadata ? JSON.stringify(user.metadata) : null,
           user.deletedAt,
-        ]
+        ],
       )
     }
     console.log(`Inserted ${seedData.users.length} users successfully`)
@@ -124,7 +133,7 @@ describe(`Electric Collection E2E Tests`, () => {
           post.largeViewCount.toString(), // BigInt must be converted to string for pg
           post.publishedAt,
           post.deletedAt,
-        ]
+        ],
       )
     }
 
@@ -139,7 +148,7 @@ describe(`Electric Collection E2E Tests`, () => {
           comment.text,
           comment.createdAt,
           comment.deletedAt,
-        ]
+        ],
       )
     }
 
@@ -159,7 +168,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `eager`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const tempPostsCollection = createCollection(
@@ -174,7 +183,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `eager`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const tempCommentsCollection = createCollection(
@@ -189,7 +198,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `eager`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     await Promise.all([
@@ -236,7 +245,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `eager`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const eagerPosts = createCollection(
@@ -251,7 +260,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `eager`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const eagerComments = createCollection(
@@ -266,7 +275,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `eager`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const onDemandUsers = createCollection(
@@ -281,7 +290,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `on-demand`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const onDemandPosts = createCollection(
@@ -296,7 +305,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `on-demand`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const onDemandComments = createCollection(
@@ -311,7 +320,7 @@ describe(`Electric Collection E2E Tests`, () => {
         syncMode: `on-demand`,
         getKey: (item: any) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     // Create control mechanisms for progressive collections
@@ -354,7 +363,7 @@ describe(`Electric Collection E2E Tests`, () => {
         [ELECTRIC_TEST_HOOKS]: {
           beforeMarkingReady: () => usersUpToDateControl.createPromise(),
         },
-      })
+      }),
     )
 
     const progressivePosts = createCollection(
@@ -372,7 +381,7 @@ describe(`Electric Collection E2E Tests`, () => {
         [ELECTRIC_TEST_HOOKS]: {
           beforeMarkingReady: () => postsUpToDateControl.createPromise(),
         },
-      })
+      }),
     )
 
     const progressiveComments = createCollection(
@@ -390,7 +399,7 @@ describe(`Electric Collection E2E Tests`, () => {
         [ELECTRIC_TEST_HOOKS]: {
           beforeMarkingReady: () => commentsUpToDateControl.createPromise(),
         },
-      })
+      }),
     )
 
     // Wait for eager collections to sync all data
@@ -433,13 +442,20 @@ describe(`Electric Collection E2E Tests`, () => {
           commentsUpToDateControl.current?.()
         },
       },
+      tagsTestSetup: {
+        dbClient,
+        baseUrl,
+        testSchema,
+        usersTable,
+        postsTable,
+      },
       getTxid: async () => {
         // Get the current transaction ID from the last operation
         // This uses pg_current_xact_id_if_assigned() which returns the txid
         // Note: This gets the CURRENT transaction's ID, so must be called
         // immediately after an insert in the same transaction context
         const result = await dbClient.query(
-          `SELECT pg_current_xact_id_if_assigned()::text::bigint as txid`
+          `SELECT pg_current_xact_id_if_assigned()::text::bigint as txid`,
         )
         return result.rows[0]?.txid || null
       },
@@ -459,7 +475,7 @@ describe(`Electric Collection E2E Tests`, () => {
               user.createdAt,
               user.metadata ? JSON.stringify(user.metadata) : null,
               user.deletedAt || null,
-            ]
+            ],
           )
         },
         updateUser: async (id, updates) => {
@@ -487,7 +503,7 @@ describe(`Electric Collection E2E Tests`, () => {
           values.push(id)
           await dbClient.query(
             `UPDATE ${usersTable} SET ${setClauses.join(`, `)} WHERE id = $${paramIndex}`,
-            values
+            values,
           )
         },
         deleteUser: async (id) => {
@@ -506,7 +522,7 @@ describe(`Electric Collection E2E Tests`, () => {
               post.largeViewCount.toString(), // BigInt must be converted to string for pg
               post.publishedAt || null,
               post.deletedAt || null,
-            ]
+            ],
           )
         },
       },
@@ -578,4 +594,5 @@ describe(`Electric Collection E2E Tests`, () => {
   createMutationsTestSuite(getConfig)
   createLiveUpdatesTestSuite(getConfig)
   createProgressiveTestSuite(getConfig)
+  createMovesTestSuite(getConfig as any)
 })
diff --git a/packages/electric-db-collection/package.json b/packages/electric-db-collection/package.json
index 7a4b7af9c..54774cfe0 100644
--- a/packages/electric-db-collection/package.json
+++ b/packages/electric-db-collection/package.json
@@ -1,20 +1,32 @@
 {
   "name": "@tanstack/electric-db-collection",
+  "version": "0.2.19",
   "description": "ElectricSQL collection for TanStack DB",
-  "version": "0.2.11",
-  "dependencies": {
-    "@electric-sql/client": "^1.2.0",
-    "@standard-schema/spec": "^1.0.0",
-    "@tanstack/db": "workspace:*",
-    "@tanstack/store": "^0.8.0",
-    "debug": "^4.4.3"
+  "author": "Kyle Mathews",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TanStack/db.git",
+    "directory": "packages/electric-db-collection"
   },
-  "devDependencies": {
-    "@types/debug": "^4.1.12",
-    "@types/pg": "^8.15.6",
-    "@vitest/coverage-istanbul": "^3.2.4",
-    "pg": "^8.16.3"
+  "homepage": "https://tanstack.com/db",
+  "keywords": [
+    "electric",
+    "sql",
+    "optimistic",
+    "typescript"
+  ],
+  "scripts": {
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "lint": "eslint . --fix",
+    "test": "vitest run",
+    "test:e2e": "vitest run --config vitest.e2e.config.ts"
   },
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -28,35 +40,22 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
-  "packageManager": "pnpm@10.24.0",
-  "author": "Kyle Mathews",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/TanStack/db.git",
-    "directory": "packages/electric-db-collection"
-  },
-  "homepage": "https://tanstack.com/db",
-  "keywords": [
-    "electric",
-    "sql",
-    "optimistic",
-    "typescript"
-  ],
-  "scripts": {
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "lint": "eslint . --fix",
-    "test": "npx vitest run",
-    "test:e2e": "npx vitest run --config vitest.e2e.config.ts"
+  "dependencies": {
+    "@electric-sql/client": "^1.3.0",
+    "@standard-schema/spec": "^1.0.0",
+    "@tanstack/db": "workspace:*",
+    "@tanstack/store": "^0.8.0",
+    "debug": "^4.4.3"
   },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@types/debug": "^4.1.12",
+    "@types/pg": "^8.15.6",
+    "@vitest/coverage-istanbul": "^3.2.4",
+    "pg": "^8.16.3"
+  }
 }
diff --git a/packages/electric-db-collection/src/electric.ts b/packages/electric-db-collection/src/electric.ts
index 1ec043fd2..65d3b7cc0 100644
--- a/packages/electric-db-collection/src/electric.ts
+++ b/packages/electric-db-collection/src/electric.ts
@@ -3,19 +3,35 @@ import {
   isChangeMessage,
   isControlMessage,
   isVisibleInSnapshot,
-} from "@electric-sql/client"
-import { Store } from "@tanstack/store"
-import DebugModule from "debug"
-import { DeduplicatedLoadSubset } from "@tanstack/db"
+} from '@electric-sql/client'
+import { Store } from '@tanstack/store'
+import DebugModule from 'debug'
+import { DeduplicatedLoadSubset, and } from '@tanstack/db'
 import {
   ExpectedNumberInAwaitTxIdError,
   StreamAbortedError,
   TimeoutWaitingForMatchError,
   TimeoutWaitingForTxIdError,
-} from "./errors"
-import { compileSQL } from "./sql-compiler"
+} from './errors'
+import { compileSQL } from './sql-compiler'
+import {
+  addTagToIndex,
+  findRowsMatchingPattern,
+  getTagLength,
+  isMoveOutMessage,
+  removeTagFromIndex,
+  tagMatchesPattern,
+} from './tag-index'
+import type {
+  MoveOutPattern,
+  MoveTag,
+  ParsedMoveTag,
+  RowId,
+  TagIndex,
+} from './tag-index'
 import type {
   BaseCollectionConfig,
+  ChangeMessageOrDeleteKeyMessage,
   CollectionConfig,
   DeleteMutationFnParams,
   InsertMutationFnParams,
@@ -24,8 +40,8 @@ import type {
   SyncMode,
   UpdateMutationFnParams,
   UtilsRecord,
-} from "@tanstack/db"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from '@tanstack/db'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 import type {
   ControlMessage,
   GetExtensions,
@@ -33,10 +49,10 @@ import type {
   PostgresSnapshot,
   Row,
   ShapeStreamOptions,
-} from "@electric-sql/client"
+} from '@electric-sql/client'
 
 // Re-export for user convenience in custom match functions
-export { isChangeMessage, isControlMessage } from "@electric-sql/client"
+export { isChangeMessage, isControlMessage } from '@electric-sql/client'
 
 const debug = DebugModule.debug(`ts/db:electric`)
 
@@ -66,7 +82,7 @@ export type Txid = number
  * indicating if the mutation has been synchronized
  */
 export type MatchFunction<T extends Row<unknown>> = (
-  message: Message<T>
+  message: Message<T>,
 ) => boolean
 
 /**
@@ -197,7 +213,7 @@ export interface ElectricCollectionConfig<
       T,
       string | number,
       ElectricCollectionUtils<T>
-    >
+    >,
   ) => Promise<MatchingStrategy>
 
   /**
@@ -232,7 +248,7 @@ export interface ElectricCollectionConfig<
       T,
       string | number,
       ElectricCollectionUtils<T>
-    >
+    >,
   ) => Promise<MatchingStrategy>
 
   /**
@@ -266,28 +282,37 @@ export interface ElectricCollectionConfig<
       T,
       string | number,
       ElectricCollectionUtils<T>
-    >
+    >,
   ) => Promise<MatchingStrategy>
 }
 
 function isUpToDateMessage<T extends Row<unknown>>(
-  message: Message<T>
+  message: Message<T>,
 ): message is ControlMessage & { up_to_date: true } {
   return isControlMessage(message) && message.headers.control === `up-to-date`
 }
 
 function isMustRefetchMessage<T extends Row<unknown>>(
-  message: Message<T>
+  message: Message<T>,
 ): message is ControlMessage & { headers: { control: `must-refetch` } } {
   return isControlMessage(message) && message.headers.control === `must-refetch`
 }
 
 function isSnapshotEndMessage<T extends Row<unknown>>(
-  message: Message<T>
+  message: Message<T>,
 ): message is SnapshotEndMessage {
   return isControlMessage(message) && message.headers.control === `snapshot-end`
 }
 
+function isSubsetEndMessage<T extends Row<unknown>>(
+  message: Message<T>,
+): message is ControlMessage & { headers: { control: `subset-end` } } {
+  return (
+    isControlMessage(message) &&
+    (message.headers.control as string) === `subset-end`
+  )
+}
+
 function parseSnapshotMessage(message: SnapshotEndMessage): PostgresSnapshot {
   return {
     xmin: message.headers.xmin,
@@ -298,7 +323,7 @@ function parseSnapshotMessage(message: SnapshotEndMessage): PostgresSnapshot {
 
 // Check if a message contains txids in its headers
 function hasTxids<T extends Row<unknown>>(
-  message: Message<T>
+  message: Message<T>,
 ): message is Message<T> & { headers: { txids?: Array<Txid> } } {
   return `txids` in message.headers && Array.isArray(message.headers.txids)
 }
@@ -307,7 +332,12 @@ function hasTxids<T extends Row<unknown>>(
  * Creates a deduplicated loadSubset handler for progressive/on-demand modes
  * Returns null for eager mode, or a DeduplicatedLoadSubset instance for other modes.
  * Handles fetching snapshots in progressive mode during buffering phase,
- * and requesting snapshots in on-demand mode
+ * and requesting snapshots in on-demand mode.
+ *
+ * When cursor expressions are provided (whereFrom/whereCurrent), makes two
+ * requestSnapshot calls:
+ * - One for whereFrom (rows > cursor) with limit
+ * - One for whereCurrent (rows = cursor, for tie-breaking) without limit
  */
 function createLoadSubsetDedupe<T extends Row<unknown>>({
   stream,
@@ -347,7 +377,7 @@ function createLoadSubsetDedupe<T extends Row<unknown>>({
         // and completed the atomic swap while waiting for the snapshot
         if (!isBufferingInitialSync()) {
           debug(
-            `${collectionId ? `[${collectionId}] ` : ``}Ignoring snapshot - sync completed while fetching`
+            `${collectionId ? `[${collectionId}] ` : ``}Ignoring snapshot - sync completed while fetching`,
           )
           return
         }
@@ -367,13 +397,13 @@ function createLoadSubsetDedupe<T extends Row<unknown>>({
           commit()
 
           debug(
-            `${collectionId ? `[${collectionId}] ` : ``}Applied snapshot with ${rows.length} rows`
+            `${collectionId ? `[${collectionId}] ` : ``}Applied snapshot with ${rows.length} rows`,
           )
         }
       } catch (error) {
         debug(
           `${collectionId ? `[${collectionId}] ` : ``}Error fetching snapshot: %o`,
-          error
+          error,
         )
         throw error
       }
@@ -382,8 +412,50 @@ function createLoadSubsetDedupe<T extends Row<unknown>>({
       return
     } else {
       // On-demand mode: use requestSnapshot
-      const snapshotParams = compileSQL<T>(opts)
-      await stream.requestSnapshot(snapshotParams)
+      // When cursor is provided, make two calls:
+      // 1. whereCurrent (all ties, no limit)
+      // 2. whereFrom (rows > cursor, with limit)
+      const { cursor, where, orderBy, limit } = opts
+
+      if (cursor) {
+        // Make parallel requests for cursor-based pagination
+        const promises: Array<Promise<unknown>> = []
+
+        // Request 1: All rows matching whereCurrent (ties at boundary, no limit)
+        // Combine main where with cursor.whereCurrent
+        const whereCurrentOpts: LoadSubsetOptions = {
+          where: where ? and(where, cursor.whereCurrent) : cursor.whereCurrent,
+          orderBy,
+          // No limit - get all ties
+        }
+        const whereCurrentParams = compileSQL<T>(whereCurrentOpts)
+        promises.push(stream.requestSnapshot(whereCurrentParams))
+
+        debug(
+          `${collectionId ? `[${collectionId}] ` : ``}Requesting cursor.whereCurrent snapshot (all ties)`,
+        )
+
+        // Request 2: Rows matching whereFrom (rows > cursor, with limit)
+        // Combine main where with cursor.whereFrom
+        const whereFromOpts: LoadSubsetOptions = {
+          where: where ? and(where, cursor.whereFrom) : cursor.whereFrom,
+          orderBy,
+          limit,
+        }
+        const whereFromParams = compileSQL<T>(whereFromOpts)
+        promises.push(stream.requestSnapshot(whereFromParams))
+
+        debug(
+          `${collectionId ? `[${collectionId}] ` : ``}Requesting cursor.whereFrom snapshot (with limit ${limit})`,
+        )
+
+        // Wait for both requests to complete
+        await Promise.all(promises)
+      } else {
+        // No cursor - standard single request
+        const snapshotParams = compileSQL<T>(opts)
+        await stream.requestSnapshot(snapshotParams)
+      }
     }
   }
 
@@ -400,7 +472,7 @@ export type AwaitTxIdFn = (txId: Txid, timeout?: number) => Promise<boolean>
  */
 export type AwaitMatchFn<T extends Row<unknown>> = (
   matchFn: MatchFunction<T>,
-  timeout?: number
+  timeout?: number,
 ) => Promise<boolean>
 
 /**
@@ -427,7 +499,7 @@ export interface ElectricCollectionUtils<
 export function electricCollectionOptions<T extends StandardSchemaV1>(
   config: ElectricCollectionConfig<InferSchemaOutput<T>, T> & {
     schema: T
-  }
+  },
 ): Omit<CollectionConfig<InferSchemaOutput<T>, string | number, T>, `utils`> & {
   id?: string
   utils: ElectricCollectionUtils<InferSchemaOutput<T>>
@@ -438,7 +510,7 @@ export function electricCollectionOptions<T extends StandardSchemaV1>(
 export function electricCollectionOptions<T extends Row<unknown>>(
   config: ElectricCollectionConfig<T> & {
     schema?: never // prohibit schema
-  }
+  },
 ): Omit<CollectionConfig<T, string | number>, `utils`> & {
   id?: string
   utils: ElectricCollectionUtils<T>
@@ -446,7 +518,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
 }
 
 export function electricCollectionOptions<T extends Row<unknown>>(
-  config: ElectricCollectionConfig<T, any>
+  config: ElectricCollectionConfig<T, any>,
 ): Omit<
   CollectionConfig<T, string | number, any, ElectricCollectionUtils<T>>,
   `utils`
@@ -476,6 +548,10 @@ export function electricCollectionOptions<T extends Row<unknown>>(
   // Buffer messages since last up-to-date to handle race conditions
   const currentBatchMessages = new Store<Array<Message<any>>>([])
 
+  // Track whether the current batch has been committed (up-to-date received)
+  // This allows awaitMatch to resolve immediately for messages from committed batches
+  const batchCommitted = new Store<boolean>(false)
+
   /**
    * Helper function to remove multiple matches from the pendingMatches store
    */
@@ -501,7 +577,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
         matchesToResolve.push(matchId)
         debug(
           `${config.id ? `[${config.id}] ` : ``}awaitMatch resolved on up-to-date for match %s`,
-          matchId
+          matchId,
         )
       }
     })
@@ -513,6 +589,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
     syncMode: internalSyncMode,
     pendingMatches,
     currentBatchMessages,
+    batchCommitted,
     removePendingMatches,
     resolveMatchedPendingMatches,
     collectionId: config.id,
@@ -527,11 +604,11 @@ export function electricCollectionOptions<T extends Row<unknown>>(
    */
   const awaitTxId: AwaitTxIdFn = async (
     txId: Txid,
-    timeout: number = 5000
+    timeout: number = 5000,
   ): Promise<boolean> => {
     debug(
       `${config.id ? `[${config.id}] ` : ``}awaitTxId called with txid %d`,
-      txId
+      txId,
     )
     if (typeof txId !== `number`) {
       throw new ExpectedNumberInAwaitTxIdError(typeof txId, config.id)
@@ -543,7 +620,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
 
     // Then check if the txid is in any of the seen snapshots
     const hasSnapshot = seenSnapshots.state.some((snapshot) =>
-      isVisibleInSnapshot(txId, snapshot)
+      isVisibleInSnapshot(txId, snapshot),
     )
     if (hasSnapshot) return true
 
@@ -558,7 +635,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
         if (seenTxids.state.has(txId)) {
           debug(
             `${config.id ? `[${config.id}] ` : ``}awaitTxId found match for txid %o`,
-            txId
+            txId,
           )
           clearTimeout(timeoutId)
           unsubscribeSeenTxids()
@@ -569,13 +646,13 @@ export function electricCollectionOptions<T extends Row<unknown>>(
 
       const unsubscribeSeenSnapshots = seenSnapshots.subscribe(() => {
         const visibleSnapshot = seenSnapshots.state.find((snapshot) =>
-          isVisibleInSnapshot(txId, snapshot)
+          isVisibleInSnapshot(txId, snapshot),
         )
         if (visibleSnapshot) {
           debug(
             `${config.id ? `[${config.id}] ` : ``}awaitTxId found match for txid %o in snapshot %o`,
             txId,
-            visibleSnapshot
+            visibleSnapshot,
           )
           clearTimeout(timeoutId)
           unsubscribeSeenSnapshots()
@@ -594,10 +671,10 @@ export function electricCollectionOptions<T extends Row<unknown>>(
    */
   const awaitMatch: AwaitMatchFn<any> = async (
     matchFn: MatchFunction<any>,
-    timeout: number = 3000
+    timeout: number = 3000,
   ): Promise<boolean> => {
     debug(
-      `${config.id ? `[${config.id}] ` : ``}awaitMatch called with custom function`
+      `${config.id ? `[${config.id}] ` : ``}awaitMatch called with custom function`,
     )
 
     return new Promise((resolve, reject) => {
@@ -623,7 +700,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
       const checkMatch = (message: Message<any>) => {
         if (matchFn(message)) {
           debug(
-            `${config.id ? `[${config.id}] ` : ``}awaitMatch found matching message, waiting for up-to-date`
+            `${config.id ? `[${config.id}] ` : ``}awaitMatch found matching message, waiting for up-to-date`,
           )
           // Mark as matched but don't resolve yet - wait for up-to-date
           pendingMatches.setState((current) => {
@@ -642,10 +719,21 @@ export function electricCollectionOptions<T extends Row<unknown>>(
       // Check against current batch messages first to handle race conditions
       for (const message of currentBatchMessages.state) {
         if (matchFn(message)) {
+          // If batch is committed (up-to-date already received), resolve immediately
+          // just like awaitTxId does when it finds a txid in seenTxids
+          if (batchCommitted.state) {
+            debug(
+              `${config.id ? `[${config.id}] ` : ``}awaitMatch found immediate match in committed batch, resolving immediately`,
+            )
+            clearTimeout(timeoutId)
+            resolve(true)
+            return
+          }
+
+          // If batch is not yet committed, register match and wait for up-to-date
           debug(
-            `${config.id ? `[${config.id}] ` : ``}awaitMatch found immediate match in current batch, waiting for up-to-date`
+            `${config.id ? `[${config.id}] ` : ``}awaitMatch found immediate match in current batch, waiting for up-to-date`,
           )
-          // Register match as already matched
           pendingMatches.setState((current) => {
             const newMatches = new Map(current)
             newMatches.set(matchId, {
@@ -653,7 +741,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
               resolve,
               reject,
               timeoutId,
-              matched: true, // Already matched
+              matched: true, // Already matched, will resolve on up-to-date
             })
             return newMatches
           })
@@ -681,7 +769,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
    * Process matching strategy and wait for synchronization
    */
   const processMatchingStrategy = async (
-    result: MatchingStrategy
+    result: MatchingStrategy,
   ): Promise<void> => {
     // Only wait if result contains txid
     if (result && `txid` in result) {
@@ -703,7 +791,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
           any,
           string | number,
           ElectricCollectionUtils<T>
-        >
+        >,
       ) => {
         const handlerResult = await config.onInsert!(params)
         await processMatchingStrategy(handlerResult)
@@ -717,7 +805,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
           any,
           string | number,
           ElectricCollectionUtils<T>
-        >
+        >,
       ) => {
         const handlerResult = await config.onUpdate!(params)
         await processMatchingStrategy(handlerResult)
@@ -731,7 +819,7 @@ export function electricCollectionOptions<T extends Row<unknown>>(
           any,
           string | number,
           ElectricCollectionUtils<T>
-        >
+        >,
       ) => {
         const handlerResult = await config.onDelete!(params)
         await processMatchingStrategy(handlerResult)
@@ -784,11 +872,12 @@ function createElectricSync<T extends Row<unknown>>(
       >
     >
     currentBatchMessages: Store<Array<Message<T>>>
+    batchCommitted: Store<boolean>
     removePendingMatches: (matchIds: Array<string>) => void
     resolveMatchedPendingMatches: () => void
     collectionId?: string
     testHooks?: ElectricTestHooks
-  }
+  },
 ): SyncConfig<T> {
   const {
     seenTxids,
@@ -796,6 +885,7 @@ function createElectricSync<T extends Row<unknown>>(
     syncMode,
     pendingMatches,
     currentBatchMessages,
+    batchCommitted,
     removePendingMatches,
     resolveMatchedPendingMatches,
     collectionId,
@@ -806,6 +896,231 @@ function createElectricSync<T extends Row<unknown>>(
   // Store for the relation schema information
   const relationSchema = new Store<string | undefined>(undefined)
 
+  const tagCache = new Map<MoveTag, ParsedMoveTag>()
+
+  // Parses a tag string into a MoveTag.
+  // It memoizes the result parsed tag such that future calls
+  // for the same tag string return the same MoveTag array.
+  const parseTag = (tag: MoveTag): ParsedMoveTag => {
+    const cachedTag = tagCache.get(tag)
+    if (cachedTag) {
+      return cachedTag
+    }
+
+    const parsedTag = tag.split(`|`)
+    tagCache.set(tag, parsedTag)
+    return parsedTag
+  }
+
+  // Tag tracking state
+  const rowTagSets = new Map<RowId, Set<MoveTag>>()
+  const tagIndex: TagIndex = []
+  let tagLength: number | undefined = undefined
+
+  /**
+   * Initialize the tag index with the correct length
+   */
+  const initializeTagIndex = (length: number): void => {
+    if (tagIndex.length < length) {
+      // Extend the index array to the required length
+      for (let i = tagIndex.length; i < length; i++) {
+        tagIndex[i] = new Map()
+      }
+    }
+  }
+
+  /**
+   * Add tags to a row and update the tag index
+   */
+  const addTagsToRow = (
+    tags: Array<MoveTag>,
+    rowId: RowId,
+    rowTagSet: Set<MoveTag>,
+  ): void => {
+    for (const tag of tags) {
+      const parsedTag = parseTag(tag)
+
+      // Infer tag length from first tag
+      if (tagLength === undefined) {
+        tagLength = getTagLength(parsedTag)
+        initializeTagIndex(tagLength)
+      }
+
+      // Validate tag length matches
+      const currentTagLength = getTagLength(parsedTag)
+      if (currentTagLength !== tagLength) {
+        debug(
+          `${collectionId ? `[${collectionId}] ` : ``}Tag length mismatch: expected ${tagLength}, got ${currentTagLength}`,
+        )
+        continue
+      }
+
+      rowTagSet.add(tag)
+      addTagToIndex(parsedTag, rowId, tagIndex, tagLength)
+    }
+  }
+
+  /**
+   * Remove tags from a row and update the tag index
+   */
+  const removeTagsFromRow = (
+    removedTags: Array<MoveTag>,
+    rowId: RowId,
+    rowTagSet: Set<MoveTag>,
+  ): void => {
+    if (tagLength === undefined) {
+      return
+    }
+
+    for (const tag of removedTags) {
+      const parsedTag = parseTag(tag)
+      rowTagSet.delete(tag)
+      removeTagFromIndex(parsedTag, rowId, tagIndex, tagLength)
+      // We aggresively evict the tag from the cache
+      // if this tag is shared with another row
+      // and is not removed from that other row
+      // then next time we encounter the tag it will be parsed again
+      tagCache.delete(tag)
+    }
+  }
+
+  /**
+   * Process tags for a change message (add and remove tags)
+   */
+  const processTagsForChangeMessage = (
+    tags: Array<MoveTag> | undefined,
+    removedTags: Array<MoveTag> | undefined,
+    rowId: RowId,
+  ): Set<MoveTag> => {
+    // Initialize tag set for this row if it doesn't exist (needed for checking deletion)
+    if (!rowTagSets.has(rowId)) {
+      rowTagSets.set(rowId, new Set())
+    }
+    const rowTagSet = rowTagSets.get(rowId)!
+
+    // Add new tags
+    if (tags) {
+      addTagsToRow(tags, rowId, rowTagSet)
+    }
+
+    // Remove tags
+    if (removedTags) {
+      removeTagsFromRow(removedTags, rowId, rowTagSet)
+    }
+
+    return rowTagSet
+  }
+
+  /**
+   * Clear all tag tracking state (used when truncating)
+   */
+  const clearTagTrackingState = (): void => {
+    rowTagSets.clear()
+    tagIndex.length = 0
+    tagLength = undefined
+  }
+
+  /**
+   * Remove all tags for a row from both the tag set and the index
+   * Used when a row is deleted
+   */
+  const clearTagsForRow = (rowId: RowId): void => {
+    if (tagLength === undefined) {
+      return
+    }
+
+    const rowTagSet = rowTagSets.get(rowId)
+    if (!rowTagSet) {
+      return
+    }
+
+    // Remove each tag from the index
+    for (const tag of rowTagSet) {
+      const parsedTag = parseTag(tag)
+      const currentTagLength = getTagLength(parsedTag)
+      if (currentTagLength === tagLength) {
+        removeTagFromIndex(parsedTag, rowId, tagIndex, tagLength)
+      }
+      tagCache.delete(tag)
+    }
+
+    // Remove the row from the tag sets map
+    rowTagSets.delete(rowId)
+  }
+
+  /**
+   * Remove matching tags from a row based on a pattern
+   * Returns true if the row's tag set is now empty
+   */
+  const removeMatchingTagsFromRow = (
+    rowId: RowId,
+    pattern: MoveOutPattern,
+  ): boolean => {
+    const rowTagSet = rowTagSets.get(rowId)
+    if (!rowTagSet) {
+      return false
+    }
+
+    // Find tags that match this pattern and remove them
+    for (const tag of rowTagSet) {
+      const parsedTag = parseTag(tag)
+      if (tagMatchesPattern(parsedTag, pattern)) {
+        rowTagSet.delete(tag)
+        removeTagFromIndex(parsedTag, rowId, tagIndex, tagLength!)
+      }
+    }
+
+    // Check if row's tag set is now empty
+    if (rowTagSet.size === 0) {
+      rowTagSets.delete(rowId)
+      return true
+    }
+
+    return false
+  }
+
+  /**
+   * Process move-out event: remove matching tags from rows and delete rows with empty tag sets
+   */
+  const processMoveOutEvent = (
+    patterns: Array<MoveOutPattern>,
+    begin: () => void,
+    write: (message: ChangeMessageOrDeleteKeyMessage<T>) => void,
+    transactionStarted: boolean,
+  ): boolean => {
+    if (tagLength === undefined) {
+      debug(
+        `${collectionId ? `[${collectionId}] ` : ``}Received move-out message but no tag length set yet, ignoring`,
+      )
+      return transactionStarted
+    }
+
+    let txStarted = transactionStarted
+
+    // Process all patterns and collect rows to delete
+    for (const pattern of patterns) {
+      // Find all rows that match this pattern
+      const affectedRowIds = findRowsMatchingPattern(pattern, tagIndex)
+
+      for (const rowId of affectedRowIds) {
+        if (removeMatchingTagsFromRow(rowId, pattern)) {
+          // Delete rows with empty tag sets
+          if (!txStarted) {
+            begin()
+            txStarted = true
+          }
+
+          write({
+            type: `delete`,
+            key: rowId,
+          })
+        }
+      }
+    }
+
+    return txStarted
+  }
+
   /**
    * Get the sync metadata for insert operations
    * @returns Record containing relation information
@@ -858,7 +1173,7 @@ function createElectricSync<T extends Row<unknown>>(
           },
           {
             once: true,
-          }
+          },
         )
         if (shapeOptions.signal.aborted) {
           abortController.abort()
@@ -900,7 +1215,7 @@ function createElectricSync<T extends Row<unknown>>(
               `An error occurred while syncing collection: ${collection.id}, \n` +
                 `it has been marked as ready to avoid blocking apps waiting for '.preload()' to finish. \n` +
                 `You can provide an 'onError' handler on the shapeOptions to handle this error, and this message will not be logged.`,
-              errorParams
+              errorParams,
             )
           }
 
@@ -918,6 +1233,38 @@ function createElectricSync<T extends Row<unknown>>(
         syncMode === `progressive` && !hasReceivedUpToDate
       const bufferedMessages: Array<Message<T>> = [] // Buffer change messages during initial sync
 
+      /**
+       * Process a change message: handle tags and write the mutation
+       */
+      const processChangeMessage = (changeMessage: Message<T>) => {
+        if (!isChangeMessage(changeMessage)) {
+          return
+        }
+
+        // Process tags if present
+        const tags = changeMessage.headers.tags
+        const removedTags = changeMessage.headers.removed_tags
+        const hasTags = tags || removedTags
+
+        const rowId = collection.getKeyFromItem(changeMessage.value)
+        const operation = changeMessage.headers.operation
+
+        if (operation === `delete`) {
+          clearTagsForRow(rowId)
+        } else if (hasTags) {
+          processTagsForChangeMessage(tags, removedTags, rowId)
+        }
+
+        write({
+          type: changeMessage.headers.operation,
+          value: changeMessage.value,
+          // Include the primary key and relation info in the metadata
+          metadata: {
+            ...changeMessage.headers,
+          },
+        })
+      }
+
       // Create deduplicated loadSubset wrapper for non-eager modes
       // This prevents redundant snapshot requests when multiple concurrent
       // live queries request overlapping or subset predicates
@@ -932,12 +1279,18 @@ function createElectricSync<T extends Row<unknown>>(
       })
 
       unsubscribeStream = stream.subscribe((messages: Array<Message<T>>) => {
-        let hasUpToDate = false
-        let hasSnapshotEnd = false
+        // Track commit point type - up-to-date takes precedence as it also triggers progressive mode atomic swap
+        let commitPoint: `up-to-date` | `subset-end` | null = null
+
+        // Don't clear the buffer between batches - this preserves messages for awaitMatch
+        // to find even if multiple batches arrive before awaitMatch is called.
+        // The buffer is naturally limited by MAX_BATCH_MESSAGES (oldest messages are dropped).
+        // Reset batchCommitted since we're starting a new batch
+        batchCommitted.setState(() => false)
 
         for (const message of messages) {
           // Add message to current batch buffer (for race condition handling)
-          if (isChangeMessage(message)) {
+          if (isChangeMessage(message) || isMoveOutMessage(message)) {
             currentBatchMessages.setState((currentBuffer) => {
               const newBuffer = [...currentBuffer, message]
               // Limit buffer size for safety
@@ -965,7 +1318,7 @@ function createElectricSync<T extends Row<unknown>>(
                 // If matchFn throws, clean up and reject the promise
                 clearTimeout(match.timeoutId)
                 match.reject(
-                  err instanceof Error ? err : new Error(String(err))
+                  err instanceof Error ? err : new Error(String(err)),
                 )
                 matchesToRemove.push(matchId)
                 debug(`matchFn error: %o`, err)
@@ -994,26 +1347,38 @@ function createElectricSync<T extends Row<unknown>>(
                 transactionStarted = true
               }
 
-              write({
-                type: message.headers.operation,
-                value: message.value,
-                // Include the primary key and relation info in the metadata
-                metadata: {
-                  ...message.headers,
-                },
-              })
+              processChangeMessage(message)
             }
           } else if (isSnapshotEndMessage(message)) {
-            // Skip snapshot-end tracking during buffered initial sync (will be extracted during atomic swap)
+            // Track postgres snapshot metadata for resolving awaiting mutations
+            // Skip during buffered initial sync (will be extracted during atomic swap)
             if (!isBufferingInitialSync()) {
               newSnapshots.push(parseSnapshotMessage(message))
             }
-            hasSnapshotEnd = true
           } else if (isUpToDateMessage(message)) {
-            hasUpToDate = true
+            // up-to-date takes precedence - also triggers progressive mode atomic swap
+            commitPoint = `up-to-date`
+          } else if (isSubsetEndMessage(message)) {
+            // subset-end triggers commit but not progressive mode atomic swap
+            if (commitPoint !== `up-to-date`) {
+              commitPoint = `subset-end`
+            }
+          } else if (isMoveOutMessage(message)) {
+            // Handle move-out event: buffer if buffering, otherwise process immediately
+            if (isBufferingInitialSync()) {
+              bufferedMessages.push(message)
+            } else {
+              // Normal processing: process move-out immediately
+              transactionStarted = processMoveOutEvent(
+                message.headers.patterns,
+                begin,
+                write,
+                transactionStarted,
+              )
+            }
           } else if (isMustRefetchMessage(message)) {
             debug(
-              `${collectionId ? `[${collectionId}] ` : ``}Received must-refetch message, starting transaction with truncate`
+              `${collectionId ? `[${collectionId}] ` : ``}Received must-refetch message, starting transaction with truncate`,
             )
 
             // Start a transaction and truncate the collection
@@ -1024,23 +1389,25 @@ function createElectricSync<T extends Row<unknown>>(
 
             truncate()
 
+            // Clear tag tracking state
+            clearTagTrackingState()
+
             // Reset the loadSubset deduplication state since we're starting fresh
             // This ensures that previously loaded predicates don't prevent refetching after truncate
             loadSubsetDedupe?.reset()
 
             // Reset flags so we continue accumulating changes until next up-to-date
-            hasUpToDate = false
-            hasSnapshotEnd = false
+            commitPoint = null
             hasReceivedUpToDate = false // Reset for progressive mode (isBufferingInitialSync will reflect this)
             bufferedMessages.length = 0 // Clear buffered messages
           }
         }
 
-        if (hasUpToDate || hasSnapshotEnd) {
-          // PROGRESSIVE MODE: Atomic swap on first up-to-date
-          if (isBufferingInitialSync() && hasUpToDate) {
+        if (commitPoint !== null) {
+          // PROGRESSIVE MODE: Atomic swap on first up-to-date (not subset-end)
+          if (isBufferingInitialSync() && commitPoint === `up-to-date`) {
             debug(
-              `${collectionId ? `[${collectionId}] ` : ``}Progressive mode: Performing atomic swap with ${bufferedMessages.length} buffered messages`
+              `${collectionId ? `[${collectionId}] ` : ``}Progressive mode: Performing atomic swap with ${bufferedMessages.length} buffered messages`,
             )
 
             // Start atomic swap transaction
@@ -1049,26 +1416,31 @@ function createElectricSync<T extends Row<unknown>>(
             // Truncate to clear all snapshot data
             truncate()
 
+            // Clear tag tracking state for atomic swap
+            clearTagTrackingState()
+
             // Apply all buffered change messages and extract txids/snapshots
             for (const bufferedMsg of bufferedMessages) {
               if (isChangeMessage(bufferedMsg)) {
-                write({
-                  type: bufferedMsg.headers.operation,
-                  value: bufferedMsg.value,
-                  metadata: {
-                    ...bufferedMsg.headers,
-                  },
-                })
+                processChangeMessage(bufferedMsg)
 
                 // Extract txids from buffered messages (will be committed to store after transaction)
                 if (hasTxids(bufferedMsg)) {
                   bufferedMsg.headers.txids?.forEach((txid) =>
-                    newTxids.add(txid)
+                    newTxids.add(txid),
                   )
                 }
               } else if (isSnapshotEndMessage(bufferedMsg)) {
                 // Extract snapshots from buffered messages (will be committed to store after transaction)
                 newSnapshots.push(parseSnapshotMessage(bufferedMsg))
+              } else if (isMoveOutMessage(bufferedMsg)) {
+                // Process buffered move-out messages during atomic swap
+                processMoveOutEvent(
+                  bufferedMsg.headers.patterns,
+                  begin,
+                  write,
+                  transactionStarted,
+                )
               }
             }
 
@@ -1080,32 +1452,20 @@ function createElectricSync<T extends Row<unknown>>(
             bufferedMessages.length = 0
 
             debug(
-              `${collectionId ? `[${collectionId}] ` : ``}Progressive mode: Atomic swap complete, now in normal sync mode`
+              `${collectionId ? `[${collectionId}] ` : ``}Progressive mode: Atomic swap complete, now in normal sync mode`,
             )
           } else {
             // Normal mode or on-demand: commit transaction if one was started
-            // In eager mode, only commit on snapshot-end if we've already received
-            // the first up-to-date, because the snapshot-end in the log could be from
-            // a significant period before the stream is actually up to date
-            const shouldCommit =
-              hasUpToDate || syncMode === `on-demand` || hasReceivedUpToDate
-
-            if (transactionStarted && shouldCommit) {
+            // Both up-to-date and subset-end trigger a commit
+            if (transactionStarted) {
               commit()
               transactionStarted = false
             }
           }
-
-          // Clear the current batch buffer since we're now up-to-date
-          currentBatchMessages.setState(() => [])
-
-          if (hasUpToDate || (hasSnapshotEnd && syncMode === `on-demand`)) {
-            // Mark the collection as ready now that sync is up to date
-            wrappedMarkReady(isBufferingInitialSync())
-          }
+          wrappedMarkReady(isBufferingInitialSync())
 
           // Track that we've received the first up-to-date for progressive mode
-          if (hasUpToDate) {
+          if (commitPoint === `up-to-date`) {
             hasReceivedUpToDate = true
           }
 
@@ -1115,7 +1475,7 @@ function createElectricSync<T extends Row<unknown>>(
             if (newTxids.size > 0) {
               debug(
                 `${collectionId ? `[${collectionId}] ` : ``}new txids synced from pg %O`,
-                Array.from(newTxids)
+                Array.from(newTxids),
               )
             }
             newTxids.forEach((txid) => clonedSeen.add(txid))
@@ -1129,14 +1489,18 @@ function createElectricSync<T extends Row<unknown>>(
             newSnapshots.forEach((snapshot) =>
               debug(
                 `${collectionId ? `[${collectionId}] ` : ``}new snapshot synced from pg %o`,
-                snapshot
-              )
+                snapshot,
+              ),
             )
             newSnapshots.length = 0
             return seen
           })
 
-          // Resolve all matched pending matches on up-to-date
+          // Resolve all matched pending matches on up-to-date or subset-end
+          // Set batchCommitted BEFORE resolving to avoid timing window where late awaitMatch
+          // calls could register as "matched" after resolver pass already ran
+          batchCommitted.setState(() => true)
+
           resolveMatchedPendingMatches()
         }
       })
diff --git a/packages/electric-db-collection/src/errors.ts b/packages/electric-db-collection/src/errors.ts
index 4f889c276..14ee6ab50 100644
--- a/packages/electric-db-collection/src/errors.ts
+++ b/packages/electric-db-collection/src/errors.ts
@@ -1,4 +1,4 @@
-import { TanStackDBError } from "@tanstack/db"
+import { TanStackDBError } from '@tanstack/db'
 
 // Electric DB Collection Errors
 export class ElectricDBCollectionError extends TanStackDBError {
diff --git a/packages/electric-db-collection/src/index.ts b/packages/electric-db-collection/src/index.ts
index ac436bcf7..31f615e56 100644
--- a/packages/electric-db-collection/src/index.ts
+++ b/packages/electric-db-collection/src/index.ts
@@ -1,9 +1,11 @@
 export {
   electricCollectionOptions,
+  isChangeMessage,
+  isControlMessage,
   type ElectricCollectionConfig,
   type ElectricCollectionUtils,
   type Txid,
   type AwaitTxIdFn,
-} from "./electric"
+} from './electric'
 
-export * from "./errors"
+export * from './errors'
diff --git a/packages/electric-db-collection/src/sql-compiler.ts b/packages/electric-db-collection/src/sql-compiler.ts
index c941c7fef..d7d021c89 100644
--- a/packages/electric-db-collection/src/sql-compiler.ts
+++ b/packages/electric-db-collection/src/sql-compiler.ts
@@ -1,6 +1,6 @@
-import { serialize } from "./pg-serializer"
-import type { SubsetParams } from "@electric-sql/client"
-import type { IR, LoadSubsetOptions } from "@tanstack/db"
+import { serialize } from './pg-serializer'
+import type { SubsetParams } from '@electric-sql/client'
+import type { IR, LoadSubsetOptions } from '@tanstack/db'
 
 export type CompiledSqlRecord = Omit<SubsetParams, `params`> & {
   params?: Array<unknown>
@@ -45,7 +45,7 @@ export function compileSQL<T>(options: LoadSubsetOptions): SubsetParams {
       }
       return acc
     },
-    {} as Record<string, string>
+    {} as Record<string, string>,
   )
 
   return {
@@ -72,7 +72,7 @@ function quoteIdentifier(name: string): string {
  */
 function compileBasicExpression(
   exp: IR.BasicExpression<unknown>,
-  params: Array<unknown>
+  params: Array<unknown>,
 ): string {
   switch (exp.type) {
     case `val`:
@@ -82,7 +82,7 @@ function compileBasicExpression(
       // TODO: doesn't yet support JSON(B) values which could be accessed with nested props
       if (exp.path.length !== 1) {
         throw new Error(
-          `Compiler can't handle nested properties: ${exp.path.join(`.`)}`
+          `Compiler can't handle nested properties: ${exp.path.join(`.`)}`,
         )
       }
       return quoteIdentifier(exp.path[0]!)
@@ -95,14 +95,14 @@ function compileBasicExpression(
 
 function compileOrderBy(orderBy: IR.OrderBy, params: Array<unknown>): string {
   const compiledOrderByClauses = orderBy.map((clause: IR.OrderByClause) =>
-    compileOrderByClause(clause, params)
+    compileOrderByClause(clause, params),
   )
   return compiledOrderByClauses.join(`,`)
 }
 
 function compileOrderByClause(
   clause: IR.OrderByClause,
-  params: Array<unknown>
+  params: Array<unknown>,
 ): string {
   // FIXME: We should handle stringSort and locale.
   //        Correctly supporting them is tricky as it depends on Postgres' collation
@@ -124,16 +124,43 @@ function compileOrderByClause(
   return sql
 }
 
+/**
+ * Check if a BasicExpression represents a null/undefined value
+ */
+function isNullValue(exp: IR.BasicExpression<unknown>): boolean {
+  return exp.type === `val` && (exp.value === null || exp.value === undefined)
+}
+
 function compileFunction(
   exp: IR.Func<unknown>,
-  params: Array<unknown> = []
+  params: Array<unknown> = [],
 ): string {
   const { name, args } = exp
 
   const opName = getOpName(name)
 
+  // Handle comparison operators with null/undefined values
+  // These would create invalid queries with missing params (e.g., "col = $1" with empty params)
+  // In SQL, all comparisons with NULL return UNKNOWN, so these are almost always mistakes
+  if (isComparisonOp(name)) {
+    const nullArgIndex = args.findIndex((arg: IR.BasicExpression) =>
+      isNullValue(arg),
+    )
+
+    if (nullArgIndex !== -1) {
+      // All comparison operators (including eq) throw an error for null values
+      // Users should use isNull() or isUndefined() to check for null values
+      throw new Error(
+        `Cannot use null/undefined value with '${name}' operator. ` +
+          `Comparisons with null always evaluate to UNKNOWN in SQL. ` +
+          `Use isNull() or isUndefined() to check for null values, ` +
+          `or filter out null values before building the query.`,
+      )
+    }
+  }
+
   const compiledArgs = args.map((arg: IR.BasicExpression) =>
-    compileBasicExpression(arg, params)
+    compileBasicExpression(arg, params),
   )
 
   // Special case for IS NULL / IS NOT NULL - these are postfix operators
@@ -172,6 +199,120 @@ function compileFunction(
       throw new Error(`Binary operator ${name} expects 2 arguments`)
     }
     const [lhs, rhs] = compiledArgs
+
+    // Special case for comparison operators with boolean values
+    // PostgreSQL doesn't support < > <= >= on booleans
+    // Transform to equivalent equality checks or constant expressions
+    if (isBooleanComparisonOp(name)) {
+      const lhsArg = args[0]
+      const rhsArg = args[1]
+
+      // Check if RHS is a boolean literal value
+      if (
+        rhsArg &&
+        rhsArg.type === `val` &&
+        typeof rhsArg.value === `boolean`
+      ) {
+        const boolValue = rhsArg.value
+        // Remove the boolean param we just added since we'll transform the expression
+        params.pop()
+
+        // Transform based on operator and boolean value
+        // Boolean ordering: false < true
+        if (name === `lt`) {
+          if (boolValue === true) {
+            // lt(col, true) → col = false (only false is less than true)
+            params.push(false)
+            return `${lhs} = $${params.length}`
+          } else {
+            // lt(col, false) → nothing is less than false
+            return `false`
+          }
+        } else if (name === `gt`) {
+          if (boolValue === false) {
+            // gt(col, false) → col = true (only true is greater than false)
+            params.push(true)
+            return `${lhs} = $${params.length}`
+          } else {
+            // gt(col, true) → nothing is greater than true
+            return `false`
+          }
+        } else if (name === `lte`) {
+          if (boolValue === true) {
+            // lte(col, true) → everything is ≤ true
+            return `true`
+          } else {
+            // lte(col, false) → col = false
+            params.push(false)
+            return `${lhs} = $${params.length}`
+          }
+        } else if (name === `gte`) {
+          if (boolValue === false) {
+            // gte(col, false) → everything is ≥ false
+            return `true`
+          } else {
+            // gte(col, true) → col = true
+            params.push(true)
+            return `${lhs} = $${params.length}`
+          }
+        }
+      }
+
+      // Check if LHS is a boolean literal value (less common but handle it)
+      if (
+        lhsArg &&
+        lhsArg.type === `val` &&
+        typeof lhsArg.value === `boolean`
+      ) {
+        const boolValue = lhsArg.value
+        // Remove params for this expression and rebuild
+        params.pop() // remove RHS
+        params.pop() // remove LHS (boolean)
+
+        // Recompile RHS to get fresh param
+        const rhsCompiled = compileBasicExpression(rhsArg!, params)
+
+        // Transform: flip the comparison (val op col → col flipped_op val)
+        if (name === `lt`) {
+          // lt(true, col) → gt(col, true) → col > true → nothing is greater than true
+          if (boolValue === true) {
+            return `false`
+          } else {
+            // lt(false, col) → gt(col, false) → col = true
+            params.push(true)
+            return `${rhsCompiled} = $${params.length}`
+          }
+        } else if (name === `gt`) {
+          // gt(true, col) → lt(col, true) → col = false
+          if (boolValue === true) {
+            params.push(false)
+            return `${rhsCompiled} = $${params.length}`
+          } else {
+            // gt(false, col) → lt(col, false) → nothing is less than false
+            return `false`
+          }
+        } else if (name === `lte`) {
+          if (boolValue === false) {
+            // lte(false, col) → gte(col, false) → everything
+            return `true`
+          } else {
+            // lte(true, col) → gte(col, true) → col = true
+            params.push(true)
+            return `${rhsCompiled} = $${params.length}`
+          }
+        } else if (name === `gte`) {
+          if (boolValue === true) {
+            // gte(true, col) → lte(col, true) → everything
+            return `true`
+          } else {
+            // gte(false, col) → lte(col, false) → col = false
+            params.push(false)
+            return `${rhsCompiled} = $${params.length}`
+          }
+        }
+      }
+    }
+
     // Special case for = ANY operator which needs parentheses around the array parameter
     if (name === `in`) {
       return `${lhs} ${opName}(${rhs})`
@@ -198,6 +339,24 @@ function isBinaryOp(name: string): boolean {
   return binaryOps.includes(name)
 }
 
+/**
+ * Check if operator is a comparison operator that takes two values
+ * These operators cannot accept null/undefined as values
+ * (null comparisons in SQL always evaluate to UNKNOWN)
+ */
+function isComparisonOp(name: string): boolean {
+  const comparisonOps = [`eq`, `gt`, `gte`, `lt`, `lte`, `like`, `ilike`]
+  return comparisonOps.includes(name)
+}
+
+/**
+ * Checks if the operator is a comparison operator (excluding eq)
+ * These operators don't work on booleans in PostgreSQL without casting
+ */
+function isBooleanComparisonOp(name: string): boolean {
+  return [`gt`, `gte`, `lt`, `lte`].includes(name)
+}
+
 function getOpName(name: string): string {
   const opNames = {
     eq: `=`,
diff --git a/packages/electric-db-collection/src/tag-index.ts b/packages/electric-db-collection/src/tag-index.ts
new file mode 100644
index 000000000..eeecab67f
--- /dev/null
+++ b/packages/electric-db-collection/src/tag-index.ts
@@ -0,0 +1,160 @@
+// Import Row and Message types for the isEventMessage function
+import type { Message, Row } from '@electric-sql/client'
+
+export type RowId = string | number
+export type MoveTag = string
+export type ParsedMoveTag = Array<string>
+export type Position = number
+export type Value = string
+export type MoveOutPattern = {
+  pos: Position
+  value: Value
+}
+
+const TAG_WILDCARD = `_`
+
+/**
+ * Event message type for move-out events
+ */
+export interface EventMessage {
+  headers: {
+    event: `move-out`
+    patterns: Array<MoveOutPattern>
+  }
+}
+
+/**
+ * Tag index structure: array indexed by position, maps value to set of row IDs.
+ * For example:
+ * ```example
+ * const tag1 = [a, b, c]
+ * const tag2 = [a, b, d]
+ * const tag3 = [a, d, e]
+ *
+ * // Index is:
+ * [
+ *   new Map([a -> <rows with a on index 0>])
+ *   new Map([b -> <rows with b on index 1>, d -> <rows with d on index 1>])
+ *   new Map([c -> <rows with c on index 2>, d -> <rows with d on index 2>, e -> <rows with e on index 2>])
+ * ]
+ * ```
+ */
+export type TagIndex = Array<Map<Value, Set<RowId>>>
+
+/**
+ * Abstraction to get the value at a specific position in a tag
+ */
+export function getValue(tag: ParsedMoveTag, position: Position): Value {
+  if (position >= tag.length) {
+    throw new Error(`Position out of bounds`)
+  }
+  return tag[position]!
+}
+
+/**
+ * Abstraction to extract position and value from a pattern.
+ */
+function getPositionalValue(pattern: MoveOutPattern): {
+  pos: number
+  value: string
+} {
+  return pattern
+}
+
+/**
+ * Abstraction to get the length of a tag
+ */
+export function getTagLength(tag: ParsedMoveTag): number {
+  return tag.length
+}
+
+/**
+ * Check if a tag matches a pattern.
+ * A tag matches if the value at the pattern's position equals the pattern's value,
+ * or if the value at that position is "_" (wildcard).
+ */
+export function tagMatchesPattern(
+  tag: ParsedMoveTag,
+  pattern: MoveOutPattern,
+): boolean {
+  const { pos, value } = getPositionalValue(pattern)
+  const tagValue = getValue(tag, pos)
+  return tagValue === value || tagValue === TAG_WILDCARD
+}
+
+/**
+ * Add a tag to the index for efficient pattern matching
+ */
+export function addTagToIndex(
+  tag: ParsedMoveTag,
+  rowId: RowId,
+  index: TagIndex,
+  tagLength: number,
+): void {
+  for (let i = 0; i < tagLength; i++) {
+    const value = getValue(tag, i)
+
+    // Only index non-wildcard values
+    if (value !== TAG_WILDCARD) {
+      const positionIndex = index[i]!
+      if (!positionIndex.has(value)) {
+        positionIndex.set(value, new Set())
+      }
+
+      const tags = positionIndex.get(value)!
+      tags.add(rowId)
+    }
+  }
+}
+
+/**
+ * Remove a tag from the index
+ */
+export function removeTagFromIndex(
+  tag: ParsedMoveTag,
+  rowId: RowId,
+  index: TagIndex,
+  tagLength: number,
+): void {
+  for (let i = 0; i < tagLength; i++) {
+    const value = getValue(tag, i)
+
+    // Only remove non-wildcard values
+    if (value !== TAG_WILDCARD) {
+      const positionIndex = index[i]
+      if (positionIndex) {
+        const rowSet = positionIndex.get(value)
+        if (rowSet) {
+          rowSet.delete(rowId)
+
+          // Clean up empty sets
+          if (rowSet.size === 0) {
+            positionIndex.delete(value)
+          }
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Find all rows that match a given pattern
+ */
+export function findRowsMatchingPattern(
+  pattern: MoveOutPattern,
+  index: TagIndex,
+): Set<RowId> {
+  const { pos, value } = getPositionalValue(pattern)
+  const positionIndex = index[pos]
+  const rowSet = positionIndex?.get(value)
+  return rowSet ?? new Set()
+}
+
+/**
+ * Check if a message is an event message with move-out event
+ */
+export function isMoveOutMessage<T extends Row<unknown>>(
+  message: Message<T>,
+): message is Message<T> & EventMessage {
+  return message.headers.event === `move-out`
+}
diff --git a/packages/electric-db-collection/tests/electric-live-query.test.ts b/packages/electric-db-collection/tests/electric-live-query.test.ts
index ece48b667..bcd83d310 100644
--- a/packages/electric-db-collection/tests/electric-live-query.test.ts
+++ b/packages/electric-db-collection/tests/electric-live-query.test.ts
@@ -1,16 +1,16 @@
-import { beforeEach, describe, expect, it, vi } from "vitest"
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   createCollection,
   createLiveQueryCollection,
   eq,
   gt,
   lt,
-} from "@tanstack/db"
-import { electricCollectionOptions } from "../src/electric"
-import type { ElectricCollectionUtils } from "../src/electric"
-import type { Collection } from "@tanstack/db"
-import type { Message } from "@electric-sql/client"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from '@tanstack/db'
+import { electricCollectionOptions } from '../src/electric'
+import type { ElectricCollectionUtils } from '../src/electric'
+import type { Collection } from '@tanstack/db'
+import type { Message } from '@electric-sql/client'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 // Sample user type for tests
 type User = {
@@ -505,7 +505,7 @@ describe.each([
           getKey: (user: User) => user.id,
           startSync: true,
           autoIndex: `eager` as const,
-        })
+        }),
       )
 
       mockRequestSnapshot.mockResolvedValue({
@@ -551,7 +551,7 @@ describe.each([
       const callArgs = (index: number) =>
         mockRequestSnapshot.mock.calls[index]?.[0]
       expect(callArgs(0)).toMatchObject({
-        params: { "1": `true` },
+        params: { '1': `true` },
         where: `"active" = $1`,
         orderBy: `"age" NULLS FIRST`,
         limit: 2,
@@ -609,13 +609,12 @@ describe.each([
       // Limited queries are only deduplicated when their where clauses are equal.
       // Both queries have the same where clause (active = true), but the second query
       // with limit 6 needs more data than the first query with limit 2 provided.
-      // The internal query system makes additional requests as it processes the data.
-      // TODO: Once we have cursor based pagination with the PK as a tiebreaker, we can reduce this.
-      expect(mockRequestSnapshot).toHaveBeenCalledTimes(6)
+      // With cursor-based pagination, initial loads (without cursor) make 1 requestSnapshot call each.
+      expect(mockRequestSnapshot).toHaveBeenCalledTimes(2)
 
       // Check that first it requested a limit of 2 users (from first query)
       expect(callArgs(0)).toMatchObject({
-        params: { "1": `true` },
+        params: { '1': `true` },
         where: `"active" = $1`,
         orderBy: `"age" NULLS FIRST`,
         limit: 2,
@@ -623,7 +622,7 @@ describe.each([
 
       // Check that second it requested a limit of 6 users (from second query)
       expect(callArgs(1)).toMatchObject({
-        params: { "1": `true` },
+        params: { '1': `true` },
         where: `"active" = $1`,
         orderBy: `"age" NULLS FIRST`,
         limit: 6,
@@ -643,7 +642,7 @@ describe(`Electric Collection with Live Query - syncMode integration`, () => {
   let subscriber: (messages: Array<Message<User>>) => void
 
   function createElectricCollectionWithSyncMode(
-    syncMode: `eager` | `on-demand` | `progressive`
+    syncMode: `eager` | `on-demand` | `progressive`,
   ) {
     vi.clearAllMocks()
 
@@ -737,7 +736,7 @@ describe(`Electric Collection with Live Query - syncMode integration`, () => {
         orderBy: `"age" NULLS FIRST`,
         where: `"active" = $1`,
         params: { 1: `true` }, // Parameters are stringified
-      })
+      }),
     )
     expect(liveQuery.size).toBeGreaterThan(2)
   })
@@ -798,7 +797,7 @@ describe(`Electric Collection with Live Query - syncMode integration`, () => {
         limit: 3, // Requests full limit from Electric
         orderBy: `"id" NULLS FIRST`,
         params: {},
-      })
+      }),
     )
     expect(mockRequestSnapshot).not.toHaveBeenCalled()
   })
@@ -873,13 +872,12 @@ describe(`Electric Collection with Live Query - syncMode integration`, () => {
       expect.objectContaining({
         limit: 3,
         orderBy: `"age" NULLS FIRST`,
-      })
+      }),
     )
 
     // For limited queries, only requests with identical where clauses can be deduplicated.
-    // The internal query system may make additional requests as it processes the data.
-    // TODO: Once we have cursor based pagination with the PK as a tiebreaker, we can reduce this.
-    expect(mockRequestSnapshot).toHaveBeenCalledTimes(3)
+    // With cursor-based pagination, initial loads (without cursor) make 1 requestSnapshot call.
+    expect(mockRequestSnapshot).toHaveBeenCalledTimes(1)
   })
 
   it(`should pass correct WHERE clause to requestSnapshot when live query has filters`, async () => {
@@ -906,10 +904,10 @@ describe(`Electric Collection with Live Query - syncMode integration`, () => {
     expect(mockRequestSnapshot).toHaveBeenCalledWith(
       expect.objectContaining({
         where: `"active" = $1`,
-        params: { "1": `true` },
+        params: { '1': `true` },
         orderBy: `"name" DESC NULLS FIRST`,
         limit: 10,
-      })
+      }),
     )
   })
 
@@ -937,10 +935,10 @@ describe(`Electric Collection with Live Query - syncMode integration`, () => {
     expect(mockFetchSnapshot).toHaveBeenCalledWith(
       expect.objectContaining({
         where: `"age" > $1`,
-        params: { "1": `20` },
+        params: { '1': `20` },
         orderBy: `"age" NULLS FIRST`,
         limit: 5,
-      })
+      }),
     )
     expect(mockRequestSnapshot).not.toHaveBeenCalled()
   })
@@ -951,7 +949,7 @@ describe(`Electric Collection - loadSubset deduplication`, () => {
   let subscriber: (messages: Array<Message<User>>) => void
 
   function createElectricCollectionWithSyncMode(
-    syncMode: `on-demand` | `progressive`
+    syncMode: `on-demand` | `progressive`,
   ) {
     vi.clearAllMocks()
 
@@ -1044,10 +1042,10 @@ describe(`Electric Collection - loadSubset deduplication`, () => {
     expect(mockRequestSnapshot).toHaveBeenCalledWith(
       expect.objectContaining({
         where: `"active" = $1`,
-        params: { "1": `true` },
+        params: { '1': `true` },
         orderBy: `"age" NULLS FIRST`,
         limit: 10,
-      })
+      }),
     )
   })
 
@@ -1189,9 +1187,8 @@ describe(`Electric Collection - loadSubset deduplication`, () => {
     await new Promise((resolve) => setTimeout(resolve, 0))
 
     // For limited queries, only requests with identical where clauses can be deduplicated.
-    // The internal query system may make additional requests as it processes data.
-    // TODO: Once we have cursor based pagination with the PK as a tiebreaker, we can reduce this.
-    expect(mockRequestSnapshot).toHaveBeenCalledTimes(3)
+    // With cursor-based pagination, initial loads (without cursor) make 1 requestSnapshot call.
+    expect(mockRequestSnapshot).toHaveBeenCalledTimes(1)
 
     // Simulate a must-refetch (which triggers truncate and reset)
     subscriber([{ headers: { control: `must-refetch` } }])
@@ -1201,8 +1198,8 @@ describe(`Electric Collection - loadSubset deduplication`, () => {
     await new Promise((resolve) => setTimeout(resolve, 0))
 
     // The existing live query re-requests its data after truncate
-    // TODO: Once we have cursor based pagination with the PK as a tiebreaker, we can reduce this.
-    expect(mockRequestSnapshot).toHaveBeenCalledTimes(5)
+    // After must-refetch, the query requests data again (1 initial + 1 after truncate)
+    expect(mockRequestSnapshot).toHaveBeenCalledTimes(2)
 
     // Create the same live query again after reset
     // This should NOT be deduped because the reset cleared the deduplication state,
@@ -1221,8 +1218,8 @@ describe(`Electric Collection - loadSubset deduplication`, () => {
     await new Promise((resolve) => setTimeout(resolve, 0))
 
     // Should have more calls - the different query triggered a new request
-    // TODO: Once we have cursor based pagination with the PK as a tiebreaker, we can reduce this.
-    expect(mockRequestSnapshot).toHaveBeenCalledTimes(6)
+    // 1 initial + 1 after must-refetch + 1 for new query = 3
+    expect(mockRequestSnapshot).toHaveBeenCalledTimes(3)
   })
 
   it(`should deduplicate unlimited queries regardless of orderBy`, async () => {
diff --git a/packages/electric-db-collection/tests/electric.test-d.ts b/packages/electric-db-collection/tests/electric.test-d.ts
index 02efdcb4c..946e6496a 100644
--- a/packages/electric-db-collection/tests/electric.test-d.ts
+++ b/packages/electric-db-collection/tests/electric.test-d.ts
@@ -1,22 +1,22 @@
-import { describe, expectTypeOf, it } from "vitest"
-import { z } from "zod"
+import { describe, expectTypeOf, it } from 'vitest'
+import { z } from 'zod'
 import {
   and,
   createCollection,
   createLiveQueryCollection,
   eq,
   gt,
-} from "@tanstack/db"
-import { electricCollectionOptions } from "../src/electric"
+} from '@tanstack/db'
+import { electricCollectionOptions } from '../src/electric'
 import type {
   ElectricCollectionConfig,
   ElectricCollectionUtils,
-} from "../src/electric"
+} from '../src/electric'
 import type {
   DeleteMutationFnParams,
   InsertMutationFnParams,
   UpdateMutationFnParams,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 describe(`Electric collection type resolution tests`, () => {
   // Define test types
@@ -175,21 +175,21 @@ describe(`Electric collection type resolution tests`, () => {
       onInsert: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve({ txid: 1 })
       },
       onUpdate: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve({ txid: 1 })
       },
       onDelete: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].original
+          params.transaction.mutations[0].original,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve({ txid: 1 })
       },
@@ -229,12 +229,12 @@ describe(`Electric collection type resolution tests`, () => {
       onDelete: (params) => {
         // Direct index access should be correctly typed
         expectTypeOf(
-          params.transaction.mutations[0].original
+          params.transaction.mutations[0].original,
         ).toEqualTypeOf<TodoType>()
 
         // Non-null assertion on second element should be correctly typed
         expectTypeOf(
-          params.transaction.mutations[1]!.original
+          params.transaction.mutations[1]!.original,
         ).toEqualTypeOf<TodoType>()
 
         // When mapping over mutations, each mutation.original should be correctly typed
@@ -248,7 +248,7 @@ describe(`Electric collection type resolution tests`, () => {
       onInsert: (params) => {
         // Direct index access should be correctly typed
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<TodoType>()
 
         // When mapping over mutations, each mutation.modified should be correctly typed
@@ -262,10 +262,10 @@ describe(`Electric collection type resolution tests`, () => {
       onUpdate: (params) => {
         // Direct index access should be correctly typed
         expectTypeOf(
-          params.transaction.mutations[0].original
+          params.transaction.mutations[0].original,
         ).toEqualTypeOf<TodoType>()
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<TodoType>()
 
         // When mapping over mutations, each mutation should be correctly typed
diff --git a/packages/electric-db-collection/tests/electric.test.ts b/packages/electric-db-collection/tests/electric.test.ts
index 9808c36fe..3ac3ccf7a 100644
--- a/packages/electric-db-collection/tests/electric.test.ts
+++ b/packages/electric-db-collection/tests/electric.test.ts
@@ -1,11 +1,11 @@
-import { beforeEach, describe, expect, it, vi } from "vitest"
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   CollectionImpl,
   createCollection,
   createTransaction,
-} from "@tanstack/db"
-import { electricCollectionOptions, isChangeMessage } from "../src/electric"
-import type { ElectricCollectionUtils } from "../src/electric"
+} from '@tanstack/db'
+import { electricCollectionOptions, isChangeMessage } from '../src/electric'
+import type { ElectricCollectionUtils } from '../src/electric'
 import type {
   Collection,
   InsertMutationFnParams,
@@ -13,9 +13,9 @@ import type {
   PendingMutation,
   Transaction,
   TransactionWithMutations,
-} from "@tanstack/db"
-import type { Message, Row } from "@electric-sql/client"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from '@tanstack/db'
+import type { Message, Row } from '@electric-sql/client'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 // Mock the ShapeStream module
 const mockSubscribe = vi.fn()
@@ -116,7 +116,7 @@ describe(`Electric Integration`, () => {
     ])
 
     expect(collection.state).toEqual(
-      new Map([[1, { id: 1, name: `Test User` }]])
+      new Map([[1, { id: 1, name: `Test User` }]]),
     )
   })
 
@@ -154,7 +154,7 @@ describe(`Electric Integration`, () => {
       new Map([
         [1, { id: 1, name: `Test User` }],
         [2, { id: 2, name: `Another User` }],
-      ])
+      ]),
     )
   })
 
@@ -185,7 +185,7 @@ describe(`Electric Integration`, () => {
     ])
 
     expect(collection.state).toEqual(
-      new Map([[1, { id: 1, name: `Updated User` }]])
+      new Map([[1, { id: 1, name: `Updated User` }]]),
     )
   })
 
@@ -314,9 +314,9 @@ describe(`Electric Integration`, () => {
       // awaitTxId throws if you pass it a string
       await expect(
         // @ts-expect-error
-        collection.utils.awaitTxId(`123`)
+        collection.utils.awaitTxId(`123`),
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `[ExpectedNumberInAwaitTxIdError: [test] Expected number in awaitTxId, received string]`
+        `[ExpectedNumberInAwaitTxIdError: [test] Expected number in awaitTxId, received string]`,
       )
 
       // The txid should be tracked and awaitTxId should resolve immediately
@@ -357,7 +357,7 @@ describe(`Electric Integration`, () => {
 
       // The promise should reject with a timeout error
       await expect(promise).rejects.toThrow(
-        `Timeout waiting for txId: ${unknownTxid}`
+        `Timeout waiting for txId: ${unknownTxid}`,
       )
     })
 
@@ -449,7 +449,7 @@ describe(`Electric Integration`, () => {
         async ({ transaction }: { transaction: Transaction }) => {
           // Persist to fake backend and get txid
           const txid = await fakeBackend.persist(
-            transaction.mutations as Array<PendingMutation<Row>>
+            transaction.mutations as Array<PendingMutation<Row>>,
           )
 
           if (!txid) {
@@ -468,13 +468,13 @@ describe(`Electric Integration`, () => {
           await promise
 
           return Promise.resolve()
-        }
+        },
       )
 
       const tx1 = createTransaction({ mutationFn: testMutationFn })
 
       let transaction = tx1.mutate(() =>
-        collection.insert({ id: 1, name: `Test item 1` })
+        collection.insert({ id: 1, name: `Test item 1` }),
       )
 
       await transaction.isPersisted.promise
@@ -707,7 +707,7 @@ describe(`Electric Integration`, () => {
 
       // The transaction should reject due to timeout
       await expect(tx.isPersisted.promise).rejects.toThrow(
-        `Timeout waiting for txId: 999999`
+        `Timeout waiting for txId: 999999`,
       )
     })
 
@@ -715,7 +715,7 @@ describe(`Electric Integration`, () => {
       // Create a fake backend that returns multiple txids
       const fakeBackend = {
         persist: (
-          mutations: Array<PendingMutation<Row>>
+          mutations: Array<PendingMutation<Row>>,
         ): Promise<Array<number>> => {
           // Simulate multiple items being persisted and each getting a txid
           const txids = mutations.map(() => Math.floor(Math.random() * 10000))
@@ -861,7 +861,7 @@ describe(`Electric Integration`, () => {
         .mockImplementation(async ({ collection: col }) => {
           await col.utils.awaitMatch(
             () => false, // Never matches
-            1 // Short timeout for test
+            1, // Short timeout for test
           )
         })
 
@@ -881,7 +881,7 @@ describe(`Electric Integration`, () => {
 
       // Capture the rejection promise before advancing timers
       const rejectionPromise = expect(tx.isPersisted.promise).rejects.toThrow(
-        `Timeout waiting for custom match function`
+        `Timeout waiting for custom match function`,
       )
 
       // Advance timers to trigger timeout
@@ -892,6 +892,564 @@ describe(`Electric Integration`, () => {
 
       vi.useRealTimers()
     })
+
+    it(`should find matching message in awaitMatch even when called after up-to-date`, async () => {
+      // This test verifies the fix for the race condition where:
+      // 1. Server receives insert and syncs it via Electric
+      // 2. Electric messages (including up-to-date) are processed
+      // 3. THEN awaitMatch is called - it should still find the message
+
+      let resolveServerCall: () => void
+      const serverCallPromise = new Promise<void>((resolve) => {
+        resolveServerCall = resolve
+      })
+
+      const onInsert = vi
+        .fn()
+        .mockImplementation(async ({ transaction, collection: col }) => {
+          const item = transaction.mutations[0].modified
+
+          // Simulate waiting for server call to complete
+          // During this time, Electric messages will arrive and be processed
+          await serverCallPromise
+
+          // Now awaitMatch is called AFTER the messages were processed
+          // This should still find the message in the buffer
+          await col.utils.awaitMatch((message: any) => {
+            return (
+              isChangeMessage(message) &&
+              message.headers.operation === `insert` &&
+              message.value.id === item.id
+            )
+          }, 5000)
+        })
+
+      const config = {
+        id: `test-await-match-after-up-to-date`,
+        shapeOptions: {
+          url: `http://test-url`,
+          params: { table: `test_table` },
+        },
+        startSync: true,
+        getKey: (item: Row) => item.id as number,
+        onInsert,
+      }
+
+      const testCollection = createCollection(electricCollectionOptions(config))
+
+      // Start insert - will call onInsert which waits for serverCallPromise
+      const insertPromise = testCollection.insert({
+        id: 42,
+        name: `Race Condition Test`,
+      })
+
+      // Wait for onInsert to start and reach the await serverCallPromise
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Send Electric messages while onInsert is waiting for serverCallPromise
+      // This simulates the race condition where messages arrive while API call is in progress
+      subscriber([
+        {
+          key: `42`,
+          value: { id: 42, name: `Race Condition Test` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+
+      // Wait a tick to ensure messages are processed
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Now resolve the server call - awaitMatch will be called AFTER messages were processed
+      resolveServerCall!()
+
+      // Should complete successfully - awaitMatch should find the message in the buffer
+      await insertPromise.isPersisted.promise
+
+      expect(onInsert).toHaveBeenCalled()
+      expect(testCollection.has(42)).toBe(true)
+    })
+
+    it(`should wait for up-to-date when match found during batch processing`, async () => {
+      // This test verifies that if awaitMatch finds a match while the batch
+      // is still being processed (before up-to-date), it waits for up-to-date
+      // before resolving, ensuring data is committed before returning
+
+      let matchFoundTime: number | undefined
+      let resolveTime: number | undefined
+
+      const onInsert = vi
+        .fn()
+        .mockImplementation(async ({ transaction, collection: col }) => {
+          const item = transaction.mutations[0].modified
+
+          await col.utils.awaitMatch((message: any) => {
+            if (
+              isChangeMessage(message) &&
+              message.headers.operation === `insert` &&
+              message.value.id === item.id
+            ) {
+              matchFoundTime = Date.now()
+              return true
+            }
+            return false
+          }, 5000)
+          resolveTime = Date.now()
+        })
+
+      const config = {
+        id: `test-wait-for-up-to-date`,
+        shapeOptions: {
+          url: `http://test-url`,
+          params: { table: `test_table` },
+        },
+        startSync: true,
+        getKey: (item: Row) => item.id as number,
+        onInsert,
+      }
+
+      const testCollection = createCollection(electricCollectionOptions(config))
+
+      const insertPromise = testCollection.insert({
+        id: 100,
+        name: `Wait Test`,
+      })
+
+      // Send insert message first, then up-to-date after a delay
+      // This simulates awaitMatch finding the message before up-to-date
+      setTimeout(() => {
+        subscriber([
+          {
+            key: `100`,
+            value: { id: 100, name: `Wait Test` },
+            headers: { operation: `insert` },
+          },
+        ])
+      }, 50)
+
+      // Send up-to-date after another delay
+      setTimeout(() => {
+        subscriber([{ headers: { control: `up-to-date` } }])
+      }, 150)
+
+      await insertPromise.isPersisted.promise
+
+      expect(onInsert).toHaveBeenCalled()
+      // Match should have been found before resolve (both times should exist)
+      expect(matchFoundTime).toBeDefined()
+      expect(resolveTime).toBeDefined()
+      // Verify that resolve happened AFTER match was found (waited for up-to-date)
+      expect(resolveTime).toBeGreaterThanOrEqual(matchFoundTime!)
+    })
+
+    it(`should clear buffer on new batch and match new messages`, async () => {
+      // Verify that when a new batch arrives, the old buffer is cleared
+      // and awaitMatch correctly matches messages from the new batch
+
+      let resolveServerCall: () => void
+      const serverCallPromise = new Promise<void>((resolve) => {
+        resolveServerCall = resolve
+      })
+
+      const onInsert = vi
+        .fn()
+        .mockImplementation(async ({ transaction, collection: col }) => {
+          const item = transaction.mutations[0].modified
+
+          // Simulate API call
+          await serverCallPromise
+
+          await col.utils.awaitMatch((message: any) => {
+            return (
+              isChangeMessage(message) &&
+              message.headers.operation === `insert` &&
+              message.value.id === item.id
+            )
+          }, 5000)
+        })
+
+      const config = {
+        id: `test-buffer-clearing`,
+        shapeOptions: {
+          url: `http://test-url`,
+          params: { table: `test_table` },
+        },
+        startSync: true,
+        getKey: (item: Row) => item.id as number,
+        onInsert,
+      }
+
+      const testCollection = createCollection(electricCollectionOptions(config))
+
+      // Start insert for item 201
+      const insertPromise = testCollection.insert({
+        id: 201,
+        name: `Second Item`,
+      })
+
+      // Wait for onInsert to start
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // First batch - insert different item 200 (simulating other sync activity)
+      subscriber([
+        {
+          key: `200`,
+          value: { id: 200, name: `First Item` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Second batch - insert item 201 (our target)
+      subscriber([
+        {
+          key: `201`,
+          value: { id: 201, name: `Second Item` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Resolve server call - awaitMatch should find item 201 in the buffer
+      // even though item 200 from the first batch is no longer in the buffer
+      resolveServerCall!()
+
+      await insertPromise.isPersisted.promise
+
+      expect(testCollection.has(201)).toBe(true)
+    })
+
+    it(`should timeout when no match in committed batch and no new messages`, async () => {
+      // Verify that awaitMatch times out when the message isn't found
+
+      const onInsert = vi
+        .fn()
+        .mockImplementation(async ({ collection: col }) => {
+          // Look for a message that doesn't exist
+          await col.utils.awaitMatch(
+            (message: any) =>
+              isChangeMessage(message) && message.value.id === 999,
+            100, // Short timeout
+          )
+        })
+
+      const config = {
+        id: `test-no-match-timeout`,
+        shapeOptions: {
+          url: `http://test-url`,
+          params: { table: `test_table` },
+        },
+        startSync: true,
+        getKey: (item: Row) => item.id as number,
+        onInsert,
+      }
+
+      const testCollection = createCollection(electricCollectionOptions(config))
+
+      // Send a batch with different items
+      subscriber([
+        {
+          key: `300`,
+          value: { id: 300, name: `Wrong Item` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+
+      await new Promise((resolve) => setTimeout(resolve, 20))
+
+      // Insert looking for id 999 which doesn't exist
+      const tx = testCollection.insert({ id: 301, name: `Test` })
+
+      await expect(tx.isPersisted.promise).rejects.toThrow(
+        `Timeout waiting for custom match function`,
+      )
+    })
+
+    it(`should resolve multiple awaitMatch calls from same committed batch`, async () => {
+      // Verify that multiple concurrent awaitMatch calls can all find their
+      // respective messages in the same committed batch
+
+      const matches: Array<number> = []
+      const serverCalls: Array<{ resolve: () => void }> = []
+
+      const onInsert = vi
+        .fn()
+        .mockImplementation(async ({ transaction, collection: col }) => {
+          const item = transaction.mutations[0].modified
+
+          // Create a promise for this insert's "API call"
+          const serverCallPromise = new Promise<void>((resolve) => {
+            serverCalls.push({ resolve })
+          })
+          await serverCallPromise
+
+          await col.utils.awaitMatch((message: any) => {
+            if (
+              isChangeMessage(message) &&
+              message.headers.operation === `insert` &&
+              message.value.id === item.id
+            ) {
+              matches.push(item.id)
+              return true
+            }
+            return false
+          }, 5000)
+        })
+
+      const config = {
+        id: `test-multiple-matches`,
+        shapeOptions: {
+          url: `http://test-url`,
+          params: { table: `test_table` },
+        },
+        startSync: true,
+        getKey: (item: Row) => item.id as number,
+        onInsert,
+      }
+
+      const testCollection = createCollection(electricCollectionOptions(config))
+
+      // Start all three inserts concurrently
+      const insert1 = testCollection.insert({ id: 400, name: `Item A` })
+      const insert2 = testCollection.insert({ id: 401, name: `Item B` })
+      const insert3 = testCollection.insert({ id: 402, name: `Item C` })
+
+      // Wait for all onInsert handlers to start
+      await new Promise((resolve) => setTimeout(resolve, 20))
+
+      // Send batch with all three items (simulating fast sync from server)
+      subscriber([
+        {
+          key: `400`,
+          value: { id: 400, name: `Item A` },
+          headers: { operation: `insert` },
+        },
+        {
+          key: `401`,
+          value: { id: 401, name: `Item B` },
+          headers: { operation: `insert` },
+        },
+        {
+          key: `402`,
+          value: { id: 402, name: `Item C` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+
+      await new Promise((resolve) => setTimeout(resolve, 20))
+
+      // Resolve all server calls - all awaitMatch calls should find their messages
+      serverCalls.forEach((call) => call.resolve())
+
+      await Promise.all([
+        insert1.isPersisted.promise,
+        insert2.isPersisted.promise,
+        insert3.isPersisted.promise,
+      ])
+
+      expect(matches).toContain(400)
+      expect(matches).toContain(401)
+      expect(matches).toContain(402)
+      expect(testCollection.has(400)).toBe(true)
+      expect(testCollection.has(401)).toBe(true)
+      expect(testCollection.has(402)).toBe(true)
+    })
+
+    it(`should handle awaitMatch across multiple sequential batches`, async () => {
+      // Real-world scenario: continuous sync with multiple batches
+      // Each insert should find its matching message in the committed buffer
+
+      const serverCalls: Array<{ resolve: () => void; id: number }> = []
+
+      const onInsert = vi
+        .fn()
+        .mockImplementation(async ({ transaction, collection: col }) => {
+          const item = transaction.mutations[0].modified
+
+          // Create a promise for this insert's "API call"
+          const serverCallPromise = new Promise<void>((resolve) => {
+            serverCalls.push({ resolve, id: item.id })
+          })
+          await serverCallPromise
+
+          await col.utils.awaitMatch((message: any) => {
+            return (
+              isChangeMessage(message) &&
+              message.headers.operation === `insert` &&
+              message.value.id === item.id
+            )
+          }, 5000)
+        })
+
+      const config = {
+        id: `test-sequential-batches`,
+        shapeOptions: {
+          url: `http://test-url`,
+          params: { table: `test_table` },
+        },
+        startSync: true,
+        getKey: (item: Row) => item.id as number,
+        onInsert,
+      }
+
+      const testCollection = createCollection(electricCollectionOptions(config))
+
+      // Insert 1 - starts waiting on server call
+      const insert1 = testCollection.insert({ id: 500, name: `Batch 1 Item` })
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Batch 1 arrives with item 500
+      subscriber([
+        {
+          key: `500`,
+          value: { id: 500, name: `Batch 1 Item` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Resolve server call for insert 1
+      const call1 = serverCalls.find((c) => c.id === 500)
+      call1?.resolve()
+      await insert1.isPersisted.promise
+      expect(testCollection.has(500)).toBe(true)
+
+      // Insert 2 - starts waiting on server call
+      const insert2 = testCollection.insert({ id: 501, name: `Batch 2 Item` })
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Batch 2 arrives (clears batch 1 from buffer)
+      subscriber([
+        {
+          key: `501`,
+          value: { id: 501, name: `Batch 2 Item` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Resolve server call for insert 2
+      const call2 = serverCalls.find((c) => c.id === 501)
+      call2?.resolve()
+      await insert2.isPersisted.promise
+      expect(testCollection.has(501)).toBe(true)
+
+      // Insert 3 - starts waiting on server call
+      const insert3 = testCollection.insert({ id: 502, name: `Batch 3 Item` })
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Batch 3 arrives
+      subscriber([
+        {
+          key: `502`,
+          value: { id: 502, name: `Batch 3 Item` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Resolve server call for insert 3
+      const call3 = serverCalls.find((c) => c.id === 502)
+      call3?.resolve()
+      await insert3.isPersisted.promise
+      expect(testCollection.has(502)).toBe(true)
+    })
+
+    it(`should preserve buffer across heartbeat batches until awaitMatch is called`, async () => {
+      // This test verifies the fix for the race condition where:
+      // 1. Batch 1 arrives with insert message + up-to-date
+      // 2. Batch 2 arrives (heartbeat/empty) BEFORE awaitMatch is called
+      // 3. awaitMatch is called - should still find the message from Batch 1
+      // This was failing before because the buffer was cleared when Batch 2 arrived
+
+      let resolveServerCall: () => void
+      const serverCallPromise = new Promise<void>((resolve) => {
+        resolveServerCall = resolve
+      })
+
+      const onInsert = vi
+        .fn()
+        .mockImplementation(async ({ transaction, collection: col }) => {
+          const item = transaction.mutations[0].modified
+
+          // Simulate a slow API call
+          await serverCallPromise
+
+          // awaitMatch is called AFTER multiple batches have arrived
+          await col.utils.awaitMatch((message: any) => {
+            return (
+              isChangeMessage(message) &&
+              message.headers.operation === `insert` &&
+              message.value.id === item.id
+            )
+          }, 5000)
+        })
+
+      const config = {
+        id: `test-buffer-preserved-across-heartbeats`,
+        shapeOptions: {
+          url: `http://test-url`,
+          params: { table: `test_table` },
+        },
+        startSync: true,
+        getKey: (item: Row) => item.id as number,
+        onInsert,
+      }
+
+      const testCollection = createCollection(electricCollectionOptions(config))
+
+      // Start insert - will call onInsert which waits for serverCallPromise
+      const insertPromise = testCollection.insert({
+        id: 600,
+        name: `Heartbeat Race Test`,
+      })
+
+      // Wait for onInsert to start
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Batch 1: insert message + up-to-date
+      subscriber([
+        {
+          key: `600`,
+          value: { id: 600, name: `Heartbeat Race Test` },
+          headers: { operation: `insert` },
+        },
+        { headers: { control: `up-to-date` } },
+      ])
+
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Batch 2: heartbeat (just up-to-date, no insert messages)
+      // This simulates Electric sending a heartbeat while the API call is still in progress
+      // Previously, this would clear the buffer and lose the insert message from Batch 1
+      subscriber([{ headers: { control: `up-to-date` } }])
+
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Batch 3: another heartbeat (to really stress the scenario)
+      subscriber([{ headers: { control: `up-to-date` } }])
+
+      await new Promise((resolve) => setTimeout(resolve, 10))
+
+      // Now resolve the server call - awaitMatch should still find the message
+      // from Batch 1 despite Batches 2 and 3 arriving
+      resolveServerCall!()
+
+      // Should complete successfully
+      await insertPromise.isPersisted.promise
+
+      expect(onInsert).toHaveBeenCalled()
+      expect(testCollection.has(600)).toBe(true)
+    })
   })
 
   // Tests for matching strategies utilities
@@ -914,6 +1472,29 @@ describe(`Electric Integration`, () => {
       expect(isChangeMessage(controlMessage)).toBe(false)
     })
 
+    it(`should export isChangeMessage and isControlMessage from package index`, async () => {
+      // Verify that the exports are available from the package's public API
+      // This tests the fix for the missing exports in index.ts
+      const exports = await import(`../src/index`)
+
+      expect(typeof exports.isChangeMessage).toBe(`function`)
+      expect(typeof exports.isControlMessage).toBe(`function`)
+
+      // Verify they work correctly
+      const changeMessage = {
+        key: `1`,
+        value: { id: 1, name: `Test` },
+        headers: { operation: `insert` as const },
+      }
+      expect(exports.isChangeMessage(changeMessage)).toBe(true)
+
+      const controlMessage = {
+        headers: { control: `up-to-date` as const },
+      }
+      expect(exports.isControlMessage(controlMessage)).toBe(true)
+      expect(exports.isChangeMessage(controlMessage)).toBe(false)
+    })
+
     it(`should provide awaitMatch utility in collection utils`, () => {
       const config = {
         id: `test-await-match`,
@@ -937,7 +1518,8 @@ describe(`Electric Integration`, () => {
           // Custom match using awaitMatch utility
           await col.utils.awaitMatch(
             (message: any) =>
-              isChangeMessage(message) && message.headers.operation === `delete`
+              isChangeMessage(message) &&
+              message.headers.operation === `delete`,
           )
         })
 
@@ -972,7 +1554,7 @@ describe(`Electric Integration`, () => {
         .mockImplementation(async ({ collection: col }) => {
           await col.utils.awaitMatch(
             () => false, // Never matches
-            1 // Short timeout for test
+            1, // Short timeout for test
           )
         })
 
@@ -994,7 +1576,7 @@ describe(`Electric Integration`, () => {
 
       // Capture the rejection promise before advancing timers
       const rejectionPromise = expect(tx.isPersisted.promise).rejects.toThrow(
-        `Timeout waiting for custom match function`
+        `Timeout waiting for custom match function`,
       )
 
       // Advance timers to trigger timeout
@@ -1569,18 +2151,18 @@ describe(`Electric Integration`, () => {
 
       // Txids in xip_list (in-progress transactions) should NOT resolve
       await expect(testCollection.utils.awaitTxId(120, 100)).rejects.toThrow(
-        `Timeout waiting for txId: 120`
+        `Timeout waiting for txId: 120`,
       )
       await expect(testCollection.utils.awaitTxId(130, 100)).rejects.toThrow(
-        `Timeout waiting for txId: 130`
+        `Timeout waiting for txId: 130`,
       )
 
       // Txids >= xmax should NOT resolve (not yet assigned)
       await expect(testCollection.utils.awaitTxId(150, 100)).rejects.toThrow(
-        `Timeout waiting for txId: 150`
+        `Timeout waiting for txId: 150`,
       )
       await expect(testCollection.utils.awaitTxId(200, 100)).rejects.toThrow(
-        `Timeout waiting for txId: 200`
+        `Timeout waiting for txId: 200`,
       )
     })
 
@@ -1680,10 +2262,10 @@ describe(`Electric Integration`, () => {
 
       // Txids >= second snapshot's xmax should timeout (not yet assigned)
       await expect(testCollection.utils.awaitTxId(210, 100)).rejects.toThrow(
-        `Timeout waiting for txId: 210`
+        `Timeout waiting for txId: 210`,
       )
       await expect(testCollection.utils.awaitTxId(300, 100)).rejects.toThrow(
-        `Timeout waiting for txId: 300`
+        `Timeout waiting for txId: 300`,
       )
     })
 
@@ -1795,7 +2377,7 @@ describe(`Electric Integration`, () => {
         expect.objectContaining({
           limit: 10,
           params: {},
-        })
+        }),
       )
     })
 
@@ -1842,7 +2424,7 @@ describe(`Electric Integration`, () => {
         expect.objectContaining({
           limit: 20,
           params: {},
-        })
+        }),
       )
       expect(mockRequestSnapshot).not.toHaveBeenCalled()
 
@@ -2170,7 +2752,7 @@ describe(`Electric Integration`, () => {
       expect(ShapeStream).toHaveBeenCalledWith(
         expect.objectContaining({
           offset: `now`,
-        })
+        }),
       )
     })
 
@@ -2199,7 +2781,7 @@ describe(`Electric Integration`, () => {
       expect(ShapeStream).toHaveBeenCalledWith(
         expect.objectContaining({
           offset: undefined,
-        })
+        }),
       )
     })
 
@@ -2228,7 +2810,7 @@ describe(`Electric Integration`, () => {
       expect(ShapeStream).toHaveBeenCalledWith(
         expect.objectContaining({
           offset: undefined,
-        })
+        }),
       )
     })
 
@@ -2257,7 +2839,7 @@ describe(`Electric Integration`, () => {
       expect(ShapeStream).toHaveBeenCalledWith(
         expect.objectContaining({
           offset: -1,
-        })
+        }),
       )
     })
   })
@@ -2325,9 +2907,9 @@ describe(`Electric Integration`, () => {
       expect(testCollection.status).toBe(`ready`)
     })
 
-    it(`should commit on snapshot-end in eager mode AFTER first up-to-date`, () => {
+    it(`should commit on subset-end in eager mode`, () => {
       const config = {
-        id: `eager-snapshot-end-test`,
+        id: `eager-subset-end-test`,
         shapeOptions: {
           url: `http://test-url`,
           params: { table: `test_table` },
@@ -2339,7 +2921,8 @@ describe(`Electric Integration`, () => {
 
       const testCollection = createCollection(electricCollectionOptions(config))
 
-      // First send up-to-date (with initial data) to establish the connection
+      // Send data followed by subset-end (marks end of injected subset snapshot)
+      // subset-end should trigger a commit
       subscriber([
         {
           key: `1`,
@@ -2347,20 +2930,36 @@ describe(`Electric Integration`, () => {
           headers: { operation: `insert` },
         },
         {
-          headers: { control: `up-to-date` },
+          headers: { control: `subset-end` },
         },
       ])
 
       // Data should be committed and collection ready
       expect(testCollection.has(1)).toBe(true)
+      expect(testCollection.get(1)).toEqual({ id: 1, name: `Test User` })
       expect(testCollection.status).toBe(`ready`)
+    })
 
-      // Now send more data followed by snapshot-end (simulating incremental snapshot)
-      // After the first up-to-date, snapshot-end SHOULD commit
+    it(`should NOT commit on snapshot-end (only tracks metadata)`, () => {
+      const config = {
+        id: `eager-snapshot-end-no-commit-test`,
+        shapeOptions: {
+          url: `http://test-url`,
+          params: { table: `test_table` },
+        },
+        syncMode: `eager` as const,
+        getKey: (item: Row) => item.id as number,
+        startSync: true,
+      }
+
+      const testCollection = createCollection(electricCollectionOptions(config))
+
+      // Send data followed by snapshot-end
+      // snapshot-end should NOT trigger a commit - only up-to-date or subset-end do
       subscriber([
         {
-          key: `2`,
-          value: { id: 2, name: `Second User` },
+          key: `1`,
+          value: { id: 1, name: `Test User` },
           headers: { operation: `insert` },
         },
         {
@@ -2373,15 +2972,25 @@ describe(`Electric Integration`, () => {
         },
       ])
 
-      // Data should be committed since we've already received up-to-date
-      expect(testCollection.has(2)).toBe(true)
-      expect(testCollection.get(2)).toEqual({ id: 2, name: `Second User` })
+      // Data should NOT be committed yet (snapshot-end doesn't trigger commit)
+      expect(testCollection.has(1)).toBe(false)
+      expect(testCollection.status).toBe(`loading`)
+
+      // Now send up-to-date to commit
+      subscriber([
+        {
+          headers: { control: `up-to-date` },
+        },
+      ])
+
+      // Now data should be committed
+      expect(testCollection.has(1)).toBe(true)
       expect(testCollection.status).toBe(`ready`)
     })
 
-    it(`should commit and mark ready on snapshot-end in on-demand mode`, () => {
+    it(`should commit and mark ready on subset-end in on-demand mode`, () => {
       const config = {
-        id: `on-demand-snapshot-end-test`,
+        id: `on-demand-subset-end-test`,
         shapeOptions: {
           url: `http://test-url`,
           params: { table: `test_table` },
@@ -2393,7 +3002,7 @@ describe(`Electric Integration`, () => {
 
       const testCollection = createCollection(electricCollectionOptions(config))
 
-      // Send data followed by snapshot-end (but no up-to-date)
+      // Send data followed by subset-end (marks end of injected subset snapshot)
       subscriber([
         {
           key: `1`,
@@ -2401,12 +3010,7 @@ describe(`Electric Integration`, () => {
           headers: { operation: `insert` },
         },
         {
-          headers: {
-            control: `snapshot-end`,
-            xmin: `100`,
-            xmax: `110`,
-            xip_list: [],
-          },
+          headers: { control: `subset-end` },
         },
       ])
 
diff --git a/packages/electric-db-collection/tests/pg-serializer.test.ts b/packages/electric-db-collection/tests/pg-serializer.test.ts
index a91ee157a..266da1acf 100644
--- a/packages/electric-db-collection/tests/pg-serializer.test.ts
+++ b/packages/electric-db-collection/tests/pg-serializer.test.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from "vitest"
-import { serialize } from "../src/pg-serializer"
+import { describe, expect, it } from 'vitest'
+import { serialize } from '../src/pg-serializer'
 
 describe(`pg-serializer`, () => {
   describe(`serialize`, () => {
@@ -56,7 +56,7 @@ describe(`pg-serializer`, () => {
       it(`should serialize arrays of bigints`, () => {
         expect(serialize([BigInt(1), BigInt(2), BigInt(3)])).toBe(`{1,2,3}`)
         expect(serialize([BigInt(`9007199254740993`)])).toBe(
-          `{9007199254740993}`
+          `{9007199254740993}`,
         )
       })
 
@@ -94,7 +94,7 @@ describe(`pg-serializer`, () => {
           serialize([
             [1, 2],
             [3, 4],
-          ])
+          ]),
         ).toBe(`{{1,2},{3,4}}`)
       })
     })
@@ -102,10 +102,10 @@ describe(`pg-serializer`, () => {
     describe(`error handling`, () => {
       it(`should throw for unsupported types`, () => {
         expect(() => serialize({ key: `value` })).toThrow(
-          `Cannot serialize value:`
+          `Cannot serialize value:`,
         )
         expect(() => serialize(Symbol(`test`))).toThrow(
-          `Cannot serialize value:`
+          `Cannot serialize value:`,
         )
       })
 
diff --git a/packages/electric-db-collection/tests/sql-compiler.test.ts b/packages/electric-db-collection/tests/sql-compiler.test.ts
new file mode 100644
index 000000000..9989d47f9
--- /dev/null
+++ b/packages/electric-db-collection/tests/sql-compiler.test.ts
@@ -0,0 +1,312 @@
+import { describe, expect, it } from 'vitest'
+import { compileSQL } from '../src/sql-compiler'
+import type { IR } from '@tanstack/db'
+
+// Helper to create a value expression
+function val<T>(value: T): IR.BasicExpression<T> {
+  return { type: `val`, value } as IR.BasicExpression<T>
+}
+
+// Helper to create a reference expression
+function ref(...path: Array<string>): IR.BasicExpression {
+  return { type: `ref`, path } as IR.BasicExpression
+}
+
+// Helper to create a function expression
+
+function func(name: string, args: Array<any>): IR.BasicExpression<boolean> {
+  return { type: `func`, name, args } as IR.BasicExpression<boolean>
+}
+
+describe(`sql-compiler`, () => {
+  describe(`compileSQL`, () => {
+    describe(`basic where clauses`, () => {
+      it(`should compile eq with string value`, () => {
+        const result = compileSQL({
+          where: func(`eq`, [ref(`name`), val(`John`)]),
+        })
+        expect(result.where).toBe(`"name" = $1`)
+        expect(result.params).toEqual({ '1': `John` })
+      })
+
+      it(`should compile eq with number value`, () => {
+        const result = compileSQL({
+          where: func(`eq`, [ref(`age`), val(25)]),
+        })
+        expect(result.where).toBe(`"age" = $1`)
+        expect(result.params).toEqual({ '1': `25` })
+      })
+
+      it(`should compile gt operator`, () => {
+        const result = compileSQL({
+          where: func(`gt`, [ref(`age`), val(18)]),
+        })
+        expect(result.where).toBe(`"age" > $1`)
+        expect(result.params).toEqual({ '1': `18` })
+      })
+
+      it(`should compile lt operator`, () => {
+        const result = compileSQL({
+          where: func(`lt`, [ref(`price`), val(100)]),
+        })
+        expect(result.where).toBe(`"price" < $1`)
+        expect(result.params).toEqual({ '1': `100` })
+      })
+
+      it(`should compile gte operator`, () => {
+        const result = compileSQL({
+          where: func(`gte`, [ref(`quantity`), val(10)]),
+        })
+        expect(result.where).toBe(`"quantity" >= $1`)
+        expect(result.params).toEqual({ '1': `10` })
+      })
+
+      it(`should compile lte operator`, () => {
+        const result = compileSQL({
+          where: func(`lte`, [ref(`rating`), val(5)]),
+        })
+        expect(result.where).toBe(`"rating" <= $1`)
+        expect(result.params).toEqual({ '1': `5` })
+      })
+    })
+
+    describe(`compound where clauses`, () => {
+      it(`should compile AND with two conditions`, () => {
+        const result = compileSQL({
+          where: func(`and`, [
+            func(`eq`, [ref(`projectId`), val(`uuid-123`)]),
+            func(`gt`, [ref(`name`), val(`cursor-value`)]),
+          ]),
+        })
+        // Note: 2-arg AND doesn't add parentheses around the operands
+        expect(result.where).toBe(`"projectId" = $1 AND "name" > $2`)
+        expect(result.params).toEqual({ '1': `uuid-123`, '2': `cursor-value` })
+      })
+
+      it(`should compile AND with more than two conditions`, () => {
+        const result = compileSQL({
+          where: func(`and`, [
+            func(`eq`, [ref(`a`), val(`1`)]),
+            func(`eq`, [ref(`b`), val(`2`)]),
+            func(`eq`, [ref(`c`), val(`3`)]),
+          ]),
+        })
+        // >2 args adds parentheses
+        expect(result.where).toBe(`("a" = $1) AND ("b" = $2) AND ("c" = $3)`)
+        expect(result.params).toEqual({ '1': `1`, '2': `2`, '3': `3` })
+      })
+
+      it(`should compile OR with two conditions`, () => {
+        const result = compileSQL({
+          where: func(`or`, [
+            func(`eq`, [ref(`status`), val(`active`)]),
+            func(`eq`, [ref(`status`), val(`pending`)]),
+          ]),
+        })
+        expect(result.where).toBe(`"status" = $1 OR "status" = $2`)
+        expect(result.params).toEqual({ '1': `active`, '2': `pending` })
+      })
+    })
+
+    describe(`null/undefined value handling`, () => {
+      it(`should throw error for eq(col, null)`, () => {
+        // Users should use isNull() instead of eq(col, null)
+        expect(() =>
+          compileSQL({
+            where: func(`eq`, [ref(`deletedAt`), val(null)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+      })
+
+      it(`should throw error for eq(col, undefined)`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`eq`, [ref(`deletedAt`), val(undefined)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+      })
+
+      it(`should throw error for eq(null, col) (reversed order)`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`eq`, [val(null), ref(`name`)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+      })
+
+      it(`should throw error for gt with null value`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`gt`, [ref(`age`), val(null)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'gt' operator`)
+      })
+
+      it(`should throw error for lt with undefined value`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`lt`, [ref(`age`), val(undefined)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'lt' operator`)
+      })
+
+      it(`should throw error for gte with null value`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`gte`, [ref(`price`), val(null)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'gte' operator`)
+      })
+
+      it(`should throw error for lte with null value`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`lte`, [ref(`rating`), val(null)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'lte' operator`)
+      })
+
+      it(`should throw error for like with null value`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`like`, [ref(`name`), val(null)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'like' operator`)
+      })
+
+      it(`should throw error for ilike with null value`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`ilike`, [ref(`name`), val(null)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'ilike' operator`)
+      })
+
+      it(`should throw error for eq(col, null) in AND clause`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`and`, [
+              func(`eq`, [ref(`projectId`), val(`uuid-123`)]),
+              func(`eq`, [ref(`deletedAt`), val(null)]),
+            ]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+      })
+
+      it(`should throw error for eq(col, null) in mixed conditions`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`and`, [
+              func(`eq`, [ref(`status`), val(`active`)]),
+              func(`eq`, [ref(`archivedAt`), val(null)]),
+              func(`gt`, [ref(`createdAt`), val(`2024-01-01`)]),
+            ]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+      })
+
+      it(`should not include params for null values in complex queries`, () => {
+        // This test simulates the bug scenario: a query with both valid params and null
+        // Before the fix, this would generate:
+        //   where: "projectId" = $1 AND "name" > $2
+        //   params: { "1": "uuid" } // missing $2!
+        // After the fix, gt(name, null) throws an error
+        expect(() =>
+          compileSQL({
+            where: func(`and`, [
+              func(`eq`, [ref(`projectId`), val(`uuid`)]),
+              func(`gt`, [ref(`name`), val(null)]),
+            ]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'gt' operator`)
+      })
+
+      it(`should throw error for eq(null, null)`, () => {
+        // Both args are null - this is nonsensical and would cause missing params
+        expect(() =>
+          compileSQL({
+            where: func(`eq`, [val(null), val(null)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+      })
+
+      it(`should throw error for eq(null, literal)`, () => {
+        // Comparing null to a literal is nonsensical (always evaluates to UNKNOWN)
+        expect(() =>
+          compileSQL({
+            where: func(`eq`, [val(null), val(42)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+      })
+
+      it(`should throw error for eq(col, null) - use isNull(col) instead`, () => {
+        // eq(col, null) should throw an error
+        // Users should use isNull(col) which works correctly
+        expect(() =>
+          compileSQL({
+            where: func(`eq`, [ref(`email`), val(null)]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+
+        // isNull(col) should work correctly
+        const isNullResult = compileSQL({
+          where: func(`isNull`, [ref(`email`)]),
+        })
+        expect(isNullResult.where).toBe(`"email" IS NULL`)
+        expect(isNullResult.params).toEqual({})
+      })
+
+      it(`should throw error for eq(col, null) in OR clause`, () => {
+        expect(() =>
+          compileSQL({
+            where: func(`or`, [
+              func(`eq`, [ref(`deletedAt`), val(null)]),
+              func(`eq`, [ref(`status`), val(`active`)]),
+            ]),
+          }),
+        ).toThrow(`Cannot use null/undefined value with 'eq' operator`)
+      })
+    })
+
+    describe(`isNull/isUndefined operators`, () => {
+      it(`should compile isNull correctly`, () => {
+        const result = compileSQL({
+          where: func(`isNull`, [ref(`deletedAt`)]),
+        })
+        expect(result.where).toBe(`"deletedAt" IS NULL`)
+        expect(result.params).toEqual({})
+      })
+
+      it(`should compile isUndefined correctly`, () => {
+        const result = compileSQL({
+          where: func(`isUndefined`, [ref(`field`)]),
+        })
+        expect(result.where).toBe(`"field" IS NULL`)
+        expect(result.params).toEqual({})
+      })
+
+      it(`should compile NOT isNull correctly`, () => {
+        const result = compileSQL({
+          where: func(`not`, [func(`isNull`, [ref(`name`)])]),
+        })
+        expect(result.where).toBe(`"name" IS NOT NULL`)
+        expect(result.params).toEqual({})
+      })
+    })
+
+    describe(`empty where clause`, () => {
+      it(`should add true = true when no where clause`, () => {
+        const result = compileSQL({})
+        expect(result.where).toBe(`true = true`)
+        expect(result.params).toEqual({})
+      })
+    })
+
+    describe(`limit`, () => {
+      it(`should include limit in result`, () => {
+        const result = compileSQL({ limit: 10 })
+        expect(result.limit).toBe(10)
+      })
+    })
+  })
+})
diff --git a/packages/electric-db-collection/tests/tags.test.ts b/packages/electric-db-collection/tests/tags.test.ts
new file mode 100644
index 000000000..01dfa2773
--- /dev/null
+++ b/packages/electric-db-collection/tests/tags.test.ts
@@ -0,0 +1,1241 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '@tanstack/db'
+import { electricCollectionOptions } from '../src/electric'
+import type { ElectricCollectionUtils } from '../src/electric'
+import type { Collection } from '@tanstack/db'
+import type { Message, Row } from '@electric-sql/client'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+import type { MoveOutPattern } from '../src/tag-index'
+
+// Mock the ShapeStream module
+const mockSubscribe = vi.fn()
+const mockRequestSnapshot = vi.fn()
+const mockFetchSnapshot = vi.fn()
+const mockStream = {
+  subscribe: mockSubscribe,
+  requestSnapshot: mockRequestSnapshot,
+  fetchSnapshot: mockFetchSnapshot,
+}
+
+vi.mock(`@electric-sql/client`, async () => {
+  const actual = await vi.importActual(`@electric-sql/client`)
+  return {
+    ...actual,
+    ShapeStream: vi.fn(() => mockStream),
+  }
+})
+
+describe(`Electric Tag Tracking and GC`, () => {
+  let collection: Collection<
+    Row,
+    string | number,
+    ElectricCollectionUtils,
+    StandardSchemaV1<unknown, unknown>,
+    Row
+  >
+  let subscriber: (messages: Array<Message<Row>>) => void
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    // Reset mock subscriber
+    mockSubscribe.mockImplementation((callback) => {
+      subscriber = callback
+      return () => {}
+    })
+
+    // Reset mock requestSnapshot
+    mockRequestSnapshot.mockResolvedValue(undefined)
+
+    // Create collection with Electric configuration
+    const config = {
+      id: `test`,
+      shapeOptions: {
+        url: `http://test-url`,
+        params: {
+          table: `test_table`,
+        },
+      },
+      startSync: true,
+      getKey: (item: Row) => item.id as number,
+    }
+
+    // Get the options with utilities
+    const options = electricCollectionOptions(config)
+
+    // Create collection with Electric configuration
+    collection = createCollection(options) as unknown as Collection<
+      Row,
+      string | number,
+      ElectricCollectionUtils,
+      StandardSchemaV1<unknown, unknown>,
+      Row
+    >
+  })
+
+  it(`should track tags when rows are inserted with tags`, () => {
+    const tag1 = `hash1|hash2|hash3`
+    const tag2 = `hash4|hash5|hash6`
+
+    // Insert row with tags
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1, tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Test User` }]]),
+    )
+    expect(collection.status).toEqual(`ready`)
+
+    // Remove first tag - row should still exist
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Test User` }]]),
+    )
+
+    // Remove last tag - row should be garbage collected
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(new Map())
+  })
+
+  it(`should track tags when rows are updated with new tags`, () => {
+    const tag1 = `hash1|hash2|hash3`
+
+    // Insert row with tags
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Test User` }]]),
+    )
+
+    // Update with additional tags
+    const tag2 = `hash4|hash5|hash6`
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Updated User` },
+        headers: {
+          operation: `update`,
+          tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Updated User` }]]),
+    )
+
+    // Remove first tag - row should still exist
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Updated User` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Updated User` }]]),
+    )
+
+    // Remove last tag - row should be garbage collected
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Updated User` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(new Map())
+  })
+
+  it(`should track tags that are structurally equal`, () => {
+    const tag1 = `hash1|hash2|hash3`
+    const tag1Copy = `hash1|hash2|hash3`
+
+    // Insert row with tags
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Test User` }]]),
+    )
+
+    // Remove first tag - row should be gone
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Updated User` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tag1Copy],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(new Map())
+  })
+
+  it(`should not interfere between rows with distinct tags`, () => {
+    const tag1 = `hash1|hash2|hash3`
+    const tag2 = `hash4|hash5|hash6`
+    const tag3 = `hash7|hash8|hash9`
+    const tag4 = `hash10|hash11|hash12`
+
+    // Insert multiple rows with some shared tags
+    // Row 1: tag1, tag2
+    // Row 2: tag2 (shared with row 1), tag3
+    // Row 3: tag3 (shared with row 2), tag4
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1, tag2],
+        },
+      },
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `insert`,
+          tags: [tag2, tag3],
+        },
+      },
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `insert`,
+          tags: [tag3, tag4],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // All rows should exist
+    expect(collection.state.size).toBe(3)
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Remove tag1 from row 1 - row 1 should still exist (has tag2), others unaffected
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row 1 should still exist (has tag2), rows 2 and 3 unaffected
+    expect(collection.state.size).toBe(3)
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Remove tag2 from row 1 (shared tag) - row 1 should be deleted
+    // Row 2 should still exist because it has tag3 (tag2 removal only affects row 1)
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row 1 should be garbage collected, rows 2 and 3 should remain
+    // Row 2 still has tag2 and tag3, so removing tag2 from row 1 doesn't affect it
+    expect(collection.state.size).toBe(2)
+    expect(collection.state.has(1)).toBe(false)
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Remove tag3 from row 2 - row 2 should still exist (has tag2)
+    // Row 3 should still exist because it has tag4 (tag3 removal only affects row 2)
+    subscriber([
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tag3],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row 2 should still exist (has tag3), row 3 unaffected
+    expect(collection.state.size).toBe(2)
+    expect(collection.state.has(1)).toBe(false)
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Remove tag2 from row 2 (shared tag) - row 2 should be deleted
+    subscriber([
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row 2 should be garbage collected, row 3 should remain
+    // Row 3 still has tag3 and tag4
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.has(1)).toBe(false)
+    expect(collection.state.has(2)).toBe(false)
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+  })
+
+  it(`should require exact match in removed_tags for tags with wildcards (underscore)`, () => {
+    const tagWithWildcard = `hash1|_|hash3`
+    const tagWithoutWildcard = `hash1|hash2|hash3`
+
+    // Insert row with wildcard tag
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `insert`,
+          tags: [tagWithWildcard],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+
+    // Try to remove with non-matching tag (has specific value instead of wildcard)
+    // Should NOT remove because it doesn't match exactly
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tagWithoutWildcard],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should still exist because the tag didn't match exactly
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+
+    // Remove with exact match (wildcard tag)
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tagWithWildcard],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should be garbage collected because exact match was removed
+    expect(collection.state.size).toBe(0)
+    expect(collection.state.has(1)).toBe(false)
+
+    // Insert row with specific value tag (no wildcard)
+    subscriber([
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `insert`,
+          tags: [tagWithoutWildcard],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+
+    // Try to remove with wildcard tag - should NOT match
+    subscriber([
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tagWithWildcard],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should still exist because wildcard doesn't match specific value
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+
+    // Remove with exact match (specific value tag)
+    subscriber([
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tagWithoutWildcard],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should be garbage collected
+    expect(collection.state.size).toBe(0)
+    expect(collection.state.has(2)).toBe(false)
+
+    // Test with multiple tags including wildcards
+    const tagWildcard1 = `hash1|_|hash3`
+    const tagWildcard2 = `hash4|_|hash6`
+    const tagSpecific = `hash1|hash2|hash3`
+
+    subscriber([
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `insert`,
+          tags: [tagWildcard1, tagWildcard2, tagSpecific],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Remove one wildcard tag with exact match
+    subscriber([
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tagWildcard1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should still exist (has tagWildcard2 and tagSpecific)
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Try to remove wildcard tag with non-matching specific value
+    subscriber([
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tagWithoutWildcard],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should still exist because tagWithoutWildcard doesn't match tagWildcard2
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Remove specific tag with exact match
+    subscriber([
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `update`,
+          removed_tags: [tagSpecific],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should still exist (has tagWildcard2)
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Remove last wildcard tag with exact match
+    subscriber([
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tagWildcard2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should be garbage collected
+    expect(collection.state.size).toBe(0)
+    expect(collection.state.has(3)).toBe(false)
+  })
+
+  it(`should handle move-out events that remove matching tags`, () => {
+    const tag1 = `hash1|hash2|hash3`
+    const tag2 = `hash1|hash2|hash4`
+    const tag3 = `hash5|hash6|hash1`
+
+    // Insert rows with tags
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1],
+        },
+      },
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `insert`,
+          tags: [tag2],
+        },
+      },
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `insert`,
+          tags: [tag3],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state.size).toBe(3)
+
+    // Send move-out event with pattern matching hash1 at position 0
+    const pattern: MoveOutPattern = {
+      pos: 0,
+      value: `hash1`,
+    }
+
+    subscriber([
+      {
+        headers: {
+          event: `move-out`,
+          patterns: [pattern],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Rows 1 and 2 should be deleted (they have hash1 at position 0)
+    // Row 3 should remain (has hash5 at position 0)
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.has(3)).toBe(true)
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+  })
+
+  it(`should remove shared tags from all rows when move-out pattern matches`, () => {
+    // Create tags where some are shared between rows
+    const sharedTag1 = `hash1|hash2|hash3` // Shared by rows 1 and 2
+    const sharedTag2 = `hash4|hash5|hash6` // Shared by rows 2 and 3
+    const uniqueTag1 = `hash7|hash8|hash9` // Only in row 1
+    const uniqueTag2 = `hash10|hash11|hash12` // Only in row 3
+
+    // Insert rows with multiple tags, some shared
+    // Row 1: sharedTag1, uniqueTag1
+    // Row 2: sharedTag1, sharedTag2
+    // Row 3: sharedTag2, uniqueTag2
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `insert`,
+          tags: [sharedTag1, uniqueTag1],
+        },
+      },
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `insert`,
+          tags: [sharedTag1, sharedTag2],
+        },
+      },
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `insert`,
+          tags: [sharedTag2, uniqueTag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state.size).toBe(3)
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Send move-out event matching sharedTag1 (hash1 at position 0)
+    // This should remove sharedTag1 from both row 1 and row 2
+    const pattern: MoveOutPattern = {
+      pos: 0,
+      value: `hash1`,
+    }
+
+    subscriber([
+      {
+        headers: {
+          event: `move-out`,
+          patterns: [pattern],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row 1 should be deleted (only had sharedTag1 and uniqueTag1, sharedTag1 removed, but uniqueTag1 should remain... wait)
+    // Actually, if sharedTag1 matches the pattern, it should be removed from row 1
+    // Row 1 has [sharedTag1, uniqueTag1], so after removing sharedTag1, it still has uniqueTag1
+    // Row 2 has [sharedTag1, sharedTag2], so after removing sharedTag1, it still has sharedTag2
+    // So both rows should still exist
+    expect(collection.state.size).toBe(3)
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Send move-out event matching sharedTag2 (hash4 at position 0)
+    // This should remove sharedTag2 from both row 2 and row 3
+    const pattern2: MoveOutPattern = {
+      pos: 0,
+      value: `hash4`,
+    }
+
+    subscriber([
+      {
+        headers: {
+          event: `move-out`,
+          patterns: [pattern2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row 2 should be deleted (had sharedTag1 and sharedTag2, both removed)
+    // Row 3 should still exist (has uniqueTag2)
+    // Row 1 should still exist (has uniqueTag1)
+    expect(collection.state.size).toBe(2)
+    expect(collection.state.has(2)).toBe(false)
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+
+    // Send move-out event matching uniqueTag1 (hash7 at position 0)
+    // This should remove uniqueTag1 from row 1
+    const pattern3: MoveOutPattern = {
+      pos: 0,
+      value: `hash7`,
+    }
+
+    subscriber([
+      {
+        headers: {
+          event: `move-out`,
+          patterns: [pattern3],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row 1 should be deleted (no tags left)
+    // Row 3 should still exist (has uniqueTag2)
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.has(1)).toBe(false)
+    expect(collection.state.has(2)).toBe(false)
+    expect(collection.state.get(3)).toEqual({ id: 3, name: `User 3` })
+  })
+
+  it(`should not remove tags with underscores when pattern matches non-indexed position`, () => {
+    // Tag with underscore at position 1: a|_|c
+    // This tag is NOT indexed at position 1 (because of underscore)
+    const tagWithUnderscore = `a|_|c`
+
+    // Insert row with tag containing underscore
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `insert`,
+          tags: [tagWithUnderscore],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+
+    // Send move-out event with pattern matching position 1 (where underscore is)
+    // Since the tag is not indexed at position 1, it won't be found in the index
+    // and the tag should remain
+    const patternNonIndexed: MoveOutPattern = {
+      pos: 1,
+      value: `b`,
+    }
+
+    subscriber([
+      {
+        headers: {
+          event: `move-out`,
+          patterns: [patternNonIndexed],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should still exist because the tag wasn't found in the index
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `User 1` })
+
+    // Send move-out event with pattern matching position 2 (where 'c' is)
+    // Position 2 is indexed (has value 'c'), so it will be found in the index
+    // The pattern matching position 2 with value 'c' matches the tag a|_|c, so the tag is removed
+    const patternIndexed: MoveOutPattern = {
+      pos: 2,
+      value: `c`,
+    }
+
+    subscriber([
+      {
+        headers: {
+          event: `move-out`,
+          patterns: [patternIndexed],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should be garbage collected because the tag was removed
+    // (tagset becomes empty)
+    expect(collection.state.size).toBe(0)
+    expect(collection.state.has(1)).toBe(false)
+  })
+
+  it(`should handle move-out events with multiple patterns`, () => {
+    const tag1 = `hash1|hash2|hash3`
+    const tag2 = `hash4|hash5|hash6`
+    const tag3 = `hash7|hash8|hash9`
+
+    // Insert rows with tags
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `User 1` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1],
+        },
+      },
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `insert`,
+          tags: [tag2],
+        },
+      },
+      {
+        key: `3`,
+        value: { id: 3, name: `User 3` },
+        headers: {
+          operation: `insert`,
+          tags: [tag3],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state.size).toBe(3)
+
+    // Send move-out event with multiple patterns
+    const pattern1: MoveOutPattern = {
+      pos: 0,
+      value: `hash1`,
+    }
+    const pattern2: MoveOutPattern = {
+      pos: 0,
+      value: `hash4`,
+    }
+
+    subscriber([
+      {
+        headers: {
+          event: `move-out`,
+          patterns: [pattern1, pattern2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Rows 1 and 2 should be deleted, row 3 should remain
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.has(3)).toBe(true)
+  })
+
+  it(`should clear tag state on must-refetch`, () => {
+    const tag1 = `hash1|hash2|hash3`
+    const tag2 = `hash4|hash5|hash6`
+
+    // Insert row with tag
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Test User` }]]),
+    )
+
+    // Send must-refetch
+    subscriber([
+      {
+        headers: { control: `must-refetch` },
+      },
+    ])
+
+    // The collection should still have old data because truncate is in pending
+    // transaction. This is the intended behavior of the collection, you should have
+    // the old data until the next up-to-date message.
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.has(1)).toBe(true)
+    expect(collection.state.get(1)).toEqual({ id: 1, name: `Test User` })
+
+    // Send new data after must-refetch
+    subscriber([
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: { operation: `insert` },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Collection should now have the new data
+    expect(collection.state).toEqual(new Map([[2, { id: 2, name: `User 2` }]]))
+
+    // Re-insert with new tag
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `insert`,
+          tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([
+        [1, { id: 1, name: `Test User` }],
+        [2, { id: 2, name: `User 2` }],
+      ]),
+    )
+
+    // Remove tag2 and check that the row is gone
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should be garbage collected
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.has(1)).toBe(false)
+    expect(collection.state.has(2)).toBe(true)
+    expect(collection.state.get(2)).toEqual({ id: 2, name: `User 2` })
+  })
+
+  it(`should handle rows with no tags (not deleted)`, () => {
+    // Insert row without tags
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `insert`,
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should exist even without tags
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Test User` }]]),
+    )
+
+    // Update the row without tags
+    subscriber([
+      {
+        key: `1`,
+        old_value: { id: 1, name: `Test User` },
+        value: { id: 1, name: `Updated Test User` },
+        headers: {
+          operation: `update`,
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should still exist
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Updated Test User` }]]),
+    )
+
+    // Insert a row with tags
+    const tag = `hash1|hash2|hash3`
+    subscriber([
+      {
+        key: `2`,
+        value: { id: 2, name: `User 2` },
+        headers: {
+          operation: `insert`,
+          tags: [tag],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should exist
+    expect(collection.state).toEqual(
+      new Map([
+        [1, { id: 1, name: `Updated Test User` }],
+        [2, { id: 2, name: `User 2` }],
+      ]),
+    )
+
+    // Move out that matches the tag
+    const pattern: MoveOutPattern = {
+      pos: 1,
+      value: `hash2`,
+    }
+
+    subscriber([
+      {
+        headers: { event: `move-out`, patterns: [pattern] },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // User 2 should be gine but user 1 should still exist because it was never tagged
+    expect(collection.state.size).toBe(1)
+    expect(collection.state.has(1)).toBe(true)
+    expect(collection.state.has(2)).toBe(false)
+    expect(collection.state.get(1)).toEqual({
+      id: 1,
+      name: `Updated Test User`,
+    })
+  })
+
+  it(`should handle adding and removing tags in same update`, () => {
+    const tag1 = `hash1|hash2|hash3`
+    const tag2 = `hash4|hash5|hash6`
+
+    // Insert row with tag1
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Test User` }]]),
+    )
+
+    // Update: remove tag1, add tag2
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Updated User` },
+        headers: {
+          operation: `update`,
+          tags: [tag2],
+          removed_tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should still exist (has tag2)
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Updated User` }]]),
+    )
+  })
+
+  it(`should not recover old tags when row is deleted and re-inserted`, () => {
+    const tag1 = `hash1|hash2|hash3`
+    const tag2 = `hash4|hash5|hash6`
+
+    // Insert row with tag1
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `insert`,
+          tags: [tag1],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Test User` }]]),
+    )
+
+    // Delete the row (without tags)
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Test User` },
+        headers: {
+          operation: `delete`,
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should be deleted
+    expect(collection.state.size).toBe(0)
+    expect(collection.state.has(1)).toBe(false)
+
+    // Insert the row again with a new tag (tag2)
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Re-inserted User` },
+        headers: {
+          operation: `insert`,
+          tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should exist with new tag
+    expect(collection.state).toEqual(
+      new Map([[1, { id: 1, name: `Re-inserted User` }]]),
+    )
+
+    // Update the row with removed_tags including its new tag (tag2)
+    // The row should NOT have the old tag1, only tag2
+    subscriber([
+      {
+        key: `1`,
+        value: { id: 1, name: `Re-inserted User` },
+        headers: {
+          operation: `delete`,
+          removed_tags: [tag2],
+        },
+      },
+      {
+        headers: { control: `up-to-date` },
+      },
+    ])
+
+    // Row should be gone because tag2 was removed and it doesn't have old tag1
+    expect(collection.state.size).toBe(0)
+    expect(collection.state.has(1)).toBe(false)
+  })
+})
diff --git a/packages/electric-db-collection/vite.config.ts b/packages/electric-db-collection/vite.config.ts
index b174faf80..b8c7930f0 100644
--- a/packages/electric-db-collection/vite.config.ts
+++ b/packages/electric-db-collection/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -21,5 +21,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/electric-db-collection/vitest.e2e.config.ts b/packages/electric-db-collection/vitest.e2e.config.ts
index 16afb1170..903f46de5 100644
--- a/packages/electric-db-collection/vitest.e2e.config.ts
+++ b/packages/electric-db-collection/vitest.e2e.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from "vitest/config"
+import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
diff --git a/packages/offline-transactions/CHANGELOG.md b/packages/offline-transactions/CHANGELOG.md
index 0c12f3ce2..0cffd04ed 100644
--- a/packages/offline-transactions/CHANGELOG.md
+++ b/packages/offline-transactions/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @tanstack/offline-transactions
 
+## 1.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 1.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 1.0.3
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 1.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 1.0.1
+
+### Patch Changes
+
+- Use regular dependency for @tanstack/db instead of peerDependency to match the standard pattern used by other TanStack DB packages and prevent duplicate installations ([#952](https://github.com/TanStack/db/pull/952))
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 1.0.0
 
 ### Patch Changes
@@ -82,7 +119,7 @@
   import {
     startOfflineExecutor,
     IndexedDBAdapter,
-  } from "@tanstack/offline-transactions"
+  } from '@tanstack/offline-transactions'
 
   const executor = startOfflineExecutor({
     collections: { todos: todoCollection },
@@ -94,18 +131,18 @@
       },
     },
     onStorageFailure: (diagnostic) => {
-      console.warn("Running in online-only mode:", diagnostic.message)
+      console.warn('Running in online-only mode:', diagnostic.message)
     },
   })
 
   // Create offline transaction
   const tx = executor.createOfflineTransaction({
-    mutationFnName: "syncTodos",
+    mutationFnName: 'syncTodos',
     autoCommit: false,
   })
 
   tx.mutate(() => {
-    todoCollection.insert({ id: "1", text: "Buy milk", completed: false })
+    todoCollection.insert({ id: '1', text: 'Buy milk', completed: false })
   })
 
   await tx.commit() // Persists to outbox and syncs when online
diff --git a/packages/offline-transactions/README.md b/packages/offline-transactions/README.md
index 635e19627..334125a60 100644
--- a/packages/offline-transactions/README.md
+++ b/packages/offline-transactions/README.md
@@ -20,7 +20,7 @@ npm install @tanstack/offline-transactions
 ## Quick Start
 
 ```typescript
-import { startOfflineExecutor } from "@tanstack/offline-transactions"
+import { startOfflineExecutor } from '@tanstack/offline-transactions'
 
 // Setup offline executor
 const offline = startOfflineExecutor({
@@ -32,21 +32,21 @@ const offline = startOfflineExecutor({
   },
   onLeadershipChange: (isLeader) => {
     if (!isLeader) {
-      console.warn("Running in online-only mode (another tab is the leader)")
+      console.warn('Running in online-only mode (another tab is the leader)')
     }
   },
 })
 
 // Create offline transactions
 const offlineTx = offline.createOfflineTransaction({
-  mutationFnName: "syncTodos",
+  mutationFnName: 'syncTodos',
   autoCommit: false,
 })
 
 offlineTx.mutate(() => {
   todoCollection.insert({
     id: crypto.randomUUID(),
-    text: "Buy milk",
+    text: 'Buy milk',
     completed: false,
   })
 })
@@ -121,14 +121,14 @@ interface OfflineConfig {
 Use `NonRetriableError` for permanent failures:
 
 ```typescript
-import { NonRetriableError } from "@tanstack/offline-transactions"
+import { NonRetriableError } from '@tanstack/offline-transactions'
 
 const mutationFn = async ({ transaction }) => {
   try {
     await api.save(transaction.mutations)
   } catch (error) {
     if (error.status === 422) {
-      throw new NonRetriableError("Invalid data - will not retry")
+      throw new NonRetriableError('Invalid data - will not retry')
     }
     throw error // Will retry with backoff
   }
@@ -143,11 +143,11 @@ const mutationFn = async ({ transaction }) => {
 import {
   IndexedDBAdapter,
   LocalStorageAdapter,
-} from "@tanstack/offline-transactions"
+} from '@tanstack/offline-transactions'
 
 const executor = startOfflineExecutor({
   // Use custom storage
-  storage: new IndexedDBAdapter("my-app", "transactions"),
+  storage: new IndexedDBAdapter('my-app', 'transactions'),
   // ... other config
 })
 ```
@@ -171,13 +171,13 @@ const executor = startOfflineExecutor({
 
 ```typescript
 const tx = executor.createOfflineTransaction({
-  mutationFnName: "syncData",
+  mutationFnName: 'syncData',
   autoCommit: false,
 })
 
 tx.mutate(() => {
-  collection.insert({ id: "1", text: "Item 1" })
-  collection.insert({ id: "2", text: "Item 2" })
+  collection.insert({ id: '1', text: 'Item 1' })
+  collection.insert({ id: '2', text: 'Item 2' })
 })
 
 // Commit when ready
@@ -190,7 +190,7 @@ This package uses explicit offline transactions to provide offline capabilities:
 
 ```typescript
 // Before: Standard TanStack DB (online only)
-todoCollection.insert({ id: "1", text: "Buy milk" })
+todoCollection.insert({ id: '1', text: 'Buy milk' })
 
 // After: Explicit offline transactions
 const offline = startOfflineExecutor({
@@ -202,8 +202,8 @@ const offline = startOfflineExecutor({
   },
 })
 
-const tx = offline.createOfflineTransaction({ mutationFnName: "syncTodos" })
-tx.mutate(() => todoCollection.insert({ id: "1", text: "Buy milk" }))
+const tx = offline.createOfflineTransaction({ mutationFnName: 'syncTodos' })
+tx.mutate(() => todoCollection.insert({ id: '1', text: 'Buy milk' }))
 await tx.commit() // Works offline!
 ```
 
diff --git a/packages/offline-transactions/package.json b/packages/offline-transactions/package.json
index 23b3619a4..663d838d9 100644
--- a/packages/offline-transactions/package.json
+++ b/packages/offline-transactions/package.json
@@ -1,17 +1,14 @@
 {
   "name": "@tanstack/offline-transactions",
-  "version": "1.0.0",
+  "version": "1.0.5",
   "description": "Offline-first transaction capabilities for TanStack DB",
   "author": "TanStack",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/TanStack/db.git",
+    "url": "git+https://github.com/TanStack/db.git",
     "directory": "packages/offline-transactions"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "keywords": [
     "tanstack",
     "database",
@@ -20,8 +17,18 @@
     "persistence",
     "sync"
   ],
+  "scripts": {
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "test": "vitest",
+    "test:watch": "vitest --watch",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint src"
+  },
   "type": "module",
-  "sideEffects": false,
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -35,28 +42,18 @@
     },
     "./package.json": "./package.json"
   },
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "scripts": {
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "test": "vitest",
-    "test:watch": "vitest --watch",
-    "typecheck": "tsc --noEmit",
-    "lint": "eslint src"
-  },
   "dependencies": {
     "@tanstack/db": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "^20.0.0",
-    "eslint": "^8.57.1",
-    "typescript": "^5.5.4",
+    "@types/node": "^24.6.2",
+    "eslint": "^9.39.1",
+    "typescript": "^5.9.2",
     "vitest": "^3.2.4"
   }
 }
diff --git a/packages/offline-transactions/src/OfflineExecutor.ts b/packages/offline-transactions/src/OfflineExecutor.ts
index aa250a9e7..8ae8bd375 100644
--- a/packages/offline-transactions/src/OfflineExecutor.ts
+++ b/packages/offline-transactions/src/OfflineExecutor.ts
@@ -1,28 +1,28 @@
 // Storage adapters
-import { createOptimisticAction, createTransaction } from "@tanstack/db"
-import { IndexedDBAdapter } from "./storage/IndexedDBAdapter"
-import { LocalStorageAdapter } from "./storage/LocalStorageAdapter"
+import { createOptimisticAction, createTransaction } from '@tanstack/db'
+import { IndexedDBAdapter } from './storage/IndexedDBAdapter'
+import { LocalStorageAdapter } from './storage/LocalStorageAdapter'
 
 // Core components
-import { OutboxManager } from "./outbox/OutboxManager"
-import { KeyScheduler } from "./executor/KeyScheduler"
-import { TransactionExecutor } from "./executor/TransactionExecutor"
+import { OutboxManager } from './outbox/OutboxManager'
+import { KeyScheduler } from './executor/KeyScheduler'
+import { TransactionExecutor } from './executor/TransactionExecutor'
 
 // Coordination
-import { WebLocksLeader } from "./coordination/WebLocksLeader"
-import { BroadcastChannelLeader } from "./coordination/BroadcastChannelLeader"
+import { WebLocksLeader } from './coordination/WebLocksLeader'
+import { BroadcastChannelLeader } from './coordination/BroadcastChannelLeader'
 
 // Connectivity
-import { DefaultOnlineDetector } from "./connectivity/OnlineDetector"
+import { DefaultOnlineDetector } from './connectivity/OnlineDetector'
 
 // API
-import { OfflineTransaction as OfflineTransactionAPI } from "./api/OfflineTransaction"
-import { createOfflineAction } from "./api/OfflineAction"
+import { OfflineTransaction as OfflineTransactionAPI } from './api/OfflineTransaction'
+import { createOfflineAction } from './api/OfflineAction'
 
 // TanStack DB primitives
 
 // Replay
-import { withNestedSpan, withSpan } from "./telemetry/tracer"
+import { withNestedSpan, withSpan } from './telemetry/tracer'
 import type {
   CreateOfflineActionOptions,
   CreateOfflineTransactionOptions,
@@ -32,8 +32,8 @@ import type {
   OfflineTransaction,
   StorageAdapter,
   StorageDiagnostic,
-} from "./types"
-import type { Transaction } from "@tanstack/db"
+} from './types'
+import type { Transaction } from '@tanstack/db'
 
 export class OfflineExecutor {
   private config: OfflineConfig
@@ -210,7 +210,7 @@ export class OfflineExecutor {
           if (isLeader) {
             this.loadAndReplayTransactions()
           }
-        }
+        },
       )
     }
 
@@ -221,7 +221,7 @@ export class OfflineExecutor {
         this.executor.executeAll().catch((error) => {
           console.warn(
             `Failed to execute transactions on connectivity change:`,
-            error
+            error,
           )
         })
       }
@@ -258,7 +258,7 @@ export class OfflineExecutor {
           this.scheduler,
           this.outbox,
           this.config,
-          this
+          this,
         )
         this.leaderElection = this.createLeaderElection()
 
@@ -279,7 +279,7 @@ export class OfflineExecutor {
         console.warn(`Failed to initialize offline executor:`, error)
         span.setAttribute(`result`, `failed`)
         this.initReject(
-          error instanceof Error ? error : new Error(String(error))
+          error instanceof Error ? error : new Error(String(error)),
         )
       }
     })
@@ -303,7 +303,7 @@ export class OfflineExecutor {
   }
 
   createOfflineTransaction(
-    options: CreateOfflineTransactionOptions
+    options: CreateOfflineTransactionOptions,
   ): Transaction | OfflineTransactionAPI {
     const mutationFn = this.config.mutationFns[options.mutationFnName]
 
@@ -331,7 +331,7 @@ export class OfflineExecutor {
       options,
       mutationFn,
       this.persistTransaction.bind(this),
-      this
+      this,
     )
   }
 
@@ -364,14 +364,14 @@ export class OfflineExecutor {
         options,
         mutationFn,
         this.persistTransaction.bind(this),
-        this
+        this,
       )
       return action(variables)
     }
   }
 
   private async persistTransaction(
-    transaction: OfflineTransaction
+    transaction: OfflineTransaction,
   ): Promise<void> {
     // Wait for initialization to complete
     await this.initPromise
@@ -379,8 +379,8 @@ export class OfflineExecutor {
     return withNestedSpan(
       `executor.persistTransaction`,
       {
-        "transaction.id": transaction.id,
-        "transaction.mutationFnName": transaction.mutationFnName,
+        'transaction.id': transaction.id,
+        'transaction.mutationFnName': transaction.mutationFnName,
       },
       async (span) => {
         if (!this.isOfflineEnabled || !this.outbox || !this.executor) {
@@ -396,12 +396,12 @@ export class OfflineExecutor {
         } catch (error) {
           console.error(
             `Failed to persist offline transaction ${transaction.id}:`,
-            error
+            error,
           )
           span.setAttribute(`result`, `failed`)
           throw error
         }
-      }
+      },
     )
   }
 
diff --git a/packages/offline-transactions/src/api/OfflineAction.ts b/packages/offline-transactions/src/api/OfflineAction.ts
index c81efd7da..3a2558a02 100644
--- a/packages/offline-transactions/src/api/OfflineAction.ts
+++ b/packages/offline-transactions/src/api/OfflineAction.ts
@@ -1,11 +1,11 @@
-import { OnMutateMustBeSynchronousError } from "@tanstack/db"
-import { OfflineTransaction } from "./OfflineTransaction"
-import type { Transaction } from "@tanstack/db"
+import { OnMutateMustBeSynchronousError } from '@tanstack/db'
+import { OfflineTransaction } from './OfflineTransaction'
+import type { Transaction } from '@tanstack/db'
 import type {
   CreateOfflineActionOptions,
   OfflineMutationFn,
   OfflineTransaction as OfflineTransactionType,
-} from "../types"
+} from '../types'
 
 function isPromiseLike(value: unknown): value is PromiseLike<unknown> {
   return (
@@ -19,7 +19,7 @@ export function createOfflineAction<T>(
   options: CreateOfflineActionOptions<T>,
   mutationFn: OfflineMutationFn,
   persistTransaction: (tx: OfflineTransactionType) => Promise<void>,
-  executor: any
+  executor: any,
 ): (variables: T) => Transaction {
   const { mutationFnName, onMutate } = options
   console.log(`createOfflineAction 2`, options)
@@ -32,7 +32,7 @@ export function createOfflineAction<T>(
       },
       mutationFn,
       persistTransaction,
-      executor
+      executor,
     )
 
     const transaction = offlineTransaction.mutate(() => {
diff --git a/packages/offline-transactions/src/api/OfflineTransaction.ts b/packages/offline-transactions/src/api/OfflineTransaction.ts
index d8be88d33..32c96fd26 100644
--- a/packages/offline-transactions/src/api/OfflineTransaction.ts
+++ b/packages/offline-transactions/src/api/OfflineTransaction.ts
@@ -1,11 +1,11 @@
-import { createTransaction } from "@tanstack/db"
-import { NonRetriableError } from "../types"
-import type { PendingMutation, Transaction } from "@tanstack/db"
+import { createTransaction } from '@tanstack/db'
+import { NonRetriableError } from '../types'
+import type { PendingMutation, Transaction } from '@tanstack/db'
 import type {
   CreateOfflineTransactionOptions,
   OfflineMutationFn,
   OfflineTransaction as OfflineTransactionType,
-} from "../types"
+} from '../types'
 
 export class OfflineTransaction {
   private offlineId: string
@@ -21,7 +21,7 @@ export class OfflineTransaction {
     options: CreateOfflineTransactionOptions,
     mutationFn: OfflineMutationFn,
     persistTransaction: (tx: OfflineTransactionType) => Promise<void>,
-    executor: any
+    executor: any,
   ) {
     this.offlineId = crypto.randomUUID()
     this.mutationFnName = options.mutationFnName
@@ -54,7 +54,7 @@ export class OfflineTransaction {
         }
 
         const completionPromise = this.executor.waitForTransactionCompletion(
-          this.offlineId
+          this.offlineId,
         )
 
         try {
diff --git a/packages/offline-transactions/src/connectivity/OnlineDetector.ts b/packages/offline-transactions/src/connectivity/OnlineDetector.ts
index caef3a596..9ebd587bf 100644
--- a/packages/offline-transactions/src/connectivity/OnlineDetector.ts
+++ b/packages/offline-transactions/src/connectivity/OnlineDetector.ts
@@ -1,4 +1,4 @@
-import type { OnlineDetector } from "../types"
+import type { OnlineDetector } from '../types'
 
 export class DefaultOnlineDetector implements OnlineDetector {
   private listeners: Set<() => void> = new Set()
@@ -32,7 +32,7 @@ export class DefaultOnlineDetector implements OnlineDetector {
       window.removeEventListener(`online`, this.handleOnline)
       document.removeEventListener(
         `visibilitychange`,
-        this.handleVisibilityChange
+        this.handleVisibilityChange,
       )
     }
   }
diff --git a/packages/offline-transactions/src/coordination/BroadcastChannelLeader.ts b/packages/offline-transactions/src/coordination/BroadcastChannelLeader.ts
index 474346171..ce11a8abc 100644
--- a/packages/offline-transactions/src/coordination/BroadcastChannelLeader.ts
+++ b/packages/offline-transactions/src/coordination/BroadcastChannelLeader.ts
@@ -1,4 +1,4 @@
-import { BaseLeaderElection } from "./LeaderElection"
+import { BaseLeaderElection } from './LeaderElection'
 
 interface LeaderMessage {
   type: `heartbeat` | `election` | `leadership-claim`
diff --git a/packages/offline-transactions/src/coordination/LeaderElection.ts b/packages/offline-transactions/src/coordination/LeaderElection.ts
index b33bca745..6223aef01 100644
--- a/packages/offline-transactions/src/coordination/LeaderElection.ts
+++ b/packages/offline-transactions/src/coordination/LeaderElection.ts
@@ -1,4 +1,4 @@
-import type { LeaderElection } from "../types"
+import type { LeaderElection } from '../types'
 
 export abstract class BaseLeaderElection implements LeaderElection {
   protected isLeaderState = false
diff --git a/packages/offline-transactions/src/coordination/WebLocksLeader.ts b/packages/offline-transactions/src/coordination/WebLocksLeader.ts
index b7952a8be..5274f4b53 100644
--- a/packages/offline-transactions/src/coordination/WebLocksLeader.ts
+++ b/packages/offline-transactions/src/coordination/WebLocksLeader.ts
@@ -1,4 +1,4 @@
-import { BaseLeaderElection } from "./LeaderElection"
+import { BaseLeaderElection } from './LeaderElection'
 
 export class WebLocksLeader extends BaseLeaderElection {
   private lockName: string
@@ -28,7 +28,7 @@ export class WebLocksLeader extends BaseLeaderElection {
         },
         (lock) => {
           return lock !== null
-        }
+        },
       )
 
       if (!available) {
@@ -52,7 +52,7 @@ export class WebLocksLeader extends BaseLeaderElection {
               }
             })
           }
-        }
+        },
       )
 
       return true
diff --git a/packages/offline-transactions/src/executor/KeyScheduler.ts b/packages/offline-transactions/src/executor/KeyScheduler.ts
index 506f423a2..1243db565 100644
--- a/packages/offline-transactions/src/executor/KeyScheduler.ts
+++ b/packages/offline-transactions/src/executor/KeyScheduler.ts
@@ -1,5 +1,5 @@
-import { withSyncSpan } from "../telemetry/tracer"
-import type { OfflineTransaction } from "../types"
+import { withSyncSpan } from '../telemetry/tracer'
+import type { OfflineTransaction } from '../types'
 
 export class KeyScheduler {
   private pendingTransactions: Array<OfflineTransaction> = []
@@ -9,16 +9,16 @@ export class KeyScheduler {
     withSyncSpan(
       `scheduler.schedule`,
       {
-        "transaction.id": transaction.id,
+        'transaction.id': transaction.id,
         queueLength: this.pendingTransactions.length,
       },
       () => {
         this.pendingTransactions.push(transaction)
         // Sort by creation time to maintain FIFO order
         this.pendingTransactions.sort(
-          (a, b) => a.createdAt.getTime() - b.createdAt.getTime()
+          (a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
         )
-      }
+      },
     )
   }
 
@@ -35,7 +35,7 @@ export class KeyScheduler {
 
         // Find the first transaction that's ready to run
         const readyTransaction = this.pendingTransactions.find((tx) =>
-          this.isReadyToRun(tx)
+          this.isReadyToRun(tx),
         )
 
         if (readyTransaction) {
@@ -46,7 +46,7 @@ export class KeyScheduler {
         }
 
         return readyTransaction ? [readyTransaction] : []
-      }
+      },
     )
   }
 
@@ -69,7 +69,7 @@ export class KeyScheduler {
 
   private removeTransaction(transaction: OfflineTransaction): void {
     const index = this.pendingTransactions.findIndex(
-      (tx) => tx.id === transaction.id
+      (tx) => tx.id === transaction.id,
     )
     if (index >= 0) {
       this.pendingTransactions.splice(index, 1)
@@ -78,13 +78,13 @@ export class KeyScheduler {
 
   updateTransaction(transaction: OfflineTransaction): void {
     const index = this.pendingTransactions.findIndex(
-      (tx) => tx.id === transaction.id
+      (tx) => tx.id === transaction.id,
     )
     if (index >= 0) {
       this.pendingTransactions[index] = transaction
       // Re-sort to maintain FIFO order after update
       this.pendingTransactions.sort(
-        (a, b) => a.createdAt.getTime() - b.createdAt.getTime()
+        (a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
       )
     }
   }
@@ -109,7 +109,7 @@ export class KeyScheduler {
   updateTransactions(updatedTransactions: Array<OfflineTransaction>): void {
     for (const updatedTx of updatedTransactions) {
       const index = this.pendingTransactions.findIndex(
-        (tx) => tx.id === updatedTx.id
+        (tx) => tx.id === updatedTx.id,
       )
       if (index >= 0) {
         this.pendingTransactions[index] = updatedTx
@@ -117,7 +117,7 @@ export class KeyScheduler {
     }
     // Re-sort to maintain FIFO order after updates
     this.pendingTransactions.sort(
-      (a, b) => a.createdAt.getTime() - b.createdAt.getTime()
+      (a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
     )
   }
 }
diff --git a/packages/offline-transactions/src/executor/TransactionExecutor.ts b/packages/offline-transactions/src/executor/TransactionExecutor.ts
index 437c26802..441a87d88 100644
--- a/packages/offline-transactions/src/executor/TransactionExecutor.ts
+++ b/packages/offline-transactions/src/executor/TransactionExecutor.ts
@@ -1,9 +1,9 @@
-import { DefaultRetryPolicy } from "../retry/RetryPolicy"
-import { NonRetriableError } from "../types"
-import { withNestedSpan } from "../telemetry/tracer"
-import type { KeyScheduler } from "./KeyScheduler"
-import type { OutboxManager } from "../outbox/OutboxManager"
-import type { OfflineConfig, OfflineTransaction } from "../types"
+import { DefaultRetryPolicy } from '../retry/RetryPolicy'
+import { NonRetriableError } from '../types'
+import { withNestedSpan } from '../telemetry/tracer'
+import type { KeyScheduler } from './KeyScheduler'
+import type { OutboxManager } from '../outbox/OutboxManager'
+import type { OfflineConfig, OfflineTransaction } from '../types'
 
 const HANDLED_EXECUTION_ERROR = Symbol(`HandledExecutionError`)
 
@@ -21,7 +21,7 @@ export class TransactionExecutor {
     scheduler: KeyScheduler,
     outbox: OutboxManager,
     config: OfflineConfig,
-    offlineExecutor: any
+    offlineExecutor: any,
   ) {
     this.scheduler = scheduler
     this.outbox = outbox
@@ -62,7 +62,7 @@ export class TransactionExecutor {
       }
 
       const executions = batch.map((transaction) =>
-        this.executeTransaction(transaction)
+        this.executeTransaction(transaction),
       )
       await Promise.allSettled(executions)
     }
@@ -72,16 +72,16 @@ export class TransactionExecutor {
   }
 
   private async executeTransaction(
-    transaction: OfflineTransaction
+    transaction: OfflineTransaction,
   ): Promise<void> {
     try {
       await withNestedSpan(
         `transaction.execute`,
         {
-          "transaction.id": transaction.id,
-          "transaction.mutationFnName": transaction.mutationFnName,
-          "transaction.retryCount": transaction.retryCount,
-          "transaction.keyCount": transaction.keys.length,
+          'transaction.id': transaction.id,
+          'transaction.mutationFnName': transaction.mutationFnName,
+          'transaction.retryCount': transaction.retryCount,
+          'transaction.keyCount': transaction.keys.length,
         },
         async (span) => {
           this.scheduler.markStarted(transaction)
@@ -108,7 +108,7 @@ export class TransactionExecutor {
             ;(err as any)[HANDLED_EXECUTION_ERROR] = true
             throw err
           }
-        }
+        },
       )
     } catch (error) {
       if (
@@ -151,19 +151,19 @@ export class TransactionExecutor {
 
   private async handleError(
     transaction: OfflineTransaction,
-    error: Error
+    error: Error,
   ): Promise<void> {
     return withNestedSpan(
       `transaction.handleError`,
       {
-        "transaction.id": transaction.id,
-        "error.name": error.name,
-        "error.message": error.message,
+        'transaction.id': transaction.id,
+        'error.name': error.name,
+        'error.message': error.message,
       },
       async (span) => {
         const shouldRetry = this.retryPolicy.shouldRetry(
           error,
-          transaction.retryCount
+          transaction.retryCount,
         )
 
         span.setAttribute(`shouldRetry`, shouldRetry)
@@ -173,7 +173,7 @@ export class TransactionExecutor {
           await this.outbox.remove(transaction.id)
           console.warn(
             `Transaction ${transaction.id} failed permanently:`,
-            error
+            error,
           )
 
           span.setAttribute(`result`, `permanent_failure`)
@@ -211,7 +211,7 @@ export class TransactionExecutor {
 
         // Schedule retry timer
         this.scheduleNextRetry()
-      }
+      },
     )
   }
 
@@ -234,7 +234,7 @@ export class TransactionExecutor {
     this.scheduleNextRetry()
 
     const removedTransactions = transactions.filter(
-      (tx) => !filteredTransactions.some((filtered) => filtered.id === tx.id)
+      (tx) => !filteredTransactions.some((filtered) => filtered.id === tx.id),
     )
 
     if (removedTransactions.length > 0) {
diff --git a/packages/offline-transactions/src/index.ts b/packages/offline-transactions/src/index.ts
index d9fa27479..67dc9657a 100644
--- a/packages/offline-transactions/src/index.ts
+++ b/packages/offline-transactions/src/index.ts
@@ -1,5 +1,5 @@
 // Main API
-export { OfflineExecutor, startOfflineExecutor } from "./OfflineExecutor"
+export { OfflineExecutor, startOfflineExecutor } from './OfflineExecutor'
 
 // Types
 export type {
@@ -16,35 +16,35 @@ export type {
   CreateOfflineActionOptions,
   SerializedError,
   SerializedMutation,
-} from "./types"
+} from './types'
 
-export { NonRetriableError } from "./types"
+export { NonRetriableError } from './types'
 
 // Storage adapters
-export { IndexedDBAdapter } from "./storage/IndexedDBAdapter"
-export { LocalStorageAdapter } from "./storage/LocalStorageAdapter"
+export { IndexedDBAdapter } from './storage/IndexedDBAdapter'
+export { LocalStorageAdapter } from './storage/LocalStorageAdapter'
 
 // Retry policies
-export { DefaultRetryPolicy } from "./retry/RetryPolicy"
-export { BackoffCalculator } from "./retry/BackoffCalculator"
+export { DefaultRetryPolicy } from './retry/RetryPolicy'
+export { BackoffCalculator } from './retry/BackoffCalculator'
 
 // Coordination
-export { WebLocksLeader } from "./coordination/WebLocksLeader"
-export { BroadcastChannelLeader } from "./coordination/BroadcastChannelLeader"
+export { WebLocksLeader } from './coordination/WebLocksLeader'
+export { BroadcastChannelLeader } from './coordination/BroadcastChannelLeader'
 
 // Connectivity
-export { DefaultOnlineDetector } from "./connectivity/OnlineDetector"
+export { DefaultOnlineDetector } from './connectivity/OnlineDetector'
 
 // API components
-export { OfflineTransaction as OfflineTransactionAPI } from "./api/OfflineTransaction"
-export { createOfflineAction } from "./api/OfflineAction"
+export { OfflineTransaction as OfflineTransactionAPI } from './api/OfflineTransaction'
+export { createOfflineAction } from './api/OfflineAction'
 
 // Outbox management
-export { OutboxManager } from "./outbox/OutboxManager"
-export { TransactionSerializer } from "./outbox/TransactionSerializer"
+export { OutboxManager } from './outbox/OutboxManager'
+export { TransactionSerializer } from './outbox/TransactionSerializer'
 
 // Execution engine
-export { KeyScheduler } from "./executor/KeyScheduler"
-export { TransactionExecutor } from "./executor/TransactionExecutor"
+export { KeyScheduler } from './executor/KeyScheduler'
+export { TransactionExecutor } from './executor/TransactionExecutor'
 
 // Replay
diff --git a/packages/offline-transactions/src/outbox/OutboxManager.ts b/packages/offline-transactions/src/outbox/OutboxManager.ts
index 8ed4cad79..bb2d8dda4 100644
--- a/packages/offline-transactions/src/outbox/OutboxManager.ts
+++ b/packages/offline-transactions/src/outbox/OutboxManager.ts
@@ -1,7 +1,7 @@
-import { withSpan } from "../telemetry/tracer"
-import { TransactionSerializer } from "./TransactionSerializer"
-import type { OfflineTransaction, StorageAdapter } from "../types"
-import type { Collection } from "@tanstack/db"
+import { withSpan } from '../telemetry/tracer'
+import { TransactionSerializer } from './TransactionSerializer'
+import type { OfflineTransaction, StorageAdapter } from '../types'
+import type { Collection } from '@tanstack/db'
 
 export class OutboxManager {
   private storage: StorageAdapter
@@ -11,7 +11,7 @@ export class OutboxManager {
   constructor(
     storage: StorageAdapter,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    collections: Record<string, Collection<any, any, any, any, any>>
+    collections: Record<string, Collection<any, any, any, any, any>>,
   ) {
     this.storage = storage
     this.serializer = new TransactionSerializer(collections)
@@ -25,20 +25,20 @@ export class OutboxManager {
     return withSpan(
       `outbox.add`,
       {
-        "transaction.id": transaction.id,
-        "transaction.mutationFnName": transaction.mutationFnName,
-        "transaction.keyCount": transaction.keys.length,
+        'transaction.id': transaction.id,
+        'transaction.mutationFnName': transaction.mutationFnName,
+        'transaction.keyCount': transaction.keys.length,
       },
       async () => {
         const key = this.getStorageKey(transaction.id)
         const serialized = this.serializer.serialize(transaction)
         await this.storage.set(key, serialized)
-      }
+      },
     )
   }
 
   async get(id: string): Promise<OfflineTransaction | null> {
-    return withSpan(`outbox.get`, { "transaction.id": id }, async (span) => {
+    return withSpan(`outbox.get`, { 'transaction.id': id }, async (span) => {
       const key = this.getStorageKey(id)
       const data = await this.storage.get(key)
 
@@ -63,7 +63,7 @@ export class OutboxManager {
     return withSpan(`outbox.getAll`, {}, async (span) => {
       const keys = await this.storage.keys()
       const transactionKeys = keys.filter((key) =>
-        key.startsWith(this.keyPrefix)
+        key.startsWith(this.keyPrefix),
       )
 
       span.setAttribute(`transactionCount`, transactionKeys.length)
@@ -79,14 +79,14 @@ export class OutboxManager {
           } catch (error) {
             console.warn(
               `Failed to deserialize transaction from key ${key}:`,
-              error
+              error,
             )
           }
         }
       }
 
       return transactions.sort(
-        (a, b) => a.createdAt.getTime() - b.createdAt.getTime()
+        (a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
       )
     })
   }
@@ -96,15 +96,15 @@ export class OutboxManager {
     const keySet = new Set(keys)
 
     return allTransactions.filter((transaction) =>
-      transaction.keys.some((key) => keySet.has(key))
+      transaction.keys.some((key) => keySet.has(key)),
     )
   }
 
   async update(
     id: string,
-    updates: Partial<OfflineTransaction>
+    updates: Partial<OfflineTransaction>,
   ): Promise<void> {
-    return withSpan(`outbox.update`, { "transaction.id": id }, async () => {
+    return withSpan(`outbox.update`, { 'transaction.id': id }, async () => {
       const existing = await this.get(id)
       if (!existing) {
         throw new Error(`Transaction ${id} not found`)
@@ -116,7 +116,7 @@ export class OutboxManager {
   }
 
   async remove(id: string): Promise<void> {
-    return withSpan(`outbox.remove`, { "transaction.id": id }, async () => {
+    return withSpan(`outbox.remove`, { 'transaction.id': id }, async () => {
       const key = this.getStorageKey(id)
       await this.storage.delete(key)
     })
diff --git a/packages/offline-transactions/src/outbox/TransactionSerializer.ts b/packages/offline-transactions/src/outbox/TransactionSerializer.ts
index 367591180..ff196f7f8 100644
--- a/packages/offline-transactions/src/outbox/TransactionSerializer.ts
+++ b/packages/offline-transactions/src/outbox/TransactionSerializer.ts
@@ -3,8 +3,8 @@ import type {
   SerializedError,
   SerializedMutation,
   SerializedOfflineTransaction,
-} from "../types"
-import type { Collection, PendingMutation } from "@tanstack/db"
+} from '../types'
+import type { Collection, PendingMutation } from '@tanstack/db'
 
 export class TransactionSerializer {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -13,7 +13,7 @@ export class TransactionSerializer {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor(
-    collections: Record<string, Collection<any, any, any, any, any>>
+    collections: Record<string, Collection<any, any, any, any, any>>,
   ) {
     this.collections = collections
     // Create reverse lookup from collection.id to registry key
@@ -28,7 +28,7 @@ export class TransactionSerializer {
       ...transaction,
       createdAt: transaction.createdAt,
       mutations: transaction.mutations.map((mutation) =>
-        this.serializeMutation(mutation)
+        this.serializeMutation(mutation),
       ),
     }
     // Convert the whole object to JSON, handling dates
@@ -52,13 +52,13 @@ export class TransactionSerializer {
           return new Date(value)
         }
         return value
-      }
+      },
     )
 
     return {
       ...parsed,
       mutations: parsed.mutations.map((mutationData) =>
-        this.deserializeMutation(mutationData)
+        this.deserializeMutation(mutationData),
       ),
     }
   }
@@ -67,7 +67,7 @@ export class TransactionSerializer {
     const registryKey = this.collectionIdToKey.get(mutation.collection.id)
     if (!registryKey) {
       throw new Error(
-        `Collection with id ${mutation.collection.id} not found in registry`
+        `Collection with id ${mutation.collection.id} not found in registry`,
       )
     }
 
diff --git a/packages/offline-transactions/src/retry/NonRetriableError.ts b/packages/offline-transactions/src/retry/NonRetriableError.ts
index 04253277c..6a2a38830 100644
--- a/packages/offline-transactions/src/retry/NonRetriableError.ts
+++ b/packages/offline-transactions/src/retry/NonRetriableError.ts
@@ -1 +1 @@
-export { NonRetriableError } from "../types"
+export { NonRetriableError } from '../types'
diff --git a/packages/offline-transactions/src/retry/RetryPolicy.ts b/packages/offline-transactions/src/retry/RetryPolicy.ts
index 1730db8c4..9fb4f6bf5 100644
--- a/packages/offline-transactions/src/retry/RetryPolicy.ts
+++ b/packages/offline-transactions/src/retry/RetryPolicy.ts
@@ -1,6 +1,6 @@
-import { NonRetriableError } from "../types"
-import { BackoffCalculator } from "./BackoffCalculator"
-import type { RetryPolicy } from "../types"
+import { NonRetriableError } from '../types'
+import { BackoffCalculator } from './BackoffCalculator'
+import type { RetryPolicy } from '../types'
 
 export class DefaultRetryPolicy implements RetryPolicy {
   private backoffCalculator: BackoffCalculator
diff --git a/packages/offline-transactions/src/storage/IndexedDBAdapter.ts b/packages/offline-transactions/src/storage/IndexedDBAdapter.ts
index 094931ad0..c4ee78f31 100644
--- a/packages/offline-transactions/src/storage/IndexedDBAdapter.ts
+++ b/packages/offline-transactions/src/storage/IndexedDBAdapter.ts
@@ -1,4 +1,4 @@
-import { BaseStorageAdapter } from "./StorageAdapter"
+import { BaseStorageAdapter } from './StorageAdapter'
 
 export class IndexedDBAdapter extends BaseStorageAdapter {
   private dbName: string
@@ -82,7 +82,7 @@ export class IndexedDBAdapter extends BaseStorageAdapter {
   }
 
   private async getStore(
-    mode: IDBTransactionMode = `readonly`
+    mode: IDBTransactionMode = `readonly`,
   ): Promise<IDBObjectStore> {
     const db = await this.openDB()
     const transaction = db.transaction([this.storeName], mode)
@@ -117,7 +117,7 @@ export class IndexedDBAdapter extends BaseStorageAdapter {
         error.name === `QuotaExceededError`
       ) {
         throw new Error(
-          `Storage quota exceeded. Consider clearing old transactions.`
+          `Storage quota exceeded. Consider clearing old transactions.`,
         )
       }
       throw error
diff --git a/packages/offline-transactions/src/storage/LocalStorageAdapter.ts b/packages/offline-transactions/src/storage/LocalStorageAdapter.ts
index b7876932d..db3b85849 100644
--- a/packages/offline-transactions/src/storage/LocalStorageAdapter.ts
+++ b/packages/offline-transactions/src/storage/LocalStorageAdapter.ts
@@ -1,4 +1,4 @@
-import { BaseStorageAdapter } from "./StorageAdapter"
+import { BaseStorageAdapter } from './StorageAdapter'
 
 export class LocalStorageAdapter extends BaseStorageAdapter {
   private prefix: string
@@ -70,8 +70,8 @@ export class LocalStorageAdapter extends BaseStorageAdapter {
       ) {
         return Promise.reject(
           new Error(
-            `Storage quota exceeded. Consider clearing old transactions.`
-          )
+            `Storage quota exceeded. Consider clearing old transactions.`,
+          ),
         )
       }
       return Promise.reject(error)
diff --git a/packages/offline-transactions/src/storage/StorageAdapter.ts b/packages/offline-transactions/src/storage/StorageAdapter.ts
index 2f63aa4d7..3ebc129fe 100644
--- a/packages/offline-transactions/src/storage/StorageAdapter.ts
+++ b/packages/offline-transactions/src/storage/StorageAdapter.ts
@@ -1,4 +1,4 @@
-import type { StorageAdapter } from "../types"
+import type { StorageAdapter } from '../types'
 
 export abstract class BaseStorageAdapter implements StorageAdapter {
   abstract get(key: string): Promise<string | null>
diff --git a/packages/offline-transactions/src/telemetry/tracer.ts b/packages/offline-transactions/src/telemetry/tracer.ts
index f2469c289..c897a17fe 100644
--- a/packages/offline-transactions/src/telemetry/tracer.ts
+++ b/packages/offline-transactions/src/telemetry/tracer.ts
@@ -26,7 +26,7 @@ export async function withSpan<T>(
   name: string,
   attrs: SpanAttrs,
   fn: (span: any) => Promise<T>,
-  _options?: WithSpanOptions
+  _options?: WithSpanOptions,
 ): Promise<T> {
   return await fn(noopSpan)
 }
@@ -39,7 +39,7 @@ export async function withNestedSpan<T>(
   name: string,
   attrs: SpanAttrs,
   fn: (span: any) => Promise<T>,
-  _options?: WithSpanOptions
+  _options?: WithSpanOptions,
 ): Promise<T> {
   return await fn(noopSpan)
 }
@@ -52,7 +52,7 @@ export function withSyncSpan<T>(
   name: string,
   attrs: SpanAttrs,
   fn: (span: any) => T,
-  _options?: WithSpanOptions
+  _options?: WithSpanOptions,
 ): T {
   return fn(noopSpan)
 }
diff --git a/packages/offline-transactions/src/types.ts b/packages/offline-transactions/src/types.ts
index 90afa3700..8cf18cc88 100644
--- a/packages/offline-transactions/src/types.ts
+++ b/packages/offline-transactions/src/types.ts
@@ -2,7 +2,7 @@ import type {
   Collection,
   MutationFnParams,
   PendingMutation,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 // Extended mutation function that includes idempotency key
 export type OfflineMutationFnParams<
@@ -12,7 +12,7 @@ export type OfflineMutationFnParams<
 }
 
 export type OfflineMutationFn<T extends object = Record<string, unknown>> = (
-  params: OfflineMutationFnParams<T>
+  params: OfflineMutationFnParams<T>,
 ) => Promise<any>
 
 // Simplified mutation structure for serialization
@@ -95,7 +95,7 @@ export interface OfflineConfig {
   maxConcurrency?: number
   jitter?: boolean
   beforeRetry?: (
-    transactions: Array<OfflineTransaction>
+    transactions: Array<OfflineTransaction>,
   ) => Array<OfflineTransaction>
   onUnknownMutationFn?: (name: string, tx: OfflineTransaction) => void
   onLeadershipChange?: (isLeader: boolean) => void
diff --git a/packages/offline-transactions/tests/OfflineExecutor.test.ts b/packages/offline-transactions/tests/OfflineExecutor.test.ts
index da8c8bbb6..19e48eb6c 100644
--- a/packages/offline-transactions/tests/OfflineExecutor.test.ts
+++ b/packages/offline-transactions/tests/OfflineExecutor.test.ts
@@ -1,6 +1,6 @@
-import { beforeEach, describe, expect, it, vi } from "vitest"
-import { LocalStorageAdapter, startOfflineExecutor } from "../src/index"
-import type { OfflineConfig } from "../src/types"
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { LocalStorageAdapter, startOfflineExecutor } from '../src/index'
+import type { OfflineConfig } from '../src/types'
 
 describe(`OfflineExecutor`, () => {
   let mockCollection: any
@@ -19,7 +19,7 @@ describe(`OfflineExecutor`, () => {
 
     config = {
       collections: {
-        "test-collection": mockCollection,
+        'test-collection': mockCollection,
       },
       mutationFns: {
         syncData: mockMutationFn,
diff --git a/packages/offline-transactions/tests/harness.ts b/packages/offline-transactions/tests/harness.ts
index dd47153ac..7f8dc82ad 100644
--- a/packages/offline-transactions/tests/harness.ts
+++ b/packages/offline-transactions/tests/harness.ts
@@ -1,12 +1,12 @@
-import { createCollection } from "@tanstack/db"
-import { startOfflineExecutor } from "../src/index"
-import type { ChangeMessage, Collection, PendingMutation } from "@tanstack/db"
+import { createCollection } from '@tanstack/db'
+import { startOfflineExecutor } from '../src/index'
+import type { ChangeMessage, Collection, PendingMutation } from '@tanstack/db'
 import type {
   LeaderElection,
   OfflineConfig,
   OfflineMutationFnParams,
   StorageAdapter,
-} from "../src/types"
+} from '../src/types'
 
 export class FakeStorageAdapter implements StorageAdapter {
   private store = new Map<string, string>()
@@ -93,7 +93,7 @@ class FakeLeaderElection implements LeaderElection {
 }
 
 type TestMutationFn = (
-  params: OfflineMutationFnParams & { attempt: number }
+  params: OfflineMutationFnParams & { attempt: number },
 ) => Promise<any>
 
 interface TestOfflineEnvironmentOptions {
@@ -130,7 +130,7 @@ function createDefaultCollection(): {
 }
 
 export function createTestOfflineEnvironment(
-  options: TestOfflineEnvironmentOptions = {}
+  options: TestOfflineEnvironmentOptions = {},
 ): {
   executor: ReturnType<typeof startOfflineExecutor>
   storage: FakeStorageAdapter
@@ -176,7 +176,7 @@ export function createTestOfflineEnvironment(
 
           if (!id) {
             throw new Error(
-              `Unable to determine id for delete mutation ${mutation.globalKey}`
+              `Unable to determine id for delete mutation ${mutation.globalKey}`,
             )
           }
 
@@ -218,7 +218,7 @@ export function createTestOfflineEnvironment(
   const leader = new FakeLeaderElection()
 
   const wrappedMutation = async (
-    params: OfflineMutationFnParams
+    params: OfflineMutationFnParams,
   ): Promise<any> => {
     const currentAttempt = (attemptCounter.get(params.idempotencyKey) ?? 0) + 1
     attemptCounter.set(params.idempotencyKey, currentAttempt)
diff --git a/packages/offline-transactions/tests/leader-failover.test.ts b/packages/offline-transactions/tests/leader-failover.test.ts
index 3d832588e..0e9bbabf8 100644
--- a/packages/offline-transactions/tests/leader-failover.test.ts
+++ b/packages/offline-transactions/tests/leader-failover.test.ts
@@ -1,14 +1,14 @@
-import { describe, expect, it } from "vitest"
-import { FakeStorageAdapter, createTestOfflineEnvironment } from "./harness"
-import type { TestItem } from "./harness"
-import type { PendingMutation } from "@tanstack/db"
+import { describe, expect, it } from 'vitest'
+import { FakeStorageAdapter, createTestOfflineEnvironment } from './harness'
+import type { TestItem } from './harness'
+import type { PendingMutation } from '@tanstack/db'
 
 const flushMicrotasks = () => new Promise((resolve) => setTimeout(resolve, 0))
 
 const waitUntil = async (
   predicate: () => boolean | Promise<boolean>,
   timeoutMs = 5000,
-  intervalMs = 20
+  intervalMs = 20,
 ) => {
   const deadline = Date.now() + timeoutMs
   while (Date.now() < deadline) {
diff --git a/packages/offline-transactions/tests/offline-e2e.test.ts b/packages/offline-transactions/tests/offline-e2e.test.ts
index c1f009df4..b4f9442df 100644
--- a/packages/offline-transactions/tests/offline-e2e.test.ts
+++ b/packages/offline-transactions/tests/offline-e2e.test.ts
@@ -1,16 +1,16 @@
-import { describe, expect, it } from "vitest"
-import { NonRetriableError } from "../src/types"
-import { FakeStorageAdapter, createTestOfflineEnvironment } from "./harness"
-import type { TestItem } from "./harness"
-import type { OfflineMutationFnParams } from "../src/types"
-import type { PendingMutation } from "@tanstack/db"
+import { describe, expect, it } from 'vitest'
+import { NonRetriableError } from '../src/types'
+import { FakeStorageAdapter, createTestOfflineEnvironment } from './harness'
+import type { TestItem } from './harness'
+import type { OfflineMutationFnParams } from '../src/types'
+import type { PendingMutation } from '@tanstack/db'
 
 const flushMicrotasks = () => new Promise((resolve) => setTimeout(resolve, 0))
 
 const waitUntil = async (
   predicate: () => boolean | Promise<boolean>,
   timeoutMs = 5000,
-  intervalMs = 20
+  intervalMs = 20,
 ) => {
   const deadline = Date.now() + timeoutMs
   while (Date.now() < deadline) {
@@ -280,7 +280,7 @@ describe(`offline executor end-to-end`, () => {
       `[TEST] After flush, mutationCalls:`,
       env.mutationCalls.length,
       `resolvers:`,
-      pendingResolvers.length
+      pendingResolvers.length,
     )
     expect(env.mutationCalls.length).toBe(1)
     expect(pendingResolvers.length).toBe(1)
@@ -306,7 +306,7 @@ describe(`offline executor end-to-end`, () => {
       `[TEST] After second flush, mutationCalls:`,
       env.mutationCalls.length,
       `resolvers:`,
-      pendingResolvers.length
+      pendingResolvers.length,
     )
     expect(env.mutationCalls.length).toBe(1)
     expect(pendingResolvers.length).toBe(1)
@@ -336,7 +336,7 @@ describe(`offline executor end-to-end`, () => {
     let env: ReturnType<typeof createTestOfflineEnvironment> | undefined
 
     const deferredMutation = async (
-      params: OfflineMutationFnParams & { attempt: number }
+      params: OfflineMutationFnParams & { attempt: number },
     ) => {
       const runtimeEnv = env
       if (!runtimeEnv) {
@@ -370,7 +370,7 @@ describe(`offline executor end-to-end`, () => {
       autoCommit: false,
     })
     const waitFirst = runtimeEnv.executor.waitForTransactionCompletion(
-      firstTx.id
+      firstTx.id,
     )
     firstTx.mutate(() => {
       runtimeEnv.collection.insert({
@@ -387,7 +387,7 @@ describe(`offline executor end-to-end`, () => {
       autoCommit: false,
     })
     const waitSecond = runtimeEnv.executor.waitForTransactionCompletion(
-      secondTx.id
+      secondTx.id,
     )
     secondTx.mutate(() => {
       runtimeEnv.collection.insert({
diff --git a/packages/offline-transactions/tests/setup.ts b/packages/offline-transactions/tests/setup.ts
index be67b1894..3a7c60e50 100644
--- a/packages/offline-transactions/tests/setup.ts
+++ b/packages/offline-transactions/tests/setup.ts
@@ -1,4 +1,4 @@
-import { vi } from "vitest"
+import { vi } from 'vitest'
 
 // Mock browser APIs that might not be available in test environment
 Object.defineProperty(global, `crypto`, {
diff --git a/packages/offline-transactions/tests/storage-failure.test.ts b/packages/offline-transactions/tests/storage-failure.test.ts
index 3ecc6f097..dfac008a9 100644
--- a/packages/offline-transactions/tests/storage-failure.test.ts
+++ b/packages/offline-transactions/tests/storage-failure.test.ts
@@ -1,16 +1,16 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import { createCollection } from "@tanstack/db"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCollection } from '@tanstack/db'
 import {
   IndexedDBAdapter,
   LocalStorageAdapter,
   startOfflineExecutor,
-} from "../src/index"
-import type { OfflineConfig, StorageDiagnostic } from "../src/types"
+} from '../src/index'
+import type { OfflineConfig, StorageDiagnostic } from '../src/types'
 
 const waitUntil = async (
   predicate: () => boolean | Promise<boolean>,
   timeoutMs = 5000,
-  intervalMs = 20
+  intervalMs = 20,
 ) => {
   const deadline = Date.now() + timeoutMs
   while (Date.now() < deadline) {
@@ -40,7 +40,7 @@ describe(`storage failure handling`, () => {
 
     baseConfig = {
       collections: {
-        "test-collection": mockCollection,
+        'test-collection': mockCollection,
       },
       mutationFns: {
         syncData: mockMutationFn,
@@ -71,14 +71,14 @@ describe(`storage failure handling`, () => {
 
     // Wait for initialization to complete
     await waitUntil(
-      () => executor.storageDiagnostic.message !== `Initializing storage...`
+      () => executor.storageDiagnostic.message !== `Initializing storage...`,
     )
 
     // Should be in offline mode using localStorage
     expect(executor.mode).toBe(`offline`)
     expect(executor.storageDiagnostic.code).toBe(`INDEXEDDB_UNAVAILABLE`)
     expect(executor.storageDiagnostic.message).toContain(
-      `localStorage fallback`
+      `localStorage fallback`,
     )
     expect(executor.storageDiagnostic.error).toBe(securityError)
 
@@ -114,7 +114,7 @@ describe(`storage failure handling`, () => {
     const executor = startOfflineExecutor(config)
 
     await waitUntil(
-      () => executor.storageDiagnostic.message !== `Initializing storage...`
+      () => executor.storageDiagnostic.message !== `Initializing storage...`,
     )
 
     // Should be in online-only mode
@@ -159,7 +159,7 @@ describe(`storage failure handling`, () => {
     const executor = startOfflineExecutor(config)
 
     await waitUntil(
-      () => executor.storageDiagnostic.message !== `Initializing storage...`
+      () => executor.storageDiagnostic.message !== `Initializing storage...`,
     )
 
     // Should be in online-only mode with QUOTA_EXCEEDED
@@ -193,7 +193,7 @@ describe(`storage failure handling`, () => {
     const executor = startOfflineExecutor(baseConfig)
 
     await waitUntil(
-      () => executor.storageDiagnostic.message !== `Initializing storage...`
+      () => executor.storageDiagnostic.message !== `Initializing storage...`,
     )
 
     // Should be in online-only mode with UNKNOWN_ERROR
@@ -225,7 +225,7 @@ describe(`storage failure handling`, () => {
     const executor = startOfflineExecutor(config)
 
     await waitUntil(
-      () => executor.storageDiagnostic.message !== `Initializing storage...`
+      () => executor.storageDiagnostic.message !== `Initializing storage...`,
     )
 
     // Should be in offline mode
@@ -375,7 +375,7 @@ describe(`storage failure handling`, () => {
     const executor = startOfflineExecutor(baseConfig)
 
     await waitUntil(
-      () => executor.storageDiagnostic.message !== `Initializing storage...`
+      () => executor.storageDiagnostic.message !== `Initializing storage...`,
     )
 
     // Should detect SecurityError and use STORAGE_BLOCKED
diff --git a/packages/offline-transactions/vite.config.ts b/packages/offline-transactions/vite.config.ts
index c7968f28a..aa589f666 100644
--- a/packages/offline-transactions/vite.config.ts
+++ b/packages/offline-transactions/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -17,5 +17,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/offline-transactions/vitest.config.ts b/packages/offline-transactions/vitest.config.ts
index 197dd46ae..4ade54490 100644
--- a/packages/offline-transactions/vitest.config.ts
+++ b/packages/offline-transactions/vitest.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from "vitest/config"
+import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
diff --git a/packages/powersync-db-collection/CHANGELOG.md b/packages/powersync-db-collection/CHANGELOG.md
index 64392d49a..be379775a 100644
--- a/packages/powersync-db-collection/CHANGELOG.md
+++ b/packages/powersync-db-collection/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @tanstack/powersync-db-collection
 
+## 0.1.19
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.1.18
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.1.17
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.1.16
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.1.15
+
+### Patch Changes
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/packages/powersync-db-collection/package.json b/packages/powersync-db-collection/package.json
index 3fa99e04e..65d388a37 100644
--- a/packages/powersync-db-collection/package.json
+++ b/packages/powersync-db-collection/package.json
@@ -1,48 +1,12 @@
 {
   "name": "@tanstack/powersync-db-collection",
+  "version": "0.1.19",
   "description": "PowerSync collection for TanStack DB",
-  "version": "0.1.14",
-  "dependencies": {
-    "@standard-schema/spec": "^1.0.0",
-    "@tanstack/db": "workspace:*",
-    "@tanstack/store": "^0.8.0",
-    "debug": "^4.4.3",
-    "p-defer": "^4.0.1"
-  },
-  "peerDependencies": {
-    "@powersync/common": "^1.41.0"
-  },
-  "devDependencies": {
-    "@powersync/common": "^1.43.1",
-    "@powersync/node": "^0.14.3",
-    "@types/debug": "^4.1.12",
-    "@vitest/coverage-istanbul": "^3.2.4"
-  },
-  "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/index.d.cts",
-        "default": "./dist/cjs/index.cjs"
-      }
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
-  "packageManager": "pnpm@10.24.0",
   "author": "POWERSYNC",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/TanStack/db.git",
+    "url": "git+https://github.com/TanStack/db.git",
     "directory": "packages/powersync-db-collection"
   },
   "homepage": "https://tanstack.com/db",
@@ -63,9 +27,44 @@
     "build": "vite build",
     "dev": "vite build --watch",
     "lint": "eslint . --fix",
-    "test": "npx vitest --run"
+    "test": "vitest --run"
   },
-  "sideEffects": false,
   "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.cts",
+        "default": "./dist/cjs/index.cjs"
+      }
+    },
+    "./package.json": "./package.json"
+  },
+  "sideEffects": false,
+  "files": [
+    "dist",
+    "src"
+  ],
+  "dependencies": {
+    "@standard-schema/spec": "^1.0.0",
+    "@tanstack/db": "workspace:*",
+    "@tanstack/store": "^0.8.0",
+    "debug": "^4.4.3",
+    "p-defer": "^4.0.1"
+  },
+  "peerDependencies": {
+    "@powersync/common": "^1.41.0"
+  },
+  "devDependencies": {
+    "@powersync/common": "^1.43.1",
+    "@powersync/node": "^0.14.3",
+    "@types/debug": "^4.1.12",
+    "@vitest/coverage-istanbul": "^3.2.4"
+  }
 }
diff --git a/packages/powersync-db-collection/src/PendingOperationStore.ts b/packages/powersync-db-collection/src/PendingOperationStore.ts
index 80edf3c14..96798b07f 100644
--- a/packages/powersync-db-collection/src/PendingOperationStore.ts
+++ b/packages/powersync-db-collection/src/PendingOperationStore.ts
@@ -1,6 +1,6 @@
-import pDefer from "p-defer"
-import type { DiffTriggerOperation } from "@powersync/common"
-import type { DeferredPromise } from "p-defer"
+import pDefer from 'p-defer'
+import type { DiffTriggerOperation } from '@powersync/common'
+import type { DeferredPromise } from 'p-defer'
 
 export type PendingOperation = {
   tableName: string
diff --git a/packages/powersync-db-collection/src/PowerSyncTransactor.ts b/packages/powersync-db-collection/src/PowerSyncTransactor.ts
index ceed7ed20..655651b60 100644
--- a/packages/powersync-db-collection/src/PowerSyncTransactor.ts
+++ b/packages/powersync-db-collection/src/PowerSyncTransactor.ts
@@ -1,11 +1,11 @@
-import { sanitizeSQL } from "@powersync/common"
-import DebugModule from "debug"
-import { asPowerSyncRecord, mapOperationToPowerSync } from "./helpers"
-import { PendingOperationStore } from "./PendingOperationStore"
-import type { AbstractPowerSyncDatabase, LockContext } from "@powersync/common"
-import type { PendingMutation, Transaction } from "@tanstack/db"
-import type { EnhancedPowerSyncCollectionConfig } from "./definitions"
-import type { PendingOperation } from "./PendingOperationStore"
+import { sanitizeSQL } from '@powersync/common'
+import DebugModule from 'debug'
+import { asPowerSyncRecord, mapOperationToPowerSync } from './helpers'
+import { PendingOperationStore } from './PendingOperationStore'
+import type { AbstractPowerSyncDatabase, LockContext } from '@powersync/common'
+import type { PendingMutation, Transaction } from '@tanstack/db'
+import type { EnhancedPowerSyncCollectionConfig } from './definitions'
+import type { PendingOperation } from './PendingOperationStore'
 
 const debug = DebugModule.debug(`ts/db:powersync`)
 
@@ -71,7 +71,7 @@ export class PowerSyncTransactor {
      * We can do some optimizations for single-collection transactions.
      */
     const mutationsCollectionIds = mutations.map(
-      (mutation) => mutation.collection.id
+      (mutation) => mutation.collection.id,
     )
     const collectionIds = Array.from(new Set(mutationsCollectionIds))
     const lastCollectionMutationIndexes = new Map<string, number>()
@@ -81,7 +81,7 @@ export class PowerSyncTransactor {
     for (const collectionId of collectionIds) {
       lastCollectionMutationIndexes.set(
         collectionId,
-        mutationsCollectionIds.lastIndexOf(collectionId)
+        mutationsCollectionIds.lastIndexOf(collectionId),
       )
     }
 
@@ -92,7 +92,7 @@ export class PowerSyncTransactor {
           return
         }
         await new Promise<void>((resolve) => collection.onFirstReady(resolve))
-      })
+      }),
     )
 
     // Persist to PowerSync
@@ -110,17 +110,17 @@ export class PowerSyncTransactor {
           switch (mutation.type) {
             case `insert`:
               pendingOperations.push(
-                await this.handleInsert(mutation, tx, shouldWait)
+                await this.handleInsert(mutation, tx, shouldWait),
               )
               break
             case `update`:
               pendingOperations.push(
-                await this.handleUpdate(mutation, tx, shouldWait)
+                await this.handleUpdate(mutation, tx, shouldWait),
               )
               break
             case `delete`:
               pendingOperations.push(
-                await this.handleDelete(mutation, tx, shouldWait)
+                await this.handleDelete(mutation, tx, shouldWait),
               )
               break
           }
@@ -136,10 +136,10 @@ export class PowerSyncTransactor {
           whenComplete: Promise.all(
             pendingOperations
               .filter((op) => !!op)
-              .map((op) => this.pendingOperationStore.waitFor(op))
+              .map((op) => this.pendingOperationStore.waitFor(op)),
           ),
         }
-      }
+      },
     )
 
     // Wait for the change to be observed via the diff trigger
@@ -149,7 +149,7 @@ export class PowerSyncTransactor {
   protected async handleInsert(
     mutation: PendingMutation<any>,
     context: LockContext,
-    waitForCompletion: boolean = false
+    waitForCompletion: boolean = false,
   ): Promise<PendingOperation | null> {
     debug(`insert`, mutation)
 
@@ -168,16 +168,16 @@ export class PowerSyncTransactor {
         VALUES 
             (${keys.map((_) => `?`).join(`, `)})
         `,
-          Object.values(values)
+          Object.values(values),
         )
-      }
+      },
     )
   }
 
   protected async handleUpdate(
     mutation: PendingMutation<any>,
     context: LockContext,
-    waitForCompletion: boolean = false
+    waitForCompletion: boolean = false,
   ): Promise<PendingOperation | null> {
     debug(`update`, mutation)
 
@@ -195,16 +195,16 @@ export class PowerSyncTransactor {
         SET ${keys.map((key) => `${key} = ?`).join(`, `)}
         WHERE id = ?
         `,
-          [...Object.values(values), asPowerSyncRecord(mutation.modified).id]
+          [...Object.values(values), asPowerSyncRecord(mutation.modified).id],
         )
-      }
+      },
     )
   }
 
   protected async handleDelete(
     mutation: PendingMutation<any>,
     context: LockContext,
-    waitForCompletion: boolean = false
+    waitForCompletion: boolean = false,
   ): Promise<PendingOperation | null> {
     debug(`update`, mutation)
 
@@ -217,9 +217,9 @@ export class PowerSyncTransactor {
           `
         DELETE FROM ${tableName} WHERE id = ?
         `,
-          [asPowerSyncRecord(mutation.original).id]
+          [asPowerSyncRecord(mutation.original).id],
         )
-      }
+      },
     )
   }
 
@@ -236,8 +236,8 @@ export class PowerSyncTransactor {
     handler: (
       tableName: string,
       mutation: PendingMutation<any>,
-      serializeValue: (value: any) => Record<string, unknown>
-    ) => Promise<void>
+      serializeValue: (value: any) => Record<string, unknown>,
+    ) => Promise<void>,
   ): Promise<PendingOperation | null> {
     if (
       typeof (mutation.collection.config as any).utils?.getMeta != `function`
@@ -259,7 +259,7 @@ export class PowerSyncTransactor {
 
     // Need to get the operation in order to wait for it
     const diffOperation = await context.get<{ id: string; timestamp: string }>(
-      sanitizeSQL`SELECT id, timestamp FROM ${trackedTableName} ORDER BY timestamp DESC LIMIT 1`
+      sanitizeSQL`SELECT id, timestamp FROM ${trackedTableName} ORDER BY timestamp DESC LIMIT 1`,
     )
     return {
       tableName,
diff --git a/packages/powersync-db-collection/src/definitions.ts b/packages/powersync-db-collection/src/definitions.ts
index d27b47311..7da2e95d5 100644
--- a/packages/powersync-db-collection/src/definitions.ts
+++ b/packages/powersync-db-collection/src/definitions.ts
@@ -1,16 +1,16 @@
-import type { AbstractPowerSyncDatabase, Table } from "@powersync/common"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+import type { AbstractPowerSyncDatabase, Table } from '@powersync/common'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 import type {
   BaseCollectionConfig,
   CollectionConfig,
   InferSchemaOutput,
-} from "@tanstack/db"
+} from '@tanstack/db'
 import type {
   AnyTableColumnType,
   ExtractedTable,
   OptionalExtractedTable,
   PowerSyncRecord,
-} from "./helpers"
+} from './helpers'
 
 /**
  * Small helper which determines the output type if:
@@ -54,7 +54,7 @@ export type CustomSQLiteSerializer<
   TSQLite extends Record<string, unknown>,
 > = Partial<{
   [Key in keyof TOutput]: (
-    value: TOutput[Key]
+    value: TOutput[Key],
   ) => Key extends keyof TSQLite ? TSQLite[Key] : never
 }>
 
diff --git a/packages/powersync-db-collection/src/helpers.ts b/packages/powersync-db-collection/src/helpers.ts
index b2c35364e..af33d259a 100644
--- a/packages/powersync-db-collection/src/helpers.ts
+++ b/packages/powersync-db-collection/src/helpers.ts
@@ -1,9 +1,9 @@
-import { DiffTriggerOperation } from "@powersync/common"
+import { DiffTriggerOperation } from '@powersync/common'
 import type {
   BaseColumnType,
   ExtractColumnValueType,
   Table,
-} from "@powersync/common"
+} from '@powersync/common'
 
 /**
  * All PowerSync table records include a UUID `id` column.
diff --git a/packages/powersync-db-collection/src/index.ts b/packages/powersync-db-collection/src/index.ts
index 6c8111f4c..6879d7a22 100644
--- a/packages/powersync-db-collection/src/index.ts
+++ b/packages/powersync-db-collection/src/index.ts
@@ -1,3 +1,3 @@
-export * from "./definitions"
-export * from "./powersync"
-export * from "./PowerSyncTransactor"
+export * from './definitions'
+export * from './powersync'
+export * from './PowerSyncTransactor'
diff --git a/packages/powersync-db-collection/src/powersync.ts b/packages/powersync-db-collection/src/powersync.ts
index 549b08db0..4e40fe739 100644
--- a/packages/powersync-db-collection/src/powersync.ts
+++ b/packages/powersync-db-collection/src/powersync.ts
@@ -1,17 +1,17 @@
-import { DiffTriggerOperation, sanitizeSQL } from "@powersync/common"
-import { PendingOperationStore } from "./PendingOperationStore"
-import { PowerSyncTransactor } from "./PowerSyncTransactor"
-import { DEFAULT_BATCH_SIZE } from "./definitions"
-import { asPowerSyncRecord, mapOperation } from "./helpers"
-import { convertTableToSchema } from "./schema"
-import { serializeForSQLite } from "./serialization"
+import { DiffTriggerOperation, sanitizeSQL } from '@powersync/common'
+import { PendingOperationStore } from './PendingOperationStore'
+import { PowerSyncTransactor } from './PowerSyncTransactor'
+import { DEFAULT_BATCH_SIZE } from './definitions'
+import { asPowerSyncRecord, mapOperation } from './helpers'
+import { convertTableToSchema } from './schema'
+import { serializeForSQLite } from './serialization'
 import type {
   AnyTableColumnType,
   ExtractedTable,
   ExtractedTableColumns,
   MapBaseColumnType,
   OptionalExtractedTable,
-} from "./helpers"
+} from './helpers'
 import type {
   BasePowerSyncCollectionConfig,
   ConfigWithArbitraryCollectionTypes,
@@ -22,11 +22,11 @@ import type {
   InferPowerSyncOutputType,
   PowerSyncCollectionConfig,
   PowerSyncCollectionUtils,
-} from "./definitions"
-import type { PendingOperation } from "./PendingOperationStore"
-import type { SyncConfig } from "@tanstack/db"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
-import type { Table, TriggerDiffRecord } from "@powersync/common"
+} from './definitions'
+import type { PendingOperation } from './PendingOperationStore'
+import type { SyncConfig } from '@tanstack/db'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+import type { Table, TriggerDiffRecord } from '@powersync/common'
 
 /**
  * Creates PowerSync collection options for use with a standard Collection.
@@ -69,7 +69,7 @@ import type { Table, TriggerDiffRecord } from "@powersync/common"
  * ```
  */
 export function powerSyncCollectionOptions<TTable extends Table = Table>(
-  config: BasePowerSyncCollectionConfig<TTable, never> & ConfigWithSQLiteTypes
+  config: BasePowerSyncCollectionConfig<TTable, never> & ConfigWithSQLiteTypes,
 ): EnhancedPowerSyncCollectionConfig<
   TTable,
   OptionalExtractedTable<TTable>,
@@ -134,7 +134,7 @@ export function powerSyncCollectionOptions<
   >,
 >(
   config: BasePowerSyncCollectionConfig<TTable, TSchema> &
-    ConfigWithSQLiteInputType<TTable, TSchema>
+    ConfigWithSQLiteInputType<TTable, TSchema>,
 ): EnhancedPowerSyncCollectionConfig<
   TTable,
   InferPowerSyncOutputType<TTable, TSchema>,
@@ -202,7 +202,7 @@ export function powerSyncCollectionOptions<
   >,
 >(
   config: BasePowerSyncCollectionConfig<TTable, TSchema> &
-    ConfigWithArbitraryCollectionTypes<TTable, TSchema>
+    ConfigWithArbitraryCollectionTypes<TTable, TSchema>,
 ): EnhancedPowerSyncCollectionConfig<
   TTable,
   InferPowerSyncOutputType<TTable, TSchema>,
@@ -280,7 +280,7 @@ export function powerSyncCollectionOptions<
   const pendingOperationStore = PendingOperationStore.GLOBAL
   // Keep the tracked table unique in case of multiple tabs.
   const trackedTableName = `__${viewName}_tracking_${Math.floor(
-    Math.random() * 0xffffffff
+    Math.random() * 0xffffffff,
   )
     .toString(16)
     .padStart(8, `0`)}`
@@ -302,7 +302,7 @@ export function powerSyncCollectionOptions<
       // The sync function needs to be synchronous
       async function start() {
         database.logger.info(
-          `Sync is starting for ${viewName} into ${trackedTableName}`
+          `Sync is starting for ${viewName} into ${trackedTableName}`,
         )
         database.onChangeWithCallback(
           {
@@ -311,7 +311,7 @@ export function powerSyncCollectionOptions<
                 .writeTransaction(async (context) => {
                   begin()
                   const operations = await context.getAll<TriggerDiffRecord>(
-                    `SELECT * FROM ${trackedTableName} ORDER BY timestamp ASC`
+                    `SELECT * FROM ${trackedTableName} ORDER BY timestamp ASC`,
                   )
                   const pendingOperations: Array<PendingOperation> = []
 
@@ -350,7 +350,7 @@ export function powerSyncCollectionOptions<
                 .catch((error) => {
                   database.logger.error(
                     `An error has been detected in the sync handler`,
-                    error
+                    error,
                   )
                 })
             },
@@ -359,7 +359,7 @@ export function powerSyncCollectionOptions<
             signal: abortController.signal,
             triggerImmediate: false,
             tables: [trackedTableName],
-          }
+          },
         )
 
         const disposeTracking = await database.triggers.createDiffTrigger({
@@ -378,7 +378,7 @@ export function powerSyncCollectionOptions<
                 begin()
                 const batchItems = await context.getAll<TableType>(
                   sanitizeSQL`SELECT * FROM ${viewName} LIMIT ? OFFSET ?`,
-                  [syncBatchSize, cursor]
+                  [syncBatchSize, cursor],
                 )
                 currentBatchCount = batchItems.length
                 cursor += currentBatchCount
@@ -392,7 +392,7 @@ export function powerSyncCollectionOptions<
               }
               markReady()
               database.logger.info(
-                `Sync is ready for ${viewName} into ${trackedTableName}`
+                `Sync is ready for ${viewName} into ${trackedTableName}`,
               )
             },
           },
@@ -407,7 +407,7 @@ export function powerSyncCollectionOptions<
             () => {
               disposeTracking()
             },
-            { once: true }
+            { once: true },
           )
         }
       }
@@ -415,13 +415,13 @@ export function powerSyncCollectionOptions<
       start().catch((error) =>
         database.logger.error(
           `Could not start syncing process for ${viewName} into ${trackedTableName}`,
-          error
-        )
+          error,
+        ),
       )
 
       return () => {
         database.logger.info(
-          `Sync has been stopped for ${viewName} into ${trackedTableName}`
+          `Sync has been stopped for ${viewName} into ${trackedTableName}`,
         )
         abortController.abort()
       }
@@ -470,7 +470,7 @@ export function powerSyncCollectionOptions<
             serializer as CustomSQLiteSerializer<
               OutputType,
               ExtractedTableColumns<Table<MapBaseColumnType<OutputType>>>
-            >
+            >,
           ),
       }),
     },
diff --git a/packages/powersync-db-collection/src/schema.ts b/packages/powersync-db-collection/src/schema.ts
index ca56c71b4..706795590 100644
--- a/packages/powersync-db-collection/src/schema.ts
+++ b/packages/powersync-db-collection/src/schema.ts
@@ -1,7 +1,7 @@
-import { ColumnType } from "@powersync/common"
-import type { Table } from "@powersync/common"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
-import type { ExtractedTable } from "./helpers"
+import { ColumnType } from '@powersync/common'
+import type { Table } from '@powersync/common'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+import type { ExtractedTable } from './helpers'
 
 /**
  * Converts a PowerSync Table instance to a StandardSchemaV1 schema.
@@ -21,12 +21,12 @@ import type { ExtractedTable } from "./helpers"
  * ```
  */
 export function convertTableToSchema<TTable extends Table>(
-  table: TTable
+  table: TTable,
 ): StandardSchemaV1<ExtractedTable<TTable>> {
   type TExtracted = ExtractedTable<TTable>
   // Create validate function that checks types according to column definitions
   const validate = (
-    value: unknown
+    value: unknown,
   ):
     | StandardSchemaV1.SuccessResult<TExtracted>
     | StandardSchemaV1.FailureResult => {
@@ -87,7 +87,7 @@ export function convertTableToSchema<TTable extends Table>(
   }
 
   return {
-    "~standard": {
+    '~standard': {
       version: 1,
       vendor: `powersync`,
       validate,
diff --git a/packages/powersync-db-collection/src/serialization.ts b/packages/powersync-db-collection/src/serialization.ts
index 13201ffad..a3719c5f8 100644
--- a/packages/powersync-db-collection/src/serialization.ts
+++ b/packages/powersync-db-collection/src/serialization.ts
@@ -1,11 +1,11 @@
-import { ColumnType } from "@powersync/common"
-import type { Table } from "@powersync/common"
-import type { CustomSQLiteSerializer } from "./definitions"
+import { ColumnType } from '@powersync/common'
+import type { Table } from '@powersync/common'
+import type { CustomSQLiteSerializer } from './definitions'
 import type {
   ExtractedTable,
   ExtractedTableColumns,
   MapBaseColumnType,
-} from "./helpers"
+} from './helpers'
 
 /**
  * Serializes an object for persistence to a SQLite table, mapping its values to appropriate SQLite types.
@@ -48,7 +48,7 @@ export function serializeForSQLite<
   tableSchema: TTable,
   customSerializer: Partial<
     CustomSQLiteSerializer<TOutput, ExtractedTableColumns<TTable>>
-  > = {}
+  > = {},
 ): ExtractedTable<TTable> {
   return Object.fromEntries(
     Object.entries(value).map(([key, value]) => {
@@ -90,12 +90,12 @@ export function serializeForSQLite<
             const numberValue = Number(value)
             if (isNaN(numberValue)) {
               throw new Error(
-                `Could not convert ${key}=${value} to a number for SQLite`
+                `Could not convert ${key}=${value} to a number for SQLite`,
               )
             }
             return [key, numberValue]
           }
       }
-    })
+    }),
   )
 }
diff --git a/packages/powersync-db-collection/tests/collection-schema.test.ts b/packages/powersync-db-collection/tests/collection-schema.test.ts
index 195ffacf7..84a7b1297 100644
--- a/packages/powersync-db-collection/tests/collection-schema.test.ts
+++ b/packages/powersync-db-collection/tests/collection-schema.test.ts
@@ -1,11 +1,11 @@
-import { randomUUID } from "node:crypto"
-import { tmpdir } from "node:os"
-import { PowerSyncDatabase, Schema, Table, column } from "@powersync/node"
-import { SchemaValidationError, createCollection } from "@tanstack/db"
-import { describe, expect, it, onTestFinished, vi } from "vitest"
-import { z } from "zod"
-import { powerSyncCollectionOptions } from "../src"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+import { randomUUID } from 'node:crypto'
+import { tmpdir } from 'node:os'
+import { PowerSyncDatabase, Schema, Table, column } from '@powersync/node'
+import { SchemaValidationError, createCollection } from '@tanstack/db'
+import { describe, expect, it, onTestFinished, vi } from 'vitest'
+import { z } from 'zod'
+import { powerSyncCollectionOptions } from '../src'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 const APP_SCHEMA = new Schema({
   documents: new Table({
@@ -41,7 +41,7 @@ describe(`PowerSync Schema Integration`, () => {
         database: db,
         // We get typing and a default validator from this
         table: APP_SCHEMA.props.documents,
-      })
+      }),
     )
     onTestFinished(() => collection.cleanup())
     return collection
@@ -110,7 +110,7 @@ describe(`PowerSync Schema Integration`, () => {
           table: APP_SCHEMA.props.documents,
           schema,
           onDeserializationError: () => {},
-        })
+        }),
       )
       onTestFinished(() => collection.cleanup())
 
@@ -170,7 +170,7 @@ describe(`PowerSync Schema Integration`, () => {
           table: APP_SCHEMA.props.documents,
           schema,
           onDeserializationError: () => {},
-        })
+        }),
       )
       onTestFinished(() => collection.cleanup())
 
@@ -234,7 +234,7 @@ describe(`PowerSync Schema Integration`, () => {
               .transform((val) => (val ? new Date(val) : null)),
           }),
           onDeserializationError: () => {},
-        })
+        }),
       )
       onTestFinished(() => collection.cleanup())
 
@@ -290,7 +290,7 @@ describe(`PowerSync Schema Integration`, () => {
           },
           deserializationSchema: schema,
           onDeserializationError: () => {},
-        })
+        }),
       )
       onTestFinished(() => collection.cleanup())
 
@@ -329,7 +329,7 @@ describe(`PowerSync Schema Integration`, () => {
       })
 
       const onError = vi.fn((() => {}) as (
-        error: StandardSchemaV1.FailureResult
+        error: StandardSchemaV1.FailureResult,
       ) => void)
 
       const collection = createCollection(
@@ -338,7 +338,7 @@ describe(`PowerSync Schema Integration`, () => {
           table: APP_SCHEMA.props.documents,
           schema,
           onDeserializationError: onError,
-        })
+        }),
       )
       onTestFinished(() => collection.cleanup())
 
@@ -355,7 +355,7 @@ describe(`PowerSync Schema Integration`, () => {
           // Each column which should have been defined
           expect(issues?.length).eq(4)
         },
-        { timeout: 1000 }
+        { timeout: 1000 },
       )
     })
   })
diff --git a/packages/powersync-db-collection/tests/powersync.test.ts b/packages/powersync-db-collection/tests/powersync.test.ts
index 5d71af023..de946be38 100644
--- a/packages/powersync-db-collection/tests/powersync.test.ts
+++ b/packages/powersync-db-collection/tests/powersync.test.ts
@@ -1,22 +1,22 @@
-import { randomUUID } from "node:crypto"
-import { tmpdir } from "node:os"
+import { randomUUID } from 'node:crypto'
+import { tmpdir } from 'node:os'
 import {
   CrudEntry,
   PowerSyncDatabase,
   Schema,
   Table,
   column,
-} from "@powersync/node"
+} from '@powersync/node'
 import {
   createCollection,
   createTransaction,
   eq,
   liveQueryCollectionOptions,
-} from "@tanstack/db"
-import { describe, expect, it, onTestFinished, vi } from "vitest"
-import { powerSyncCollectionOptions } from "../src"
-import { PowerSyncTransactor } from "../src/PowerSyncTransactor"
-import type { AbstractPowerSyncDatabase } from "@powersync/node"
+} from '@tanstack/db'
+import { describe, expect, it, onTestFinished, vi } from 'vitest'
+import { powerSyncCollectionOptions } from '../src'
+import { PowerSyncTransactor } from '../src/PowerSyncTransactor'
+import type { AbstractPowerSyncDatabase } from '@powersync/node'
 
 const APP_SCHEMA = new Schema({
   users: new Table({
@@ -55,7 +55,7 @@ describe(`PowerSync Integration`, () => {
         database: db,
         // We get typing and a default validator from this
         table: APP_SCHEMA.props.documents,
-      })
+      }),
     )
     onTestFinished(() => collection.cleanup())
     return collection
@@ -81,10 +81,11 @@ describe(`PowerSync Integration`, () => {
 
       // Verify the collection state contains our items
       expect(collection.size).toBe(3)
-      expect(collection.toArray.map((entry) => entry.name)).deep.equals([
+      // Sort by name since keys are random UUIDs
+      expect(collection.toArray.map((entry) => entry.name).sort()).deep.equals([
         `one`,
-        `two`,
         `three`,
+        `two`,
       ])
     })
 
@@ -110,14 +111,12 @@ describe(`PowerSync Integration`, () => {
       await vi.waitFor(
         () => {
           expect(collection.size).toBe(4)
-          expect(collection.toArray.map((entry) => entry.name)).deep.equals([
-            `one`,
-            `two`,
-            `three`,
-            `four`,
-          ])
+          // Sort by name since keys are random UUIDs
+          expect(
+            collection.toArray.map((entry) => entry.name).sort(),
+          ).deep.equals([`four`, `one`, `three`, `two`])
         },
-        { timeout: 1000 }
+        { timeout: 1000 },
       )
 
       await db.execute(`
@@ -129,13 +128,12 @@ describe(`PowerSync Integration`, () => {
       await vi.waitFor(
         () => {
           expect(collection.size).toBe(3)
-          expect(collection.toArray.map((entry) => entry.name)).deep.equals([
-            `one`,
-            `three`,
-            `four`,
-          ])
+          // Sort by name since keys are random UUIDs
+          expect(
+            collection.toArray.map((entry) => entry.name).sort(),
+          ).deep.equals([`four`, `one`, `three`])
         },
-        { timeout: 1000 }
+        { timeout: 1000 },
       )
 
       await db.execute(`
@@ -148,13 +146,12 @@ describe(`PowerSync Integration`, () => {
       await vi.waitFor(
         () => {
           expect(collection.size).toBe(3)
-          expect(collection.toArray.map((entry) => entry.name)).deep.equals([
-            `updated`,
-            `three`,
-            `four`,
-          ])
+          // Sort by name since keys are random UUIDs
+          expect(
+            collection.toArray.map((entry) => entry.name).sort(),
+          ).deep.equals([`four`, `three`, `updated`])
         },
-        { timeout: 1000 }
+        { timeout: 1000 },
       )
     })
 
@@ -228,7 +225,7 @@ describe(`PowerSync Integration`, () => {
         autoCommit: false,
         mutationFn: async ({ transaction }) => {
           await new PowerSyncTransactor({ database: db }).applyTransaction(
-            transaction
+            transaction,
           )
         },
       })
@@ -260,7 +257,7 @@ describe(`PowerSync Integration`, () => {
         crudEntries
           .reverse()
           .slice(0, 5)
-          .every((crudEntry) => crudEntry.transactionId == lastTransactionId)
+          .every((crudEntry) => crudEntry.transactionId == lastTransactionId),
       ).true
     })
 
@@ -274,7 +271,7 @@ describe(`PowerSync Integration`, () => {
         powerSyncCollectionOptions({
           database: db,
           table: APP_SCHEMA.props.users,
-        })
+        }),
       )
       onTestFinished(() => usersCollection.cleanup())
 
@@ -288,7 +285,7 @@ describe(`PowerSync Integration`, () => {
         autoCommit: false,
         mutationFn: async ({ transaction }) => {
           await new PowerSyncTransactor({ database: db }).applyTransaction(
-            transaction
+            transaction,
           )
         },
       })
@@ -322,7 +319,7 @@ describe(`PowerSync Integration`, () => {
         crudEntries
           .reverse()
           .slice(0, 10)
-          .every((crudEntry) => crudEntry.transactionId == lastTransactionId)
+          .every((crudEntry) => crudEntry.transactionId == lastTransactionId),
       ).true
     })
   })
@@ -350,7 +347,7 @@ describe(`PowerSync Integration`, () => {
         autoCommit: false,
         mutationFn: async ({ transaction }) => {
           await new PowerSyncTransactor({ database: db }).applyTransaction(
-            transaction
+            transaction,
           )
         },
       })
@@ -398,7 +395,7 @@ describe(`PowerSync Integration`, () => {
                 id: document.id,
                 name: document.name,
               })),
-        })
+        }),
       )
 
       expect(liveDocuments.size).eq(0)
@@ -425,7 +422,7 @@ describe(`PowerSync Integration`, () => {
         () => {
           expect(Array.from(bookNames)).deep.equals([`book`])
         },
-        { timeout: 1000 }
+        { timeout: 1000 },
       )
     })
   })
@@ -449,7 +446,7 @@ describe(`PowerSync Integration`, () => {
           expect(collectionA.size).eq(3)
           expect(collectionB.size).eq(3)
         },
-        { timeout: 1000 }
+        { timeout: 1000 },
       )
     })
   })
@@ -472,7 +469,7 @@ describe(`PowerSync Integration`, () => {
               FROM sqlite_temp_master 
               WHERE type='table' AND name = ?
             `,
-            [meta.trackedTableName]
+            [meta.trackedTableName],
           )
         })
         return result.count > 0
@@ -490,7 +487,7 @@ describe(`PowerSync Integration`, () => {
         async () => {
           expect(await tableExists()).false
         },
-        { timeout: 1000 }
+        { timeout: 1000 },
       )
     })
   })
diff --git a/packages/powersync-db-collection/tests/schema.test.ts b/packages/powersync-db-collection/tests/schema.test.ts
index 2dc6fb25d..7405284d5 100644
--- a/packages/powersync-db-collection/tests/schema.test.ts
+++ b/packages/powersync-db-collection/tests/schema.test.ts
@@ -1,7 +1,7 @@
-import { Schema, Table, column } from "@powersync/common"
-import { describe, expect, it } from "vitest"
-import { convertTableToSchema } from "../src/schema"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+import { Schema, Table, column } from '@powersync/common'
+import { describe, expect, it } from 'vitest'
+import { convertTableToSchema } from '../src/schema'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 describe(`Schema Conversion`, () => {
   describe(`convertTableToSchema`, () => {
diff --git a/packages/powersync-db-collection/vite.config.ts b/packages/powersync-db-collection/vite.config.ts
index af20d0da3..8f43b798f 100644
--- a/packages/powersync-db-collection/vite.config.ts
+++ b/packages/powersync-db-collection/vite.config.ts
@@ -1,6 +1,6 @@
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import { defineConfig, mergeConfig } from "vitest/config"
-import packageJson from "./package.json"
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import { defineConfig, mergeConfig } from 'vitest/config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -17,5 +17,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/query-db-collection/CHANGELOG.md b/packages/query-db-collection/CHANGELOG.md
index c5f50f8f1..73e708ccb 100644
--- a/packages/query-db-collection/CHANGELOG.md
+++ b/packages/query-db-collection/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @tanstack/query-db-collection
 
+## 1.0.11
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 1.0.8
+
+### Patch Changes
+
+- Fix writeInsert/writeUpsert throwing error when collection uses select option ([#1023](https://github.com/TanStack/db/pull/1023))
+
+  When a Query Collection was configured with a `select` option to extract items from a wrapped API response (e.g., `{ data: [...], meta: {...} }`), calling `writeInsert()` or `writeUpsert()` would corrupt the query cache and trigger the error: "select() must return an array of objects".
+
+  The fix routes cache updates through a new `updateCacheData` function that preserves the wrapper structure by using the `select` function to identify which property contains the items array (via reference equality), then updates only that property while keeping metadata intact.
+
+## 1.0.7
+
+### Patch Changes
+
+- Enhanced LoadSubsetOptions with separate cursor expressions and offset for flexible pagination. ([#960](https://github.com/TanStack/db/pull/960))
+
+  **⚠️ Breaking Change for Custom Sync Layers / Query Collections:**
+
+  `LoadSubsetOptions.where` no longer includes cursor expressions for pagination. If you have a custom sync layer or query collection that implements `loadSubset`, you must now handle pagination separately:
+  - **Cursor-based pagination:** Use the new `cursor` property (`cursor.whereFrom` and `cursor.whereCurrent`) and combine them with `where` yourself
+  - **Offset-based pagination:** Use the new `offset` property
+
+  Previously, cursor expressions were baked into the `where` clause. Now they are passed separately so sync layers can choose their preferred pagination strategy.
+
+  **Changes:**
+  - Added `CursorExpressions` type with `whereFrom`, `whereCurrent`, and optional `lastKey` properties
+  - Added `cursor` to `LoadSubsetOptions` for cursor-based pagination (separate from `where`)
+  - Added `offset` to `LoadSubsetOptions` for offset-based pagination support
+  - Electric sync layer now makes two parallel `requestSnapshot` calls when cursor is present:
+    - One for `whereCurrent` (all ties at boundary, no limit)
+    - One for `whereFrom` (rows after cursor, with limit)
+  - Query collection serialization now includes `offset` for query key generation
+  - Added `truncate` event to collections, emitted when synced data is truncated (e.g., after `must-refetch`)
+  - Fixed `setWindow` pagination: cursor expressions are now correctly built when paging through results
+  - Fixed offset tracking: `loadNextItems` now passes the correct window offset to prevent incorrect deduplication
+  - `CollectionSubscriber` now listens for `truncate` events to reset cursor tracking state
+
+  **Benefits:**
+  - Sync layers can choose between cursor-based or offset-based pagination strategies
+  - Electric can efficiently handle tie-breaking with two targeted requests
+  - Better separation of concerns between filtering (`where`) and pagination (`cursor`/`offset`)
+  - `setWindow` correctly triggers backend loading for subsequent pages in multi-column orderBy queries
+  - Cursor state is properly reset after truncation, preventing stale cursor data from being used
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 1.0.6
+
+### Patch Changes
+
+- fix(query-db-collection): use deep equality for object field comparison in query observer ([#967](https://github.com/TanStack/db/pull/967))
+
+  Fixed an issue where updating object fields (non-primitives) with `refetch: false` in `onUpdate` handlers would cause the value to rollback to the previous state every other update. The query observer was using shallow equality (`===`) to compare items, which compares object properties by reference rather than by value. This caused the observer to incorrectly detect differences and write stale data back to syncedData. Now uses `deepEquals` for proper value comparison.
+
+- Use regular dependency for @tanstack/db instead of peerDependency to match the standard pattern used by other TanStack DB packages and prevent duplicate installations ([#952](https://github.com/TanStack/db/pull/952))
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 1.0.5
 
 ### Patch Changes
@@ -11,7 +92,7 @@
   Additionally, QueryCollectionMeta is now an interface (instead of a type alias), enabling users to safely extend meta with custom properties via declaration merging:
 
   ```typescript
-  declare module "@tanstack/query-db-collection" {
+  declare module '@tanstack/query-db-collection' {
     interface QueryCollectionMeta {
       myCustomProperty: string
     }
@@ -73,8 +154,8 @@
   ```typescript
   // This would cause conflicts between different queries
   queryCollectionOptions({
-    queryKey: ["products"], // Static key
-    syncMode: "on-demand",
+    queryKey: ['products'], // Static key
+    syncMode: 'on-demand',
     queryFn: async (ctx) => {
       const { where, limit } = ctx.meta.loadSubsetOptions
       return fetch(`/api/products?...`).then((r) => r.json())
@@ -125,7 +206,7 @@
   **Example:**
 
   ```typescript
-  import { parseLoadSubsetOptions } from "@tanstack/db"
+  import { parseLoadSubsetOptions } from '@tanstack/db'
   // or from "@tanstack/query-db-collection" (re-exported for convenience)
 
   queryFn: async (ctx) => {
@@ -136,8 +217,8 @@
     // Build API request from parsed filters
     const params = new URLSearchParams()
     parsed.filters.forEach(({ field, operator, value }) => {
-      if (operator === "eq") {
-        params.set(field.join("."), String(value))
+      if (operator === 'eq') {
+        params.set(field.join('.'), String(value))
       }
     })
 
@@ -186,11 +267,11 @@
 
   // Check sync status
   if (collection.utils.isFetching) {
-    console.log("Syncing with server...")
+    console.log('Syncing with server...')
   }
 
   if (collection.utils.isRefetching) {
-    console.log("Background refresh in progress")
+    console.log('Background refresh in progress')
   }
 
   // Show last update time
@@ -199,7 +280,7 @@
 
   // Check error state (now using getters)
   if (collection.utils.isError) {
-    console.error("Sync failed:", collection.utils.lastError)
+    console.error('Sync failed:', collection.utils.lastError)
     console.log(`Failed ${collection.utils.errorCount} times`)
   }
   ```
@@ -307,8 +388,8 @@
   })
 
   queryCollectionOptions({
-    id: "wallet-accounts",
-    queryKey: ["wallet-accounts"],
+    id: 'wallet-accounts',
+    queryKey: ['wallet-accounts'],
     queryClient: dbQueryClient,
     // staleTime: Infinity is now inherited from defaultOptions
   })
@@ -701,7 +782,7 @@
   try {
     collection.insert(data)
   } catch (error) {
-    if (error.message.includes("already exists")) {
+    if (error.message.includes('already exists')) {
       // Handle duplicate key error
     }
   }
@@ -710,7 +791,7 @@
   **After:**
 
   ```ts
-  import { DuplicateKeyError } from "@tanstack/db"
+  import { DuplicateKeyError } from '@tanstack/db'
 
   try {
     collection.insert(data)
@@ -727,14 +808,14 @@
 
   ```ts
   // Electric collection errors were imported from @tanstack/db
-  import { ElectricInsertHandlerMustReturnTxIdError } from "@tanstack/db"
+  import { ElectricInsertHandlerMustReturnTxIdError } from '@tanstack/db'
   ```
 
   **After:**
 
   ```ts
   // Now import from the specific adapter package
-  import { ElectricInsertHandlerMustReturnTxIdError } from "@tanstack/electric-db-collection"
+  import { ElectricInsertHandlerMustReturnTxIdError } from '@tanstack/electric-db-collection'
   ```
 
   ### Unified Error Handling
@@ -742,14 +823,14 @@
   **New:**
 
   ```ts
-  import { TanStackDBError } from "@tanstack/db"
+  import { TanStackDBError } from '@tanstack/db'
 
   try {
     // Any TanStack DB operation
   } catch (error) {
     if (error instanceof TanStackDBError) {
       // Handle all TanStack DB errors uniformly
-      console.log("TanStack DB error:", error.message)
+      console.log('TanStack DB error:', error.message)
     }
   }
   ```
diff --git a/packages/query-db-collection/e2e/query-filter.ts b/packages/query-db-collection/e2e/query-filter.ts
index 928153672..43f4d0e87 100644
--- a/packages/query-db-collection/e2e/query-filter.ts
+++ b/packages/query-db-collection/e2e/query-filter.ts
@@ -3,13 +3,13 @@
  * Uses expression helpers to implement proper predicate push-down
  */
 
-import { parseLoadSubsetOptions } from "@tanstack/db"
+import { parseLoadSubsetOptions } from '@tanstack/db'
 import type {
   IR,
   LoadSubsetOptions,
   ParsedOrderBy,
   SimpleComparison,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 const DEBUG_VERBOSE = process.env.DEBUG_QUERY_PUSH === `1`
 const DEBUG_SUMMARY =
@@ -39,13 +39,13 @@ const SIMPLE_OPERATORS = new Set([
  */
 export function buildQueryKey(
   namespace: string,
-  options: LoadSubsetOptions | undefined
+  options: LoadSubsetOptions | undefined,
 ) {
   return [`e2e`, namespace, serializeLoadSubsetOptions(options)]
 }
 
 export function serializeLoadSubsetOptions(
-  options: LoadSubsetOptions | undefined
+  options: LoadSubsetOptions | undefined,
 ): unknown {
   if (!options) {
     return null
@@ -69,6 +69,11 @@ export function serializeLoadSubsetOptions(
     result.limit = options.limit
   }
 
+  // Include offset for pagination support - different offsets need different query keys
+  if (options.offset !== undefined) {
+    result.offset = options.offset
+  }
+
   return JSON.stringify(Object.keys(result).length === 0 ? null : result)
 }
 
@@ -142,7 +147,7 @@ function serializeValue(value: unknown): unknown {
       Object.entries(value as Record<string, unknown>).map(([key, val]) => [
         key,
         serializeValue(val),
-      ])
+      ]),
     )
   }
 
@@ -152,17 +157,17 @@ function serializeValue(value: unknown): unknown {
 type Predicate<T> = (item: T) => boolean
 
 function isBasicExpression(
-  expr: IR.BasicExpression | null | undefined
+  expr: IR.BasicExpression | null | undefined,
 ): expr is IR.BasicExpression {
   return expr != null
 }
 
 /**
- * Apply LoadSubsetOptions to data (filter, sort, limit)
+ * Apply LoadSubsetOptions to data (filter, sort, limit, offset)
  */
 export function applyPredicates<T>(
   data: Array<T>,
-  options: LoadSubsetOptions | undefined
+  options: LoadSubsetOptions | undefined,
 ): Array<T> {
   if (!options) return data
 
@@ -172,6 +177,7 @@ export function applyPredicates<T>(
   let filters: Array<SimpleComparison> = []
   let sorts: Array<ParsedOrderBy> = []
   let limit: number | undefined = undefined
+  const offset = options.offset ?? 0
 
   // Check if where clause is simple before trying to parse
   const hasComplexWhere = options.where && !isSimpleExpression(options.where)
@@ -188,7 +194,7 @@ export function applyPredicates<T>(
       if (DEBUG_SUMMARY) {
         console.log(
           `[query-filter] parseLoadSubsetOptions failed unexpectedly`,
-          error
+          error,
         )
       }
       limit = options.limit
@@ -217,7 +223,7 @@ export function applyPredicates<T>(
 
     if (DEBUG_SUMMARY) {
       console.log(
-        `[query-filter] complex where clause detected, will filter using buildExpressionPredicate`
+        `[query-filter] complex where clause detected, will filter using buildExpressionPredicate`,
       )
     }
   }
@@ -232,6 +238,7 @@ export function applyPredicates<T>(
       expressionSummary: analysis,
       hasOrderBy: Boolean(orderBy),
       limit: rawLimit,
+      offset,
       filtersCount: filters.length,
       sortsCount: sorts.length,
       initialSize: data.length,
@@ -261,14 +268,16 @@ export function applyPredicates<T>(
     }
   }
 
-  // Apply LIMIT
-  // Note: offset is NOT applied here - it's handled by the live query windowing layer
-  // The limit passed here already accounts for offset (e.g., offset(20).limit(10) -> limit: 30)
-  if (limit !== undefined) {
-    result = result.slice(0, limit)
+  // Apply OFFSET and LIMIT
+  // For pagination: offset skips rows, limit caps the result
+  if (offset > 0 || limit !== undefined) {
+    const start = offset
+    const end = limit !== undefined ? offset + limit : undefined
+    result = result.slice(start, end)
     if (DEBUG_SUMMARY) {
-      console.log(`[query-filter] after limit`, {
+      console.log(`[query-filter] after offset/limit`, {
         size: result.length,
+        offset,
         limit,
       })
     }
@@ -286,7 +295,7 @@ export function applyPredicates<T>(
  */
 function buildFilterPredicate<T>(
   where: IR.BasicExpression<boolean> | undefined,
-  filters: Array<SimpleComparison>
+  filters: Array<SimpleComparison>,
 ): Predicate<T> | undefined {
   if (!where) {
     return undefined
@@ -310,7 +319,7 @@ function buildFilterPredicate<T>(
 }
 
 function buildSimplePredicate<T>(
-  filters: Array<SimpleComparison>
+  filters: Array<SimpleComparison>,
 ): Predicate<T> {
   return (item: T) =>
     filters.every((comparison) => evaluateSimpleComparison(comparison, item))
@@ -318,7 +327,7 @@ function buildSimplePredicate<T>(
 
 function evaluateSimpleComparison<T>(
   comparison: SimpleComparison,
-  item: T
+  item: T,
 ): boolean {
   const actualValue = getFieldValue(item, comparison.field)
   const expectedValue = comparison.value
@@ -363,7 +372,7 @@ function evaluateSimpleComparison<T>(
       return actualValue !== undefined
     default:
       throw new Error(
-        `Unsupported simple comparison operator: ${comparison.operator}`
+        `Unsupported simple comparison operator: ${comparison.operator}`,
       )
   }
 }
@@ -376,7 +385,7 @@ function isSimpleExpression(expr: IR.BasicExpression): boolean {
   if (expr.name === `and`) {
     return expr.args.every(
       (arg): arg is IR.BasicExpression =>
-        Boolean(arg) && arg.type === `func` && isSimpleExpression(arg)
+        Boolean(arg) && arg.type === `func` && isSimpleExpression(arg),
     )
   }
 
@@ -406,7 +415,7 @@ function isSimpleExpression(expr: IR.BasicExpression): boolean {
 }
 
 function buildExpressionPredicate<T>(
-  expr: IR.BasicExpression<boolean>
+  expr: IR.BasicExpression<boolean>,
 ): Predicate<T> {
   return (item: T) => Boolean(evaluateExpression(expr, item))
 }
@@ -520,7 +529,7 @@ function evaluateFunction(name: string, args: Array<any>): any {
 function evaluateLike(
   value: any,
   pattern: any,
-  caseInsensitive: boolean
+  caseInsensitive: boolean,
 ): boolean | null {
   // In 3-valued logic, if value or pattern is null/undefined, return UNKNOWN (null)
   if (
@@ -569,7 +578,7 @@ function compareValues(
   a: any,
   b: any,
   direction: `asc` | `desc`,
-  nulls?: `first` | `last`
+  nulls?: `first` | `last`,
 ): number {
   const aNull = a === null || a === undefined
   const bNull = b === null || b === undefined
diff --git a/packages/query-db-collection/e2e/query.e2e.test.ts b/packages/query-db-collection/e2e/query.e2e.test.ts
index 7b44be9f6..1bda6ce26 100644
--- a/packages/query-db-collection/e2e/query.e2e.test.ts
+++ b/packages/query-db-collection/e2e/query.e2e.test.ts
@@ -4,10 +4,10 @@
  * Tests using Query collections with mock backend
  */
 
-import { afterAll, afterEach, beforeAll, describe } from "vitest"
-import { createCollection } from "@tanstack/db"
-import { QueryClient } from "@tanstack/query-core"
-import { queryCollectionOptions } from "../src/query"
+import { afterAll, afterEach, beforeAll, describe } from 'vitest'
+import { createCollection } from '@tanstack/db'
+import { QueryClient } from '@tanstack/query-core'
+import { queryCollectionOptions } from '../src/query'
 import {
   createCollationTestSuite,
   createDeduplicationTestSuite,
@@ -17,14 +17,14 @@ import {
   createPaginationTestSuite,
   createPredicatesTestSuite,
   generateSeedData,
-} from "../../db-collection-e2e/src/index"
-import { applyPredicates, buildQueryKey } from "./query-filter"
+} from '../../db-collection-e2e/src/index'
+import { applyPredicates, buildQueryKey } from './query-filter'
 import type {
   Comment as E2EComment,
   Post as E2EPost,
   E2ETestConfig,
   User as E2EUser,
-} from "../../db-collection-e2e/src/types"
+} from '../../db-collection-e2e/src/types'
 
 describe(`Query Collection E2E Tests`, () => {
   let config: E2ETestConfig
@@ -55,7 +55,7 @@ describe(`Query Collection E2E Tests`, () => {
         },
         getKey: (item: E2EUser) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const eagerPosts = createCollection(
@@ -68,7 +68,7 @@ describe(`Query Collection E2E Tests`, () => {
         },
         getKey: (item: E2EPost) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const eagerComments = createCollection(
@@ -81,7 +81,7 @@ describe(`Query Collection E2E Tests`, () => {
         },
         getKey: (item: E2EComment) => item.id,
         startSync: true,
-      })
+      }),
     )
 
     const onDemandUsers = createCollection(
@@ -99,7 +99,7 @@ describe(`Query Collection E2E Tests`, () => {
         },
         getKey: (item: E2EUser) => item.id,
         startSync: false,
-      })
+      }),
     )
 
     const onDemandPosts = createCollection(
@@ -115,7 +115,7 @@ describe(`Query Collection E2E Tests`, () => {
         },
         getKey: (item: E2EPost) => item.id,
         startSync: false,
-      })
+      }),
     )
 
     const onDemandComments = createCollection(
@@ -131,7 +131,7 @@ describe(`Query Collection E2E Tests`, () => {
         },
         getKey: (item: E2EComment) => item.id,
         startSync: false,
-      })
+      }),
     )
 
     // Wait for eager collections to load
diff --git a/packages/query-db-collection/package.json b/packages/query-db-collection/package.json
index 43124de0a..0068c3a2d 100644
--- a/packages/query-db-collection/package.json
+++ b/packages/query-db-collection/package.json
@@ -1,15 +1,32 @@
 {
   "name": "@tanstack/query-db-collection",
+  "version": "1.0.11",
   "description": "TanStack Query collection for TanStack DB",
-  "version": "1.0.5",
-  "dependencies": {
-    "@standard-schema/spec": "^1.0.0",
-    "@tanstack/db": "workspace:*"
+  "author": "Kyle Mathews",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TanStack/db.git",
+    "directory": "packages/query-db-collection"
   },
-  "devDependencies": {
-    "@tanstack/query-core": "^5.90.11",
-    "@vitest/coverage-istanbul": "^3.2.4"
+  "homepage": "https://tanstack.com/db",
+  "keywords": [
+    "query",
+    "tanstack",
+    "optimistic",
+    "typescript"
+  ],
+  "scripts": {
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "lint": "eslint . --fix",
+    "test": "vitest run",
+    "test:e2e": "vitest run --config vitest.e2e.config.ts"
   },
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -23,39 +40,21 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
-  "packageManager": "pnpm@10.24.0",
+  "dependencies": {
+    "@standard-schema/spec": "^1.0.0",
+    "@tanstack/db": "workspace:*"
+  },
   "peerDependencies": {
     "@tanstack/query-core": "^5.0.0",
     "typescript": ">=4.7"
   },
-  "author": "Kyle Mathews",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/TanStack/db.git",
-    "directory": "packages/query-db-collection"
-  },
-  "homepage": "https://tanstack.com/db",
-  "keywords": [
-    "query",
-    "tanstack",
-    "optimistic",
-    "typescript"
-  ],
-  "scripts": {
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "lint": "eslint . --fix",
-    "test": "npx vitest run",
-    "test:e2e": "npx vitest run --config vitest.e2e.config.ts"
-  },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@tanstack/query-core": "^5.90.12",
+    "@vitest/coverage-istanbul": "^3.2.4"
+  }
 }
diff --git a/packages/query-db-collection/src/errors.ts b/packages/query-db-collection/src/errors.ts
index d14e69ff0..722474525 100644
--- a/packages/query-db-collection/src/errors.ts
+++ b/packages/query-db-collection/src/errors.ts
@@ -1,4 +1,4 @@
-import { TanStackDBError } from "@tanstack/db"
+import { TanStackDBError } from '@tanstack/db'
 
 // Query Collection Errors
 export class QueryCollectionError extends TanStackDBError {
@@ -39,7 +39,7 @@ export class GetKeyRequiredError extends QueryCollectionError {
 export class SyncNotInitializedError extends QueryCollectionError {
   constructor() {
     super(
-      `Collection must be in 'ready' state for manual sync operations. Sync not initialized yet.`
+      `Collection must be in 'ready' state for manual sync operations. Sync not initialized yet.`,
     )
     this.name = `SyncNotInitializedError`
   }
diff --git a/packages/query-db-collection/src/global.ts b/packages/query-db-collection/src/global.ts
index efb95561f..281ed99b4 100644
--- a/packages/query-db-collection/src/global.ts
+++ b/packages/query-db-collection/src/global.ts
@@ -10,7 +10,7 @@
  * users to manually import QueryCollectionMeta.
  */
 
-import type { LoadSubsetOptions } from "@tanstack/db"
+import type { LoadSubsetOptions } from '@tanstack/db'
 
 /**
  * Base interface for Query Collection meta properties.
@@ -33,7 +33,7 @@ export interface QueryCollectionMeta extends Record<string, unknown> {
 
 // Module augmentation to extend TanStack Query's Register interface
 // This ensures that ctx.meta always includes loadSubsetOptions
-declare module "@tanstack/query-core" {
+declare module '@tanstack/query-core' {
   interface Register {
     queryMeta: QueryCollectionMeta
   }
diff --git a/packages/query-db-collection/src/index.ts b/packages/query-db-collection/src/index.ts
index 0ecb54133..14a5fe702 100644
--- a/packages/query-db-collection/src/index.ts
+++ b/packages/query-db-collection/src/index.ts
@@ -1,15 +1,15 @@
 // Export QueryCollectionMeta from global.ts
 // This ensures the module augmentation in global.ts is processed by TypeScript
-export type { QueryCollectionMeta } from "./global"
+export type { QueryCollectionMeta } from './global'
 
 export {
   queryCollectionOptions,
   type QueryCollectionConfig,
   type QueryCollectionUtils,
   type SyncOperation,
-} from "./query"
+} from './query'
 
-export * from "./errors"
+export * from './errors'
 
 // Re-export expression helpers from @tanstack/db
 export {
@@ -24,4 +24,4 @@ export {
   type SimpleComparison,
   type ParseWhereOptions,
   type ParsedOrderBy,
-} from "@tanstack/db"
+} from '@tanstack/db'
diff --git a/packages/query-db-collection/src/manual-sync.ts b/packages/query-db-collection/src/manual-sync.ts
index e9686789a..b772550e3 100644
--- a/packages/query-db-collection/src/manual-sync.ts
+++ b/packages/query-db-collection/src/manual-sync.ts
@@ -3,9 +3,9 @@ import {
   DuplicateKeyInBatchError,
   SyncNotInitializedError,
   UpdateOperationItemNotFoundError,
-} from "./errors"
-import type { QueryClient } from "@tanstack/query-core"
-import type { ChangeMessage, Collection } from "@tanstack/db"
+} from './errors'
+import type { QueryClient } from '@tanstack/query-core'
+import type { ChangeMessage, Collection } from '@tanstack/db'
 
 // Track active batch operations per context to prevent cross-collection contamination
 const activeBatchContexts = new WeakMap<
@@ -38,6 +38,12 @@ export interface SyncContext<
   begin: () => void
   write: (message: Omit<ChangeMessage<TRow>, `key`>) => void
   commit: () => void
+  /**
+   * Optional function to update the query cache with the latest synced data.
+   * Handles both direct array caches and wrapped response formats (when `select` is used).
+   * If not provided, falls back to directly setting the cache with the raw array.
+   */
+  updateCacheData?: (items: Array<TRow>) => void
 }
 
 interface NormalizedOperation<
@@ -58,7 +64,7 @@ function normalizeOperations<
   ops:
     | SyncOperation<TRow, TKey, TInsertInput>
     | Array<SyncOperation<TRow, TKey, TInsertInput>>,
-  ctx: SyncContext<TRow, TKey>
+  ctx: SyncContext<TRow, TKey>,
 ): Array<NormalizedOperation<TRow, TKey>> {
   const operations = Array.isArray(ops) ? ops : [ops]
   const normalized: Array<NormalizedOperation<TRow, TKey>> = []
@@ -80,7 +86,7 @@ function normalizeOperations<
           // For insert/upsert, validate and resolve the full item first
           const resolved = ctx.collection.validateData(
             item,
-            op.type === `upsert` ? `insert` : op.type
+            op.type === `upsert` ? `insert` : op.type,
           )
           key = ctx.getKey(resolved)
         }
@@ -98,7 +104,7 @@ function validateOperations<
   TKey extends string | number = string | number,
 >(
   operations: Array<NormalizedOperation<TRow, TKey>>,
-  ctx: SyncContext<TRow, TKey>
+  ctx: SyncContext<TRow, TKey>,
 ): void {
   const seenKeys = new Set<TKey>()
 
@@ -133,7 +139,7 @@ export function performWriteOperations<
   operations:
     | SyncOperation<TRow, TKey, TInsertInput>
     | Array<SyncOperation<TRow, TKey, TInsertInput>>,
-  ctx: SyncContext<TRow, TKey>
+  ctx: SyncContext<TRow, TKey>,
 ): void {
   const normalized = normalizeOperations(operations, ctx)
   validateOperations(normalized, ctx)
@@ -160,7 +166,7 @@ export function performWriteOperations<
         const resolved = ctx.collection.validateData(
           updatedItem,
           `update`,
-          op.key
+          op.key,
         )
         ctx.write({
           type: `update`,
@@ -183,7 +189,7 @@ export function performWriteOperations<
         const resolved = ctx.collection.validateData(
           op.data,
           existsInSyncedStore ? `update` : `insert`,
-          op.key
+          op.key,
         )
         if (existsInSyncedStore) {
           ctx.write({
@@ -205,7 +211,12 @@ export function performWriteOperations<
 
   // Update query cache after successful commit
   const updatedData = Array.from(ctx.collection._state.syncedData.values())
-  ctx.queryClient.setQueryData(ctx.queryKey, updatedData)
+  if (ctx.updateCacheData) {
+    ctx.updateCacheData(updatedData)
+  } else {
+    // Fallback: directly set the cache with raw array (for non-Query Collection consumers)
+    ctx.queryClient.setQueryData(ctx.queryKey, updatedData)
+  }
 }
 
 // Factory function to create write utils
@@ -300,7 +311,7 @@ export function createWriteUtils<
       const existingBatch = activeBatchContexts.get(ctx)
       if (existingBatch?.isActive) {
         throw new Error(
-          `Cannot nest writeBatch calls. Complete the current batch before starting a new one.`
+          `Cannot nest writeBatch calls. Complete the current batch before starting a new one.`,
         )
       }
 
@@ -326,7 +337,7 @@ export function createWriteUtils<
           typeof result.then === `function`
         ) {
           throw new Error(
-            `writeBatch does not support async callbacks. The callback must be synchronous.`
+            `writeBatch does not support async callbacks. The callback must be synchronous.`,
           )
         }
 
diff --git a/packages/query-db-collection/src/query.ts b/packages/query-db-collection/src/query.ts
index 8b98ec570..4cbdae5a2 100644
--- a/packages/query-db-collection/src/query.ts
+++ b/packages/query-db-collection/src/query.ts
@@ -1,12 +1,13 @@
-import { QueryObserver, hashKey } from "@tanstack/query-core"
+import { QueryObserver, hashKey } from '@tanstack/query-core'
+import { deepEquals } from '@tanstack/db'
 import {
   GetKeyRequiredError,
   QueryClientRequiredError,
   QueryFnRequiredError,
   QueryKeyRequiredError,
-} from "./errors"
-import { createWriteUtils } from "./manual-sync"
-import { serializeLoadSubsetOptions } from "./serialization"
+} from './errors'
+import { createWriteUtils } from './manual-sync'
+import { serializeLoadSubsetOptions } from './serialization'
 import type {
   BaseCollectionConfig,
   ChangeMessage,
@@ -17,7 +18,7 @@ import type {
   SyncConfig,
   UpdateMutationFnParams,
   UtilsRecord,
-} from "@tanstack/db"
+} from '@tanstack/db'
 import type {
   FetchStatus,
   QueryClient,
@@ -25,11 +26,11 @@ import type {
   QueryKey,
   QueryObserverOptions,
   QueryObserverResult,
-} from "@tanstack/query-core"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from '@tanstack/query-core'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 // Re-export for external use
-export type { SyncOperation } from "./manual-sync"
+export type { SyncOperation } from './manual-sync'
 
 // Schema output type inference helper (matches electric.ts pattern)
 type InferSchemaOutput<T> = T extends StandardSchemaV1
@@ -59,7 +60,7 @@ type TQueryKeyBuilder<TQueryKey> = (opts: LoadSubsetOptions) => TQueryKey
 export interface QueryCollectionConfig<
   T extends object = object,
   TQueryFn extends (context: QueryFunctionContext<any>) => Promise<any> = (
-    context: QueryFunctionContext<any>
+    context: QueryFunctionContext<any>,
   ) => Promise<any>,
   TError = unknown,
   TQueryKey extends QueryKey = QueryKey,
@@ -71,7 +72,7 @@ export interface QueryCollectionConfig<
   queryKey: TQueryKey | TQueryKeyBuilder<TQueryKey>
   /** Function that fetches data from the server. Must return the complete collection state */
   queryFn: TQueryFn extends (
-    context: QueryFunctionContext<TQueryKey>
+    context: QueryFunctionContext<TQueryKey>,
   ) => Promise<Array<any>>
     ? (context: QueryFunctionContext<TQueryKey>) => Promise<Array<T>>
     : TQueryFn
@@ -231,7 +232,7 @@ class QueryCollectionUtilsImpl {
   constructor(
     state: QueryCollectionState,
     refetch: RefetchFn,
-    writeUtils: ReturnType<typeof createWriteUtils>
+    writeUtils: ReturnType<typeof createWriteUtils>,
   ) {
     this.state = state
     this.refetchFn = refetch
@@ -269,21 +270,21 @@ class QueryCollectionUtilsImpl {
   public get isFetching() {
     // check if any observer is fetching
     return Array.from(this.state.observers.values()).some(
-      (observer) => observer.getCurrentResult().isFetching
+      (observer) => observer.getCurrentResult().isFetching,
     )
   }
 
   public get isRefetching() {
     // check if any observer is refetching
     return Array.from(this.state.observers.values()).some(
-      (observer) => observer.getCurrentResult().isRefetching
+      (observer) => observer.getCurrentResult().isRefetching,
     )
   }
 
   public get isLoading() {
     // check if any observer is loading
     return Array.from(this.state.observers.values()).some(
-      (observer) => observer.getCurrentResult().isLoading
+      (observer) => observer.getCurrentResult().isLoading,
     )
   }
 
@@ -292,14 +293,14 @@ class QueryCollectionUtilsImpl {
     return Math.max(
       0,
       ...Array.from(this.state.observers.values()).map(
-        (observer) => observer.getCurrentResult().dataUpdatedAt
-      )
+        (observer) => observer.getCurrentResult().dataUpdatedAt,
+      ),
     )
   }
 
   public get fetchStatus(): Array<FetchStatus> {
     return Array.from(this.state.observers.values()).map(
-      (observer) => observer.getCurrentResult().fetchStatus
+      (observer) => observer.getCurrentResult().fetchStatus,
     )
   }
 }
@@ -408,7 +409,7 @@ export function queryCollectionOptions<
   > & {
     schema: T
     select: (data: TQueryData) => Array<InferSchemaInput<T>>
-  }
+  },
 ): CollectionConfig<
   InferSchemaOutput<T>,
   TKey,
@@ -428,7 +429,7 @@ export function queryCollectionOptions<
 export function queryCollectionOptions<
   T extends object,
   TQueryFn extends (context: QueryFunctionContext<any>) => Promise<any> = (
-    context: QueryFunctionContext<any>
+    context: QueryFunctionContext<any>,
   ) => Promise<any>,
   TError = unknown,
   TQueryKey extends QueryKey = QueryKey,
@@ -446,7 +447,7 @@ export function queryCollectionOptions<
   > & {
     schema?: never // prohibit schema
     select: (data: TQueryData) => Array<T>
-  }
+  },
 ): CollectionConfig<
   T,
   TKey,
@@ -467,7 +468,7 @@ export function queryCollectionOptions<
   config: QueryCollectionConfig<
     InferSchemaOutput<T>,
     (
-      context: QueryFunctionContext<any>
+      context: QueryFunctionContext<any>,
     ) => Promise<Array<InferSchemaOutput<T>>>,
     TError,
     TQueryKey,
@@ -475,7 +476,7 @@ export function queryCollectionOptions<
     T
   > & {
     schema: T
-  }
+  },
 ): CollectionConfig<
   InferSchemaOutput<T>,
   TKey,
@@ -506,7 +507,7 @@ export function queryCollectionOptions<
     TKey
   > & {
     schema?: never // prohibit schema
-  }
+  },
 ): CollectionConfig<
   T,
   TKey,
@@ -518,7 +519,7 @@ export function queryCollectionOptions<
 }
 
 export function queryCollectionOptions(
-  config: QueryCollectionConfig<Record<string, unknown>>
+  config: QueryCollectionConfig<Record<string, unknown>>,
 ): CollectionConfig<
   Record<string, unknown>,
   string | number,
@@ -662,7 +663,7 @@ export function queryCollectionOptions(
 
     const createQueryFromOpts = (
       opts: LoadSubsetOptions = {},
-      queryFunction: typeof queryFn = queryFn
+      queryFunction: typeof queryFn = queryFn,
     ): true | Promise<void> => {
       // Generate key using common function
       const key = generateQueryKeyFromOptions(opts)
@@ -674,7 +675,7 @@ export function queryCollectionOptions(
         // Increment reference count since another consumer is using this observer
         queryRefCounts.set(
           hashedQueryKey,
-          (queryRefCounts.get(hashedQueryKey) || 0) + 1
+          (queryRefCounts.get(hashedQueryKey) || 0) + 1,
         )
 
         // Get the current result and return based on its state
@@ -738,7 +739,7 @@ export function queryCollectionOptions(
       // Increment reference count for this query
       queryRefCounts.set(
         hashedQueryKey,
-        (queryRefCounts.get(hashedQueryKey) || 0) + 1
+        (queryRefCounts.get(hashedQueryKey) || 0) + 1,
       )
 
       // Create a promise that resolves when the query result is first available
@@ -789,7 +790,7 @@ export function queryCollectionOptions(
           }
 
           const currentSyncedItems: Map<string | number, any> = new Map(
-            collection._state.syncedData.entries()
+            collection._state.syncedData.entries(),
           )
           const newItemsMap = new Map<string | number, any>()
           newItemsArray.forEach((item) => {
@@ -799,26 +800,6 @@ export function queryCollectionOptions(
 
           begin()
 
-          // Helper function for shallow equality check of objects
-          const shallowEqual = (
-            obj1: Record<string, any>,
-            obj2: Record<string, any>
-          ): boolean => {
-            // Get all keys from both objects
-            const keys1 = Object.keys(obj1)
-            const keys2 = Object.keys(obj2)
-
-            // If number of keys is different, objects are not equal
-            if (keys1.length !== keys2.length) return false
-
-            // Check if all keys in obj1 have the same values in obj2
-            return keys1.every((key) => {
-              // Skip comparing functions and complex objects deeply
-              if (typeof obj1[key] === `function`) return true
-              return obj1[key] === obj2[key]
-            })
-          }
-
           currentSyncedItems.forEach((oldItem, key) => {
             const newItem = newItemsMap.get(key)
             if (!newItem) {
@@ -826,12 +807,7 @@ export function queryCollectionOptions(
               if (needToRemove) {
                 write({ type: `delete`, value: oldItem })
               }
-            } else if (
-              !shallowEqual(
-                oldItem as Record<string, any>,
-                newItem as Record<string, any>
-              )
-            ) {
+            } else if (!deepEquals(oldItem, newItem)) {
               // Only update if there are actual differences in the properties
               write({ type: `update`, value: newItem })
             }
@@ -857,7 +833,7 @@ export function queryCollectionOptions(
 
           console.error(
             `[QueryCollection] Error observing query ${String(queryKey)}:`,
-            result.error
+            result.error,
           )
 
           // Mark collection as ready even on error to avoid blocking apps
@@ -873,7 +849,7 @@ export function queryCollectionOptions(
 
     const subscribeToQuery = (
       observer: QueryObserver<Array<any>, any, Array<any>, Array<any>, any>,
-      hashedQueryKey: string
+      hashedQueryKey: string,
     ) => {
       if (!isSubscribed(hashedQueryKey)) {
         const cachedQueryKey = hashToQueryKey.get(hashedQueryKey)!
@@ -913,7 +889,7 @@ export function queryCollectionOptions(
         } else if (subscriberCount === 0) {
           unsubscribeFromQueries()
         }
-      }
+      },
     )
 
     // If syncMode is eager, create the initial query without any predicates
@@ -1013,7 +989,7 @@ export function queryCollectionOptions(
       if (refcount > 0) {
         console.warn(
           `[cleanupQueryIfIdle] Invariant violation: refcount=${refcount} but no listeners. Cleaning up to prevent leak.`,
-          { hashedQueryKey }
+          { hashedQueryKey },
         )
       }
 
@@ -1064,7 +1040,7 @@ export function queryCollectionOptions(
         allQueryKeys.map(async (qKey) => {
           await queryClient.cancelQueries({ queryKey: qKey, exact: true })
           queryClient.removeQueries({ queryKey: qKey, exact: true })
-        })
+        }),
       )
     }
 
@@ -1154,6 +1130,73 @@ export function queryCollectionOptions(
     await Promise.all(refetchPromises)
   }
 
+  /**
+   * Updates the query cache with new items, handling both direct arrays
+   * and wrapped response formats (when `select` is used).
+   */
+  const updateCacheData = (items: Array<any>): void => {
+    // Get the base query key (handle both static and function-based keys)
+    const key =
+      typeof queryKey === `function`
+        ? queryKey({})
+        : (queryKey as unknown as QueryKey)
+
+    if (select) {
+      // When `select` is used, the cache contains a wrapped response (e.g., { data: [...], meta: {...} })
+      // We need to update the cache while preserving the wrapper structure
+      queryClient.setQueryData(key, (oldData: any) => {
+        if (!oldData || typeof oldData !== `object`) {
+          // No existing cache or not an object - don't corrupt the cache
+          return oldData
+        }
+
+        if (Array.isArray(oldData)) {
+          // Cache is already a raw array (shouldn't happen with select, but handle it)
+          return items
+        }
+
+        // Use the select function to identify which property contains the items array.
+        // This is more robust than guessing based on property order.
+        const selectedArray = select(oldData)
+
+        if (Array.isArray(selectedArray)) {
+          // Find the property that matches the selected array by reference equality
+          for (const propKey of Object.keys(oldData)) {
+            if (oldData[propKey] === selectedArray) {
+              // Found the exact property - create a shallow copy with updated items
+              return { ...oldData, [propKey]: items }
+            }
+          }
+        }
+
+        // Fallback: check common property names used for data arrays
+        if (Array.isArray(oldData.data)) {
+          return { ...oldData, data: items }
+        }
+        if (Array.isArray(oldData.items)) {
+          return { ...oldData, items: items }
+        }
+        if (Array.isArray(oldData.results)) {
+          return { ...oldData, results: items }
+        }
+
+        // Last resort: find first array property
+        for (const propKey of Object.keys(oldData)) {
+          if (Array.isArray(oldData[propKey])) {
+            return { ...oldData, [propKey]: items }
+          }
+        }
+
+        // Couldn't safely identify the array property - don't corrupt the cache
+        // Return oldData unchanged to avoid breaking select
+        return oldData
+      })
+    } else {
+      // No select - cache contains raw array, just set it directly
+      queryClient.setQueryData(key, items)
+    }
+  }
+
   // Create write context for manual write operations
   let writeContext: {
     collection: any
@@ -1163,21 +1206,29 @@ export function queryCollectionOptions(
     begin: () => void
     write: (message: Omit<ChangeMessage<any>, `key`>) => void
     commit: () => void
+    updateCacheData?: (items: Array<any>) => void
   } | null = null
 
   // Enhanced internalSync that captures write functions for manual use
   const enhancedInternalSync: SyncConfig<any>[`sync`] = (params) => {
     const { begin, write, commit, collection } = params
 
+    // Get the base query key for the context (handle both static and function-based keys)
+    const contextQueryKey =
+      typeof queryKey === `function`
+        ? (queryKey({}) as unknown as Array<unknown>)
+        : (queryKey as unknown as Array<unknown>)
+
     // Store references for manual write operations
     writeContext = {
       collection,
       queryClient,
-      queryKey: queryKey as unknown as Array<unknown>,
+      queryKey: contextQueryKey,
       getKey: getKey as (item: any) => string | number,
       begin,
       write,
       commit,
+      updateCacheData,
     }
 
     // Call the original internalSync logic
@@ -1186,7 +1237,7 @@ export function queryCollectionOptions(
 
   // Create write utils using the manual-sync module
   const writeUtils = createWriteUtils<any, string | number, any>(
-    () => writeContext
+    () => writeContext,
   )
 
   // Create wrapper handlers for direct persistence operations that handle refetching
diff --git a/packages/query-db-collection/src/serialization.ts b/packages/query-db-collection/src/serialization.ts
index ba22dc75a..9849c4bd3 100644
--- a/packages/query-db-collection/src/serialization.ts
+++ b/packages/query-db-collection/src/serialization.ts
@@ -1,11 +1,13 @@
-import type { IR, LoadSubsetOptions } from "@tanstack/db"
+import type { IR, LoadSubsetOptions } from '@tanstack/db'
 
 /**
- * Serializes LoadSubsetOptions into a stable, hashable format for query keys
+ * Serializes LoadSubsetOptions into a stable, hashable format for query keys.
+ * Includes where, orderBy, limit, and offset for pagination support.
+ * Note: cursor expressions are not serialized as they are backend-specific.
  * @internal
  */
 export function serializeLoadSubsetOptions(
-  options: LoadSubsetOptions | undefined
+  options: LoadSubsetOptions | undefined,
 ): string | undefined {
   if (!options) {
     return undefined
@@ -43,6 +45,11 @@ export function serializeLoadSubsetOptions(
     result.limit = options.limit
   }
 
+  // Include offset for pagination support
+  if (options.offset !== undefined) {
+    result.offset = options.offset
+  }
+
   return Object.keys(result).length === 0 ? undefined : JSON.stringify(result)
 }
 
@@ -120,7 +127,7 @@ function serializeValue(value: unknown): unknown {
       Object.entries(value as Record<string, unknown>).map(([key, val]) => [
         key,
         serializeValue(val),
-      ])
+      ]),
     )
   }
 
diff --git a/packages/query-db-collection/tests/query.test-d.ts b/packages/query-db-collection/tests/query.test-d.ts
index e299615ef..8481021eb 100644
--- a/packages/query-db-collection/tests/query.test-d.ts
+++ b/packages/query-db-collection/tests/query.test-d.ts
@@ -1,4 +1,4 @@
-import { describe, expectTypeOf, it } from "vitest"
+import { describe, expectTypeOf, it } from 'vitest'
 import {
   and,
   createCollection,
@@ -6,17 +6,17 @@ import {
   eq,
   gt,
   parseLoadSubsetOptions,
-} from "@tanstack/db"
-import { QueryClient } from "@tanstack/query-core"
-import { z } from "zod"
-import { queryCollectionOptions } from "../src/query"
-import type { QueryCollectionConfig, QueryCollectionUtils } from "../src/query"
+} from '@tanstack/db'
+import { QueryClient } from '@tanstack/query-core'
+import { z } from 'zod'
+import { queryCollectionOptions } from '../src/query'
+import type { QueryCollectionConfig, QueryCollectionUtils } from '../src/query'
 import type {
   DeleteMutationFnParams,
   InsertMutationFnParams,
   LoadSubsetOptions,
   UpdateMutationFnParams,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 describe(`Query collection type resolution tests`, () => {
   // Define test types
@@ -48,21 +48,21 @@ describe(`Query collection type resolution tests`, () => {
       onInsert: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve()
       },
       onUpdate: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].modified
+          params.transaction.mutations[0].modified,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve()
       },
       onDelete: (params) => {
         // Verify that the mutation value has the correct type
         expectTypeOf(
-          params.transaction.mutations[0].original
+          params.transaction.mutations[0].original,
         ).toEqualTypeOf<ExplicitType>()
         return Promise.resolve()
       },
@@ -440,7 +440,7 @@ describe(`Query collection type resolution tests`, () => {
           // Verify that loadSubsetOptions is assignable to LoadSubsetOptions
           // This ensures it can be used where LoadSubsetOptions is expected
           expectTypeOf(
-            ctx.meta!.loadSubsetOptions
+            ctx.meta!.loadSubsetOptions,
           ).toExtend<LoadSubsetOptions>()
           // so that parseLoadSubsetOptions can be called without type errors
           parseLoadSubsetOptions(ctx.meta?.loadSubsetOptions)
@@ -476,7 +476,7 @@ describe(`Query collection type resolution tests`, () => {
 
           // Verify the assignment worked (this will fail at compile time if types don't match)
           expectTypeOf(
-            typedMeta.loadSubsetOptions
+            typedMeta.loadSubsetOptions,
           ).toExtend<LoadSubsetOptions>()
 
           return Promise.resolve([])
diff --git a/packages/query-db-collection/tests/query.test.ts b/packages/query-db-collection/tests/query.test.ts
index 0c4408646..1845641aa 100644
--- a/packages/query-db-collection/tests/query.test.ts
+++ b/packages/query-db-collection/tests/query.test.ts
@@ -1,22 +1,22 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import { QueryClient } from "@tanstack/query-core"
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { QueryClient } from '@tanstack/query-core'
 import {
   createCollection,
   createLiveQueryCollection,
   eq,
   ilike,
   or,
-} from "@tanstack/db"
-import { queryCollectionOptions } from "../src/query"
-import type { QueryFunctionContext } from "@tanstack/query-core"
+} from '@tanstack/db'
+import { queryCollectionOptions } from '../src/query'
+import type { QueryFunctionContext } from '@tanstack/query-core'
 import type {
   Collection,
   DeleteMutationFnParams,
   InsertMutationFnParams,
   TransactionWithMutations,
   UpdateMutationFnParams,
-} from "@tanstack/db"
-import type { QueryCollectionConfig, QueryCollectionUtils } from "../src/query"
+} from '@tanstack/db'
+import type { QueryCollectionConfig, QueryCollectionUtils } from '../src/query'
 
 interface TestItem {
   id: string
@@ -87,7 +87,7 @@ describe(`QueryCollection`, () => {
       {
         timeout: 1000, // Give it a reasonable timeout
         interval: 50, // Check frequently
-      }
+      },
     )
 
     // Additional wait for internal processing if necessary
@@ -192,7 +192,7 @@ describe(`QueryCollection`, () => {
       .mockImplementation(() => {})
 
     const queryFn: (
-      context: QueryFunctionContext<any>
+      context: QueryFunctionContext<any>,
     ) => Promise<Array<TestItem>> = vi
       .fn()
       .mockResolvedValueOnce([initialItem])
@@ -225,7 +225,7 @@ describe(`QueryCollection`, () => {
 
     // Verify the error was logged correctly
     const errorCallArgs = consoleErrorSpy.mock.calls.find((call) =>
-      call[0].includes(`[QueryCollection] Error observing query`)
+      call[0].includes(`[QueryCollection] Error observing query`),
     )
     expect(errorCallArgs).toBeDefined()
     expect(errorCallArgs?.[1]).toBe(testError)
@@ -246,7 +246,7 @@ describe(`QueryCollection`, () => {
 
     // Mock queryFn to return invalid data (not an array of objects)
     const queryFn: (
-      context: QueryFunctionContext<any>
+      context: QueryFunctionContext<any>,
     ) => Promise<Array<TestItem>> = vi
       .fn()
       .mockResolvedValue(`not an array` as any)
@@ -270,8 +270,8 @@ describe(`QueryCollection`, () => {
     await vi.waitFor(() => {
       const errorCallArgs = consoleErrorSpy.mock.calls.find((call) =>
         call[0].includes(
-          `@tanstack/query-db-collection: queryFn must return an array of objects`
-        )
+          `@tanstack/query-db-collection: queryFn must return an array of objects`,
+        ),
       )
       expect(errorCallArgs).toBeDefined()
     })
@@ -291,7 +291,7 @@ describe(`QueryCollection`, () => {
     // Second query returns a new object with the same properties (different reference)
     // Third query returns an object with an actual change
     const queryFn: (
-      context: QueryFunctionContext<any>
+      context: QueryFunctionContext<any>,
     ) => Promise<Array<TestItem>> = vi
       .fn()
       .mockResolvedValueOnce([initialItem])
@@ -445,7 +445,7 @@ describe(`QueryCollection`, () => {
 
     // Verify queryFn was called with the correct context, including the meta object
     expect(queryFn).toHaveBeenCalledWith(
-      expect.objectContaining({ meta: { ...meta, loadSubsetOptions: {} } })
+      expect.objectContaining({ meta: { ...meta, loadSubsetOptions: {} } }),
     )
   })
 
@@ -505,7 +505,7 @@ describe(`QueryCollection`, () => {
               }),
             }),
           }),
-        })
+        }),
       )
     })
 
@@ -566,7 +566,7 @@ describe(`QueryCollection`, () => {
               }),
             }),
           }),
-        })
+        }),
       )
     })
   })
@@ -651,8 +651,8 @@ describe(`QueryCollection`, () => {
       await vi.waitFor(() => {
         const errorCallArgs = consoleErrorSpy.mock.calls.find((call) =>
           call[0].includes(
-            `@tanstack/query-db-collection: select() must return an array of objects`
-          )
+            `@tanstack/query-db-collection: select() must return an array of objects`,
+          ),
         )
         expect(errorCallArgs).toBeDefined()
       })
@@ -688,10 +688,183 @@ describe(`QueryCollection`, () => {
 
       // Verify that the query cache state exists along with its metadata
       const initialCache = queryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as MetaDataType<TestItem>
       expect(initialCache).toEqual(initialMetaData)
     })
+
+    it(`should not throw error when using writeInsert with select option`, async () => {
+      const queryKey = [`select-writeInsert-test`]
+      const consoleErrorSpy = vi
+        .spyOn(console, `error`)
+        .mockImplementation(() => {})
+
+      const queryFn = vi.fn().mockResolvedValue(initialMetaData)
+      const select = vi.fn((data: MetaDataType<TestItem>) => data.data)
+
+      const options = queryCollectionOptions({
+        id: `select-writeInsert-test`,
+        queryClient,
+        queryKey,
+        queryFn,
+        select,
+        getKey,
+        startSync: true,
+      })
+      const collection = createCollection(options)
+
+      // Wait for collection to be ready
+      await vi.waitFor(() => {
+        expect(collection.status).toBe(`ready`)
+        expect(collection.size).toBe(2)
+      })
+
+      // This should NOT cause an error - but with the bug it does
+      const newItem: TestItem = { id: `3`, name: `New Item` }
+      collection.utils.writeInsert(newItem)
+
+      // Verify the item was inserted
+      expect(collection.size).toBe(3)
+      expect(collection.get(`3`)).toEqual(newItem)
+
+      // Wait a tick to allow any async error handlers to run
+      await flushPromises()
+
+      // Verify no error was logged about select returning non-array
+      const errorCallArgs = consoleErrorSpy.mock.calls.find((call) =>
+        call[0]?.includes?.(
+          `@tanstack/query-db-collection: select() must return an array of objects`,
+        ),
+      )
+      expect(errorCallArgs).toBeUndefined()
+
+      consoleErrorSpy.mockRestore()
+    })
+
+    it(`should not throw error when using writeUpsert with select option`, async () => {
+      const queryKey = [`select-writeUpsert-test`]
+      const consoleErrorSpy = vi
+        .spyOn(console, `error`)
+        .mockImplementation(() => {})
+
+      const queryFn = vi.fn().mockResolvedValue(initialMetaData)
+      const select = vi.fn((data: MetaDataType<TestItem>) => data.data)
+
+      const options = queryCollectionOptions({
+        id: `select-writeUpsert-test`,
+        queryClient,
+        queryKey,
+        queryFn,
+        select,
+        getKey,
+        startSync: true,
+      })
+      const collection = createCollection(options)
+
+      // Wait for collection to be ready
+      await vi.waitFor(() => {
+        expect(collection.status).toBe(`ready`)
+        expect(collection.size).toBe(2)
+      })
+
+      // This should NOT cause an error - but with the bug it does
+      // Test upsert for new item
+      const newItem: TestItem = { id: `3`, name: `Upserted New Item` }
+      collection.utils.writeUpsert(newItem)
+
+      // Verify the item was inserted
+      expect(collection.size).toBe(3)
+      expect(collection.get(`3`)).toEqual(newItem)
+
+      // Test upsert for existing item
+      collection.utils.writeUpsert({ id: `1`, name: `Updated First Item` })
+
+      // Verify the item was updated
+      expect(collection.get(`1`)?.name).toBe(`Updated First Item`)
+
+      // Wait a tick to allow any async error handlers to run
+      await flushPromises()
+
+      // Verify no error was logged about select returning non-array
+      const errorCallArgs = consoleErrorSpy.mock.calls.find((call) =>
+        call[0]?.includes?.(
+          `@tanstack/query-db-collection: select() must return an array of objects`,
+        ),
+      )
+      expect(errorCallArgs).toBeUndefined()
+
+      consoleErrorSpy.mockRestore()
+    })
+
+    it(`should update query cache with wrapped format preserved when using writeInsert with select option`, async () => {
+      const queryKey = [`select-cache-update-test`]
+
+      const queryFn = vi.fn().mockResolvedValue(initialMetaData)
+      const select = vi.fn((data: MetaDataType<TestItem>) => data.data)
+
+      const options = queryCollectionOptions({
+        id: `select-cache-update-test`,
+        queryClient,
+        queryKey,
+        queryFn,
+        select,
+        getKey,
+        startSync: true,
+      })
+      const collection = createCollection(options)
+
+      // Wait for collection to be ready
+      await vi.waitFor(() => {
+        expect(collection.status).toBe(`ready`)
+        expect(collection.size).toBe(2)
+      })
+
+      // Verify initial cache has wrapped format
+      const initialCache = queryClient.getQueryData(
+        queryKey,
+      ) as MetaDataType<TestItem>
+      expect(initialCache.metaDataOne).toBe(`example metadata`)
+      expect(initialCache.metaDataTwo).toBe(`example metadata`)
+      expect(initialCache.data).toHaveLength(2)
+
+      // Insert a new item
+      const newItem: TestItem = { id: `3`, name: `New Item` }
+      collection.utils.writeInsert(newItem)
+
+      // Verify the cache still has wrapped format with metadata preserved
+      const cacheAfterInsert = queryClient.getQueryData(
+        queryKey,
+      ) as MetaDataType<TestItem>
+      expect(cacheAfterInsert.metaDataOne).toBe(`example metadata`)
+      expect(cacheAfterInsert.metaDataTwo).toBe(`example metadata`)
+      expect(cacheAfterInsert.data).toHaveLength(3)
+      expect(cacheAfterInsert.data).toContainEqual(newItem)
+
+      // Update an existing item
+      collection.utils.writeUpdate({ id: `1`, name: `Updated First Item` })
+
+      // Verify the cache still has wrapped format
+      const cacheAfterUpdate = queryClient.getQueryData(
+        queryKey,
+      ) as MetaDataType<TestItem>
+      expect(cacheAfterUpdate.metaDataOne).toBe(`example metadata`)
+      expect(cacheAfterUpdate.data).toHaveLength(3)
+      const updatedItem = cacheAfterUpdate.data.find((item) => item.id === `1`)
+      expect(updatedItem?.name).toBe(`Updated First Item`)
+
+      // Delete an item
+      collection.utils.writeDelete(`2`)
+
+      // Verify the cache still has wrapped format
+      const cacheAfterDelete = queryClient.getQueryData(
+        queryKey,
+      ) as MetaDataType<TestItem>
+      expect(cacheAfterDelete.metaDataOne).toBe(`example metadata`)
+      expect(cacheAfterDelete.data).toHaveLength(2)
+      expect(cacheAfterDelete.data).not.toContainEqual(
+        expect.objectContaining({ id: `2` }),
+      )
+    })
   })
   describe(`Direct persistence handlers`, () => {
     it(`should pass through direct persistence handlers to collection options`, () => {
@@ -1737,7 +1910,7 @@ describe(`QueryCollection`, () => {
       collection.utils.writeInsert(newItem)
 
       const cacheAfterInsert = queryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as Array<TestItem>
       expect(cacheAfterInsert).toHaveLength(3)
       expect(cacheAfterInsert).toContainEqual(newItem)
@@ -1746,7 +1919,7 @@ describe(`QueryCollection`, () => {
       collection.utils.writeUpdate({ id: `1`, name: `Updated Item 1` })
 
       const cacheAfterUpdate = queryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as Array<TestItem>
       expect(cacheAfterUpdate).toHaveLength(3)
       const updatedItem = cacheAfterUpdate.find((item) => item.id === `1`)
@@ -1756,7 +1929,7 @@ describe(`QueryCollection`, () => {
       collection.utils.writeDelete(`2`)
 
       const cacheAfterDelete = queryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as Array<TestItem>
       expect(cacheAfterDelete).toHaveLength(2)
       expect(cacheAfterDelete).not.toContainEqual({
@@ -1769,7 +1942,7 @@ describe(`QueryCollection`, () => {
       collection.utils.writeUpsert({ id: `4`, name: `Item 4`, value: 40 })
 
       const cacheAfterUpsert = queryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as Array<TestItem>
       expect(cacheAfterUpsert).toHaveLength(3)
       expect(cacheAfterUpsert).toContainEqual({
@@ -1795,13 +1968,13 @@ describe(`QueryCollection`, () => {
       })
 
       const cacheAfterBatch = queryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as Array<TestItem>
       expect(cacheAfterBatch).toHaveLength(4) // 3 - 1 (delete) + 1 (insert) + 1 (upsert) = 4
 
       // Verify specific changes from batch
       expect(cacheAfterBatch).not.toContainEqual(
-        expect.objectContaining({ id: `1` })
+        expect.objectContaining({ id: `1` }),
       )
       expect(cacheAfterBatch).toContainEqual({
         id: `5`,
@@ -1860,7 +2033,7 @@ describe(`QueryCollection`, () => {
 
       // Verify cache wasn't modified
       const cacheAfterError = queryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as Array<TestItem>
       expect(cacheAfterError).toEqual(initialCache)
       expect(cacheAfterError).toHaveLength(2)
@@ -1875,7 +2048,7 @@ describe(`QueryCollection`, () => {
 
       // Verify cache wasn't modified
       const cacheAfterBatchError = queryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as Array<TestItem>
       expect(cacheAfterBatchError).toEqual(initialCache)
       expect(cacheAfterBatchError).toHaveLength(2)
@@ -2077,7 +2250,7 @@ describe(`QueryCollection`, () => {
 
             return { refetch: false }
           },
-        })
+        }),
       )
 
       await vi.waitFor(() => {
@@ -2112,6 +2285,98 @@ describe(`QueryCollection`, () => {
       expect(todo?.id).toBe(1)
       expect(todo?.id).not.toBe(clientId)
     })
+
+    it(`should not rollback object field updates after server response with refetch: false`, async () => {
+      const queryKey = [`object-field-update-test`]
+
+      type Todo = {
+        id: string
+        metadata: { createdBy: string }
+      }
+
+      const serverTodos: Array<Todo> = [
+        { id: `1`, metadata: { createdBy: `user1` } },
+      ]
+
+      const queryFn = vi
+        .fn()
+        .mockImplementation(() => Promise.resolve([...serverTodos]))
+
+      async function updateTodo(id: string, changes: Partial<Todo>) {
+        await new Promise((resolve) => setTimeout(resolve, 10))
+        const todo = serverTodos.find((t) => t.id === id)
+        if (todo) {
+          Object.assign(todo, changes)
+        }
+        return todo
+      }
+
+      const todosCollection = createCollection(
+        queryCollectionOptions<Todo>({
+          id: `object-field-update-test`,
+          queryKey,
+          queryFn,
+          queryClient,
+          getKey: (item: Todo) => item.id,
+          startSync: true,
+          onUpdate: async ({ transaction }) => {
+            const updates = transaction.mutations.map((m) => ({
+              id: m.key as string,
+              changes: m.changes,
+            }))
+
+            const serverItems = await Promise.all(
+              updates.map((update) => updateTodo(update.id, update.changes)),
+            )
+
+            todosCollection.utils.writeBatch(() => {
+              serverItems.forEach((serverItem) => {
+                if (serverItem) {
+                  todosCollection.utils.writeUpdate(serverItem)
+                }
+              })
+            })
+
+            return { refetch: false }
+          },
+        }),
+      )
+
+      await vi.waitFor(() => {
+        expect(todosCollection.status).toBe(`ready`)
+      })
+
+      // Verify initial state
+      expect(todosCollection.get(`1`)?.metadata.createdBy).toBe(`user1`)
+
+      // Update 1: change metadata from user1 to user456
+      todosCollection.update(`1`, (draft) => {
+        draft.metadata = { createdBy: `user456` }
+      })
+
+      // Wait for mutation to complete
+      await new Promise((resolve) => setTimeout(resolve, 50))
+
+      // Verify Update 1 worked
+      expect(todosCollection.get(`1`)?.metadata.createdBy).toBe(`user456`)
+      expect(
+        todosCollection._state.syncedData.get(`1`)?.metadata.createdBy,
+      ).toBe(`user456`)
+
+      // Update 2: change metadata from user456 to user789
+      todosCollection.update(`1`, (draft) => {
+        draft.metadata = { createdBy: `user789` }
+      })
+
+      // Wait for mutation to complete
+      await new Promise((resolve) => setTimeout(resolve, 50))
+
+      // Verify Update 2 persisted correctly
+      expect(
+        todosCollection._state.syncedData.get(`1`)?.metadata.createdBy,
+      ).toBe(`user789`)
+      expect(todosCollection.get(`1`)?.metadata.createdBy).toBe(`user789`)
+    })
   })
 
   it(`should call markReady when queryFn returns an empty array`, async () => {
@@ -2140,7 +2405,7 @@ describe(`QueryCollection`, () => {
       {
         timeout: 1000,
         interval: 50,
-      }
+      },
     )
 
     // Verify the collection is empty but ready
@@ -2156,7 +2421,7 @@ describe(`QueryCollection`, () => {
       { id: `2`, name: `Cached Item 2` },
     ]
     const queryFn: (
-      context: QueryFunctionContext<any>
+      context: QueryFunctionContext<any>,
     ) => Promise<Array<TestItem>> = vi.fn().mockReturnValue(initialItems)
     await queryClient.prefetchQuery({ queryKey, queryFn })
 
@@ -2170,12 +2435,12 @@ describe(`QueryCollection`, () => {
         getKey,
         startSync: true,
         staleTime: 60000, // uses the prefetched value without a refetch
-      })
+      }),
     )
     expect(collection.status).toBe(`ready`)
     expect(collection.size).toBe(2)
     expect(Array.from(collection.values())).toEqual(
-      expect.arrayContaining(initialItems)
+      expect.arrayContaining(initialItems),
     )
   })
 
@@ -2401,7 +2666,7 @@ describe(`QueryCollection`, () => {
         getKey,
         retry: false,
         startSync: true,
-      })
+      }),
     )
 
     await vi.waitFor(() => {
@@ -2409,7 +2674,7 @@ describe(`QueryCollection`, () => {
     })
 
     await expect(
-      collection.utils.refetch({ throwOnError: true })
+      collection.utils.refetch({ throwOnError: true }),
     ).rejects.toThrow(testError)
 
     // Should not throw when throwOnError is false
@@ -2431,7 +2696,7 @@ describe(`QueryCollection`, () => {
           queryFn,
           getKey,
           startSync: true,
-        })
+        }),
       )
 
       await vi.waitFor(() => {
@@ -2460,7 +2725,7 @@ describe(`QueryCollection`, () => {
           getKey,
           enabled: false,
           startSync: true,
-        })
+        }),
       )
 
       // Query should not auto-fetch due to enabled: false
@@ -2485,7 +2750,7 @@ describe(`QueryCollection`, () => {
           queryFn,
           getKey,
           startSync: false,
-        })
+        }),
       )
 
       // Refetch should be no-op because observer doesn't exist yet
@@ -2500,7 +2765,7 @@ describe(`QueryCollection`, () => {
     // Helper to create test collection with common configuration
     const createErrorHandlingTestCollection = (
       testId: string,
-      queryFn: ReturnType<typeof vi.fn>
+      queryFn: ReturnType<typeof vi.fn>,
     ) => {
       const config: QueryCollectionConfig<TestItem> = {
         id: testId,
@@ -2529,7 +2794,7 @@ describe(`QueryCollection`, () => {
 
       const collection = createErrorHandlingTestCollection(
         `error-tracking-test`,
-        queryFn
+        queryFn,
       )
 
       // Wait for initial success - no errors
@@ -2578,7 +2843,7 @@ describe(`QueryCollection`, () => {
 
       const collection = createErrorHandlingTestCollection(
         `clear-error-test`,
-        queryFn
+        queryFn,
       )
 
       // Wait for initial error
@@ -2619,7 +2884,7 @@ describe(`QueryCollection`, () => {
 
       const collection = createErrorHandlingTestCollection(
         `functionality-with-errors-test`,
-        queryFn
+        queryFn,
       )
 
       await vi.waitFor(() => {
@@ -2726,7 +2991,7 @@ describe(`QueryCollection`, () => {
 
       const collection = createErrorHandlingTestCollection(
         `error-persistence-cleanup-test`,
-        queryFn
+        queryFn,
       )
 
       // Wait for collection to be ready (even with error)
@@ -2779,7 +3044,7 @@ describe(`QueryCollection`, () => {
           expect(queryFn).toHaveBeenCalledTimes(totalAttempts)
           expect(collection.utils.isError).toBe(true)
         },
-        { timeout: 2000 }
+        { timeout: 2000 },
       )
 
       // Error count should only increment once after all retries are exhausted
@@ -2799,7 +3064,7 @@ describe(`QueryCollection`, () => {
         () => {
           expect(queryFn).toHaveBeenCalledTimes(totalAttempts)
         },
-        { timeout: 2000 }
+        { timeout: 2000 },
       )
 
       // Error count should now be 2 (two post-retry failures)
@@ -3096,7 +3361,7 @@ describe(`QueryCollection`, () => {
         () => {
           expect(collection.status).toBe(`ready`)
         },
-        { timeout: 2000 }
+        { timeout: 2000 },
       )
 
       // Should have called queryFn 3 times (initial + 2 retries)
@@ -3398,7 +3663,7 @@ describe(`QueryCollection`, () => {
           q
             .from({ item: collection })
             .where(({ item }) =>
-              or(eq(item.category, `A`), eq(item.category, `B`))
+              or(eq(item.category, `A`), eq(item.category, `B`)),
             )
             .select(({ item }) => ({ id: item.id, name: item.name })),
       })
@@ -4346,7 +4611,7 @@ describe(`QueryCollection`, () => {
 
       // Verify query data is in the cache
       const cachedData = testQueryClient.getQueryData(
-        queryKey
+        queryKey,
       ) as Array<TestItem>
       expect(cachedData).toBeDefined()
       expect(cachedData).toEqual(items)
diff --git a/packages/query-db-collection/vite.config.ts b/packages/query-db-collection/vite.config.ts
index b174faf80..b8c7930f0 100644
--- a/packages/query-db-collection/vite.config.ts
+++ b/packages/query-db-collection/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -21,5 +21,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/query-db-collection/vitest.e2e.config.ts b/packages/query-db-collection/vitest.e2e.config.ts
index 81e8f894b..5b0918452 100644
--- a/packages/query-db-collection/vitest.e2e.config.ts
+++ b/packages/query-db-collection/vitest.e2e.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from "vitest/config"
+import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
diff --git a/packages/react-db/CHANGELOG.md b/packages/react-db/CHANGELOG.md
index 9e71ef76d..8f2f8cb2f 100644
--- a/packages/react-db/CHANGELOG.md
+++ b/packages/react-db/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @tanstack/react-db
 
+## 0.1.59
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.1.58
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.1.57
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.1.56
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.1.55
+
+### Patch Changes
+
+- Fixed `isReady` to return `true` for disabled queries in `useLiveQuery`/`injectLiveQuery` across all framework packages. When a query function returns `null` or `undefined` (disabling the query), there's no async operation to wait for, so the hook should be considered "ready" immediately. ([#886](https://github.com/TanStack/db/pull/886))
+
+  Additionally, all frameworks now have proper TypeScript overloads that explicitly support returning `undefined | null` from query functions, making the disabled query pattern type-safe.
+
+  This fixes the common pattern where users conditionally enable queries and don't want to show loading states when the query is disabled.
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.1.54
 
 ### Patch Changes
@@ -110,15 +151,15 @@
   **Example usage:**
 
   ```tsx
-  import { Suspense } from "react"
-  import { useLiveSuspenseQuery } from "@tanstack/react-db"
+  import { Suspense } from 'react'
+  import { useLiveSuspenseQuery } from '@tanstack/react-db'
 
   function TodoList() {
     // Data is guaranteed to be defined - no isLoading needed
     const { data } = useLiveSuspenseQuery((q) =>
       q
         .from({ todos: todosCollection })
-        .where(({ todos }) => eq(todos.completed, false))
+        .where(({ todos }) => eq(todos.completed, false)),
     )
 
     return (
@@ -194,7 +235,7 @@
   **Example Usage:**
 
   ```ts
-  import { usePacedMutations, debounceStrategy } from "@tanstack/react-db"
+  import { usePacedMutations, debounceStrategy } from '@tanstack/react-db'
 
   const mutate = usePacedMutations({
     mutationFn: async ({ transaction }) => {
@@ -271,7 +312,7 @@
   **Example usage:**
 
   ```tsx
-  import { useLiveInfiniteQuery } from "@tanstack/react-db"
+  import { useLiveInfiniteQuery } from '@tanstack/react-db'
 
   function PostList() {
     const { data, pages, fetchNextPage, hasNextPage, isLoading } =
@@ -279,12 +320,12 @@
         (q) =>
           q
             .from({ posts: postsCollection })
-            .orderBy(({ posts }) => posts.createdAt, "desc"),
+            .orderBy(({ posts }) => posts.createdAt, 'desc'),
         {
           pageSize: 20,
           getNextPageParam: (lastPage, allPages) =>
             lastPage.length === 20 ? allPages.length : undefined,
-        }
+        },
       )
 
     if (isLoading) return <div>Loading...</div>
diff --git a/packages/react-db/package.json b/packages/react-db/package.json
index 5bf8272c8..42f910c71 100644
--- a/packages/react-db/package.json
+++ b/packages/react-db/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@tanstack/react-db",
+  "version": "0.1.59",
   "description": "React integration for @tanstack/db",
-  "version": "0.1.54",
   "author": "Kyle Mathews",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/TanStack/db.git",
+    "url": "git+https://github.com/TanStack/db.git",
     "directory": "packages/react-db"
   },
   "homepage": "https://tanstack.com/db",
@@ -15,21 +15,17 @@
     "react",
     "typescript"
   ],
-  "packageManager": "pnpm@10.24.0",
-  "dependencies": {
-    "@tanstack/db": "workspace:*",
-    "use-sync-external-store": "^1.6.0"
-  },
-  "devDependencies": {
-    "@electric-sql/client": "1.2.0",
-    "@testing-library/react": "^16.3.0",
-    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3",
-    "@types/use-sync-external-store": "^1.5.0",
-    "@vitest/coverage-istanbul": "^3.2.4",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0"
+  "scripts": {
+    "build": "vite build",
+    "build:minified": "vite build --minify",
+    "dev": "vite build --watch",
+    "test": "vitest --run",
+    "lint": "eslint . --fix"
   },
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -43,23 +39,26 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
+  "dependencies": {
+    "@tanstack/db": "workspace:*",
+    "use-sync-external-store": "^1.6.0"
+  },
   "peerDependencies": {
     "react": ">=16.8.0"
   },
-  "scripts": {
-    "build": "vite build",
-    "build:minified": "vite build --minify",
-    "dev": "vite build --watch",
-    "test": "npx vitest --run",
-    "lint": "eslint . --fix"
-  },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@electric-sql/client": "^1.3.0",
+    "@testing-library/react": "^16.3.0",
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
+    "@types/use-sync-external-store": "^1.5.0",
+    "@vitest/coverage-istanbul": "^3.2.4",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1"
+  }
 }
diff --git a/packages/react-db/src/index.ts b/packages/react-db/src/index.ts
index 5f7d07daa..b352a0ba0 100644
--- a/packages/react-db/src/index.ts
+++ b/packages/react-db/src/index.ts
@@ -1,12 +1,12 @@
 // Re-export all public APIs
-export * from "./useLiveQuery"
-export * from "./useLiveSuspenseQuery"
-export * from "./usePacedMutations"
-export * from "./useLiveInfiniteQuery"
+export * from './useLiveQuery'
+export * from './useLiveSuspenseQuery'
+export * from './usePacedMutations'
+export * from './useLiveInfiniteQuery'
 
 // Re-export everything from @tanstack/db
-export * from "@tanstack/db"
+export * from '@tanstack/db'
 
 // Re-export some stuff explicitly to ensure the type & value is exported
-export type { Collection } from "@tanstack/db"
-export { createTransaction } from "@tanstack/db"
+export type { Collection } from '@tanstack/db'
+export { createTransaction } from '@tanstack/db'
diff --git a/packages/react-db/src/useLiveInfiniteQuery.ts b/packages/react-db/src/useLiveInfiniteQuery.ts
index 650bbe22c..405ecb583 100644
--- a/packages/react-db/src/useLiveInfiniteQuery.ts
+++ b/packages/react-db/src/useLiveInfiniteQuery.ts
@@ -1,6 +1,6 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react"
-import { CollectionImpl } from "@tanstack/db"
-import { useLiveQuery } from "./useLiveQuery"
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { CollectionImpl } from '@tanstack/db'
+import { useLiveQuery } from './useLiveQuery'
 import type {
   Collection,
   Context,
@@ -9,13 +9,13 @@ import type {
   LiveQueryCollectionUtils,
   NonSingleResult,
   QueryBuilder,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 /**
  * Type guard to check if utils object has setWindow method (LiveQueryCollectionUtils)
  */
 function isLiveQueryCollectionUtils(
-  utils: unknown
+  utils: unknown,
 ): utils is LiveQueryCollectionUtils {
   return typeof (utils as any).setWindow === `function`
 }
@@ -27,7 +27,7 @@ export type UseLiveInfiniteQueryConfig<TContext extends Context> = {
     lastPage: Array<InferResultType<TContext>[number]>,
     allPages: Array<Array<InferResultType<TContext>[number]>>,
     lastPageParam: number,
-    allPageParams: Array<number>
+    allPageParams: Array<number>,
   ) => number | undefined
 }
 
@@ -116,21 +116,21 @@ export function useLiveInfiniteQuery<
   TUtils extends Record<string, any>,
 >(
   liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult,
-  config: UseLiveInfiniteQueryConfig<any>
+  config: UseLiveInfiniteQueryConfig<any>,
 ): UseLiveInfiniteQueryReturn<any>
 
 // Overload for query function
 export function useLiveInfiniteQuery<TContext extends Context>(
   queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
   config: UseLiveInfiniteQueryConfig<TContext>,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): UseLiveInfiniteQueryReturn<TContext>
 
 // Implementation
 export function useLiveInfiniteQuery<TContext extends Context>(
   queryFnOrCollection: any,
   config: UseLiveInfiniteQueryConfig<TContext>,
-  deps: Array<unknown> = []
+  deps: Array<unknown> = [],
 ): UseLiveInfiniteQueryReturn<TContext> {
   const pageSize = config.pageSize || 20
   const initialPageParam = config.initialPageParam ?? 0
@@ -142,7 +142,7 @@ export function useLiveInfiniteQuery<TContext extends Context>(
   if (!isCollection && typeof queryFnOrCollection !== `function`) {
     throw new Error(
       `useLiveInfiniteQuery: First argument must be either a pre-created live query collection (CollectionImpl) ` +
-        `or a query function. Received: ${typeof queryFnOrCollection}`
+        `or a query function. Received: ${typeof queryFnOrCollection}`,
     )
   }
 
@@ -188,7 +188,7 @@ export function useLiveInfiniteQuery<TContext extends Context>(
     ? useLiveQuery(queryFnOrCollection)
     : useLiveQuery(
         (q) => queryFnOrCollection(q).limit(pageSize).offset(0),
-        deps
+        deps,
       )
 
   // Adjust window when pagination changes
@@ -203,7 +203,7 @@ export function useLiveInfiniteQuery<TContext extends Context>(
       if (isCollection) {
         throw new Error(
           `useLiveInfiniteQuery: Pre-created live query collection must have an orderBy clause for infinite pagination to work. ` +
-            `Please add .orderBy() to your createLiveQueryCollection query.`
+            `Please add .orderBy() to your createLiveQueryCollection query.`,
         )
       }
       return
@@ -219,7 +219,7 @@ export function useLiveInfiniteQuery<TContext extends Context>(
       ) {
         console.warn(
           `useLiveInfiniteQuery: Pre-created collection has window {offset: ${currentWindow.offset}, limit: ${currentWindow.limit}} ` +
-            `but hook expects {offset: ${expectedOffset}, limit: ${expectedLimit}}. Adjusting window now.`
+            `but hook expects {offset: ${expectedOffset}, limit: ${expectedLimit}}. Adjusting window now.`,
         )
       }
       hasValidatedCollectionRef.current = true
@@ -273,7 +273,7 @@ export function useLiveInfiniteQuery<TContext extends Context>(
     // Flatten the pages for the data return (without peek ahead item)
     const flatDataResult = dataArray.slice(
       0,
-      totalItemsRequested
+      totalItemsRequested,
     ) as InferResultType<TContext>
 
     return {
diff --git a/packages/react-db/src/useLiveQuery.ts b/packages/react-db/src/useLiveQuery.ts
index 8fd0d2eb0..14a56d647 100644
--- a/packages/react-db/src/useLiveQuery.ts
+++ b/packages/react-db/src/useLiveQuery.ts
@@ -1,9 +1,9 @@
-import { useRef, useSyncExternalStore } from "react"
+import { useRef, useSyncExternalStore } from 'react'
 import {
   BaseQueryBuilder,
   CollectionImpl,
   createLiveQueryCollection,
-} from "@tanstack/db"
+} from '@tanstack/db'
 import type {
   Collection,
   CollectionConfigSingleRowOption,
@@ -16,7 +16,7 @@ import type {
   NonSingleResult,
   QueryBuilder,
   SingleResult,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 const DEFAULT_GC_TIME_MS = 1 // Live queries created by useLiveQuery are cleaned up immediately (0 disables GC)
 
@@ -83,7 +83,7 @@ export type UseLiveQueryStatus = CollectionStatus | `disabled`
 // Overload 1: Accept query function that always returns QueryBuilder
 export function useLiveQuery<TContext extends Context>(
   queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): {
   state: Map<string | number, GetResult<TContext>>
   data: InferResultType<TContext>
@@ -100,9 +100,9 @@ export function useLiveQuery<TContext extends Context>(
 // Overload 2: Accept query function that can return undefined/null
 export function useLiveQuery<TContext extends Context>(
   queryFn: (
-    q: InitialQueryBuilder
+    q: InitialQueryBuilder,
   ) => QueryBuilder<TContext> | undefined | null,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): {
   state: Map<string | number, GetResult<TContext>> | undefined
   data: InferResultType<TContext> | undefined
@@ -119,9 +119,9 @@ export function useLiveQuery<TContext extends Context>(
 // Overload 3: Accept query function that can return LiveQueryCollectionConfig
 export function useLiveQuery<TContext extends Context>(
   queryFn: (
-    q: InitialQueryBuilder
+    q: InitialQueryBuilder,
   ) => LiveQueryCollectionConfig<TContext> | undefined | null,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): {
   state: Map<string | number, GetResult<TContext>> | undefined
   data: InferResultType<TContext> | undefined
@@ -142,9 +142,9 @@ export function useLiveQuery<
   TUtils extends Record<string, any>,
 >(
   queryFn: (
-    q: InitialQueryBuilder
+    q: InitialQueryBuilder,
   ) => Collection<TResult, TKey, TUtils> | undefined | null,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): {
   state: Map<TKey, TResult> | undefined
   data: Array<TResult> | undefined
@@ -166,14 +166,14 @@ export function useLiveQuery<
   TUtils extends Record<string, any>,
 >(
   queryFn: (
-    q: InitialQueryBuilder
+    q: InitialQueryBuilder,
   ) =>
     | QueryBuilder<TContext>
     | LiveQueryCollectionConfig<TContext>
     | Collection<TResult, TKey, TUtils>
     | undefined
     | null,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): {
   state:
     | Map<string | number, GetResult<TContext>>
@@ -229,7 +229,7 @@ export function useLiveQuery<
 // Overload 6: Accept config object
 export function useLiveQuery<TContext extends Context>(
   config: LiveQueryCollectionConfig<TContext>,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): {
   state: Map<string | number, GetResult<TContext>>
   data: InferResultType<TContext>
@@ -278,7 +278,7 @@ export function useLiveQuery<
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult
+  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult,
 ): {
   state: Map<TKey, TResult>
   data: Array<TResult>
@@ -298,7 +298,7 @@ export function useLiveQuery<
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult
+  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult,
 ): {
   state: Map<TKey, TResult>
   data: TResult | undefined
@@ -315,7 +315,7 @@ export function useLiveQuery<
 // Implementation - use function overloads to infer the actual collection type
 export function useLiveQuery(
   configOrQueryOrCollection: any,
-  deps: Array<unknown> = []
+  deps: Array<unknown> = [],
 ) {
   // Check if it's already a collection by checking for specific collection methods
   const isCollection =
@@ -327,7 +327,7 @@ export function useLiveQuery(
 
   // Use refs to cache collection and track dependencies
   const collectionRef = useRef<Collection<object, string | number, {}> | null>(
-    null
+    null,
   )
   const depsRef = useRef<Array<unknown> | null>(null)
   const configRef = useRef<unknown>(null)
@@ -386,7 +386,7 @@ export function useLiveQuery(
         } else {
           // Unexpected return type
           throw new Error(
-            `useLiveQuery callback must return a QueryBuilder, LiveQueryCollectionConfig, Collection, undefined, or null. Got: ${typeof result}`
+            `useLiveQuery callback must return a QueryBuilder, LiveQueryCollectionConfig, Collection, undefined, or null. Got: ${typeof result}`,
           )
         }
         depsRef.current = [...deps]
@@ -467,7 +467,7 @@ export function useLiveQuery(
   // Use useSyncExternalStore to subscribe to collection changes
   const snapshot = useSyncExternalStore(
     subscribeRef.current,
-    getSnapshotRef.current
+    getSnapshotRef.current,
   )
 
   // Track last snapshot (from useSyncExternalStore) and the returned value separately
diff --git a/packages/react-db/src/useLiveSuspenseQuery.ts b/packages/react-db/src/useLiveSuspenseQuery.ts
index 67163bdc7..326bc131a 100644
--- a/packages/react-db/src/useLiveSuspenseQuery.ts
+++ b/packages/react-db/src/useLiveSuspenseQuery.ts
@@ -1,5 +1,5 @@
-import { useRef } from "react"
-import { useLiveQuery } from "./useLiveQuery"
+import { useRef } from 'react'
+import { useLiveQuery } from './useLiveQuery'
 import type {
   Collection,
   Context,
@@ -10,7 +10,7 @@ import type {
   NonSingleResult,
   QueryBuilder,
   SingleResult,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 /**
  * Create a live query with React Suspense support
@@ -75,7 +75,7 @@ import type {
 // Overload 1: Accept query function that always returns QueryBuilder
 export function useLiveSuspenseQuery<TContext extends Context>(
   queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): {
   state: Map<string | number, GetResult<TContext>>
   data: InferResultType<TContext>
@@ -85,7 +85,7 @@ export function useLiveSuspenseQuery<TContext extends Context>(
 // Overload 2: Accept config object
 export function useLiveSuspenseQuery<TContext extends Context>(
   config: LiveQueryCollectionConfig<TContext>,
-  deps?: Array<unknown>
+  deps?: Array<unknown>,
 ): {
   state: Map<string | number, GetResult<TContext>>
   data: InferResultType<TContext>
@@ -98,7 +98,7 @@ export function useLiveSuspenseQuery<
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult
+  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult,
 ): {
   state: Map<TKey, TResult>
   data: Array<TResult>
@@ -111,7 +111,7 @@ export function useLiveSuspenseQuery<
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult
+  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult,
 ): {
   state: Map<TKey, TResult>
   data: TResult | undefined
@@ -121,7 +121,7 @@ export function useLiveSuspenseQuery<
 // Implementation - uses useLiveQuery internally and adds Suspense logic
 export function useLiveSuspenseQuery(
   configOrQueryOrCollection: any,
-  deps: Array<unknown> = []
+  deps: Array<unknown> = [],
 ) {
   const promiseRef = useRef<Promise<void> | null>(null)
   const collectionRef = useRef<Collection<any, any, any> | null>(null)
@@ -148,7 +148,7 @@ export function useLiveSuspenseQuery(
   if (!result.isEnabled) {
     // Suspense queries cannot be disabled - throw error
     throw new Error(
-      `useLiveSuspenseQuery does not support disabled queries. Use useLiveQuery instead for conditional queries.`
+      `useLiveSuspenseQuery does not support disabled queries. Use useLiveQuery instead for conditional queries.`,
     )
   }
 
diff --git a/packages/react-db/src/usePacedMutations.ts b/packages/react-db/src/usePacedMutations.ts
index a86e4efdc..7fc001e4a 100644
--- a/packages/react-db/src/usePacedMutations.ts
+++ b/packages/react-db/src/usePacedMutations.ts
@@ -1,6 +1,6 @@
-import { useCallback, useMemo, useRef } from "react"
-import { createPacedMutations } from "@tanstack/db"
-import type { PacedMutationsConfig, Transaction } from "@tanstack/db"
+import { useCallback, useMemo, useRef } from 'react'
+import { createPacedMutations } from '@tanstack/db'
+import type { PacedMutationsConfig, Transaction } from '@tanstack/db'
 
 /**
  * React hook for managing paced mutations with timing strategies.
@@ -94,7 +94,7 @@ export function usePacedMutations<
   TVariables = unknown,
   T extends object = Record<string, unknown>,
 >(
-  config: PacedMutationsConfig<TVariables, T>
+  config: PacedMutationsConfig<TVariables, T>,
 ): (variables: TVariables) => Transaction<T> {
   // Keep refs to the latest callbacks so we can call them without recreating the instance
   const onMutateRef = useRef(config.onMutate)
diff --git a/packages/react-db/tests/test-setup.ts b/packages/react-db/tests/test-setup.ts
index b686eeaaf..2d717649d 100644
--- a/packages/react-db/tests/test-setup.ts
+++ b/packages/react-db/tests/test-setup.ts
@@ -1,6 +1,6 @@
-import "@testing-library/jest-dom/vitest"
-import { cleanup } from "@testing-library/react"
-import { afterEach } from "vitest"
+import '@testing-library/jest-dom/vitest'
+import { cleanup } from '@testing-library/react'
+import { afterEach } from 'vitest'
 
 declare global {
   var IS_REACT_ACT_ENVIRONMENT: boolean
diff --git a/packages/react-db/tests/useLiveInfiniteQuery.test.tsx b/packages/react-db/tests/useLiveInfiniteQuery.test.tsx
index b59753b34..9672205c3 100644
--- a/packages/react-db/tests/useLiveInfiniteQuery.test.tsx
+++ b/packages/react-db/tests/useLiveInfiniteQuery.test.tsx
@@ -1,10 +1,10 @@
-import { describe, expect, it } from "vitest"
-import { act, renderHook, waitFor } from "@testing-library/react"
-import { createCollection, createLiveQueryCollection, eq } from "@tanstack/db"
-import { useLiveInfiniteQuery } from "../src/useLiveInfiniteQuery"
-import { mockSyncCollectionOptions } from "../../db/tests/utils"
-import { createFilterFunctionFromExpression } from "../../db/src/collection/change-events"
-import type { LoadSubsetOptions } from "@tanstack/db"
+import { describe, expect, it } from 'vitest'
+import { act, renderHook, waitFor } from '@testing-library/react'
+import { createCollection, createLiveQueryCollection, eq } from '@tanstack/db'
+import { useLiveInfiniteQuery } from '../src/useLiveInfiniteQuery'
+import { mockSyncCollectionOptions } from '../../db/tests/utils'
+import { createFilterFunctionFromExpression } from '../../db/src/collection/change-events'
+import type { LoadSubsetOptions } from '@tanstack/db'
 
 type Post = {
   id: string
@@ -36,7 +36,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `initial-page-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -54,7 +54,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -86,7 +86,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `multiple-pages-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -99,7 +99,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -145,7 +145,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `no-more-pages-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -158,7 +158,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -204,7 +204,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `empty-results-test`,
         getKey: (post: Post) => post.id,
         initialData: [],
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -217,7 +217,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -239,7 +239,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `live-updates-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -252,7 +252,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -310,7 +310,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `deletions-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -323,7 +323,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -376,7 +376,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `partial-page-deletion-desc-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -389,7 +389,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 20,
           getNextPageParam: (lastPage) =>
             lastPage.length === 20 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -423,7 +423,7 @@ describe(`useLiveInfiniteQuery`, () => {
 
     // Verify the deleted item is no longer in the data
     expect(
-      result.current.data.find((p) => p.id === firstItemId)
+      result.current.data.find((p) => p.id === firstItemId),
     ).toBeUndefined()
 
     // Verify the new first item is Post 2
@@ -443,7 +443,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `partial-page-deletion-asc-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -456,7 +456,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 20,
           getNextPageParam: (lastPage) =>
             lastPage.length === 20 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -490,7 +490,7 @@ describe(`useLiveInfiniteQuery`, () => {
 
     // Verify the deleted item is no longer in the data
     expect(
-      result.current.data.find((p) => p.id === firstItemId)
+      result.current.data.find((p) => p.id === firstItemId),
     ).toBeUndefined()
 
     // Still should have 1 page with 4 items
@@ -506,7 +506,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `where-clause-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -520,7 +520,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 5,
           getNextPageParam: (lastPage) =>
             lastPage.length === 5 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -559,7 +559,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `deps-change-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result, rerender } = renderHook(
@@ -575,10 +575,10 @@ describe(`useLiveInfiniteQuery`, () => {
             getNextPageParam: (lastPage) =>
               lastPage.length === 5 ? lastPage.length : undefined,
           },
-          [category]
+          [category],
         )
       },
-      { initialProps: { category: `tech` } }
+      { initialProps: { category: `tech` } },
     )
 
     await waitFor(() => {
@@ -617,7 +617,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `page-params-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -631,7 +631,7 @@ describe(`useLiveInfiniteQuery`, () => {
           initialPageParam: 0,
           getNextPageParam: (lastPage, allPages, lastPageParam) =>
             lastPage.length === 10 ? lastPageParam + 1 : undefined,
-        }
+        },
       )
     })
 
@@ -667,7 +667,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `exact-boundary-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -688,7 +688,7 @@ describe(`useLiveInfiniteQuery`, () => {
             // If we have less than a full page left, no more pages
             return totalLoaded
           },
-        }
+        },
       )
     })
 
@@ -723,7 +723,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `concurrent-fetch-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -736,7 +736,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -784,7 +784,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `no-fetch-when-done-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -797,7 +797,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -826,7 +826,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `initial-param-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -840,7 +840,7 @@ describe(`useLiveInfiniteQuery`, () => {
           initialPageParam: 100,
           getNextPageParam: (lastPage, allPages, lastPageParam) =>
             lastPage.length === 10 ? lastPageParam + 1 : undefined,
-        }
+        },
       )
     })
 
@@ -867,7 +867,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `sync-detection-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -880,7 +880,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -952,7 +952,7 @@ describe(`useLiveInfiniteQuery`, () => {
         id: `immediate-data-test`,
         getKey: (post: Post) => post.id,
         initialData: posts,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -965,7 +965,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -1029,8 +1029,44 @@ describe(`useLiveInfiniteQuery`, () => {
                 })
               }
 
-              // Apply limit if provided
-              if (opts.limit !== undefined) {
+              // Apply cursor expressions if present (new cursor-based pagination)
+              if (opts.cursor) {
+                const { whereFrom, whereCurrent } = opts.cursor
+                try {
+                  const whereFromFn =
+                    createFilterFunctionFromExpression(whereFrom)
+                  const fromData = filtered.filter(whereFromFn)
+
+                  const whereCurrentFn =
+                    createFilterFunctionFromExpression(whereCurrent)
+                  const currentData = filtered.filter(whereCurrentFn)
+
+                  // Combine current (ties) with from (next page), deduplicate
+                  const seenIds = new Set<string>()
+                  filtered = []
+                  for (const item of currentData) {
+                    if (!seenIds.has(item.id)) {
+                      seenIds.add(item.id)
+                      filtered.push(item)
+                    }
+                  }
+                  // Apply limit only to fromData
+                  const limitedFromData = opts.limit
+                    ? fromData.slice(0, opts.limit)
+                    : fromData
+                  for (const item of limitedFromData) {
+                    if (!seenIds.has(item.id)) {
+                      seenIds.add(item.id)
+                      filtered.push(item)
+                    }
+                  }
+                  // Re-sort after combining
+                  filtered.sort((a, b) => b.createdAt - a.createdAt)
+                } catch {
+                  // Fallback to original filtered if cursor parsing fails
+                }
+              } else if (opts.limit !== undefined) {
+                // Apply limit only if no cursor (cursor handles limit internally)
                 filtered = filtered.slice(0, opts.limit)
               }
 
@@ -1069,7 +1105,7 @@ describe(`useLiveInfiniteQuery`, () => {
           pageSize: 10,
           getNextPageParam: (lastPage) =>
             lastPage.length === 10 ? lastPage.length : undefined,
-        }
+        },
       )
     })
 
@@ -1097,7 +1133,7 @@ describe(`useLiveInfiniteQuery`, () => {
       () => {
         expect(result.current.isFetchingNextPage).toBe(false)
       },
-      { timeout: 200 }
+      { timeout: 200 },
     )
 
     // Should have 2 pages now
@@ -1113,7 +1149,7 @@ describe(`useLiveInfiniteQuery`, () => {
           id: `pre-created-test`,
           getKey: (post: Post) => post.id,
           initialData: posts,
-        })
+        }),
       )
 
       const liveQueryCollection = createLiveQueryCollection({
@@ -1158,7 +1194,7 @@ describe(`useLiveInfiniteQuery`, () => {
           id: `pre-created-multi-page-test`,
           getKey: (post: Post) => post.id,
           initialData: posts,
-        })
+        }),
       )
 
       const liveQueryCollection = createLiveQueryCollection({
@@ -1209,7 +1245,7 @@ describe(`useLiveInfiniteQuery`, () => {
           id: `pre-created-reset-1`,
           getKey: (post: Post) => post.id,
           initialData: posts1,
-        })
+        }),
       )
 
       const liveQueryCollection1 = createLiveQueryCollection({
@@ -1229,7 +1265,7 @@ describe(`useLiveInfiniteQuery`, () => {
           id: `pre-created-reset-2`,
           getKey: (post: Post) => post.id,
           initialData: posts2,
-        })
+        }),
       )
 
       const liveQueryCollection2 = createLiveQueryCollection({
@@ -1251,7 +1287,7 @@ describe(`useLiveInfiniteQuery`, () => {
               lastPage.length === 10 ? lastPage.length : undefined,
           })
         },
-        { initialProps: { coll: liveQueryCollection1 } }
+        { initialProps: { coll: liveQueryCollection1 } },
       )
 
       await waitFor(() => {
@@ -1289,7 +1325,7 @@ describe(`useLiveInfiniteQuery`, () => {
           id: `no-orderby-test`,
           getKey: (post: Post) => post.id,
           initialData: posts,
-        })
+        }),
       )
 
       // Create collection WITHOUT orderBy
@@ -1351,7 +1387,7 @@ describe(`useLiveInfiniteQuery`, () => {
           id: `mismatched-window-test`,
           getKey: (post: Post) => post.id,
           initialData: posts,
-        })
+        }),
       )
 
       const liveQueryCollection = createLiveQueryCollection({
@@ -1392,7 +1428,7 @@ describe(`useLiveInfiniteQuery`, () => {
           id: `pre-created-live-updates-test`,
           getKey: (post: Post) => post.id,
           initialData: posts,
-        })
+        }),
       )
 
       const liveQueryCollection = createLiveQueryCollection({
@@ -1465,7 +1501,7 @@ describe(`useLiveInfiniteQuery`, () => {
           id: `router-loader-test`,
           getKey: (post: Post) => post.id,
           initialData: posts,
-        })
+        }),
       )
 
       // Simulate router loader: create and preload collection
diff --git a/packages/react-db/tests/useLiveQuery.test-d.tsx b/packages/react-db/tests/useLiveQuery.test-d.tsx
index df012a021..41162698c 100644
--- a/packages/react-db/tests/useLiveQuery.test-d.tsx
+++ b/packages/react-db/tests/useLiveQuery.test-d.tsx
@@ -1,14 +1,14 @@
-import { describe, expectTypeOf, it } from "vitest"
-import { renderHook } from "@testing-library/react"
-import { createCollection } from "../../db/src/collection/index"
-import { mockSyncCollectionOptions } from "../../db/tests/utils"
+import { describe, expectTypeOf, it } from 'vitest'
+import { renderHook } from '@testing-library/react'
+import { createCollection } from '../../db/src/collection/index'
+import { mockSyncCollectionOptions } from '../../db/tests/utils'
 import {
   createLiveQueryCollection,
   eq,
   liveQueryCollectionOptions,
-} from "../../db/src/query/index"
-import { useLiveQuery } from "../src/useLiveQuery"
-import type { SingleResult } from "../../db/src/types"
+} from '../../db/src/query/index'
+import { useLiveQuery } from '../src/useLiveQuery'
+import type { SingleResult } from '../../db/src/types'
 
 type Person = {
   id: string
@@ -26,7 +26,7 @@ describe(`useLiveQuery type assertions`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: [],
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -34,7 +34,7 @@ describe(`useLiveQuery type assertions`, () => {
         q
           .from({ collection })
           .where(({ collection: c }) => eq(c.id, `3`))
-          .findOne()
+          .findOne(),
       )
     })
 
@@ -47,7 +47,7 @@ describe(`useLiveQuery type assertions`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: [],
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -69,7 +69,7 @@ describe(`useLiveQuery type assertions`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: [],
-      })
+      }),
     )
 
     const options = liveQueryCollectionOptions({
@@ -97,7 +97,7 @@ describe(`useLiveQuery type assertions`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: [],
-      })
+      }),
     )
 
     const liveQueryCollection = createLiveQueryCollection({
diff --git a/packages/react-db/tests/useLiveQuery.test.tsx b/packages/react-db/tests/useLiveQuery.test.tsx
index fb7ab5dbc..cbaf7fe97 100644
--- a/packages/react-db/tests/useLiveQuery.test.tsx
+++ b/packages/react-db/tests/useLiveQuery.test.tsx
@@ -1,5 +1,5 @@
-import { describe, expect, it } from "vitest"
-import { act, renderHook, waitFor } from "@testing-library/react"
+import { describe, expect, it } from 'vitest'
+import { act, renderHook, waitFor } from '@testing-library/react'
 import {
   Query,
   count,
@@ -9,10 +9,10 @@ import {
   eq,
   gt,
   lte,
-} from "@tanstack/db"
-import { useEffect } from "react"
-import { useLiveQuery } from "../src/useLiveQuery"
-import { mockSyncCollectionOptions } from "../../db/tests/utils"
+} from '@tanstack/db'
+import { useEffect } from 'react'
+import { useLiveQuery } from '../src/useLiveQuery'
+import { mockSyncCollectionOptions } from '../../db/tests/utils'
 
 type Person = {
   id: string
@@ -85,7 +85,7 @@ describe(`Query Collections`, () => {
         id: `test-persons`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -97,7 +97,7 @@ describe(`Query Collections`, () => {
             id: persons.id,
             name: persons.name,
             age: persons.age,
-          }))
+          })),
       )
     })
 
@@ -121,7 +121,7 @@ describe(`Query Collections`, () => {
         id: `test-persons`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result, rerender } = renderHook(() => {
@@ -133,7 +133,7 @@ describe(`Query Collections`, () => {
             id: persons.id,
             name: persons.name,
             age: persons.age,
-          }))
+          })),
       )
     })
 
@@ -163,7 +163,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -171,7 +171,7 @@ describe(`Query Collections`, () => {
         q
           .from({ collection })
           .where(({ collection: c }) => eq(c.id, `3`))
-          .findOne()
+          .findOne(),
       )
     })
 
@@ -197,7 +197,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -232,7 +232,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const liveQueryCollection = createLiveQueryCollection({
@@ -269,7 +269,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -281,7 +281,7 @@ describe(`Query Collections`, () => {
             id: c.id,
             name: c.name,
           }))
-          .orderBy(({ collection: c }) => c.id, `asc`)
+          .orderBy(({ collection: c }) => c.id, `asc`),
       )
     })
 
@@ -340,7 +340,7 @@ describe(`Query Collections`, () => {
           id: `4`,
           name: `Kyle Doe`,
         }),
-      ])
+      ]),
     )
 
     // Update the person
@@ -379,7 +379,7 @@ describe(`Query Collections`, () => {
           id: `4`,
           name: `Kyle Doe 2`,
         }),
-      ])
+      ]),
     )
 
     // Delete the person
@@ -418,7 +418,7 @@ describe(`Query Collections`, () => {
         id: `person-collection-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create issue collection
@@ -427,7 +427,7 @@ describe(`Query Collections`, () => {
         id: `issue-collection-test`,
         getKey: (issue: Issue) => issue.id,
         initialData: initialIssues,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -435,13 +435,13 @@ describe(`Query Collections`, () => {
         q
           .from({ issues: issueCollection })
           .join({ persons: personCollection }, ({ issues, persons }) =>
-            eq(issues.userId, persons.id)
+            eq(issues.userId, persons.id),
           )
           .select(({ issues, persons }) => ({
             id: issues.id,
             title: issues.title,
             name: persons?.name,
-          }))
+          })),
       )
     })
 
@@ -546,7 +546,7 @@ describe(`Query Collections`, () => {
         id: `params-change-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result, rerender } = renderHook(
@@ -561,10 +561,10 @@ describe(`Query Collections`, () => {
                 name: c.name,
                 age: c.age,
               })),
-          [minAge]
+          [minAge],
         )
       },
-      { initialProps: { minAge: 30 } }
+      { initialProps: { minAge: 30 } },
     )
 
     // Wait for collection to sync
@@ -620,7 +620,7 @@ describe(`Query Collections`, () => {
         id: `stop-query-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result, rerender } = renderHook(
@@ -634,10 +634,10 @@ describe(`Query Collections`, () => {
                 id: c.id,
                 name: c.name,
               })),
-          [minAge]
+          [minAge],
         )
       },
-      { initialProps: { minAge: 30 } }
+      { initialProps: { minAge: 30 } },
     )
 
     // Wait for collection to sync
@@ -685,7 +685,7 @@ describe(`Query Collections`, () => {
         id: `optimistic-changes-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Initial query
@@ -699,7 +699,7 @@ describe(`Query Collections`, () => {
             name: c.name,
             team: c.team,
           }))
-          .orderBy(({ collection: c }) => c.id, `asc`)
+          .orderBy(({ collection: c }) => c.id, `asc`),
       )
     })
 
@@ -715,7 +715,7 @@ describe(`Query Collections`, () => {
           .select(({ queryResult }) => ({
             team: queryResult.team,
             count: count(queryResult.id),
-          }))
+          })),
       )
     })
 
@@ -792,7 +792,7 @@ describe(`Query Collections`, () => {
         id: `person-collection-test-bug`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create issue collection
@@ -801,7 +801,7 @@ describe(`Query Collections`, () => {
         id: `issue-collection-test-bug`,
         getKey: (issue: Issue) => issue.id,
         initialData: initialIssues,
-      })
+      }),
     )
 
     // Render the hook with a query that joins persons and issues
@@ -810,13 +810,13 @@ describe(`Query Collections`, () => {
         q
           .from({ issues: issueCollection })
           .join({ persons: personCollection }, ({ issues, persons }) =>
-            eq(issues.userId, persons.id)
+            eq(issues.userId, persons.id),
           )
           .select(({ issues, persons }) => ({
             id: issues.id,
             title: issues.title,
             name: persons?.name,
-          }))
+          })),
       )
 
       // Track each render state
@@ -921,7 +921,8 @@ describe(`Query Collections`, () => {
 
     // Check if we had any render where the temp key was removed but the permanent key wasn't added yet
     const hadFlicker = renderStates.some(
-      (state) => !state.hasTempKey && !state.hasPermKey && state.stateSize === 3
+      (state) =>
+        !state.hasTempKey && !state.hasPermKey && state.stateSize === 3,
     )
 
     expect(hadFlicker).toBe(false)
@@ -942,7 +943,7 @@ describe(`Query Collections`, () => {
         id: `pre-created-collection-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create a live query collection beforehand
@@ -986,7 +987,7 @@ describe(`Query Collections`, () => {
         id: `collection-1`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const collection2 = createCollection(
@@ -1011,7 +1012,7 @@ describe(`Query Collections`, () => {
             team: `team3`,
           },
         ],
-      })
+      }),
     )
 
     // Create two different live query collections
@@ -1043,7 +1044,7 @@ describe(`Query Collections`, () => {
       ({ collection }: { collection: any }) => {
         return useLiveQuery(collection)
       },
-      { initialProps: { collection: liveQueryCollection1 } }
+      { initialProps: { collection: liveQueryCollection1 } },
     )
 
     // Wait for first collection to sync
@@ -1085,7 +1086,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-config-querybuilder`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create a QueryBuilder instance beforehand
@@ -1149,7 +1150,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1195,7 +1196,7 @@ describe(`Query Collections`, () => {
           id: `pre-created-has-loaded-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       // Create a live query collection that's already syncing
@@ -1253,7 +1254,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1302,7 +1303,7 @@ describe(`Query Collections`, () => {
           id: `live-updates-has-loaded-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { result } = renderHook(() => {
@@ -1313,7 +1314,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1398,13 +1399,13 @@ describe(`Query Collections`, () => {
           q
             .from({ issues: issueCollection })
             .join({ persons: personCollection }, ({ issues, persons }) =>
-              eq(issues.userId, persons.id)
+              eq(issues.userId, persons.id),
             )
             .select(({ issues, persons }) => ({
               id: issues.id,
               title: issues.title,
               name: persons?.name,
-            }))
+            })),
         )
       })
 
@@ -1491,10 +1492,10 @@ describe(`Query Collections`, () => {
                   id: c.id,
                   name: c.name,
                 })),
-            [minAge]
+            [minAge],
           )
         },
-        { initialProps: { minAge: 30 } }
+        { initialProps: { minAge: 30 } },
       )
 
       // Initially should be false
@@ -1585,7 +1586,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1702,7 +1703,7 @@ describe(`Query Collections`, () => {
               id: persons.id,
               name: persons.name,
               team: persons.team,
-            }))
+            })),
         )
       })
 
@@ -1824,13 +1825,13 @@ describe(`Query Collections`, () => {
           q
             .from({ issues: issueCollection })
             .join({ persons: personCollection }, ({ issues, persons }) =>
-              eq(issues.userId, persons.id)
+              eq(issues.userId, persons.id),
             )
             .select(({ issues, persons }) => ({
               id: issues.id,
               title: issues.title,
               userName: persons?.name,
-            }))
+            })),
         )
       })
 
@@ -1932,7 +1933,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1976,7 +1977,7 @@ describe(`Query Collections`, () => {
           id: `undefined-callback-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { result, rerender } = renderHook(
@@ -1993,10 +1994,10 @@ describe(`Query Collections`, () => {
                   age: persons.age,
                 }))
             },
-            [enabled]
+            [enabled],
           )
         },
-        { initialProps: { enabled: false } }
+        { initialProps: { enabled: false } },
       )
 
       // When callback returns undefined, should return the specified state
@@ -2056,7 +2057,7 @@ describe(`Query Collections`, () => {
           id: `null-callback-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { result, rerender } = renderHook(
@@ -2073,10 +2074,10 @@ describe(`Query Collections`, () => {
                   age: persons.age,
                 }))
             },
-            [enabled]
+            [enabled],
           )
         },
-        { initialProps: { enabled: false } }
+        { initialProps: { enabled: false } },
       )
 
       // When callback returns null, should return the specified state
@@ -2113,7 +2114,7 @@ describe(`Query Collections`, () => {
           id: `config-callback-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { result, rerender } = renderHook(
@@ -2144,10 +2145,10 @@ describe(`Query Collections`, () => {
                 }))
                 .orderBy(({ persons }) => persons.age)
             },
-            [useConfig]
+            [useConfig],
           )
         },
-        { initialProps: { useConfig: false } }
+        { initialProps: { useConfig: false } },
       )
 
       // Wait for collection to sync and state to update
@@ -2199,7 +2200,7 @@ describe(`Query Collections`, () => {
           id: `collection-callback-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       // Create a live query collection beforehand
@@ -2232,10 +2233,10 @@ describe(`Query Collections`, () => {
                   age: persons.age,
                 }))
             },
-            [useCollection]
+            [useCollection],
           )
         },
-        { initialProps: { useCollection: false } }
+        { initialProps: { useCollection: false } },
       )
 
       // Wait for collection to sync and state to update
@@ -2246,17 +2247,18 @@ describe(`Query Collections`, () => {
       expect(result.current.collection).toBeDefined()
       expect(result.current.status).toBeDefined()
 
+      // Results are in deterministic key order (id: 1 before id: 2)
       expect(result.current.data).toMatchObject([
-        {
-          id: `2`,
-          name: `Jane Doe`,
-          age: 25,
-        },
         {
           id: `1`,
           name: `John Doe`,
           age: 30,
         },
+        {
+          id: `2`,
+          name: `Jane Doe`,
+          age: 25,
+        },
       ])
 
       // Switch to using pre-created collection
@@ -2288,7 +2290,7 @@ describe(`Query Collections`, () => {
           id: `conditional-deps-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { result, rerender } = renderHook(
@@ -2305,10 +2307,10 @@ describe(`Query Collections`, () => {
                   age: persons.age,
                 }))
             },
-            [minAge, enabled]
+            [minAge, enabled],
           )
         },
-        { initialProps: { minAge: 30, enabled: false } }
+        { initialProps: { minAge: 30, enabled: false } },
       )
 
       // Initially disabled
diff --git a/packages/react-db/tests/useLiveSuspenseQuery.test.tsx b/packages/react-db/tests/useLiveSuspenseQuery.test.tsx
index 36a878bf9..16376306f 100644
--- a/packages/react-db/tests/useLiveSuspenseQuery.test.tsx
+++ b/packages/react-db/tests/useLiveSuspenseQuery.test.tsx
@@ -1,15 +1,15 @@
-import { describe, expect, it } from "vitest"
-import { renderHook, waitFor } from "@testing-library/react"
+import { describe, expect, it } from 'vitest'
+import { renderHook, waitFor } from '@testing-library/react'
 import {
   createCollection,
   createLiveQueryCollection,
   eq,
   gt,
-} from "@tanstack/db"
-import { StrictMode, Suspense } from "react"
-import { useLiveSuspenseQuery } from "../src/useLiveSuspenseQuery"
-import { mockSyncCollectionOptions } from "../../db/tests/utils"
-import type { ReactNode } from "react"
+} from '@tanstack/db'
+import { StrictMode, Suspense } from 'react'
+import { useLiveSuspenseQuery } from '../src/useLiveSuspenseQuery'
+import { mockSyncCollectionOptions } from '../../db/tests/utils'
+import type { ReactNode } from 'react'
 
 type Person = {
   id: string
@@ -59,7 +59,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-1`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(
@@ -72,12 +72,12 @@ describe(`useLiveSuspenseQuery`, () => {
               id: persons.id,
               name: persons.name,
               age: persons.age,
-            }))
+            })),
         )
       },
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     // Wait for data to load
@@ -100,7 +100,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-2`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(
@@ -109,7 +109,7 @@ describe(`useLiveSuspenseQuery`, () => {
       },
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     await waitFor(() => {
@@ -127,7 +127,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-3`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(
@@ -136,12 +136,12 @@ describe(`useLiveSuspenseQuery`, () => {
           q
             .from({ collection })
             .where(({ collection: c }) => eq(c.id, `3`))
-            .findOne()
+            .findOne(),
         )
       },
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     await waitFor(() => {
@@ -161,13 +161,13 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-4`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const liveQuery = createLiveQueryCollection((q) =>
       q
         .from({ persons: collection })
-        .where(({ persons }) => gt(persons.age, 30))
+        .where(({ persons }) => gt(persons.age, 30)),
     )
 
     const { result } = renderHook(() => useLiveSuspenseQuery(liveQuery), {
@@ -191,7 +191,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-5`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result, rerender } = renderHook(
@@ -201,13 +201,13 @@ describe(`useLiveSuspenseQuery`, () => {
             q
               .from({ persons: collection })
               .where(({ persons }) => gt(persons.age, minAge)),
-          [minAge]
+          [minAge],
         )
       },
       {
         wrapper: SuspenseWrapper,
         initialProps: { minAge: 30 },
-      }
+      },
     )
 
     // Initial load - age > 30
@@ -231,14 +231,14 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-6`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(
       () => useLiveSuspenseQuery((q) => q.from({ persons: collection })),
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     // Wait for initial data
@@ -270,7 +270,7 @@ describe(`useLiveSuspenseQuery`, () => {
         },
         {
           wrapper: SuspenseWrapper,
-        }
+        },
       )
     }).toThrow(/does not support disabled queries/)
   })
@@ -281,7 +281,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-7`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(
@@ -292,7 +292,7 @@ describe(`useLiveSuspenseQuery`, () => {
       },
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     await waitFor(() => {
@@ -306,14 +306,14 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-8`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result, rerender } = renderHook(
       () => useLiveSuspenseQuery((q) => q.from({ persons: collection })),
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     await waitFor(() => {
@@ -338,25 +338,25 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-9`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result } = renderHook(
       () => {
         const persons = useLiveSuspenseQuery((q) =>
-          q.from({ persons: personsCollection })
+          q.from({ persons: personsCollection }),
         )
         const johnDoe = useLiveSuspenseQuery((q) =>
           q
             .from({ persons: personsCollection })
             .where(({ persons: p }) => eq(p.id, `1`))
-            .findOne()
+            .findOne(),
         )
         return { persons, johnDoe }
       },
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     await waitFor(() => {
@@ -376,14 +376,14 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-10`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result, unmount } = renderHook(
       () => useLiveSuspenseQuery((q) => q.from({ persons: collection })),
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     await waitFor(() => {
@@ -400,7 +400,7 @@ describe(`useLiveSuspenseQuery`, () => {
       () => {
         expect(liveQueryCollection.status).toBe(`cleaned-up`)
       },
-      { timeout: 1000 }
+      { timeout: 1000 },
     )
   })
 
@@ -410,7 +410,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-11`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     let suspenseCount = 0
@@ -435,7 +435,7 @@ describe(`useLiveSuspenseQuery`, () => {
       () => useLiveSuspenseQuery((q) => q.from({ persons: collection })),
       {
         wrapper: SuspenseCounter,
-      }
+      },
     )
 
     // Wait for initial load
@@ -488,7 +488,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-12`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { result, rerender } = renderHook(
@@ -498,12 +498,12 @@ describe(`useLiveSuspenseQuery`, () => {
             q
               .from({ persons: collection })
               .where(({ persons }) => gt(persons.age, minAge)),
-          [minAge]
+          [minAge],
         ),
       {
         wrapper: SuspenseWrapper,
         initialProps: { minAge: 20 },
-      }
+      },
     )
 
     // Wait for initial load
@@ -540,7 +540,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-single`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Pre-create a SingleResult live query collection
@@ -548,14 +548,14 @@ describe(`useLiveSuspenseQuery`, () => {
       q
         .from({ persons: collection })
         .where(({ persons }) => eq(persons.id, `1`))
-        .findOne()
+        .findOne(),
     )
 
     const { result } = renderHook(
       () => useLiveSuspenseQuery(singlePersonQuery),
       {
         wrapper: SuspenseWrapper,
-      }
+      },
     )
 
     await waitFor(() => {
@@ -575,7 +575,7 @@ describe(`useLiveSuspenseQuery`, () => {
         id: `test-persons-suspense-strict`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const StrictModeWrapper = ({ children }: { children: ReactNode }) => (
@@ -588,7 +588,7 @@ describe(`useLiveSuspenseQuery`, () => {
       () => useLiveSuspenseQuery((q) => q.from({ persons: collection })),
       {
         wrapper: StrictModeWrapper,
-      }
+      },
     )
 
     await waitFor(() => {
diff --git a/packages/react-db/tests/usePacedMutations.test.tsx b/packages/react-db/tests/usePacedMutations.test.tsx
index 8ce10b1d9..cbd058c18 100644
--- a/packages/react-db/tests/usePacedMutations.test.tsx
+++ b/packages/react-db/tests/usePacedMutations.test.tsx
@@ -1,13 +1,13 @@
-import { describe, expect, it, vi } from "vitest"
-import { act, renderHook } from "@testing-library/react"
+import { describe, expect, it, vi } from 'vitest'
+import { act, renderHook } from '@testing-library/react'
 import {
   createCollection,
   debounceStrategy,
   queueStrategy,
   throttleStrategy,
-} from "@tanstack/db"
-import { usePacedMutations } from "../src/usePacedMutations"
-import { mockSyncCollectionOptionsNoInitialState } from "../../db/tests/utils"
+} from '@tanstack/db'
+import { usePacedMutations } from '../src/usePacedMutations'
+import { mockSyncCollectionOptionsNoInitialState } from '../../db/tests/utils'
 
 type Item = {
   id: number
@@ -22,7 +22,7 @@ describe(`usePacedMutations React hook`, () => {
       mockSyncCollectionOptionsNoInitialState<Item>({
         id: `test`,
         getKey: (item) => item.id,
-      })
+      }),
     )
 
     const preloadPromise = collection.preload()
@@ -38,7 +38,7 @@ describe(`usePacedMutations React hook`, () => {
         },
         mutationFn,
         strategy: debounceStrategy({ wait: 50 }),
-      })
+      }),
     )
 
     let tx
@@ -61,7 +61,7 @@ describe(`usePacedMutations React hook`, () => {
       mockSyncCollectionOptionsNoInitialState<Item>({
         id: `test`,
         getKey: (item) => item.id,
-      })
+      }),
     )
 
     const preloadPromise = collection.preload()
@@ -77,7 +77,7 @@ describe(`usePacedMutations React hook`, () => {
         },
         mutationFn,
         strategy: throttleStrategy({ wait: 50, leading: true }),
-      })
+      }),
     )
 
     let tx
@@ -99,7 +99,7 @@ describe(`usePacedMutations React hook`, () => {
       mockSyncCollectionOptionsNoInitialState<Item>({
         id: `test`,
         getKey: (item) => item.id,
-      })
+      }),
     )
 
     const preloadPromise = collection.preload()
@@ -115,7 +115,7 @@ describe(`usePacedMutations React hook`, () => {
         },
         mutationFn,
         strategy: queueStrategy({ wait: 10 }),
-      })
+      }),
     )
 
     let tx
@@ -147,7 +147,7 @@ describe(`usePacedMutations React hook`, () => {
         ({ wait }) => useCustomHook(wait),
         {
           initialProps: { wait: 3000 },
-        }
+        },
       )
 
       const firstMutate = result.current
@@ -228,7 +228,7 @@ describe(`usePacedMutations React hook`, () => {
 
       const { result, rerender } = renderHook(
         ({ opts }) => useDebouncedTransaction(opts),
-        { initialProps: { opts: { wait: 3000 } } }
+        { initialProps: { opts: { wait: 3000 } } },
       )
 
       const firstMutate = result.current
diff --git a/packages/react-db/vite.config.ts b/packages/react-db/vite.config.ts
index a394bec32..1e193ca2f 100644
--- a/packages/react-db/vite.config.ts
+++ b/packages/react-db/vite.config.ts
@@ -1,7 +1,7 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import react from "@vitejs/plugin-react"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import react from '@vitejs/plugin-react'
+import packageJson from './package.json'
 
 export default defineConfig(async () => {
   const tanstack = await tanstackViteConfig({
diff --git a/packages/rxdb-db-collection/CHANGELOG.md b/packages/rxdb-db-collection/CHANGELOG.md
index ec41bb803..af90cbe78 100644
--- a/packages/rxdb-db-collection/CHANGELOG.md
+++ b/packages/rxdb-db-collection/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @tanstack/rxdb-db-collection
 
+## 0.1.47
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.1.46
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.1.45
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.1.44
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.1.43
+
+### Patch Changes
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.1.42
 
 ### Patch Changes
diff --git a/packages/rxdb-db-collection/package.json b/packages/rxdb-db-collection/package.json
index 56b2504c2..e83bd57e0 100644
--- a/packages/rxdb-db-collection/package.json
+++ b/packages/rxdb-db-collection/package.json
@@ -1,48 +1,12 @@
 {
   "name": "@tanstack/rxdb-db-collection",
+  "version": "0.1.47",
   "description": "RxDB collection for TanStack DB",
-  "version": "0.1.42",
-  "dependencies": {
-    "rxdb": "16.21.0",
-    "@standard-schema/spec": "^1.0.0",
-    "@tanstack/db": "workspace:*",
-    "@tanstack/store": "^0.8.0",
-    "debug": "^4.4.3"
-  },
-  "devDependencies": {
-    "@types/debug": "^4.1.12",
-    "@vitest/coverage-istanbul": "^3.2.4"
-  },
-  "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/index.d.cts",
-        "default": "./dist/cjs/index.cjs"
-      }
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
-  "packageManager": "pnpm@10.24.0",
-  "peerDependencies": {
-    "rxdb": ">=16.17.2",
-    "rxjs": ">=7.8.2",
-    "typescript": ">=4.7"
-  },
   "author": "Kyle Mathews",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/TanStack/db.git",
+    "url": "git+https://github.com/TanStack/db.git",
     "directory": "packages/rxdb-db-collection"
   },
   "homepage": "https://tanstack.com/db",
@@ -64,9 +28,44 @@
     "build": "vite build",
     "dev": "vite build --watch",
     "lint": "eslint . --fix",
-    "test": "npx vitest --run"
+    "test": "vitest --run"
   },
-  "sideEffects": false,
   "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.cts",
+        "default": "./dist/cjs/index.cjs"
+      }
+    },
+    "./package.json": "./package.json"
+  },
+  "sideEffects": false,
+  "files": [
+    "dist",
+    "src"
+  ],
+  "dependencies": {
+    "@standard-schema/spec": "^1.0.0",
+    "@tanstack/db": "workspace:*",
+    "@tanstack/store": "^0.8.0",
+    "debug": "^4.4.3",
+    "rxdb": "16.21.1"
+  },
+  "peerDependencies": {
+    "rxdb": ">=16.17.2",
+    "rxjs": ">=7.8.2",
+    "typescript": ">=4.7"
+  },
+  "devDependencies": {
+    "@types/debug": "^4.1.12",
+    "@vitest/coverage-istanbul": "^3.2.4"
+  }
 }
diff --git a/packages/rxdb-db-collection/src/index.ts b/packages/rxdb-db-collection/src/index.ts
index 4d3f5981c..2beb5af06 100644
--- a/packages/rxdb-db-collection/src/index.ts
+++ b/packages/rxdb-db-collection/src/index.ts
@@ -1,2 +1,2 @@
-export * from "./rxdb"
-export * from "./helper"
+export * from './rxdb'
+export * from './helper'
diff --git a/packages/rxdb-db-collection/src/rxdb.ts b/packages/rxdb-db-collection/src/rxdb.ts
index dfb1f9011..6ec59cfb6 100644
--- a/packages/rxdb-db-collection/src/rxdb.ts
+++ b/packages/rxdb-db-collection/src/rxdb.ts
@@ -5,23 +5,23 @@ import {
   lastOfArray,
   prepareQuery,
   rxStorageWriteErrorToRxError,
-} from "rxdb/plugins/core"
-import DebugModule from "debug"
-import { stripRxdbFields } from "./helper"
+} from 'rxdb/plugins/core'
+import DebugModule from 'debug'
+import { stripRxdbFields } from './helper'
 import type {
   FilledMangoQuery,
   RxCollection,
   RxDocumentData,
-} from "rxdb/plugins/core"
-import type { Subscription } from "rxjs"
+} from 'rxdb/plugins/core'
+import type { Subscription } from 'rxjs'
 
 import type {
   BaseCollectionConfig,
   CollectionConfig,
   InferSchemaOutput,
   SyncConfig,
-} from "@tanstack/db"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from '@tanstack/db'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 const debug = DebugModule.debug(`ts/db:rxdb`)
 
@@ -87,7 +87,7 @@ export type RxDBCollectionConfig<
 
 // Overload for when schema is provided
 export function rxdbCollectionOptions<T extends StandardSchemaV1>(
-  config: RxDBCollectionConfig<InferSchemaOutput<T>, T>
+  config: RxDBCollectionConfig<InferSchemaOutput<T>, T>,
 ): CollectionConfig<InferSchemaOutput<T>, string, T> & {
   schema: T
 }
@@ -96,7 +96,7 @@ export function rxdbCollectionOptions<T extends StandardSchemaV1>(
 export function rxdbCollectionOptions<T extends object>(
   config: RxDBCollectionConfig<T> & {
     schema?: never // prohibit schema
-  }
+  },
 ): CollectionConfig<T, string> & {
   schema?: never // no schema in the result
 }
@@ -143,9 +143,9 @@ export function rxdbCollectionOptions(config: RxDBCollectionConfig<any, any>) {
             query = {
               selector: {
                 $or: [
-                  { "_meta.lwt": { $gt: cursor._meta.lwt } },
+                  { '_meta.lwt': { $gt: cursor._meta.lwt } },
                   {
-                    "_meta.lwt": cursor._meta.lwt,
+                    '_meta.lwt': cursor._meta.lwt,
                     [primaryPath]: {
                       $gt: getKey(cursor),
                     },
@@ -153,14 +153,14 @@ export function rxdbCollectionOptions(config: RxDBCollectionConfig<any, any>) {
                 ],
                 _deleted: false,
               },
-              sort: [{ "_meta.lwt": `asc` }, { [primaryPath]: `asc` }],
+              sort: [{ '_meta.lwt': `asc` }, { [primaryPath]: `asc` }],
               limit: syncBatchSize,
               skip: 0,
             }
           } else {
             query = {
               selector: { _deleted: false },
-              sort: [{ "_meta.lwt": `asc` }, { [primaryPath]: `asc` }],
+              sort: [{ '_meta.lwt': `asc` }, { [primaryPath]: `asc` }],
               limit: syncBatchSize,
               skip: 0,
             }
@@ -174,7 +174,7 @@ export function rxdbCollectionOptions(config: RxDBCollectionConfig<any, any>) {
            */
           const preparedQuery = prepareQuery<Row>(
             rxCollection.storageInstance.schema,
-            query
+            query,
           )
           const result = await rxCollection.storageInstance.query(preparedQuery)
           const docs = result.documents
@@ -228,7 +228,7 @@ export function rxdbCollectionOptions(config: RxDBCollectionConfig<any, any>) {
         const subs = getFromMapOrCreate(
           OPEN_RXDB_SUBSCRIPTIONS,
           rxCollection,
-          () => new Set()
+          () => new Set(),
         )
         subs.add(sub)
       }
@@ -253,7 +253,7 @@ export function rxdbCollectionOptions(config: RxDBCollectionConfig<any, any>) {
         const subs = getFromMapOrCreate(
           OPEN_RXDB_SUBSCRIPTIONS,
           rxCollection,
-          () => new Set()
+          () => new Set(),
         )
         subs.delete(sub)
         sub.unsubscribe()
@@ -280,7 +280,8 @@ export function rxdbCollectionOptions(config: RxDBCollectionConfig<any, any>) {
     onUpdate: async (params) => {
       debug(`update`, params)
       const mutations = params.transaction.mutations.filter(
-        (m) => m.type === `update`
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        (m) => m.type === `update`,
       )
 
       for (const mutation of mutations) {
@@ -296,7 +297,8 @@ export function rxdbCollectionOptions(config: RxDBCollectionConfig<any, any>) {
     onDelete: async (params) => {
       debug(`delete`, params)
       const mutations = params.transaction.mutations.filter(
-        (m) => m.type === `delete`
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        (m) => m.type === `delete`,
       )
       const ids = mutations.map((mutation) => getKey(mutation.original))
       return rxCollection.bulkRemove(ids).then((result) => {
diff --git a/packages/rxdb-db-collection/tests/rxdb.test.ts b/packages/rxdb-db-collection/tests/rxdb.test.ts
index 87c1b9dff..03f470d88 100644
--- a/packages/rxdb-db-collection/tests/rxdb.test.ts
+++ b/packages/rxdb-db-collection/tests/rxdb.test.ts
@@ -1,16 +1,16 @@
-import { describe, expect, it } from "vitest"
-import { createCollection } from "@tanstack/db"
+import { describe, expect, it } from 'vitest'
+import { createCollection } from '@tanstack/db'
 import {
   addRxPlugin,
   createRxDatabase,
   getFromMapOrCreate,
-} from "rxdb/plugins/core"
-import { RxDBDevModePlugin } from "rxdb/plugins/dev-mode"
-import { getRxStorageMemory } from "rxdb/plugins/storage-memory"
-import { wrappedValidateAjvStorage } from "rxdb/plugins/validate-ajv"
-import { OPEN_RXDB_SUBSCRIPTIONS, rxdbCollectionOptions } from "../src/rxdb"
-import type { RxCollection } from "rxdb/plugins/core"
-import type { RxDBCollectionConfig } from "../src/rxdb"
+} from 'rxdb/plugins/core'
+import { RxDBDevModePlugin } from 'rxdb/plugins/dev-mode'
+import { getRxStorageMemory } from 'rxdb/plugins/storage-memory'
+import { wrappedValidateAjvStorage } from 'rxdb/plugins/validate-ajv'
+import { OPEN_RXDB_SUBSCRIPTIONS, rxdbCollectionOptions } from '../src/rxdb'
+import type { RxCollection } from 'rxdb/plugins/core'
+import type { RxDBCollectionConfig } from '../src/rxdb'
 
 type TestDocType = {
   id: string
@@ -36,7 +36,7 @@ describe(`RxDB Integration`, () => {
 
   async function getDatababase(
     initialDocs: Array<TestDocType> = [],
-    dbId = dbNameId++
+    dbId = dbNameId++,
   ) {
     const db = await createRxDatabase<RxCollections, unknown, unknown, unknown>(
       {
@@ -45,7 +45,7 @@ describe(`RxDB Integration`, () => {
         storage: wrappedValidateAjvStorage({
           storage: getRxStorageMemory(),
         }),
-      }
+      },
     )
     const collections = await db.addCollections<RxCollections>({
       test: {
@@ -76,7 +76,7 @@ describe(`RxDB Integration`, () => {
 
   async function createTestState(
     initialDocs: Array<TestDocType> = [],
-    config: Partial<RxDBCollectionConfig<TestDocType, any>> = {}
+    config: Partial<RxDBCollectionConfig<TestDocType, any>> = {},
   ) {
     const db = await getDatababase(initialDocs, dbNameId++)
     const rxCollection: RxCollection<TestDocType> = db.test
@@ -205,7 +205,7 @@ describe(`RxDB Integration`, () => {
       const subs = getFromMapOrCreate(
         OPEN_RXDB_SUBSCRIPTIONS,
         rxCollection,
-        () => new Set()
+        () => new Set(),
       )
       expect(subs.size).toEqual(0)
 
@@ -249,13 +249,13 @@ describe(`RxDB Integration`, () => {
         rxdbCollectionOptions({
           rxCollection: db1.test,
           startSync: true,
-        })
+        }),
       )
       const col2 = createCollection(
         rxdbCollectionOptions({
           rxCollection: db2.test,
           startSync: true,
-        })
+        }),
       )
       await col1.stateWhenReady()
       await col2.stateWhenReady()
diff --git a/packages/rxdb-db-collection/vite.config.ts b/packages/rxdb-db-collection/vite.config.ts
index c7968f28a..aa589f666 100644
--- a/packages/rxdb-db-collection/vite.config.ts
+++ b/packages/rxdb-db-collection/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -17,5 +17,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/solid-db/CHANGELOG.md b/packages/solid-db/CHANGELOG.md
index ecacfad5f..bcf19eaf3 100644
--- a/packages/solid-db/CHANGELOG.md
+++ b/packages/solid-db/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @tanstack/react-db
 
+## 0.1.58
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.1.57
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.1.56
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.1.55
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.1.54
+
+### Patch Changes
+
+- Fixed `isReady` to return `true` for disabled queries in `useLiveQuery`/`injectLiveQuery` across all framework packages. When a query function returns `null` or `undefined` (disabling the query), there's no async operation to wait for, so the hook should be considered "ready" immediately. ([#886](https://github.com/TanStack/db/pull/886))
+
+  Additionally, all frameworks now have proper TypeScript overloads that explicitly support returning `undefined | null` from query functions, making the disabled query pattern type-safe.
+
+  This fixes the common pattern where users conditionally enable queries and don't want to show loading states when the query is disabled.
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.1.53
 
 ### Patch Changes
diff --git a/packages/solid-db/package.json b/packages/solid-db/package.json
index 84b027be8..26c1f432e 100644
--- a/packages/solid-db/package.json
+++ b/packages/solid-db/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@tanstack/solid-db",
+  "version": "0.1.58",
   "description": "Solid integration for @tanstack/db",
-  "version": "0.1.53",
   "author": "Kyle Mathews",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/TanStack/db.git",
+    "url": "git+https://github.com/TanStack/db.git",
     "directory": "packages/solid-db"
   },
   "homepage": "https://tanstack.com/db",
@@ -15,20 +15,16 @@
     "solid",
     "typescript"
   ],
-  "packageManager": "pnpm@10.24.0",
-  "dependencies": {
-    "@solid-primitives/map": "^0.7.2",
-    "@tanstack/db": "workspace:*"
-  },
-  "devDependencies": {
-    "@electric-sql/client": "1.2.0",
-    "@solidjs/testing-library": "^0.8.10",
-    "@vitest/coverage-istanbul": "^3.2.4",
-    "jsdom": "^27.2.0",
-    "solid-js": "^1.9.10",
-    "vite-plugin-solid": "^2.11.10",
-    "vitest": "^3.2.4"
+  "scripts": {
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "test": "vitest --run",
+    "lint": "eslint . --fix"
   },
+  "type": "module",
+  "main": "dist/esm/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -38,22 +34,25 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
+  "dependencies": {
+    "@solid-primitives/map": "^0.7.2",
+    "@tanstack/db": "workspace:*"
+  },
   "peerDependencies": {
     "solid-js": ">=1.9.0"
   },
-  "scripts": {
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "test": "vitest --run",
-    "lint": "eslint . --fix"
-  },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@electric-sql/client": "^1.3.0",
+    "@solidjs/testing-library": "^0.8.10",
+    "@vitest/coverage-istanbul": "^3.2.4",
+    "jsdom": "^27.2.0",
+    "solid-js": "^1.9.10",
+    "vite-plugin-solid": "^2.11.10",
+    "vitest": "^3.2.4"
+  }
 }
diff --git a/packages/solid-db/src/index.ts b/packages/solid-db/src/index.ts
index bd98349f0..681078b9c 100644
--- a/packages/solid-db/src/index.ts
+++ b/packages/solid-db/src/index.ts
@@ -1,9 +1,9 @@
 // Re-export all public APIs
-export * from "./useLiveQuery"
+export * from './useLiveQuery'
 
 // Re-export everything from @tanstack/db
-export * from "@tanstack/db"
+export * from '@tanstack/db'
 
 // Re-export some stuff explicitly to ensure the type & value is exported
-export type { Collection } from "@tanstack/db"
-export { createTransaction } from "@tanstack/db"
+export type { Collection } from '@tanstack/db'
+export { createTransaction } from '@tanstack/db'
diff --git a/packages/solid-db/src/useLiveQuery.ts b/packages/solid-db/src/useLiveQuery.ts
index 9654ac20b..b804d3d5f 100644
--- a/packages/solid-db/src/useLiveQuery.ts
+++ b/packages/solid-db/src/useLiveQuery.ts
@@ -5,15 +5,15 @@ import {
   createResource,
   createSignal,
   onCleanup,
-} from "solid-js"
-import { ReactiveMap } from "@solid-primitives/map"
+} from 'solid-js'
+import { ReactiveMap } from '@solid-primitives/map'
 import {
   BaseQueryBuilder,
   CollectionImpl,
   createLiveQueryCollection,
-} from "@tanstack/db"
-import { createStore, reconcile } from "solid-js/store"
-import type { Accessor } from "solid-js"
+} from '@tanstack/db'
+import { createStore, reconcile } from 'solid-js/store'
+import type { Accessor } from 'solid-js'
 import type {
   ChangeMessage,
   Collection,
@@ -23,7 +23,7 @@ import type {
   InitialQueryBuilder,
   LiveQueryCollectionConfig,
   QueryBuilder,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 /**
  * Create a live query using a query function
@@ -82,7 +82,7 @@ import type {
  */
 // Overload 1: Accept query function that always returns QueryBuilder
 export function useLiveQuery<TContext extends Context>(
-  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>
+  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
 ): {
   state: ReactiveMap<string | number, GetResult<TContext>>
   data: Array<GetResult<TContext>>
@@ -97,7 +97,9 @@ export function useLiveQuery<TContext extends Context>(
 
 // Overload 1b: Accept query function that can return undefined/null
 export function useLiveQuery<TContext extends Context>(
-  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext> | undefined | null
+  queryFn: (
+    q: InitialQueryBuilder,
+  ) => QueryBuilder<TContext> | undefined | null,
 ): {
   state: ReactiveMap<string | number, GetResult<TContext>>
   data: Array<GetResult<TContext>>
@@ -156,7 +158,7 @@ export function useLiveQuery<TContext extends Context>(
  */
 // Overload 2: Accept config object
 export function useLiveQuery<TContext extends Context>(
-  config: Accessor<LiveQueryCollectionConfig<TContext>>
+  config: Accessor<LiveQueryCollectionConfig<TContext>>,
 ): {
   state: ReactiveMap<string | number, GetResult<TContext>>
   data: Array<GetResult<TContext>>
@@ -210,7 +212,7 @@ export function useLiveQuery<
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: Accessor<Collection<TResult, TKey, TUtils>>
+  liveQueryCollection: Accessor<Collection<TResult, TKey, TUtils>>,
 ): {
   state: ReactiveMap<TKey, TResult>
   data: Array<TResult>
@@ -225,7 +227,7 @@ export function useLiveQuery<
 
 // Implementation - use function overloads to infer the actual collection type
 export function useLiveQuery(
-  configOrQueryOrCollection: (queryFn?: any) => any
+  configOrQueryOrCollection: (queryFn?: any) => any,
 ) {
   const collection = createMemo(
     () => {
@@ -263,7 +265,7 @@ export function useLiveQuery(
       })
     },
     undefined,
-    { name: `TanstackDBCollectionMemo` }
+    { name: `TanstackDBCollectionMemo` },
   )
 
   // Reactive state that gets updated granularly through change events
@@ -279,15 +281,15 @@ export function useLiveQuery(
     collection() ? collection()!.status : (`disabled` as const),
     {
       name: `TanstackDBStatus`,
-    }
+    },
   )
 
   // Helper to sync data array from collection in correct order
   const syncDataFromCollection = (
-    currentCollection: Collection<any, any, any>
+    currentCollection: Collection<any, any, any>,
   ) => {
     setData((prev) =>
-      reconcile(Array.from(currentCollection.values()))(prev).filter(Boolean)
+      reconcile(Array.from(currentCollection.values()))(prev).filter(Boolean),
     )
   }
 
@@ -345,7 +347,7 @@ export function useLiveQuery(
         },
         {
           includeInitialState: true,
-        }
+        },
       )
 
       currentUnsubscribe = subscription.unsubscribe.bind(subscription)
@@ -364,7 +366,7 @@ export function useLiveQuery(
       })
     },
     undefined,
-    { name: `TanstackDBSyncComputed` }
+    { name: `TanstackDBSyncComputed` },
   )
 
   return {
diff --git a/packages/solid-db/tests/test-setup.ts b/packages/solid-db/tests/test-setup.ts
index 9b279c469..6c99e8bb9 100644
--- a/packages/solid-db/tests/test-setup.ts
+++ b/packages/solid-db/tests/test-setup.ts
@@ -1,6 +1,6 @@
-import "@testing-library/jest-dom/vitest"
-import { cleanup } from "@solidjs/testing-library"
-import { afterEach } from "vitest"
+import '@testing-library/jest-dom/vitest'
+import { cleanup } from '@solidjs/testing-library'
+import { afterEach } from 'vitest'
 
 // https://testing-library.com/docs/solid-testing-library/api/#cleanup
 afterEach(() => cleanup())
diff --git a/packages/solid-db/tests/useLiveQuery.test.tsx b/packages/solid-db/tests/useLiveQuery.test.tsx
index db59f828a..2afca16d9 100644
--- a/packages/solid-db/tests/useLiveQuery.test.tsx
+++ b/packages/solid-db/tests/useLiveQuery.test.tsx
@@ -1,5 +1,5 @@
-import { describe, expect, it } from "vitest"
-import { renderHook, waitFor } from "@solidjs/testing-library"
+import { describe, expect, it } from 'vitest'
+import { renderHook, waitFor } from '@solidjs/testing-library'
 import {
   Query,
   count,
@@ -8,11 +8,11 @@ import {
   createOptimisticAction,
   eq,
   gt,
-} from "@tanstack/db"
-import { createComputed, createRoot, createSignal } from "solid-js"
-import { useLiveQuery } from "../src/useLiveQuery"
-import { mockSyncCollectionOptions } from "../../db/tests/utils"
-import type { Accessor } from "solid-js"
+} from '@tanstack/db'
+import { createComputed, createRoot, createSignal } from 'solid-js'
+import { useLiveQuery } from '../src/useLiveQuery'
+import { mockSyncCollectionOptions } from '../../db/tests/utils'
+import type { Accessor } from 'solid-js'
 
 type Person = {
   id: string
@@ -85,7 +85,7 @@ describe(`Query Collections`, () => {
         id: `test-persons`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const rendered = renderHook(() => {
@@ -97,7 +97,7 @@ describe(`Query Collections`, () => {
             id: persons.id,
             name: persons.name,
             age: persons.age,
-          }))
+          })),
       )
     })
 
@@ -121,7 +121,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const rendered = renderHook(() => {
@@ -133,7 +133,7 @@ describe(`Query Collections`, () => {
             id: c.id,
             name: c.name,
           }))
-          .orderBy(({ collection: c }) => c.id, `asc`)
+          .orderBy(({ collection: c }) => c.id, `asc`),
       )
     })
 
@@ -190,7 +190,7 @@ describe(`Query Collections`, () => {
           id: `4`,
           name: `Kyle Doe`,
         }),
-      ])
+      ]),
     )
 
     // Update the person
@@ -227,7 +227,7 @@ describe(`Query Collections`, () => {
           id: `4`,
           name: `Kyle Doe 2`,
         }),
-      ])
+      ]),
     )
 
     // Delete the person
@@ -264,7 +264,7 @@ describe(`Query Collections`, () => {
         id: `person-collection-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create issue collection
@@ -273,7 +273,7 @@ describe(`Query Collections`, () => {
         id: `issue-collection-test`,
         getKey: (issue: Issue) => issue.id,
         initialData: initialIssues,
-      })
+      }),
     )
 
     const { result } = renderHook(() => {
@@ -281,13 +281,13 @@ describe(`Query Collections`, () => {
         q
           .from({ issues: issueCollection })
           .join({ persons: personCollection }, ({ issues, persons }) =>
-            eq(issues.userId, persons.id)
+            eq(issues.userId, persons.id),
           )
           .select(({ issues, persons }) => ({
             id: issues.id,
             title: issues.title,
             name: persons.name,
-          }))
+          })),
       )
     })
 
@@ -387,7 +387,7 @@ describe(`Query Collections`, () => {
           id: `params-change-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const [minAge, setMinAge] = createSignal(30)
@@ -401,10 +401,10 @@ describe(`Query Collections`, () => {
                 id: c.id,
                 name: c.name,
                 age: c.age,
-              }))
+              })),
           )
         },
-        { initialProps: [{ minAge: minAge }] }
+        { initialProps: [{ minAge: minAge }] },
       )
 
       // Wait for collection to sync
@@ -460,7 +460,7 @@ describe(`Query Collections`, () => {
           id: `stop-query-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const [minAge, setMinAge] = createSignal(30)
@@ -473,10 +473,10 @@ describe(`Query Collections`, () => {
               .select(({ collection: c }) => ({
                 id: c.id,
                 name: c.name,
-              }))
+              })),
           )
         },
-        { initialProps: [{ minAge }] }
+        { initialProps: [{ minAge }] },
       )
 
       // Wait for collection to sync
@@ -523,7 +523,7 @@ describe(`Query Collections`, () => {
         id: `optimistic-changes-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Initial query
@@ -537,7 +537,7 @@ describe(`Query Collections`, () => {
             name: c.name,
             team: c.team,
           }))
-          .orderBy(({ collection: c }) => c.id, `asc`)
+          .orderBy(({ collection: c }) => c.id, `asc`),
       )
     })
 
@@ -553,7 +553,7 @@ describe(`Query Collections`, () => {
           .select(({ queryResult }) => ({
             team: queryResult.team,
             count: count(queryResult.id),
-          }))
+          })),
       )
     })
 
@@ -628,7 +628,7 @@ describe(`Query Collections`, () => {
         id: `person-collection-test-bug`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create issue collection
@@ -637,7 +637,7 @@ describe(`Query Collections`, () => {
         id: `issue-collection-test-bug`,
         getKey: (issue: Issue) => issue.id,
         initialData: initialIssues,
-      })
+      }),
     )
 
     // Render the hook with a query that joins persons and issues
@@ -646,13 +646,13 @@ describe(`Query Collections`, () => {
         q
           .from({ issues: issueCollection })
           .join({ persons: personCollection }, ({ issues, persons }) =>
-            eq(issues.userId, persons.id)
+            eq(issues.userId, persons.id),
           )
           .select(({ issues, persons }) => ({
             id: issues.id,
             title: issues.title,
             name: persons.name,
-          }))
+          })),
       )
 
       // Track each render state
@@ -751,7 +751,8 @@ describe(`Query Collections`, () => {
 
     // Check if we had any render where the temp key was removed but the permanent key wasn't added yet
     const hadFlicker = renderStates.some(
-      (state) => !state.hasTempKey && !state.hasPermKey && state.stateSize === 3
+      (state) =>
+        !state.hasTempKey && !state.hasPermKey && state.stateSize === 3,
     )
 
     expect(hadFlicker).toBe(false)
@@ -772,7 +773,7 @@ describe(`Query Collections`, () => {
         id: `pre-created-collection-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create a live query collection beforehand
@@ -817,7 +818,7 @@ describe(`Query Collections`, () => {
           id: `collection-1`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const collection2 = createCollection(
@@ -842,7 +843,7 @@ describe(`Query Collections`, () => {
               team: `team3`,
             },
           ],
-        })
+        }),
       )
 
       // Create two different live query collections
@@ -875,7 +876,7 @@ describe(`Query Collections`, () => {
         (props: { collection: Accessor<any> }) => {
           return useLiveQuery(props.collection)
         },
-        { initialProps: [{ collection: collection }] }
+        { initialProps: [{ collection: collection }] },
       )
 
       // Wait for first collection to sync
@@ -918,7 +919,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-config-querybuilder`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create a QueryBuilder instance beforehand
@@ -982,7 +983,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1022,7 +1023,7 @@ describe(`Query Collections`, () => {
           id: `pre-created-has-loaded-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       // Create a live query collection that's already syncing
@@ -1080,7 +1081,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1125,7 +1126,7 @@ describe(`Query Collections`, () => {
           id: `live-updates-has-loaded-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { result } = renderHook(() => {
@@ -1136,7 +1137,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1219,13 +1220,13 @@ describe(`Query Collections`, () => {
           q
             .from({ issues: issueCollection })
             .join({ persons: personCollection }, ({ issues, persons }) =>
-              eq(issues.userId, persons.id)
+              eq(issues.userId, persons.id),
             )
             .select(({ issues, persons }) => ({
               id: issues.id,
               title: issues.title,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1306,10 +1307,10 @@ describe(`Query Collections`, () => {
                 .select(({ collection: c }) => ({
                   id: c.id,
                   name: c.name,
-                }))
+                })),
             )
           },
-          { initialProps: [{ minAge: minAge }] }
+          { initialProps: [{ minAge: minAge }] },
         )
 
         // Initially should be false
@@ -1394,7 +1395,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1502,7 +1503,7 @@ describe(`Query Collections`, () => {
               id: persons.id,
               name: persons.name,
               team: persons.team,
-            }))
+            })),
         )
       })
 
@@ -1617,13 +1618,13 @@ describe(`Query Collections`, () => {
           q
             .from({ issues: issueCollection })
             .join({ persons: personCollection }, ({ issues, persons }) =>
-              eq(issues.userId, persons.id)
+              eq(issues.userId, persons.id),
             )
             .select(({ issues, persons }) => ({
               id: issues.id,
               title: issues.title,
               userName: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1716,7 +1717,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
       })
 
@@ -1757,7 +1758,7 @@ describe(`Query Collections`, () => {
             id: `disabled-undefined-test`,
             getKey: (person: Person) => person.id,
             initialData: initialPersons,
-          })
+          }),
         )
 
         const [enabled, setEnabled] = createSignal(false)
@@ -1775,7 +1776,7 @@ describe(`Query Collections`, () => {
                 }))
             })
           },
-          { initialProps: [{ enabled }] }
+          { initialProps: [{ enabled }] },
         )
 
         // When callback returns undefined, should return disabled state
@@ -1814,7 +1815,7 @@ describe(`Query Collections`, () => {
             id: `disabled-null-test`,
             getKey: (person: Person) => person.id,
             initialData: initialPersons,
-          })
+          }),
         )
 
         const [enabled, setEnabled] = createSignal(false)
@@ -1832,7 +1833,7 @@ describe(`Query Collections`, () => {
                 }))
             })
           },
-          { initialProps: [{ enabled }] }
+          { initialProps: [{ enabled }] },
         )
 
         // When callback returns null, should return disabled state
diff --git a/packages/solid-db/vite.config.ts b/packages/solid-db/vite.config.ts
index 043716caa..aa8d1d9f3 100644
--- a/packages/solid-db/vite.config.ts
+++ b/packages/solid-db/vite.config.ts
@@ -1,7 +1,7 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import solidPlugin from "vite-plugin-solid"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import solidPlugin from 'vite-plugin-solid'
+import packageJson from './package.json'
 
 const config = defineConfig({
   plugins: [solidPlugin()],
@@ -21,5 +21,5 @@ export default mergeConfig(
     entry: `./src/index.ts`,
     srcDir: `./src`,
     cjs: false,
-  })
+  }),
 )
diff --git a/packages/svelte-db/CHANGELOG.md b/packages/svelte-db/CHANGELOG.md
index 846f70554..644717632 100644
--- a/packages/svelte-db/CHANGELOG.md
+++ b/packages/svelte-db/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @tanstack/svelte-db
 
+## 0.1.58
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.1.57
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.1.56
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.1.55
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.1.54
+
+### Patch Changes
+
+- Fixed `isReady` to return `true` for disabled queries in `useLiveQuery`/`injectLiveQuery` across all framework packages. When a query function returns `null` or `undefined` (disabling the query), there's no async operation to wait for, so the hook should be considered "ready" immediately. ([#886](https://github.com/TanStack/db/pull/886))
+
+  Additionally, all frameworks now have proper TypeScript overloads that explicitly support returning `undefined | null` from query functions, making the disabled query pattern type-safe.
+
+  This fixes the common pattern where users conditionally enable queries and don't want to show loading states when the query is disabled.
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.1.53
 
 ### Patch Changes
diff --git a/packages/svelte-db/package.json b/packages/svelte-db/package.json
index 9a1bea95c..846dc7749 100644
--- a/packages/svelte-db/package.json
+++ b/packages/svelte-db/package.json
@@ -1,52 +1,55 @@
 {
   "name": "@tanstack/svelte-db",
+  "version": "0.1.58",
   "description": "Svelte integration for @tanstack/db",
-  "version": "0.1.53",
-  "dependencies": {
-    "@tanstack/db": "workspace:*"
+  "author": "Kyle Mathews",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TanStack/db.git",
+    "directory": "packages/svelte-db"
   },
-  "devDependencies": {
-    "@sveltejs/package": "^2.5.7",
-    "@sveltejs/vite-plugin-svelte": "^6.2.1",
-    "@vitest/coverage-istanbul": "^3.2.4",
-    "publint": "^0.3.15",
-    "svelte": "^5.45.2",
-    "svelte-check": "^4.3.4"
+  "homepage": "https://tanstack.com/db",
+  "keywords": [
+    "optimistic",
+    "svelte",
+    "typescript"
+  ],
+  "scripts": {
+    "build": "svelte-package --input ./src --output ./dist --tsconfig ./tsconfig.build.json",
+    "lint": "eslint . --fix",
+    "test": "vitest --run",
+    "test:types": "svelte-check --tsconfig ./tsconfig.json"
   },
+  "type": "module",
+  "svelte": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "svelte": "./dist/index.js"
     }
   },
+  "sideEffects": [
+    "**/*.css"
+  ],
   "files": [
     "dist",
     "!dist/**/*.test.*",
     "!dist/**/*.spec.*"
   ],
-  "keywords": [
-    "optimistic",
-    "svelte",
-    "typescript"
-  ],
+  "dependencies": {
+    "@tanstack/db": "workspace:*"
+  },
   "peerDependencies": {
     "svelte": "^5.0.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/TanStack/db.git",
-    "directory": "packages/svelte-db"
-  },
-  "scripts": {
-    "build": "svelte-package --input ./src --output ./dist --tsconfig ./tsconfig.build.json",
-    "lint": "eslint . --fix",
-    "test": "npx vitest --run",
-    "test:types": "svelte-check --tsconfig ./tsconfig.json"
-  },
-  "sideEffects": [
-    "**/*.css"
-  ],
-  "svelte": "./dist/index.js",
-  "type": "module",
-  "types": "./dist/index.d.ts"
+  "devDependencies": {
+    "@sveltejs/package": "^2.5.7",
+    "@sveltejs/vite-plugin-svelte": "^6.2.1",
+    "@vitest/coverage-istanbul": "^3.2.4",
+    "publint": "^0.3.15",
+    "svelte": "^5.45.6",
+    "svelte-check": "^4.3.4"
+  }
 }
diff --git a/packages/svelte-db/src/index.ts b/packages/svelte-db/src/index.ts
index 0e460625d..a07f98a64 100644
--- a/packages/svelte-db/src/index.ts
+++ b/packages/svelte-db/src/index.ts
@@ -1,9 +1,9 @@
 // Re-export all public APIs
-export * from "./useLiveQuery.svelte.js"
+export * from './useLiveQuery.svelte.js'
 
 // Re-export everything from @tanstack/db
-export * from "@tanstack/db"
+export * from '@tanstack/db'
 
 // Re-export some stuff explicitly to ensure the type & value is exported
-export type { Collection } from "@tanstack/db"
-export { createTransaction } from "@tanstack/db"
+export type { Collection } from '@tanstack/db'
+export { createTransaction } from '@tanstack/db'
diff --git a/packages/svelte-db/src/useLiveQuery.svelte.ts b/packages/svelte-db/src/useLiveQuery.svelte.ts
index af7f5b550..436112b5f 100644
--- a/packages/svelte-db/src/useLiveQuery.svelte.ts
+++ b/packages/svelte-db/src/useLiveQuery.svelte.ts
@@ -1,8 +1,8 @@
 // eslint-disable-next-line import/no-duplicates -- See https://github.com/un-ts/eslint-plugin-import-x/issues/308
-import { untrack } from "svelte"
+import { untrack } from 'svelte'
 // eslint-disable-next-line import/no-duplicates -- See https://github.com/un-ts/eslint-plugin-import-x/issues/308
-import { SvelteMap } from "svelte/reactivity"
-import { BaseQueryBuilder, createLiveQueryCollection } from "@tanstack/db"
+import { SvelteMap } from 'svelte/reactivity'
+import { BaseQueryBuilder, createLiveQueryCollection } from '@tanstack/db'
 import type {
   ChangeMessage,
   Collection,
@@ -12,7 +12,7 @@ import type {
   InitialQueryBuilder,
   LiveQueryCollectionConfig,
   QueryBuilder,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 /**
  * Return type for useLiveQuery hook
@@ -154,15 +154,15 @@ function toValue<T>(value: MaybeGetter<T>): T {
 // Overload 1: Accept query function that always returns QueryBuilder
 export function useLiveQuery<TContext extends Context>(
   queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
-  deps?: Array<() => unknown>
+  deps?: Array<() => unknown>,
 ): UseLiveQueryReturn<GetResult<TContext>>
 
 // Overload 1b: Accept query function that can return undefined/null
 export function useLiveQuery<TContext extends Context>(
   queryFn: (
-    q: InitialQueryBuilder
+    q: InitialQueryBuilder,
   ) => QueryBuilder<TContext> | undefined | null,
-  deps?: Array<() => unknown>
+  deps?: Array<() => unknown>,
 ): UseLiveQueryReturn<GetResult<TContext>>
 
 /**
@@ -205,7 +205,7 @@ export function useLiveQuery<TContext extends Context>(
 // Overload 2: Accept config object
 export function useLiveQuery<TContext extends Context>(
   config: LiveQueryCollectionConfig<TContext>,
-  deps?: Array<() => unknown>
+  deps?: Array<() => unknown>,
 ): UseLiveQueryReturn<GetResult<TContext>>
 
 /**
@@ -257,13 +257,13 @@ export function useLiveQuery<
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: MaybeGetter<Collection<TResult, TKey, TUtils>>
+  liveQueryCollection: MaybeGetter<Collection<TResult, TKey, TUtils>>,
 ): UseLiveQueryReturnWithCollection<TResult, TKey, TUtils>
 
 // Implementation
 export function useLiveQuery(
   configOrQueryOrCollection: any,
-  deps: Array<() => unknown> = []
+  deps: Array<() => unknown> = [],
 ): UseLiveQueryReturn<any> | UseLiveQueryReturnWithCollection<any, any, any> {
   const collection = $derived.by(() => {
     // First check if the original parameter might be a getter
@@ -333,7 +333,7 @@ export function useLiveQuery(
 
   // Helper to sync data array from collection in correct order
   const syncDataFromCollection = (
-    currentCollection: Collection<any, any, any>
+    currentCollection: Collection<any, any, any>,
   ) => {
     untrack(() => {
       internalData = []
@@ -414,7 +414,7 @@ export function useLiveQuery(
       },
       {
         includeInitialState: true,
-      }
+      },
     )
 
     currentUnsubscribe = subscription.unsubscribe.bind(subscription)
diff --git a/packages/svelte-db/svelte.config.js b/packages/svelte-db/svelte.config.js
index af7d74ea4..94ca454ac 100644
--- a/packages/svelte-db/svelte.config.js
+++ b/packages/svelte-db/svelte.config.js
@@ -1,4 +1,4 @@
-import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
 
 const config = {
   preprocess: vitePreprocess(),
diff --git a/packages/svelte-db/tests/useLiveQuery.svelte.test.ts b/packages/svelte-db/tests/useLiveQuery.svelte.test.ts
index c7ad28cc1..edf7eb79c 100644
--- a/packages/svelte-db/tests/useLiveQuery.svelte.test.ts
+++ b/packages/svelte-db/tests/useLiveQuery.svelte.test.ts
@@ -1,14 +1,14 @@
-import { afterEach, describe, expect, it } from "vitest"
+import { afterEach, describe, expect, it } from 'vitest'
 import {
   count,
   createCollection,
   createLiveQueryCollection,
   eq,
   gt,
-} from "@tanstack/db"
-import { flushSync } from "svelte"
-import { useLiveQuery } from "../src/useLiveQuery.svelte.js"
-import { mockSyncCollectionOptions } from "../../db/tests/utils"
+} from '@tanstack/db'
+import { flushSync } from 'svelte'
+import { useLiveQuery } from '../src/useLiveQuery.svelte.js'
+import { mockSyncCollectionOptions } from '../../db/tests/utils'
 
 type Person = {
   id: string
@@ -87,7 +87,7 @@ describe(`Query Collections`, () => {
         id: `test-persons`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -99,7 +99,7 @@ describe(`Query Collections`, () => {
             id: persons.id,
             name: persons.name,
             age: persons.age,
-          }))
+          })),
       )
 
       flushSync()
@@ -122,7 +122,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-destructure`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -136,7 +136,7 @@ describe(`Query Collections`, () => {
             id: persons.id,
             name: persons.name,
             age: persons.age,
-          }))
+          })),
       )
 
       // Destructure using $derived to maintain reactivity
@@ -212,7 +212,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -224,7 +224,7 @@ describe(`Query Collections`, () => {
             id: c.id,
             name: c.name,
           }))
-          .orderBy(({ collection: c }) => c.id, `asc`)
+          .orderBy(({ collection: c }) => c.id, `asc`),
       )
 
       // Wait for collection to sync
@@ -280,7 +280,7 @@ describe(`Query Collections`, () => {
             id: `4`,
             name: `Kyle Doe`,
           }),
-        ])
+        ]),
       )
 
       // Update the person
@@ -317,7 +317,7 @@ describe(`Query Collections`, () => {
             id: `4`,
             name: `Kyle Doe 2`,
           }),
-        ])
+        ]),
       )
 
       // Delete the person
@@ -355,7 +355,7 @@ describe(`Query Collections`, () => {
         id: `person-collection-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -365,20 +365,20 @@ describe(`Query Collections`, () => {
           id: `issue-collection-test`,
           getKey: (issue: Issue) => issue.id,
           initialData: initialIssues,
-        })
+        }),
       )
 
       const query = useLiveQuery((q) =>
         q
           .from({ issues: issueCollection })
           .join({ persons: personCollection }, ({ issues, persons }) =>
-            eq(issues.userId, persons.id)
+            eq(issues.userId, persons.id),
           )
           .select(({ issues, persons }) => ({
             id: issues.id,
             title: issues.title,
             name: persons.name,
-          }))
+          })),
       )
 
       // Wait for collections to sync
@@ -476,7 +476,7 @@ describe(`Query Collections`, () => {
         id: `params-change-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -492,7 +492,7 @@ describe(`Query Collections`, () => {
               name: c.name,
               age: c.age,
             })),
-        [() => minAge]
+        [() => minAge],
       )
 
       // Wait for collection to sync
@@ -545,7 +545,7 @@ describe(`Query Collections`, () => {
         id: `optimistic-changes-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -559,7 +559,7 @@ describe(`Query Collections`, () => {
             name: c.name,
             team: c.team,
           }))
-          .orderBy(({ collection: c }) => c.id, `asc`)
+          .orderBy(({ collection: c }) => c.id, `asc`),
       )
 
       // Wait for collection to sync
@@ -573,7 +573,7 @@ describe(`Query Collections`, () => {
           .select(({ queryResult }) => ({
             team: queryResult.team,
             count: count(queryResult.id),
-          }))
+          })),
       )
 
       // Wait for grouped query to sync
@@ -640,7 +640,7 @@ describe(`Query Collections`, () => {
         id: `person-collection-test-bug`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create issue collection
@@ -649,7 +649,7 @@ describe(`Query Collections`, () => {
         id: `issue-collection-test-bug`,
         getKey: (issue: Issue) => issue.id,
         initialData: initialIssues,
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -658,13 +658,13 @@ describe(`Query Collections`, () => {
         q
           .from({ issues: issueCollection })
           .join({ persons: personCollection }, ({ issues, persons }) =>
-            eq(issues.userId, persons.id)
+            eq(issues.userId, persons.id),
           )
           .select(({ issues, persons }) => ({
             id: issues.id,
             title: issues.title,
             name: persons.name,
-          }))
+          })),
       )
 
       // Wait for collections to sync and verify initial state
@@ -703,7 +703,7 @@ describe(`Query Collections`, () => {
         id: `pre-created-collection-test-vue`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -747,7 +747,7 @@ describe(`Query Collections`, () => {
         id: `collection-1-vue`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const collection2 = createCollection(
@@ -772,7 +772,7 @@ describe(`Query Collections`, () => {
             team: `team3`,
           },
         ],
-      })
+      }),
     )
 
     cleanup = $effect.root(() => {
@@ -869,7 +869,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
 
         // Initially isReady should be false (collection is in idle state)
@@ -907,7 +907,7 @@ describe(`Query Collections`, () => {
           id: `pre-created-is-ready-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       cleanup = $effect.root(() => {
@@ -994,7 +994,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
 
         expect(query.isReady).toBe(false)
@@ -1047,7 +1047,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
 
         // Initially should be true
@@ -1091,7 +1091,7 @@ describe(`Query Collections`, () => {
           id: `live-updates-is-ready-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       cleanup = $effect.root(() => {
@@ -1102,7 +1102,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
 
         flushSync()
@@ -1173,13 +1173,13 @@ describe(`Query Collections`, () => {
           q
             .from({ issues: issueCollection })
             .join({ persons: personCollection }, ({ issues, persons }) =>
-              eq(issues.userId, persons.id)
+              eq(issues.userId, persons.id),
             )
             .select(({ issues, persons }) => ({
               id: issues.id,
               title: issues.title,
               name: persons.name,
-            }))
+            })),
         )
 
         expect(query.isReady).toBe(false)
@@ -1248,7 +1248,7 @@ describe(`Query Collections`, () => {
                 id: c.id,
                 name: c.name,
               })),
-          [() => minAge]
+          [() => minAge],
         )
 
         expect(query.isReady).toBe(false)
@@ -1312,7 +1312,7 @@ describe(`Query Collections`, () => {
             .select(({ collection: c }) => ({
               id: c.id,
               name: c.name,
-            }))
+            })),
         )
 
         // Initially should be loading
@@ -1376,7 +1376,7 @@ describe(`Query Collections`, () => {
             .select(({ collection: c }) => ({
               id: c.id,
               name: c.name,
-            }))
+            })),
         )
 
         let readyEffectCount = 0
@@ -1439,7 +1439,7 @@ describe(`Query Collections`, () => {
         id: `config-querybuilder-test-vue`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { Query } = await import(`@tanstack/db`)
@@ -1506,7 +1506,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
 
         // Initially isLoading should be true
@@ -1612,7 +1612,7 @@ describe(`Query Collections`, () => {
               id: persons.id,
               name: persons.name,
               team: persons.team,
-            }))
+            })),
         )
 
         // Start sync
@@ -1725,13 +1725,13 @@ describe(`Query Collections`, () => {
           q
             .from({ issues: issueCollection })
             .join({ persons: personCollection }, ({ issues, persons }) =>
-              eq(issues.userId, persons.id)
+              eq(issues.userId, persons.id),
             )
             .select(({ issues, persons }) => ({
               id: issues.id,
               title: issues.title,
               userName: persons.name,
-            }))
+            })),
         )
 
         // Start sync for both
@@ -1822,7 +1822,7 @@ describe(`Query Collections`, () => {
             .select(({ persons }) => ({
               id: persons.id,
               name: persons.name,
-            }))
+            })),
         )
 
         // Initially isLoading should be true
diff --git a/packages/svelte-db/tsconfig.json b/packages/svelte-db/tsconfig.json
index fc534e3d5..58906938a 100644
--- a/packages/svelte-db/tsconfig.json
+++ b/packages/svelte-db/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "types": ["svelte"],
     "target": "ES2020",
     "module": "ESNext",
     "moduleResolution": "Bundler",
diff --git a/packages/svelte-db/vite.config.ts b/packages/svelte-db/vite.config.ts
index c8adb39f8..eb445e040 100644
--- a/packages/svelte-db/vite.config.ts
+++ b/packages/svelte-db/vite.config.ts
@@ -1,6 +1,6 @@
-import { svelte } from "@sveltejs/vite-plugin-svelte"
-import { defineConfig } from "vitest/config"
-import packageJson from "./package.json" with { type: "json" }
+import { svelte } from '@sveltejs/vite-plugin-svelte'
+import { defineConfig } from 'vitest/config'
+import packageJson from './package.json' with { type: 'json' }
 
 export default defineConfig({
   plugins: [svelte()],
diff --git a/packages/trailbase-db-collection/CHANGELOG.md b/packages/trailbase-db-collection/CHANGELOG.md
index 0a3f128d1..12de03e24 100644
--- a/packages/trailbase-db-collection/CHANGELOG.md
+++ b/packages/trailbase-db-collection/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @tanstack/trailbase-db-collection
 
+## 0.1.59
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.1.58
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.1.57
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.1.56
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.1.55
+
+### Patch Changes
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.1.54
 
 ### Patch Changes
@@ -467,7 +502,7 @@
   try {
     collection.insert(data)
   } catch (error) {
-    if (error.message.includes("already exists")) {
+    if (error.message.includes('already exists')) {
       // Handle duplicate key error
     }
   }
@@ -476,7 +511,7 @@
   **After:**
 
   ```ts
-  import { DuplicateKeyError } from "@tanstack/db"
+  import { DuplicateKeyError } from '@tanstack/db'
 
   try {
     collection.insert(data)
@@ -493,14 +528,14 @@
 
   ```ts
   // Electric collection errors were imported from @tanstack/db
-  import { ElectricInsertHandlerMustReturnTxIdError } from "@tanstack/db"
+  import { ElectricInsertHandlerMustReturnTxIdError } from '@tanstack/db'
   ```
 
   **After:**
 
   ```ts
   // Now import from the specific adapter package
-  import { ElectricInsertHandlerMustReturnTxIdError } from "@tanstack/electric-db-collection"
+  import { ElectricInsertHandlerMustReturnTxIdError } from '@tanstack/electric-db-collection'
   ```
 
   ### Unified Error Handling
@@ -508,14 +543,14 @@
   **New:**
 
   ```ts
-  import { TanStackDBError } from "@tanstack/db"
+  import { TanStackDBError } from '@tanstack/db'
 
   try {
     // Any TanStack DB operation
   } catch (error) {
     if (error instanceof TanStackDBError) {
       // Handle all TanStack DB errors uniformly
-      console.log("TanStack DB error:", error.message)
+      console.log('TanStack DB error:', error.message)
     }
   }
   ```
diff --git a/packages/trailbase-db-collection/package.json b/packages/trailbase-db-collection/package.json
index b227f99d4..db3579902 100644
--- a/packages/trailbase-db-collection/package.json
+++ b/packages/trailbase-db-collection/package.json
@@ -1,18 +1,31 @@
 {
   "name": "@tanstack/trailbase-db-collection",
+  "version": "0.1.59",
   "description": "TrailBase collection for TanStack DB",
-  "version": "0.1.54",
-  "dependencies": {
-    "@standard-schema/spec": "^1.0.0",
-    "@tanstack/db": "workspace:*",
-    "@tanstack/store": "^0.8.0",
-    "debug": "^4.4.3",
-    "trailbase": "^0.8.0"
+  "author": "Sebastian Jeltsch",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TanStack/db.git",
+    "directory": "packages/trailbase-db-collection"
   },
-  "devDependencies": {
-    "@types/debug": "^4.1.12",
-    "@vitest/coverage-istanbul": "^3.2.4"
+  "homepage": "https://tanstack.com/db",
+  "keywords": [
+    "trailbase",
+    "sql",
+    "optimistic",
+    "typescript"
+  ],
+  "scripts": {
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "lint": "eslint . --fix",
+    "test": "vitest --run"
   },
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -26,37 +39,23 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
-  "packageManager": "pnpm@10.24.0",
+  "dependencies": {
+    "@standard-schema/spec": "^1.0.0",
+    "@tanstack/db": "workspace:*",
+    "@tanstack/store": "^0.8.0",
+    "debug": "^4.4.3",
+    "trailbase": "^0.8.0"
+  },
   "peerDependencies": {
     "typescript": ">=4.7"
   },
-  "author": "Sebastian Jeltsch",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/TanStack/db.git",
-    "directory": "packages/trailbase-db-collection"
-  },
-  "homepage": "https://tanstack.com/db",
-  "keywords": [
-    "trailbase",
-    "sql",
-    "optimistic",
-    "typescript"
-  ],
-  "scripts": {
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "lint": "eslint . --fix",
-    "test": "npx vitest --run"
-  },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@types/debug": "^4.1.12",
+    "@vitest/coverage-istanbul": "^3.2.4"
+  }
 }
diff --git a/packages/trailbase-db-collection/src/errors.ts b/packages/trailbase-db-collection/src/errors.ts
index a158ca933..ece48fcad 100644
--- a/packages/trailbase-db-collection/src/errors.ts
+++ b/packages/trailbase-db-collection/src/errors.ts
@@ -1,4 +1,4 @@
-import { TanStackDBError } from "@tanstack/db"
+import { TanStackDBError } from '@tanstack/db'
 
 // TrailBase DB Collection Errors
 export class TrailBaseDBCollectionError extends TanStackDBError {
diff --git a/packages/trailbase-db-collection/src/index.ts b/packages/trailbase-db-collection/src/index.ts
index 43dff974f..81c4593a7 100644
--- a/packages/trailbase-db-collection/src/index.ts
+++ b/packages/trailbase-db-collection/src/index.ts
@@ -2,6 +2,6 @@ export {
   trailBaseCollectionOptions,
   type TrailBaseCollectionConfig,
   type TrailBaseCollectionUtils,
-} from "./trailbase"
+} from './trailbase'
 
-export * from "./errors"
+export * from './errors'
diff --git a/packages/trailbase-db-collection/src/trailbase.ts b/packages/trailbase-db-collection/src/trailbase.ts
index 3a6e500c5..32b6755c5 100644
--- a/packages/trailbase-db-collection/src/trailbase.ts
+++ b/packages/trailbase-db-collection/src/trailbase.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
-import { Store } from "@tanstack/store"
+import { Store } from '@tanstack/store'
 import {
   ExpectedDeleteTypeError,
   ExpectedInsertTypeError,
   ExpectedUpdateTypeError,
   TimeoutWaitingForIdsError,
-} from "./errors"
-import type { Event, RecordApi } from "trailbase"
+} from './errors'
+import type { Event, RecordApi } from 'trailbase'
 
 import type {
   BaseCollectionConfig,
@@ -16,7 +16,7 @@ import type {
   SyncConfig,
   UpdateMutationFnParams,
   UtilsRecord,
-} from "@tanstack/db"
+} from '@tanstack/db'
 
 type ShapeOf<T> = Record<keyof T, unknown>
 type Conversion<I, O> = (value: I) => O
@@ -52,7 +52,7 @@ function convert<
   OutputType extends ShapeOf<InputType>,
 >(
   conversions: Conversions<InputType, OutputType>,
-  input: InputType
+  input: InputType,
 ): OutputType {
   const c = conversions as Record<string, Conversion<InputType, OutputType>>
 
@@ -60,7 +60,7 @@ function convert<
     Object.keys(input).map((k: string) => {
       const value = input[k]
       return [k, c[k]?.(value as any) ?? value]
-    })
+    }),
   ) as OutputType
 }
 
@@ -69,7 +69,7 @@ function convertPartial<
   OutputType extends ShapeOf<InputType>,
 >(
   conversions: Conversions<InputType, OutputType>,
-  input: Partial<InputType>
+  input: Partial<InputType>,
 ): Partial<OutputType> {
   const c = conversions as Record<string, Conversion<InputType, OutputType>>
 
@@ -77,7 +77,7 @@ function convertPartial<
     Object.keys(input).map((k: string) => {
       const value = input[k]
       return [k, c[k]?.(value as any) ?? value]
-    })
+    }),
   ) as OutputType
 }
 
@@ -112,7 +112,7 @@ export function trailBaseCollectionOptions<
   TRecord extends ShapeOf<TItem> = TItem,
   TKey extends string | number = string | number,
 >(
-  config: TrailBaseCollectionConfig<TItem, TRecord, TKey>
+  config: TrailBaseCollectionConfig<TItem, TRecord, TKey>,
 ): CollectionConfig<TItem, TKey> & { utils: TrailBaseCollectionUtils } {
   const getKey = config.getKey
 
@@ -127,7 +127,7 @@ export function trailBaseCollectionOptions<
 
   const awaitIds = (
     ids: Array<string>,
-    timeout: number = 120 * 1000
+    timeout: number = 120 * 1000,
   ): Promise<void> => {
     const completed = (value: Map<string, number>) =>
       ids.every((id) => value.has(id))
@@ -295,7 +295,7 @@ export function trailBaseCollectionOptions<
     sync,
     getKey,
     onInsert: async (
-      params: InsertMutationFnParams<TItem, TKey>
+      params: InsertMutationFnParams<TItem, TKey>,
     ): Promise<Array<number | string>> => {
       const ids = await config.recordApi.createBulk(
         params.transaction.mutations.map((tx) => {
@@ -304,7 +304,7 @@ export function trailBaseCollectionOptions<
             throw new ExpectedInsertTypeError(type)
           }
           return serialIns(modified)
-        })
+        }),
       )
 
       // The optimistic mutation overlay is removed on return, so at this point
@@ -325,7 +325,7 @@ export function trailBaseCollectionOptions<
           await config.recordApi.update(key, serialUpd(changes))
 
           return String(key)
-        })
+        }),
       )
 
       // The optimistic mutation overlay is removed on return, so at this point
@@ -343,7 +343,7 @@ export function trailBaseCollectionOptions<
 
           await config.recordApi.delete(key)
           return String(key)
-        })
+        }),
       )
 
       // The optimistic mutation overlay is removed on return, so at this point
diff --git a/packages/trailbase-db-collection/tests/trailbase.test.ts b/packages/trailbase-db-collection/tests/trailbase.test.ts
index bfec08cb4..a6d282a30 100644
--- a/packages/trailbase-db-collection/tests/trailbase.test.ts
+++ b/packages/trailbase-db-collection/tests/trailbase.test.ts
@@ -1,13 +1,13 @@
-import { describe, expect, it, vi } from "vitest"
-import { createCollection } from "@tanstack/db"
-import { trailBaseCollectionOptions } from "../src/trailbase"
+import { describe, expect, it, vi } from 'vitest'
+import { createCollection } from '@tanstack/db'
+import { trailBaseCollectionOptions } from '../src/trailbase'
 import type {
   Event,
   FilterOrComposite,
   ListResponse,
   Pagination,
   RecordApi,
-} from "trailbase"
+} from 'trailbase'
 
 type Data = {
   id: number | null
@@ -25,7 +25,7 @@ class MockRecordApi<T> implements RecordApi<T> {
       expand?: Array<string>
     }): Promise<ListResponse<T>> => {
       return Promise.resolve({ records: [] })
-    }
+    },
   )
 
   read = vi.fn(
@@ -33,10 +33,10 @@ class MockRecordApi<T> implements RecordApi<T> {
       _id: string | number,
       _opt?: {
         expand?: Array<string>
-      }
+      },
     ): Promise<T> => {
       throw `read`
-    }
+    },
   )
 
   create = vi.fn((_record: T): Promise<string | number> => {
@@ -58,7 +58,7 @@ class MockRecordApi<T> implements RecordApi<T> {
         start: (controller: ReadableStreamDefaultController<Event>) => {
           controller.close()
         },
-      })
+      }),
     )
   })
 }
@@ -124,7 +124,7 @@ describe(`TrailBase Integration`, () => {
     await injectEvent({ Update: updatedRecord })
 
     expect(collection.state).toEqual(
-      new Map([updatedRecord].map((d) => [d.id, d]))
+      new Map([updatedRecord].map((d) => [d.id, d])),
     )
 
     // Await cancellation.
@@ -196,7 +196,7 @@ describe(`TrailBase Integration`, () => {
         }, 1)
 
         return Promise.resolve(records.map((r) => r.id ?? 0))
-      }
+      },
     )
 
     const options = setUp(recordApi)
@@ -231,7 +231,7 @@ describe(`TrailBase Integration`, () => {
         })
         writer.releaseLock()
         return Promise.resolve()
-      }
+      },
     )
 
     collection.update(data.id, (old: Data) => {
@@ -250,7 +250,7 @@ describe(`TrailBase Integration`, () => {
         })
         writer.releaseLock()
         return Promise.resolve()
-      }
+      },
     )
 
     collection.delete(updatedData.id!)
diff --git a/packages/trailbase-db-collection/vite.config.ts b/packages/trailbase-db-collection/vite.config.ts
index c7968f28a..aa589f666 100644
--- a/packages/trailbase-db-collection/vite.config.ts
+++ b/packages/trailbase-db-collection/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import packageJson from './package.json'
 
 const config = defineConfig({
   test: {
@@ -17,5 +17,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/packages/vue-db/CHANGELOG.md b/packages/vue-db/CHANGELOG.md
index 63cc10379..f65627239 100644
--- a/packages/vue-db/CHANGELOG.md
+++ b/packages/vue-db/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @tanstack/vue-db
 
+## 0.0.91
+
+### Patch Changes
+
+- Updated dependencies [[`32ec4d8`](https://github.com/TanStack/db/commit/32ec4d8478cca96f76f3a49efc259c95b85baa40)]:
+  - @tanstack/db@0.5.15
+
+## 0.0.90
+
+### Patch Changes
+
+- Updated dependencies [[`26ed0aa`](https://github.com/TanStack/db/commit/26ed0aad2def60e652508a99b2e980e73f70148e)]:
+  - @tanstack/db@0.5.14
+
+## 0.0.89
+
+### Patch Changes
+
+- Updated dependencies [[`8ed7725`](https://github.com/TanStack/db/commit/8ed7725514a6a501482a391162f7792aa8b371e5), [`01452bf`](https://github.com/TanStack/db/commit/01452bfd0d00da8bd52941a4954af73749473651)]:
+  - @tanstack/db@0.5.13
+
+## 0.0.88
+
+### Patch Changes
+
+- Updated dependencies [[`b3b1940`](https://github.com/TanStack/db/commit/b3b194000d8efcc2c6cc45a663029dadc26f13f0), [`09da081`](https://github.com/TanStack/db/commit/09da081b420fc915d7f0dc566c6cdbbc78582435), [`86ad40c`](https://github.com/TanStack/db/commit/86ad40c6bc37b2f5d4ad24d06f72168ca4b96161)]:
+  - @tanstack/db@0.5.12
+
+## 0.0.87
+
+### Patch Changes
+
+- Fixed `isReady` to return `true` for disabled queries in `useLiveQuery`/`injectLiveQuery` across all framework packages. When a query function returns `null` or `undefined` (disabling the query), there's no async operation to wait for, so the hook should be considered "ready" immediately. ([#886](https://github.com/TanStack/db/pull/886))
+
+  Additionally, all frameworks now have proper TypeScript overloads that explicitly support returning `undefined | null` from query functions, making the disabled query pattern type-safe.
+
+  This fixes the common pattern where users conditionally enable queries and don't want to show loading states when the query is disabled.
+
+- Updated dependencies [[`c4b9399`](https://github.com/TanStack/db/commit/c4b93997432743d974749683059bf68a082d3e5b), [`a1a484e`](https://github.com/TanStack/db/commit/a1a484ec4d2331d702ab9c4b7e5b02622c76b3dd)]:
+  - @tanstack/db@0.5.11
+
 ## 0.0.86
 
 ### Patch Changes
diff --git a/packages/vue-db/package.json b/packages/vue-db/package.json
index df2283445..857118f17 100644
--- a/packages/vue-db/package.json
+++ b/packages/vue-db/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@tanstack/vue-db",
+  "version": "0.0.91",
   "description": "Vue integration for @tanstack/db",
-  "version": "0.0.86",
   "author": "Kyle Mathews",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/TanStack/db.git",
+    "url": "git+https://github.com/TanStack/db.git",
     "directory": "packages/vue-db"
   },
   "homepage": "https://tanstack.com/db",
@@ -15,16 +15,16 @@
     "vue",
     "typescript"
   ],
-  "packageManager": "pnpm@10.24.0",
-  "dependencies": {
-    "@tanstack/db": "workspace:*"
-  },
-  "devDependencies": {
-    "@electric-sql/client": "1.2.0",
-    "@vitejs/plugin-vue": "^6.0.2",
-    "@vitest/coverage-istanbul": "^3.2.4",
-    "vue": "^3.5.25"
+  "scripts": {
+    "build": "vite build",
+    "dev": "vite build --watch",
+    "test": "vitest --run",
+    "lint": "eslint . --fix"
   },
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -38,22 +38,21 @@
     },
     "./package.json": "./package.json"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "src"
   ],
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
+  "dependencies": {
+    "@tanstack/db": "workspace:*"
+  },
   "peerDependencies": {
     "vue": ">=3.3.0"
   },
-  "scripts": {
-    "build": "vite build",
-    "dev": "vite build --watch",
-    "test": "npx vitest --run",
-    "lint": "eslint . --fix"
-  },
-  "sideEffects": false,
-  "type": "module",
-  "types": "dist/esm/index.d.ts"
+  "devDependencies": {
+    "@electric-sql/client": "^1.3.0",
+    "@vitejs/plugin-vue": "^6.0.2",
+    "@vitest/coverage-istanbul": "^3.2.4",
+    "vue": "^3.5.25"
+  }
 }
diff --git a/packages/vue-db/src/index.ts b/packages/vue-db/src/index.ts
index bd98349f0..681078b9c 100644
--- a/packages/vue-db/src/index.ts
+++ b/packages/vue-db/src/index.ts
@@ -1,9 +1,9 @@
 // Re-export all public APIs
-export * from "./useLiveQuery"
+export * from './useLiveQuery'
 
 // Re-export everything from @tanstack/db
-export * from "@tanstack/db"
+export * from '@tanstack/db'
 
 // Re-export some stuff explicitly to ensure the type & value is exported
-export type { Collection } from "@tanstack/db"
-export { createTransaction } from "@tanstack/db"
+export type { Collection } from '@tanstack/db'
+export { createTransaction } from '@tanstack/db'
diff --git a/packages/vue-db/src/useLiveQuery.ts b/packages/vue-db/src/useLiveQuery.ts
index a7116b66d..bdb035c27 100644
--- a/packages/vue-db/src/useLiveQuery.ts
+++ b/packages/vue-db/src/useLiveQuery.ts
@@ -7,8 +7,8 @@ import {
   ref,
   toValue,
   watchEffect,
-} from "vue"
-import { createLiveQueryCollection } from "@tanstack/db"
+} from 'vue'
+import { createLiveQueryCollection } from '@tanstack/db'
 import type {
   ChangeMessage,
   Collection,
@@ -18,8 +18,8 @@ import type {
   InitialQueryBuilder,
   LiveQueryCollectionConfig,
   QueryBuilder,
-} from "@tanstack/db"
-import type { ComputedRef, MaybeRefOrGetter } from "vue"
+} from '@tanstack/db'
+import type { ComputedRef, MaybeRefOrGetter } from 'vue'
 
 /**
  * Return type for useLiveQuery hook
@@ -113,15 +113,15 @@ export interface UseLiveQueryReturnWithCollection<
 // Overload 1: Accept query function that always returns QueryBuilder
 export function useLiveQuery<TContext extends Context>(
   queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
-  deps?: Array<MaybeRefOrGetter<unknown>>
+  deps?: Array<MaybeRefOrGetter<unknown>>,
 ): UseLiveQueryReturn<GetResult<TContext>>
 
 // Overload 1b: Accept query function that can return undefined/null
 export function useLiveQuery<TContext extends Context>(
   queryFn: (
-    q: InitialQueryBuilder
+    q: InitialQueryBuilder,
   ) => QueryBuilder<TContext> | undefined | null,
-  deps?: Array<MaybeRefOrGetter<unknown>>
+  deps?: Array<MaybeRefOrGetter<unknown>>,
 ): UseLiveQueryReturn<GetResult<TContext>>
 
 /**
@@ -159,7 +159,7 @@ export function useLiveQuery<TContext extends Context>(
 // Overload 2: Accept config object
 export function useLiveQuery<TContext extends Context>(
   config: LiveQueryCollectionConfig<TContext>,
-  deps?: Array<MaybeRefOrGetter<unknown>>
+  deps?: Array<MaybeRefOrGetter<unknown>>,
 ): UseLiveQueryReturn<GetResult<TContext>>
 
 /**
@@ -207,13 +207,13 @@ export function useLiveQuery<
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: MaybeRefOrGetter<Collection<TResult, TKey, TUtils>>
+  liveQueryCollection: MaybeRefOrGetter<Collection<TResult, TKey, TUtils>>,
 ): UseLiveQueryReturnWithCollection<TResult, TKey, TUtils>
 
 // Implementation
 export function useLiveQuery(
   configOrQueryOrCollection: any,
-  deps: Array<MaybeRefOrGetter<unknown>> = []
+  deps: Array<MaybeRefOrGetter<unknown>> = [],
 ): UseLiveQueryReturn<any> | UseLiveQueryReturnWithCollection<any, any, any> {
   const collection = computed(() => {
     // First check if the original parameter might be a ref/getter
@@ -298,12 +298,12 @@ export function useLiveQuery(
 
   // Track collection status reactively
   const status = ref(
-    collection.value ? collection.value.status : (`disabled` as const)
+    collection.value ? collection.value.status : (`disabled` as const),
   )
 
   // Helper to sync data array from collection in correct order
   const syncDataFromCollection = (
-    currentCollection: Collection<any, any, any>
+    currentCollection: Collection<any, any, any>,
   ) => {
     internalData.length = 0
     internalData.push(...Array.from(currentCollection.values()))
@@ -377,7 +377,7 @@ export function useLiveQuery(
       },
       {
         includeInitialState: true,
-      }
+      },
     )
 
     currentUnsubscribe = subscription.unsubscribe.bind(subscription)
@@ -413,7 +413,7 @@ export function useLiveQuery(
     status: computed(() => status.value),
     isLoading: computed(() => status.value === `loading`),
     isReady: computed(
-      () => status.value === `ready` || status.value === `disabled`
+      () => status.value === `ready` || status.value === `disabled`,
     ),
     isIdle: computed(() => status.value === `idle`),
     isError: computed(() => status.value === `error`),
diff --git a/packages/vue-db/tests/useLiveQuery.test.ts b/packages/vue-db/tests/useLiveQuery.test.ts
index 60dc77cd9..57b8ae57b 100644
--- a/packages/vue-db/tests/useLiveQuery.test.ts
+++ b/packages/vue-db/tests/useLiveQuery.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest"
+import { describe, expect, it } from 'vitest'
 import {
   count,
   createCollection,
@@ -6,10 +6,10 @@ import {
   createOptimisticAction,
   eq,
   gt,
-} from "@tanstack/db"
-import { nextTick, ref, watchEffect } from "vue"
-import { useLiveQuery } from "../src/useLiveQuery"
-import { mockSyncCollectionOptions } from "../../db/tests/utils"
+} from '@tanstack/db'
+import { nextTick, ref, watchEffect } from 'vue'
+import { useLiveQuery } from '../src/useLiveQuery'
+import { mockSyncCollectionOptions } from '../../db/tests/utils'
 
 type Person = {
   id: string
@@ -105,7 +105,7 @@ describe(`Query Collections`, () => {
         id: `test-persons`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { state, data } = useLiveQuery((q) =>
@@ -116,7 +116,7 @@ describe(`Query Collections`, () => {
           id: persons.id,
           name: persons.name,
           age: persons.age,
-        }))
+        })),
     )
 
     // Wait for Vue reactivity to update
@@ -139,7 +139,7 @@ describe(`Query Collections`, () => {
         id: `test-persons-2`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const { state, data } = useLiveQuery((q) =>
@@ -150,7 +150,7 @@ describe(`Query Collections`, () => {
           id: c.id,
           name: c.name,
         }))
-        .orderBy(({ collection: c }) => c.id, `asc`)
+        .orderBy(({ collection: c }) => c.id, `asc`),
     )
 
     // Wait for collection to sync
@@ -206,7 +206,7 @@ describe(`Query Collections`, () => {
           id: `4`,
           name: `Kyle Doe`,
         }),
-      ])
+      ]),
     )
 
     // Update the person
@@ -243,7 +243,7 @@ describe(`Query Collections`, () => {
           id: `4`,
           name: `Kyle Doe 2`,
         }),
-      ])
+      ]),
     )
 
     // Delete the person
@@ -280,7 +280,7 @@ describe(`Query Collections`, () => {
         id: `person-collection-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create issue collection
@@ -289,20 +289,20 @@ describe(`Query Collections`, () => {
         id: `issue-collection-test`,
         getKey: (issue: Issue) => issue.id,
         initialData: initialIssues,
-      })
+      }),
     )
 
     const { state } = useLiveQuery((q) =>
       q
         .from({ issues: issueCollection })
         .join({ persons: personCollection }, ({ issues, persons }) =>
-          eq(issues.userId, persons.id)
+          eq(issues.userId, persons.id),
         )
         .select(({ issues, persons }) => ({
           id: issues.id,
           title: issues.title,
           name: persons.name,
-        }))
+        })),
     )
 
     // Wait for collections to sync
@@ -399,7 +399,7 @@ describe(`Query Collections`, () => {
         id: `params-change-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const minAge = ref(30)
@@ -414,7 +414,7 @@ describe(`Query Collections`, () => {
             name: c.name,
             age: c.age,
           })),
-      [minAge]
+      [minAge],
     )
 
     // Wait for collection to sync
@@ -466,7 +466,7 @@ describe(`Query Collections`, () => {
         id: `optimistic-changes-test`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Initial query
@@ -480,7 +480,7 @@ describe(`Query Collections`, () => {
             name: c.name,
             team: c.team,
           }))
-          .orderBy(({ collection: c }) => c.id, `asc`)
+          .orderBy(({ collection: c }) => c.id, `asc`),
       )
 
     // Wait for collection to sync
@@ -494,7 +494,7 @@ describe(`Query Collections`, () => {
         .select(({ queryResult }) => ({
           team: queryResult.team,
           count: count(queryResult.id),
-        }))
+        })),
     )
 
     // Wait for grouped query to sync
@@ -568,7 +568,7 @@ describe(`Query Collections`, () => {
         id: `person-collection-test-bug`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create issue collection
@@ -577,7 +577,7 @@ describe(`Query Collections`, () => {
         id: `issue-collection-test-bug`,
         getKey: (issue: Issue) => issue.id,
         initialData: initialIssues,
-      })
+      }),
     )
 
     // Render the hook with a query that joins persons and issues
@@ -585,13 +585,13 @@ describe(`Query Collections`, () => {
       q
         .from({ issues: issueCollection })
         .join({ persons: personCollection }, ({ issues, persons }) =>
-          eq(issues.userId, persons.id)
+          eq(issues.userId, persons.id),
         )
         .select(({ issues, persons }) => ({
           id: issues.id,
           title: issues.title,
           name: persons.name,
-        }))
+        })),
     )
 
     const { state } = queryResult
@@ -701,7 +701,7 @@ describe(`Query Collections`, () => {
         id: `pre-created-collection-test-vue`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create a live query collection beforehand
@@ -747,7 +747,7 @@ describe(`Query Collections`, () => {
         id: `collection-1-vue`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     const collection2 = createCollection(
@@ -772,7 +772,7 @@ describe(`Query Collections`, () => {
             team: `team3`,
           },
         ],
-      })
+      }),
     )
 
     // Create two different live query collections
@@ -867,7 +867,7 @@ describe(`Query Collections`, () => {
           .select(({ persons }) => ({
             id: persons.id,
             name: persons.name,
-          }))
+          })),
       )
 
       // Initially isReady should be false (collection is in idle state)
@@ -902,7 +902,7 @@ describe(`Query Collections`, () => {
           id: `pre-created-is-ready-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       // Create a live query collection that's already syncing
@@ -984,7 +984,7 @@ describe(`Query Collections`, () => {
           .select(({ persons }) => ({
             id: persons.id,
             name: persons.name,
-          }))
+          })),
       )
 
       expect(isReady.value).toBe(false)
@@ -1034,7 +1034,7 @@ describe(`Query Collections`, () => {
           .select(({ persons }) => ({
             id: persons.id,
             name: persons.name,
-          }))
+          })),
       )
 
       // Initially should be true
@@ -1078,7 +1078,7 @@ describe(`Query Collections`, () => {
           id: `live-updates-is-ready-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const { isReady } = useLiveQuery((q) =>
@@ -1088,7 +1088,7 @@ describe(`Query Collections`, () => {
           .select(({ persons }) => ({
             id: persons.id,
             name: persons.name,
-          }))
+          })),
       )
 
       await waitForVueUpdate()
@@ -1157,13 +1157,13 @@ describe(`Query Collections`, () => {
         q
           .from({ issues: issueCollection })
           .join({ persons: personCollection }, ({ issues, persons }) =>
-            eq(issues.userId, persons.id)
+            eq(issues.userId, persons.id),
           )
           .select(({ issues, persons }) => ({
             id: issues.id,
             title: issues.title,
             name: persons.name,
-          }))
+          })),
       )
 
       expect(isReady.value).toBe(false)
@@ -1229,7 +1229,7 @@ describe(`Query Collections`, () => {
               id: c.id,
               name: c.name,
             })),
-        [minAge]
+        [minAge],
       )
 
       expect(isReady.value).toBe(false)
@@ -1288,7 +1288,7 @@ describe(`Query Collections`, () => {
           .select(({ collection: c }) => ({
             id: c.id,
             name: c.name,
-          }))
+          })),
       )
 
       // Initially should be loading
@@ -1357,7 +1357,7 @@ describe(`Query Collections`, () => {
           .select(({ collection: c }) => ({
             id: c.id,
             name: c.name,
-          }))
+          })),
       )
 
       // Initially should be loading
@@ -1402,7 +1402,7 @@ describe(`Query Collections`, () => {
         id: `config-querybuilder-test-vue`,
         getKey: (person: Person) => person.id,
         initialData: initialPersons,
-      })
+      }),
     )
 
     // Create a pre-built QueryBuilder instance
@@ -1465,7 +1465,7 @@ describe(`Query Collections`, () => {
           .select(({ persons }) => ({
             id: persons.id,
             name: persons.name,
-          }))
+          })),
       )
 
       // Initially isLoading should be true
@@ -1571,7 +1571,7 @@ describe(`Query Collections`, () => {
             id: persons.id,
             name: persons.name,
             team: persons.team,
-          }))
+          })),
       )
 
       // Start sync
@@ -1684,13 +1684,13 @@ describe(`Query Collections`, () => {
         q
           .from({ issues: issueCollection })
           .join({ persons: personCollection }, ({ issues, persons }) =>
-            eq(issues.userId, persons.id)
+            eq(issues.userId, persons.id),
           )
           .select(({ issues, persons }) => ({
             id: issues.id,
             title: issues.title,
             userName: persons.name,
-          }))
+          })),
       )
 
       // Start sync for both
@@ -1781,7 +1781,7 @@ describe(`Query Collections`, () => {
           .select(({ persons }) => ({
             id: persons.id,
             name: persons.name,
-          }))
+          })),
       )
 
       // Initially isLoading should be true
@@ -1820,7 +1820,7 @@ describe(`Query Collections`, () => {
           id: `disabled-undefined-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const enabled = ref(false)
@@ -1836,7 +1836,7 @@ describe(`Query Collections`, () => {
               age: persons.age,
             }))
         },
-        [() => enabled.value]
+        [() => enabled.value],
       )
 
       // When callback returns undefined, should return disabled state
@@ -1873,7 +1873,7 @@ describe(`Query Collections`, () => {
           id: `disabled-null-test`,
           getKey: (person: Person) => person.id,
           initialData: initialPersons,
-        })
+        }),
       )
 
       const enabled = ref(false)
@@ -1889,7 +1889,7 @@ describe(`Query Collections`, () => {
               age: persons.age,
             }))
         },
-        [() => enabled.value]
+        [() => enabled.value],
       )
 
       // When callback returns null, should return disabled state
diff --git a/packages/vue-db/vite.config.ts b/packages/vue-db/vite.config.ts
index bf10fb50d..7fffa40fc 100644
--- a/packages/vue-db/vite.config.ts
+++ b/packages/vue-db/vite.config.ts
@@ -1,7 +1,7 @@
-import { defineConfig, mergeConfig } from "vitest/config"
-import { tanstackViteConfig } from "@tanstack/config/vite"
-import vue from "@vitejs/plugin-vue"
-import packageJson from "./package.json"
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/vite-config'
+import vue from '@vitejs/plugin-vue'
+import packageJson from './package.json'
 
 const config = defineConfig({
   plugins: [vue()],
@@ -19,5 +19,5 @@ export default mergeConfig(
   tanstackViteConfig({
     entry: `./src/index.ts`,
     srcDir: `./src`,
-  })
+  }),
 )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d81826e9b..8b06f5c89 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,30 +4,9 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
-overrides:
-  '@tanstack/angular-db': workspace:*
-  '@tanstack/db': workspace:*
-  '@tanstack/db-ivm': workspace:*
-  '@tanstack/electric-db-collection': workspace:*
-  '@tanstack/offline-transactions': workspace:*
-  '@tanstack/powersync-db-collection': workspace:*
-  '@tanstack/query-db-collection': workspace:*
-  '@tanstack/react-db': workspace:*
-  '@tanstack/rxdb-db-collection': workspace:*
-  '@tanstack/solid-db': workspace:*
-  '@tanstack/svelte-db': workspace:*
-  '@tanstack/trailbase-db-collection': workspace:*
-  '@tanstack/vue-db': workspace:*
-
-pnpmfileChecksum: sha256-PWDKLEtYr7WAzwKAKmFednYERF5OFDKcRonW93aOwc8=
-
 importers:
 
   .:
-    dependencies:
-      tsx:
-        specifier: ^4.21.0
-        version: 4.21.0
     devDependencies:
       '@changesets/cli':
         specifier: ^2.29.8
@@ -35,15 +14,18 @@ importers:
       '@eslint/js':
         specifier: ^9.39.1
         version: 9.39.1
-      '@stylistic/eslint-plugin':
-        specifier: ^4.4.1
-        version: 4.4.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@svitejs/changesets-changelog-github-compact':
         specifier: ^1.2.0
         version: 1.2.0(encoding@0.1.13)
-      '@tanstack/config':
-        specifier: ^0.22.2
-        version: 0.22.2(@types/node@24.7.0)(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@tanstack/eslint-config':
+        specifier: 0.3.4
+        version: 0.3.4(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@tanstack/typedoc-config':
+        specifier: 0.3.3
+        version: 0.3.3(typescript@5.9.3)
+      '@tanstack/vite-config':
+        specifier: 0.4.3
+        version: 0.4.3(@types/node@24.7.0)(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@testing-library/jest-dom':
         specifier: ^6.9.1
         version: 6.9.1
@@ -60,26 +42,20 @@ importers:
         specifier: ^1.5.0
         version: 1.5.0
       '@typescript-eslint/eslint-plugin':
-        specifier: ^8.48.0
-        version: 8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.48.1
+        version: 8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@typescript-eslint/parser':
-        specifier: ^8.48.0
-        version: 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.48.1
+        version: 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@vitejs/plugin-react':
         specifier: ^5.1.1
         version: 5.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       eslint:
         specifier: ^9.39.1
         version: 9.39.1(jiti@2.6.1)
-      eslint-config-prettier:
-        specifier: ^10.1.8
-        version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-import-resolver-typescript:
         specifier: ^4.4.4
-        version: 4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-prettier:
-        specifier: ^5.5.4
-        version: 5.5.4(eslint-config-prettier@10.1.8(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))(prettier@3.7.3)
+        version: 4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-react:
         specifier: ^7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -90,20 +66,17 @@ importers:
         specifier: ^27.2.0
         version: 27.2.0(postcss@8.5.6)
       knip:
-        specifier: ^5.70.2
-        version: 5.70.2(@types/node@24.7.0)(typescript@5.9.3)
+        specifier: ^5.71.0
+        version: 5.71.0(@types/node@24.7.0)(typescript@5.9.3)
       lint-staged:
         specifier: ^15.5.2
         version: 15.5.2
       markdown-link-extractor:
         specifier: ^4.0.3
         version: 4.0.3
-      mitt:
-        specifier: ^3.0.1
-        version: 3.0.1
       prettier:
-        specifier: ^3.7.3
-        version: 3.7.3
+        specifier: ^3.7.4
+        version: 3.7.4
       publint:
         specifier: ^0.3.15
         version: 0.3.15
@@ -116,6 +89,9 @@ importers:
       tinyglobby:
         specifier: ^0.2.15
         version: 0.2.15
+      tsx:
+        specifier: ^4.21.0
+        version: 4.21.0
       typescript:
         specifier: ^5.9.2
         version: 5.9.3
@@ -132,57 +108,57 @@ importers:
   examples/angular/todos:
     dependencies:
       '@angular/common':
-        specifier: ^20.3.13
-        version: 20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
+        specifier: ^19.2.17
+        version: 19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
       '@angular/compiler':
-        specifier: ^20.3.14
+        specifier: ^20.3.15
         version: 20.3.15
       '@angular/core':
-        specifier: ^20.3.14
-        version: 20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)
+        specifier: ^19.2.17
+        version: 19.2.17(rxjs@7.8.2)(zone.js@0.16.0)
       '@angular/forms':
-        specifier: ^20.3.14
-        version: 20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)))(rxjs@7.8.2)
+        specifier: ^20.3.15
+        version: 20.3.15(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)))(rxjs@7.8.2)
       '@angular/platform-browser':
-        specifier: ^20.3.14
-        version: 20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))
+        specifier: ^19.2.17
+        version: 19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))
       '@angular/router':
-        specifier: ^20.3.14
-        version: 20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)))(rxjs@7.8.2)
+        specifier: ^20.3.15
+        version: 20.3.15(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)))(rxjs@7.8.2)
       '@tanstack/angular-db':
-        specifier: workspace:*
+        specifier: ^0.1.37
         version: link:../../../packages/angular-db
       '@tanstack/db':
-        specifier: workspace:*
+        specifier: ^0.5.11
         version: link:../../../packages/db
       rxjs:
-        specifier: ~7.8.2
+        specifier: ^7.8.2
         version: 7.8.2
       tslib:
         specifier: ^2.8.1
         version: 2.8.1
       zone.js:
-        specifier: ~0.16.0
+        specifier: ^0.16.0
         version: 0.16.0
     devDependencies:
       '@angular/build':
-        specifier: ^20.3.12
-        version: 20.3.12(@angular/compiler-cli@20.3.14(@angular/compiler@20.3.15)(typescript@5.8.3))(@angular/compiler@20.3.15)(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)))(@types/node@24.7.0)(chokidar@4.0.3)(jiti@2.6.1)(karma@6.4.4)(lightningcss@1.30.2)(postcss@8.5.6)(tailwindcss@3.4.18)(terser@5.44.0)(tslib@2.8.1)(tsx@4.21.0)(typescript@5.8.3)(vitest@3.2.4)(yaml@2.8.1)
+        specifier: ^20.3.13
+        version: 20.3.13(@angular/compiler-cli@20.3.15(@angular/compiler@20.3.15)(typescript@5.9.3))(@angular/compiler@20.3.15)(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)))(@types/node@24.7.0)(chokidar@4.0.3)(jiti@2.6.1)(karma@6.4.4)(lightningcss@1.30.2)(postcss@8.5.6)(tailwindcss@4.1.17)(terser@5.44.0)(tslib@2.8.1)(tsx@4.21.0)(typescript@5.9.3)(vitest@3.2.4)(yaml@2.8.1)
       '@angular/cli':
-        specifier: ^20.3.12
-        version: 20.3.12(@types/node@24.7.0)(chokidar@4.0.3)
+        specifier: ^20.3.13
+        version: 20.3.13(@types/node@24.7.0)(chokidar@4.0.3)
       '@angular/compiler-cli':
-        specifier: ^20.3.14
-        version: 20.3.14(@angular/compiler@20.3.15)(typescript@5.8.3)
+        specifier: ^20.3.15
+        version: 20.3.15(@angular/compiler@20.3.15)(typescript@5.9.3)
+      '@tailwindcss/postcss':
+        specifier: ^4.1.17
+        version: 4.1.17
       '@types/jasmine':
         specifier: ~5.1.13
         version: 5.1.13
-      autoprefixer:
-        specifier: ^10.4.22
-        version: 10.4.22(postcss@8.5.6)
       jasmine-core:
-        specifier: ~5.12.1
-        version: 5.12.1
+        specifier: ~5.13.0
+        version: 5.13.0
       karma:
         specifier: ~6.4.4
         version: 6.4.4
@@ -197,46 +173,46 @@ importers:
         version: 5.1.0(karma@6.4.4)
       karma-jasmine-html-reporter:
         specifier: ~2.1.0
-        version: 2.1.0(jasmine-core@5.12.1)(karma-jasmine@5.1.0(karma@6.4.4))(karma@6.4.4)
+        version: 2.1.0(jasmine-core@5.13.0)(karma-jasmine@5.1.0(karma@6.4.4))(karma@6.4.4)
       postcss:
         specifier: ^8.5.6
         version: 8.5.6
       tailwindcss:
-        specifier: ^3.4.18
-        version: 3.4.18
+        specifier: ^4.1.17
+        version: 4.1.17
       typescript:
-        specifier: ~5.8.2
-        version: 5.8.3
+        specifier: ^5.9.2
+        version: 5.9.3
 
   examples/react/offline-transactions:
     dependencies:
       '@tanstack/offline-transactions':
-        specifier: workspace:*
+        specifier: ^1.0.5
         version: link:../../../packages/offline-transactions
       '@tanstack/query-db-collection':
-        specifier: workspace:*
+        specifier: ^1.0.11
         version: link:../../../packages/query-db-collection
       '@tanstack/react-db':
-        specifier: workspace:*
+        specifier: ^0.1.59
         version: link:../../../packages/react-db
       '@tanstack/react-query':
-        specifier: ^5.90.11
-        version: 5.90.11(react@19.2.0)
+        specifier: ^5.90.12
+        version: 5.90.12(react@19.2.1)
       '@tanstack/react-router':
-        specifier: ^1.139.12
-        version: 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+        specifier: ^1.140.0
+        version: 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
       '@tanstack/react-router-devtools':
-        specifier: ^1.139.12
-        version: 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.139.12)(@types/node@22.18.1)(csstype@3.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass@1.90.0)(solid-js@1.9.10)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+        specifier: ^1.140.0
+        version: 1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(@tanstack/router-core@1.140.0)(csstype@3.2.3)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(solid-js@1.9.10)
       '@tanstack/react-start':
-        specifier: ^1.139.12
-        version: 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        specifier: ^1.140.0
+        version: 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       react:
-        specifier: ^19.2.0
-        version: 19.2.0
+        specifier: ^19.2.1
+        version: 19.2.1
       react-dom:
-        specifier: ^19.2.0
-        version: 19.2.0(react@19.2.0)
+        specifier: ^19.2.1
+        version: 19.2.1(react@19.2.1)
       tailwind-merge:
         specifier: ^2.6.0
         version: 2.6.0
@@ -244,9 +220,12 @@ importers:
         specifier: ^3.25.76
         version: 3.25.76
     devDependencies:
+      '@tailwindcss/vite':
+        specifier: ^4.1.17
+        version: 4.1.17(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@types/node':
-        specifier: ^22.5.4
-        version: 22.18.1
+        specifier: ^24.6.2
+        version: 24.7.0
       '@types/react':
         specifier: ^19.2.7
         version: 19.2.7
@@ -255,92 +234,86 @@ importers:
         version: 19.2.3(@types/react@19.2.7)
       '@vitejs/plugin-react':
         specifier: ^5.1.1
-        version: 5.1.1(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      autoprefixer:
-        specifier: ^10.4.22
-        version: 10.4.22(postcss@8.5.6)
+        version: 5.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       chokidar:
         specifier: ^4.0.3
         version: 4.0.3
-      postcss:
-        specifier: ^8.5.6
-        version: 8.5.6
       tailwindcss:
-        specifier: ^3.4.18
-        version: 3.4.18
+        specifier: ^4.1.17
+        version: 4.1.17
       typescript:
-        specifier: ^5.7.2
+        specifier: ^5.9.2
         version: 5.9.3
       vite:
         specifier: ^7.2.6
-        version: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+        version: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
       vite-tsconfig-paths:
         specifier: ^5.1.4
-        version: 5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
 
   examples/react/paced-mutations-demo:
     dependencies:
       '@tanstack/db':
-        specifier: workspace:*
+        specifier: ^0.5.11
         version: link:../../../packages/db
       '@tanstack/react-db':
-        specifier: workspace:*
+        specifier: ^0.1.59
         version: link:../../../packages/react-db
       mitt:
         specifier: ^3.0.1
         version: 3.0.1
       react:
-        specifier: ^18.3.1
-        version: 18.3.1
+        specifier: ^19.2.1
+        version: 19.2.1
       react-dom:
-        specifier: ^18.3.1
-        version: 18.3.1(react@18.3.1)
+        specifier: ^19.2.1
+        version: 19.2.1(react@19.2.1)
     devDependencies:
       '@types/react':
-        specifier: ^18.3.27
-        version: 18.3.27
+        specifier: ^19.2.7
+        version: 19.2.7
       '@types/react-dom':
-        specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.27)
+        specifier: ^19.2.3
+        version: 19.2.3(@types/react@19.2.7)
       '@vitejs/plugin-react':
-        specifier: ^4.7.0
-        version: 4.7.0(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        specifier: ^5.1.1
+        version: 5.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       typescript:
-        specifier: ^5.7.2
+        specifier: ^5.9.2
         version: 5.9.3
       vite:
-        specifier: ^6.4.1
-        version: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+        specifier: ^7.2.6
+        version: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
   examples/react/projects:
     dependencies:
       '@tailwindcss/vite':
         specifier: ^4.1.17
-        version: 4.1.17(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 4.1.17(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@tanstack/query-core':
-        specifier: ^5.90.11
-        version: 5.90.11
+        specifier: ^5.90.12
+        version: 5.90.12
       '@tanstack/query-db-collection':
-        specifier: workspace:*
+        specifier: ^1.0.11
         version: link:../../../packages/query-db-collection
       '@tanstack/react-db':
-        specifier: workspace:*
+        specifier: ^0.1.59
         version: link:../../../packages/react-db
       '@tanstack/react-router':
-        specifier: ^1.139.12
-        version: 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+        specifier: ^1.140.0
+        version: 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
       '@tanstack/react-router-devtools':
-        specifier: ^1.139.12
-        version: 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.139.12)(@types/node@24.7.0)(csstype@3.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass@1.90.0)(solid-js@1.9.10)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+        specifier: ^1.140.0
+        version: 1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(@tanstack/router-core@1.140.0)(csstype@3.2.3)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(solid-js@1.9.10)
       '@tanstack/react-router-with-query':
         specifier: ^1.130.17
-        version: 1.130.17(@tanstack/react-query@5.90.11(react@19.2.0))(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.139.12)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+        version: 1.130.17(@tanstack/react-query@5.90.12(react@19.2.1))(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(@tanstack/router-core@1.140.0)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
       '@tanstack/react-start':
-        specifier: ^1.139.12
-        version: 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        specifier: ^1.140.0
+        version: 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@tanstack/router-plugin':
-        specifier: ^1.139.12
-        version: 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        specifier: ^1.140.0
+        version: 1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@trpc/client':
         specifier: ^11.7.2
         version: 11.7.2(@trpc/server@11.7.2(typescript@5.9.3))(typescript@5.9.3)
@@ -349,37 +322,37 @@ importers:
         version: 11.7.2(typescript@5.9.3)
       better-auth:
         specifier: ^1.3.26
-        version: 1.3.26(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(solid-js@1.9.10)
+        version: 1.3.26(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(solid-js@1.9.10)
       dotenv:
         specifier: ^17.2.3
         version: 17.2.3
       drizzle-orm:
-        specifier: ^0.44.7
-        version: 0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7)
+        specifier: ^0.45.0
+        version: 0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7)
       drizzle-zod:
         specifier: ^0.8.3
-        version: 0.8.3(drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7))(zod@4.1.11)
+        version: 0.8.3(drizzle-orm@0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7))(zod@4.1.13)
       pg:
         specifier: ^8.16.3
         version: 8.16.3
       react:
-        specifier: ^19.2.0
-        version: 19.2.0
+        specifier: ^19.2.1
+        version: 19.2.1
       react-dom:
-        specifier: ^19.2.0
-        version: 19.2.0(react@19.2.0)
+        specifier: ^19.2.1
+        version: 19.2.1(react@19.2.1)
       tailwindcss:
         specifier: ^4.1.17
         version: 4.1.17
       vite:
-        specifier: ^6.3.5
-        version: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+        specifier: ^7.2.6
+        version: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
       vite-tsconfig-paths:
         specifier: ^5.1.4
-        version: 5.1.4(typescript@5.9.3)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       zod:
         specifier: ^4.1.11
-        version: 4.1.11
+        version: 4.1.13
     devDependencies:
       '@eslint/compat':
         specifier: ^1.4.1
@@ -392,7 +365,7 @@ importers:
         version: 10.4.1
       '@testing-library/react':
         specifier: ^16.3.0
-        version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+        version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
       '@types/pg':
         specifier: ^8.15.6
         version: 8.15.6
@@ -403,20 +376,20 @@ importers:
         specifier: ^19.2.3
         version: 19.2.3(@types/react@19.2.7)
       '@typescript-eslint/eslint-plugin':
-        specifier: ^8.48.0
-        version: 8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.48.1
+        version: 8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@typescript-eslint/parser':
-        specifier: ^8.48.0
-        version: 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.48.1
+        version: 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@vitejs/plugin-react':
-        specifier: ^5.0.4
-        version: 5.1.1(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        specifier: ^5.1.1
+        version: 5.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       concurrently:
         specifier: ^9.2.1
         version: 9.2.1
       drizzle-kit:
-        specifier: ^0.31.7
-        version: 0.31.7
+        specifier: ^0.31.8
+        version: 0.31.8
       eslint:
         specifier: ^9.39.1
         version: 9.39.1(jiti@2.6.1)
@@ -425,7 +398,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-prettier:
         specifier: ^5.5.4
-        version: 5.5.4(eslint-config-prettier@10.1.8(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))(prettier@3.7.3)
+        version: 5.5.4(eslint-config-prettier@10.1.8(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))(prettier@3.7.4)
       eslint-plugin-react:
         specifier: ^7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -433,11 +406,11 @@ importers:
         specifier: ^16.5.0
         version: 16.5.0
       jsdom:
-        specifier: ^27.0.0
+        specifier: ^27.2.0
         version: 27.2.0(postcss@8.5.6)
       prettier:
-        specifier: ^3.7.3
-        version: 3.7.3
+        specifier: ^3.7.4
+        version: 3.7.4
       tsx:
         specifier: ^4.21.0
         version: 4.21.0
@@ -454,47 +427,47 @@ importers:
   examples/react/todo:
     dependencies:
       '@tanstack/electric-db-collection':
-        specifier: workspace:*
+        specifier: ^0.2.12
         version: link:../../../packages/electric-db-collection
       '@tanstack/query-core':
-        specifier: ^5.90.11
-        version: 5.90.11
+        specifier: ^5.90.12
+        version: 5.90.12
       '@tanstack/query-db-collection':
-        specifier: workspace:*
+        specifier: ^1.0.11
         version: link:../../../packages/query-db-collection
       '@tanstack/react-db':
-        specifier: workspace:*
+        specifier: ^0.1.59
         version: link:../../../packages/react-db
       '@tanstack/react-router':
-        specifier: ^1.139.12
-        version: 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+        specifier: ^1.140.0
+        version: 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
       '@tanstack/react-start':
-        specifier: ^1.139.12
-        version: 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        specifier: ^1.140.0
+        version: 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@tanstack/trailbase-db-collection':
-        specifier: workspace:*
+        specifier: ^0.1.55
         version: link:../../../packages/trailbase-db-collection
       cors:
         specifier: ^2.8.5
         version: 2.8.5
       drizzle-orm:
-        specifier: ^0.44.7
-        version: 0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7)
+        specifier: ^0.45.0
+        version: 0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7)
       drizzle-zod:
         specifier: ^0.8.3
-        version: 0.8.3(drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7))(zod@4.1.11)
+        version: 0.8.3(drizzle-orm@0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7))(zod@4.1.13)
       express:
-        specifier: ^4.21.2
-        version: 4.21.2
+        specifier: ^4.22.1
+        version: 4.22.1
       postgres:
         specifier: ^3.4.7
         version: 3.4.7
       react:
-        specifier: ^19.2.0
-        version: 19.2.0
+        specifier: ^19.2.1
+        version: 19.2.1
       react-dom:
-        specifier: ^19.2.0
-        version: 19.2.0(react@19.2.0)
+        specifier: ^19.2.1
+        version: 19.2.1(react@19.2.1)
       tailwindcss:
         specifier: ^4.1.17
         version: 4.1.17
@@ -503,17 +476,17 @@ importers:
         version: 0.8.0
       vite-tsconfig-paths:
         specifier: ^5.1.4
-        version: 5.1.4(typescript@5.9.3)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       zod:
         specifier: ^4.1.11
-        version: 4.1.11
+        version: 4.1.13
     devDependencies:
       '@eslint/js':
         specifier: ^9.39.1
         version: 9.39.1
       '@tailwindcss/vite':
         specifier: ^4.1.17
-        version: 4.1.17(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 4.1.17(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@types/cors':
         specifier: ^2.8.19
         version: 2.8.19
@@ -521,7 +494,7 @@ importers:
         specifier: ^4.17.25
         version: 4.17.25
       '@types/node':
-        specifier: ^24.5.2
+        specifier: ^24.6.2
         version: 24.7.0
       '@types/pg':
         specifier: ^8.15.6
@@ -533,23 +506,23 @@ importers:
         specifier: ^19.2.3
         version: 19.2.3(@types/react@19.2.7)
       '@typescript-eslint/eslint-plugin':
-        specifier: ^8.48.0
-        version: 8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.48.1
+        version: 8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@typescript-eslint/parser':
-        specifier: ^8.48.0
-        version: 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.48.1
+        version: 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@vitejs/plugin-react':
-        specifier: ^5.0.3
-        version: 5.1.1(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        specifier: ^5.1.1
+        version: 5.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       concurrently:
         specifier: ^9.2.1
         version: 9.2.1
       dotenv:
-        specifier: ^17.2.2
+        specifier: ^17.2.3
         version: 17.2.3
       drizzle-kit:
-        specifier: ^0.31.7
-        version: 0.31.7
+        specifier: ^0.31.8
+        version: 0.31.8
       eslint:
         specifier: ^9.39.1
         version: 9.39.1(jiti@2.6.1)
@@ -569,44 +542,44 @@ importers:
         specifier: ^5.9.2
         version: 5.9.3
       vite:
-        specifier: ^6.1.1
-        version: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+        specifier: ^7.2.6
+        version: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
   examples/solid/todo:
     dependencies:
       '@tanstack/electric-db-collection':
-        specifier: workspace:*
+        specifier: ^0.2.12
         version: link:../../../packages/electric-db-collection
       '@tanstack/query-core':
-        specifier: ^5.90.11
-        version: 5.90.11
+        specifier: ^5.90.12
+        version: 5.90.12
       '@tanstack/query-db-collection':
-        specifier: workspace:*
+        specifier: ^1.0.11
         version: link:../../../packages/query-db-collection
       '@tanstack/solid-db':
-        specifier: workspace:*
+        specifier: ^0.1.54
         version: link:../../../packages/solid-db
       '@tanstack/solid-router':
-        specifier: ^1.139.12
-        version: 1.139.12(solid-js@1.9.10)
+        specifier: ^1.140.0
+        version: 1.140.0(solid-js@1.9.10)
       '@tanstack/solid-start':
-        specifier: ^1.139.12
-        version: 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(solid-js@1.9.10)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        specifier: ^1.140.0
+        version: 1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(solid-js@1.9.10)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@tanstack/trailbase-db-collection':
-        specifier: workspace:*
+        specifier: ^0.1.55
         version: link:../../../packages/trailbase-db-collection
       cors:
         specifier: ^2.8.5
         version: 2.8.5
       drizzle-orm:
-        specifier: ^0.44.7
-        version: 0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7)
+        specifier: ^0.45.0
+        version: 0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7)
       drizzle-zod:
         specifier: ^0.8.3
-        version: 0.8.3(drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7))(zod@4.1.11)
+        version: 0.8.3(drizzle-orm@0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7))(zod@4.1.13)
       express:
-        specifier: ^4.21.2
-        version: 4.21.2
+        specifier: ^4.22.1
+        version: 4.22.1
       postgres:
         specifier: ^3.4.7
         version: 3.4.7
@@ -621,14 +594,14 @@ importers:
         version: 0.8.0
       vite-tsconfig-paths:
         specifier: ^5.1.4
-        version: 5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
     devDependencies:
       '@eslint/js':
         specifier: ^9.39.1
         version: 9.39.1
       '@tailwindcss/vite':
         specifier: ^4.1.17
-        version: 4.1.17(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 4.1.17(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@types/cors':
         specifier: ^2.8.19
         version: 2.8.19
@@ -636,26 +609,26 @@ importers:
         specifier: ^4.17.25
         version: 4.17.25
       '@types/node':
-        specifier: ^22.18.1
-        version: 22.18.1
+        specifier: ^24.6.2
+        version: 24.7.0
       '@types/pg':
         specifier: ^8.15.6
         version: 8.15.6
       '@typescript-eslint/eslint-plugin':
-        specifier: ^8.48.0
-        version: 8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.48.1
+        version: 8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@typescript-eslint/parser':
-        specifier: ^8.48.0
-        version: 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.48.1
+        version: 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       concurrently:
         specifier: ^9.2.1
         version: 9.2.1
       dotenv:
-        specifier: ^16.6.1
-        version: 16.6.1
+        specifier: ^17.2.3
+        version: 17.2.3
       drizzle-kit:
-        specifier: ^0.31.7
-        version: 0.31.7
+        specifier: ^0.31.8
+        version: 0.31.8
       eslint:
         specifier: ^9.39.1
         version: 9.39.1(jiti@2.6.1)
@@ -672,11 +645,11 @@ importers:
         specifier: ^5.9.2
         version: 5.9.3
       vite:
-        specifier: ^7.1.7
-        version: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+        specifier: ^7.2.6
+        version: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
       vite-plugin-solid:
         specifier: ^2.11.10
-        version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
 
   packages/angular-db:
     dependencies:
@@ -685,20 +658,20 @@ importers:
         version: link:../db
     devDependencies:
       '@angular/common':
-        specifier: ^19.2.15
-        version: 19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
+        specifier: ^19.2.17
+        version: 19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
       '@angular/compiler':
-        specifier: ^20.0.0
+        specifier: ^20.3.15
         version: 20.3.15
       '@angular/core':
-        specifier: ^19.2.16
-        version: 19.2.16(rxjs@7.8.2)(zone.js@0.16.0)
+        specifier: ^19.2.17
+        version: 19.2.17(rxjs@7.8.2)(zone.js@0.16.0)
       '@angular/platform-browser':
-        specifier: ^19.2.16
-        version: 19.2.16(@angular/common@19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))
+        specifier: ^19.2.17
+        version: 19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))
       '@angular/platform-browser-dynamic':
-        specifier: ^19.2.16
-        version: 19.2.16(@angular/common@19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/compiler@20.3.15)(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.16(@angular/common@19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0)))
+        specifier: ^19.2.17
+        version: 19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/compiler@20.3.15)(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)))
       '@vitest/coverage-istanbul':
         specifier: ^3.2.4
         version: 3.2.4(vitest@3.2.4)
@@ -718,18 +691,24 @@ importers:
         specifier: workspace:*
         version: link:../db-ivm
       '@tanstack/pacer-lite':
-        specifier: ^0.1.0
-        version: 0.1.0
+        specifier: ^0.1.1
+        version: 0.1.1
       typescript:
         specifier: '>=4.7'
         version: 5.9.3
     devDependencies:
+      '@tanstack/config':
+        specifier: ^0.22.2
+        version: 0.22.2(@types/node@24.7.0)(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@vitest/coverage-istanbul':
         specifier: ^3.2.4
         version: 3.2.4(vitest@3.2.4)
       arktype:
-        specifier: ^2.1.27
-        version: 2.1.27
+        specifier: ^2.1.28
+        version: 2.1.28
+      mitt:
+        specifier: ^3.0.1
+        version: 3.0.1
       superjson:
         specifier: ^2.2.6
         version: 2.2.6
@@ -790,8 +769,8 @@ importers:
   packages/electric-db-collection:
     dependencies:
       '@electric-sql/client':
-        specifier: ^1.2.0
-        version: 1.2.0
+        specifier: ^1.3.0
+        version: 1.3.0
       '@standard-schema/spec':
         specifier: ^1.0.0
         version: 1.0.0
@@ -825,17 +804,17 @@ importers:
         version: link:../db
     devDependencies:
       '@types/node':
-        specifier: ^20.0.0
-        version: 20.19.24
+        specifier: ^24.6.2
+        version: 24.7.0
       eslint:
-        specifier: ^8.57.1
-        version: 8.57.1
+        specifier: ^9.39.1
+        version: 9.39.1(jiti@2.6.1)
       typescript:
-        specifier: ^5.5.4
+        specifier: ^5.9.2
         version: 5.9.3
       vitest:
         specifier: ^3.2.4
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@20.19.24)(@vitest/ui@3.2.4)(jiti@2.6.1)(jsdom@27.2.0(postcss@8.5.6))(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@24.7.0)(@vitest/ui@3.2.4)(jiti@2.6.1)(jsdom@27.2.0(postcss@8.5.6))(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
   packages/powersync-db-collection:
     dependencies:
@@ -881,8 +860,8 @@ importers:
         version: 5.9.3
     devDependencies:
       '@tanstack/query-core':
-        specifier: ^5.90.11
-        version: 5.90.11
+        specifier: ^5.90.12
+        version: 5.90.12
       '@vitest/coverage-istanbul':
         specifier: ^3.2.4
         version: 3.2.4(vitest@3.2.4)
@@ -894,14 +873,14 @@ importers:
         version: link:../db
       use-sync-external-store:
         specifier: ^1.6.0
-        version: 1.6.0(react@19.2.0)
+        version: 1.6.0(react@19.2.1)
     devDependencies:
       '@electric-sql/client':
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: ^1.3.0
+        version: 1.3.0
       '@testing-library/react':
         specifier: ^16.3.0
-        version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+        version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
       '@types/react':
         specifier: ^19.2.7
         version: 19.2.7
@@ -915,11 +894,11 @@ importers:
         specifier: ^3.2.4
         version: 3.2.4(vitest@3.2.4)
       react:
-        specifier: ^19.2.0
-        version: 19.2.0
+        specifier: ^19.2.1
+        version: 19.2.1
       react-dom:
-        specifier: ^19.2.0
-        version: 19.2.0(react@19.2.0)
+        specifier: ^19.2.1
+        version: 19.2.1(react@19.2.1)
 
   packages/rxdb-db-collection:
     dependencies:
@@ -936,8 +915,8 @@ importers:
         specifier: ^4.4.3
         version: 4.4.3
       rxdb:
-        specifier: 16.21.0
-        version: 16.21.0(rxjs@7.8.2)(socks@2.8.7)
+        specifier: 16.21.1
+        version: 16.21.1(rxjs@7.8.2)(socks@2.8.7)
       rxjs:
         specifier: '>=7.8.2'
         version: 7.8.2
@@ -962,8 +941,8 @@ importers:
         version: link:../db
     devDependencies:
       '@electric-sql/client':
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: ^1.3.0
+        version: 1.3.0
       '@solidjs/testing-library':
         specifier: ^0.8.10
         version: 0.8.10(solid-js@1.9.10)
@@ -991,10 +970,10 @@ importers:
     devDependencies:
       '@sveltejs/package':
         specifier: ^2.5.7
-        version: 2.5.7(svelte@5.45.2)(typescript@5.9.3)
+        version: 2.5.7(svelte@5.45.6)(typescript@5.9.3)
       '@sveltejs/vite-plugin-svelte':
         specifier: ^6.2.1
-        version: 6.2.1(svelte@5.45.2)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+        version: 6.2.1(svelte@5.45.6)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@vitest/coverage-istanbul':
         specifier: ^3.2.4
         version: 3.2.4(vitest@3.2.4)
@@ -1002,11 +981,11 @@ importers:
         specifier: ^0.3.15
         version: 0.3.15
       svelte:
-        specifier: ^5.45.2
-        version: 5.45.2
+        specifier: ^5.45.6
+        version: 5.45.6
       svelte-check:
         specifier: ^4.3.4
-        version: 4.3.4(picomatch@4.0.3)(svelte@5.45.2)(typescript@5.9.3)
+        version: 4.3.4(picomatch@4.0.3)(svelte@5.45.6)(typescript@5.9.3)
 
   packages/trailbase-db-collection:
     dependencies:
@@ -1043,8 +1022,8 @@ importers:
         version: link:../db
     devDependencies:
       '@electric-sql/client':
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: ^1.3.0
+        version: 1.3.0
       '@vitejs/plugin-vue':
         specifier: ^6.0.2
         version: 6.0.2(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))(vue@3.5.25(typescript@5.9.3))
@@ -1127,12 +1106,12 @@ packages:
     resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
     engines: {node: '>=6.0.0'}
 
-  '@angular-devkit/architect@0.2003.12':
-    resolution: {integrity: sha512-5H40lAFF4CKY32C4HOp6bTlOF1f4WsGCwe7FjFQp9A+T7yoCBiHpIWt2JKTwV4sBoTKVDZOnuf0GG+UVKjQT4A==}
+  '@angular-devkit/architect@0.2003.13':
+    resolution: {integrity: sha512-JyH6Af6PNC1IHJToColFk1RaXDU87mpPjz7M5sWDfn8bC+KBipw6dSdRkCEuw0D9HY1lZkC9EBV9k9GhpvHjCQ==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
-  '@angular-devkit/core@20.3.12':
-    resolution: {integrity: sha512-ReFxd/UOoVDr3+kIUjmYILQZF89qg62POdY7a7OqBH7plmInFlYVSEDouJvGqj3LVCPiqTk2ZOSChbhS/eLxXA==}
+  '@angular-devkit/core@20.3.13':
+    resolution: {integrity: sha512-/D84T1Caxll3I2sRihPDR9UaWBhF50M+tAX15PdP6uSh/TxwAlLl9p7Rm1bD0mPjPercqaEKA+h9a9qLP16hug==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     peerDependencies:
       chokidar: ^4.0.0
@@ -1140,12 +1119,12 @@ packages:
       chokidar:
         optional: true
 
-  '@angular-devkit/schematics@20.3.12':
-    resolution: {integrity: sha512-JqJ1u59y+Ud51k/8MHYzSP+aQOeC2PJBaDmMnvqfWVaIt6n3x4gc/VtuhqhpJ0SKulbFuOWgAfI6QbPFrgUYQQ==}
+  '@angular-devkit/schematics@20.3.13':
+    resolution: {integrity: sha512-hdMKY4rUTko8xqeWYGnwwDYDomkeOoLsYsP6SdaHWK7hpGvzWsT6Q/aIv8J8NrCYkLu+M+5nLiKOooweUZu3GQ==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
-  '@angular/build@20.3.12':
-    resolution: {integrity: sha512-iAZve4VPviC8y6RFctyh3qFXSlP5mth9K46/0zasB4LV4pcmu8BrzIHERxIn/jCDNdVdPh973kxo1ksO4WpyuA==}
+  '@angular/build@20.3.13':
+    resolution: {integrity: sha512-/5pM3ZS+lLkZgA+n6TMmNV8I6t9Ow1C6Vkj6bXqWeOgFDH5LwnIEZFAKzEDBkCGos0m2gPKPcREcDD5tfp9h4g==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     peerDependencies:
       '@angular/compiler': ^20.0.0
@@ -1155,7 +1134,7 @@ packages:
       '@angular/platform-browser': ^20.0.0
       '@angular/platform-server': ^20.0.0
       '@angular/service-worker': ^20.0.0
-      '@angular/ssr': ^20.3.12
+      '@angular/ssr': ^20.3.13
       karma: ^6.4.0
       less: ^4.2.0
       ng-packagr: ^20.0.0
@@ -1190,31 +1169,24 @@ packages:
       vitest:
         optional: true
 
-  '@angular/cli@20.3.12':
-    resolution: {integrity: sha512-vqVyVjbFPCRMjA5evL7tV2JeR6Anuzb9WcXTMB17fr7uzKNNAvo7KyRaOJjp+TU4JDARTNyGPy0aywfPx7R60A==}
+  '@angular/cli@20.3.13':
+    resolution: {integrity: sha512-G78I/HDJULloS2LSqfUfbmBlhDCbcWujIRWfuMnGsRf82TyGA2OEPe3IA/F8MrJfeOzPQim2fMyn24MqHL40Vg==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     hasBin: true
 
-  '@angular/common@19.2.15':
-    resolution: {integrity: sha512-aVa/ctBYH/4qgA7r4sS7TV+/DzRYmcS+3d6l89pNKUXkI8gpmsd+r3FjccaemX4Wqru1QOrMvC+i+e7IBIVv0g==}
+  '@angular/common@19.2.17':
+    resolution: {integrity: sha512-yFUXAdpvOFirGD/EGDwp1WHravHzI4sdyRE2iH7i8im9l8IE2VZ6D1KDJp8VVpMJt38LNlRAWYek3s+z6OcAkg==}
     engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0}
     peerDependencies:
-      '@angular/core': 19.2.15
-      rxjs: ^6.5.3 || ^7.4.0
-
-  '@angular/common@20.3.13':
-    resolution: {integrity: sha512-Jy+Qu6760TZyiDJX0+fNzkc70+lwF9ojdkIyCso/Lvbx1v3Fki0+9Wui7Vge56hknkr05xXg1aEUeqMN0966Lg==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
-    peerDependencies:
-      '@angular/core': 20.3.13
+      '@angular/core': 19.2.17
       rxjs: ^6.5.3 || ^7.4.0
 
-  '@angular/compiler-cli@20.3.14':
-    resolution: {integrity: sha512-lFg9ikwRClzDPjdFiwynbVFIi1RJZf/0i+OHa3Ns2gzXxJeHNKMJrHHjWZ2DU4N2UpxH0YAPe22N9Bie28IuQQ==}
+  '@angular/compiler-cli@20.3.15':
+    resolution: {integrity: sha512-8sJoxodxsfyZ8eJ5r6Bx7BCbazXYgsZ1+dE8t5u5rTQ6jNggwNtYEzkyReoD5xvP+MMtRkos3xpwq4rtFnpI6A==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
-      '@angular/compiler': 20.3.14
+      '@angular/compiler': 20.3.15
       typescript: '>=5.8 <6.0'
     peerDependenciesMeta:
       typescript:
@@ -1224,80 +1196,56 @@ packages:
     resolution: {integrity: sha512-lMicIAFAKZXa+BCZWs3soTjNQPZZXrF/WMVDinm8dQcggNarnDj4UmXgKSyXkkyqK5SLfnLsXVzrX6ndVT6z7A==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
 
-  '@angular/core@19.2.16':
-    resolution: {integrity: sha512-aBt4rYq0sMonUsl7k9kHAVgeP+6NM3CNGVvxqLmeSiQI2BUTWTTvfGR/52cQyUmDBuBRmaV6YK0F3zEAnOZzyA==}
+  '@angular/core@19.2.17':
+    resolution: {integrity: sha512-nVu0ryxfiXUZ9M+NV21TY+rJZkPXTYo9U0aJb19hvByPpG+EvuujXUOgpulz6vxIzGy7pz/znRa+K9kxuuC+yQ==}
     engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0}
     peerDependencies:
       rxjs: ^6.5.3 || ^7.4.0
       zone.js: ~0.15.0
 
-  '@angular/core@20.3.14':
-    resolution: {integrity: sha512-rpyEbhWF6Fj/xI9IvNLZh5QBUYnoXuF7vX54CCtyQ2MHALxRR/aa1WRxjRM96cF2OqodQ/Gj3oYW8ei8hlBh4w==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
-    peerDependencies:
-      '@angular/compiler': 20.3.14
-      rxjs: ^6.5.3 || ^7.4.0
-      zone.js: ~0.15.0
-    peerDependenciesMeta:
-      '@angular/compiler':
-        optional: true
-      zone.js:
-        optional: true
-
-  '@angular/forms@20.3.14':
-    resolution: {integrity: sha512-fGrJ589tU+AKoxf+kaRrEw7wlSfVr1/z/Fz625ggFCc6ySQEityKW3JsnLfNkh5qGrdxib4BOfF78f9J7Pyk+w==}
+  '@angular/forms@20.3.15':
+    resolution: {integrity: sha512-gS5hQkinq52pm/7mxz4yHPCzEcmRWjtUkOVddPH0V1BW/HMni/p4Y6k2KqKBeGb9p8S5EAp6PDxDVLOPukp3mg==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
     peerDependencies:
-      '@angular/common': 20.3.14
-      '@angular/core': 20.3.14
-      '@angular/platform-browser': 20.3.14
+      '@angular/common': 20.3.15
+      '@angular/core': 20.3.15
+      '@angular/platform-browser': 20.3.15
       rxjs: ^6.5.3 || ^7.4.0
 
-  '@angular/platform-browser-dynamic@19.2.16':
-    resolution: {integrity: sha512-bq4wqUgVAR9cr5QzjLjuSXEHo1Cstx8z/z1gZz0OM9HMSnA95bgPvQMtwtuZYOds0ItOUsLMDyFsDiAD3dAAmw==}
+  '@angular/platform-browser-dynamic@19.2.17':
+    resolution: {integrity: sha512-jrps9QKhuPrHBZwLv+43z+WldT4aVKZu8v7LPpRHb7/pVLvqccXtIxt3Ttm7sa4tc2SwlKazdE8/ezaNWIRnAg==}
     engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0}
     peerDependencies:
-      '@angular/common': 19.2.16
-      '@angular/compiler': 19.2.16
-      '@angular/core': 19.2.16
-      '@angular/platform-browser': 19.2.16
+      '@angular/common': 19.2.17
+      '@angular/compiler': 19.2.17
+      '@angular/core': 19.2.17
+      '@angular/platform-browser': 19.2.17
 
-  '@angular/platform-browser@19.2.16':
-    resolution: {integrity: sha512-oDg0YWE0ZxW6AI2m5Da4fAVIhmNrrXLCvzE7bKZjBK1FsFx6FduBfQFsCg4K7D+72aGj0WDmEia8IVcBDtwvog==}
+  '@angular/platform-browser@19.2.17':
+    resolution: {integrity: sha512-Rn23nIQwYMSeGXWFHI/X8bGHAkdahRxH9UIGUlJKxW61MSkK6AW4kCHG/Ev1TvDq9HjijsMjcqcsd6/Sb8aBXg==}
     engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0}
     peerDependencies:
-      '@angular/animations': 19.2.16
-      '@angular/common': 19.2.16
-      '@angular/core': 19.2.16
-    peerDependenciesMeta:
-      '@angular/animations':
-        optional: true
-
-  '@angular/platform-browser@20.3.14':
-    resolution: {integrity: sha512-Lviz9GfsIyOIBDal8QhIBKU8OMH29A0RhFw2opTC50sqKadXLN9CD7iSaAwQbNLc4mc3JAF4zth0AzKdHLbz7Q==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
-    peerDependencies:
-      '@angular/animations': 20.3.14
-      '@angular/common': 20.3.14
-      '@angular/core': 20.3.14
+      '@angular/animations': 19.2.17
+      '@angular/common': 19.2.17
+      '@angular/core': 19.2.17
     peerDependenciesMeta:
       '@angular/animations':
         optional: true
 
-  '@angular/router@20.3.14':
-    resolution: {integrity: sha512-gi7/NuHRS9n9RCwh03VuVFizVMa2lKL/s+7yP3Ecq2nQ5uSeTMWb/91OmGEBwncI3wKPkYdQ9g3n6PvK/O8uDQ==}
+  '@angular/router@20.3.15':
+    resolution: {integrity: sha512-6+qgk8swGSoAu7ISSY//GatAyCP36hEvvUgvjbZgkXLLH9yUQxdo77ij05aJ5s0OyB25q/JkqS8VTY0z1yE9NQ==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
     peerDependencies:
-      '@angular/common': 20.3.14
-      '@angular/core': 20.3.14
-      '@angular/platform-browser': 20.3.14
+      '@angular/common': 20.3.15
+      '@angular/core': 20.3.15
+      '@angular/platform-browser': 20.3.15
       rxjs: ^6.5.3 || ^7.4.0
 
-  '@ark/schema@0.55.0':
-    resolution: {integrity: sha512-IlSIc0FmLKTDGr4I/FzNHauMn0MADA6bCjT1wauu4k6MyxhC1R9gz0olNpIRvK7lGGDwtc/VO0RUDNvVQW5WFg==}
+  '@ark/schema@0.56.0':
+    resolution: {integrity: sha512-ECg3hox/6Z/nLajxXqNhgPtNdHWC9zNsDyskwO28WinoFEnWow4IsERNz9AnXRhTZJnYIlAJ4uGn3nlLk65vZA==}
 
-  '@ark/util@0.55.0':
-    resolution: {integrity: sha512-aWFNK7aqSvqFtVsl1xmbTjGbg91uqtJV7Za76YGNEwIO4qLjMfyY8flmmbhooYMuqPCO2jyxu8hve943D+w3bA==}
+  '@ark/util@0.56.0':
+    resolution: {integrity: sha512-BghfRC8b9pNs3vBoDJhcta0/c1J1rsoS1+HgVUreMFPdhz/CRAKReAu57YEllNaSy98rWAdY1gE+gFup7OXpgA==}
 
   '@asamuzakjp/css-color@4.0.5':
     resolution: {integrity: sha512-lMrXidNhPGsDjytDy11Vwlb6OIGrT3CmLg3VWNFyWkLWtijKl7xjvForlh8vuj0SHGjgl4qZEQzUmYTeQA2JFQ==}
@@ -1540,12 +1488,12 @@ packages:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
 
-  '@commitlint/parse@20.0.0':
-    resolution: {integrity: sha512-j/PHCDX2bGM5xGcWObOvpOc54cXjn9g6xScXzAeOLwTsScaL4Y+qd0pFC6HBwTtrH92NvJQc+2Lx9HFkVi48cg==}
+  '@commitlint/parse@20.2.0':
+    resolution: {integrity: sha512-LXStagGU1ivh07X7sM+hnEr4BvzFYn1iBJ6DRg2QsIN8lBfSzyvkUcVCDwok9Ia4PWiEgei5HQjju6xfJ1YaSQ==}
     engines: {node: '>=v18'}
 
-  '@commitlint/types@20.0.0':
-    resolution: {integrity: sha512-bVUNBqG6aznYcYjTjnc3+Cat/iBgbgpflxbIBTnsHTX0YVpnmINPEkSRWymT2Q8aSH3Y7aKnEbunilkYe8TybA==}
+  '@commitlint/types@20.2.0':
+    resolution: {integrity: sha512-KTy0OqRDLR5y/zZMnizyx09z/rPlPC/zKhYgH8o/q6PuAjoQAKlRfY4zzv0M64yybQ//6//4H1n14pxaLZfUnA==}
     engines: {node: '>=v18'}
 
   '@csstools/color-helpers@5.1.0':
@@ -1585,8 +1533,8 @@ packages:
   '@drizzle-team/brocli@0.10.2':
     resolution: {integrity: sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w==}
 
-  '@electric-sql/client@1.2.0':
-    resolution: {integrity: sha512-K/MEjti3UF4aPKJJqO6Tp4f5noqc2/3icU1NPdpKfQaHwbzGtEX2aJmL2vxTEUJbfyrISkPKbOPnrz/lAvw1Vg==}
+  '@electric-sql/client@1.3.0':
+    resolution: {integrity: sha512-6pVQOBmocDBj5diGCOcyekL9gsa2Kk3j/eN3fytzLYKxqUguvuojMisoYPexHgOchJlcMzR6qpJTYj42npWWxw==}
 
   '@emnapi/core@1.5.0':
     resolution: {integrity: sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==}
@@ -2236,18 +2184,10 @@ packages:
     resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/eslintrc@2.1.4':
-    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
   '@eslint/eslintrc@3.3.1':
     resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/js@8.57.1':
-    resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
   '@eslint/js@9.39.1':
     resolution: {integrity: sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -2493,19 +2433,10 @@ packages:
     resolution: {integrity: sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==}
     engines: {node: '>=18.18.0'}
 
-  '@humanwhocodes/config-array@0.13.0':
-    resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
-    engines: {node: '>=10.10.0'}
-    deprecated: Use @eslint/config-array instead
-
   '@humanwhocodes/module-importer@1.0.1':
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
 
-  '@humanwhocodes/object-schema@2.0.3':
-    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
-    deprecated: Use @eslint/object-schema instead
-
   '@humanwhocodes/retry@0.4.3':
     resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
     engines: {node: '>=18.18'}
@@ -2761,9 +2692,15 @@ packages:
   '@microsoft/tsdoc@0.15.1':
     resolution: {integrity: sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw==}
 
-  '@modelcontextprotocol/sdk@1.17.3':
-    resolution: {integrity: sha512-JPwUKWSsbzx+DLFznf/QZ32Qa+ptfbUlHhRLrBQBAFu9iI1iYvizM4p+zhhRDceSsPutXp4z+R/HPVphlIiclg==}
+  '@modelcontextprotocol/sdk@1.24.0':
+    resolution: {integrity: sha512-D8h5KXY2vHFW8zTuxn2vuZGN0HGrQ5No6LkHwlEA9trVgNdPL3TF1dSqKA7Dny6BbBYKSW/rOBDXdC8KJAjUCg==}
     engines: {node: '>=18'}
+    peerDependencies:
+      '@cfworker/json-schema': ^4.1.1
+      zod: ^3.25 || ^4.0
+    peerDependenciesMeta:
+      '@cfworker/json-schema':
+        optional: true
 
   '@mongodb-js/saslprep@1.3.0':
     resolution: {integrity: sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==}
@@ -3264,9 +3201,6 @@ packages:
     resolution: {integrity: sha512-S+9ANAvUmjutrshV4jZjaiG8XQyuJIZ8a4utWmN/vW1sgQ9IfBnPndwkmQYw53QmouOIytT874u65HEmu6H5jw==}
     engines: {node: '>=18'}
 
-  '@rolldown/pluginutils@1.0.0-beta.27':
-    resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==}
-
   '@rolldown/pluginutils@1.0.0-beta.40':
     resolution: {integrity: sha512-s3GeJKSQOwBlzdUrj4ISjJj5SfSh+aqn0wjOar4Bx95iV1ETI7F6S/5hLcfAxZ9kXDcyrAkxPlqmd1ZITttf+w==}
 
@@ -3527,8 +3461,8 @@ packages:
   '@rushstack/ts-command-line@4.22.6':
     resolution: {integrity: sha512-QSRqHT/IfoC5nk9zn6+fgyqOPXHME0BfchII9EUPR19pocsNp/xSbeBCbD3PIR2Lg+Q5qk7OFqk1VhWPMdKHJg==}
 
-  '@schematics/angular@20.3.12':
-    resolution: {integrity: sha512-ikl+nkWUab/Z4eSkBHgq9FLIUH8qh4OcYKeBQ0fyWqIUFHyjjK0JOfwmH1g/3zAmuUMtkthHCehAtyKzCTQjVA==}
+  '@schematics/angular@20.3.13':
+    resolution: {integrity: sha512-ETJ1budKmrkdxojo5QP6TPr6zQZYGxtWWf8NrX1cBIS851zPCmFkKyhSFLZsoksariYF/LP8ljvm8tlcIzt/XA==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
   '@shikijs/engine-oniguruma@3.13.0':
@@ -3678,12 +3612,6 @@ packages:
   '@standard-schema/spec@1.0.0':
     resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==}
 
-  '@stylistic/eslint-plugin@4.4.1':
-    resolution: {integrity: sha512-CEigAk7eOLyHvdgmpZsKFwtiqS2wFwI1fn4j09IU9GmD4euFM4jEBAViWeCqaNLlbX2k2+A/Fq9cje4HQBXuJQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: '>=9.0.0'
-
   '@stylistic/eslint-plugin@5.4.0':
     resolution: {integrity: sha512-UG8hdElzuBDzIbjG1QDwnYH0MQ73YLXDFHgZzB4Zh/YJfnw8XNsloVtytqzx0I2Qky9THSdpTmi8Vjn/pf/Lew==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -3806,6 +3734,9 @@ packages:
     resolution: {integrity: sha512-F0F7d01fmkQhsTjXezGBLdrl1KresJTcI3DB8EkScCldyKp3Msz4hub4uyYaVnk88BAS1g5DQjjF6F5qczheLA==}
     engines: {node: '>= 10'}
 
+  '@tailwindcss/postcss@4.1.17':
+    resolution: {integrity: sha512-+nKl9N9mN5uJ+M7dBOOCzINw94MPstNR/GtIhz1fpZysxL/4a+No64jCBD6CPN+bIHWFx3KWuu8XJRrj/572Dw==}
+
   '@tailwindcss/vite@4.1.17':
     resolution: {integrity: sha512-4+9w8ZHOiGnpcGI6z1TVVfWaX/koK7fKeSYF3qlYg2xpBtbteP2ddBxiarL+HVgfSJGeK5RIxRQmKm4rTJJAwA==}
     peerDependencies:
@@ -3814,9 +3745,10 @@ packages:
   '@tanstack/config@0.22.2':
     resolution: {integrity: sha512-zP1b6xd864AOOJQ7u6r+kicohRc8dAyql6sBbQh2f2RjoEynAfn0GrMHGeqhl1LN8JThokCkcjfGnXbPEz3q3A==}
     engines: {node: '>=18'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
-  '@tanstack/directive-functions-plugin@1.139.0':
-    resolution: {integrity: sha512-qLGxldnWa0pp/siZEFEYDU+eB/j40bd1V3IuTzP0sFnrYi11Ldx1yVkOruDKUbO1WM0o+OlPhp22Q1h+LMdDMA==}
+  '@tanstack/directive-functions-plugin@1.140.0':
+    resolution: {integrity: sha512-uquEEs9ClzHew5f5u/ks4XxlCdK9fjK+T38DsMhuW8WXfBn7aDBacUrf9uXYDhVPuSLR0FUZrfixR0JHHspzDA==}
     engines: {node: '>=12'}
     peerDependencies:
       vite: '>=6.0.0 || >=7.0.0'
@@ -3825,32 +3757,38 @@ packages:
     resolution: {integrity: sha512-8VFyAaIFV9onJcfc5yVj5WWl6DmN3W4m+t0Mb+nZrQmqHy+kDndw5O5Xv2BHVWRRPTqnhlJYh6wHWGh0R81ZzQ==}
     engines: {node: '>=18'}
 
-  '@tanstack/history@1.139.0':
-    resolution: {integrity: sha512-l6wcxwDBeh/7Dhles23U1O8lp9kNJmAb2yNjekR6olZwCRNAVA8TCXlVCrueELyFlYZqvQkh0ofxnzG62A1Kkg==}
+  '@tanstack/eslint-config@0.3.4':
+    resolution: {integrity: sha512-5Ou1XWJRCTx5G8WoCbT7+6nQ4iNdsISzBAc4lXpFy2fEOO7xioOSPvcPIv+r9V0drPPETou2tr6oLGZZ909FKg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      eslint: ^8.0.0 || ^9.0.0
+
+  '@tanstack/history@1.140.0':
+    resolution: {integrity: sha512-u+/dChlWlT3kYa/RmFP+E7xY5EnzvKEKcvKk+XrgWMpBWExQIh3RQX/eUqhqwCXJPNc4jfm1Coj8umnm/hDgyA==}
     engines: {node: '>=12'}
 
-  '@tanstack/pacer-lite@0.1.0':
-    resolution: {integrity: sha512-a5A0PI0H4npUy7u3VOjOhdynXnRBna+mDvpt8ghDCVzS3Tgn8DlGzHlRqS2rKJP8ZcLuVO2qxlIIblhcoaiv8Q==}
+  '@tanstack/pacer-lite@0.1.1':
+    resolution: {integrity: sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w==}
     engines: {node: '>=18'}
 
   '@tanstack/publish-config@0.2.2':
     resolution: {integrity: sha512-hTW2rLeZLBMmpwVzWmUJ5L50hPlf4Ea74rZtecbT6qQYCT16JEAbryfHm1u07KIICI2vEArsm2YguckjODqx0w==}
     engines: {node: '>=18'}
 
-  '@tanstack/query-core@5.90.11':
-    resolution: {integrity: sha512-f9z/nXhCgWDF4lHqgIE30jxLe4sYv15QodfdPDKYAk7nAEjNcndy4dHz3ezhdUaR23BpWa4I2EH4/DZ0//Uf8A==}
+  '@tanstack/query-core@5.90.12':
+    resolution: {integrity: sha512-T1/8t5DhV/SisWjDnaiU2drl6ySvsHj1bHBCWNXd+/T+Hh1cf6JodyEYMd5sgwm+b/mETT4EV3H+zCVczCU5hg==}
 
-  '@tanstack/react-query@5.90.11':
-    resolution: {integrity: sha512-3uyzz01D1fkTLXuxF3JfoJoHQMU2fxsfJwE+6N5hHy0dVNoZOvwKP8Z2k7k1KDeD54N20apcJnG75TBAStIrBA==}
+  '@tanstack/react-query@5.90.12':
+    resolution: {integrity: sha512-graRZspg7EoEaw0a8faiUASCyJrqjKPdqJ9EwuDRUF9mEYJ1YPczI9H+/agJ0mOJkPCJDk0lsz5QTrLZ/jQ2rg==}
     peerDependencies:
       react: ^18 || ^19
 
-  '@tanstack/react-router-devtools@1.139.12':
-    resolution: {integrity: sha512-deMQGaojEJGFio95o0rDT4OhgtwfgrQIBZAGnXhfyC395n94IuE43uvvv7tkfBzWHQwYK0IvZIeyKMavbvAj7Q==}
+  '@tanstack/react-router-devtools@1.140.0':
+    resolution: {integrity: sha512-11NFwHCG8KphG7Bif570qOxBVwNBTkIOExsf42WNv7cgRhwD6cHjUvfx20/WzkAlvFbEGlV+pp7wiJm3HR56bQ==}
     engines: {node: '>=12'}
     peerDependencies:
-      '@tanstack/react-router': ^1.139.12
-      '@tanstack/router-core': ^1.139.12
+      '@tanstack/react-router': ^1.140.0
+      '@tanstack/router-core': ^1.140.0
       react: '>=18.0.0 || >=19.0.0'
       react-dom: '>=18.0.0 || >=19.0.0'
     peerDependenciesMeta:
@@ -3867,29 +3805,29 @@ packages:
       react: '>=18.0.0 || >=19.0.0'
       react-dom: '>=18.0.0 || >=19.0.0'
 
-  '@tanstack/react-router@1.139.12':
-    resolution: {integrity: sha512-qrIxb8c6XXih6MERZKKwdnYg0OannsQLJ/s+4/wRqKqGCG+QmvAMvnmNP7bfYLgFKi+KsE27HqUkHaSpZSenwQ==}
+  '@tanstack/react-router@1.140.0':
+    resolution: {integrity: sha512-Xe4K1bEtU5h0cAhaKYXDQA2cuITgEs1x6tOognJbcxamlAdzDAkhYBhRg8dKSVAyfGejAUNlUi4utnN0s6R+Yw==}
     engines: {node: '>=12'}
     peerDependencies:
       react: '>=18.0.0 || >=19.0.0'
       react-dom: '>=18.0.0 || >=19.0.0'
 
-  '@tanstack/react-start-client@1.139.12':
-    resolution: {integrity: sha512-ZRif6o5Ctoc9T+oJzU5zGlcbcIcAtFL+Em8hCG72wvoF9r5AB8ji6+tvToVa0rhoDq3Rq3DsZLee7aEVOuczgA==}
+  '@tanstack/react-start-client@1.140.0':
+    resolution: {integrity: sha512-c8TfaKOUwgbNTHIBdlg40pH/IUQR30KtW3Qh1wTMczMM0Z0EgZK9D3TgReXpgngttri9ka++CZ56UsSKNT8fxQ==}
     engines: {node: '>=22.12.0'}
     peerDependencies:
       react: '>=18.0.0 || >=19.0.0'
       react-dom: '>=18.0.0 || >=19.0.0'
 
-  '@tanstack/react-start-server@1.139.12':
-    resolution: {integrity: sha512-rJFS5/bo/hvl66hQIbTBbHbrwDGc8Go2GfvYhJQUInecIqgOXJTDctc3vvgsrdZGPmoH2i5zwM2SYIJ4Na1AvQ==}
+  '@tanstack/react-start-server@1.140.0':
+    resolution: {integrity: sha512-ywVGdVmFtZPHVEZlYd1HjdF40kaWyZ8dXv7sv8TQmr3doAdDJGAyUX/EPYZgJbsInHsEJKmhWJBBz7amXB9ztA==}
     engines: {node: '>=22.12.0'}
     peerDependencies:
       react: '>=18.0.0 || >=19.0.0'
       react-dom: '>=18.0.0 || >=19.0.0'
 
-  '@tanstack/react-start@1.139.12':
-    resolution: {integrity: sha512-CcVrR0AHGvOdpWg8FKM83Cqy/25n7xHe0XosMaSpW4DvfSOn4HyDc6RoFi8DqVKCRnXhdqn6GzhKEIk1VfRDog==}
+  '@tanstack/react-start@1.140.0':
+    resolution: {integrity: sha512-6GaCnindCwz2jGcR5IY6h8PAJgY/Y+aD70ocFd41hF6HYEi80iQalN+ItL5M8JhPXUV6CAWy5x4ciOyvonoNwA==}
     engines: {node: '>=22.12.0'}
     peerDependencies:
       react: '>=18.0.0 || >=19.0.0'
@@ -3902,31 +3840,31 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@tanstack/router-core@1.139.12':
-    resolution: {integrity: sha512-HCDi4fpnAFeDDogT0C61yd2nJn0FrIyFDhyHG3xJji8emdn8Ni4rfyrN4Av46xKkXTPUGdbsqih45+uuNtunew==}
+  '@tanstack/router-core@1.140.0':
+    resolution: {integrity: sha512-/Te/mlAzi5FEpZ9NF9RhVw/n+cWYLiCHpvevNKo7JPA8ZYWF58wkalPtNWSocftX4P+OIBNerFAW9UbLgSbvSw==}
     engines: {node: '>=12'}
 
-  '@tanstack/router-devtools-core@1.139.12':
-    resolution: {integrity: sha512-VARlT9alLnROnPsZtHrSZsqYksIdBBQ24yGzEper5K1+1e0fzpcKLnMYLK9cwr//uWA2xmQayznvBnwcTmnUlg==}
+  '@tanstack/router-devtools-core@1.140.0':
+    resolution: {integrity: sha512-jrfJZabe2ndKgoQWd7xLdfLFG/ew6hfPMjCmx2Ep+KBkSqfR19Pww8UtJ8Y0KcfTEFKL3YzVEsRS4EZDX3A1Qw==}
     engines: {node: '>=12'}
     peerDependencies:
-      '@tanstack/router-core': ^1.139.12
+      '@tanstack/router-core': ^1.140.0
       csstype: ^3.0.10
       solid-js: '>=1.9.5'
     peerDependenciesMeta:
       csstype:
         optional: true
 
-  '@tanstack/router-generator@1.139.12':
-    resolution: {integrity: sha512-HGs35aBml+2TVwoynsEc00/9Duw19GeT1fX+JzrY0TKNfMzq/nbjR+xxU8M1w3+gHqfKiITmW70XSZoWkXu9tw==}
+  '@tanstack/router-generator@1.140.0':
+    resolution: {integrity: sha512-YYq/DSn7EkBboCySf87RDH3mNq3AfN18v4qHmre73KOdxUJchTZ4LC1+8vbO/1K/Uus2ZFXUDy7QX5KziNx08g==}
     engines: {node: '>=12'}
 
-  '@tanstack/router-plugin@1.139.12':
-    resolution: {integrity: sha512-xX39CcU6GLMaahr6YGNQYRZOQsd1WefgCH99PtY0cxZr9VNAIpJMYPsQY8h/g8A4JI10rHI1tdKxZAvodWjZxw==}
+  '@tanstack/router-plugin@1.140.0':
+    resolution: {integrity: sha512-hUOOYTPLFS3LvGoPoQNk3BY3ZvPlVIgxnJT3JMJMdstLMT2RUYha3ddsaamZd4ONUSWmt+7N5OXmiG0v4XmzMw==}
     engines: {node: '>=12'}
     peerDependencies:
       '@rsbuild/core': '>=1.0.2'
-      '@tanstack/react-router': ^1.139.12
+      '@tanstack/react-router': ^1.140.0
       vite: '>=5.0.0 || >=6.0.0 || >=7.0.0'
       vite-plugin-solid: ^2.11.10
       webpack: '>=5.92.0'
@@ -3942,34 +3880,34 @@ packages:
       webpack:
         optional: true
 
-  '@tanstack/router-utils@1.139.0':
-    resolution: {integrity: sha512-jT7D6NimWqoFSkid4vCno8gvTyfL1+NHpgm3es0B2UNhKKRV3LngOGilm1m6v8Qvk/gy6Fh/tvB+s+hBl6GhOg==}
+  '@tanstack/router-utils@1.140.0':
+    resolution: {integrity: sha512-gobraqMjkR5OO4nNbnwursGo08Idla6Yu30RspIA9IR1hv4WPJlxIyRWJcKjiQeXGyu5TuekLPUOHM46oood7w==}
     engines: {node: '>=12'}
 
-  '@tanstack/server-functions-plugin@1.139.0':
-    resolution: {integrity: sha512-IpNFiCoy2YU6gY/4lCKIVlFyU67ltlcUMGcdnrevqOgq20AbMyeLbbBVo9tAA3TkHK9F+9Hd7DqGXsup2pmBLg==}
+  '@tanstack/server-functions-plugin@1.140.0':
+    resolution: {integrity: sha512-DArdmj+L1i4z3aPa/opr2GrbwY4Oil6o2faJjf4rZJMY7sCtVHs/tCNLWTJfYMLe+Jj/zyp7kkEpW19fpuLFhg==}
     engines: {node: '>=12'}
 
-  '@tanstack/solid-router@1.139.12':
-    resolution: {integrity: sha512-OeGv3MiNOv71ZucPdeU/PD2mVrwRavC4o8v2mUImPHlRNtG7DHScMmmE6q6cO7CQOinIRWkZVcHa8hcHtHZHyA==}
+  '@tanstack/solid-router@1.140.0':
+    resolution: {integrity: sha512-ZYM5bvzugmHCvkZaOHYlSCRSTV5niLs+sKJpM4rRKv73dAvoYlUSrqe6nRnv3bqdPbnHbCxZtKP8+NbC8BReng==}
     engines: {node: '>=12'}
     peerDependencies:
       solid-js: ^1.9.10
 
-  '@tanstack/solid-start-client@1.139.12':
-    resolution: {integrity: sha512-lt/oJzOLet+QyscxjgLZworvFt4K5fbCaVyx1c14hJV2US0C0oppCdmMuSZqLeDuv1yzN+SQJsjDDHtfmzVM9g==}
+  '@tanstack/solid-start-client@1.140.0':
+    resolution: {integrity: sha512-y4FZ8pWA+kNuEoK8qrEDDXXF03teV9kHVkxmdn82srOQ2lHFHurVYP3tLRf7ARz7Qo63eqY01mJqFOx2fuMQpA==}
     engines: {node: '>=22.12.0'}
     peerDependencies:
       solid-js: '>=1.0.0'
 
-  '@tanstack/solid-start-server@1.139.12':
-    resolution: {integrity: sha512-zrkEJm3erbKb5eAhuRSRkwR7AHI5g5RA6b5wp4xMj++43JmChxs1yvz6YX6cU8cQFn5uPhbiM4BZmMjFhBUlJg==}
+  '@tanstack/solid-start-server@1.140.0':
+    resolution: {integrity: sha512-MounuOKJ7ATaY1ivI6x659fzzMT30mfvvhGRXfGGn5G9qHAmkdRg5DUJ8HvkabiQtWw8eXC/VRG1/q/nes2lGw==}
     engines: {node: '>=22.12.0'}
     peerDependencies:
       solid-js: ^1.0.0
 
-  '@tanstack/solid-start@1.139.12':
-    resolution: {integrity: sha512-dpV1W/la7bEseTsOJA6DoOPqOB0Fas7xsFUgG/B3JjMJeFFU1NhIkAGaLp8+dpzsWP9fKdEA2u+B5yStQcUDnQ==}
+  '@tanstack/solid-start@1.140.0':
+    resolution: {integrity: sha512-DH0zV5RrrhD3X6OpTrAo5GwAsEDMChhkvf+h9w1rzjGP1gKdN/T9kui4Uy0P9XeYXbEHAELX8bRq8Mui67zevw==}
     engines: {node: '>=22.12.0'}
     peerDependencies:
       solid-js: '>=1.0.0'
@@ -3980,22 +3918,22 @@ packages:
     peerDependencies:
       solid-js: ^1.6.0
 
-  '@tanstack/start-client-core@1.139.12':
-    resolution: {integrity: sha512-W+btitgSMIPKWecBHpV+ZOS7HVKr5koOwYBPO/Nc5I3Xwnd96cFp80MoaB5yTj+BeVLnfKr69i3z/a04NsgxdQ==}
+  '@tanstack/start-client-core@1.140.0':
+    resolution: {integrity: sha512-uO1cKROMfnqu+HFe+0Q7MmZY6FIImfvubh8HXv6CY+XVdVTAkmKTtY8xKsAit/isLdrOZwDpKACxTM0FrW1MDQ==}
     engines: {node: '>=22.12.0'}
 
-  '@tanstack/start-plugin-core@1.139.12':
-    resolution: {integrity: sha512-RjvCwRDF80U0X84bbmVhZTYM325seu+ACwuNMlVltPahiEsPuA+6kKEckP8U2fvEjBIV8ev380+jYKekpnZG6w==}
+  '@tanstack/start-plugin-core@1.140.0':
+    resolution: {integrity: sha512-wwFA3ILC7dgOQdQWOCYqkx75oSBH6izfh+M5rb4wNzYWN4OTJxP1dSo1OW/GZ47RjehCNohO6Ct17i7aXY7cqA==}
     engines: {node: '>=22.12.0'}
     peerDependencies:
       vite: '>=7.0.0'
 
-  '@tanstack/start-server-core@1.139.12':
-    resolution: {integrity: sha512-zgT1z5+XGyl2SVK6EybrjWW9yjawtbPJ/aoHcDgMjJNmGL0D/aXLqwPzekKHkEMB/Al1CEMZNcSk4UgxFApVEg==}
+  '@tanstack/start-server-core@1.140.0':
+    resolution: {integrity: sha512-gsDovQeogPSmiV/EwVMRSJ9SWTNuGo+po1iLbZ4M058fM7K0xY6Pir8PlEL3jk0kzrAGCPY+0k28m9X5rS5dyQ==}
     engines: {node: '>=22.12.0'}
 
-  '@tanstack/start-storage-context@1.139.12':
-    resolution: {integrity: sha512-ygN5Z4XpCiVYmjjxPvwD1x//eA5CRJ2Acif9+fPz/bpz73Er32mgVndRi1SMsVHXUowWrKER1qDiPfs9gAoMRA==}
+  '@tanstack/start-storage-context@1.140.0':
+    resolution: {integrity: sha512-P2Z+Y/E+rfbdwyYapCTEzxyw4ovfNInOQovHCaME3nqi7/w3z1Luki69KBb1OkHxzBgqenUp/0uXVVBg1D/4wA==}
     engines: {node: '>=22.12.0'}
 
   '@tanstack/store@0.8.0':
@@ -4005,14 +3943,24 @@ packages:
     resolution: {integrity: sha512-4S6vIl2JmjvSQC87py/ZS9YWb1//1RRlHQRCUNLaGAdnptZYX7qJvSJS8GmAZ6nele2eRlpmPZGSw3MpCR22Tg==}
     engines: {node: '>=18'}
 
-  '@tanstack/virtual-file-routes@1.139.0':
-    resolution: {integrity: sha512-9PImF1d1tovTUIpjFVa0W7Fwj/MHif7BaaczgJJfbv3sDt1Gh+oW9W9uCw9M3ndEJynnp5ZD/TTs0RGubH5ssg==}
+  '@tanstack/typedoc-config@0.3.3':
+    resolution: {integrity: sha512-wVT2YfKDSpd+4f7fk6UaPIP3a2J7LSovlyVuFF1PH2yQb7gjqehod5zdFiwFyEXgvI9XGuFvvs1OehkKNYcr6A==}
+    engines: {node: '>=18'}
+
+  '@tanstack/virtual-file-routes@1.140.0':
+    resolution: {integrity: sha512-LVmd19QkxV3x40oHkuTii9ey3l5XDV+X8locO2p5zfVDUC+N58H2gA7cDUtVc9qtImncnz3WxQkO/6kM3PMx2w==}
     engines: {node: '>=12'}
 
   '@tanstack/vite-config@0.4.1':
     resolution: {integrity: sha512-FOl8EF6SAcljanKSm5aBeJaflFcxQAytTbxtNW8HC6D4x+UBW68IC4tBcrlrsI0wXHBmC/Gz4Ovvv8qCtiXSgQ==}
     engines: {node: '>=18'}
 
+  '@tanstack/vite-config@0.4.3':
+    resolution: {integrity: sha512-bqXfdPmD6DuAZdE08ih5bSqpcge9Im9nEym3CKcQ9OsPo0jmGW7WrJarLaoVB6qWEysh3FIwWQN1gtfeC7q8UQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      vite: ^6.0.0 || ^7.0.0
+
   '@testing-library/dom@10.4.1':
     resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
     engines: {node: '>=18'}
@@ -4091,8 +4039,8 @@ packages:
   '@types/connect@3.4.38':
     resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
 
-  '@types/conventional-commits-parser@5.0.1':
-    resolution: {integrity: sha512-7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ==}
+  '@types/conventional-commits-parser@5.0.2':
+    resolution: {integrity: sha512-BgT2szDXnVypgpNxOK8aL5SGjUdaQbC++WZNjF1Qge3Og2+zhHj+RWhmehLhYyvQwqAmvezruVfOf8+3m74W+g==}
 
   '@types/cors@2.8.19':
     resolution: {integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==}
@@ -4142,40 +4090,23 @@ packages:
   '@types/node@12.20.55':
     resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==}
 
-  '@types/node@20.19.24':
-    resolution: {integrity: sha512-FE5u0ezmi6y9OZEzlJfg37mqqf6ZDSF2V/NLjUyGrR9uTZ7Sb9F7bLNZ03S4XVUNRWGA7Ck4c1kK+YnuWjl+DA==}
-
-  '@types/node@22.18.1':
-    resolution: {integrity: sha512-rzSDyhn4cYznVG+PCzGe1lwuMYJrcBS1fc3JqSa2PvtABwWo+dZ1ij5OVok3tqfpEBCBoaR4d7upFJk73HRJDw==}
-
   '@types/node@24.7.0':
     resolution: {integrity: sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==}
 
   '@types/pg@8.15.6':
     resolution: {integrity: sha512-NoaMtzhxOrubeL/7UZuNTrejB4MPAJ0RpxZqXQf2qXuVlTPuG6Y8p4u9dKRaue4yjmC7ZhzVO2/Yyyn25znrPQ==}
 
-  '@types/prop-types@15.7.15':
-    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
-
   '@types/qs@6.14.0':
     resolution: {integrity: sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==}
 
   '@types/range-parser@1.2.7':
     resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
 
-  '@types/react-dom@18.3.7':
-    resolution: {integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==}
-    peerDependencies:
-      '@types/react': ^18.0.0
-
   '@types/react-dom@19.2.3':
     resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
     peerDependencies:
       '@types/react': ^19.2.0
 
-  '@types/react@18.3.27':
-    resolution: {integrity: sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==}
-
   '@types/react@19.2.7':
     resolution: {integrity: sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==}
 
@@ -4211,11 +4142,11 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/eslint-plugin@8.48.0':
-    resolution: {integrity: sha512-XxXP5tL1txl13YFtrECECQYeZjBZad4fyd3cFV4a19LkAY/bIp9fev3US4S5fDVV2JaYFiKAZ/GRTOLer+mbyQ==}
+  '@typescript-eslint/eslint-plugin@8.48.1':
+    resolution: {integrity: sha512-X63hI1bxl5ohelzr0LY5coufyl0LJNthld+abwxpCoo6Gq+hSqhKwci7MUWkXo67mzgUK6YFByhmaHmUcuBJmA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.48.0
+      '@typescript-eslint/parser': ^8.48.1
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
@@ -4226,8 +4157,8 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/parser@8.48.0':
-    resolution: {integrity: sha512-jCzKdm/QK0Kg4V4IK/oMlRZlY+QOcdjv89U2NgKHZk1CYTj82/RVSx1mV/0gqCVMJ/DA+Zf/S4NBWNF8GQ+eqQ==}
+  '@typescript-eslint/parser@8.48.1':
+    resolution: {integrity: sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -4239,8 +4170,8 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/project-service@8.48.0':
-    resolution: {integrity: sha512-Ne4CTZyRh1BecBf84siv42wv5vQvVmgtk8AuiEffKTUo3DrBaGYZueJSxxBZ8fjk/N3DrgChH4TOdIOwOwiqqw==}
+  '@typescript-eslint/project-service@8.48.1':
+    resolution: {integrity: sha512-HQWSicah4s9z2/HifRPQ6b6R7G+SBx64JlFQpgSSHWPKdvCZX57XCbszg/bapbRsOEv42q5tayTYcEFpACcX1w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -4249,8 +4180,8 @@ packages:
     resolution: {integrity: sha512-a0TTJk4HXMkfpFkL9/WaGTNuv7JWfFTQFJd6zS9dVAjKsojmv9HT55xzbEpnZoY+VUb+YXLMp+ihMLz/UlZfDg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/scope-manager@8.48.0':
-    resolution: {integrity: sha512-uGSSsbrtJrLduti0Q1Q9+BF1/iFKaxGoQwjWOIVNJv0o6omrdyR8ct37m4xIl5Zzpkp69Kkmvom7QFTtue89YQ==}
+  '@typescript-eslint/scope-manager@8.48.1':
+    resolution: {integrity: sha512-rj4vWQsytQbLxC5Bf4XwZ0/CKd362DkWMUkviT7DCS057SK64D5lH74sSGzhI6PDD2HCEq02xAP9cX68dYyg1w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/tsconfig-utils@8.47.0':
@@ -4259,8 +4190,8 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/tsconfig-utils@8.48.0':
-    resolution: {integrity: sha512-WNebjBdFdyu10sR1M4OXTt2OkMd5KWIL+LLfeH9KhgP+jzfDV/LI3eXzwJ1s9+Yc0Kzo2fQCdY/OpdusCMmh6w==}
+  '@typescript-eslint/tsconfig-utils@8.48.1':
+    resolution: {integrity: sha512-k0Jhs4CpEffIBm6wPaCXBAD7jxBtrHjrSgtfCjUvPp9AZ78lXKdTR8fxyZO5y4vWNlOvYXRtngSZNSn+H53Jkw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -4272,8 +4203,8 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/type-utils@8.48.0':
-    resolution: {integrity: sha512-zbeVaVqeXhhab6QNEKfK96Xyc7UQuoFWERhEnj3mLVnUWrQnv15cJNseUni7f3g557gm0e46LZ6IJ4NJVOgOpw==}
+  '@typescript-eslint/type-utils@8.48.1':
+    resolution: {integrity: sha512-1jEop81a3LrJQLTf/1VfPQdhIY4PlGDBc/i67EVWObrtvcziysbLN3oReexHOM6N3jyXgCrkBsZpqwH0hiDOQg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -4283,8 +4214,8 @@ packages:
     resolution: {integrity: sha512-nHAE6bMKsizhA2uuYZbEbmp5z2UpffNrPEqiKIeN7VsV6UY/roxanWfoRrf6x/k9+Obf+GQdkm0nPU+vnMXo9A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/types@8.48.0':
-    resolution: {integrity: sha512-cQMcGQQH7kwKoVswD1xdOytxQR60MWKM1di26xSUtxehaDs/32Zpqsu5WJlXTtTTqyAVK8R7hvsUnIXRS+bjvA==}
+  '@typescript-eslint/types@8.48.1':
+    resolution: {integrity: sha512-+fZ3LZNeiELGmimrujsDCT4CRIbq5oXdHe7chLiW8qzqyPMnn1puNstCrMNVAqwcl2FdIxkuJ4tOs/RFDBVc/Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@8.47.0':
@@ -4293,8 +4224,8 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/typescript-estree@8.48.0':
-    resolution: {integrity: sha512-ljHab1CSO4rGrQIAyizUS6UGHHCiAYhbfcIZ1zVJr5nMryxlXMVWS3duFPSKvSUbFPwkXMFk1k0EMIjub4sRRQ==}
+  '@typescript-eslint/typescript-estree@8.48.1':
+    resolution: {integrity: sha512-/9wQ4PqaefTK6POVTjJaYS0bynCgzh6ClJHGSBj06XEHjkfylzB+A3qvyaXnErEZSaxhIo4YdyBgq6j4RysxDg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -4306,8 +4237,8 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/utils@8.48.0':
-    resolution: {integrity: sha512-yTJO1XuGxCsSfIVt1+1UrLHtue8xz16V8apzPYI06W0HbEbEWHxHXgZaAgavIkoh+GeV6hKKd5jm0sS6OYxWXQ==}
+  '@typescript-eslint/utils@8.48.1':
+    resolution: {integrity: sha512-fAnhLrDjiVfey5wwFRwrweyRlCmdz5ZxXz2G/4cLn0YDLjTapmN4gcCsTBR1N2rWnZSDeWpYtgLDsJt+FpmcwA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -4317,16 +4248,13 @@ packages:
     resolution: {integrity: sha512-SIV3/6eftCy1bNzCQoPmbWsRLujS8t5iDIZ4spZOBHqrM+yfX2ogg8Tt3PDTAVKw3sSCiUgg30uOAvK2r9zGjQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/visitor-keys@8.48.0':
-    resolution: {integrity: sha512-T0XJMaRPOH3+LBbAfzR2jalckP1MSG/L9eUtY0DEzUyVaXJ/t6zN0nR7co5kz0Jko/nkSYCBRkz1djvjajVTTg==}
+  '@typescript-eslint/visitor-keys@8.48.1':
+    resolution: {integrity: sha512-BmxxndzEWhE4TIEEMBs8lP3MBWN3jFPs/p6gPm/wkv02o41hI6cq9AuSmGAaTTHPtA1FTi2jBre4A9rm5ZmX+Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@ungap/raw-json@0.4.4':
     resolution: {integrity: sha512-mUDobz3DeEItDmI34Hg+eL9hTTJSZbIvsvGAr42YoK4IyS7SWKmF5Xa0pI8RWFZSijL8QmfvCNH3s8HYJNxKaw==}
 
-  '@ungap/structured-clone@1.3.0':
-    resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
-
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
     resolution: {integrity: sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==}
     cpu: [arm]
@@ -4428,12 +4356,6 @@ packages:
     peerDependencies:
       vite: ^6.0.0 || ^7.0.0
 
-  '@vitejs/plugin-react@4.7.0':
-    resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
-
   '@vitejs/plugin-react@5.1.1':
     resolution: {integrity: sha512-WQfkSw0QbQ5aJ2CHYw23ZGkqnRwqKHD/KYsMeTkZzPT4Jcf0DcBxBtwMJxnu6E7oxw5+JC6ZAiePgh28uJ1HBA==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -4636,16 +4558,10 @@ packages:
     resolution: {integrity: sha512-BGcItUBWSMRgOCe+SVZJ+S7yTRG0eGt9cXAHev72yuGcY23hnLA7Bky5L/xLyPINoSN95geovfBkqoTlNZYa7w==}
     engines: {node: '>=14'}
 
-  any-promise@1.3.0:
-    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
-
   anymatch@3.1.3:
     resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
     engines: {node: '>= 8'}
 
-  arg@5.0.2:
-    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
-
   argparse@1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
 
@@ -4659,11 +4575,11 @@ packages:
     resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
     engines: {node: '>= 0.4'}
 
-  arkregex@0.0.3:
-    resolution: {integrity: sha512-bU21QJOJEFJK+BPNgv+5bVXkvRxyAvgnon75D92newgHxkBJTgiFwQxusyViYyJkETsddPlHyspshDQcCzmkNg==}
+  arkregex@0.0.4:
+    resolution: {integrity: sha512-biS/FkvSwQq59TZ453piUp8bxMui11pgOMV9WHAnli1F8o0ayNCZzUwQadL/bGIUic5TkS/QlPcyMuI8ZIwedQ==}
 
-  arktype@2.1.27:
-    resolution: {integrity: sha512-enctOHxI4SULBv/TDtCVi5M8oLd4J5SVlPUblXDzSsOYQNMzmVbUosGBnJuZDKmFlN5Ie0/QVEuTE+Z5X1UhsQ==}
+  arktype@2.1.28:
+    resolution: {integrity: sha512-LVZqXl2zWRpNFnbITrtFmqeqNkPPo+KemuzbGSY6jvJwCb4v8NsDzrWOLHnQgWl26TkJeWWcUNUeBpq2Mst1/Q==}
 
   array-buffer-byte-length@1.0.2:
     resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}
@@ -4728,13 +4644,6 @@ packages:
   async-mutex@0.5.0:
     resolution: {integrity: sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==}
 
-  autoprefixer@10.4.22:
-    resolution: {integrity: sha512-ARe0v/t9gO28Bznv6GgqARmVqcWOV3mfgUPn9becPHMiD3o9BwlRgaeccZnwTpZ7Zwqrm+c1sUSsMxIzQzc8Xg==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-
   available-typed-arrays@1.0.7:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
@@ -4892,10 +4801,6 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  camelcase-css@2.0.1:
-    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
-    engines: {node: '>= 6'}
-
   caniuse-lite@1.0.30001755:
     resolution: {integrity: sha512-44V+Jm6ctPj7R52Na4TLi3Zri4dWUljJd+RDm+j8LtNCc/ihLCT+X1TzoOAkRETEWqjuLnh9581Tl80FvK7jVA==}
 
@@ -5004,10 +4909,6 @@ packages:
   commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
-  commander@4.1.1:
-    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
-    engines: {node: '>= 6'}
-
   comment-parser@1.4.1:
     resolution: {integrity: sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==}
     engines: {node: '>= 12.0.0'}
@@ -5077,10 +4978,6 @@ packages:
     resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
     engines: {node: '>=6.6.0'}
 
-  cookie@0.7.1:
-    resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==}
-    engines: {node: '>= 0.6'}
-
   cookie@0.7.2:
     resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
     engines: {node: '>= 0.6'}
@@ -5125,11 +5022,6 @@ packages:
   css.escape@1.5.1:
     resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
 
-  cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
-
   cssstyle@5.3.3:
     resolution: {integrity: sha512-OytmFH+13/QXONJcC75QNdMtKpceNk3u8ThBjyyYjkEcy/ekBwR1mMAuNvi3gdBPW3N5TlCzQ0WZw8H0lN/bDw==}
     engines: {node: '>=20'}
@@ -5261,9 +5153,6 @@ packages:
   di@0.0.1:
     resolution: {integrity: sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==}
 
-  didyoumean@1.2.2:
-    resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
-
   diff@8.0.2:
     resolution: {integrity: sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==}
     engines: {node: '>=0.3.1'}
@@ -5272,17 +5161,10 @@ packages:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
 
-  dlv@1.1.3:
-    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
-
   doctrine@2.1.0:
     resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
     engines: {node: '>=0.10.0'}
 
-  doctrine@3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
-    engines: {node: '>=6.0.0'}
-
   dom-accessibility-api@0.5.16:
     resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}
 
@@ -5317,12 +5199,12 @@ packages:
     resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==}
     engines: {node: '>=12'}
 
-  drizzle-kit@0.31.7:
-    resolution: {integrity: sha512-hOzRGSdyKIU4FcTSFYGKdXEjFsncVwHZ43gY3WU5Bz9j5Iadp6Rh6hxLSQ1IWXpKLBKt/d5y1cpSPcV+FcoQ1A==}
+  drizzle-kit@0.31.8:
+    resolution: {integrity: sha512-O9EC/miwdnRDY10qRxM8P3Pg8hXe3LyU4ZipReKOgTwn4OqANmftj8XJz1UPUAS6NMHf0E2htjsbQujUTkncCg==}
     hasBin: true
 
-  drizzle-orm@0.44.7:
-    resolution: {integrity: sha512-quIpnYznjU9lHshEOAYLoZ9s3jweleHlZIAWR/jX9gAWNg/JhQ1wj0KGRf7/Zm+obRrYd9GjPVJg790QY9N5AQ==}
+  drizzle-orm@0.45.0:
+    resolution: {integrity: sha512-lyd9VRk3SXKRjV/gQckQzmJgkoYMvVG3A2JAV0vh3L+Lwk+v9+rK5Gj0H22y+ZBmxsrRBgJ5/RbQCN7DWd1dtQ==}
     peerDependencies:
       '@aws-sdk/client-rds-data': '>=3'
       '@cloudflare/workers-types': '>=4'
@@ -5672,10 +5554,6 @@ packages:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
       typescript: '>=4.8.4'
 
-  eslint-scope@7.2.2:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
   eslint-scope@8.4.0:
     resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -5688,12 +5566,6 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  eslint@8.57.1:
-    resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
-    hasBin: true
-
   eslint@9.39.1:
     resolution: {integrity: sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -5711,10 +5583,6 @@ packages:
     resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  espree@9.6.1:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
   esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
@@ -5724,8 +5592,8 @@ packages:
     resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
     engines: {node: '>=0.10'}
 
-  esrap@2.2.0:
-    resolution: {integrity: sha512-WBmtxe7R9C5mvL4n2le8nMUe4mD5V9oiK2vJpQ9I3y20ENPUomPcphBXE8D1x/Bm84oN1V+lOfgXxtqmxTp3Xg==}
+  esrap@2.2.1:
+    resolution: {integrity: sha512-GiYWG34AN/4CUyaWAgunGt0Rxvr1PTMlGC0vvEov/uOQYWne2bpN03Um+k8jT+q3op33mKouP2zeJ6OlM+qeUg==}
 
   esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
@@ -5791,8 +5659,8 @@ packages:
     peerDependencies:
       express: '>= 4.11'
 
-  express@4.21.2:
-    resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==}
+  express@4.22.1:
+    resolution: {integrity: sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==}
     engines: {node: '>= 0.10.0'}
 
   express@5.1.0:
@@ -5852,10 +5720,6 @@ packages:
   fflate@0.8.2:
     resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
 
-  file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-
   file-entry-cache@8.0.0:
     resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
     engines: {node: '>=16.0.0'}
@@ -5887,10 +5751,6 @@ packages:
   firebase@11.10.0:
     resolution: {integrity: sha512-nKBXoDzF0DrXTBQJlZa+sbC5By99ysYU1D6PkMRYknm0nCW7rJly47q492Ht7Ndz5MeYSBuboKuhS1e6mFC03w==}
 
-  flat-cache@3.2.0:
-    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-
   flat-cache@4.0.1:
     resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
     engines: {node: '>=16'}
@@ -5924,9 +5784,6 @@ packages:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
 
-  fraction.js@5.3.4:
-    resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==}
-
   fractional-indexing@3.2.0:
     resolution: {integrity: sha512-PcOxmqwYCW7O2ovKRU8OoQQj2yqTfEB/yeTYk4gPid6dN5ODRfU1hXd9tTVZzax/0NkO7AxpHykvZnT1aYp/BQ==}
     engines: {node: ^14.13.1 || >=16.0.0}
@@ -6045,10 +5902,6 @@ packages:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     deprecated: Glob versions prior to v9 are no longer supported
 
-  globals@13.24.0:
-    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
-    engines: {node: '>=8'}
-
   globals@14.0.0:
     resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
     engines: {node: '>=18'}
@@ -6384,10 +6237,6 @@ packages:
     resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
     engines: {node: '>=8'}
 
-  is-path-inside@3.0.3:
-    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
-    engines: {node: '>=8'}
-
   is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
 
@@ -6533,12 +6382,8 @@ packages:
   jasmine-core@4.6.1:
     resolution: {integrity: sha512-VYz/BjjmC3klLJlLwA4Kw8ytk0zDSmbbDLNs794VnWmkcCB7I9aAL/D48VNQtmITyPvea2C3jdUMfc3kAoy0PQ==}
 
-  jasmine-core@5.12.1:
-    resolution: {integrity: sha512-P/UbRZ0LKwXe7wEpwDheuhunPwITn4oPALhrJEQJo6756EwNGnsK/TSQrWojBB4cQDQ+VaxWYws9tFNDuiMh2Q==}
-
-  jiti@1.21.7:
-    resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==}
-    hasBin: true
+  jasmine-core@5.13.0:
+    resolution: {integrity: sha512-vsYjfh7lyqvZX5QgqKc4YH8phs7g96Z8bsdIFNEU3VqXhlHaq+vov/Fgn/sr6MiUczdZkyXRC3TX369Ll4Nzbw==}
 
   jiti@2.6.1:
     resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
@@ -6665,8 +6510,8 @@ packages:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
 
-  knip@5.70.2:
-    resolution: {integrity: sha512-LI7DbeVnk7h9+FAet5KzzHNdDwJyqDa2+cn4uQfZYTfpuVjEqtGmYD9r5b9JEuOs4eVkf/7sskNhWXxELm3C/Q==}
+  knip@5.71.0:
+    resolution: {integrity: sha512-hwgdqEJ+7DNJ5jE8BCPu7b57TY7vUwP6MzWYgCgPpg6iPCee/jKPShDNIlFER2koti4oz5xF88VJbKCb4Wl71g==}
     engines: {node: '>=18.18.0'}
     hasBin: true
     peerDependencies:
@@ -6761,9 +6606,6 @@ packages:
     resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
     engines: {node: '>=14'}
 
-  lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
-
   linkify-it@5.0.0:
     resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
 
@@ -7061,8 +6903,8 @@ packages:
   mongodb-connection-string-url@3.0.2:
     resolution: {integrity: sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==}
 
-  mongodb@6.20.0:
-    resolution: {integrity: sha512-Tl6MEIU3K4Rq3TSHd+sZQqRBoGlFsOgNrH5ltAcFBV62Re3Fd+FcaVf8uSEQFOJ51SDowDVttBTONMfoYWrWlQ==}
+  mongodb@6.21.0:
+    resolution: {integrity: sha512-URyb/VXMjJ4da46OeSXg+puO39XH9DeQpWCslifrRn9JWugy0D+DvvBvkm2WxmHe61O/H19JM66p1z7RHVkZ6A==}
     engines: {node: '>=16.20.1'}
     peerDependencies:
       '@aws-sdk/credential-providers': ^3.188.0
@@ -7116,9 +6958,6 @@ packages:
     resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==}
     engines: {node: ^18.17.0 || >=20.5.0}
 
-  mz@2.7.0:
-    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
-
   nanoid@3.3.11:
     resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -7194,10 +7033,6 @@ packages:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
 
-  normalize-range@0.1.2:
-    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: '>=0.10.0'}
-
   npm-bundled@4.0.0:
     resolution: {integrity: sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==}
     engines: {node: ^18.17.0 || >=20.5.0}
@@ -7245,10 +7080,6 @@ packages:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
 
-  object-hash@3.0.0:
-    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
-    engines: {node: '>= 6'}
-
   object-inspect@1.13.4:
     resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
     engines: {node: '>= 0.4'}
@@ -7509,18 +7340,10 @@ packages:
     engines: {node: '>=0.10'}
     hasBin: true
 
-  pify@2.3.0:
-    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
-    engines: {node: '>=0.10.0'}
-
   pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
 
-  pirates@4.0.7:
-    resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
-    engines: {node: '>= 6'}
-
   piscina@5.1.3:
     resolution: {integrity: sha512-0u3N7H4+hbr40KjuVn2uNhOcthu/9usKhnw5vT3J7ply79v3D3M8naI00el9Klcy16x557VsEkkUQaHCWFXC/g==}
     engines: {node: '>=20.x'}
@@ -7536,46 +7359,9 @@ packages:
     resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
     engines: {node: '>= 0.4'}
 
-  postcss-import@15.1.0:
-    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      postcss: ^8.0.0
-
-  postcss-js@4.0.1:
-    resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
-    engines: {node: ^12 || ^14 || >= 16}
-    peerDependencies:
-      postcss: ^8.4.21
-
-  postcss-load-config@4.0.2:
-    resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
-    engines: {node: '>= 14'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-
   postcss-media-query-parser@0.2.3:
     resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
 
-  postcss-nested@6.2.0:
-    resolution: {integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.2.14
-
-  postcss-selector-parser@6.1.2:
-    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
-    engines: {node: '>=4'}
-
-  postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-
   postcss@8.5.6:
     resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
     engines: {node: ^10 || ^12 || >=14}
@@ -7613,8 +7399,8 @@ packages:
     engines: {node: '>=10.13.0'}
     hasBin: true
 
-  prettier@3.7.3:
-    resolution: {integrity: sha512-QgODejq9K3OzoBbuyobZlUhznP5SKwPqp+6Q6xw6o8gnhr4O85L2U915iM2IDcfF2NPXVaM9zlo9tdwipnYwzg==}
+  prettier@3.7.4:
+    resolution: {integrity: sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -7700,15 +7486,10 @@ packages:
     resolution: {integrity: sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==}
     engines: {node: '>= 0.10'}
 
-  react-dom@18.3.1:
-    resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
-    peerDependencies:
-      react: ^18.3.1
-
-  react-dom@19.2.0:
-    resolution: {integrity: sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==}
+  react-dom@19.2.1:
+    resolution: {integrity: sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==}
     peerDependencies:
-      react: ^19.2.0
+      react: ^19.2.1
 
   react-is@16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
@@ -7716,25 +7497,14 @@ packages:
   react-is@17.0.2:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
 
-  react-refresh@0.17.0:
-    resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==}
-    engines: {node: '>=0.10.0'}
-
   react-refresh@0.18.0:
     resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
     engines: {node: '>=0.10.0'}
 
-  react@18.3.1:
-    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
-    engines: {node: '>=0.10.0'}
-
-  react@19.2.0:
-    resolution: {integrity: sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==}
+  react@19.2.1:
+    resolution: {integrity: sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==}
     engines: {node: '>=0.10.0'}
 
-  read-cache@1.0.0:
-    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
-
   read-yaml-file@1.1.0:
     resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==}
     engines: {node: '>=6'}
@@ -7860,8 +7630,8 @@ packages:
   run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
-  rxdb@16.21.0:
-    resolution: {integrity: sha512-rcRDLTcCSBIW9AwKyl/8L65NBH6JtsumnOeM+iB8qSg/qXeX39FGmac2+FC+hCNwTt6yW28m2chQuQpPMij4eA==}
+  rxdb@16.21.1:
+    resolution: {integrity: sha512-4yFfP9qw6QFFPueR9Dlwi/WYZ4u79AZ8ltLsDCB1PXhAuEj0vRPbaUiKR/U2iXdGb+1tDqj9d4hhrdtSLvR5xA==}
     engines: {node: '>=18'}
     peerDependencies:
       rxjs: ^7.8.0
@@ -7900,9 +7670,6 @@ packages:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
 
-  scheduler@0.23.2:
-    resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
-
   scheduler@0.27.0:
     resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
 
@@ -8306,11 +8073,6 @@ packages:
   style-to-object@1.0.9:
     resolution: {integrity: sha512-G4qppLgKu/k6FwRpHiGiKPaPTFcG3g4wNVX/Qsfu+RqQM30E7Tyu/TEgxcL9PNLF5pdRLwQdE3YKKf+KF2Dzlw==}
 
-  sucrase@3.35.0:
-    resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    hasBin: true
-
   superjson@2.2.6:
     resolution: {integrity: sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==}
     engines: {node: '>=16'}
@@ -8341,8 +8103,8 @@ packages:
       svelte: ^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0
       typescript: ^4.9.4 || ^5.0.0
 
-  svelte@5.45.2:
-    resolution: {integrity: sha512-yyXdW2u3H0H/zxxWoGwJoQlRgaSJLp+Vhktv12iRw2WRDlKqUPT54Fi0K/PkXqrdkcQ98aBazpy0AH4BCBVfoA==}
+  svelte@5.45.6:
+    resolution: {integrity: sha512-V3aVXthzPyPt1UB1wLEoXnEXpwPsvs7NHrR0xkCor8c11v71VqBj477MClqPZYyrcXrAH21sNGhOj9FJvSwXfQ==}
     engines: {node: '>=18'}
 
   symbol-tree@3.2.4:
@@ -8355,11 +8117,6 @@ packages:
   tailwind-merge@2.6.0:
     resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
 
-  tailwindcss@3.4.18:
-    resolution: {integrity: sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
-
   tailwindcss@4.1.17:
     resolution: {integrity: sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q==}
 
@@ -8398,16 +8155,6 @@ packages:
     resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==}
     engines: {node: '>=8'}
 
-  text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
-
-  thenify-all@1.6.0:
-    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
-    engines: {node: '>=0.8'}
-
-  thenify@3.3.1:
-    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
-
   through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
 
@@ -8499,9 +8246,6 @@ packages:
     peerDependencies:
       typescript: '>=4.0.0'
 
-  ts-interface-checker@0.1.13:
-    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
-
   tsconfck@3.1.6:
     resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==}
     engines: {node: ^18 || >=20}
@@ -8538,10 +8282,6 @@ packages:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
 
-  type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
-
   type-fest@0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
@@ -8600,11 +8340,6 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  typescript@5.8.3:
-    resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==}
-    engines: {node: '>=14.17'}
-    hasBin: true
-
   typescript@5.9.3:
     resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
     engines: {node: '>=14.17'}
@@ -8627,9 +8362,6 @@ packages:
   uncrypto@0.1.3:
     resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}
 
-  undici-types@6.21.0:
-    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
-
   undici-types@7.14.0:
     resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==}
 
@@ -8751,19 +8483,19 @@ packages:
       vite:
         optional: true
 
-  vite@6.4.1:
-    resolution: {integrity: sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+  vite@7.1.11:
+    resolution: {integrity: sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      '@types/node': ^20.19.0 || >=22.12.0
       jiti: '>=1.21.0'
-      less: '*'
+      less: ^4.0.0
       lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
       terser: ^5.16.0
       tsx: ^4.8.1
       yaml: ^2.4.2
@@ -8791,48 +8523,8 @@ packages:
       yaml:
         optional: true
 
-  vite@7.1.11:
-    resolution: {integrity: sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^20.19.0 || >=22.12.0
-      jiti: '>=1.21.0'
-      less: ^4.0.0
-      lightningcss: ^1.21.0
-      sass: ^1.70.0
-      sass-embedded: ^1.70.0
-      stylus: '>=0.54.8'
-      sugarss: ^5.0.0
-      terser: ^5.16.0
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      jiti:
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-
-  vite@7.2.6:
-    resolution: {integrity: sha512-tI2l/nFHC5rLh7+5+o7QjKjSR04ivXDF4jcgV0f/bTQ+OJiITy5S6gaynVsEM+7RqzufMnVbIon6Sr5x1SDYaQ==}
+  vite@7.2.6:
+    resolution: {integrity: sha512-tI2l/nFHC5rLh7+5+o7QjKjSR04ivXDF4jcgV0f/bTQ+OJiITy5S6gaynVsEM+7RqzufMnVbIon6Sr5x1SDYaQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -9151,16 +8843,16 @@ packages:
   zimmerframe@1.1.4:
     resolution: {integrity: sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==}
 
-  zod-to-json-schema@3.24.6:
-    resolution: {integrity: sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==}
+  zod-to-json-schema@3.25.0:
+    resolution: {integrity: sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ==}
     peerDependencies:
-      zod: ^3.24.1
+      zod: ^3.25 || ^4
 
   zod@3.25.76:
     resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
 
-  zod@4.1.11:
-    resolution: {integrity: sha512-WPsqwxITS2tzx1bzhIKsEs19ABD5vmCVa4xBo2tq/SrV4RNZtfws1EnCWQXM6yh8bD08a1idvkB5MZSBiZsjwg==}
+  zod@4.1.13:
+    resolution: {integrity: sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==}
 
   zone.js@0.16.0:
     resolution: {integrity: sha512-LqLPpIQANebrlxY6jKcYKdgN5DTXyyHAKnnWWjE5pPfEQ4n7j5zn7mOEEpwNZVKGqx3kKKmvplEmoBrvpgROTA==}
@@ -9262,14 +8954,14 @@ snapshots:
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
 
-  '@angular-devkit/architect@0.2003.12(chokidar@4.0.3)':
+  '@angular-devkit/architect@0.2003.13(chokidar@4.0.3)':
     dependencies:
-      '@angular-devkit/core': 20.3.12(chokidar@4.0.3)
+      '@angular-devkit/core': 20.3.13(chokidar@4.0.3)
       rxjs: 7.8.2
     transitivePeerDependencies:
       - chokidar
 
-  '@angular-devkit/core@20.3.12(chokidar@4.0.3)':
+  '@angular-devkit/core@20.3.13(chokidar@4.0.3)':
     dependencies:
       ajv: 8.17.1
       ajv-formats: 3.0.1(ajv@8.17.1)
@@ -9280,9 +8972,9 @@ snapshots:
     optionalDependencies:
       chokidar: 4.0.3
 
-  '@angular-devkit/schematics@20.3.12(chokidar@4.0.3)':
+  '@angular-devkit/schematics@20.3.13(chokidar@4.0.3)':
     dependencies:
-      '@angular-devkit/core': 20.3.12(chokidar@4.0.3)
+      '@angular-devkit/core': 20.3.13(chokidar@4.0.3)
       jsonc-parser: 3.3.1
       magic-string: 0.30.17
       ora: 8.2.0
@@ -9290,12 +8982,12 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@angular/build@20.3.12(@angular/compiler-cli@20.3.14(@angular/compiler@20.3.15)(typescript@5.8.3))(@angular/compiler@20.3.15)(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)))(@types/node@24.7.0)(chokidar@4.0.3)(jiti@2.6.1)(karma@6.4.4)(lightningcss@1.30.2)(postcss@8.5.6)(tailwindcss@3.4.18)(terser@5.44.0)(tslib@2.8.1)(tsx@4.21.0)(typescript@5.8.3)(vitest@3.2.4)(yaml@2.8.1)':
+  '@angular/build@20.3.13(@angular/compiler-cli@20.3.15(@angular/compiler@20.3.15)(typescript@5.9.3))(@angular/compiler@20.3.15)(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)))(@types/node@24.7.0)(chokidar@4.0.3)(jiti@2.6.1)(karma@6.4.4)(lightningcss@1.30.2)(postcss@8.5.6)(tailwindcss@4.1.17)(terser@5.44.0)(tslib@2.8.1)(tsx@4.21.0)(typescript@5.9.3)(vitest@3.2.4)(yaml@2.8.1)':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@angular-devkit/architect': 0.2003.12(chokidar@4.0.3)
+      '@angular-devkit/architect': 0.2003.13(chokidar@4.0.3)
       '@angular/compiler': 20.3.15
-      '@angular/compiler-cli': 20.3.14(@angular/compiler@20.3.15)(typescript@5.8.3)
+      '@angular/compiler-cli': 20.3.15(@angular/compiler@20.3.15)(typescript@5.9.3)
       '@babel/core': 7.28.3
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-split-export-declaration': 7.24.7
@@ -9319,16 +9011,16 @@ snapshots:
       source-map-support: 0.5.21
       tinyglobby: 0.2.14
       tslib: 2.8.1
-      typescript: 5.8.3
+      typescript: 5.9.3
       vite: 7.1.11(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
       watchpack: 2.4.4
     optionalDependencies:
-      '@angular/core': 20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)
-      '@angular/platform-browser': 20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))
+      '@angular/core': 19.2.17(rxjs@7.8.2)(zone.js@0.16.0)
+      '@angular/platform-browser': 19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))
       karma: 6.4.4
       lmdb: 3.4.2
       postcss: 8.5.6
-      tailwindcss: 3.4.18
+      tailwindcss: 4.1.17
       vitest: 3.2.4(@types/debug@4.1.12)(@types/node@24.7.0)(@vitest/ui@3.2.4)(jiti@2.6.1)(jsdom@27.2.0(postcss@8.5.6))(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
@@ -9343,15 +9035,15 @@ snapshots:
       - tsx
       - yaml
 
-  '@angular/cli@20.3.12(@types/node@24.7.0)(chokidar@4.0.3)':
+  '@angular/cli@20.3.13(@types/node@24.7.0)(chokidar@4.0.3)':
     dependencies:
-      '@angular-devkit/architect': 0.2003.12(chokidar@4.0.3)
-      '@angular-devkit/core': 20.3.12(chokidar@4.0.3)
-      '@angular-devkit/schematics': 20.3.12(chokidar@4.0.3)
+      '@angular-devkit/architect': 0.2003.13(chokidar@4.0.3)
+      '@angular-devkit/core': 20.3.13(chokidar@4.0.3)
+      '@angular-devkit/schematics': 20.3.13(chokidar@4.0.3)
       '@inquirer/prompts': 7.8.2(@types/node@24.7.0)
       '@listr2/prompt-adapter-inquirer': 3.0.1(@inquirer/prompts@7.8.2(@types/node@24.7.0))(@types/node@24.7.0)(listr2@9.0.1)
-      '@modelcontextprotocol/sdk': 1.17.3
-      '@schematics/angular': 20.3.12(chokidar@4.0.3)
+      '@modelcontextprotocol/sdk': 1.24.0(zod@4.1.13)
+      '@schematics/angular': 20.3.13(chokidar@4.0.3)
       '@yarnpkg/lockfile': 1.1.0
       algoliasearch: 5.35.0
       ini: 5.0.0
@@ -9362,25 +9054,20 @@ snapshots:
       resolve: 1.22.10
       semver: 7.7.2
       yargs: 18.0.0
-      zod: 3.25.76
+      zod: 4.1.13
     transitivePeerDependencies:
+      - '@cfworker/json-schema'
       - '@types/node'
       - chokidar
       - supports-color
 
-  '@angular/common@19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)':
-    dependencies:
-      '@angular/core': 19.2.16(rxjs@7.8.2)(zone.js@0.16.0)
-      rxjs: 7.8.2
-      tslib: 2.8.1
-
-  '@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)':
+  '@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)
+      '@angular/core': 19.2.17(rxjs@7.8.2)(zone.js@0.16.0)
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@angular/compiler-cli@20.3.14(@angular/compiler@20.3.15)(typescript@5.8.3)':
+  '@angular/compiler-cli@20.3.15(@angular/compiler@20.3.15)(typescript@5.9.3)':
     dependencies:
       '@angular/compiler': 20.3.15
       '@babel/core': 7.28.3
@@ -9392,7 +9079,7 @@ snapshots:
       tslib: 2.8.1
       yargs: 18.0.0
     optionalDependencies:
-      typescript: 5.8.3
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
@@ -9400,61 +9087,47 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  '@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0)':
-    dependencies:
-      rxjs: 7.8.2
-      tslib: 2.8.1
-      zone.js: 0.16.0
-
-  '@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)':
+  '@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)':
     dependencies:
       rxjs: 7.8.2
       tslib: 2.8.1
-    optionalDependencies:
-      '@angular/compiler': 20.3.15
       zone.js: 0.16.0
 
-  '@angular/forms@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)))(rxjs@7.8.2)':
+  '@angular/forms@20.3.15(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
-      '@angular/core': 20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)
-      '@angular/platform-browser': 20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))
+      '@angular/common': 19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
+      '@angular/core': 19.2.17(rxjs@7.8.2)(zone.js@0.16.0)
+      '@angular/platform-browser': 19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@angular/platform-browser-dynamic@19.2.16(@angular/common@19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/compiler@20.3.15)(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.16(@angular/common@19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0)))':
+  '@angular/platform-browser-dynamic@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/compiler@20.3.15)(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)))':
     dependencies:
-      '@angular/common': 19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
+      '@angular/common': 19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
       '@angular/compiler': 20.3.15
-      '@angular/core': 19.2.16(rxjs@7.8.2)(zone.js@0.16.0)
-      '@angular/platform-browser': 19.2.16(@angular/common@19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))
-      tslib: 2.8.1
-
-  '@angular/platform-browser@19.2.16(@angular/common@19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))':
-    dependencies:
-      '@angular/common': 19.2.15(@angular/core@19.2.16(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
-      '@angular/core': 19.2.16(rxjs@7.8.2)(zone.js@0.16.0)
+      '@angular/core': 19.2.17(rxjs@7.8.2)(zone.js@0.16.0)
+      '@angular/platform-browser': 19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))
       tslib: 2.8.1
 
-  '@angular/platform-browser@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))':
+  '@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))':
     dependencies:
-      '@angular/common': 20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
-      '@angular/core': 20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)
+      '@angular/common': 19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
+      '@angular/core': 19.2.17(rxjs@7.8.2)(zone.js@0.16.0)
       tslib: 2.8.1
 
-  '@angular/router@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)))(rxjs@7.8.2)':
+  '@angular/router@20.3.15(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(@angular/platform-browser@19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0)))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
-      '@angular/core': 20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0)
-      '@angular/platform-browser': 20.3.14(@angular/common@20.3.13(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@20.3.14(@angular/compiler@20.3.15)(rxjs@7.8.2)(zone.js@0.16.0))
+      '@angular/common': 19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2)
+      '@angular/core': 19.2.17(rxjs@7.8.2)(zone.js@0.16.0)
+      '@angular/platform-browser': 19.2.17(@angular/common@19.2.17(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@19.2.17(rxjs@7.8.2)(zone.js@0.16.0))
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@ark/schema@0.55.0':
+  '@ark/schema@0.56.0':
     dependencies:
-      '@ark/util': 0.55.0
+      '@ark/util': 0.56.0
 
-  '@ark/util@0.55.0': {}
+  '@ark/util@0.56.0': {}
 
   '@asamuzakjp/css-color@4.0.5':
     dependencies:
@@ -9718,7 +9391,7 @@ snapshots:
   '@better-auth/core@1.3.26':
     dependencies:
       better-call: 1.0.19
-      zod: 4.1.11
+      zod: 4.1.13
 
   '@better-auth/utils@0.3.0': {}
 
@@ -9877,15 +9550,15 @@ snapshots:
 
   '@colors/colors@1.5.0': {}
 
-  '@commitlint/parse@20.0.0':
+  '@commitlint/parse@20.2.0':
     dependencies:
-      '@commitlint/types': 20.0.0
+      '@commitlint/types': 20.2.0
       conventional-changelog-angular: 7.0.0
       conventional-commits-parser: 5.0.0
 
-  '@commitlint/types@20.0.0':
+  '@commitlint/types@20.2.0':
     dependencies:
-      '@types/conventional-commits-parser': 5.0.1
+      '@types/conventional-commits-parser': 5.0.2
       chalk: 5.6.2
 
   '@csstools/color-helpers@5.1.0': {}
@@ -9914,7 +9587,7 @@ snapshots:
 
   '@drizzle-team/brocli@0.10.2': {}
 
-  '@electric-sql/client@1.2.0':
+  '@electric-sql/client@1.3.0':
     dependencies:
       '@microsoft/fetch-event-source': 2.0.1
     optionalDependencies:
@@ -10246,11 +9919,6 @@ snapshots:
   '@esbuild/win32-x64@0.27.0':
     optional: true
 
-  '@eslint-community/eslint-utils@4.9.0(eslint@8.57.1)':
-    dependencies:
-      eslint: 8.57.1
-      eslint-visitor-keys: 3.4.3
-
   '@eslint-community/eslint-utils@4.9.0(eslint@9.39.1(jiti@2.6.1))':
     dependencies:
       eslint: 9.39.1(jiti@2.6.1)
@@ -10280,20 +9948,6 @@ snapshots:
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/eslintrc@2.1.4':
-    dependencies:
-      ajv: 6.12.6
-      debug: 4.4.3
-      espree: 9.6.1
-      globals: 13.24.0
-      ignore: 5.3.2
-      import-fresh: 3.3.1
-      js-yaml: 4.1.1
-      minimatch: 3.1.2
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-
   '@eslint/eslintrc@3.3.1':
     dependencies:
       ajv: 6.12.6
@@ -10308,8 +9962,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/js@8.57.1': {}
-
   '@eslint/js@9.39.1': {}
 
   '@eslint/object-schema@2.1.7': {}
@@ -10666,18 +10318,8 @@ snapshots:
       '@humanfs/core': 0.19.1
       '@humanwhocodes/retry': 0.4.3
 
-  '@humanwhocodes/config-array@0.13.0':
-    dependencies:
-      '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.4.3
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@humanwhocodes/module-importer@1.0.1': {}
 
-  '@humanwhocodes/object-schema@2.0.3': {}
-
   '@humanwhocodes/retry@0.4.3': {}
 
   '@inquirer/checkbox@4.2.2(@types/node@24.7.0)':
@@ -10948,9 +10590,10 @@ snapshots:
 
   '@microsoft/tsdoc@0.15.1': {}
 
-  '@modelcontextprotocol/sdk@1.17.3':
+  '@modelcontextprotocol/sdk@1.24.0(zod@4.1.13)':
     dependencies:
-      ajv: 6.12.6
+      ajv: 8.17.1
+      ajv-formats: 3.0.1(ajv@8.17.1)
       content-type: 1.0.5
       cors: 2.8.5
       cross-spawn: 7.0.6
@@ -10958,10 +10601,11 @@ snapshots:
       eventsource-parser: 3.0.6
       express: 5.1.0
       express-rate-limit: 7.5.1(express@5.1.0)
+      jose: 6.1.2
       pkce-challenge: 5.0.0
       raw-body: 3.0.1
-      zod: 3.25.76
-      zod-to-json-schema: 3.24.6(zod@3.25.76)
+      zod: 4.1.13
+      zod-to-json-schema: 3.25.0(zod@4.1.13)
     transitivePeerDependencies:
       - supports-color
 
@@ -11434,8 +11078,6 @@ snapshots:
 
   '@publint/pack@0.1.2': {}
 
-  '@rolldown/pluginutils@1.0.0-beta.27': {}
-
   '@rolldown/pluginutils@1.0.0-beta.40': {}
 
   '@rolldown/pluginutils@1.0.0-beta.47': {}
@@ -11616,10 +11258,10 @@ snapshots:
     transitivePeerDependencies:
       - '@types/node'
 
-  '@schematics/angular@20.3.12(chokidar@4.0.3)':
+  '@schematics/angular@20.3.13(chokidar@4.0.3)':
     dependencies:
-      '@angular-devkit/core': 20.3.12(chokidar@4.0.3)
-      '@angular-devkit/schematics': 20.3.12(chokidar@4.0.3)
+      '@angular-devkit/core': 20.3.13(chokidar@4.0.3)
+      '@angular-devkit/schematics': 20.3.13(chokidar@4.0.3)
       jsonc-parser: 3.3.1
     transitivePeerDependencies:
       - chokidar
@@ -11811,22 +11453,10 @@ snapshots:
 
   '@standard-schema/spec@1.0.0': {}
 
-  '@stylistic/eslint-plugin@4.4.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/utils': 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      eslint: 9.39.1(jiti@2.6.1)
-      eslint-visitor-keys: 4.2.1
-      espree: 10.4.0
-      estraverse: 5.3.0
-      picomatch: 4.0.3
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   '@stylistic/eslint-plugin@5.4.0(eslint@9.39.1(jiti@2.6.1))':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1))
-      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/types': 8.48.1
       eslint: 9.39.1(jiti@2.6.1)
       eslint-visitor-keys: 4.2.1
       espree: 10.4.0
@@ -11837,33 +11467,33 @@ snapshots:
     dependencies:
       acorn: 8.15.0
 
-  '@sveltejs/package@2.5.7(svelte@5.45.2)(typescript@5.9.3)':
+  '@sveltejs/package@2.5.7(svelte@5.45.6)(typescript@5.9.3)':
     dependencies:
       chokidar: 5.0.0
       kleur: 4.1.5
       sade: 1.8.1
       semver: 7.7.3
-      svelte: 5.45.2
-      svelte2tsx: 0.7.42(svelte@5.45.2)(typescript@5.9.3)
+      svelte: 5.45.6
+      svelte2tsx: 0.7.42(svelte@5.45.6)(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
 
-  '@sveltejs/vite-plugin-svelte-inspector@5.0.1(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.2)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(svelte@5.45.2)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte-inspector@5.0.1(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.6)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(svelte@5.45.6)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 6.2.1(svelte@5.45.2)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte': 6.2.1(svelte@5.45.6)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       debug: 4.4.3
-      svelte: 5.45.2
+      svelte: 5.45.6
       vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.2)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.6)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 5.0.1(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.2)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(svelte@5.45.2)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte-inspector': 5.0.1(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.45.6)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(svelte@5.45.6)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       debug: 4.4.3
       deepmerge: 4.3.1
       magic-string: 0.30.21
-      svelte: 5.45.2
+      svelte: 5.45.6
       vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
       vitefu: 1.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
     transitivePeerDependencies:
@@ -11937,23 +11567,24 @@ snapshots:
       '@tailwindcss/oxide-win32-arm64-msvc': 4.1.17
       '@tailwindcss/oxide-win32-x64-msvc': 4.1.17
 
-  '@tailwindcss/vite@4.1.17(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tailwindcss/postcss@4.1.17':
     dependencies:
+      '@alloc/quick-lru': 5.2.0
       '@tailwindcss/node': 4.1.17
       '@tailwindcss/oxide': 4.1.17
+      postcss: 8.5.6
       tailwindcss: 4.1.17
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
-  '@tailwindcss/vite@4.1.17(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tailwindcss/vite@4.1.17(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
       '@tailwindcss/node': 4.1.17
       '@tailwindcss/oxide': 4.1.17
       tailwindcss: 4.1.17
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
-  '@tanstack/config@0.22.2(@types/node@24.7.0)(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tanstack/config@0.22.2(@types/node@24.7.0)(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
-      '@tanstack/eslint-config': 0.3.3(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@tanstack/eslint-config': 0.3.3(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       '@tanstack/publish-config': 0.2.2
       '@tanstack/typedoc-config': 0.3.2(typescript@5.9.3)
       '@tanstack/vite-config': 0.4.1(@types/node@24.7.0)(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
@@ -11967,192 +11598,138 @@ snapshots:
       - typescript
       - vite
 
-  '@tanstack/directive-functions-plugin@1.139.0(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tanstack/directive-functions-plugin@1.140.0(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
       '@babel/code-frame': 7.27.1
       '@babel/core': 7.28.5
       '@babel/traverse': 7.28.5
       '@babel/types': 7.28.5
-      '@tanstack/router-utils': 1.139.0
+      '@tanstack/router-utils': 1.140.0
       babel-dead-code-elimination: 1.0.10
       pathe: 2.0.3
       tiny-invariant: 1.3.3
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/directive-functions-plugin@1.139.0(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tanstack/eslint-config@0.3.3(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/core': 7.28.5
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
-      '@tanstack/router-utils': 1.139.0
-      babel-dead-code-elimination: 1.0.10
-      pathe: 2.0.3
-      tiny-invariant: 1.3.3
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      '@eslint/js': 9.39.1
+      '@stylistic/eslint-plugin': 5.4.0(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-n: 17.23.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      globals: 16.5.0
+      typescript-eslint: 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      vue-eslint-parser: 10.2.0(eslint@9.39.1(jiti@2.6.1))
     transitivePeerDependencies:
+      - '@typescript-eslint/utils'
+      - eslint
+      - eslint-import-resolver-node
       - supports-color
+      - typescript
 
-  '@tanstack/eslint-config@0.3.3(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+  '@tanstack/eslint-config@0.3.4(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint/js': 9.39.1
       '@stylistic/eslint-plugin': 5.4.0(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
+      eslint: 9.39.1(jiti@2.6.1)
+      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-n: 17.23.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       globals: 16.5.0
       typescript-eslint: 8.47.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       vue-eslint-parser: 10.2.0(eslint@9.39.1(jiti@2.6.1))
     transitivePeerDependencies:
       - '@typescript-eslint/utils'
-      - eslint
       - eslint-import-resolver-node
       - supports-color
       - typescript
 
-  '@tanstack/history@1.139.0': {}
+  '@tanstack/history@1.140.0': {}
 
-  '@tanstack/pacer-lite@0.1.0': {}
+  '@tanstack/pacer-lite@0.1.1': {}
 
   '@tanstack/publish-config@0.2.2':
     dependencies:
-      '@commitlint/parse': 20.0.0
+      '@commitlint/parse': 20.2.0
       jsonfile: 6.2.0
       semver: 7.7.3
       simple-git: 3.30.0
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/query-core@5.90.11': {}
+  '@tanstack/query-core@5.90.12': {}
 
-  '@tanstack/react-query@5.90.11(react@19.2.0)':
+  '@tanstack/react-query@5.90.12(react@19.2.1)':
     dependencies:
-      '@tanstack/query-core': 5.90.11
-      react: 19.2.0
+      '@tanstack/query-core': 5.90.12
+      react: 19.2.1
 
-  '@tanstack/react-router-devtools@1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.139.12)(@types/node@22.18.1)(csstype@3.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass@1.90.0)(solid-js@1.9.10)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)':
+  '@tanstack/react-router-devtools@1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(@tanstack/router-core@1.140.0)(csstype@3.2.3)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/router-devtools-core': 1.139.12(@tanstack/router-core@1.139.12)(@types/node@22.18.1)(csstype@3.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(solid-js@1.9.10)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      '@tanstack/react-router': 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      '@tanstack/router-devtools-core': 1.140.0(@tanstack/router-core@1.140.0)(csstype@3.2.3)(solid-js@1.9.10)
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
     optionalDependencies:
-      '@tanstack/router-core': 1.139.12
+      '@tanstack/router-core': 1.140.0
     transitivePeerDependencies:
-      - '@types/node'
       - csstype
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
       - solid-js
-      - stylus
-      - sugarss
-      - terser
-      - tsx
-      - yaml
 
-  '@tanstack/react-router-devtools@1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.139.12)(@types/node@24.7.0)(csstype@3.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass@1.90.0)(solid-js@1.9.10)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)':
+  '@tanstack/react-router-with-query@1.130.17(@tanstack/react-query@5.90.12(react@19.2.1))(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(@tanstack/router-core@1.140.0)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)':
     dependencies:
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/router-devtools-core': 1.139.12(@tanstack/router-core@1.139.12)(@types/node@24.7.0)(csstype@3.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(solid-js@1.9.10)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
-      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    optionalDependencies:
-      '@tanstack/router-core': 1.139.12
-    transitivePeerDependencies:
-      - '@types/node'
-      - csstype
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - solid-js
-      - stylus
-      - sugarss
-      - terser
-      - tsx
-      - yaml
+      '@tanstack/react-query': 5.90.12(react@19.2.1)
+      '@tanstack/react-router': 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      '@tanstack/router-core': 1.140.0
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
 
-  '@tanstack/react-router-with-query@1.130.17(@tanstack/react-query@5.90.11(react@19.2.0))(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.139.12)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
+  '@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)':
     dependencies:
-      '@tanstack/react-query': 5.90.11(react@19.2.0)
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/router-core': 1.139.12
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
-
-  '@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
-    dependencies:
-      '@tanstack/history': 1.139.0
-      '@tanstack/react-store': 0.8.0(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/router-core': 1.139.12
+      '@tanstack/history': 1.140.0
+      '@tanstack/react-store': 0.8.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      '@tanstack/router-core': 1.140.0
       isbot: 5.1.30
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
-  '@tanstack/react-start-client@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
+  '@tanstack/react-start-client@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)':
     dependencies:
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/start-client-core': 1.139.12
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
+      '@tanstack/react-router': 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/start-client-core': 1.140.0
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
-  '@tanstack/react-start-server@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
+  '@tanstack/react-start-server@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)':
     dependencies:
-      '@tanstack/history': 1.139.0
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/start-client-core': 1.139.12
-      '@tanstack/start-server-core': 1.139.12
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
+      '@tanstack/history': 1.140.0
+      '@tanstack/react-router': 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/start-client-core': 1.140.0
+      '@tanstack/start-server-core': 1.140.0
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
     transitivePeerDependencies:
       - crossws
 
-  '@tanstack/react-start@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tanstack/react-start@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/react-start-client': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/react-start-server': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/router-utils': 1.139.0
-      '@tanstack/start-client-core': 1.139.12
-      '@tanstack/start-plugin-core': 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      '@tanstack/start-server-core': 1.139.12
+      '@tanstack/react-router': 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      '@tanstack/react-start-client': 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      '@tanstack/react-start-server': 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      '@tanstack/router-utils': 1.140.0
+      '@tanstack/start-client-core': 1.140.0
+      '@tanstack/start-plugin-core': 1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@tanstack/start-server-core': 1.140.0
       pathe: 2.0.3
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    transitivePeerDependencies:
-      - '@rsbuild/core'
-      - crossws
-      - supports-color
-      - vite-plugin-solid
-      - webpack
-
-  '@tanstack/react-start@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
-    dependencies:
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/react-start-client': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/react-start-server': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@tanstack/router-utils': 1.139.0
-      '@tanstack/start-client-core': 1.139.12
-      '@tanstack/start-plugin-core': 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      '@tanstack/start-server-core': 1.139.12
-      pathe: 2.0.3
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@rsbuild/core'
       - crossws
@@ -12160,16 +11737,16 @@ snapshots:
       - vite-plugin-solid
       - webpack
 
-  '@tanstack/react-store@0.8.0(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
+  '@tanstack/react-store@0.8.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)':
     dependencies:
       '@tanstack/store': 0.8.0
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
-      use-sync-external-store: 1.6.0(react@19.2.0)
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
+      use-sync-external-store: 1.6.0(react@19.2.1)
 
-  '@tanstack/router-core@1.139.12':
+  '@tanstack/router-core@1.140.0':
     dependencies:
-      '@tanstack/history': 1.139.0
+      '@tanstack/history': 1.140.0
       '@tanstack/store': 0.8.0
       cookie-es: 2.0.0
       seroval: 1.4.0
@@ -12177,58 +11754,22 @@ snapshots:
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
-  '@tanstack/router-devtools-core@1.139.12(@tanstack/router-core@1.139.12)(@types/node@22.18.1)(csstype@3.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(solid-js@1.9.10)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)':
-    dependencies:
-      '@tanstack/router-core': 1.139.12
-      clsx: 2.1.1
-      goober: 2.1.16(csstype@3.2.3)
-      solid-js: 1.9.10
-      tiny-invariant: 1.3.3
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    optionalDependencies:
-      csstype: 3.2.3
-    transitivePeerDependencies:
-      - '@types/node'
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - terser
-      - tsx
-      - yaml
-
-  '@tanstack/router-devtools-core@1.139.12(@tanstack/router-core@1.139.12)(@types/node@24.7.0)(csstype@3.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(solid-js@1.9.10)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)':
+  '@tanstack/router-devtools-core@1.140.0(@tanstack/router-core@1.140.0)(csstype@3.2.3)(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/router-core': 1.139.12
+      '@tanstack/router-core': 1.140.0
       clsx: 2.1.1
       goober: 2.1.16(csstype@3.2.3)
       solid-js: 1.9.10
       tiny-invariant: 1.3.3
-      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
     optionalDependencies:
       csstype: 3.2.3
-    transitivePeerDependencies:
-      - '@types/node'
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - terser
-      - tsx
-      - yaml
 
-  '@tanstack/router-generator@1.139.12':
+  '@tanstack/router-generator@1.140.0':
     dependencies:
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/router-utils': 1.139.0
-      '@tanstack/virtual-file-routes': 1.139.0
-      prettier: 3.7.3
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/router-utils': 1.140.0
+      '@tanstack/virtual-file-routes': 1.140.0
+      prettier: 3.7.4
       recast: 0.23.11
       source-map: 0.7.6
       tsx: 4.21.0
@@ -12236,30 +11777,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/router-plugin@1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
-    dependencies:
-      '@babel/core': 7.28.5
-      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.5)
-      '@babel/template': 7.27.2
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/router-generator': 1.139.12
-      '@tanstack/router-utils': 1.139.0
-      '@tanstack/virtual-file-routes': 1.139.0
-      babel-dead-code-elimination: 1.0.10
-      chokidar: 3.6.0
-      unplugin: 2.3.10
-      zod: 3.25.76
-    optionalDependencies:
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      vite-plugin-solid: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-    transitivePeerDependencies:
-      - supports-color
-
-  '@tanstack/router-plugin@1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tanstack/router-plugin@1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
       '@babel/core': 7.28.5
       '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.5)
@@ -12267,22 +11785,22 @@ snapshots:
       '@babel/template': 7.27.2
       '@babel/traverse': 7.28.5
       '@babel/types': 7.28.5
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/router-generator': 1.139.12
-      '@tanstack/router-utils': 1.139.0
-      '@tanstack/virtual-file-routes': 1.139.0
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/router-generator': 1.140.0
+      '@tanstack/router-utils': 1.140.0
+      '@tanstack/virtual-file-routes': 1.140.0
       babel-dead-code-elimination: 1.0.10
       chokidar: 3.6.0
       unplugin: 2.3.10
       zod: 3.25.76
     optionalDependencies:
-      '@tanstack/react-router': 1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      vite-plugin-solid: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@tanstack/react-router': 1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vite-plugin-solid: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/router-utils@1.139.0':
+  '@tanstack/router-utils@1.140.0':
     dependencies:
       '@babel/core': 7.28.5
       '@babel/generator': 7.28.5
@@ -12295,7 +11813,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/server-functions-plugin@1.139.0(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tanstack/server-functions-plugin@1.140.0(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
       '@babel/code-frame': 7.27.1
       '@babel/core': 7.28.5
@@ -12304,74 +11822,58 @@ snapshots:
       '@babel/template': 7.27.2
       '@babel/traverse': 7.28.5
       '@babel/types': 7.28.5
-      '@tanstack/directive-functions-plugin': 1.139.0(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@tanstack/directive-functions-plugin': 1.140.0(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       babel-dead-code-elimination: 1.0.10
       tiny-invariant: 1.3.3
     transitivePeerDependencies:
       - supports-color
       - vite
 
-  '@tanstack/server-functions-plugin@1.139.0(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
-    dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/core': 7.28.5
-      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.5)
-      '@babel/template': 7.27.2
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
-      '@tanstack/directive-functions-plugin': 1.139.0(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      babel-dead-code-elimination: 1.0.10
-      tiny-invariant: 1.3.3
-    transitivePeerDependencies:
-      - supports-color
-      - vite
-
-  '@tanstack/solid-router@1.139.12(solid-js@1.9.10)':
+  '@tanstack/solid-router@1.140.0(solid-js@1.9.10)':
     dependencies:
       '@solid-devtools/logger': 0.9.11(solid-js@1.9.10)
       '@solid-primitives/refs': 1.1.2(solid-js@1.9.10)
       '@solidjs/meta': 0.29.4(solid-js@1.9.10)
-      '@tanstack/history': 1.139.0
-      '@tanstack/router-core': 1.139.12
+      '@tanstack/history': 1.140.0
+      '@tanstack/router-core': 1.140.0
       '@tanstack/solid-store': 0.8.0(solid-js@1.9.10)
       isbot: 5.1.30
       solid-js: 1.9.10
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
-  '@tanstack/solid-start-client@1.139.12(solid-js@1.9.10)':
+  '@tanstack/solid-start-client@1.140.0(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/solid-router': 1.139.12(solid-js@1.9.10)
-      '@tanstack/start-client-core': 1.139.12
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/solid-router': 1.140.0(solid-js@1.9.10)
+      '@tanstack/start-client-core': 1.140.0
       solid-js: 1.9.10
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
-  '@tanstack/solid-start-server@1.139.12(solid-js@1.9.10)':
+  '@tanstack/solid-start-server@1.140.0(solid-js@1.9.10)':
     dependencies:
       '@solidjs/meta': 0.29.4(solid-js@1.9.10)
-      '@tanstack/history': 1.139.0
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/solid-router': 1.139.12(solid-js@1.9.10)
-      '@tanstack/start-client-core': 1.139.12
-      '@tanstack/start-server-core': 1.139.12
+      '@tanstack/history': 1.140.0
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/solid-router': 1.140.0(solid-js@1.9.10)
+      '@tanstack/start-client-core': 1.140.0
+      '@tanstack/start-server-core': 1.140.0
       solid-js: 1.9.10
     transitivePeerDependencies:
       - crossws
 
-  '@tanstack/solid-start@1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(solid-js@1.9.10)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tanstack/solid-start@1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(solid-js@1.9.10)(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
-      '@tanstack/solid-router': 1.139.12(solid-js@1.9.10)
-      '@tanstack/solid-start-client': 1.139.12(solid-js@1.9.10)
-      '@tanstack/solid-start-server': 1.139.12(solid-js@1.9.10)
-      '@tanstack/start-client-core': 1.139.12
-      '@tanstack/start-plugin-core': 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      '@tanstack/start-server-core': 1.139.12
+      '@tanstack/solid-router': 1.140.0(solid-js@1.9.10)
+      '@tanstack/solid-start-client': 1.140.0(solid-js@1.9.10)
+      '@tanstack/solid-start-server': 1.140.0(solid-js@1.9.10)
+      '@tanstack/start-client-core': 1.140.0
+      '@tanstack/start-plugin-core': 1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@tanstack/start-server-core': 1.140.0
       pathe: 2.0.3
       solid-js: 1.9.10
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@rsbuild/core'
       - '@tanstack/react-router'
@@ -12385,27 +11887,27 @@ snapshots:
       '@tanstack/store': 0.8.0
       solid-js: 1.9.10
 
-  '@tanstack/start-client-core@1.139.12':
+  '@tanstack/start-client-core@1.140.0':
     dependencies:
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/start-storage-context': 1.139.12
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/start-storage-context': 1.140.0
       seroval: 1.4.0
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
-  '@tanstack/start-plugin-core@1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@tanstack/start-plugin-core@1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/core': 7.28.5
       '@babel/types': 7.28.5
       '@rolldown/pluginutils': 1.0.0-beta.40
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/router-generator': 1.139.12
-      '@tanstack/router-plugin': 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      '@tanstack/router-utils': 1.139.0
-      '@tanstack/server-functions-plugin': 1.139.0(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      '@tanstack/start-client-core': 1.139.12
-      '@tanstack/start-server-core': 1.139.12
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/router-generator': 1.140.0
+      '@tanstack/router-plugin': 1.140.0(@tanstack/react-router@1.140.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@tanstack/router-utils': 1.140.0
+      '@tanstack/server-functions-plugin': 1.140.0(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@tanstack/start-client-core': 1.140.0
+      '@tanstack/start-server-core': 1.140.0
       babel-dead-code-elimination: 1.0.10
       cheerio: 1.1.2
       exsolve: 1.0.7
@@ -12413,40 +11915,8 @@ snapshots:
       srvx: 0.8.16
       tinyglobby: 0.2.15
       ufo: 1.6.1
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      vitefu: 1.1.1(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      xmlbuilder2: 4.0.0
-      zod: 3.25.76
-    transitivePeerDependencies:
-      - '@rsbuild/core'
-      - '@tanstack/react-router'
-      - crossws
-      - supports-color
-      - vite-plugin-solid
-      - webpack
-
-  '@tanstack/start-plugin-core@1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
-    dependencies:
-      '@babel/code-frame': 7.26.2
-      '@babel/core': 7.28.5
-      '@babel/types': 7.28.5
-      '@rolldown/pluginutils': 1.0.0-beta.40
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/router-generator': 1.139.12
-      '@tanstack/router-plugin': 1.139.12(@tanstack/react-router@1.139.12(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)))(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      '@tanstack/router-utils': 1.139.0
-      '@tanstack/server-functions-plugin': 1.139.0(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      '@tanstack/start-client-core': 1.139.12
-      '@tanstack/start-server-core': 1.139.12
-      babel-dead-code-elimination: 1.0.10
-      cheerio: 1.1.2
-      exsolve: 1.0.7
-      pathe: 2.0.3
-      srvx: 0.8.16
-      tinyglobby: 0.2.15
-      ufo: 1.6.1
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      vitefu: 1.1.1(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vitefu: 1.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       xmlbuilder2: 4.0.0
       zod: 3.25.76
     transitivePeerDependencies:
@@ -12457,21 +11927,21 @@ snapshots:
       - vite-plugin-solid
       - webpack
 
-  '@tanstack/start-server-core@1.139.12':
+  '@tanstack/start-server-core@1.140.0':
     dependencies:
-      '@tanstack/history': 1.139.0
-      '@tanstack/router-core': 1.139.12
-      '@tanstack/start-client-core': 1.139.12
-      '@tanstack/start-storage-context': 1.139.12
+      '@tanstack/history': 1.140.0
+      '@tanstack/router-core': 1.140.0
+      '@tanstack/start-client-core': 1.140.0
+      '@tanstack/start-storage-context': 1.140.0
       h3-v2: h3@2.0.0-beta.5
       seroval: 1.4.0
       tiny-invariant: 1.3.3
     transitivePeerDependencies:
       - crossws
 
-  '@tanstack/start-storage-context@1.139.12':
+  '@tanstack/start-storage-context@1.140.0':
     dependencies:
-      '@tanstack/router-core': 1.139.12
+      '@tanstack/router-core': 1.140.0
 
   '@tanstack/store@0.8.0': {}
 
@@ -12483,7 +11953,15 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@tanstack/virtual-file-routes@1.139.0': {}
+  '@tanstack/typedoc-config@0.3.3(typescript@5.9.3)':
+    dependencies:
+      typedoc: 0.28.14(typescript@5.9.3)
+      typedoc-plugin-frontmatter: 1.3.0(typedoc-plugin-markdown@4.9.0(typedoc@0.28.14(typescript@5.9.3)))
+      typedoc-plugin-markdown: 4.9.0(typedoc@0.28.14(typescript@5.9.3))
+    transitivePeerDependencies:
+      - typescript
+
+  '@tanstack/virtual-file-routes@1.140.0': {}
 
   '@tanstack/vite-config@0.4.1(@types/node@24.7.0)(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
@@ -12498,6 +11976,19 @@ snapshots:
       - typescript
       - vite
 
+  '@tanstack/vite-config@0.4.3(@types/node@24.7.0)(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+    dependencies:
+      rollup-plugin-preserve-directives: 0.4.0(rollup@4.52.5)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vite-plugin-dts: 4.2.3(@types/node@24.7.0)(rollup@4.52.5)(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      vite-plugin-externalize-deps: 0.10.0(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      vite-tsconfig-paths: 5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+    transitivePeerDependencies:
+      - '@types/node'
+      - rollup
+      - supports-color
+      - typescript
+
   '@testing-library/dom@10.4.1':
     dependencies:
       '@babel/code-frame': 7.27.1
@@ -12518,12 +12009,12 @@ snapshots:
       picocolors: 1.1.1
       redent: 3.0.0
 
-  '@testing-library/react@16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
+  '@testing-library/react@16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)':
     dependencies:
       '@babel/runtime': 7.28.4
       '@testing-library/dom': 10.4.1
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
@@ -12591,7 +12082,7 @@ snapshots:
     dependencies:
       '@types/node': 24.7.0
 
-  '@types/conventional-commits-parser@5.0.1':
+  '@types/conventional-commits-parser@5.0.2':
     dependencies:
       '@types/node': 24.7.0
 
@@ -12652,14 +12143,6 @@ snapshots:
 
   '@types/node@12.20.55': {}
 
-  '@types/node@20.19.24':
-    dependencies:
-      undici-types: 6.21.0
-
-  '@types/node@22.18.1':
-    dependencies:
-      undici-types: 6.21.0
-
   '@types/node@24.7.0':
     dependencies:
       undici-types: 7.14.0
@@ -12670,25 +12153,14 @@ snapshots:
       pg-protocol: 1.10.3
       pg-types: 2.2.0
 
-  '@types/prop-types@15.7.15': {}
-
   '@types/qs@6.14.0': {}
 
   '@types/range-parser@1.2.7': {}
 
-  '@types/react-dom@18.3.7(@types/react@18.3.27)':
-    dependencies:
-      '@types/react': 18.3.27
-
   '@types/react-dom@19.2.3(@types/react@19.2.7)':
     dependencies:
       '@types/react': 19.2.7
 
-  '@types/react@18.3.27':
-    dependencies:
-      '@types/prop-types': 15.7.15
-      csstype: 3.2.3
-
   '@types/react@19.2.7':
     dependencies:
       csstype: 3.2.3
@@ -12739,14 +12211,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.48.0
-      '@typescript-eslint/type-utils': 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.48.0
+      '@typescript-eslint/parser': 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.48.1
+      '@typescript-eslint/type-utils': 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.48.1
       eslint: 9.39.1(jiti@2.6.1)
       graphemer: 1.4.0
       ignore: 7.0.5
@@ -12768,12 +12240,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.48.0
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.48.0
+      '@typescript-eslint/scope-manager': 8.48.1
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.48.1
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
       typescript: 5.9.3
@@ -12782,17 +12254,17 @@ snapshots:
 
   '@typescript-eslint/project-service@8.47.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/tsconfig-utils': 8.48.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.48.1
       debug: 4.4.3
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.48.0(typescript@5.9.3)':
+  '@typescript-eslint/project-service@8.48.1(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/tsconfig-utils': 8.48.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.48.1
       debug: 4.4.3
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -12803,16 +12275,16 @@ snapshots:
       '@typescript-eslint/types': 8.47.0
       '@typescript-eslint/visitor-keys': 8.47.0
 
-  '@typescript-eslint/scope-manager@8.48.0':
+  '@typescript-eslint/scope-manager@8.48.1':
     dependencies:
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/visitor-keys': 8.48.0
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/visitor-keys': 8.48.1
 
   '@typescript-eslint/tsconfig-utils@8.47.0(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
-  '@typescript-eslint/tsconfig-utils@8.48.0(typescript@5.9.3)':
+  '@typescript-eslint/tsconfig-utils@8.48.1(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
@@ -12828,11 +12300,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/type-utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/type-utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
       ts-api-utils: 2.1.0(typescript@5.9.3)
@@ -12842,7 +12314,7 @@ snapshots:
 
   '@typescript-eslint/types@8.47.0': {}
 
-  '@typescript-eslint/types@8.48.0': {}
+  '@typescript-eslint/types@8.48.1': {}
 
   '@typescript-eslint/typescript-estree@8.47.0(typescript@5.9.3)':
     dependencies:
@@ -12860,12 +12332,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.48.0(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@8.48.1(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.48.0(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/visitor-keys': 8.48.0
+      '@typescript-eslint/project-service': 8.48.1(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.48.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/visitor-keys': 8.48.1
       debug: 4.4.3
       minimatch: 9.0.5
       semver: 7.7.3
@@ -12886,12 +12358,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.48.0
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.48.1
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.9.3)
       eslint: 9.39.1(jiti@2.6.1)
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -12902,15 +12374,13 @@ snapshots:
       '@typescript-eslint/types': 8.47.0
       eslint-visitor-keys: 4.2.1
 
-  '@typescript-eslint/visitor-keys@8.48.0':
+  '@typescript-eslint/visitor-keys@8.48.1':
     dependencies:
-      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/types': 8.48.1
       eslint-visitor-keys: 4.2.1
 
   '@ungap/raw-json@0.4.4': {}
 
-  '@ungap/structured-clone@1.3.0': {}
-
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
     optional: true
 
@@ -12974,42 +12444,6 @@ snapshots:
     dependencies:
       vite: 7.1.11(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
-  '@vitejs/plugin-react@4.7.0(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
-    dependencies:
-      '@babel/core': 7.28.5
-      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.5)
-      '@rolldown/pluginutils': 1.0.0-beta.27
-      '@types/babel__core': 7.20.5
-      react-refresh: 0.17.0
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@vitejs/plugin-react@5.1.1(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
-    dependencies:
-      '@babel/core': 7.28.5
-      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.5)
-      '@rolldown/pluginutils': 1.0.0-beta.47
-      '@types/babel__core': 7.20.5
-      react-refresh: 0.18.0
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@vitejs/plugin-react@5.1.1(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
-    dependencies:
-      '@babel/core': 7.28.5
-      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.5)
-      '@rolldown/pluginutils': 1.0.0-beta.47
-      '@types/babel__core': 7.20.5
-      react-refresh: 0.18.0
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    transitivePeerDependencies:
-      - supports-color
-
   '@vitejs/plugin-react@5.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
       '@babel/core': 7.28.5
@@ -13052,21 +12486,13 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@6.4.1(@types/node@20.19.24)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
-    dependencies:
-      '@vitest/spy': 3.2.4
-      estree-walker: 3.0.3
-      magic-string: 0.30.21
-    optionalDependencies:
-      vite: 6.4.1(@types/node@20.19.24)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-
-  '@vitest/mocker@3.2.4(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
+  '@vitest/mocker@3.2.4(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -13297,15 +12723,11 @@ snapshots:
 
   ansis@4.1.0: {}
 
-  any-promise@1.3.0: {}
-
   anymatch@3.1.3:
     dependencies:
       normalize-path: 3.0.0
       picomatch: 2.3.1
 
-  arg@5.0.2: {}
-
   argparse@1.0.10:
     dependencies:
       sprintf-js: 1.0.3
@@ -13318,15 +12740,15 @@ snapshots:
 
   aria-query@5.3.2: {}
 
-  arkregex@0.0.3:
+  arkregex@0.0.4:
     dependencies:
-      '@ark/util': 0.55.0
+      '@ark/util': 0.56.0
 
-  arktype@2.1.27:
+  arktype@2.1.28:
     dependencies:
-      '@ark/schema': 0.55.0
-      '@ark/util': 0.55.0
-      arkregex: 0.0.3
+      '@ark/schema': 0.56.0
+      '@ark/util': 0.56.0
+      arkregex: 0.0.4
 
   array-buffer-byte-length@1.0.2:
     dependencies:
@@ -13413,16 +12835,6 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  autoprefixer@10.4.22(postcss@8.5.6):
-    dependencies:
-      browserslist: 4.28.0
-      caniuse-lite: 1.0.30001755
-      fraction.js: 5.3.4
-      normalize-range: 0.1.2
-      picocolors: 1.1.1
-      postcss: 8.5.6
-      postcss-value-parser: 4.2.0
-
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.1.0
@@ -13474,7 +12886,7 @@ snapshots:
       postcss: 8.5.6
       postcss-media-query-parser: 0.2.3
 
-  better-auth@1.3.26(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(solid-js@1.9.10):
+  better-auth@1.3.26(react-dom@19.2.1(react@19.2.1))(react@19.2.1)(solid-js@1.9.10):
     dependencies:
       '@better-auth/core': 1.3.26
       '@better-auth/utils': 0.3.0
@@ -13488,10 +12900,10 @@ snapshots:
       jose: 6.1.2
       kysely: 0.28.8
       nanostores: 1.1.0
-      zod: 4.1.11
+      zod: 4.1.13
     optionalDependencies:
-      react: 19.2.0
-      react-dom: 19.2.0(react@19.2.0)
+      react: 19.2.1
+      react-dom: 19.2.1(react@19.2.1)
       solid-js: 1.9.10
 
   better-call@1.0.19:
@@ -13622,8 +13034,6 @@ snapshots:
 
   callsites@3.1.0: {}
 
-  camelcase-css@2.0.1: {}
-
   caniuse-lite@1.0.30001755: {}
 
   chai@5.3.3:
@@ -13745,8 +13155,6 @@ snapshots:
   commander@2.20.3:
     optional: true
 
-  commander@4.1.1: {}
-
   comment-parser@1.4.1: {}
 
   common-tags@1.8.2: {}
@@ -13813,8 +13221,6 @@ snapshots:
 
   cookie-signature@1.2.2: {}
 
-  cookie@0.7.1: {}
-
   cookie@0.7.2: {}
 
   copy-anything@4.0.5:
@@ -13869,8 +13275,6 @@ snapshots:
 
   css.escape@1.5.1: {}
 
-  cssesc@3.0.0: {}
-
   cssstyle@5.3.3(postcss@8.5.6):
     dependencies:
       '@asamuzakjp/css-color': 4.0.5
@@ -13971,24 +13375,16 @@ snapshots:
 
   di@0.0.1: {}
 
-  didyoumean@1.2.2: {}
-
   diff@8.0.2: {}
 
   dir-glob@3.0.1:
     dependencies:
       path-type: 4.0.0
 
-  dlv@1.1.3: {}
-
   doctrine@2.1.0:
     dependencies:
       esutils: 2.0.3
 
-  doctrine@3.0.0:
-    dependencies:
-      esutils: 2.0.3
-
   dom-accessibility-api@0.5.16: {}
 
   dom-accessibility-api@0.6.3: {}
@@ -14026,7 +13422,7 @@ snapshots:
 
   dotenv@17.2.3: {}
 
-  drizzle-kit@0.31.7:
+  drizzle-kit@0.31.8:
     dependencies:
       '@drizzle-team/brocli': 0.10.2
       '@esbuild-kit/esm-loader': 2.6.5
@@ -14035,7 +13431,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7):
+  drizzle-orm@0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7):
     optionalDependencies:
       '@opentelemetry/api': 1.9.0
       '@types/pg': 8.15.6
@@ -14044,10 +13440,10 @@ snapshots:
       pg: 8.16.3
       postgres: 3.4.7
 
-  drizzle-zod@0.8.3(drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7))(zod@4.1.11):
+  drizzle-zod@0.8.3(drizzle-orm@0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7))(zod@4.1.13):
     dependencies:
-      drizzle-orm: 0.44.7(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7)
-      zod: 4.1.11
+      drizzle-orm: 0.45.0(@opentelemetry/api@1.9.0)(@types/pg@8.15.6)(gel@2.1.1)(kysely@0.28.8)(pg@8.16.3)(postgres@3.4.7)
+      zod: 4.1.13
 
   dunder-proto@1.0.1:
     dependencies:
@@ -14379,7 +13775,7 @@ snapshots:
     optionalDependencies:
       unrs-resolver: 1.11.1
 
-  eslint-import-resolver-typescript@4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1)):
+  eslint-import-resolver-typescript@4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
@@ -14390,7 +13786,7 @@ snapshots:
       tinyglobby: 0.2.15
       unrs-resolver: 1.11.1
     optionalDependencies:
-      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
     transitivePeerDependencies:
       - supports-color
 
@@ -14401,9 +13797,9 @@ snapshots:
       eslint: 9.39.1(jiti@2.6.1)
       eslint-compat-utils: 0.5.1(eslint@9.39.1(jiti@2.6.1))
 
-  eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)):
+  eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
-      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/types': 8.48.1
       comment-parser: 1.4.1
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
@@ -14414,7 +13810,7 @@ snapshots:
       stable-hash-x: 0.2.0
       unrs-resolver: 1.11.1
     optionalDependencies:
-      '@typescript-eslint/utils': 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -14433,10 +13829,10 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  eslint-plugin-prettier@5.5.4(eslint-config-prettier@10.1.8(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))(prettier@3.7.3):
+  eslint-plugin-prettier@5.5.4(eslint-config-prettier@10.1.8(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))(prettier@3.7.4):
     dependencies:
       eslint: 9.39.1(jiti@2.6.1)
-      prettier: 3.7.3
+      prettier: 3.7.4
       prettier-linter-helpers: 1.0.0
       synckit: 0.11.11
     optionalDependencies:
@@ -14474,74 +13870,26 @@ snapshots:
 
   eslint-plugin-solid@0.14.5(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/utils': 8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.48.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       eslint: 9.39.1(jiti@2.6.1)
       estraverse: 5.3.0
       is-html: 2.0.0
       kebab-case: 1.0.2
       known-css-properties: 0.30.0
       style-to-object: 1.0.9
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-scope@7.2.2:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-
-  eslint-scope@8.4.0:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-
-  eslint-visitor-keys@3.4.3: {}
-
-  eslint-visitor-keys@4.2.1: {}
-
-  eslint@8.57.1:
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@8.57.1)
-      '@eslint-community/regexpp': 4.12.1
-      '@eslint/eslintrc': 2.1.4
-      '@eslint/js': 8.57.1
-      '@humanwhocodes/config-array': 0.13.0
-      '@humanwhocodes/module-importer': 1.0.1
-      '@nodelib/fs.walk': 1.2.8
-      '@ungap/structured-clone': 1.3.0
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.6
-      debug: 4.4.3
-      doctrine: 3.0.0
-      escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.3
-      espree: 9.6.1
-      esquery: 1.6.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      globals: 13.24.0
-      graphemer: 1.4.0
-      ignore: 5.3.2
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      is-path-inside: 3.0.3
-      js-yaml: 4.1.1
-      json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.4
-      strip-ansi: 6.0.1
-      text-table: 0.2.0
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
+  eslint-scope@8.4.0:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-visitor-keys@3.4.3: {}
+
+  eslint-visitor-keys@4.2.1: {}
+
   eslint@9.39.1(jiti@2.6.1):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1))
@@ -14591,19 +13939,13 @@ snapshots:
       acorn-jsx: 5.3.2(acorn@8.15.0)
       eslint-visitor-keys: 4.2.1
 
-  espree@9.6.1:
-    dependencies:
-      acorn: 8.15.0
-      acorn-jsx: 5.3.2(acorn@8.15.0)
-      eslint-visitor-keys: 3.4.3
-
   esprima@4.0.1: {}
 
   esquery@1.6.0:
     dependencies:
       estraverse: 5.3.0
 
-  esrap@2.2.0:
+  esrap@2.2.1:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
@@ -14670,14 +14012,14 @@ snapshots:
     dependencies:
       express: 5.1.0
 
-  express@4.21.2:
+  express@4.22.1:
     dependencies:
       accepts: 1.3.8
       array-flatten: 1.1.1
       body-parser: 1.20.3
       content-disposition: 0.5.4
       content-type: 1.0.5
-      cookie: 0.7.1
+      cookie: 0.7.2
       cookie-signature: 1.0.6
       debug: 2.6.9
       depd: 2.0.0
@@ -14693,13 +14035,13 @@ snapshots:
       parseurl: 1.3.3
       path-to-regexp: 0.1.12
       proxy-addr: 2.0.7
-      qs: 6.13.0
+      qs: 6.14.0
       range-parser: 1.2.1
       safe-buffer: 5.2.1
       send: 0.19.0
       serve-static: 1.16.2
       setprototypeof: 1.2.0
-      statuses: 2.0.1
+      statuses: 2.0.2
       type-is: 1.6.18
       utils-merge: 1.0.1
       vary: 1.1.2
@@ -14782,10 +14124,6 @@ snapshots:
 
   fflate@0.8.2: {}
 
-  file-entry-cache@6.0.1:
-    dependencies:
-      flat-cache: 3.2.0
-
   file-entry-cache@8.0.0:
     dependencies:
       flat-cache: 4.0.1
@@ -14872,12 +14210,6 @@ snapshots:
     transitivePeerDependencies:
       - '@react-native-async-storage/async-storage'
 
-  flat-cache@3.2.0:
-    dependencies:
-      flatted: 3.3.3
-      keyv: 4.5.4
-      rimraf: 3.0.2
-
   flat-cache@4.0.1:
     dependencies:
       flatted: 3.3.3
@@ -14902,8 +14234,6 @@ snapshots:
 
   forwarded@0.2.0: {}
 
-  fraction.js@5.3.4: {}
-
   fractional-indexing@3.2.0: {}
 
   fresh@0.5.2: {}
@@ -15045,10 +14375,6 @@ snapshots:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  globals@13.24.0:
-    dependencies:
-      type-fest: 0.20.2
-
   globals@14.0.0: {}
 
   globals@15.15.0: {}
@@ -15354,8 +14680,6 @@ snapshots:
 
   is-obj@2.0.0: {}
 
-  is-path-inside@3.0.3: {}
-
   is-potential-custom-element-name@1.0.1: {}
 
   is-promise@4.0.0: {}
@@ -15507,9 +14831,7 @@ snapshots:
 
   jasmine-core@4.6.1: {}
 
-  jasmine-core@5.12.1: {}
-
-  jiti@1.21.7: {}
+  jasmine-core@5.13.0: {}
 
   jiti@2.6.1: {}
 
@@ -15616,9 +14938,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  karma-jasmine-html-reporter@2.1.0(jasmine-core@5.12.1)(karma-jasmine@5.1.0(karma@6.4.4))(karma@6.4.4):
+  karma-jasmine-html-reporter@2.1.0(jasmine-core@5.13.0)(karma-jasmine@5.1.0(karma@6.4.4))(karma@6.4.4):
     dependencies:
-      jasmine-core: 5.12.1
+      jasmine-core: 5.13.0
       karma: 6.4.4
       karma-jasmine: 5.1.0(karma@6.4.4)
 
@@ -15667,7 +14989,7 @@ snapshots:
 
   kleur@4.1.5: {}
 
-  knip@5.70.2(@types/node@24.7.0)(typescript@5.9.3):
+  knip@5.71.0(@types/node@24.7.0)(typescript@5.9.3):
     dependencies:
       '@nodelib/fs.walk': 1.2.8
       '@types/node': 24.7.0
@@ -15682,7 +15004,7 @@ snapshots:
       smol-toml: 1.5.2
       strip-json-comments: 5.0.3
       typescript: 5.9.3
-      zod: 4.1.11
+      zod: 4.1.13
 
   known-css-properties@0.30.0: {}
 
@@ -15746,8 +15068,6 @@ snapshots:
 
   lilconfig@3.1.3: {}
 
-  lines-and-columns@1.2.4: {}
-
   linkify-it@5.0.0:
     dependencies:
       uc.micro: 2.1.0
@@ -16066,7 +15386,7 @@ snapshots:
       '@types/whatwg-url': 11.0.5
       whatwg-url: 14.2.0
 
-  mongodb@6.20.0(socks@2.8.7):
+  mongodb@6.21.0(socks@2.8.7):
     dependencies:
       '@mongodb-js/saslprep': 1.3.0
       bson: 6.10.4
@@ -16103,12 +15423,6 @@ snapshots:
 
   mute-stream@2.0.0: {}
 
-  mz@2.7.0:
-    dependencies:
-      any-promise: 1.3.0
-      object-assign: 4.1.1
-      thenify-all: 1.6.0
-
   nanoid@3.3.11: {}
 
   nanostores@1.1.0: {}
@@ -16176,8 +15490,6 @@ snapshots:
 
   normalize-path@3.0.0: {}
 
-  normalize-range@0.1.2: {}
-
   npm-bundled@4.0.0:
     dependencies:
       npm-normalize-package-bin: 4.0.0
@@ -16240,8 +15552,6 @@ snapshots:
 
   object-assign@4.1.1: {}
 
-  object-hash@3.0.0: {}
-
   object-inspect@1.13.4: {}
 
   object-keys@1.1.1: {}
@@ -16533,12 +15843,8 @@ snapshots:
 
   pidtree@0.6.0: {}
 
-  pify@2.3.0: {}
-
   pify@4.0.1: {}
 
-  pirates@4.0.7: {}
-
   piscina@5.1.3:
     optionalDependencies:
       '@napi-rs/nice': 1.1.1
@@ -16553,39 +15859,8 @@ snapshots:
 
   possible-typed-array-names@1.1.0: {}
 
-  postcss-import@15.1.0(postcss@8.5.6):
-    dependencies:
-      postcss: 8.5.6
-      postcss-value-parser: 4.2.0
-      read-cache: 1.0.0
-      resolve: 1.22.10
-
-  postcss-js@4.0.1(postcss@8.5.6):
-    dependencies:
-      camelcase-css: 2.0.1
-      postcss: 8.5.6
-
-  postcss-load-config@4.0.2(postcss@8.5.6):
-    dependencies:
-      lilconfig: 3.1.3
-      yaml: 2.8.1
-    optionalDependencies:
-      postcss: 8.5.6
-
   postcss-media-query-parser@0.2.3: {}
 
-  postcss-nested@6.2.0(postcss@8.5.6):
-    dependencies:
-      postcss: 8.5.6
-      postcss-selector-parser: 6.1.2
-
-  postcss-selector-parser@6.1.2:
-    dependencies:
-      cssesc: 3.0.0
-      util-deprecate: 1.0.2
-
-  postcss-value-parser@4.2.0: {}
-
   postcss@8.5.6:
     dependencies:
       nanoid: 3.3.11
@@ -16612,7 +15887,7 @@ snapshots:
 
   prettier@2.8.8: {}
 
-  prettier@3.7.3: {}
+  prettier@3.7.4: {}
 
   pretty-format@27.5.1:
     dependencies:
@@ -16711,34 +15986,18 @@ snapshots:
       iconv-lite: 0.7.0
       unpipe: 1.0.0
 
-  react-dom@18.3.1(react@18.3.1):
+  react-dom@19.2.1(react@19.2.1):
     dependencies:
-      loose-envify: 1.4.0
-      react: 18.3.1
-      scheduler: 0.23.2
-
-  react-dom@19.2.0(react@19.2.0):
-    dependencies:
-      react: 19.2.0
+      react: 19.2.1
       scheduler: 0.27.0
 
   react-is@16.13.1: {}
 
   react-is@17.0.2: {}
 
-  react-refresh@0.17.0: {}
-
   react-refresh@0.18.0: {}
 
-  react@18.3.1:
-    dependencies:
-      loose-envify: 1.4.0
-
-  react@19.2.0: {}
-
-  read-cache@1.0.0:
-    dependencies:
-      pify: 2.3.0
+  react@19.2.1: {}
 
   read-yaml-file@1.1.0:
     dependencies:
@@ -16921,7 +16180,7 @@ snapshots:
     dependencies:
       queue-microtask: 1.2.3
 
-  rxdb@16.21.0(rxjs@7.8.2)(socks@2.8.7):
+  rxdb@16.21.1(rxjs@7.8.2)(socks@2.8.7):
     dependencies:
       '@babel/runtime': 7.28.4
       '@types/clone': 2.1.4
@@ -16947,7 +16206,7 @@ snapshots:
       js-base64: 3.7.8
       jsonschema-key-compression: 1.7.0
       mingo: 6.5.6
-      mongodb: 6.20.0(socks@2.8.7)
+      mongodb: 6.21.0(socks@2.8.7)
       nats: 2.29.3
       oblivious-set: 1.4.0
       reconnecting-websocket: 4.4.0
@@ -17012,10 +16271,6 @@ snapshots:
     dependencies:
       xmlchars: 2.2.0
 
-  scheduler@0.23.2:
-    dependencies:
-      loose-envify: 1.4.0
-
   scheduler@0.27.0: {}
 
   semver@5.7.2: {}
@@ -17497,16 +16752,6 @@ snapshots:
     dependencies:
       inline-style-parser: 0.2.4
 
-  sucrase@3.35.0:
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.13
-      commander: 4.1.1
-      glob: 10.4.5
-      lines-and-columns: 1.2.4
-      mz: 2.7.0
-      pirates: 4.0.7
-      ts-interface-checker: 0.1.13
-
   superjson@2.2.6:
     dependencies:
       copy-anything: 4.0.5
@@ -17521,26 +16766,26 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelte-check@4.3.4(picomatch@4.0.3)(svelte@5.45.2)(typescript@5.9.3):
+  svelte-check@4.3.4(picomatch@4.0.3)(svelte@5.45.6)(typescript@5.9.3):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       chokidar: 4.0.3
       fdir: 6.5.0(picomatch@4.0.3)
       picocolors: 1.1.1
       sade: 1.8.1
-      svelte: 5.45.2
+      svelte: 5.45.6
       typescript: 5.9.3
     transitivePeerDependencies:
       - picomatch
 
-  svelte2tsx@0.7.42(svelte@5.45.2)(typescript@5.9.3):
+  svelte2tsx@0.7.42(svelte@5.45.6)(typescript@5.9.3):
     dependencies:
       dedent-js: 1.0.1
       pascal-case: 3.1.2
-      svelte: 5.45.2
+      svelte: 5.45.6
       typescript: 5.9.3
 
-  svelte@5.45.2:
+  svelte@5.45.6:
     dependencies:
       '@jridgewell/remapping': 2.3.5
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -17552,7 +16797,7 @@ snapshots:
       clsx: 2.1.1
       devalue: 5.5.0
       esm-env: 1.2.2
-      esrap: 2.2.0
+      esrap: 2.2.1
       is-reference: 3.0.3
       locate-character: 3.0.0
       magic-string: 0.30.21
@@ -17566,33 +16811,6 @@ snapshots:
 
   tailwind-merge@2.6.0: {}
 
-  tailwindcss@3.4.18:
-    dependencies:
-      '@alloc/quick-lru': 5.2.0
-      arg: 5.0.2
-      chokidar: 3.6.0
-      didyoumean: 1.2.2
-      dlv: 1.1.3
-      fast-glob: 3.3.3
-      glob-parent: 6.0.2
-      is-glob: 4.0.3
-      jiti: 1.21.7
-      lilconfig: 3.1.3
-      micromatch: 4.0.8
-      normalize-path: 3.0.0
-      object-hash: 3.0.0
-      picocolors: 1.1.1
-      postcss: 8.5.6
-      postcss-import: 15.1.0(postcss@8.5.6)
-      postcss-js: 4.0.1(postcss@8.5.6)
-      postcss-load-config: 4.0.2(postcss@8.5.6)
-      postcss-nested: 6.2.0(postcss@8.5.6)
-      postcss-selector-parser: 6.1.2
-      resolve: 1.22.10
-      sucrase: 3.35.0
-    transitivePeerDependencies:
-      - ts-node
-
   tailwindcss@4.1.17: {}
 
   tapable@2.2.3: {}
@@ -17638,16 +16856,6 @@ snapshots:
 
   text-extensions@2.4.0: {}
 
-  text-table@0.2.0: {}
-
-  thenify-all@1.6.0:
-    dependencies:
-      thenify: 3.3.1
-
-  thenify@3.3.1:
-    dependencies:
-      any-promise: 1.3.0
-
   through@2.3.8: {}
 
   tiny-invariant@1.3.3: {}
@@ -17721,8 +16929,6 @@ snapshots:
       picomatch: 4.0.3
       typescript: 5.9.3
 
-  ts-interface-checker@0.1.13: {}
-
   tsconfck@3.1.6(typescript@5.9.3):
     optionalDependencies:
       typescript: 5.9.3
@@ -17756,8 +16962,6 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
 
-  type-fest@0.20.2: {}
-
   type-fest@0.21.3: {}
 
   type-is@1.6.18:
@@ -17835,8 +17039,6 @@ snapshots:
 
   typescript@5.4.2: {}
 
-  typescript@5.8.3: {}
-
   typescript@5.9.3: {}
 
   ua-parser-js@0.7.41: {}
@@ -17854,8 +17056,6 @@ snapshots:
 
   uncrypto@0.1.3: {}
 
-  undici-types@6.21.0: {}
-
   undici-types@7.14.0: {}
 
   undici@7.16.0: {}
@@ -17917,9 +17117,9 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
-  use-sync-external-store@1.6.0(react@19.2.0):
+  use-sync-external-store@1.6.0(react@19.2.1):
     dependencies:
-      react: 19.2.0
+      react: 19.2.1
 
   util-deprecate@1.0.2: {}
 
@@ -17948,34 +17148,13 @@ snapshots:
 
   vary@1.1.2: {}
 
-  vite-node@3.2.4(@types/node@20.19.24)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
-    dependencies:
-      cac: 6.7.14
-      debug: 4.4.3
-      es-module-lexer: 1.7.0
-      pathe: 2.0.3
-      vite: 6.4.1(@types/node@20.19.24)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    transitivePeerDependencies:
-      - '@types/node'
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
   vite-node@3.2.4(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -18013,37 +17192,6 @@ snapshots:
     dependencies:
       vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
-  vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
-    dependencies:
-      '@babel/core': 7.28.5
-      '@types/babel__core': 7.20.5
-      babel-preset-solid: 1.9.9(@babel/core@7.28.5)(solid-js@1.9.10)
-      merge-anything: 5.1.7
-      solid-js: 1.9.10
-      solid-refresh: 0.6.3(solid-js@1.9.10)
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      vitefu: 1.1.1(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-    optionalDependencies:
-      '@testing-library/jest-dom': 6.9.1
-    transitivePeerDependencies:
-      - supports-color
-    optional: true
-
-  vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
-    dependencies:
-      '@babel/core': 7.28.5
-      '@types/babel__core': 7.20.5
-      babel-preset-solid: 1.9.9(@babel/core@7.28.5)(solid-js@1.9.10)
-      merge-anything: 5.1.7
-      solid-js: 1.9.10
-      solid-refresh: 0.6.3(solid-js@1.9.10)
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      vitefu: 1.1.1(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-    optionalDependencies:
-      '@testing-library/jest-dom': 6.9.1
-    transitivePeerDependencies:
-      - supports-color
-
   vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.10)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
     dependencies:
       '@babel/core': 7.28.5
@@ -18059,28 +17207,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
-    dependencies:
-      debug: 4.4.3
-      globrex: 0.1.2
-      tsconfck: 3.1.6(typescript@5.9.3)
-    optionalDependencies:
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
-    dependencies:
-      debug: 4.4.3
-      globrex: 0.1.2
-      tsconfck: 3.1.6(typescript@5.9.3)
-    optionalDependencies:
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
     dependencies:
       debug: 4.4.3
@@ -18092,42 +17218,6 @@ snapshots:
       - supports-color
       - typescript
 
-  vite@6.4.1(@types/node@20.19.24)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
-    dependencies:
-      esbuild: 0.25.11
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-      postcss: 8.5.6
-      rollup: 4.52.5
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 20.19.24
-      fsevents: 2.3.3
-      jiti: 2.6.1
-      lightningcss: 1.30.2
-      sass: 1.90.0
-      terser: 5.44.0
-      tsx: 4.21.0
-      yaml: 2.8.1
-
-  vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
-    dependencies:
-      esbuild: 0.25.11
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-      postcss: 8.5.6
-      rollup: 4.52.5
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 24.7.0
-      fsevents: 2.3.3
-      jiti: 2.6.1
-      lightningcss: 1.30.2
-      sass: 1.90.0
-      terser: 5.44.0
-      tsx: 4.21.0
-      yaml: 2.8.1
-
   vite@7.1.11(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.11
@@ -18146,24 +17236,6 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.8.1
 
-  vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
-    dependencies:
-      esbuild: 0.25.11
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-      postcss: 8.5.6
-      rollup: 4.52.5
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 22.18.1
-      fsevents: 2.3.3
-      jiti: 2.6.1
-      lightningcss: 1.30.2
-      sass: 1.90.0
-      terser: 5.44.0
-      tsx: 4.21.0
-      yaml: 2.8.1
-
   vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.11
@@ -18182,67 +17254,15 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.8.1
 
-  vitefu@1.1.1(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
-    optionalDependencies:
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-
-  vitefu@1.1.1(vite@7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
-    optionalDependencies:
-      vite: 7.2.6(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-
   vitefu@1.1.1(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)):
     optionalDependencies:
       vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@20.19.24)(@vitest/ui@3.2.4)(jiti@2.6.1)(jsdom@27.2.0(postcss@8.5.6))(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
-    dependencies:
-      '@types/chai': 5.2.2
-      '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@6.4.1(@types/node@20.19.24)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
-      '@vitest/pretty-format': 3.2.4
-      '@vitest/runner': 3.2.4
-      '@vitest/snapshot': 3.2.4
-      '@vitest/spy': 3.2.4
-      '@vitest/utils': 3.2.4
-      chai: 5.3.3
-      debug: 4.4.3
-      expect-type: 1.2.2
-      magic-string: 0.30.21
-      pathe: 2.0.3
-      picomatch: 4.0.3
-      std-env: 3.9.0
-      tinybench: 2.9.0
-      tinyexec: 0.3.2
-      tinyglobby: 0.2.15
-      tinypool: 1.1.1
-      tinyrainbow: 2.0.0
-      vite: 6.4.1(@types/node@20.19.24)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@20.19.24)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
-      why-is-node-running: 2.3.0
-    optionalDependencies:
-      '@types/debug': 4.1.12
-      '@types/node': 20.19.24
-      '@vitest/ui': 3.2.4(vitest@3.2.4)
-      jsdom: 27.2.0(postcss@8.5.6)
-    transitivePeerDependencies:
-      - jiti
-      - less
-      - lightningcss
-      - msw
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
   vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.7.0)(@vitest/ui@3.2.4)(jiti@2.6.1)(jsdom@27.2.0(postcss@8.5.6))(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -18260,7 +17280,7 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 6.4.1(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
+      vite: 7.2.6(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
       vite-node: 3.2.4(@types/node@24.7.0)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.90.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
@@ -18530,12 +17550,12 @@ snapshots:
 
   zimmerframe@1.1.4: {}
 
-  zod-to-json-schema@3.24.6(zod@3.25.76):
+  zod-to-json-schema@3.25.0(zod@4.1.13):
     dependencies:
-      zod: 3.25.76
+      zod: 4.1.13
 
   zod@3.25.76: {}
 
-  zod@4.1.11: {}
+  zod@4.1.13: {}
 
   zone.js@0.16.0: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 78eca2b88..18dafa94f 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -4,4 +4,4 @@ preferWorkspacePackages: true
 
 packages:
   - packages/**
-  - examples/**
+  - examples/**/*
diff --git a/prettier.config.js b/prettier.config.js
new file mode 100644
index 000000000..2c53b10e3
--- /dev/null
+++ b/prettier.config.js
@@ -0,0 +1,10 @@
+// @ts-check
+
+/** @type {import('prettier').Config} */
+const config = {
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'all',
+}
+
+export default config
diff --git a/scripts/generateDocs.ts b/scripts/generate-docs.ts
similarity index 71%
rename from scripts/generateDocs.ts
rename to scripts/generate-docs.ts
index 738fff336..e9a6da6c5 100644
--- a/scripts/generateDocs.ts
+++ b/scripts/generate-docs.ts
@@ -1,8 +1,6 @@
-import { readFileSync, writeFileSync } from "node:fs"
-import { resolve } from "node:path"
-import { fileURLToPath } from "node:url"
-import { generateReferenceDocs } from "@tanstack/config/typedoc"
-import { glob } from "tinyglobby"
+import { resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { generateReferenceDocs } from '@tanstack/typedoc-config'
 
 const __dirname = fileURLToPath(new URL(`.`, import.meta.url))
 
@@ -21,7 +19,7 @@ await generateReferenceDocs({
       ],
       tsconfig: resolve(
         __dirname,
-        `../packages/electric-db-collection/tsconfig.docs.json`
+        `../packages/electric-db-collection/tsconfig.docs.json`,
       ),
       outputDir: resolve(__dirname, `../docs/reference/electric-db-collection`),
       exclude: [`packages/db/**/*`],
@@ -33,7 +31,7 @@ await generateReferenceDocs({
       ],
       tsconfig: resolve(
         __dirname,
-        `../packages/query-db-collection/tsconfig.docs.json`
+        `../packages/query-db-collection/tsconfig.docs.json`,
       ),
       outputDir: resolve(__dirname, `../docs/reference/query-db-collection`),
       exclude: [`packages/db/**/*`],
@@ -45,11 +43,11 @@ await generateReferenceDocs({
       ],
       tsconfig: resolve(
         __dirname,
-        `../packages/powersync-db-collection/tsconfig.docs.json`
+        `../packages/powersync-db-collection/tsconfig.docs.json`,
       ),
       outputDir: resolve(
         __dirname,
-        `../docs/reference/powersync-db-collection`
+        `../docs/reference/powersync-db-collection`,
       ),
       exclude: [`packages/db/**/*`],
     },
@@ -81,11 +79,11 @@ await generateReferenceDocs({
       ],
       tsconfig: resolve(
         __dirname,
-        `../packages/trailbase-db-collection/tsconfig.docs.json`
+        `../packages/trailbase-db-collection/tsconfig.docs.json`,
       ),
       outputDir: resolve(
         __dirname,
-        `../docs/reference/trailbase-db-collection`
+        `../docs/reference/trailbase-db-collection`,
       ),
       exclude: [`packages/db/**/*`],
     },
@@ -106,32 +104,6 @@ await generateReferenceDocs({
   ],
 })
 
-// Find all markdown files matching the pattern
-const markdownFiles = [
-  ...(await glob(`docs/reference/**/*.md`)),
-  ...(await glob(`docs/framework/*/reference/**/*.md`)),
-]
-
-console.log(`Found ${markdownFiles.length} markdown files to process\n`)
-
-// Process each markdown file
-markdownFiles.forEach((file) => {
-  const content = readFileSync(file, `utf-8`)
-  let updatedContent = content
-  updatedContent = updatedContent.replaceAll(/\]\(\.\.\//gm, `](../../`)
-  // updatedContent = content.replaceAll(/\]\(\.\//gm, '](../')
-  updatedContent = updatedContent.replaceAll(
-    /\]\((?!https?:\/\/|\/\/|\/|\.\/|\.\.\/|#)([^)]+)\)/gm,
-    (match, p1) => `](../${p1})`
-  )
-
-  // Write the updated content back to the file
-  if (updatedContent !== content) {
-    writeFileSync(file, updatedContent, `utf-8`)
-    console.log(`Processed file: ${file}`)
-  }
-})
-
 console.log(`\n✅ All markdown files have been processed!`)
 
 process.exit(0)
diff --git a/scripts/verify-links.ts b/scripts/verify-links.ts
index 4efcb357c..8a1c40ddc 100644
--- a/scripts/verify-links.ts
+++ b/scripts/verify-links.ts
@@ -1,60 +1,60 @@
-import { existsSync, readFileSync, statSync } from "node:fs"
-import path, { resolve } from "node:path"
-import { glob } from "tinyglobby"
-// @ts-ignore - markdown-link-extractor is not typed
-import markdownLinkExtractor from "markdown-link-extractor"
+import { existsSync, readFileSync, statSync } from 'node:fs'
+import { extname, resolve } from 'node:path'
+import { glob } from 'tinyglobby'
+// @ts-ignore Could not find a declaration file for module 'markdown-link-extractor'.
+import markdownLinkExtractor from 'markdown-link-extractor'
+
+const errors: Array<{
+  file: string
+  link: string
+  resolvedPath: string
+  reason: string
+}> = []
 
 function isRelativeLink(link: string) {
   return (
-    link &&
-    !link.startsWith(`/`) &&
-    !link.startsWith(`http://`) &&
-    !link.startsWith(`https://`) &&
-    !link.startsWith(`//`) &&
-    !link.startsWith(`#`) &&
-    !link.startsWith(`mailto:`)
+    !link.startsWith('/') &&
+    !link.startsWith('http://') &&
+    !link.startsWith('https://') &&
+    !link.startsWith('//') &&
+    !link.startsWith('#') &&
+    !link.startsWith('mailto:')
   )
 }
 
-function normalizePath(p: string): string {
-  // Remove any trailing .md
-  p = p.replace(`${path.extname(p)}`, ``)
-  return p
+/** Remove any trailing .md */
+function stripExtension(p: string): string {
+  return p.replace(`${extname(p)}`, '')
 }
 
-function fileExistsForLink(
-  link: string,
-  markdownFile: string,
-  errors: Array<any>
-): boolean {
+function relativeLinkExists(link: string, file: string): boolean {
   // Remove hash if present
-  const filePart = link.split(`#`)[0]
+  const linkWithoutHash = link.split('#')[0]
   // If the link is empty after removing hash, it's not a file
-  if (!filePart) return false
+  if (!linkWithoutHash) return false
 
-  // Normalize the markdown file path
-  markdownFile = normalizePath(markdownFile)
-
-  // Normalize the path
-  const normalizedPath = normalizePath(filePart)
+  // Strip the file/link extensions
+  const filePath = stripExtension(file)
+  const linkPath = stripExtension(linkWithoutHash)
 
   // Resolve the path relative to the markdown file's directory
-  let absPath = resolve(markdownFile, normalizedPath)
+  // Nav up a level to simulate how links are resolved on the web
+  let absPath = resolve(filePath, '..', linkPath)
 
   // Ensure the resolved path is within /docs
-  const docsRoot = resolve(`docs`)
+  const docsRoot = resolve('docs')
   if (!absPath.startsWith(docsRoot)) {
     errors.push({
       link,
-      markdownFile,
+      file,
       resolvedPath: absPath,
-      reason: `navigates above /docs, invalid`,
+      reason: 'Path outside /docs',
     })
     return false
   }
 
   // Check if this is an example path
-  const isExample = absPath.includes(`/examples/`)
+  const isExample = absPath.includes('/examples/')
 
   let exists = false
 
@@ -62,13 +62,13 @@ function fileExistsForLink(
     // Transform /docs/framework/{framework}/examples/ to /examples/{framework}/
     absPath = absPath.replace(
       /\/docs\/framework\/([^/]+)\/examples\//,
-      `/examples/$1/`
+      '/examples/$1/',
     )
     // For examples, we want to check if the directory exists
     exists = existsSync(absPath) && statSync(absPath).isDirectory()
   } else {
     // For non-examples, we want to check if the .md file exists
-    if (!absPath.endsWith(`.md`)) {
+    if (!absPath.endsWith('.md')) {
       absPath = `${absPath}.md`
     }
     exists = existsSync(absPath)
@@ -77,42 +77,34 @@ function fileExistsForLink(
   if (!exists) {
     errors.push({
       link,
-      markdownFile,
+      file,
       resolvedPath: absPath,
-      reason: `not found`,
+      reason: 'Not found',
     })
   }
   return exists
 }
 
-async function findMarkdownLinks() {
+async function verifyMarkdownLinks() {
   // Find all markdown files in docs directory
-  const markdownFiles = await glob(`docs/**/*.md`, {
-    ignore: [`**/node_modules/**`],
+  const markdownFiles = await glob('docs/**/*.md', {
+    ignore: ['**/node_modules/**'],
   })
 
   console.log(`Found ${markdownFiles.length} markdown files\n`)
 
-  const errors: Array<any> = []
-
   // Process each file
   for (const file of markdownFiles) {
-    const content = readFileSync(file, `utf-8`)
-    const links: Array<any> = markdownLinkExtractor(content)
-
-    const filteredLinks = links.filter((link: any) => {
-      if (typeof link === `string`) {
-        return isRelativeLink(link)
-      } else if (link && typeof link.href === `string`) {
-        return isRelativeLink(link.href)
-      }
-      return false
+    const content = readFileSync(file, 'utf-8')
+    const links: Array<string> = markdownLinkExtractor(content)
+
+    const relativeLinks = links.filter((link: string) => {
+      return isRelativeLink(link)
     })
 
-    if (filteredLinks.length > 0) {
-      filteredLinks.forEach((link: any) => {
-        const href = typeof link === `string` ? link : link.href
-        fileExistsForLink(href, file, errors)
+    if (relativeLinks.length > 0) {
+      relativeLinks.forEach((link) => {
+        relativeLinkExists(link, file)
       })
     }
   }
@@ -121,13 +113,13 @@ async function findMarkdownLinks() {
     console.log(`\n❌ Found ${errors.length} broken links:`)
     errors.forEach((err) => {
       console.log(
-        `${err.link}\n  in:    ${err.markdownFile}\n  path:  ${err.resolvedPath}\n  why:   ${err.reason}\n`
+        `${err.file}\n  link:      ${err.link}\n  resolved:  ${err.resolvedPath}\n  why:       ${err.reason}\n`,
       )
     })
     process.exit(1)
   } else {
-    console.log(`\n✅ No broken links found!`)
+    console.log('\n✅ No broken links found!')
   }
 }
 
-findMarkdownLinks().catch(console.error)
+verifyMarkdownLinks().catch(console.error)
diff --git a/tsconfig.json b/tsconfig.json
index fcc600141..153171020 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -34,8 +34,8 @@
     "todo-app/**/*.tsx",
     "examples/**/*.ts",
     "examples/**/*.tsx",
-    "eslint.config.js",
-    "scripts/*.ts"
+    "*.config.*",
+    "scripts"
   ],
   "exclude": ["node_modules"]
 }