@effect-app/infra 4.0.0-beta.98 → 4.0.0

package/src/Store/SQL.ts

@@ -1,24 +1,64 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Effect, type NonEmptyReadonlyArray, Option, Struct } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import { toNonEmptyArray } from "effect-app/Array"
-import { SqlClient } from "effect/unstable/sql"
-import { OptimisticConcurrencyException } from "../errors.js"
-import { InfraLogger } from "../logger.js"
-import type { FieldValues } from "../Model/filter/types.js"
-import { storeId } from "./Memory.js"
-import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "./service.js"
-import { buildWhereSQLQuery, logQuery, type SQLDialect, sqliteDialect } from "./SQL/query.js"
-import { makeETag } from "./utils.js"
-
-/** @internal */
+import * as Effect from "effect-app/Effect"
+import type { FieldValues } from "effect-app/Model/filter/types"
+import type { ComputedProjectionIrExpression } from "effect-app/Model/query"
+import * as Option from "effect-app/Option"
+import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, storeId, StoreMaker } from "effect-app/Store"
+import * as Context from "effect/Context"
+import * as Layer from "effect/Layer"
+import * as LayerMap from "effect/LayerMap"
+import { SqlClient } from "effect/sql"
+import * as Struct from "effect/Struct"
+import { DatabaseError, OptimisticConcurrencyException } from "../errors.ts"
+import { InfraLogger } from "../logger.ts"
+import { annotateDb, type DbSystem } from "../otel.ts"
+import { decodeStoredMany, decodeStoredOption, makeJsonDocumentCodec, makeStoredDecode } from "./jsonDocument.ts"
+import { buildWhereSQLQuery, logQuery, type SQLDialect, sqliteDialect } from "./SQL/query.ts"
+import { makeETag, makeJsonLower, toJsonQueryValue } from "./utils.ts"
+
+const sqlErrorMessage = (e: unknown) => (e as any)?.message ? String((e as any).message) : String(e)
+const sqlIsTransient = (e: unknown) =>
+  /timeout|ETIMEDOUT|ECONNRESET|ECONNREFUSED|connection|deadlock|too many connections/i.test(sqlErrorMessage(e))
+// Map a SqlError into a typed, serializable DatabaseError (instead of `.orDie`,
+// which would turn it into an opaque, non-serializable defect).
+const toDatabaseError = (e: unknown) =>
+  new DatabaseError({ message: `SQL request failed: ${sqlErrorMessage(e)}`, transient: sqlIsTransient(e), cause: e })
+// withTransaction may re-raise setInternal's typed errors or add SqlError on begin/commit.
+// Preserve DatabaseError / OCC by `_tag` (not instanceof — dual package instances break it);
+// map residual SQL failures to DatabaseError.
+const preserveStoreError = (e: unknown): DatabaseError | OptimisticConcurrencyException => {
+  if (e !== null && typeof e === "object" && "_tag" in e) {
+    if (e._tag === "DatabaseError") return e as DatabaseError
+    if (e._tag === "OptimisticConcurrencyException") return e as OptimisticConcurrencyException
+  }
+  return toDatabaseError(e)
+}
+
+export type WithNsTransactionFn = <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+
+export class WithNsTransaction
+  extends Context.Service<WithNsTransaction, WithNsTransactionFn>()("effect-app/WithNsTransaction")
+{}
+
+/**
+ * Row -> raw stored JSON document: `data` parsed, `defaultValues` merged, `id`
+ * and `_etag` re-injected from their columns. Decoding it is a separate step
+ * (`makeStoredDecode`), so a document `jitM` does not repair fails as a typed
+ * `S.SchemaError` rather than throwing out of here.
+ *
+ * @internal
+ */
 export const parseRow = <Encoded extends FieldValues>(
   row: { id: string; _etag: string | null; data: string },
   idKey: PropertyKey,
   defaultValues: Partial<Encoded>
 ): PersistenceModelType<Encoded> => {
   const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data) as object
-  return { ...defaultValues, ...data, [idKey]: row.id, _etag: row._etag ?? undefined } as PersistenceModelType<Encoded>
+  const jsonDefaults = toJsonQueryValue(defaultValues) as Partial<Encoded>
+  return { ...jsonDefaults, ...data, [idKey]: row.id, _etag: row._etag ?? undefined } as PersistenceModelType<Encoded>
 }
 
 const parseSelectRow = (
@@ -43,315 +83,724 @@ const parseSelectRow = (
   return result
 }
 
-function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
-  return ({ prefix }: StorageConfig) =>
-    Effect.gen(function*() {
-      const sql = yield* SqlClient.SqlClient
-      return {
-        make: <IdKey extends keyof Encoded, Encoded extends FieldValues, R = never, E = never>(
-          name: string,
-          idKey: IdKey,
-          seed?: Effect.Effect<Iterable<Encoded>, E, R>,
-          config?: StoreConfig<Encoded>
-        ) =>
-          Effect.gen(function*() {
-            type PM = PersistenceModelType<Encoded>
-            const tableName = `${prefix}${name}`
-            const defaultValues = config?.defaultValues ?? {}
-
-            const resolveNamespace = !config?.allowNamespace
-              ? Effect.succeed("primary")
-              : storeId.asEffect().pipe(Effect.map((namespace) => {
-                if (namespace !== "primary" && !config.allowNamespace!(namespace)) {
-                  throw new Error(`Namespace ${namespace} not allowed!`)
-                }
-                return namespace
-              }))
-
-            yield* sql
-              .unsafe(
-                `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL, _namespace TEXT NOT NULL DEFAULT 'primary', _etag TEXT, data ${jsonColumnType} NOT NULL, PRIMARY KEY (id, _namespace))`
-              )
-              .pipe(Effect.orDie)
-
-            const toRow = (e: PM) => {
-              const newE = makeETag(e)
-              const id = newE[idKey] as string
-              const { _etag, [idKey]: _id, ...rest } = newE as any
-              const data = JSON.stringify(rest)
-              return { id, _etag: newE._etag!, data, item: newE }
+function makeSQLStoreInt(system: DbSystem, dialect: SQLDialect, jsonColumnType: string) {
+  return Effect.fnUntraced(function*({ prefix }: StorageConfig) {
+    const sql = yield* SqlClient.SqlClient
+    return {
+      make: Effect.fnUntraced(function*<IdKey extends keyof Encoded, Encoded extends FieldValues, R = never, E = never>(
+        name: string,
+        idKey: IdKey,
+        seed?: Effect.Effect<Iterable<Encoded>, E, R>,
+        config?: StoreConfig<Encoded>
+      ) {
+        type PM = PersistenceModelType<Encoded>
+        const tableName = `${prefix}${name}`
+        const json = makeJsonLower(config)
+        const defaultValues = json.toJson(config?.defaultValues ?? {}) as Partial<Encoded>
+        const codec = makeJsonDocumentCodec<Encoded>(config?.schema)
+        // read path: stored JSON -> defaultValues -> jitM -> JSON→Encoded decode
+        const decodeStored = makeStoredDecode<Encoded>(config?.schema, config?.jitM)
+        const decodeRow = (row: { id: string; _etag: string | null; data: string }) =>
+          decodeStored(parseRow<Encoded>(row, idKey, defaultValues))
+
+        const resolveNamespace = !config?.allowNamespace
+          ? Effect.succeed("primary")
+          : storeId.pipe(Effect.map((namespace) => {
+            if (namespace !== "primary" && !config.allowNamespace!(namespace)) {
+              throw new Error(`Namespace ${namespace} not allowed!`)
             }
+            return namespace
+          }))
 
-            const exec = (query: string, params?: readonly unknown[]) =>
-              sql.unsafe(query, params as any).pipe(Effect.orDie)
+        const ensureTable = sql
+          .unsafe(
+            `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL, _namespace TEXT NOT NULL DEFAULT 'primary', _etag TEXT, data ${jsonColumnType} NOT NULL, PRIMARY KEY (id, _namespace))`
+          )
+          .pipe(
+            Effect.andThen(
+              sql.unsafe(
+                `CREATE TABLE IF NOT EXISTS "_migrations" (id TEXT NOT NULL, version TEXT NOT NULL, PRIMARY KEY (id, version))`
+              )
+            ),
+            Effect.orDie,
+            Effect.asVoid
+          )
 
-            const seedMarkerId = `__seed_marker__`
+        const toRow = (e: PM) => {
+          const newE = makeETag(codec.encode(e))
+          const id = newE[idKey] as string
+          const { _etag, [idKey]: _id, ...rest } = newE as any
+          const data = JSON.stringify(rest)
+          return { id, _etag: newE._etag!, data, item: codec.decode(newE) }
+        }
 
-            const setInternal = (e: PM, ns: string) =>
-              Effect.gen(function*() {
-                const row = toRow(e)
-                if (e._etag) {
-                  yield* exec(
-                    `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ? AND _namespace = ?`,
-                    [row._etag, row.data, row.id, e._etag, ns]
-                  )
-                  const existing = yield* exec(
-                    `SELECT _etag FROM "${tableName}" WHERE id = ? AND _namespace = ?`,
-                    [row.id, ns]
-                  )
-                  const current = (existing as any[])[0]
-                  if (!current || current._etag !== row._etag) {
-                    if (current) {
-                      return yield* new OptimisticConcurrencyException({
-                        type: name,
-                        id: row.id,
-                        current: current._etag,
-                        found: e._etag,
-                        code: 412
-                      })
-                    }
-                    return yield* new OptimisticConcurrencyException({
-                      type: name,
-                      id: row.id,
-                      current: "",
-                      found: e._etag,
-                      code: 404
-                    })
-                  }
-                } else {
-                  yield* exec(
-                    `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`,
-                    [row.id, ns, row._etag, row.data]
-                  )
-                }
-                return row.item
+        const exec = (query: string, params?: readonly unknown[]) =>
+          sql.unsafe(query, params as any).pipe(Effect.mapError(toDatabaseError))
+
+        const setInternal = Effect.fnUntraced(function*(e: PM, ns: string) {
+          const row = toRow(e)
+          if (e._etag) {
+            yield* exec(
+              `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ? AND _namespace = ?`,
+              [row._etag, row.data, row.id, e._etag, ns]
+            )
+            const existing = yield* exec(
+              `SELECT _etag FROM "${tableName}" WHERE id = ? AND _namespace = ?`,
+              [row.id, ns]
+            )
+            const current = (existing as any[])[0]
+            if (!current || current._etag !== row._etag) {
+              if (current) {
+                return yield* new OptimisticConcurrencyException({
+                  type: name,
+                  id: row.id,
+                  current: current._etag,
+                  found: e._etag,
+                  code: 412
+                })
+              }
+              return yield* new OptimisticConcurrencyException({
+                type: name,
+                id: row.id,
+                current: "",
+                found: e._etag,
+                code: 404
               })
+            }
+          } else {
+            yield* exec(
+              `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`,
+              [row.id, ns, row._etag, row.data]
+            )
+          }
+          return row.item
+        })
 
-            const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
-              sql
-                .withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
-                .pipe(
-                  Effect.orDie,
-                  Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>)
-                )
+        const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
+          sql
+            .withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
+            .pipe(
+              Effect.mapError(preserveStoreError),
+              Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>)
+            )
 
-            const ctx = yield* Effect.context<R>()
-            const seedCache = new Map<string, Effect.Effect<void>>()
-            const makeSeedEffect = (ns: string) =>
-              exec(
-                `SELECT id FROM "${tableName}" WHERE id = ? AND _namespace = ?`,
-                [seedMarkerId, `__seed__::${ns}`]
-              )
+        const ctx = yield* Effect.context<R>()
+        const seedCache = new Map<string, Effect.Effect<void, DatabaseError>>()
+        const makeSeedEffect = Effect.fnUntraced(function*(ns: string) {
+          yield* ensureTable
+          if (!seed) return
+          const existing = yield* exec(
+            `SELECT id FROM "_migrations" WHERE id = ? AND version = ?`,
+            [`${tableName}::${ns}`, tableName]
+          )
+          if ((existing as any[]).length > 0) return
+          yield* InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`)
+          const items = yield* seed.pipe(Effect.provide(ctx), Effect.orDie)
+          const ne = toNonEmptyArray([...items])
+          // Seed inserts are not concurrent; OCC here is a programming defect.
+          if (Option.isSome(ne)) {
+            yield* bulkSetInternal(ne.value, ns).pipe(
+              Effect.catchTag("OptimisticConcurrencyException", Effect.die)
+            )
+          }
+          yield* exec(
+            `INSERT INTO "_migrations" (id, version) VALUES (?, ?)`,
+            [`${tableName}::${ns}`, tableName]
+          )
+        })
+        const seedNamespace = (ns: string) => {
+          let cached = seedCache.get(ns)
+          if (!cached) {
+            cached = Effect.cached(Effect.uninterruptible(makeSeedEffect(ns))).pipe(Effect.runSync)
+            seedCache.set(ns, cached)
+          }
+          return cached
+        }
+        const selectAllSql = `SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = ?`
+        const allStored = resolveNamespace.pipe(
+          Effect.flatMap((ns) =>
+            exec(selectAllSql, [ns]).pipe(
+              Effect.map((rows) => (rows as any[]).map((row) => parseRow<Encoded>(row, idKey, defaultValues)))
+            )
+          )
+        )
+
+        const s: Store<IdKey, Encoded> = {
+          seedNamespace: (ns) => seedNamespace(ns),
+
+          all: resolveNamespace.pipe(
+            Effect.flatMap((ns) => {
+              return exec(selectAllSql, [ns])
                 .pipe(
-                  Effect.flatMap((existing) => {
-                    if ((existing as any[]).length > 0) return Effect.void
-                    return InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`).pipe(
-                      Effect.andThen(seed!),
-                      Effect.flatMap((items) =>
-                        Effect.flatMapOption(
-                          Effect.succeed(toNonEmptyArray([...items])),
-                          (a) => bulkSetInternal(a, ns)
-                        )
-                      ),
-                      Effect.andThen(
-                        exec(
-                          `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`,
-                          [seedMarkerId, `__seed__::${ns}`, null, JSON.stringify({ _marker: true })]
-                        )
-                      ),
-                      Effect.provide(ctx),
-                      Effect.orDie
-                    )
+                  Effect.flatMap((rows) => Effect.fromResult(decodeStoredMany(rows as any[], decodeRow))),
+                  annotateDb({
+                    operation: "all",
+                    system,
+                    collection: tableName,
+                    namespace: ns,
+                    entity: name,
+                    query: selectAllSql
                   })
                 )
-            const seedNamespace = Effect.fn("seedNamespace")(function*(ns: string) {
-              if (!seed) return
-              let cached = seedCache.get(ns)
-              if (!cached) {
-                cached = yield* Effect.cached(makeSeedEffect(ns))
-                seedCache.set(ns, cached)
-              }
-              yield* cached
             })
-            const resolveAndSeed = resolveNamespace.pipe(
-              Effect.tap((ns) => seedNamespace(ns))
-            )
+          ),
 
-            const s: Store<IdKey, Encoded> = {
-              all: resolveAndSeed.pipe(Effect.flatMap((ns) =>
-                exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = ?`, [ns])
+          find: (id) =>
+            resolveNamespace.pipe(
+              Effect.flatMap((ns) => {
+                const sqlText = `SELECT id, _etag, data FROM "${tableName}" WHERE id = ? AND _namespace = ?`
+                return exec(sqlText, [id, ns])
                   .pipe(
-                    Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
-                    Effect.withSpan("SQL.all [effect-app/infra/Store]", {
-                      attributes: {
-                        "repository.table_name": tableName,
-                        "repository.model_name": name,
-                        "repository.namespace": ns
-                      }
-                    }, { captureStackTrace: false })
+                    Effect.flatMap((rows) =>
+                      Effect.fromResult(decodeStoredOption(Option.fromNullishOr((rows as any[])[0]), decodeRow))
+                    ),
+                    annotateDb({
+                      operation: "find",
+                      system,
+                      collection: tableName,
+                      namespace: ns,
+                      entity: name,
+                      query: sqlText,
+                      extra: { "app.entity.id": id }
+                    })
                   )
-              )),
+              })
+            ),
 
-              find: (id) =>
-                resolveAndSeed.pipe(Effect.flatMap((ns) =>
-                  exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [id, ns])
+          filter: <U extends keyof Encoded = never>(f: FilterArgs<Encoded, U>) => {
+            const filter = f
+              .filter
+            type M = U extends undefined ? Encoded
+              : Pick<Encoded, U>
+            return resolveNamespace
+              .pipe(Effect
+                .flatMap((ns) =>
+                  Effect
+                    .sync(() => {
+                      return buildWhereSQLQuery(
+                        dialect,
+                        idKey,
+                        filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [],
+                        tableName,
+                        defaultValues,
+                        f
+                          .select as
+                            | NonEmptyReadonlyArray<
+                              string | {
+                                key: string
+                                subKeys: readonly string[]
+                              } | {
+                                key: string
+                                computed: ComputedProjectionIrExpression
+                              }
+                            >
+                            | undefined,
+                        f
+                          .order,
+                        f
+                          .skip,
+                        f
+                          .limit,
+                        ns,
+                        json
+                      )
+                    })
                     .pipe(
-                      Effect.map((rows) => {
-                        const row = (rows as any[])[0]
-                        return row
-                          ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
-                          : Option.none()
-                      }),
-                      Effect.withSpan("SQL.find [effect-app/infra/Store]", {
-                        attributes: { "repository.table_name": tableName, "repository.model_name": name, id }
-                      }, { captureStackTrace: false })
-                    )
-                )),
-
-              filter: <U extends keyof Encoded = never>(f: FilterArgs<Encoded, U>) => {
-                const filter = f
-                  .filter
-                type M = U extends undefined ? Encoded
-                  : Pick<Encoded, U>
-                return resolveAndSeed
-                  .pipe(Effect
-                    .flatMap((ns) =>
                       Effect
-                        .sync(() => {
-                          const q = buildWhereSQLQuery(
-                            dialect,
-                            idKey,
-                            filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [],
-                            tableName,
-                            defaultValues,
-                            f
-                              .select as
-                                | NonEmptyReadonlyArray<string | { key: string; subKeys: readonly string[] }>
-                                | undefined,
-                            f
-                              .order as NonEmptyReadonlyArray<{ key: string; direction: "ASC" | "DESC" }> | undefined,
-                            f
-                              .skip,
-                            f
-                              .limit
-                          )
-                          const hasWhere = q
-                            .sql
-                            .includes("WHERE")
-                          const nsSql = hasWhere
-                            ? q
-                              .sql
-                              .replace("WHERE", `WHERE _namespace = ? AND`)
-                            : q
-                              .sql
-                              .replace(
-                                `FROM "${tableName}"`,
-                                `FROM "${tableName}" WHERE _namespace = ?`
-                              )
-                          return {
-                            sql: nsSql,
-                            params: [
-                              ns,
-                              ...q
-                                .params
-                            ]
-                          }
-                        })
-                        .pipe(
-                          Effect
-                            .tap((q) =>
-                              logQuery(q)
-                            ),
-                          Effect.flatMap((q) =>
-                            exec(q.sql, q.params).pipe(
-                              Effect.map((rows) => {
-                                if (f.select) {
-                                  return (rows as any[]).map((r) => {
-                                    const selected = parseSelectRow(r, idKey)
-                                    return {
-                                      ...Struct.pick(
-                                        defaultValues as any,
-                                        f.select!.filter((_) => typeof _ === "string") as never[]
-                                      ),
-                                      ...selected
-                                    } as M
-                                  })
-                                }
-                                return (rows as any[]).map((r) =>
-                                  parseRow<Encoded>(r, idKey, defaultValues) as any as M
-                                )
-                              })
+                        .tap((q) => logQuery(q)),
+                      Effect.tap((q) => Effect.annotateCurrentSpan({ "db.query.text": q.sql })),
+                      Effect.flatMap((q) =>
+                        exec(q.sql, q.params).pipe(
+                          Effect.flatMap((rows) => {
+                            if (f.select) {
+                              return Effect.succeed((rows as any[]).map((r) => {
+                                const selected = parseSelectRow(r, idKey)
+                                return {
+                                  ...Struct.pick(
+                                    defaultValues as any,
+                                    f.select!.filter((_) => typeof _ === "string") as never[]
+                                  ),
+                                  ...selected
+                                } as M
+                              }))
+                            }
+                            return Effect.map(
+                              Effect.fromResult(decodeStoredMany(rows as any[], decodeRow)),
+                              (decoded) => decoded as any as M[]
                             )
-                          ),
-                          Effect.withSpan("SQL.filter [effect-app/infra/Store]", {
-                            attributes: { "repository.table_name": tableName, "repository.model_name": name }
-                          }, { captureStackTrace: false })
+                          })
                         )
-                    ))
-              },
-
-              set: (e) =>
-                resolveAndSeed.pipe(Effect.flatMap((ns) =>
-                  setInternal(e, ns).pipe(
-                    Effect.withSpan("SQL.set [effect-app/infra/Store]", {
-                      attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
-                    }, { captureStackTrace: false })
-                  )
-                )),
-
-              batchSet: (items) =>
-                resolveAndSeed.pipe(Effect.flatMap((ns) =>
-                  bulkSetInternal(items, ns).pipe(
-                    Effect.withSpan("SQL.batchSet [effect-app/infra/Store]", {
-                      attributes: { "repository.table_name": tableName, "repository.model_name": name }
-                    }, { captureStackTrace: false })
-                  )
-                )),
-
-              bulkSet: (items) =>
-                resolveAndSeed.pipe(Effect.flatMap((ns) =>
-                  bulkSetInternal(items, ns).pipe(
-                    Effect.withSpan("SQL.bulkSet [effect-app/infra/Store]", {
-                      attributes: { "repository.table_name": tableName, "repository.model_name": name }
-                    }, { captureStackTrace: false })
-                  )
-                )),
-
-              batchRemove: (ids) => {
-                const placeholders = ids.map(() => "?").join(", ")
-                return resolveAndSeed.pipe(Effect.flatMap((ns) =>
-                  exec(
-                    `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ?`,
-                    [...ids, ns]
-                  )
-                    .pipe(
-                      Effect.asVoid,
-                      Effect.withSpan("SQL.batchRemove [effect-app/infra/Store]", {
-                        attributes: { "repository.table_name": tableName, "repository.model_name": name }
-                      }, { captureStackTrace: false })
+                      ),
+                      annotateDb({
+                        operation: "filter",
+                        system,
+                        collection: tableName,
+                        namespace: ns,
+                        entity: name
+                      })
                     )
                 ))
-              },
-
-              queryRaw: (query) =>
-                s.all.pipe(
-                  Effect.map(query.memory),
-                  Effect.withSpan("SQL.queryRaw [effect-app/infra/Store]", {
-                    attributes: { "repository.table_name": tableName, "repository.model_name": name }
-                  }, { captureStackTrace: false })
+          },
+
+          set: (e) =>
+            resolveNamespace.pipe(Effect.flatMap((ns) =>
+              setInternal(e, ns).pipe(
+                annotateDb({
+                  operation: "set",
+                  system,
+                  collection: tableName,
+                  namespace: ns,
+                  entity: name,
+                  extra: { "app.entity.id": e[idKey] }
+                })
+              )
+            )),
+
+          batchSet: (items) =>
+            resolveNamespace.pipe(Effect.flatMap((ns) =>
+              bulkSetInternal(items, ns).pipe(
+                annotateDb({
+                  operation: "batchSet",
+                  system,
+                  collection: tableName,
+                  namespace: ns,
+                  entity: name
+                })
+              )
+            )),
+
+          bulkSet: (items) =>
+            resolveNamespace.pipe(Effect.flatMap((ns) =>
+              bulkSetInternal(items, ns).pipe(
+                annotateDb({
+                  operation: "bulkSet",
+                  system,
+                  collection: tableName,
+                  namespace: ns,
+                  entity: name
+                })
+              )
+            )),
+
+          batchRemove: (ids) => {
+            const placeholders = ids.map(() => "?").join(", ")
+            return resolveNamespace.pipe(Effect.flatMap((ns) => {
+              const sqlText = `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ?`
+              return exec(sqlText, [...ids, ns])
+                .pipe(
+                  Effect.asVoid,
+                  annotateDb({
+                    operation: "batchRemove",
+                    system,
+                    collection: tableName,
+                    namespace: ns,
+                    entity: name,
+                    query: sqlText
+                  })
+                )
+            }))
+          },
+
+          queryRaw: (query) =>
+            allStored.pipe(
+              Effect.map(query.memory),
+              annotateDb({
+                operation: "queryRaw",
+                system,
+                collection: tableName,
+                entity: name
+              })
+            )
+        }
+
+        // Eagerly seed primary namespace on initialization. A seed failure at
+        // construction is fatal (orDie); the per-call `seedNamespace` still
+        // surfaces DatabaseError to callers.
+        yield* seedNamespace("primary").pipe(Effect.orDie)
+
+        return s
+      })
+    }
+  })
+}
+
+type WithNsSqlFn = <A, E2, R2>(
+  ns: string,
+  f: (sql: SqlClient.SqlClient) => Effect.Effect<A, E2, R2>
+) => Effect.Effect<A, E2, R2>
+
+function makeSQLiteStorePerNs(
+  withNsSql: WithNsSqlFn,
+  { prefix }: StorageConfig
+) {
+  return {
+    make: Effect.fnUntraced(function*<IdKey extends keyof Encoded, Encoded extends FieldValues, R = never, E = never>(
+      name: string,
+      idKey: IdKey,
+      seed?: Effect.Effect<Iterable<Encoded>, E, R>,
+      config?: StoreConfig<Encoded>
+    ) {
+      type PM = PersistenceModelType<Encoded>
+      const tableName = `${prefix}${name}`
+      const json = makeJsonLower(config)
+      const defaultValues = json.toJson(config?.defaultValues ?? {}) as Partial<Encoded>
+      const codec = makeJsonDocumentCodec<Encoded>(config?.schema)
+      // read path: stored JSON -> defaultValues -> jitM -> JSON→Encoded decode
+      const decodeStored = makeStoredDecode<Encoded>(config?.schema, config?.jitM)
+      const decodeRow = (row: { id: string; _etag: string | null; data: string }) =>
+        decodeStored(parseRow<Encoded>(row, idKey, defaultValues))
+
+      const resolveNamespace = !config?.allowNamespace
+        ? Effect.succeed("primary")
+        : storeId.pipe(Effect.map((namespace) => {
+          if (namespace !== "primary" && !config.allowNamespace!(namespace)) {
+            throw new Error(`Namespace ${namespace} not allowed!`)
+          }
+          return namespace
+        }))
+
+      const toRow = (e: PM) => {
+        const newE = makeETag(codec.encode(e))
+        const id = newE[idKey] as string
+        const { _etag, [idKey]: _id, ...rest } = newE as any
+        const data = JSON.stringify(rest)
+        return { id, _etag: newE._etag!, data, item: codec.decode(newE) }
+      }
+
+      const exec = (ns: string, query: string, params?: readonly unknown[]) =>
+        withNsSql(ns, (sql) => sql.unsafe(query, params as any).pipe(Effect.mapError(toDatabaseError)))
+
+      const ensureTable = (ns: string) =>
+        withNsSql(ns, (sql) =>
+          sql
+            .unsafe(
+              `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`
+            )
+            .pipe(
+              Effect.andThen(
+                sql.unsafe(
+                  `CREATE TABLE IF NOT EXISTS "_migrations" (id TEXT NOT NULL, version TEXT NOT NULL, PRIMARY KEY (id, version))`
                 )
+              ),
+              Effect.orDie,
+              Effect.asVoid
+            ))
+
+      const setInternal = Effect.fnUntraced(function*(e: PM, ns: string) {
+        const row = toRow(e)
+        if (e._etag) {
+          yield* exec(
+            ns,
+            `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ?`,
+            [row._etag, row.data, row.id, e._etag]
+          )
+          const existing = yield* exec(
+            ns,
+            `SELECT _etag FROM "${tableName}" WHERE id = ?`,
+            [row.id]
+          )
+          const current = (existing as any[])[0]
+          if (!current || current._etag !== row._etag) {
+            if (current) {
+              return yield* new OptimisticConcurrencyException({
+                type: name,
+                id: row.id,
+                current: current._etag,
+                found: e._etag,
+                code: 412
+              })
             }
+            return yield* new OptimisticConcurrencyException({
+              type: name,
+              id: row.id,
+              current: "",
+              found: e._etag,
+              code: 404
+            })
+          }
+        } else {
+          yield* exec(
+            ns,
+            `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`,
+            [row.id, row._etag, row.data]
+          )
+        }
+        return row.item
+      })
 
-            // Eagerly seed primary namespace on initialization
-            yield* seedNamespace("primary")
+      const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
+        withNsSql(ns, (sql) =>
+          sql
+            .withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
+            .pipe(
+              Effect.mapError(preserveStoreError),
+              Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>)
+            ))
 
-            return s
-          })
+      const ctx = yield* Effect.context<R>()
+      const seedCache = new Map<string, Effect.Effect<void, DatabaseError>>()
+      const makeSeedEffect = Effect.fnUntraced(function*(ns: string) {
+        yield* ensureTable(ns)
+        if (!seed) return
+        const existing = yield* exec(
+          ns,
+          `SELECT id FROM "_migrations" WHERE id = ? AND version = ?`,
+          [tableName, tableName]
+        )
+        if ((existing as any[]).length > 0) return
+        yield* InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`)
+        const items = yield* seed.pipe(Effect.provide(ctx), Effect.orDie)
+        const ne = toNonEmptyArray([...items])
+        // Seed inserts are not concurrent; OCC here is a programming defect.
+        if (Option.isSome(ne)) {
+          yield* bulkSetInternal(ne.value, ns).pipe(
+            Effect.catchTag("OptimisticConcurrencyException", Effect.die)
+          )
+        }
+        yield* exec(
+          ns,
+          `INSERT INTO "_migrations" (id, version) VALUES (?, ?)`,
+          [tableName, tableName]
+        )
+      })
+      const seedNamespace = (ns: string) => {
+        let cached = seedCache.get(ns)
+        if (!cached) {
+          cached = Effect.cached(Effect.uninterruptible(makeSeedEffect(ns))).pipe(Effect.runSync)
+          seedCache.set(ns, cached)
+        }
+        return cached
       }
+
+      const selectAllSql = `SELECT id, _etag, data FROM "${tableName}"`
+      const allStored = resolveNamespace.pipe(
+        Effect.flatMap((ns) =>
+          exec(ns, selectAllSql).pipe(
+            Effect.map((rows) => (rows as any[]).map((row) => parseRow<Encoded>(row, idKey, defaultValues)))
+          )
+        )
+      )
+
+      const s: Store<IdKey, Encoded> = {
+        seedNamespace: (ns) => seedNamespace(ns),
+
+        all: resolveNamespace.pipe(Effect.flatMap((ns) => {
+          return exec(ns, selectAllSql)
+            .pipe(
+              Effect.flatMap((rows) => Effect.fromResult(decodeStoredMany(rows as any[], decodeRow))),
+              annotateDb({
+                operation: "all",
+                system: "sqlite",
+                collection: tableName,
+                namespace: ns,
+                entity: name,
+                query: selectAllSql
+              })
+            )
+        })),
+
+        find: (id) =>
+          resolveNamespace.pipe(
+            Effect.flatMap((ns) => {
+              const sqlText = `SELECT id, _etag, data FROM "${tableName}" WHERE id = ?`
+              return exec(ns, sqlText, [id])
+                .pipe(
+                  Effect.flatMap((rows) =>
+                    Effect.fromResult(decodeStoredOption(Option.fromNullishOr((rows as any[])[0]), decodeRow))
+                  ),
+                  annotateDb({
+                    operation: "find",
+                    system: "sqlite",
+                    collection: tableName,
+                    namespace: ns,
+                    entity: name,
+                    query: sqlText,
+                    extra: { "app.entity.id": id }
+                  })
+                )
+            })
+          ),
+
+        filter: <U extends keyof Encoded = never>(f: FilterArgs<Encoded, U>) => {
+          const filter = f
+            .filter
+          type M = U extends undefined ? Encoded
+            : Pick<Encoded, U>
+          return resolveNamespace
+            .pipe(Effect
+              .flatMap((ns) =>
+                Effect
+                  .sync(() =>
+                    buildWhereSQLQuery(
+                      sqliteDialect,
+                      idKey,
+                      filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [],
+                      tableName,
+                      defaultValues,
+                      f
+                        .select as
+                          | NonEmptyReadonlyArray<
+                            string | {
+                              key: string
+                              subKeys: readonly string[]
+                            } | {
+                              key: string
+                              computed: ComputedProjectionIrExpression
+                            }
+                          >
+                          | undefined,
+                      f
+                        .order as NonEmptyReadonlyArray<{ key: string; direction: "ASC" | "DESC" }> | undefined,
+                      f
+                        .skip,
+                      f
+                        .limit,
+                      undefined,
+                      json
+                    )
+                  )
+                  .pipe(
+                    Effect
+                      .tap((q) => logQuery(q)),
+                    Effect.tap((q) => Effect.annotateCurrentSpan({ "db.query.text": q.sql })),
+                    Effect.flatMap((q) =>
+                      exec(ns, q.sql, q.params).pipe(
+                        Effect.flatMap((rows) => {
+                          if (f.select) {
+                            return Effect.succeed((rows as any[]).map((r) => {
+                              const selected = parseSelectRow(r, idKey)
+                              return {
+                                ...Struct.pick(
+                                  defaultValues as any,
+                                  f.select!.filter((_) => typeof _ === "string") as never[]
+                                ),
+                                ...selected
+                              } as M
+                            }))
+                          }
+                          return Effect.map(
+                            Effect.fromResult(decodeStoredMany(rows as any[], decodeRow)),
+                            (decoded) => decoded as any as M[]
+                          )
+                        })
+                      )
+                    ),
+                    annotateDb({
+                      operation: "filter",
+                      system: "sqlite",
+                      collection: tableName,
+                      namespace: ns,
+                      entity: name
+                    })
+                  )
+              ))
+        },
+
+        set: (e) =>
+          resolveNamespace.pipe(Effect.flatMap((ns) =>
+            setInternal(e, ns).pipe(
+              annotateDb({
+                operation: "set",
+                system: "sqlite",
+                collection: tableName,
+                namespace: ns,
+                entity: name,
+                extra: { "app.entity.id": e[idKey] }
+              })
+            )
+          )),
+
+        batchSet: (items) =>
+          resolveNamespace.pipe(Effect.flatMap((ns) =>
+            bulkSetInternal(items, ns).pipe(
+              annotateDb({
+                operation: "batchSet",
+                system: "sqlite",
+                collection: tableName,
+                namespace: ns,
+                entity: name
+              })
+            )
+          )),
+
+        bulkSet: (items) =>
+          resolveNamespace.pipe(Effect.flatMap((ns) =>
+            bulkSetInternal(items, ns).pipe(
+              annotateDb({
+                operation: "bulkSet",
+                system: "sqlite",
+                collection: tableName,
+                namespace: ns,
+                entity: name
+              })
+            )
+          )),
+
+        batchRemove: (ids) => {
+          const placeholders = ids.map(() => "?").join(", ")
+          return resolveNamespace.pipe(Effect.flatMap((ns) => {
+            const sqlText = `DELETE FROM "${tableName}" WHERE id IN (${placeholders})`
+            return exec(ns, sqlText, [...ids])
+              .pipe(
+                Effect.asVoid,
+                annotateDb({
+                  operation: "batchRemove",
+                  system: "sqlite",
+                  collection: tableName,
+                  namespace: ns,
+                  entity: name,
+                  query: sqlText
+                })
+              )
+          }))
+        },
+
+        queryRaw: (query) =>
+          allStored.pipe(
+            Effect.map(query.memory),
+            annotateDb({
+              operation: "queryRaw",
+              system: "sqlite",
+              collection: tableName,
+              entity: name
+            })
+          )
+      }
+
+      yield* seedNamespace("primary").pipe(Effect.orDie)
+
+      return s
     })
+  }
 }
 
-export function SQLiteStoreLayer(cfg: StorageConfig) {
+export function SQLiteStoreLayer(
+  cfg: StorageConfig,
+  options?: { makeSqlClientLayer?: (namespace: string) => Layer.Layer<SqlClient.SqlClient> }
+) {
+  if (options?.makeSqlClientLayer) {
+    return Layer.effectContext(
+      Effect.gen(function*() {
+        const layerMap = yield* LayerMap.make(
+          (namespace: string) => options.makeSqlClientLayer!(namespace),
+          { idleTimeToLive: "10 minutes" }
+        )
+
+        const withNsSql: WithNsSqlFn = (ns, f) => SqlClient.SqlClient.use(f).pipe(Effect.provide(layerMap.get(ns)))
+
+        const storeMaker = makeSQLiteStorePerNs(withNsSql, cfg)
+
+        const withTransaction: WithNsTransactionFn = (effect) =>
+          storeId.pipe(
+            Effect.flatMap((ns) => withNsSql(ns, (sql) => sql.withTransaction(effect).pipe(Effect.orDie)))
+          )
+
+        return StoreMaker.context(storeMaker).pipe(
+          Context.add(WithNsTransaction, withTransaction)
+        )
+      })
+    )
+  }
   return StoreMaker
-    .toLayer(makeSQLStoreInt(sqliteDialect, "JSON")(cfg))
+    .toLayer(makeSQLStoreInt("sqlite", sqliteDialect, "JSON")(cfg))
 }