@rebasepro/server-postgres 0.13.0 → 0.13.1-canary.g1822133

package/src/collections/buildRegistry.ts

@@ -34,7 +34,9 @@ export function buildCollectionRegistry(schema: RegistrySchema): PostgresCollect
 
     if (schema.collections) {
         registry.registerMultiple(schema.collections);
-        logger.info(
+        // `Auto-discovered collections` already reports the count and the
+        // directory they came from; this is the same fact with the names.
+        logger.debug(
             `📋 [PostgresRegistry] Registered ${registry.getCollections().length} collections: ` +
             `[${registry.getCollections().map(c => c.slug).join(", ")}]`
         );

package/src/collections/validate-relations.ts

@@ -2,6 +2,7 @@ import { getTableColumns } from "drizzle-orm";
 import { PgTable } from "drizzle-orm/pg-core";
 import { CollectionConfig, ResolvedRelation } from "@rebasepro/types";
 import { getTableName, resolveCollectionRelations } from "@rebasepro/common";
+import { generateForeignKeyName, legacyForeignKeyName } from "@rebasepro/utils";
 
 import { PostgresCollectionRegistry } from "./PostgresCollectionRegistry";
 
@@ -58,6 +59,68 @@ const quote = (xs: Iterable<string>) => Array.from(xs).map(s => `\`${s}\``).join
 /** `on.from` / `on.to` accept a single column or a composite tuple. */
 const asColumns = (value: string | string[]): string[] => Array.isArray(value) ? value : [value];
 
+/**
+ * Distinguish "this column name is wrong" from "the generated schema is old".
+ *
+ * They present identically here — a relation asks for a column the registered
+ * table does not have — but they are opposite problems with opposite fixes, and
+ * getting them the wrong way round is how the 0.12 → 0.13 upgrade bricked
+ * projects.
+ *
+ * The registered table is not the database. It comes from the project's
+ * checked-in `backend/src/schema.generated.ts`, and 0.13 changed the rule that
+ * derives foreign-key names: `categories` yields `category_id` where it used to
+ * yield `categorie_id`. Boot-ensure renames the database column to match, so by
+ * the time this runs the *database* is correct and the *generated module* is the
+ * stale one. Reporting "not a column" then points at the wrong artifact, and the
+ * generic fix — "set `through.targetColumn` to one of: …", listing the legacy
+ * name because that is what the stale module still has — talks the reader into
+ * pinning a column that no longer exists.
+ *
+ * So when the wanted name is what the current rule derives, and the table
+ * carries what the *previous* rule would have derived from the same source, say
+ * that instead.
+ *
+ * @param wanted   the column the relation asks for
+ * @param available every column the registered table has
+ * @param sources  names the default could have been derived from (a slug, a
+ *                 relation name) — checking against these rather than guessing
+ *                 backwards from `wanted` keeps the match exact
+ */
+function staleCodegenRename(
+    wanted: string,
+    available: Set<string>,
+    sources: string[]
+): { legacy: string; current: string } | null {
+    for (const source of sources) {
+        if (!source) continue;
+        const current = generateForeignKeyName(source);
+        const legacy = legacyForeignKeyName(source);
+        // Only a name that actually moved, and only when the table still has the
+        // old spelling and not the new one.
+        if (current !== wanted || legacy === current) continue;
+        if (available.has(legacy) && !available.has(current)) return { legacy, current };
+    }
+    return null;
+}
+
+/** The shared explanation, so every relation kind reports it identically. */
+function staleCodegenDefect(
+    table: string,
+    { legacy, current }: { legacy: string; current: string }
+): Pick<RelationDefect, "problem" | "fix"> {
+    return {
+        problem:
+            `the generated Drizzle schema still declares \`${legacy}\` on \`${table}\`, but this ` +
+            `release derives \`${current}\` — the generated schema predates the foreign-key ` +
+            "naming fix and no longer describes the database",
+        fix:
+            "regenerate it with `rebase schema generate` (or `pnpm run schema:generate`). The " +
+            "database column has already been renamed for you at boot, so nothing else is needed. " +
+            `To keep \`${legacy}\` instead, name it explicitly on the relation and regenerate.`
+    };
+}
+
 /**
  * Relations whose names do not resolve against the registered schema.
  *
@@ -117,11 +180,20 @@ kind: relation.kind };
             switch (relation.kind) {
                 case "belongsTo": {
                     if (!sourceColumns.has(relation.localKey)) {
-                        defects.push({
-                            ...at,
-                            problem: `\`localKey: "${relation.localKey}"\` is not a column on \`${sourceTableName}\``,
-                            fix: `add the column, or set \`localKey\` to one of: ${quote(sourceColumns)}`
-                        });
+                        // `localKey` defaults to the relation name run through
+                        // the foreign-key rule, so it moves with that rule.
+                        const stale = staleCodegenRename(
+                            relation.localKey,
+                            sourceColumns,
+                            [relation.relationName, targetCollection.slug]
+                        );
+                        defects.push(stale
+                            ? { ...at, ...staleCodegenDefect(sourceTableName, stale) }
+                            : {
+                                ...at,
+                                problem: `\`localKey: "${relation.localKey}"\` is not a column on \`${sourceTableName}\``,
+                                fix: `add the column, or set \`localKey\` to one of: ${quote(sourceColumns)}`
+                            });
                     }
                     break;
                 }
@@ -129,11 +201,20 @@ kind: relation.kind };
                 case "hasOne":
                 case "hasMany": {
                     if (!targetColumns.has(relation.foreignKeyOnTarget)) {
-                        defects.push({
-                            ...at,
-                            problem: `\`foreignKeyOnTarget: "${relation.foreignKeyOnTarget}"\` is not a column on the target table \`${targetTableName}\``,
-                            fix: `add the column, or set \`foreignKeyOnTarget\` to one of: ${quote(targetColumns)}`
-                        });
+                        // The default is derived from *this* collection's slug —
+                        // the column on the target that points back here.
+                        const stale = staleCodegenRename(
+                            relation.foreignKeyOnTarget,
+                            targetColumns,
+                            [collection.slug]
+                        );
+                        defects.push(stale
+                            ? { ...at, ...staleCodegenDefect(targetTableName, stale) }
+                            : {
+                                ...at,
+                                problem: `\`foreignKeyOnTarget: "${relation.foreignKeyOnTarget}"\` is not a column on the target table \`${targetTableName}\``,
+                                fix: `add the column, or set \`foreignKeyOnTarget\` to one of: ${quote(targetColumns)}`
+                            });
                     }
                     // `sourceKey` is the easiest of the two to put on the wrong
                     // side — it is the only column in a `hasMany` that lives
@@ -167,14 +248,24 @@ kind: relation.kind };
                         break;
                     }
                     const junctionColumns = columnNames(junction);
+                    // Junction columns are the ones that actually moved in 0.13:
+                    // each defaults to its endpoint collection's *slug* run
+                    // through the foreign-key rule, and slugs are plural.
+                    const derivedFrom = {
+                        sourceColumn: [collection.slug],
+                        targetColumn: [targetCollection.slug]
+                    } as const;
                     for (const [label, column] of [["sourceColumn", sourceColumn], ["targetColumn", targetColumn]] as const) {
                         if (!junctionColumns.has(column)) {
-                            defects.push({
-                                ...at,
-                                problem: `\`through.${label}: "${column}"\` is not a column on the junction table \`${table}\``,
-                                fix: `set \`through.${label}\` to one of: ${quote(junctionColumns)}` +
-                                    (label === "sourceColumn" ? " — it is the column naming *this* collection" : "")
-                            });
+                            const stale = staleCodegenRename(column, junctionColumns, [...derivedFrom[label]]);
+                            defects.push(stale
+                                ? { ...at, ...staleCodegenDefect(table, stale) }
+                                : {
+                                    ...at,
+                                    problem: `\`through.${label}: "${column}"\` is not a column on the junction table \`${table}\``,
+                                    fix: `set \`through.${label}\` to one of: ${quote(junctionColumns)}` +
+                                        (label === "sourceColumn" ? " — it is the column naming *this* collection" : "")
+                                });
                         }
                     }
                     break;
@@ -287,9 +378,25 @@ export function assertRelationsResolve(
     );
 
     throw new Error(
-        `${defects.length} relation${defects.length === 1 ? "" : "s"} cannot resolve against the database schema.\n\n` +
+        `${defects.length} relation${defects.length === 1 ? "" : "s"} cannot resolve against ` +
+        "`backend/src/schema.generated.ts`.\n\n" +
         "Each of these would return no rows at query time rather than reporting an error, " +
         "so they are fatal at boot instead.\n\n" +
+        // This reads the *generated file*, not the database, and the difference
+        // is the whole diagnosis after an upgrade. Boot-ensure renames columns
+        // in the database — a 0.12 → 0.13 upgrade singularises a junction key,
+        // `categorie_id` → `category_id` — and the checked-in file still
+        // declares the old name. The config is then correct and the file is
+        // stale, so the per-defect advice below, which lists the columns this
+        // file has, names a column that no longer exists in the database.
+        // Following it turns a recoverable state into a broken config.
+        //
+        // Hence the ordering: regenerate first, and only then consider that the
+        // collection might be the thing that is wrong.
+        "If the database was migrated recently — an upgrade, a `db push`, a restore — this file is\n" +
+        "probably older than the schema it describes. Regenerate it before changing anything else:\n\n" +
+        "    rebase schema generate\n\n" +
+        "If it is already current, then the collection is what disagrees with it:\n\n" +
         lines.join("\n\n") + "\n"
     );
 }

package/src/data-transformer.ts

@@ -2,11 +2,12 @@ import { eq, SQL } from "drizzle-orm";
 import { AnyPgColumn } from "drizzle-orm/pg-core";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { CollectionConfig, Properties, Property, ResolvedRelation, RelationProperty, Vector, BinaryProperty, hasForeignKeyOnTarget, type ResolvedBelongsTo, type ResolvedForeignKeyOnTarget, type ResolvedVia } from "@rebasepro/types";
-import { getTableName, resolveCollectionRelations, findRelation, createRelationRef, DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE } from "@rebasepro/common";
+import { getTableName, resolveCollectionRelations, findRelation, fieldKeyForColumn, createRelationRef, DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE } from "@rebasepro/common";
+import { isPrototypePollutingKey } from "@rebasepro/utils";
 import { PostgresCollectionRegistry } from "./collections/PostgresCollectionRegistry";
 import { DrizzleConditionBuilder } from "./utils/drizzle-conditions";
 import { getPrimaryKeys, buildCompositeId } from "./services/collection-helpers";
-import { logger } from "@rebasepro/server";
+import { ApiError, logger } from "@rebasepro/server";
 
 /**
  * Data transformation utilities for converting between frontend and database formats.
@@ -68,9 +69,15 @@ export function sanitizeAndConvertDates(obj: unknown): unknown {
     if (typeof obj === "object") {
         const newObj: Record<string, unknown> = {};
         for (const key in obj) {
-            if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                newObj[key] = sanitizeAndConvertDates((obj as Record<string, unknown>)[key]);
-            }
+            if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
+            // `JSON.parse` creates `__proto__` as an *own* property, so it gets
+            // past the check above — and `newObj[key] = …` then invokes the
+            // prototype setter instead of creating a property. The row's
+            // prototype becomes whatever the request body supplied, so
+            // `row.isAdmin` answers `true` while `Object.keys(row)` shows
+            // nothing of the sort. No column can be reached by these names.
+            if (isPrototypePollutingKey(key)) continue;
+            newObj[key] = sanitizeAndConvertDates((obj as Record<string, unknown>)[key]);
         }
         return newObj;
     }
@@ -119,13 +126,30 @@ joinPathRelationUpdates: [] };
         newTargetId: string | number | null;
     }> = [];
 
-    // Pre-calculate all local keys used as foreign keys
+    // Pre-calculate all local keys used as foreign keys.
+    //
+    // Keyed by the *wire* name: the payload arrives from a client, which knows
+    // the field as `authorId`, never as the `author_id` column behind it.
     const foreignKeys = new Set<string>();
     Object.values(resolvedRelations).forEach(relation => {
-        if (relation.kind === "belongsTo") foreignKeys.add(relation.localKey);
+        if (relation.kind === "belongsTo") foreignKeys.add(fieldKeyForColumn(collection, relation.localKey));
     });
 
     for (const [key, value] of Object.entries(row)) {
+        // Same reasoning as `sanitizeAndConvertDates`: these keys come from the
+        // request body, and no column answers to them.
+        if (isPrototypePollutingKey(key)) continue;
+
+        // `{ subtitle: undefined }` means "I have no value for this", not "set
+        // this column to NULL" — it is what spreading an optional field
+        // produces, and what Drizzle itself skips. The key used to survive with
+        // `undefined` and `sanitizeAndConvertDates` then turned it into `null`,
+        // so `update(id, { title, subtitle: payload.subtitle })` wiped
+        // `subtitle` whenever the payload happened not to carry one. Unreachable
+        // over HTTP (JSON has no `undefined`); the in-process data API passes
+        // the caller's object straight through, so it is reachable there.
+        if (value === undefined) continue;
+
         const property = properties[key as keyof M] as Property;
 
         // Coerce empty strings to null for any field that acts as a foreign key
@@ -143,15 +167,17 @@ joinPathRelationUpdates: [] };
             if (relation) {
                 if (relation.kind === "belongsTo") {
                     // Owning relation: Map relation object to FK column on current table
-                    const serializedValue = serializePropertyToServer(effectiveValue, property);
+                    const serializedValue = serializePropertyToServer(effectiveValue, property, key);
                     if (serializedValue !== undefined) {
-                        result[relation.localKey] = serializedValue;
+                        // The Drizzle key, not the column: Drizzle maps it back
+                        // to `author_id` when it builds the statement.
+                        result[fieldKeyForColumn(collection, relation.localKey)] = serializedValue;
                     }
                     // Don't add the original relation property to the result
                     continue;
                 } else if (hasForeignKeyOnTarget(relation)) {
                     // Inverse relation: Need to update the target table's FK
-                    const serializedValue = serializePropertyToServer(effectiveValue, property);
+                    const serializedValue = serializePropertyToServer(effectiveValue, property, key);
                     inverseRelationUpdates.push({
                         relationKey: key,
                         relation,
@@ -165,7 +191,7 @@ joinPathRelationUpdates: [] };
                     // There used to be two arms here — "owning" and "inverse"
                     // joinPath — but a join chain has no owning side, so they
                     // only ever differed by which list they pushed to.
-                    const serializedValue = serializePropertyToServer(effectiveValue, property);
+                    const serializedValue = serializePropertyToServer(effectiveValue, property, key);
                     if (relation.cardinality === "one") {
                         // Ordering matters: PersistService applies these BEFORE
                         // the main UPDATE, so the mapping reads the pre-update
@@ -187,7 +213,7 @@ joinPathRelationUpdates: [] };
             }
         }
 
-        result[key] = serializePropertyToServer(effectiveValue, property);
+        result[key] = serializePropertyToServer(effectiveValue, property, key);
     }
 
     return {
@@ -198,19 +224,41 @@ joinPathRelationUpdates: [] };
 }
 
 /**
- * Serialize a single property value for database storage
+ * How to name a rejected value in an error, without quoting it back.
+ *
+ * The value may be anything the caller sent, including a secret in the wrong
+ * field, so the message describes its shape rather than echoing it — an echoed
+ * value ends up in logs and in error-reporting services.
  */
-export function serializePropertyToServer(value: unknown, property: Property): unknown {
+function describeValue(value: unknown): string {
+    if (value === null) return "null";
+    if (Array.isArray(value)) return "an array";
+    if (value instanceof Date) return "a date";
+    const type = typeof value;
+    return type === "object" ? "an object" : `a ${type}`;
+}
+
+/**
+ * Serialize a single property value for database storage.
+ *
+ * `propertyKey` is only ever used to phrase errors and warnings. Without it the
+ * one trace a bad value left was `Expected array value for array property, got
+ * string` — no collection, no property, no value, which in the log of a
+ * thousand-row import names nothing at all.
+ */
+export function serializePropertyToServer(value: unknown, property: Property, propertyKey?: string): unknown {
     if (value === null || value === undefined) {
         return value;
     }
 
+    const fieldLabel = propertyKey ? `'${propertyKey}'` : `a '${property.type}' field`;
+
     const propertyType = property.type;
 
     switch (propertyType) {
         case "relation":
             if (Array.isArray(value)) {
-                return value.map(v => serializePropertyToServer(v, property));
+                return value.map(v => serializePropertyToServer(v, property, propertyKey));
             } else if (typeof value === "object" && value !== null && "id" in value) {
                 return (value as Record<string, unknown>).id;
             }
@@ -220,7 +268,7 @@ export function serializePropertyToServer(value: unknown, property: Property): u
         case "array":
             if (Array.isArray(value)) {
                 if (property.of) {
-                    return value.map(item => serializePropertyToServer(item, property.of as Property));
+                    return value.map(item => serializePropertyToServer(item, property.of as Property, propertyKey));
                 } else if (property.oneOf) {
                     const typeField = property.oneOf.typeField ?? DEFAULT_ONE_OF_TYPE;
                     const valueField = property.oneOf.valueField ?? DEFAULT_ONE_OF_VALUE;
@@ -233,15 +281,50 @@ export function serializePropertyToServer(value: unknown, property: Property): u
                         if (!type || !childProperty) return e;
                         return {
                             [typeField]: type,
-                            [valueField]: serializePropertyToServer(rec[valueField], childProperty)
+                            [valueField]: serializePropertyToServer(rec[valueField], childProperty, propertyKey)
                         };
                     });
                 }
                 return value;
             }
-            // Non-array value for an array property — coerce to avoid .map() crashes downstream
-            logger.warn(`Expected array value for array property, got ${typeof value}. Coercing to empty array.`);
-            return [];
+            // A non-array value used to become `[]` here — the caller's value
+            // destroyed, answered 200/201, and the row reading back as an empty
+            // list on every later fetch. `POST /posts {"tags":"news"}` from a
+            // client that sent a single tag as a scalar, or a CSV import that
+            // did not split a column, was unrecoverable data loss on a `text[]`
+            // column. The stated reason for coercing — "avoid .map() crashes
+            // downstream" — is better served by refusing the value at the
+            // boundary, which is what a 400 does.
+            //
+            // The read-side twin (`parsePropertyFromServer`) still coerces, and
+            // should: a row already in the database is not this caller's fault.
+            throw ApiError.badRequest(
+                `${fieldLabel} expects an array, but received ${describeValue(value)}.`,
+                "VALIDATION_INVALID_VALUE"
+            );
+
+        case "geopoint": {
+            // Stored as `jsonb`, in the `{ latitude, longitude }` shape the
+            // OpenAPI schema and the generated TS type both promise. Nothing
+            // used to handle `geopoint` on either side, which is why the type
+            // was documented, code-generated, admin-editable — and dropped.
+            if (typeof value !== "object" || Array.isArray(value)) {
+                throw ApiError.badRequest(
+                    `${fieldLabel} expects a geopoint object with \`latitude\` and \`longitude\`, ` +
+                    `but received ${describeValue(value)}.`,
+                    "VALIDATION_INVALID_VALUE"
+                );
+            }
+            const point = value as Record<string, unknown>;
+            if (typeof point.latitude !== "number" || typeof point.longitude !== "number") {
+                throw ApiError.badRequest(
+                    `${fieldLabel} expects a geopoint object with numeric \`latitude\` and \`longitude\`.`,
+                    "VALIDATION_INVALID_VALUE"
+                );
+            }
+            return { latitude: point.latitude,
+longitude: point.longitude };
+        }
 
 
         case "map":
@@ -250,7 +333,7 @@ export function serializePropertyToServer(value: unknown, property: Property): u
                 for (const [subKey, subValue] of Object.entries(value)) {
                     const subProperty = (property.properties as Properties)[subKey];
                     if (subProperty) {
-                        result[subKey] = serializePropertyToServer(subValue, subProperty);
+                        result[subKey] = serializePropertyToServer(subValue, subProperty, propertyKey ? `${propertyKey}.${subKey}` : subKey);
                     } else {
                         result[subKey] = subValue;
                     }
@@ -311,9 +394,12 @@ export async function parseDataFromServer<M extends Record<string, unknown>>(
             // Find the normalized relation for this property
             const relation = findRelation(resolvedRelations, propKey);
             if (relation) {
-                if (relation.kind === "belongsTo" && relation.localKey in data) {
-                    // Owning relation: FK is in current table
-                    const fkValue = data[relation.localKey as keyof M];
+                const localField = relation.kind === "belongsTo"
+                    ? fieldKeyForColumn(collection, relation.localKey)
+                    : "";
+                if (relation.kind === "belongsTo" && localField in data) {
+                    // Owning relation: FK is in current table, under its wire name
+                    const fkValue = data[localField as keyof M];
                     if (fkValue !== null && fkValue !== undefined) {
                         try {
                             const targetCollection = relation.target();
@@ -337,7 +423,8 @@ export async function parseDataFromServer<M extends Record<string, unknown>>(
                             : buildCompositeId(data, pks);
 
                         if (targetTable && currentId !== undefined && currentId !== null && currentId !== "") {
-                            const foreignKeyColumn = targetTable[relation.foreignKeyOnTarget as keyof typeof targetTable] as AnyPgColumn;
+                            const fkFieldKey = fieldKeyForColumn(targetCollection, relation.foreignKeyOnTarget);
+                            const foreignKeyColumn = targetTable[fkFieldKey as keyof typeof targetTable] as AnyPgColumn;
                             if (foreignKeyColumn) {
                                 // Query the target table to find row that references this row
                                 const relatedRows = await db
@@ -616,6 +703,13 @@ export function parsePropertyFromServer(value: unknown, property: Property, coll
             }
             return value;
 
+        case "geopoint":
+            // A `jsonb` column, so node-postgres hands back the object already.
+            // Named explicitly rather than left to `default:`, which would run
+            // it past the Buffer probe — and because a type with a write
+            // serializer and no read counterpart is how this one went missing.
+            return value;
+
         case "vector": {
             let nums: number[] = [];
             if (typeof value === "string") {
@@ -675,6 +769,15 @@ export function parsePropertyFromServer(value: unknown, property: Property, coll
  *                       from the result (used by `normalizeDbValues` where
  *                       Drizzle's relational API already hydrates them).
  */
+/**
+ * Keys a query computes and attaches to a row, rather than reads from a column.
+ *
+ * An explicit set rather than a `_` prefix rule: a user's column may perfectly
+ * well be called `_internal`, and passing it through here would put a value on
+ * the row that no property describes and nothing downstream knows how to type.
+ */
+const QUERY_METADATA_KEYS = new Set(["_score", "_distance", "_matches"]);
+
 function normalizeScalarValues<M extends Record<string, unknown>>(
     data: M,
     properties: Properties,
@@ -687,9 +790,11 @@ function normalizeScalarValues<M extends Record<string, unknown>>(
     // Identify FK columns used only for relations and not exposed as properties
     const internalFKColumns = new Set<string>();
     Object.values(resolvedRelations).forEach(relation => {
-        if (relation.kind === "belongsTo" && !properties[relation.localKey]) {
-            internalFKColumns.add(relation.localKey);
-        }
+        if (relation.kind !== "belongsTo") return;
+        // The key a row carries this foreign key under, which is the wire name
+        // — `authorId`, not the `author_id` column.
+        const localField = fieldKeyForColumn(collection, relation.localKey);
+        if (!properties[localField]) internalFKColumns.add(localField);
     });
 
     for (const [key, value] of Object.entries(data)) {
@@ -699,6 +804,15 @@ function normalizeScalarValues<M extends Record<string, unknown>>(
             continue;
         }
 
+        // Query-computed metadata, which by definition is not a column and so
+        // has no property to be found. Dropped here until now — which meant
+        // `_distance` was computed for every vector search on this path and
+        // then discarded before the caller ever saw it.
+        if (QUERY_METADATA_KEYS.has(key)) {
+            result[key] = value;
+            continue;
+        }
+
         const property = properties[key as keyof M] as Property;
         if (!property) continue; // Skip DB columns not defined in properties
 

package/src/history/ensure-history-table.ts

@@ -1,6 +1,7 @@
 import { sql } from "drizzle-orm";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { logger } from "@rebasepro/server";
+import { revokeInternalTableSql } from "@rebasepro/common";
 
 /**
  * Auto-create the row history table if it doesn't exist.
@@ -8,7 +9,7 @@ import { logger } from "@rebasepro/server";
  * pattern as `ensureAuthTablesExist`.
  */
 export async function ensureHistoryTableExists(db: NodePgDatabase): Promise<void> {
-    logger.info("🔍 Checking row history table...");
+    logger.debug("🔍 Checking row history table...");
 
     try {
         // Create the rebase schema (idempotent — may already exist from auth init)
@@ -38,7 +39,13 @@ export async function ensureHistoryTableExists(db: NodePgDatabase): Promise<void
             ON rebase.entity_history(table_name, entity_id, updated_at DESC)
         `);
 
-        logger.info("✅ Entity history table ready");
+        // Every previous value of every audited row, in one table with no RLS
+        // and no tenant scoping — so a readable copy defeats the row policies on
+        // the tables it shadows. The driver's schema-wide grant reaches it
+        // (created here, after that grant ran), so take it back.
+        await db.execute(sql.raw(revokeInternalTableSql("rebase", "entity_history")));
+
+        logger.debug("✅ Entity history table ready");
     } catch (error) {
         logger.error("❌ Failed to create row history table", { error: error });
         logger.warn("⚠️ Continuing without creating history table.");

package/src/schema/auth-schema.ts

@@ -1,4 +1,4 @@
-import { pgSchema, pgTable, uuid, timestamp, boolean, jsonb, text, unique, index } from "drizzle-orm/pg-core";
+import { pgSchema, pgTable, uuid, timestamp, boolean, jsonb, text, unique, index, integer, bigint } from "drizzle-orm/pg-core";
 import { relations } from "drizzle-orm";
 
 /**
@@ -87,6 +87,13 @@ export function createAuthSchema(usersSchemaName = "rebase") {
          * that rotates immediately after it.
          */
         sessionStartedAt: timestamp("session_started_at").defaultNow().notNull(),
+        /**
+         * The assurance level the sign-in was established at — `aal2` only
+         * where a second factor was actually presented. Carried across
+         * rotations, because refresh is not a new authentication and has
+         * nothing else to read the level from.
+         */
+        aal: text("aal"),
         userAgent: text("user_agent"),
         ipAddress: text("ip_address"),
         createdAt: timestamp("created_at").defaultNow().notNull()
@@ -140,6 +147,13 @@ export function createAuthSchema(usersSchemaName = "rebase") {
         secretEncrypted: text("secret_encrypted").notNull(),
         friendlyName: text("friendly_name"),
         verified: boolean("verified").default(false).notNull(),
+        /**
+         * The highest TOTP time step ever accepted for this factor. RFC 6238
+         * §5.2 forbids accepting an OTP twice, and the ±1 step window that
+         * exists for clock drift is also a 90-second replay window: without
+         * this, one observed code buys a fresh session for a minute and a half.
+         */
+        lastUsedCounter: bigint("last_used_counter", { mode: "number" }),
         createdAt: timestamp("created_at").defaultNow().notNull(),
         updatedAt: timestamp("updated_at").defaultNow().notNull()
     });
@@ -153,6 +167,8 @@ export function createAuthSchema(usersSchemaName = "rebase") {
         createdAt: timestamp("created_at").defaultNow().notNull(),
         verifiedAt: timestamp("verified_at"),
         ipAddress: text("ip_address"),
+        /** Failed guesses recorded against this challenge; bounded by the route. */
+        attempts: integer("attempts").default(0).notNull(),
         expiresAt: timestamp("expires_at").notNull()
     });