@c9up/atlas 0.1.19 → 0.2.0

package/dist/BaseRepository.js

@@ -4,14 +4,17 @@
  * @implements FR29, FR31, FR35
  */
 import { randomUUID } from "node:crypto";
+import { DateTime } from "@c9up/chronos";
+import { dateTimeAtlasAdapter } from "@c9up/chronos/atlas";
 import { REPO_REF } from "./BaseEntity.js";
-import { getColumnMetadata, getDateColumnConfig, getEntityMetadata, getPrimaryKey, getPrimaryKeyGenerator, getRelationMetadata, hasSoftDeletes, } from "./decorators/entity.js";
+import { ensureEntityMetadata, getColumnMetadata, getDateColumnConfig, getPrimaryKey, getPrimaryKeyGenerator, getRelationMetadata, hasSoftDeletes, } from "./decorators/entity.js";
 import { fireHooks } from "./decorators/hooks.js";
 import { AtlasError, EntityNotFoundError } from "./errors.js";
-import { ModelQuery, runWithAtlasInternalBypass } from "./ModelQuery.js";
+import { isAtlasStrictMode, ModelQuery } from "./ModelQuery.js";
 import { compileStatementNative, getAtlasDialect, registerColumnCast, registerTableCasts, } from "./query/native.js";
 import { transaction } from "./Transaction.js";
 import { camelToSnake, snakeToCamel } from "./utils/casing.js";
+import { isTransactionClient } from "./utils/transactionBrand.js";
 /**
  * Coerce a `lastInsertRowid` to a JS number when it fits, leaving large
  * mysql/sqlite values as bigint so callers don't silently lose precision.
@@ -90,10 +93,16 @@ const POSTGRES_CAST_TYPES = new Set([
  */
 export function computeCastTypes(entityClass) {
     const out = {};
+    // Resolve each property to its real DB column, honouring `@Column({ columnName })`
+    // — the cast MUST key off the column name that actually appears in the SQL.
+    const dbNameOf = new Map();
+    for (const col of getColumnMetadata(entityClass)) {
+        dbNameOf.set(col.propertyKey, col.columnName ?? camelToSnake(col.propertyKey));
+    }
     for (const col of getColumnMetadata(entityClass)) {
         const t = col.type?.toLowerCase();
         if (t && POSTGRES_CAST_TYPES.has(t)) {
-            out[camelToSnake(col.propertyKey)] = t;
+            out[dbNameOf.get(col.propertyKey) ?? camelToSnake(col.propertyKey)] = t;
         }
     }
     // `@column.date()` / `@column.dateTime()` columns are tracked in a SEPARATE
@@ -105,11 +114,14 @@ export function computeCastTypes(entityClass) {
     // expression is of type text`. An explicit recognized `col.type` already set
     // in the loop above wins via `??=`.
     for (const [prop, cfg] of Object.entries(getDateColumnConfig(entityClass))) {
-        out[camelToSnake(prop)] ??= cfg.dateOnly ? "date" : "timestamp";
+        out[dbNameOf.get(prop) ?? camelToSnake(prop)] ??= cfg.dateOnly
+            ? "date"
+            : "timestamp";
     }
     // A uuid-strategy primary key is generated app-side as a string.
     if (getPrimaryKeyGenerator(entityClass) === "uuid") {
-        out[camelToSnake(getPrimaryKey(entityClass) ?? "id")] ??= "uuid";
+        const pk = getPrimaryKey(entityClass) ?? "id";
+        out[dbNameOf.get(pk) ?? camelToSnake(pk)] ??= "uuid";
     }
     return out;
 }
@@ -121,7 +133,8 @@ export class BaseRepository {
     #db;
     #softDeletes;
     #validColumns;
-    #columnMap; // camelCase → snake_case (cached)
+    #columnMap; // property/db name → resolved db column (cached)
+    #columnByDbName; // resolved db column → property (for hydrate)
     #dateColumns;
     /** Snake column → logical type for params needing a Postgres `::cast`. */
     #castTypes;
@@ -148,6 +161,14 @@ export class BaseRepository {
     #dialect;
     /** Callback to dispatch domain events (set by framework integration). */
     onDomainEvents;
+    /**
+     * The durable (non-transactional) repo a `useTransaction(trx)` copy was forked
+     * from. Lucid resets a model's `$trx` on commit AND rollback, so after a manual
+     * transaction ends every entity persisted through the trx-bound repo must have
+     * its REPO_REF re-pointed here — otherwise related()/refresh() run on a finished
+     * transaction. Undefined on a durable repo (it IS the durable parent).
+     */
+    #durableParent;
     constructor(entityClass, db, options) {
         this.#entityClass = entityClass;
         if (db == null) {
@@ -162,12 +183,10 @@ export class BaseRepository {
         // Dialect resolution order: explicit option > connection.dialect > process default.
         const connDialect = db.dialect;
         this.#dialect = options?.dialect ?? connDialect ?? getAtlasDialect();
-        const meta = getEntityMetadata(entityClass);
-        if (!meta) {
-            throw new AtlasError("NOT_ENTITY", `Class '${entityClass.name}' is not decorated with @Entity()`, {
-                hint: "Add @Entity('table_name') decorator to the class.",
-            });
-        }
+        // Infer the table name (naming strategy / `static table`) when @Entity is
+        // absent — AdonisJS Lucid parity, shared with BaseModel via one helper so
+        // the Data-Mapper and Active-Record paths agree on the convention.
+        const meta = ensureEntityMetadata(entityClass);
         this.#tableName = meta.tableName;
         this.#primaryKey = getPrimaryKey(entityClass) ?? "id";
         const columnsMeta = getColumnMetadata(entityClass);
@@ -194,16 +213,31 @@ export class BaseRepository {
         // time, before any repository for that entity is instantiated.
         this.#validColumns = new Set();
         this.#columnMap = new Map();
-        for (const col of this.#columns) {
-            const snake = camelToSnake(col);
-            this.#validColumns.add(col);
-            this.#validColumns.add(snake);
-            this.#columnMap.set(col, snake);
-            this.#columnMap.set(snake, snake);
+        this.#columnByDbName = new Map();
+        for (const col of columnsMeta) {
+            const prop = col.propertyKey;
+            // Explicit `@Column({ columnName })` wins over the snake_case convention.
+            const db = col.columnName ?? camelToSnake(prop);
+            this.#validColumns.add(prop);
+            this.#validColumns.add(db);
+            this.#columnMap.set(prop, db);
+            this.#columnMap.set(db, db);
+            // Reverse map for hydration — a DB row keyed by the real column name maps
+            // back to the TS property (covers explicit overrides AND the default,
+            // where `snakeToCamel(db)` would otherwise mis-resolve an override).
+            this.#columnByDbName.set(db, prop);
         }
+        // PK is registered as a column too (via @PrimaryKey → Column), so the loop
+        // above already mapped it, honouring any columnName. Fall back for the rare
+        // PK declared outside the column metadata.
         this.#validColumns.add(this.#primaryKey);
-        this.#validColumns.add(camelToSnake(this.#primaryKey));
-        this.#columnMap.set(this.#primaryKey, camelToSnake(this.#primaryKey));
+        if (!this.#columnMap.has(this.#primaryKey)) {
+            const pkDb = camelToSnake(this.#primaryKey);
+            this.#validColumns.add(pkDb);
+            this.#columnMap.set(this.#primaryKey, pkDb);
+            this.#columnMap.set(pkDb, pkDb);
+            this.#columnByDbName.set(pkDb, this.#primaryKey);
+        }
         // Postgres cast hints: sqlx binds JS strings as `text`, which Postgres
         // won't coerce to timestamp/uuid/date. See `computeCastTypes`.
         this.#castTypes = computeCastTypes(entityClass);
@@ -226,7 +260,9 @@ export class BaseRepository {
                 // FK lives on THIS table, references the related (owner) PK.
                 const fk = rel.foreignKey ?? `${camelToSnake(related.name)}_id`;
                 const ownerKey = rel.ownerKey ?? getPrimaryKey(related) ?? "id";
-                const cast = computeCastTypes(related)[camelToSnake(ownerKey)];
+                const ownerDb = getColumnMetadata(related).find((c) => c.propertyKey === ownerKey)
+                    ?.columnName ?? camelToSnake(ownerKey);
+                const cast = computeCastTypes(related)[ownerDb];
                 if (cast)
                     registerColumnCast(this.#tableName, fk, cast);
             }
@@ -234,9 +270,13 @@ export class BaseRepository {
                 // hasOne / hasMany: FK lives on the RELATED table, references THIS PK.
                 const fk = rel.foreignKey ?? `${camelToSnake(entityClass.name)}_id`;
                 const localKey = rel.localKey ?? this.#primaryKey;
-                const cast = this.#castTypes[camelToSnake(localKey)];
-                const relatedMeta = getEntityMetadata(related);
-                if (cast && relatedMeta) {
+                const cast = this.#castTypes[this.#dbColumn(localKey)];
+                // Boot the related model on demand (Lucid lazy-boot): a related model
+                // with only `static table` (no @Entity yet) would otherwise miss its FK
+                // cast → a uuid FK relation query compiles without `::uuid` and breaks on
+                // Postgres. Mirrors relatedProxy / the preload paths.
+                const relatedMeta = ensureEntityMetadata(related);
+                if (cast) {
                     registerColumnCast(relatedMeta.tableName, fk, cast);
                 }
             }
@@ -255,9 +295,26 @@ export class BaseRepository {
             hint: `Valid columns: ${this.#columns.join(", ")}`,
         });
     }
+    /**
+     * Resolve a KNOWN property (from `this.#columns`) to its real DB column name,
+     * honouring `@Column({ columnName })`. Non-throwing — used on the write path
+     * where the column set is already trusted. Falls back to the snake convention.
+     */
+    #dbColumn(prop) {
+        return this.#columnMap.get(prop) ?? camelToSnake(prop);
+    }
+    /**
+     * Normalise a mass-assignment key to its TS property. A payload may key by the
+     * DB column name (incl. an explicit `columnName`); without this, `create({
+     * full_label: 'x' })` would set a `full_label` property that the INSERT (which
+     * reads declared properties) then drops silently.
+     */
+    #toProperty(key) {
+        return this.#columnByDbName.get(key) ?? key;
+    }
     // ─── Query builder ────────────────────────────────────────
     query() {
-        return new ModelQuery(this.#tableName, this.#db, (row) => this.#hydrate(row), this.#entityClass, (col) => this.#resolveColumn(col), this.#softDeletes, this.#dialect);
+        return new ModelQuery(this.#tableName, this.#db, (row) => this.#hydrate(row), this.#entityClass, (col) => this.#resolveColumn(col), this.#softDeletes, this.#dialect, (prop, value) => this.#applyPrepare(prop, value), this.onDomainEvents);
     }
     // ─── Transaction ──────────────────────────────────────────
     useTransaction(trx) {
@@ -270,6 +327,9 @@ export class BaseRepository {
             dialect: this.#dialect,
         });
         repo.onDomainEvents = this.onDomainEvents;
+        // Chain back to the true durable root (a nested useTransaction forwards it)
+        // so post-transaction REPO_REF restoration always lands on a live connection.
+        repo.#durableParent = this.#durableParent ?? this;
         return repo;
     }
     // ─── Finders ──────────────────────────────────────────────
@@ -293,17 +353,27 @@ export class BaseRepository {
         }
         return entity;
     }
-    async findBy(column, value) {
+    async findBy(columnOrClause, value) {
         // Through the builder for read-hook parity (see `find`).
-        return this.query().where(column, value).first();
+        let q = this.query();
+        if (typeof columnOrClause === "string") {
+            q = q.where(columnOrClause, value);
+        }
+        else {
+            for (const [k, v] of Object.entries(columnOrClause))
+                q = q.where(k, v);
+        }
+        return q.first();
     }
-    /** Find by a column or throw `EntityNotFoundError` (AdonisJS `findByOrFail`). */
-    async findByOrFail(column, value) {
-        const entity = await this.findBy(column, value);
+    async findByOrFail(columnOrClause, value) {
+        const entity = typeof columnOrClause === "string"
+            ? await this.findBy(columnOrClause, value)
+            : await this.findBy(columnOrClause);
         if (!entity) {
-            throw new EntityNotFoundError(this.#entityClass.name, {
-                [column]: value,
-            });
+            const criteria = typeof columnOrClause === "string"
+                ? { [columnOrClause]: value }
+                : columnOrClause;
+            throw new EntityNotFoundError(this.#entityClass.name, criteria);
         }
         return entity;
     }
@@ -316,11 +386,16 @@ export class BaseRepository {
             .orderBy(this.#primaryKey, "desc")
             .exec();
     }
-    /** Find many rows by an arbitrary column (AdonisJS `findManyBy`). */
-    async findManyBy(column, values) {
-        if (values.length === 0)
-            return [];
-        return this.query().whereIn(column, values).exec();
+    async findManyBy(columnOrClause, values) {
+        if (typeof columnOrClause === "string") {
+            if (!values || values.length === 0)
+                return [];
+            return this.query().whereIn(columnOrClause, values).exec();
+        }
+        let q = this.query();
+        for (const [k, v] of Object.entries(columnOrClause))
+            q = q.where(k, v);
+        return q.exec();
     }
     async all() {
         // Through the builder so beforeFetch/afterFetch fire. The builder applies
@@ -328,6 +403,32 @@ export class BaseRepository {
         // Ordered PK desc for AdonisJS Lucid `all()` parity (newest first).
         return this.query().orderBy(this.#primaryKey, "desc").exec();
     }
+    /**
+     * Empty this model's table (AdonisJS Lucid `Model.truncate`). Postgres/MySQL
+     * issue `TRUNCATE TABLE` (fast, resets identity); SQLite has no TRUNCATE so it
+     * falls back to `DELETE FROM`. `cascade` is Postgres-only (truncates dependent
+     * FK tables). The table name comes from entity metadata — never user input.
+     */
+    async truncate(cascade = false) {
+        // Quote each dotted segment so a schema-qualified table (`reporting.events`)
+        // becomes `"reporting"."events"`, not one dotted identifier that TRUNCATEs
+        // the wrong (nonexistent) table. Validate each segment even though the table
+        // name is app metadata: a bulletproof ORM must never emit malformed/injectable
+        // raw SQL from a `static table = 'x"; DROP…'` slip (same policy as qTable).
+        const wrap = (seg) => {
+            if (!/^[A-Za-z0-9_]+$/.test(seg)) {
+                throw new Error(`Unsafe table identifier: '${seg}'`);
+            }
+            return this.#dialect === "mysql" ? `\`${seg}\`` : `"${seg}"`;
+        };
+        const quoted = this.#tableName.split(".").map(wrap).join(".");
+        if (this.#dialect === "sqlite") {
+            await this.#db.query(`DELETE FROM ${quoted}`, []);
+            return;
+        }
+        const suffix = cascade && this.#dialect === "postgres" ? " CASCADE" : "";
+        await this.#db.query(`TRUNCATE TABLE ${quoted}${suffix}`, []);
+    }
     async allWithTrashed() {
         return this.query().withTrashed().exec();
     }
@@ -337,40 +438,50 @@ export class BaseRepository {
         return this.query().onlyTrashed().exec();
     }
     async where(column, value) {
-        // Order by the primary key (DESC = most recent insert first when the PK is
-        // an auto-increment integer or a monotonic UUID). The ordering contract is
-        // "most recent first by PK" for `repo.where(col, val)` as a convenience
-        // finder. Through the builder for read-hook parity (see `find`).
-        return this.query()
-            .where(column, value)
-            .orderBy(this.#primaryKey, "desc")
-            .exec();
+        // No implicit ORDER BY — the row order is left to the database, matching
+        // Lucid's query-builder `where` (only `all`/`findMany` order by PK desc,
+        // which Lucid itself does). Add `.orderBy()` explicitly when order matters.
+        // Through the builder for read-hook parity (see `find`).
+        return this.query().where(column, value).exec();
     }
     // ─── Create / Save / Delete ───────────────────────────────
     /**
-     * Build an entity from a plain object and persist it. Fires `beforeSave` →
-     * `beforeCreate` → INSERT → `afterCreate` → `afterSave`.
+     * Build an entity from a plain object and persist it. Fires `beforeCreate` →
+     * `beforeSave` → INSERT → `afterCreate` → `afterSave` (AdonisJS/Lucid order:
+     * the specific hook runs before the general `beforeSave`).
      */
-    async create(data) {
+    async create(data, quiet = false) {
         const entity = new this.#entityClass();
         for (const [key, value] of Object.entries(data)) {
             if (this.#validColumns.has(key) ||
                 this.#validColumns.has(camelToSnake(key))) {
-                entity.setProp(key, value);
+                const prop = this.#toProperty(key);
+                entity.assertMassAssignable(prop);
+                entity.setProp(prop, value);
             }
         }
-        await fireHooks(this.#entityClass, "beforeSave", entity);
-        await fireHooks(this.#entityClass, "beforeCreate", entity);
+        if (!quiet) {
+            await fireHooks(this.#entityClass, "beforeCreate", entity);
+            await fireHooks(this.#entityClass, "beforeSave", entity);
+        }
         await this.#insert(entity);
-        await fireHooks(this.#entityClass, "afterCreate", entity);
-        await fireHooks(this.#entityClass, "afterSave", entity);
-        await this.#dispatchDomainEvents(entity);
+        this.#attachRepoRef(entity);
+        if (!quiet) {
+            await fireHooks(this.#entityClass, "afterCreate", entity);
+            await fireHooks(this.#entityClass, "afterSave", entity);
+        }
+        await this.#dispatchOrDefer(entity, true);
         return entity;
     }
+    /** {@link create} without firing lifecycle hooks (AdonisJS Lucid `createQuietly`). */
+    createQuietly(data) {
+        return this.create(data, true);
+    }
     /**
      * Persist an entity. Insert if PK is missing or row doesn't exist, update
-     * otherwise. Fires `beforeSave` → (`beforeCreate` | `beforeUpdate`) → DB →
-     * (`afterCreate` | `afterUpdate`) → `afterSave`, then dispatches
+     * otherwise. Fires (`beforeCreate` | `beforeUpdate`) → `beforeSave` → DB →
+     * (`afterCreate` | `afterUpdate`) → `afterSave` (AdonisJS/Lucid order: the
+     * specific hook runs before the general `beforeSave`), then dispatches
      * accumulated domain events through `onDomainEvents`.
      *
      * Race-safety: the `find(pk)` → branch decision has a TOCTOU window. If a
@@ -381,19 +492,53 @@ export class BaseRepository {
      * `beforeCreate` hooks to be idempotent or move side-effects into
      * `afterCreate` / `afterSave` where they only fire on commit.
      */
-    async save(entity) {
+    async save(entity, quiet = false) {
+        // A deleted instance must not be resurrected (AdonisJS Lucid parity —
+        // `save()` throws once `$isDeleted` is set). Prevents recreating a row the
+        // caller believes is gone, or clobbering one deleted concurrently.
+        if (entity.$isDeleted) {
+            throw new AtlasError("E_MODEL_DELETED", `Cannot save a deleted ${this.#entityClass.name} instance.`, {
+                hint: "The instance was already deleted; re-fetch it before saving again.",
+            });
+        }
         const pk = entity[this.#primaryKey];
-        // Treat a present PK (including `0` and `''`) as a candidate update —
-        // `pk && ...` would route legitimate zero / empty-string keys through
-        // INSERT and double-write the row.
-        const isUpdate = isProvidedPk(pk) && (await this.find(pk)) !== null;
-        await fireHooks(this.#entityClass, "beforeSave", entity);
+        // A DB-originated entity whose PK wasn't loaded (an aggregate/alias partial
+        // projection) must NOT be treated as new — that would INSERT a duplicate.
+        // Fail loud: re-fetch it fully or use `.pojo()` for projections.
+        if (entity.$isPersisted && !isProvidedPk(pk)) {
+            throw new AtlasError("E_MISSING_PRIMARY_KEY", `Cannot save a ${this.#entityClass.name} loaded without its primary key ('${this.#primaryKey}').`, {
+                hint: "Select the primary key (plain-column projections auto-include it) or use query().pojo() for aggregate/alias projections.",
+            });
+        }
+        // Decide insert-vs-update from the in-memory `$isPersisted` flag, exactly as
+        // AdonisJS/Lucid does — NOT a `find(pk)` SELECT probe. The old probe fired the
+        // `beforeFind`/`afterFind` read hooks on every `save()` (a spurious side
+        // effect: `save()` isn't a find) and cost an extra round-trip. A brand-new
+        // entity whose manual PK collides with an existing row still resolves to an
+        // UPDATE via the unique-violation fallback below.
+        const isUpdate = entity.$isPersisted;
+        // Snapshot the domain-event queue BEFORE hooks/write add to it, so a rollback
+        // (see #dispatchOrDefer) drops only this save's events, not ones the caller
+        // queued earlier.
+        const eventFloor = entity.domainEventCount();
+        if (!quiet) {
+            // AdonisJS/Lucid order: the SPECIFIC before-hook fires first, then the
+            // general `beforeSave`, then the DB write.
+            await fireHooks(this.#entityClass, isUpdate ? "beforeUpdate" : "beforeCreate", entity);
+            await fireHooks(this.#entityClass, "beforeSave", entity);
+        }
+        // Whether THIS call inserted a brand-new row (vs updated an existing one).
+        // Drives the manual-transaction rollback restore: only a fresh INSERT's row
+        // vanishes on rollback, so only it reverts to not-persisted. The race-recovery
+        // fallback below stays false — the row pre-existed (a concurrent writer).
+        let didInsert = false;
         if (isUpdate) {
-            await this.#runUpdateBranch(entity);
+            await this.#runUpdateBranch(entity, quiet);
         }
         else {
             try {
-                await this.#runInsertBranch(entity);
+                await this.#runInsertBranch(entity, quiet);
+                didInsert = true;
             }
             catch (err) {
                 // Race recovery: the row didn't exist when we checked, but a
@@ -401,15 +546,45 @@ export class BaseRepository {
                 // was explicitly provided (auto-generated PK can't collide on
                 // a fresh insert — DB generates a unique one per call).
                 if (isProvidedPk(pk) && isUniqueKeyViolation(err)) {
-                    await this.#runUpdateBranch(entity);
+                    // We already fired `beforeCreate`; fire `beforeUpdate` too so the
+                    // update branch's contract holds (documented race quirk).
+                    if (!quiet)
+                        await fireHooks(this.#entityClass, "beforeUpdate", entity);
+                    await this.#runUpdateBranch(entity, quiet);
                 }
                 else {
                     throw err;
                 }
             }
         }
-        await fireHooks(this.#entityClass, "afterSave", entity);
-        await this.#dispatchDomainEvents(entity);
+        this.#attachRepoRef(entity);
+        if (!quiet)
+            await fireHooks(this.#entityClass, "afterSave", entity);
+        await this.#dispatchOrDefer(entity, didInsert, eventFloor);
+    }
+    /** {@link save} without firing lifecycle hooks (AdonisJS Lucid `saveQuietly`). */
+    saveQuietly(entity) {
+        return this.save(entity, true);
+    }
+    /**
+     * When true (a repo bound to an atlas-managed transaction), `create`/`save`/
+     * `createMany` BUFFER domain events on the entity instead of dispatching them
+     * inline. The managed helper flushes them only AFTER the transaction commits, so
+     * a rollback never emits events for rows that were rolled back.
+     */
+    #deferDomainEvents = false;
+    /**
+     * When set (a trx-bound repo whose owner wants to undo fresh inserts on
+     * rollback), every successful fresh INSERT through this repo pushes its entity
+     * here. The owner (a managed batch or a relation write) then reverts exactly
+     * these entities — the ones whose row provably did not exist before — to $isNew
+     * if the transaction rolls back, without a DB probe or find-vs-create bookkeeping.
+     * Undefined on a durable repo (nothing to undo — its writes are their own commit).
+     */
+    #insertTracker;
+    /** Record a fresh INSERT so its owner can revert it on rollback (see {@link #insertTracker}). */
+    #trackInsert(entity) {
+        this.#insertTracker?.push(entity);
     }
     /**
      * Flush the entity's accumulated domain events through `onDomainEvents`.
@@ -431,15 +606,61 @@ export class BaseRepository {
             }
         }
     }
-    async #runInsertBranch(entity) {
-        await fireHooks(this.#entityClass, "beforeCreate", entity);
+    /**
+     * Dispatch an entity's domain events AND restore its in-memory state across a
+     * transaction boundary, honouring the post-commit contract in EVERY context
+     * (BaseEntity documents post-commit flush):
+     *  - inside a MANAGED batch (`#inManagedTx` set `#deferDomainEvents`): skip —
+     *    that helper flushes `collect(result)` on `trx.after('commit')`, and its
+     *    callers (`#inManagedTx` re-attach / `saveMany` rollback catch) restore
+     *    REPO_REF + $isPersisted + events themselves.
+     *  - inside a MANUAL transaction (`repo.useTransaction(trx).create(...)`): the
+     *    repo's `#db` IS the trx. Register post-transaction hooks:
+     *    · commit  → re-point REPO_REF at the durable repo (Lucid resets `$trx` on
+     *      commit) then flush events (a rollback thus publishes NOTHING).
+     *    · rollback → re-point REPO_REF at the durable repo (Lucid also resets
+     *      `$trx` on rollback); revert a fresh INSERT to not-persisted — the row
+     *      never existed, and keeping `$isPersisted` would let a later
+     *      `entity.related('x').create()` skip the parent save and write a child
+     *      with a phantom FK (named data-integrity deviation vs Lucid, same class
+     *      as the saveMany rollback fix); and clear the queued domain events — they
+     *      describe a write that didn't happen, so leaving them would double-publish
+     *      on a re-save.
+     *  - no transaction: dispatch immediately.
+     */
+    async #dispatchOrDefer(entity, wasInsert, eventFloor = 0) {
+        if (this.#deferDomainEvents)
+            return;
+        if (isTransactionClient(this.#db)) {
+            const durable = this.#durableParent ?? this;
+            this.#db.after("commit", async () => {
+                durable.#attachRepoRef(entity);
+                await this.#dispatchDomainEvents(entity);
+            });
+            this.#db.after("rollback", () => {
+                durable.#attachRepoRef(entity);
+                if (wasInsert)
+                    entity.markAsNotPersisted();
+                // Drop only the events THIS write queued (from `eventFloor` on), not the
+                // ones the caller queued before entering the transaction — those describe
+                // work outside the rolled-back write and must survive.
+                entity.restoreDomainEventsTo(eventFloor);
+            });
+            return;
+        }
+        await this.#dispatchDomainEvents(entity);
+    }
+    // The specific `beforeCreate`/`beforeUpdate` hook is fired by `save()` BEFORE
+    // `beforeSave` (Lucid order), so these branches only do the write + after-hook.
+    async #runInsertBranch(entity, quiet = false) {
         await this.#insert(entity);
-        await fireHooks(this.#entityClass, "afterCreate", entity);
+        if (!quiet)
+            await fireHooks(this.#entityClass, "afterCreate", entity);
     }
-    async #runUpdateBranch(entity) {
-        await fireHooks(this.#entityClass, "beforeUpdate", entity);
+    async #runUpdateBranch(entity, quiet = false) {
         await this.#update(entity);
-        await fireHooks(this.#entityClass, "afterUpdate", entity);
+        if (!quiet)
+            await fireHooks(this.#entityClass, "afterUpdate", entity);
     }
     /**
      * Insert many rows in a single multi-row INSERT. Fires beforeSave/beforeCreate
@@ -449,26 +670,58 @@ export class BaseRepository {
      *
      * @implements Story 30.1 + 30.5
      */
-    async createMany(rows) {
+    async createMany(rows, quiet = false) {
         if (rows.length === 0)
             return [];
         const entities = rows.map((r) => {
             const e = new this.#entityClass();
             for (const [k, v] of Object.entries(r)) {
                 if (this.#validColumns.has(k) ||
-                    this.#validColumns.has(camelToSnake(k)))
-                    e.setProp(k, v);
+                    this.#validColumns.has(camelToSnake(k))) {
+                    const prop = this.#toProperty(k);
+                    e.assertMassAssignable(prop);
+                    e.setProp(prop, v);
+                }
             }
             return e;
         });
-        for (const e of entities) {
-            await fireHooks(this.#entityClass, "beforeSave", e);
-            await fireHooks(this.#entityClass, "beforeCreate", e);
+        // All-or-nothing (Lucid parity, same as saveMany): run the batch INSERT *and*
+        // its afterCreate/afterSave hooks inside ONE managed transaction, so a hook that
+        // throws rolls the whole batch back. Previously #persistFreshBatch ran the insert
+        // then the after-hooks with no surrounding transaction, so a failing after-hook
+        // left the rows committed while createMany rejected. The built entities are
+        // internal (returned only on success), so — unlike saveMany, whose instances the
+        // caller keeps — no rollback-restore of caller state is needed; the nested-under-
+        // external case is already handled by #inManagedTx's tracker.
+        return this.#inManagedTx((repo) => repo.#persistFreshBatch(entities, quiet), (result) => result);
+    }
+    /**
+     * Persist a batch of NEW entity INSTANCES: fire create/save hooks, batch-INSERT
+     * (multi-row RETURNING; mysql falls back to N inserts in one managed tx), fire
+     * the after hooks, wire the repo ref, and dispatch domain events (unless
+     * deferred). Shared by `createMany` (which builds instances from rows) and
+     * `saveMany` (which passes the CALLER's own fresh instances) so hook mutations
+     * and hook-generated domain events always land on the exact objects the caller
+     * holds — never on discarded clones.
+     */
+    async #persistFreshBatch(entities, quiet) {
+        if (entities.length === 0)
+            return [];
+        if (!quiet) {
+            for (const e of entities) {
+                await fireHooks(this.#entityClass, "beforeCreate", e);
+                await fireHooks(this.#entityClass, "beforeSave", e);
+            }
         }
         if (this.#dialect === "mysql") {
-            // mysql: loop single inserts (no RETURNING).
-            for (const e of entities)
-                await this.#insert(e);
+            // mysql has no multi-row RETURNING, so insert row-by-row — but inside a
+            // single managed transaction so the batch is all-or-nothing (Lucid parity;
+            // a mid-batch failure must not leave a partial insert committed).
+            await transaction(this.#db, async (trx) => {
+                const r = this.useTransaction(trx);
+                for (const e of entities)
+                    await r.#insert(e);
+            });
         }
         else {
             const specRows = entities.map((e) => this.#entityToRowPairs(e));
@@ -478,27 +731,43 @@ export class BaseRepository {
                 rows: specRows,
                 casts: this.#castTypes,
                 returning: [
-                    camelToSnake(this.#primaryKey),
-                    ...this.#columns.map((c) => camelToSnake(c)),
+                    this.#dbColumn(this.#primaryKey),
+                    ...this.#columns.map((c) => this.#dbColumn(c)),
                 ],
             };
             const compiled = compileStatementNative(spec, this.#dialect);
             const returned = await this.#db.query(compiled.statements[0], compiled.params);
             returned.forEach((row, i) => {
-                for (const [k, v] of Object.entries(row))
-                    entities[i].setProp(snakeToCamel(k), v);
+                for (const [k, v] of Object.entries(row)) {
+                    const prop = this.#columnByDbName.get(k) ?? snakeToCamel(k);
+                    // Run the DB value through consume so date columns come back as
+                    // Chronos DateTime (not the raw ISO string) — mirrors #hydrate.
+                    entities[i].setProp(prop, this.#applyConsume(prop, v, entities[i]));
+                }
                 entities[i].markAsPersisted();
             });
         }
-        for (const e of entities) {
-            await fireHooks(this.#entityClass, "afterCreate", e);
-            await fireHooks(this.#entityClass, "afterSave", e);
-        }
-        for (const e of entities) {
-            await this.#dispatchDomainEvents(e);
+        if (!quiet) {
+            for (const e of entities) {
+                await fireHooks(this.#entityClass, "afterCreate", e);
+                await fireHooks(this.#entityClass, "afterSave", e);
+            }
         }
+        for (const e of entities)
+            this.#attachRepoRef(e);
+        // Record the fresh inserts on THIS repo (the mysql path ran #insert on a nested
+        // trx repo, so track here uniformly for both dialects) so the owning managed
+        // batch can revert them on rollback.
+        for (const e of entities)
+            this.#trackInsert(e);
+        for (const e of entities)
+            await this.#dispatchOrDefer(e, true);
         return entities;
     }
+    /** {@link createMany} without firing lifecycle hooks (AdonisJS Lucid `createManyQuietly`). */
+    createManyQuietly(rows) {
+        return this.createMany(rows, true);
+    }
     /**
      * Persist many already-constructed entity instances. Same hooks + batching
      * as `createMany`, but accepts prebuilt entities so dirty tracking works.
@@ -508,36 +777,68 @@ export class BaseRepository {
     async saveMany(entities) {
         if (entities.length === 0)
             return [];
-        // Split new vs already-persisted; for simplicity, persist new ones as a
-        // batch and fall back to per-entity save for dirty ones.
+        // All-or-nothing, like Lucid: `createMany` and every batch helper run in a
+        // managed transaction, so a mid-batch failure rolls the WHOLE batch back
+        // (verified against the Lucid CRUD docs). Fresh inserts AND dirty updates
+        // commit together or not at all — previously the dirty ones were saved one
+        // by one OUTSIDE any transaction, leaving earlier rows persisted on a later
+        // failure. Events flush post-commit via #inManagedTx (deferred inside).
+        // #inManagedTx re-points each returned entity's REPO_REF at the durable repo
+        // after commit, so related()/refresh() work on the instances we hand back.
+        // Split BEFORE the batch so the rollback path still knows which were fresh
+        // (once #persistFreshBatch runs markAsPersisted, the flag flips). Classify by
+        // `$isPersisted`, NOT by an empty `$original`: an aggregate/alias PROJECTION is
+        // hydrated persisted but with `$original = {}`, so the old empty-$original test
+        // misrouted it into the fresh INSERT batch — bypassing save()'s
+        // E_MISSING_PRIMARY_KEY guard and turning a keyless projection into an INSERT.
+        // A persisted projection now lands in `dirty` → save() → the guard fires.
         const fresh = [];
         const dirty = [];
         for (const e of entities) {
-            if (Object.keys(e.$original ?? {}).length === 0)
+            if (!e.$isPersisted)
                 fresh.push(e);
             else
                 dirty.push(e);
         }
-        if (fresh.length > 0) {
-            const rows = fresh.map((e) => {
-                const r = {};
-                for (const c of this.#columns) {
-                    const v = e[c];
-                    if (v !== undefined)
-                        r[c] = v;
-                }
-                return r;
-            });
-            const created = await this.createMany(rows);
-            // Copy generated PKs back to the original instances.
-            created.forEach((c, i) => {
-                fresh[i].setProp(this.#primaryKey, c[this.#primaryKey]);
-                fresh[i].markAsPersisted();
-            });
+        // Snapshot each caller instance's domain-event floor BEFORE the batch, so a
+        // rollback drops only the events this batch queued, keeping any the caller
+        // queued earlier (#8).
+        const eventFloors = new Map();
+        for (const e of entities)
+            eventFloors.set(e, e.domainEventCount());
+        try {
+            return await this.#inManagedTx(async (repo) => {
+                // Persist the caller's OWN fresh instances (not clones): hook mutations
+                // and hook-generated domain events stay on the objects we return.
+                if (fresh.length > 0)
+                    await repo.#persistFreshBatch(fresh, false);
+                for (const d of dirty)
+                    await repo.save(d);
+                return entities;
+            }, (result) => result, eventFloors);
+        }
+        catch (err) {
+            // Rollback recovery. Re-point every instance's REPO_REF at the durable repo
+            // (it was stamped at the now-finished trx) — Lucid resets `$trx` the same
+            // way. And REVERT the FRESH instances to not-persisted: their INSERT was
+            // rolled back, so keeping `$isPersisted` (Lucid does) would let a later
+            // `fresh.related('x').create()` skip re-saving the parent and write a child
+            // with a phantom foreign key. Reverting only the FRESH ones (provably
+            // unpersisted before the batch) is a NAMED safety deviation; DIRTY rows
+            // keep `$isPersisted` — their row still exists with its rolled-back values.
+            for (const e of entities)
+                this.#attachRepoRef(e);
+            for (const e of fresh)
+                e.markAsNotPersisted();
+            // Drop the events THIS batch queued (from each instance's pre-batch floor):
+            // the whole batch rolled back, so those describe writes that didn't happen.
+            // Leaving them would double-publish when the caller re-saves the same
+            // instance (its hooks re-queue the event). Events queued BEFORE the batch
+            // survive (#8) — they describe work outside this rolled-back batch.
+            for (const e of entities)
+                e.restoreDomainEventsTo(eventFloors.get(e) ?? 0);
+            throw err;
         }
-        for (const d of dirty)
-            await this.save(d);
-        return entities;
     }
     /**
      * Dialect-aware upsert. postgres + sqlite emit `ON CONFLICT DO UPDATE`; mysql
@@ -568,13 +869,89 @@ export class BaseRepository {
     async firstOrCreate(search, defaults = {}) {
         // Atomic (AdonisJS Lucid parity): find-under-lock then create inside one
         // transaction, so two concurrent callers can't both miss and both INSERT.
-        return transaction(this.#db, async (trx) => {
-            const repo = this.useTransaction(trx);
+        return this.#inManagedTx(async (repo) => {
             const existing = await repo.#findBySearch(search, true);
             if (existing)
                 return existing;
             return repo.create({ ...search, ...defaults });
+        }, (r) => [r]);
+    }
+    /**
+     * Run `body` inside an atlas-managed transaction whose trx-bound repo DEFERS
+     * domain-event dispatch, then flush the collected entities' events AFTER the
+     * commit — so a rollback emits no events for rows that were rolled back
+     * (previously each create/save dispatched in-loop, before the batch committed).
+     * `collect` picks the entities whose events flush post-commit.
+     */
+    async #inManagedTx(body, collect, eventFloors) {
+        // Records every fresh INSERT the body performs through the trx-bound repo, so
+        // we can revert exactly those (not the found-and-updated rows) on rollback.
+        const freshInserts = [];
+        const result = await transaction(this.#db, async (trx) => {
+            const repo = this.useTransaction(trx);
+            repo.#deferDomainEvents = true;
+            repo.#insertTracker = freshInserts;
+            const r = await body(repo);
+            // Flush AFTER the transaction is durable. Registering on the trx (rather
+            // than awaiting after `transaction(...)` returns) is what makes this
+            // correct inside an EXTERNAL transaction: there `transaction()` only
+            // opens a SAVEPOINT, so a post-return flush would fire before the outer
+            // commit — and emit events for rows a later outer rollback discards.
+            trx.after("commit", async () => {
+                for (const e of collect(r))
+                    await this.#dispatchDomainEvents(e);
+            });
+            return r;
         });
+        // Every entity produced here was created / hydrated through the trx-bound
+        // repo, so its REPO_REF points at the (now-finished inner) transaction. Re-point
+        // it at `this` so related()/refresh()/fresh() work on the returned instance —
+        // covers firstOrCreate/updateOrCreate/*Many/saveMany.
+        const produced = collect(result);
+        for (const e of produced)
+            this.#attachRepoRef(e);
+        // When we ran NESTED inside an external transaction, `this.#db` is that outer
+        // trx and the re-attach above pointed REPO_REF at the outer-trx repo (correct
+        // while still inside it). But the inner SAVEPOINT's RELEASE is NOT durable — the
+        // root can still roll back. Lucid resets `$trx` once the transaction it was bound
+        // to resolves, either way, so re-point REPO_REF at the durable repo on BOTH the
+        // outer commit and the outer rollback; otherwise the ref dangles on a finished
+        // transaction ("transaction already finished") on any later related()/refresh().
+        // AND on rollback, revert the rows that were FRESHLY INSERTED (the tracker proves
+        // exactly which — found-and-updated rows still exist and stay persisted): keeping
+        // $isPersisted on a row that no longer exists would let a later related().create()
+        // skip re-saving the parent and orphan the FK (named data-integrity deviation, now
+        // closed for the nested managed path too — freshness is proven, no longer at Lucid
+        // parity as in the initial R21 pass).
+        if (isTransactionClient(this.#db)) {
+            const durable = this.#durableParent ?? this;
+            this.#db.after("commit", () => {
+                for (const e of produced)
+                    durable.#attachRepoRef(e);
+            });
+            this.#db.after("rollback", () => {
+                for (const e of produced) {
+                    durable.#attachRepoRef(e);
+                    // Every produced entity was written (inserted OR updated) in the
+                    // rolled-back trx, so any event THIS batch queued describes a write that
+                    // never committed — drop it (else a later re-save double-publishes: a
+                    // beforeUpdate hook on a found+updated row is the canonical trigger).
+                    // Restore to the caller's pre-batch floor so events queued BEFORE the
+                    // batch (e.g. a caller's manual addDomainEvent) survive; absent a floor
+                    // the entity was tx-internal (floor 0 = clear).
+                    e.restoreDomainEventsTo(eventFloors?.get(e) ?? 0);
+                }
+                // Fresh inserts additionally revert to $isNew — their row is gone.
+                // Found+updated rows keep $isPersisted (their row still exists).
+                // (restoreDomainEventsTo is idempotent — safe even if a fresh insert is not
+                // among `produced`, e.g. an internal side-write not returned by collect.)
+                for (const e of freshInserts) {
+                    e.markAsNotPersisted();
+                    e.restoreDomainEventsTo(eventFloors?.get(e) ?? 0);
+                }
+            });
+        }
+        return result;
     }
     /** Find a row or build an in-memory instance without persisting. */
     async firstOrNew(search, defaults = {}) {
@@ -583,24 +960,105 @@ export class BaseRepository {
             return existing;
         const e = new this.#entityClass();
         for (const [k, v] of Object.entries({ ...search, ...defaults })) {
-            if (this.#validColumns.has(k) || this.#validColumns.has(camelToSnake(k)))
-                e.setProp(k, v);
+            if (this.#validColumns.has(k) ||
+                this.#validColumns.has(camelToSnake(k))) {
+                const prop = this.#toProperty(k);
+                e.assertMassAssignable(prop);
+                e.setProp(prop, v);
+            }
         }
         return e;
     }
     /** Atomic find-or-update-or-insert (AdonisJS Lucid parity — locked + transactional). */
     async updateOrCreate(search, values) {
-        return transaction(this.#db, async (trx) => {
-            const repo = this.useTransaction(trx);
+        return this.#inManagedTx(async (repo) => {
             const existing = await repo.#findBySearch(search, true);
             if (existing) {
-                for (const [k, v] of Object.entries(values))
-                    existing.setProp(k, v);
+                for (const [k, v] of Object.entries(values)) {
+                    const prop = this.#toProperty(k);
+                    existing.assertMassAssignable(prop);
+                    existing.setProp(prop, v);
+                }
                 await repo.save(existing);
                 return existing;
             }
             return repo.create({ ...search, ...values });
-        });
+        }, (r) => [r]);
+    }
+    /** Extract the search clause (the unique key column(s)) from a row. */
+    #pickKeys(row, key) {
+        const keys = Array.isArray(key) ? key : [key];
+        const search = {};
+        for (const k of keys) {
+            // The predicate key AND the row may each be a TS property or a DB column
+            // name. Normalise both to the property so `updateOrCreateMany('label', [{
+            // full_label: 'x' }])` matches — mirrors the create() key normalization.
+            const prop = this.#toProperty(k);
+            const dbName = this.#dbColumn(prop);
+            let value;
+            if (k in row)
+                value = row[k];
+            else if (prop in row)
+                value = row[prop];
+            else
+                value = row[dbName];
+            search[prop] = value;
+        }
+        return search;
+    }
+    /**
+     * Bulk find-or-update-or-insert, keyed by a unique column (or columns), in ONE
+     * transaction — all-or-nothing (AdonisJS Lucid `updateOrCreateMany`).
+     */
+    async updateOrCreateMany(key, rows) {
+        if (rows.length === 0)
+            return [];
+        return this.#inManagedTx(async (repo) => {
+            const out = [];
+            for (const row of rows) {
+                const existing = await repo.#findBySearch(this.#pickKeys(row, key), true);
+                if (existing) {
+                    for (const [k, v] of Object.entries(row)) {
+                        const prop = this.#toProperty(k);
+                        existing.assertMassAssignable(prop);
+                        existing.setProp(prop, v);
+                    }
+                    await repo.save(existing);
+                    out.push(existing);
+                }
+                else {
+                    out.push(await repo.create(row));
+                }
+            }
+            return out;
+        }, (out) => out);
+    }
+    /**
+     * Bulk find-or-create keyed by a unique column(s) — existing rows are returned
+     * untouched — in one transaction (AdonisJS Lucid `fetchOrCreateMany`).
+     */
+    async fetchOrCreateMany(key, rows) {
+        if (rows.length === 0)
+            return [];
+        return this.#inManagedTx(async (repo) => {
+            const out = [];
+            for (const row of rows) {
+                const existing = await repo.#findBySearch(this.#pickKeys(row, key), true);
+                out.push(existing ?? (await repo.create(row)));
+            }
+            return out;
+        }, (out) => out);
+    }
+    /**
+     * Bulk find-or-new keyed by a unique column(s): existing rows are returned,
+     * misses become UNPERSISTED in-memory instances (AdonisJS `fetchOrNewUpMany`).
+     */
+    async fetchOrNewUpMany(key, rows) {
+        const out = [];
+        for (const row of rows) {
+            out.push(await this.firstOrNew(this.#pickKeys(row, key), row));
+        }
+        return out;
     }
     async #findBySearch(search, lock = false) {
         let q = this.query();
@@ -617,26 +1075,46 @@ export class BaseRepository {
      * contract — callback receives the raw value (including null/undefined) and
      * decides what to do with it.
      */
-    #applyPrepare(propertyKey, value) {
+    #applyPrepare(key, value, model) {
+        // Callers may pass a DB column name (e.g. updateWhere("starts_at", …) or a
+        // `@Column({ columnName })` column) — prepare/dateColumns are keyed by the TS
+        // property, so normalise via the reverse map first, else the adapter/date
+        // conversion is silently skipped.
+        const propertyKey = this.#columnByDbName.get(key) ?? key;
         const prepare = this.#columnPrepares.get(propertyKey);
-        if (!prepare)
-            return value;
-        let result;
-        try {
-            result = prepare(value);
+        if (prepare) {
+            let result;
+            try {
+                // Adonis Lucid signature: (value, attribute, model). `model` is
+                // undefined on query-builder paths that carry no instance.
+                result = prepare(value, propertyKey, model);
+            }
+            catch (err) {
+                throw wrapAdapterError("prepare", propertyKey, err);
+            }
+            assertNotPromise("prepare", propertyKey, result);
+            return result;
         }
-        catch (err) {
-            throw wrapAdapterError("prepare", propertyKey, err);
+        // No explicit `@Column({ prepare })`: lower a `@column.date()` /
+        // `@column.dateTime()` value to its ISO 8601 string for the SQL bind. A raw
+        // JS `Date` is accepted leniently; otherwise the Chronos adapter's prepare
+        // serialises a `DateTime` — via a STRUCTURAL check, so an instance from a
+        // duplicated `@c9up/chronos` copy (another realm) round-trips instead of
+        // being passed raw to the N-API bind.
+        if (this.#dateColumns[propertyKey] && value != null) {
+            if (value instanceof Date)
+                return value.toISOString();
+            return dateTimeAtlasAdapter.prepare(value);
         }
-        assertNotPromise("prepare", propertyKey, result);
-        return result;
+        return value;
     }
-    #applyConsume(propertyKey, value) {
+    #applyConsume(propertyKey, value, model) {
         const consume = this.#columnConsumes.get(propertyKey);
         if (consume) {
             let result;
             try {
-                result = consume(value);
+                // Adonis Lucid signature: (value, attribute, model).
+                result = consume(value, propertyKey, model);
             }
             catch (err) {
                 throw wrapAdapterError("consume", propertyKey, err);
@@ -645,18 +1123,13 @@ export class BaseRepository {
             return result;
         }
         // No explicit `@Column({ consume })`: a `@column.date()` / `@column.dateTime()`
-        // column hydrates its DB value (an ISO string from the Rust decode) into a
-        // JS `Date`, so `.getTime()` / date arithmetic work on read. Mirrors Adonis
-        // Lucid hydrating date columns to a Luxon `DateTime` — atlas standardises on
-        // the native `Date` (no Luxon dependency). An unparseable string is left
-        // untouched rather than turned into `Invalid Date`.
-        if (this.#dateColumns[propertyKey] &&
-            value != null &&
-            !(value instanceof Date) &&
-            (typeof value === "string" || typeof value === "number")) {
-            const d = new Date(value);
-            if (!Number.isNaN(d.getTime()))
-                return d;
+        // column hydrates its DB value into a Chronos `DateTime` — mirroring Adonis
+        // Lucid, which hydrates date columns to a Luxon `DateTime` (here the Ream
+        // date engine `@c9up/chronos` plays Luxon's role). The Chronos adapter's
+        // consume is idempotent and uses a structural check, so a `DateTime` from a
+        // different realm (duplicated package copy) is recognised too.
+        if (this.#dateColumns[propertyKey] && value != null) {
+            return dateTimeAtlasAdapter.consume(value);
         }
         return value;
     }
@@ -668,10 +1141,9 @@ export class BaseRepository {
             // through because that's a meaningful SQL value.
             if (v === undefined)
                 continue;
-            // Prepare map is keyed by camelCase property name. The input bag may use
-            // either camel or snake — try the raw key first, else convert.
-            const propKey = this.#columnPrepares.has(k) ? k : snakeToCamel(k);
-            pairs.push([this.#resolveColumn(k), this.#applyPrepare(propKey, v)]);
+            // `#applyPrepare` normalises the key (property / snake / columnName) via
+            // the reverse map, so pass the raw key straight through.
+            pairs.push([this.#resolveColumn(k), this.#applyPrepare(k, v)]);
         }
         return pairs;
     }
@@ -680,17 +1152,22 @@ export class BaseRepository {
         for (const col of this.#columns) {
             const v = entity[col];
             if (v !== undefined)
-                pairs.push([camelToSnake(col), this.#applyPrepare(col, v)]);
+                pairs.push([this.#dbColumn(col), this.#applyPrepare(col, v)]);
         }
         return pairs;
     }
     /** Delete the entity. Fires `beforeDelete` → DB → `afterDelete`. Soft-delete aware. */
-    async delete(entity) {
-        await fireHooks(this.#entityClass, "beforeDelete", entity);
+    async delete(entity, quiet = false) {
+        // Guard BEFORE hooks — a projection entity with no PK must not fire
+        // beforeDelete against a phantom row, then delete WHERE pk IS NULL.
+        this.#assertPersistedRow(entity, entity[this.#primaryKey], "delete()");
+        if (!quiet)
+            await fireHooks(this.#entityClass, "beforeDelete", entity);
         const pk = entity[this.#primaryKey];
         if (this.#softDeletes) {
-            const now = new Date().toISOString();
-            await this.#runUpdate([["deleted_at", now]], [{ column: this.#primaryKey, operator: "=", value: pk, type: "and" }]);
+            const now = DateTime.now();
+            await this.#runUpdate([[this.#dbColumn("deletedAt"), now.toISO()]], [{ column: this.#primaryKey, operator: "=", value: pk, type: "and" }]);
+            // In-memory value is a Chronos DateTime, matching how date columns hydrate.
             entity.setProp("deletedAt", now);
         }
         else {
@@ -698,10 +1175,17 @@ export class BaseRepository {
                 { column: this.#primaryKey, operator: "=", value: pk, type: "and" },
             ]);
         }
-        await fireHooks(this.#entityClass, "afterDelete", entity);
+        entity.markAsDeleted();
+        if (!quiet)
+            await fireHooks(this.#entityClass, "afterDelete", entity);
+    }
+    /** {@link delete} without firing lifecycle hooks (AdonisJS Lucid `deleteQuietly`). */
+    deleteQuietly(entity) {
+        return this.delete(entity, true);
     }
     /** Permanently delete (bypasses soft delete). Fires `beforeDelete` / `afterDelete` hooks. */
     async forceDelete(entity) {
+        this.#assertPersistedRow(entity, entity[this.#primaryKey], "forceDelete()");
         await fireHooks(this.#entityClass, "beforeDelete", entity);
         await this.#runDelete([
             {
@@ -711,12 +1195,14 @@ export class BaseRepository {
                 type: "and",
             },
         ]);
+        entity.markAsDeleted();
         await fireHooks(this.#entityClass, "afterDelete", entity);
     }
     async restore(entity) {
         if (!this.#softDeletes)
             return;
-        await this.#runUpdate([["deleted_at", null]], [
+        this.#assertPersistedRow(entity, entity[this.#primaryKey], "restore()");
+        await this.#runUpdate([[this.#dbColumn("deletedAt"), null]], [
             {
                 column: this.#primaryKey,
                 operator: "=",
@@ -737,7 +1223,14 @@ export class BaseRepository {
         const whereCol = this.#resolveColumn(column);
         const set = this.#buildSetPairs(data);
         await this.#runUpdate(set, [
-            { column: whereCol, operator: "=", value: columnValue, type: "and" },
+            {
+                column: whereCol,
+                operator: "=",
+                // Prepare the filter value like the query()/where() path (DateTime→ISO,
+                // @Column adapters) so updateWhere matches query().where().update().
+                value: this.#applyPrepare(column, columnValue),
+                type: "and",
+            },
         ]);
     }
     async increment(id, columnOrMap, amount = 1) {
@@ -754,6 +1247,17 @@ export class BaseRepository {
     }
     // ─── Raw ──────────────────────────────────────────────────
     async raw(sql, ...params) {
+        // Strict mode hardens the repository's raw surfaces (parity with
+        // whereRaw/joinRaw/havingRaw): `raw()` splices a whole hand-written SQL
+        // statement into the typed repo and hydrates it, so it's the widest raw
+        // entry point of all. Block it and point at the connection-level break-glass
+        // (`db.query()`/`db.execute()`, explicitly parameterised) — that stays the
+        // sanctioned, greppable escape hatch, never a silent bypass of strict mode.
+        if (isAtlasStrictMode()) {
+            throw new AtlasError("E_STRICT_MODE", `raw() is disabled in Atlas strict mode on ${this.#entityClass.name}.`, {
+                hint: "Use the typed query() builder, or db.query()/db.execute() with bound params for a deliberate break-glass query. Call setAtlasStrictMode(false) at bootstrap if you truly need repo.raw().",
+            });
+        }
         const rows = await this.#db.query(sql, params);
         return rows.map((r) => this.#hydrate(r));
     }
@@ -765,6 +1269,32 @@ export class BaseRepository {
         return this.#primaryKey;
     }
     // ─── Private helpers ──────────────────────────────────────
+    /**
+     * Guard for an op PREMISED on an existing DB row (refresh/fresh/delete/
+     * forceDelete/restore/load*). These require a genuine database row, so the
+     * entity must be `$isPersisted` — a locally-built instance with a manual PK is
+     * NOT a row: deleting/refreshing off it would silently hit an unrelated row (or
+     * none) and fire hooks against a hollow object. Mirrors Lucid, whose `refresh()`
+     * rejects a non-persisted instance and whose destructive ops always run on a
+     * loaded model; the extra strictness on delete/restore is a named safety
+     * deviation. A persisted-but-keyless entity (aggregate/alias projection) is also
+     * rejected, with the projection diagnostic.
+     */
+    #assertPersistedRow(entity, key, op, keyName = this.#primaryKey) {
+        if (!entity.$isPersisted) {
+            throw new AtlasError("E_MODEL_NOT_PERSISTED", `Cannot ${op} a ${this.#entityClass.name} that is not persisted.`, {
+                hint: "Load it from the database (find/query) first — a locally-built instance with a manual primary key is not a database row.",
+            });
+        }
+        if (!isProvidedPk(key)) {
+            // Name the ACTUAL missing key — a relation with a custom `localKey` isn't
+            // missing its primary key, it's missing that local key ('code', …).
+            const isPk = keyName === this.#primaryKey;
+            throw new AtlasError("E_MISSING_PRIMARY_KEY", `Cannot ${op} a ${this.#entityClass.name} loaded without its ${isPk ? "primary key" : "key"} ('${keyName}').`, {
+                hint: "This entity came from an aggregate/alias projection. Select the key or use query().pojo() for projections.",
+            });
+        }
+    }
     async #runDelete(wheres) {
         const compiled = compileStatementNative({ kind: "delete", table: this.#tableName, wheres }, this.#dialect);
         await this.#db.execute(compiled.statements[0], compiled.params);
@@ -804,8 +1334,8 @@ export class BaseRepository {
                 values,
                 casts: this.#castTypes,
                 returning: [
-                    camelToSnake(this.#primaryKey),
-                    ...this.#columns.map((c) => camelToSnake(c)),
+                    this.#dbColumn(this.#primaryKey),
+                    ...this.#columns.map((c) => this.#dbColumn(c)),
                 ],
             }
             : {
@@ -839,8 +1369,11 @@ export class BaseRepository {
         // callers see them on the entity without an extra `find()`. Mirrors
         // `createMany`, where the multi-row path already does this.
         if (result.row) {
-            for (const [k, v] of Object.entries(result.row))
-                entity.setProp(snakeToCamel(k), v);
+            for (const [k, v] of Object.entries(result.row)) {
+                const prop = this.#columnByDbName.get(k) ?? snakeToCamel(k);
+                // Consume so date columns hydrate to Chronos DateTime, not raw ISO.
+                entity.setProp(prop, this.#applyConsume(prop, v, entity));
+            }
         }
         else if (result.lastInsertRowid !== undefined &&
             !isProvidedPk(entity[this.#primaryKey])) {
@@ -849,6 +1382,7 @@ export class BaseRepository {
         // After a successful INSERT, the entity is now persisted — snapshot
         // its columns so subsequent dirty checks compare against the DB state.
         entity.markAsPersisted();
+        this.#trackInsert(entity);
     }
     /**
      * UPDATE the entity — emits only the dirty columns (story 32.2).
@@ -857,15 +1391,21 @@ export class BaseRepository {
      * `save()` is called defensively without any real mutation).
      */
     async #update(entity) {
-        // Auto-bump @column.dateTime({ autoUpdate: true }) BEFORE computing $dirty
-        // so the bumped column lands in the SET if anything else is dirty.
+        const forced = entity.$consumeForceUpdate();
+        const pk = entity[this.#primaryKey];
+        // Compute the REAL dirt BEFORE stamping autoUpdate, so a genuinely-clean
+        // save() is a no-op — no `updated_at` bump, no query (AdonisJS Lucid parity;
+        // stamping first would make every save() on an autoUpdate model dirty).
+        const preDirty = entity.$dirty;
+        delete preDirty[this.#primaryKey];
+        if (Object.keys(preDirty).length === 0 && !forced)
+            return; // nothing changed
+        // A real change (or a forced update) is happening — now stamp
+        // @column.dateTime({ autoUpdate: true }) so it lands in the SET.
         this.#applyAutoTimestamps(entity, "update");
         const dirty = entity.$dirty;
-        const pk = entity[this.#primaryKey];
         // Primary key is never part of the SET — it's the WHERE.
         delete dirty[this.#primaryKey];
-        if (Object.keys(dirty).length === 0)
-            return; // nothing changed
         // Map dirty camelCase keys to snake_case DB columns. `$dirty` keys are
         // already camelCase (they come from `entity.setProp` / direct assignment),
         // so the prepare lookup uses `k` as-is. Skip explicit `undefined`
@@ -875,7 +1415,18 @@ export class BaseRepository {
         for (const [k, v] of Object.entries(dirty)) {
             if (v === undefined)
                 continue;
-            setPairs.push([camelToSnake(k), this.#applyPrepare(k, v)]);
+            setPairs.push([this.#dbColumn(k), this.#applyPrepare(k, v)]);
+        }
+        // enableForceUpdate() with nothing dirty: re-persist the current non-PK
+        // column values so an UPDATE still runs (fires triggers / bumps autoUpdate).
+        if (setPairs.length === 0 && forced) {
+            for (const col of this.#columns) {
+                if (col === this.#primaryKey)
+                    continue;
+                const v = entity[col];
+                if (v !== undefined)
+                    setPairs.push([this.#dbColumn(col), this.#applyPrepare(col, v)]);
+            }
         }
         if (setPairs.length === 0) {
             // All dirty entries were `undefined` (skipped above). Re-snapshot
@@ -911,7 +1462,9 @@ export class BaseRepository {
      * on the entity before persistence. Called from `#insert` and `#update`.
      */
     #applyAutoTimestamps(entity, phase) {
-        const now = new Date();
+        // A Chronos `DateTime` (not a JS `Date`) so `autoCreate`/`autoUpdate` values
+        // match the type `@column.dateTime` columns hydrate to — Adonis Lucid parity.
+        const now = DateTime.now();
         for (const [prop, cfg] of Object.entries(this.#dateColumns)) {
             if (phase === "insert") {
                 if (cfg.autoCreate && entity[prop] === undefined) {
@@ -929,33 +1482,46 @@ export class BaseRepository {
     #hydrate(row) {
         const entity = new this.#entityClass();
         for (const [key, value] of Object.entries(row)) {
-            const camelKey = snakeToCamel(key);
             // Resolve against declared column metadata, not `in entity` — fields
             // using Adonis' `declare field: T` pattern are not own-properties of
-            // a freshly constructed instance.
-            const targetKey = this.#validColumns.has(camelKey)
-                ? camelKey
-                : this.#validColumns.has(key)
-                    ? key
-                    : null;
+            // a freshly constructed instance. The reverse db→property map is
+            // consulted first so an explicit `columnName` override resolves to the
+            // right property (where `snakeToCamel` alone would not).
+            const camelKey = snakeToCamel(key);
+            const targetKey = this.#columnByDbName.get(key) ??
+                (this.#validColumns.has(camelKey)
+                    ? camelKey
+                    : this.#validColumns.has(key)
+                        ? key
+                        : null);
             if (!targetKey)
                 continue;
             // Apply `@Column({ consume })` if declared on this property. Unlike the
             // previous registry-based design, the callback receives every value
             // including `null` / `undefined` — the user's `consume` is responsible
             // for its own null-handling, matching Adonis Lucid's contract.
-            entity.setProp(targetKey, this.#applyConsume(targetKey, value));
+            entity.setProp(targetKey, this.#applyConsume(targetKey, value, entity));
         }
         // Freeze the original snapshot — from now on, only columns changed AFTER
         // hydration are considered dirty by `entity.$dirty`.
         entity.markAsPersisted();
-        // Back-pointer so `entity.refresh()` / `entity.fresh()` can re-query.
+        entity.markAsFromDatabase();
+        this.#attachRepoRef(entity);
+        return entity;
+    }
+    /**
+     * Back-pointer so a persisted instance can `related()` / `refresh()` / `fresh()`
+     * / `load*()` without being re-fetched — AdonisJS Lucid parity: a model returned
+     * by find/query AND by create/save/createMany/saveMany carries its query client.
+     * Non-enumerable so it never serializes; `configurable` so re-persisting the same
+     * instance is idempotent.
+     */
+    #attachRepoRef(entity) {
         Object.defineProperty(entity, REPO_REF, {
             value: this,
             enumerable: false,
             configurable: true,
         });
-        return entity;
     }
     /**
      * Re-read the entity's row from the database and mutate the instance in place.
@@ -965,11 +1531,7 @@ export class BaseRepository {
      */
     async refresh(entity) {
         const pk = entity[this.#primaryKey];
-        if (pk === undefined || pk === null) {
-            throw new EntityNotFoundError(this.#entityClass.name, {
-                [this.#primaryKey]: pk,
-            });
-        }
+        this.#assertPersistedRow(entity, pk, "refresh()");
         const fresh = await this.find(pk);
         if (!fresh) {
             throw new EntityNotFoundError(this.#entityClass.name, {
@@ -997,11 +1559,7 @@ export class BaseRepository {
      */
     async loadCount(entity, relationName, alias) {
         const pk = entity[this.#primaryKey];
-        if (pk === undefined || pk === null) {
-            throw new EntityNotFoundError(this.#entityClass.name, {
-                [this.#primaryKey]: pk,
-            });
-        }
+        this.#assertPersistedRow(entity, pk, "loadCount()");
         const finalAlias = alias ?? `${relationName}_count`;
         const q = this.query()
             .where(this.#primaryKey, pk)
@@ -1020,11 +1578,7 @@ export class BaseRepository {
      */
     async loadAggregate(entity, relationName, build) {
         const pk = entity[this.#primaryKey];
-        if (pk === undefined || pk === null) {
-            throw new EntityNotFoundError(this.#entityClass.name, {
-                [this.#primaryKey]: pk,
-            });
-        }
+        this.#assertPersistedRow(entity, pk, "loadAggregate()");
         let capturedAlias;
         const q = this.query()
             .where(this.#primaryKey, pk)
@@ -1045,11 +1599,7 @@ export class BaseRepository {
      */
     async loadRelation(entity, relationName, callback) {
         const pk = entity[this.#primaryKey];
-        if (pk === undefined || pk === null) {
-            throw new EntityNotFoundError(this.#entityClass.name, {
-                [this.#primaryKey]: pk,
-            });
-        }
+        this.#assertPersistedRow(entity, pk, "loadRelation()");
         const q = this.query().where(this.#primaryKey, pk);
         if (callback)
             q.preload(relationName, callback);
@@ -1075,12 +1625,19 @@ export class BaseRepository {
         if (!relation)
             throw new Error(`Relation '${relationName}' not found on ${this.#entityClass.name}`);
         const relatedClass = relation.target();
-        const relatedMeta = getEntityMetadata(relatedClass);
-        if (!relatedMeta)
-            throw new Error(`Entity metadata missing on related class ${relatedClass.name}`);
-        const relatedTable = relatedMeta.tableName;
+        // Synthesize the related model's @Entity metadata on demand (static `table`
+        // / naming strategy) — a related model referenced ONLY through this relation
+        // may never have been instantiated, so `getEntityMetadata` alone would be
+        // empty and related()/create-through would wrongly fail. Mirrors how the repo
+        // constructor boots its own class (AdonisJS Lucid lazy-boots models).
+        const relatedTable = ensureEntityMetadata(relatedClass).tableName;
         const parentPk = relation.localKey ?? getPrimaryKey(this.#entityClass) ?? "id";
-        const parentIdValue = entity[parentPk];
+        // Read the parent's key LAZILY, at operation time — not once at proxy
+        // creation. Lucid resolves the pivot value when the query runs, so mutating
+        // the parent's (custom local) key between `user.related('roles')` and a later
+        // `.attach()` must target the CURRENT key, never a captured stale one.
+        const readParentId = () => entity[parentPk];
+        const keyLabel = parentPk === this.#primaryKey ? "primary key" : `key '${parentPk}'`;
         const relatedRepo = new BaseRepository(relatedClass, this.#db, {
             dialect: this.#dialect,
         });
@@ -1095,41 +1652,153 @@ export class BaseRepository {
                 ? `${camelToSnake(relatedClass.name)}_id`
                 : `${camelToSnake(this.#entityClass.name)}_id`);
         const fkProp = snakeToCamel(fkCol);
-        const injectFk = (data) => ({
+        const injectFk = (data, fkValue) => ({
             ...data,
-            [fkCol]: parentIdValue,
-            [fkProp]: parentIdValue,
+            [fkCol]: fkValue,
+            [fkProp]: fkValue,
+        });
+        /**
+         * Lucid persists the parent FIRST (inside a managed transaction) so its key
+         * is available, then sets the child FK and writes the child — atomic, rolled
+         * back on any failure. An already-persisted parent skips the save; a
+         * persisted-but-keyless projection is rejected loud. Runs `body` with the
+         * parent's now-guaranteed key and a trx-bound related repo.
+         */
+        const flushEvents = async (entities) => {
+            for (const e of entities)
+                await this.#dispatchDomainEvents(e);
+        };
+        const withParentSaved = (body) => transaction(this.#db, async (trx) => {
+            // Snapshot BEFORE the save flips the flag — the parent's events flush
+            // ONLY if WE persisted it here. An already-persisted parent may carry
+            // unrelated in-memory events that belong to whoever saves it; a child
+            // mutation must not emit them as a side effect.
+            const savedParentHere = !entity.$isPersisted;
+            const parentDurable = this.#durableParent ?? this;
+            if (savedParentHere) {
+                // Floor the parent's event queue BEFORE we persist it, so rollback drops
+                // only the events this write queues, keeping any the caller queued
+                // earlier (#8).
+                const parentEventFloor = entity.domainEventCount();
+                // Persist the parent on the SAME trx. Build a BaseEntity-typed repo
+                // for the parent class (mirrors `relatedRepo`) so `save(entity)`
+                // accepts the generic `BaseEntity` without widening `this`.
+                const parentRepoTx = new BaseRepository(this.#entityClass, trx, { dialect: this.#dialect });
+                parentRepoTx.onDomainEvents = this.onDomainEvents;
+                parentRepoTx.#deferDomainEvents = true;
+                await parentRepoTx.save(entity);
+                // Register the parent's rollback restore IMMEDIATELY after its insert —
+                // the parentPk check just below can throw (a custom `localKey` left unset
+                // after the save), and that throw must still revert the freshly-inserted
+                // parent instead of leaving it lying $isPersisted (same gotcha as
+                // associate(): register the restore before ANY later throwable line).
+                trx.after("rollback", () => {
+                    parentDurable.#attachRepoRef(entity);
+                    entity.markAsNotPersisted();
+                    entity.restoreDomainEventsTo(parentEventFloor);
+                });
+            }
+            const fkValue = entity[parentPk];
+            if (!isProvidedPk(fkValue)) {
+                throw new AtlasError("E_MISSING_PRIMARY_KEY", `Cannot use related('${relationName}') on a ${this.#entityClass.name} with no ${keyLabel}.`, {
+                    hint: "The parent is an aggregate/alias projection with no key. Select the key or use query().pojo().",
+                });
+            }
+            const relTx = relatedRepo.useTransaction(trx);
+            relTx.#deferDomainEvents = true;
+            // Track related rows inserted DIRECTLY through relTx (single create/save;
+            // the batch helpers route through #inManagedTx, which tracks + reverts them
+            // itself on this same trx). A caller-passed related instance we insert here
+            // must, on rollback, revert to $isNew — its row is gone, and keeping
+            // $isPersisted would orphan a later relation write (a M2M pivot-insert
+            // failure AFTER `rel.save(related)` is the canonical trigger) — and drop its
+            // queued events. On commit, re-point its REPO_REF at the durable related repo
+            // (it was bound to the now-finished trx, so refresh()/related() would
+            // otherwise throw "transaction already finished").
+            const relInserts = [];
+            relTx.#insertTracker = relInserts;
+            const relDurable = relatedRepo.#durableParent ?? relatedRepo;
+            // Per-related event floor, populated by a caller-instance write (save):
+            // a fresh child built by create() has floor 0 (clear), but a caller's own
+            // instance passed to save() may carry events queued before the write (#8).
+            const relatedFloors = new Map();
+            trx.after("commit", () => {
+                for (const r of relInserts)
+                    relDurable.#attachRepoRef(r);
+            });
+            trx.after("rollback", () => {
+                for (const r of relInserts) {
+                    relDurable.#attachRepoRef(r);
+                    r.markAsNotPersisted();
+                    r.restoreDomainEventsTo(relatedFloors.get(r) ?? 0);
+                }
+            });
+            // Parent COMMIT restore (its rollback restore is registered above, right
+            // after the insert). ONLY if WE persisted it here (`parentRepoTx.save`
+            // flipped it to $isPersisted with REPO_REF bound to the trx repo). Lucid
+            // resets `$trx` on commit → re-point REPO_REF at the durable repo, then
+            // flush the parent's events (a rollback thus publishes nothing). An
+            // already-persisted parent is left untouched: its events belong to whoever
+            // saves it, and its row already exists.
+            if (savedParentHere) {
+                trx.after("commit", () => {
+                    parentDurable.#attachRepoRef(entity);
+                    return this.#dispatchDomainEvents(entity);
+                });
+            }
+            return body(fkValue, relTx, trx, relatedFloors);
         });
         // Shared "has" proxy methods (create/createMany/save/saveMany +
-        // firstOrCreate/updateOrCreate scoped to this parent's FK).
+        // firstOrCreate/updateOrCreate scoped to this parent's FK). Each persists the
+        // parent first (Lucid parity) and writes the child with the FK set, atomically,
+        // then flushes the child's domain events AFTER the transaction commits.
         const hasOps = {
-            async create(data) {
-                return relatedRepo.create(injectFk(data));
-            },
-            async createMany(rows) {
-                return relatedRepo.createMany(rows.map(injectFk));
-            },
-            // Scope the search to the parent's FK column so the lookup only sees
-            // this parent's rows; inject the FK into the created/updated row. The
-            // related repo's firstOrCreate/updateOrCreate are atomic (txn + lock).
-            async firstOrCreate(search, defaults = {}) {
-                return relatedRepo.firstOrCreate({ ...search, [fkCol]: parentIdValue }, injectFk(defaults));
-            },
-            async updateOrCreate(search, values) {
-                return relatedRepo.updateOrCreate({ ...search, [fkCol]: parentIdValue }, injectFk(values));
-            },
-            async save(related) {
-                related.setProp(fkCol, parentIdValue);
-                related.setProp(fkProp, parentIdValue);
-                await relatedRepo.save(related);
-            },
-            async saveMany(related) {
+            create: (data) => withParentSaved(async (fk, rel, trx) => {
+                const child = await rel.create(injectFk(data, fk));
+                trx.after("commit", () => flushEvents([child]));
+                return child;
+            }),
+            createMany: (rows) => withParentSaved(async (fk, rel, _trx) => {
+                // NO wrapper flush: since createMany now runs through #inManagedTx it
+                // ALREADY dispatches the children's events post-commit (like
+                // firstOrCreate/updateOrCreate/saveMany). A second flush would
+                // re-dispatch events the first hook re-queued on a partial sink failure.
+                return rel.createMany(rows.map((r) => injectFk(r, fk)));
+            }),
+            // Scope the search to the parent's FK column so the lookup only sees this
+            // parent's rows; inject the FK into the created/updated row.
+            firstOrCreate: (search, defaults = {}) => withParentSaved(async (fk, rel, _trx) => {
+                // NO wrapper flush here: unlike create/save, rel.firstOrCreate goes
+                // through #inManagedTx, which ALREADY registers its own post-commit
+                // dispatch for the child. A second flush would re-dispatch events the
+                // first hook re-queued on a partial sink failure → bus duplication.
+                return rel.firstOrCreate({ ...search, [fkCol]: fk }, injectFk(defaults, fk));
+            }),
+            updateOrCreate: (search, values) => withParentSaved(async (fk, rel, _trx) => {
+                // NO wrapper flush: rel.updateOrCreate goes through #inManagedTx which
+                // already dispatches the child's events post-commit (see firstOrCreate).
+                return rel.updateOrCreate({ ...search, [fkCol]: fk }, injectFk(values, fk));
+            }),
+            save: (related) => withParentSaved(async (fk, rel, trx, relatedFloors) => {
+                related.setProp(fkCol, fk);
+                related.setProp(fkProp, fk);
+                // Floor BEFORE the write so a rollback keeps events the caller queued on
+                // this instance earlier, dropping only what this save adds (#8).
+                relatedFloors.set(related, related.domainEventCount());
+                await rel.save(related);
+                trx.after("commit", () => flushEvents([related]));
+            }),
+            saveMany: (related) => withParentSaved(async (fk, rel, _trx) => {
                 for (const r of related) {
-                    r.setProp(fkCol, parentIdValue);
-                    r.setProp(fkProp, parentIdValue);
+                    r.setProp(fkCol, fk);
+                    r.setProp(fkProp, fk);
                 }
-                return relatedRepo.saveMany(related);
-            },
+                // NO wrapper flush: rel.saveMany now runs through #inManagedTx (it's
+                // all-or-nothing), which ALREADY dispatches these instances' events
+                // post-commit. A second flush would re-dispatch on a partial sink
+                // failure (round-13 double-flush class).
+                return rel.saveMany(related);
+            }),
         };
         // Scoped query builder (Story 31.9) — pre-applies the FK predicate
         // (or pivot JOIN for m2m) so downstream filters/updates/deletes stay
@@ -1142,7 +1811,11 @@ export class BaseRepository {
                 const pivot = relation.pivot;
                 const pivotFk = pivot.foreignKey ?? `${camelToSnake(this.#entityClass.name)}_id`;
                 const pivotOther = pivot.otherKey ?? `${camelToSnake(relatedClass.name)}_id`;
-                const relatedPk = getPrimaryKey(relatedClass) ?? "id";
+                // Resolve the related PK to its DB column (multi-word / columnName),
+                // mirroring the eager-preload fix — a raw property name here targets
+                // the wrong column in the correlated EXISTS.
+                const relatedPkProp = getPrimaryKey(relatedClass) ?? "id";
+                const relatedPk = getColumnMetadata(relatedClass).find((c) => c.propertyKey === relatedPkProp)?.columnName ?? camelToSnake(relatedPkProp);
                 // Inline validated quote (same policy as the m2m branch below).
                 const dialect = this.#dialect;
                 const quote = (name) => {
@@ -1151,30 +1824,89 @@ export class BaseRepository {
                     }
                     return dialect === "mysql" ? `\`${name}\`` : `"${name}"`;
                 };
+                // Table identifiers may be schema-qualified (`schema.table`, e.g. a
+                // Postgres `public.users_roles`) — quote each dotted segment on its own
+                // so it becomes `"schema"."table"`, while EVERY segment still passes the
+                // strict single-identifier guard above (no injection surface). Columns
+                // stay single-segment via `quote`.
+                const quoteTable = (name) => name.split(".").map(quote).join(".");
                 // The bound `?` carries the parent PK type (often uuid). A raw `?`
                 // can't be cast by the structured `casts` mechanism, so emit the
                 // `::uuid` inline — `whereRaw` rewrites `?`→`$N`, yielding `$N::uuid`.
                 // Postgres-only; sqlite/mysql coerce. Without it: `pivotFk = $N` is
                 // `uuid = text`.
-                const parentPkCast = this.#castTypes[camelToSnake(this.#primaryKey)];
+                // Cast keys off the RESOLVED parent key (localKey ?? PK), not always the
+                // PK — an m2m with a custom localKey binds `entity[localKey]` into the
+                // pivot FK, so the `::cast` must match that column's type.
+                const parentPkCast = this.#castTypes[this.#dbColumn(parentPk)];
                 const ph = dialect === "postgres" && parentPkCast ? `?::${parentPkCast}` : "?";
-                // EXISTS (SELECT 1 FROM pivot WHERE pivot.pivotFk = ? AND pivot.pivotOther = related.pk)
-                // Framework-internal raw fragment (identifiers already validated by
-                // the `quote` helper above) — bypass strict mode so this path still
-                // works when the user enables `setAtlasStrictMode(true)` on their app.
-                runWithAtlasInternalBypass(() => {
-                    q.whereRaw(`EXISTS (SELECT 1 FROM ${quote(pivot.pivotTable)} ` +
-                        `WHERE ${quote(pivot.pivotTable)}.${quote(pivotFk)} = ${ph} ` +
-                        `AND ${quote(pivot.pivotTable)}.${quote(pivotOther)} = ${quote(relatedTable)}.${quote(relatedPk)})`, [parentIdValue]);
+                // EXISTS (SELECT 1 FROM pivot WHERE pivot.pivotFk = ? AND pivot.pivotOther = related.pk
+                //         [AND pivot.col <op> ?]…)
+                // Deferred (not an eager whereRaw): a `.wherePivot()` chained on the
+                // query the proxy hands back must fold into THIS subquery, so we build it
+                // at #buildSpec time with the pivot constraints known then. Identifiers
+                // are validated by `quote`; values bind as params (no injection surface),
+                // so this internal fragment needs no strict-mode bypass.
+                const pivotTable = pivot.pivotTable;
+                q.setPivotExistsBuilder((pivotWheres) => {
+                    const base = `EXISTS (SELECT 1 FROM ${quoteTable(pivotTable)} ` +
+                        `WHERE ${quoteTable(pivotTable)}.${quote(pivotFk)} = ${ph} ` +
+                        `AND ${quoteTable(pivotTable)}.${quote(pivotOther)} = ${quoteTable(relatedTable)}.${quote(relatedPk)}`;
+                    const bindings = [readParentId()];
+                    let extra = "";
+                    for (const w of pivotWheres) {
+                        const col = `${quoteTable(pivotTable)}.${quote(w.column)}`;
+                        if (w.operator === "IN" || w.operator === "NOT IN") {
+                            const vals = Array.isArray(w.value) ? w.value : [w.value];
+                            if (vals.length === 0) {
+                                // IN () matches nothing; NOT IN () matches everything.
+                                if (w.operator === "IN")
+                                    extra += " AND 1 = 0";
+                                continue;
+                            }
+                            extra += ` AND ${col} ${w.operator} (${vals.map(() => "?").join(", ")})`;
+                            bindings.push(...vals);
+                        }
+                        else {
+                            extra += ` AND ${col} ${w.operator} ?`;
+                            bindings.push(w.value);
+                        }
+                    }
+                    return { sql: `${base}${extra})`, bindings };
                 });
             }
             else if (relation.type === "belongsTo") {
                 const ownerKey = relation.ownerKey ?? getPrimaryKey(relatedClass) ?? "id";
                 q.where(ownerKey, entity[fkProp] ?? entity[fkCol]);
             }
+            else if (relation.type === "hasOneThrough" ||
+                relation.type === "hasManyThrough") {
+                // Lucid's read-only two-hop traversal (verified): the related rows are
+                // reached VIA the intermediate ("through") table, never a direct FK.
+                //   related WHERE secondKey IN
+                //     (SELECT secondLocal FROM through WHERE firstKey = parent[localKey])
+                // Same key resolution as the eager `#resolveThrough` loader so lazy and
+                // eager agree. Returns a chainable ModelQuery (`.orderBy().limit()` …).
+                if (!relation.through) {
+                    throw new Error(`@HasOneThrough/@HasManyThrough '${relationName}' requires a through model`);
+                }
+                const throughClass = relation.through();
+                const throughRepo = new BaseRepository(throughClass, db, {
+                    dialect: this.#dialect,
+                });
+                const throughPk = getPrimaryKey(throughClass) ?? "id";
+                const parentLocal = relation.localKey ?? getPrimaryKey(this.#entityClass) ?? "id";
+                const firstKey = relation.firstKey ?? `${camelToSnake(this.#entityClass.name)}_id`;
+                const secondKey = relation.secondKey ?? `${camelToSnake(throughClass.name)}_id`;
+                const secondLocal = relation.secondLocalKey ?? throughPk;
+                q.whereIn(secondKey, throughRepo
+                    .query()
+                    .select(secondLocal)
+                    .where(firstKey, entity[parentLocal]));
+            }
             else {
                 // hasOne / hasMany
-                q.where(fkCol, parentIdValue);
+                q.where(fkCol, readParentId());
             }
             return q;
         };
@@ -1185,19 +1917,101 @@ export class BaseRepository {
             // the standard TS idiom for widening a generic `this` — safe because
             // `T extends BaseEntity`.
             const parentRepo = this;
+            // create/save/createMany/saveMany are INVALID for a belongsTo: the FK is on
+            // THIS model, so `...hasOps` would inject the FK into the owner table and
+            // save the current model before it has an owner. Reject them (same throwing
+            // pattern as @HasOne's bulk methods); the only writes are associate /
+            // dissociate.
+            const rejectWrite = async (op) => {
+                throw new Error(`related('${relationName}').${op}() is not supported on @BelongsTo — ` +
+                    `the foreign key is on this model; use associate() / dissociate().`);
+            };
             const proxy = {
                 type: "belongsTo",
-                ...hasOps,
                 query: scopedQuery,
+                create: () => rejectWrite("create"),
+                save: () => rejectWrite("save"),
+                createMany: () => rejectWrite("createMany"),
+                saveMany: () => rejectWrite("saveMany"),
                 async associate(model) {
                     if (model === null || model === undefined) {
                         throw new Error(`related('${relationName}').associate() rejects null/undefined — use dissociate() instead`);
                     }
                     const ownerKey = relation.ownerKey ?? getPrimaryKey(relatedClass) ?? "id";
-                    const fkValue = model[ownerKey];
-                    entity.setProp(fkCol, fkValue);
-                    entity.setProp(fkProp, fkValue);
-                    await parentRepo.save(entity);
+                    // Lucid: persist an unsaved owner FIRST (so a generated key exists),
+                    // set the parent FK to the owner's key, then save the parent — all in
+                    // ONE transaction (atomic, rolled back on failure). Reject a keyless
+                    // owner instead of silently setting the FK to `undefined` (which the
+                    // UPDATE would skip → stale/absent association). Events flush post-commit.
+                    await transaction(db, async (trx) => {
+                        const ownerTx = relatedRepo.useTransaction(trx);
+                        ownerTx.#deferDomainEvents = true;
+                        // Snapshot BEFORE the save: associate() only persists an unsaved
+                        // owner, so an already-persisted owner's pending domain events are
+                        // NOT ours to flush (same side-effect fix as withParentSaved).
+                        const savedOwnerHere = !model.$isPersisted;
+                        const ownerDurable = relatedRepo.#durableParent ?? relatedRepo;
+                        // Floor the owner's events before we persist it (#8).
+                        const ownerEventFloor = model.domainEventCount();
+                        if (savedOwnerHere) {
+                            await ownerTx.save(model);
+                            // Register the owner's rollback restore IMMEDIATELY after its
+                            // insert. The ownerKey check just below AND the parent save later
+                            // can BOTH throw after this point, and either must still revert the
+                            // freshly-inserted owner (Lucid resets `$trx` on rollback): re-point
+                            // its REPO_REF at the durable repo, revert it to $isNew (its row
+                            // vanished), and drop its queued events. Registering it here (not
+                            // after the checks) is the fix — a throw between the save and a
+                            // later registration would leave the owner lying $isPersisted.
+                            trx.after("rollback", () => {
+                                ownerDurable.#attachRepoRef(model);
+                                model.markAsNotPersisted();
+                                model.restoreDomainEventsTo(ownerEventFloor);
+                            });
+                        }
+                        const fkValue = model[ownerKey];
+                        if (!isProvidedPk(fkValue)) {
+                            throw new AtlasError("E_MISSING_OWNER_KEY", `Cannot associate('${relationName}'): the owner ${relatedClass.name} has no ${ownerKey} to reference.`, {
+                                hint: "Pass an owner whose key is set — a keyless aggregate/alias projection can't be a foreign-key target.",
+                            });
+                        }
+                        entity.setProp(fkCol, fkValue);
+                        entity.setProp(fkProp, fkValue);
+                        const parentTx = parentRepo.useTransaction(trx);
+                        parentTx.#deferDomainEvents = true;
+                        // Snapshot BEFORE the save flips the flag: the parent reverts on
+                        // rollback ONLY if WE inserted it here (a fresh parent). An
+                        // already-persisted parent's row survives the rollback.
+                        const savedParentHere = !entity.$isPersisted;
+                        const parentDurable = parentRepo.#durableParent ?? parentRepo;
+                        // Floor the parent's events before its save (#8).
+                        const parentEventFloor = entity.domainEventCount();
+                        // Register the parent resolution hooks BEFORE the risky parent save —
+                        // that save can throw (a beforeUpdate hook, a constraint) AFTER the
+                        // owner was inserted, and a throw here must still restore state.
+                        trx.after("commit", async () => {
+                            // Lucid resets `$trx` on commit → re-point REPO_REF at the durable
+                            // repo (else a post-commit refresh() hits the finished trx), then
+                            // flush events. The parent is always saved here → always flush its
+                            // events. The owner's events flush only if WE saved the owner.
+                            parentDurable.#attachRepoRef(entity);
+                            if (savedOwnerHere) {
+                                ownerDurable.#attachRepoRef(model);
+                                await parentRepo.#dispatchDomainEvents(model);
+                            }
+                            await parentRepo.#dispatchDomainEvents(entity);
+                        });
+                        trx.after("rollback", () => {
+                            // Restore the PARENT (the owner's restore is registered above, right
+                            // after its insert). We do NOT revert the parent's FK value — Lucid
+                            // never reverts attribute values on rollback.
+                            parentDurable.#attachRepoRef(entity);
+                            if (savedParentHere)
+                                entity.markAsNotPersisted();
+                            entity.restoreDomainEventsTo(parentEventFloor);
+                        });
+                        await parentTx.save(entity);
+                    });
                 },
                 async dissociate() {
                     entity.setProp(fkCol, null);
@@ -1223,14 +2037,20 @@ export class BaseRepository {
             // every pivot statement (sync's currentIds SELECT, detach DELETE, attach
             // INSERT) must carry these explicitly, else `pivotFk = $1` is `uuid = text`.
             const pivotKeyCasts = {};
-            const parentPkCast = this.#castTypes[camelToSnake(this.#primaryKey)];
+            // Cast keys off the RESOLVED parent key (localKey ?? PK), not always the
+            // PK — an m2m with a custom localKey binds `entity[localKey]` into the
+            // pivot FK, so the `::cast` must match that column's type.
+            const parentPkCast = this.#castTypes[this.#dbColumn(parentPk)];
             if (parentPkCast)
                 pivotKeyCasts[pivotFk] = parentPkCast;
-            const relatedPkCast = computeCastTypes(relatedClass)[camelToSnake(getPrimaryKey(relatedClass) ?? "id")];
+            const relatedPk = getPrimaryKey(relatedClass) ?? "id";
+            const relatedPkDb = getColumnMetadata(relatedClass).find((c) => c.propertyKey === relatedPk)
+                ?.columnName ?? camelToSnake(relatedPk);
+            const relatedPkCast = computeCastTypes(relatedClass)[relatedPkDb];
             if (relatedPkCast)
                 pivotKeyCasts[pivotOther] = relatedPkCast;
             /**
-             * Resolve pivot timestamp column names from the decorator config.
+             * Pivot timestamp column names, resolved once from the decorator config.
              *
              * Three forms supported:
              *   - `pivotTimestamps: true`           → { created_at, updated_at } default names
@@ -1240,54 +2060,108 @@ export class BaseRepository {
              * `false` opts a timestamp out; a string overrides the column name;
              * `undefined` falls back to the default name.
              */
-            const resolveTimestamps = () => {
+            let createdCol = null;
+            let updatedCol = null;
+            if (tsConfig === true) {
+                createdCol = "created_at";
+                updatedCol = "updated_at";
+            }
+            else if (tsConfig) {
+                createdCol =
+                    tsConfig.createdAt === false
+                        ? null
+                        : (tsConfig.createdAt ?? "created_at");
+                updatedCol =
+                    tsConfig.updatedAt === false
+                        ? null
+                        : (tsConfig.updatedAt ?? "updated_at");
+            }
+            const tsColumnSet = new Set([createdCol, updatedCol].filter((c) => c !== null));
+            // INSERT (attach) stamps both created_at + updated_at; UPDATE (sync's
+            // attribute refresh) bumps only updated_at — Adonis Lucid pivot semantics.
+            const timestampValues = (mode) => {
                 if (!tsConfig)
                     return {};
                 const now = new Date().toISOString();
-                let createdCol;
-                let updatedCol;
-                if (tsConfig === true) {
-                    createdCol = "created_at";
-                    updatedCol = "updated_at";
-                }
-                else {
-                    createdCol =
-                        tsConfig.createdAt === false
-                            ? null
-                            : (tsConfig.createdAt ?? "created_at");
-                    updatedCol =
-                        tsConfig.updatedAt === false
-                            ? null
-                            : (tsConfig.updatedAt ?? "updated_at");
-                }
                 const out = {};
-                if (createdCol)
+                if (mode === "insert" && createdCol)
                     out[createdCol] = now;
                 if (updatedCol)
                     out[updatedCol] = now;
                 return out;
             };
+            // Object literal keys are ALWAYS strings, so `sync({ 1: {…} })` /
+            // `attach({ 1: {…} })` arrive with id "1", not 1. Bound as text, a numeric
+            // pivot FK column fails on Postgres (`text` ≠ `integer`, no implicit cast)
+            // and the sync diff mis-compares "1" against the numeric id the DB returns.
+            // Coerce a *canonical* integer back to a number; the round-trip guard
+            // leaves uuid / zero-padded / oversized string keys (`"01234"`, `"abc"`)
+            // untouched so they still bind as text.
+            const canonicalizeId = (id) => {
+                if (typeof id === "number")
+                    return id;
+                return /^-?\d+$/.test(id) &&
+                    Number.isSafeInteger(Number(id)) &&
+                    String(Number(id)) === id
+                    ? Number(id)
+                    : id;
+            };
             const normalizeAttach = (arg) => {
                 if (Array.isArray(arg))
-                    return arg.map((id) => ({ id, extras: {} }));
-                return Object.entries(arg).map(([id, extras]) => ({ id, extras }));
+                    return arg.map((id) => ({ id: canonicalizeId(id), extras: {} }));
+                return Object.entries(arg).map(([id, extras]) => ({
+                    id: canonicalizeId(id),
+                    extras,
+                }));
+            };
+            // Apply a pivot column's `prepare` adapter (model → DB), shared by the
+            // INSERT (attach) and UPDATE (sync) write paths.
+            const encodeExtra = (k, raw) => {
+                const prepare = pivotAdapters?.[k]?.prepare;
+                if (!prepare)
+                    return raw;
+                let encoded;
+                try {
+                    // Adonis Lucid signature: (value, attribute, model). A pivot-row
+                    // write carries no single model instance.
+                    encoded = prepare(raw, k, undefined);
+                }
+                catch (err) {
+                    throw wrapAdapterError("prepare", k, err);
+                }
+                assertNotPromise("prepare", k, encoded);
+                return encoded;
+            };
+            // Reject an extras key colliding with a reserved pivot column. Without
+            // this guard the FK case would silently override `parentIdValue`
+            // (corrupting the join) and the timestamp case would duplicate the column
+            // (driver-dependent failure or last-wins overwrite).
+            const assertExtraKeyAllowed = (k) => {
+                if (k === pivotFk || k === pivotOther) {
+                    throw new Error(`Pivot extras key '${k}' collides with the ${k === pivotFk ? "foreignKey" : "otherKey"} column on '${pivotTable}'. Reserved keys MUST NOT appear in attach()/sync() extras.`);
+                }
+                if (tsColumnSet.has(k)) {
+                    throw new Error(`Pivot extras key '${k}' collides with a pivotTimestamps column on '${pivotTable}'. Disable the timestamp in the relation options or rename your extra.`);
+                }
             };
-            // Current pivot rows — compiled through the Rust SELECT path so the
-            // pivot identifiers go through `quote_identifier` (rejects anything
-            // outside `[A-Za-z0-9_]`), rather than through the ad-hoc `quote`
-            // helper that would blindly wrap a malicious metadata string.
-            //
-            // Now async — every site in `sync()` is in an async closure.
-            const currentIds = async () => {
+            // Narrow an unknown pivot id to a bindable scalar without an `as` cast.
+            const asId = (v) => typeof v === "number" ? v : String(v);
+            // Current pivot rows for this parent — the other-key plus any attribute
+            // columns the caller needs (so sync() can diff changed pivot rows).
+            // Compiled through the Rust SELECT path so the pivot identifiers go
+            // through `quote_identifier` (rejects anything outside `[A-Za-z0-9_]`),
+            // never the ad-hoc `quote` helper. Runs on `conn` — a transaction inside
+            // sync(), the pool otherwise.
+            const currentPivotRows = async (attrCols, conn = db) => {
                 const selectSpec = {
                     kind: "select",
                     table: pivotTable,
-                    select: [pivotOther],
+                    select: [pivotOther, ...attrCols],
                     wheres: [
                         {
                             column: pivotFk,
                             operator: "=",
-                            value: parentIdValue,
+                            value: readParentId(),
                             type: "and",
                         },
                     ],
@@ -1305,15 +2179,20 @@ export class BaseRepository {
                     casts: pivotKeyCasts,
                 };
                 const compiled = compileStatementNative(selectSpec, dialect);
-                const rows = await db.query(compiled.statements[0], compiled.params);
-                return rows.map((r) => r[pivotOther]);
+                const rows = await conn.query(compiled.statements[0], compiled.params);
+                return rows.map((r) => ({ id: asId(r[pivotOther]), row: r }));
             };
             // Delete via the Rust DELETE compiler so the pivot table + columns get
             // `quote_identifier` validation (rejects `"`, `;`, etc.) — safer than
             // the previous hand-built SQL with a dumb `"` wrapper.
-            const detach = async (ids) => {
+            const detach = async (ids, conn = db) => {
                 const wheres = [
-                    { column: pivotFk, operator: "=", value: parentIdValue, type: "and" },
+                    {
+                        column: pivotFk,
+                        operator: "=",
+                        value: readParentId(),
+                        type: "and",
+                    },
                 ];
                 if (ids && ids.length > 0) {
                     wheres.push({
@@ -1331,58 +2210,30 @@ export class BaseRepository {
                     casts: pivotKeyCasts,
                 };
                 const compiled = compileStatementNative(spec, dialect);
-                await db.execute(compiled.statements[0], compiled.params);
+                await conn.execute(compiled.statements[0], compiled.params);
             };
-            const attach = async (ids) => {
+            const attach = async (ids, conn = db, parentFk = readParentId()) => {
                 const entries = normalizeAttach(ids);
                 if (entries.length === 0)
                     return;
-                const ts = resolveTimestamps();
-                // Normalize heterogeneous extras: compute the union of extra keys
-                // across all entries and back-fill missing keys with `null`, so every
-                // row in the multi-insert shares the same column set (required by the
-                // Rust compiler's homogeneity check).
+                const ts = timestampValues("insert");
+                // Union of extra keys across all entries; back-fill missing keys with
+                // `null` so every row in the multi-insert shares the same column set
+                // (required by the Rust compiler's homogeneity check).
                 const extraKeys = new Set();
                 for (const e of entries) {
                     for (const k of Object.keys(e.extras))
                         extraKeys.add(k);
                 }
-                // Reject extras keys that collide with reserved pivot columns. Without
-                // this guard, an extras entry named after the FK or a timestamp column
-                // would emit a duplicate column in the INSERT row pair: the FK case
-                // silently overrides `parentIdValue` (corrupting the join); the
-                // timestamp case duplicates the column entirely (driver-dependent
-                // failure or last-wins overwrite).
-                for (const k of extraKeys) {
-                    if (k === pivotFk || k === pivotOther) {
-                        throw new Error(`Pivot extras key '${k}' collides with the ${k === pivotFk ? "foreignKey" : "otherKey"} column on '${pivotTable}'. Reserved keys MUST NOT appear in attach()/sync() extras.`);
-                    }
-                    if (Object.hasOwn(ts, k)) {
-                        throw new Error(`Pivot extras key '${k}' collides with a pivotTimestamps column on '${pivotTable}'. Disable the timestamp in the relation options or rename your extra.`);
-                    }
-                }
+                for (const k of extraKeys)
+                    assertExtraKeyAllowed(k);
                 const rowPairs = entries.map((e) => {
                     const pairs = [
-                        [pivotFk, parentIdValue],
+                        [pivotFk, parentFk],
                         [pivotOther, e.id],
                     ];
-                    for (const k of extraKeys) {
-                        const raw = e.extras[k] ?? null;
-                        const prepare = pivotAdapters?.[k]?.prepare;
-                        if (!prepare) {
-                            pairs.push([k, raw]);
-                            continue;
-                        }
-                        let encoded;
-                        try {
-                            encoded = prepare(raw);
-                        }
-                        catch (err) {
-                            throw wrapAdapterError("prepare", k, err);
-                        }
-                        assertNotPromise("prepare", k, encoded);
-                        pairs.push([k, encoded]);
-                    }
+                    for (const k of extraKeys)
+                        pairs.push([k, encodeExtra(k, e.extras[k] ?? null)]);
                     for (const [k, v] of Object.entries(ts))
                         pairs.push([k, v]);
                     return pairs;
@@ -1400,77 +2251,204 @@ export class BaseRepository {
                     casts: pivotCasts,
                 };
                 const compiled = compileStatementNative(spec, dialect);
-                await db.execute(compiled.statements[0], compiled.params);
+                await conn.execute(compiled.statements[0], compiled.params);
+            };
+            // Refresh one already-attached pivot row's attributes (sync's update arm,
+            // Adonis Lucid parity): set the provided extras (adapter-encoded) and bump
+            // only updated_at.
+            const updatePivot = async (id, extras, conn = db) => {
+                const ts = timestampValues("update");
+                const set = [];
+                for (const [k, raw] of Object.entries(extras)) {
+                    assertExtraKeyAllowed(k);
+                    set.push([k, encodeExtra(k, raw ?? null)]);
+                }
+                for (const [k, v] of Object.entries(ts))
+                    set.push([k, v]);
+                if (set.length === 0)
+                    return;
+                const casts = { ...pivotKeyCasts };
+                for (const k of Object.keys(ts))
+                    casts[k] = "timestamp";
+                const spec = {
+                    kind: "update",
+                    table: pivotTable,
+                    set,
+                    wheres: [
+                        {
+                            column: pivotFk,
+                            operator: "=",
+                            value: readParentId(),
+                            type: "and",
+                        },
+                        { column: pivotOther, operator: "=", value: id, type: "and" },
+                    ],
+                    returning: [],
+                    casts,
+                };
+                const compiled = compileStatementNative(spec, dialect);
+                await conn.execute(compiled.statements[0], compiled.params);
             };
             /**
-             * Diff the current pivot state against a target set and apply the
-             * minimum attach/detach to converge.
-             *
-             * **NOT ATOMIC.** `sync` reads the pivot, computes the diff, then
-             * writes — another process mutating the pivot between the read and
-             * the writes will cause divergence. Wrap the call in a transaction
-             * if you need strong consistency under concurrent writers.
-             *
-             * On SQLite this is typically fine because better-sqlite3 serializes
-             * writes per connection; on Postgres/MySQL use `useTransaction` first.
+             * Diff the current pivot state against a target set and apply the minimum
+             * insert / update / delete to converge (Adonis Lucid `sync`): rows missing
+             * from the pivot are attached, already-attached rows whose pivot attributes
+             * changed are updated, and rows absent from the target are detached (unless
+             * `additive`). The read and all three writes run inside ONE managed
+             * transaction — atomic and rolled back on any failure, so a concurrent
+             * writer can't wedge the pivot into a half-synced state.
              */
             const sync = async (target, additive = false) => {
-                const current = new Set(await currentIds());
                 const entries = normalizeAttach(target);
-                const desired = new Set(entries.map((e) => e.id));
-                const toAttach = entries.filter((e) => !current.has(e.id));
-                const toDetach = additive
-                    ? []
-                    : [...current].filter((id) => !desired.has(id));
-                if (toDetach.length > 0)
-                    await detach(toDetach);
-                if (toAttach.length > 0) {
-                    const attachArg = {};
-                    for (const e of toAttach)
-                        attachArg[String(e.id)] = e.extras;
-                    await attach(attachArg);
+                // Attribute columns to read back so we can detect changed pivot rows.
+                const attrCols = new Set();
+                for (const e of entries) {
+                    for (const k of Object.keys(e.extras))
+                        attrCols.add(k);
                 }
+                const desiredIds = new Set(entries.map((e) => String(e.id)));
+                await transaction(db, async (trx) => {
+                    const current = await currentPivotRows([...attrCols], trx);
+                    const currentById = new Map();
+                    for (const c of current)
+                        currentById.set(String(c.id), c);
+                    // Diff by String(id): the DB returns numeric ids for an integer
+                    // pivot column while object-form targets carry canonicalized ids —
+                    // stringifying both sides keeps the comparison type-agnostic.
+                    const toDetach = additive
+                        ? []
+                        : current
+                            .filter((c) => !desiredIds.has(String(c.id)))
+                            .map((c) => c.id);
+                    const toAttach = entries.filter((e) => !currentById.has(String(e.id)));
+                    const toUpdate = entries.filter((e) => {
+                        if (Object.keys(e.extras).length === 0)
+                            return false;
+                        const cur = currentById.get(String(e.id));
+                        if (!cur)
+                            return false;
+                        // Only rewrite when a provided attribute actually differs — a
+                        // no-op sync must not churn rows or bump updated_at. Compare
+                        // nullish and empty-string as DISTINCT (a `String(x ?? "")`
+                        // collapse would treat `null` and `""` as equal and miss a real
+                        // attribute change from one to the other).
+                        return Object.keys(e.extras).some((k) => {
+                            const stored = cur.row[k];
+                            const next = encodeExtra(k, e.extras[k] ?? null);
+                            const storedNull = stored === null || stored === undefined;
+                            const nextNull = next === null || next === undefined;
+                            if (storedNull || nextNull)
+                                return storedNull !== nextNull;
+                            return String(stored) !== String(next);
+                        });
+                    });
+                    if (toDetach.length > 0)
+                        await detach(toDetach, trx);
+                    for (const e of toUpdate)
+                        await updatePivot(e.id, e.extras, trx);
+                    if (toAttach.length > 0) {
+                        const attachArg = {};
+                        for (const e of toAttach)
+                            attachArg[String(e.id)] = e.extras;
+                        await attach(attachArg, trx);
+                    }
+                });
             };
             // m2m create/save persist the related row THEN insert a pivot row —
             // NOT `hasOps.injectFk`, which would write a bogus `<parent>_id` column
             // onto the related table and never touch the pivot (silent corruption).
+            // The whole chain (persist unsaved parent → write related → insert pivot)
+            // runs in ONE transaction via `withParentSaved` (AdonisJS/Lucid parity):
+            // atomic, rolled back on any failure (no orphan related row, no pivot to a
+            // missing parent), with domain events flushed only after commit.
             const relatedPkProp = getPrimaryKey(relatedClass) ?? "id";
-            const attachIds = (rows) => {
+            const attachRows = (rows, trx, fk) => {
                 if (rows.length === 0)
                     return Promise.resolve();
                 const arg = {};
                 for (const r of rows)
                     arg[String(r[relatedPkProp])] = {};
-                return attach(arg);
+                return attach(arg, trx, fk);
             };
             const m2mOps = {
-                async create(data) {
-                    const created = await relatedRepo.create(data);
-                    await attachIds([created]);
+                create: (data) => withParentSaved(async (fk, rel, trx) => {
+                    const created = await rel.create(data);
+                    await attachRows([created], trx, fk);
+                    trx.after("commit", () => flushEvents([created]));
                     return created;
-                },
-                async createMany(rows) {
-                    const created = await relatedRepo.createMany(rows);
-                    await attachIds(created);
+                }),
+                createMany: (rows) => withParentSaved(async (fk, rel, trx) => {
+                    const created = await rel.createMany(rows);
+                    await attachRows(created, trx, fk);
+                    // NO wrapper flush: rel.createMany now self-dispatches via
+                    // #inManagedTx (like saveMany). The pivot rows carry no events; a
+                    // second flush would double the related rows' events on a partial
+                    // sink failure.
                     return created;
-                },
-                async save(related) {
-                    await relatedRepo.save(related);
-                    await attachIds([related]);
-                },
-                async saveMany(related) {
-                    const saved = await relatedRepo.saveMany(related);
-                    await attachIds(saved);
+                }),
+                save: (related) => withParentSaved(async (fk, rel, trx) => {
+                    await rel.save(related);
+                    await attachRows([related], trx, fk);
+                    trx.after("commit", () => flushEvents([related]));
+                }),
+                saveMany: (related) => withParentSaved(async (fk, rel, trx) => {
+                    const saved = await rel.saveMany(related);
+                    await attachRows(saved, trx, fk);
+                    // NO wrapper flush: rel.saveMany self-dispatches via #inManagedTx
+                    // (all-or-nothing). A second flush would double on partial failure.
                     return saved;
-                },
+                }),
             };
+            // attach/detach/sync operate DIRECTLY on the pivot using the parent key —
+            // unlike create/save they never persist the parent (there's no related row
+            // to hang the transaction on). Lucid requires a persisted parent WITH a key
+            // here (every doc example starts from `findOrFail`); without the guard a
+            // keyless/unsaved parent would write a pivot row with a null FK or target a
+            // nonexistent parent. Same seam as delete/refresh: E_MODEL_NOT_PERSISTED on
+            // an unsaved instance, E_MISSING_PRIMARY_KEY on a keyless projection.
+            const guardParent = (op) => this.#assertPersistedRow(entity, readParentId(), `related('${relationName}').${op}`, 
+            // The pivot FK references `parentPk` (localKey ?? PK) — name THAT key
+            // in a missing-key diagnostic, not always 'id'.
+            parentPk);
             const proxy = {
                 type: "manyToMany",
                 ...m2mOps,
                 query: scopedQuery,
-                attach,
-                detach,
-                sync,
+                // async so the guard throw surfaces as a REJECTED promise — a method
+                // typed `Promise<void>` must never throw synchronously.
+                attach: async (ids) => {
+                    guardParent("attach()");
+                    return attach(ids);
+                },
+                detach: async (ids) => {
+                    guardParent("detach()");
+                    return detach(ids);
+                },
+                sync: async (target, additive) => {
+                    guardParent("sync()");
+                    return sync(target, additive);
+                },
+            };
+            return proxy;
+        }
+        if (relation.type === "hasOneThrough" ||
+            relation.type === "hasManyThrough") {
+            // READ-ONLY (Lucid parity, verified): a through relation exposes only
+            // query()/preload. Every write is rejected — the old code fell through to
+            // the hasMany default and wrote to the WRONG table with a bogus direct FK.
+            // To persist, the caller must go through the intermediate model.
+            const rejectWrite = async (op) => {
+                throw new Error(`related('${relationName}').${op}() is not supported on ` +
+                    `@HasManyThrough/@HasOneThrough — through relations are READ-ONLY ` +
+                    `(Lucid parity); persist via the intermediate model.`);
+            };
+            const proxy = {
+                type: relation.type,
+                query: scopedQuery,
+                create: () => rejectWrite("create"),
+                save: () => rejectWrite("save"),
+                createMany: () => rejectWrite("createMany"),
+                saveMany: () => rejectWrite("saveMany"),
             };
             return proxy;
         }
@@ -1506,11 +2484,7 @@ export class BaseRepository {
     }
     async fresh(entity) {
         const pk = entity[this.#primaryKey];
-        if (pk === undefined || pk === null) {
-            throw new EntityNotFoundError(this.#entityClass.name, {
-                [this.#primaryKey]: pk,
-            });
-        }
+        this.#assertPersistedRow(entity, pk, "fresh()");
         const found = await this.find(pk);
         if (!found) {
             throw new EntityNotFoundError(this.#entityClass.name, {
@@ -1529,7 +2503,7 @@ export class BaseRepository {
         for (const col of this.#columns) {
             const value = entity[col];
             if (value !== undefined) {
-                row[camelToSnake(col)] = this.#applyPrepare(col, value);
+                row[this.#dbColumn(col)] = this.#applyPrepare(col, value, entity);
             }
         }
         return row;
@@ -1540,11 +2514,8 @@ export class BaseRepository {
             // Mirror `#plainToRowPairs` — skip undefined so updates can't bind it.
             if (value === undefined)
                 continue;
-            const propKey = this.#columnPrepares.has(key) ? key : snakeToCamel(key);
-            pairs.push([
-                this.#resolveColumn(key),
-                this.#applyPrepare(propKey, value),
-            ]);
+            // `#applyPrepare` normalises the key (property / snake / columnName).
+            pairs.push([this.#resolveColumn(key), this.#applyPrepare(key, value)]);
         }
         return pairs;
     }
@@ -1567,7 +2538,7 @@ export class BaseRepository {
  * adapter rejected — the dev has to bisect across every adapter-tagged
  * property to find the culprit.
  */
-function wrapAdapterError(phase, propertyKey, err) {
+export function wrapAdapterError(phase, propertyKey, err) {
     const message = err instanceof Error ? err.message : String(err);
     // `cause: err` preserves the original error (and its stack) per ES2022
     // Error Cause. The wrapped Error keeps its own `stack` pointing at the
@@ -1584,7 +2555,7 @@ function wrapAdapterError(phase, propertyKey, err) {
  * gives the user a column-annotated error instead of an opaque "Invalid bind
  * value" downstream when the unawaited Promise hits the NAPI boundary.
  */
-function assertNotPromise(phase, propertyKey, value) {
+export function assertNotPromise(phase, propertyKey, value) {
     if (value !== null &&
         typeof value === "object" &&
         "then" in value &&