@rebasepro/server-postgres 0.13.1-canary.gef9608c → 0.14.0

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/data-transformer.ts

@@ -2,12 +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.
@@ -126,16 +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
@@ -153,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,
@@ -175,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
@@ -197,7 +213,7 @@ joinPathRelationUpdates: [] };
             }
         }
 
-        result[key] = serializePropertyToServer(effectiveValue, property);
+        result[key] = serializePropertyToServer(effectiveValue, property, key);
     }
 
     return {
@@ -208,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;
             }
@@ -230,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;
@@ -243,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":
@@ -260,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;
                     }
@@ -321,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();
@@ -347,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
@@ -626,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") {
@@ -685,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,
@@ -697,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)) {
@@ -709,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()
     });
 

package/src/schema/auth-users-columns.ts

@@ -0,0 +1,131 @@
+/**
+ * The one description of what an auth user table's columns must be.
+ *
+ * ## Why this exists
+ *
+ * Three different code paths create `rebase.users`, and before this module they
+ * disagreed about it:
+ *
+ * | column           | `db push` (generator) | `ensureAuthTablesExist` | `ensureCollectionTables` |
+ * |------------------|-----------------------|-------------------------|--------------------------|
+ * | `email`          | `TEXT UNIQUE NOT NULL`| `TEXT NOT NULL` + CHECK | `TEXT` (nullable)        |
+ * | `roles`          | `TEXT[]`              | `NOT NULL DEFAULT '{}'` | nullable, no default     |
+ * | `email_verified` | `BOOLEAN`             | `NOT NULL DEFAULT FALSE`| nullable                 |
+ * | `created_at`     | `DEFAULT now()`       | `NOT NULL DEFAULT NOW()`| no default               |
+ *
+ * They are all `CREATE TABLE IF NOT EXISTS` / `ADD COLUMN IF NOT EXISTS`, so
+ * whichever ran first decided the table and the other two silently no-op'd.
+ * Boot order therefore chose the constraints: a managed deploy (collection
+ * tables first) got a users table whose `email` was nullable and whose
+ * `email_verified` had no default, while the same project pushed from a
+ * checkout got the strict one. In the same table, `is_anonymous` came out
+ * `NOT NULL DEFAULT false` — because *that* column existed in only one of the
+ * three lists, so its owner's definition won by default.
+ *
+ * A second consequence was drift in the other direction. The scaffold's
+ * `users.ts` describes 12 columns; auth needs 14. `db push` is declarative and
+ * builds its desired state from the collection alone, so the two columns only
+ * auth knows about (`is_anonymous`, `tokens_valid_after`) read as unmanaged
+ * drift, and a push run after the server had booted once planned to DROP them.
+ *
+ * Both problems are the same problem: no single place said what this table is.
+ * This is that place. Every creator asks here first and only then falls back to
+ * the collection's own property definitions, so a column auth owns has one
+ * definition regardless of who gets there first, and a column the developer
+ * added to their users collection still behaves like any other field.
+ *
+ * ## What belongs here
+ *
+ * Only columns the auth services read or write. A developer's own additions to
+ * their users collection (`bio`, `stripe_customer_id`) are ordinary columns and
+ * must NOT be listed — they are generated from the collection like every other
+ * field, and listing them here would freeze a user's schema.
+ *
+ * `id` is deliberately absent: its type comes from the collection's id property
+ * (uuid / increment / text) and each creator already derives it.
+ *
+ * Keep in step with {@link AUTH_SCHEMA_VERSION} when a change here makes an
+ * older runtime unable to work against a migrated table.
+ */
+
+/**
+ * A column auth owns.
+ *
+ * Structured rather than one SQL string because the same facts are needed in
+ * three grammars — a `CREATE TABLE` column list, an `ADD COLUMN IF NOT EXISTS`,
+ * and a pair of `ALTER COLUMN … SET DEFAULT` / `SET NOT NULL` reconciles for a
+ * table that already exists with the wrong shape. Parsing a string back apart
+ * for the third of those is how the copies drifted in the first place.
+ */
+export interface AuthUsersColumn {
+    /** Physical column name. */
+    column: string;
+    /** Postgres type. */
+    type: string;
+    /** Default expression, verbatim, or absent for no default. */
+    default?: string;
+    /** Whether the column is NOT NULL. */
+    notNull?: boolean;
+}
+
+/**
+ * `email` is NOT NULL on purpose, and the anonymous sign-in route depends on it
+ * — it synthesizes `anon_<32 hex>@anonymous.local` rather than inserting NULL.
+ * The 320-char bound (RFC 5321) is a CHECK rather than a `VARCHAR(n)`, added
+ * separately by `ensureAuthTablesExist` so it can be `NOT VALID` on an adopted
+ * table that already holds a longer row.
+ */
+export const AUTH_USERS_COLUMNS: readonly AuthUsersColumn[] = [
+    { column: "email", type: "TEXT", notNull: true },
+    { column: "display_name", type: "TEXT" },
+    { column: "photo_url", type: "TEXT" },
+    { column: "roles", type: "TEXT[]", default: "'{}'", notNull: true },
+    { column: "password_hash", type: "TEXT" },
+    { column: "email_verified", type: "BOOLEAN", default: "FALSE", notNull: true },
+    { column: "email_verification_token", type: "TEXT" },
+    { column: "email_verification_sent_at", type: "TIMESTAMP WITH TIME ZONE" },
+    { column: "is_anonymous", type: "BOOLEAN", default: "FALSE", notNull: true },
+    { column: "metadata", type: "JSONB", default: "'{}'", notNull: true },
+    { column: "tokens_valid_after", type: "TIMESTAMP WITH TIME ZONE" },
+    { column: "created_at", type: "TIMESTAMP WITH TIME ZONE", default: "NOW()", notNull: true },
+    { column: "updated_at", type: "TIMESTAMP WITH TIME ZONE", default: "NOW()", notNull: true }
+];
+
+const BY_COLUMN = new Map(AUTH_USERS_COLUMNS.map(c => [c.column, c]));
+
+/** Type + inline constraints, as they appear after the column name. */
+export function authUsersColumnSql(spec: AuthUsersColumn): string {
+    return [
+        spec.type,
+        spec.default !== undefined ? `DEFAULT ${spec.default}` : "",
+        spec.notNull ? "NOT NULL" : ""
+    ].filter(Boolean).join(" ");
+}
+
+/**
+ * The auth-owned definition for a physical column name, or `undefined` when
+ * auth does not own it.
+ *
+ * Callers pass the RESOLVED column name (after `columnName` mapping), because
+ * that is the only name the three creators agree on: the scaffold's users
+ * collection spells the property `displayName` and the column `display_name`.
+ */
+export function authUsersColumnDefinition(column: string): string | undefined {
+    const spec = BY_COLUMN.get(column);
+    return spec ? authUsersColumnSql(spec) : undefined;
+}
+
+/**
+ * Whether a collection is an auth collection, i.e. whether the definitions in
+ * this module apply to its table at all.
+ *
+ * Duplicated in shape from `@rebasepro/common`'s policy defaults on purpose:
+ * that one takes a `CollectionConfig`, this one is called from DDL code paths
+ * that hold looser objects, and both spellings must accept `auth: true` as well
+ * as `auth: { enabled: true }`.
+ */
+export function isAuthCollection(collection: unknown): boolean {
+    const auth = (collection as { auth?: unknown } | undefined)?.auth;
+    if (auth === true) return true;
+    return typeof auth === "object" && auth !== null && (auth as { enabled?: unknown }).enabled === true;
+}

package/src/schema/doctor-cli.ts

@@ -5,62 +5,8 @@
  */
 import path from "path";
 import chalk from "chalk";
-import fs from "fs";
-import { runDoctor, loadCollections } from "./doctor";
-import { checkPolicyDrift, formatPolicyDrift, hasDrift } from "../security/policy-drift";
-import { validatePolicyPgRoles, warnOnAnonymousGrants } from "../security/rls-enforcement";
-import { logger } from "@rebasepro/server";
-
-/**
- * The RLS half of the doctor: policies actually deployed vs the ones the
- * collections describe, plus policy roles this server could never satisfy.
- *
- * Returns true when something is wrong, so callers can set the exit code.
- */
-async function runPolicyChecks(collectionsPath: string, databaseUrl?: string): Promise<boolean> {
-    if (!databaseUrl) {
-        logger.warn(chalk.yellow("  ⚠ No DATABASE_URL — skipping RLS policy checks"));
-        return false;
-    }
-
-    let problems = false;
-    const { Pool } = await import("pg");
-    const pool = new Pool({ connectionString: databaseUrl });
-    try {
-        const collections = await loadCollections(path.resolve(process.cwd(), collectionsPath));
-        const runSql = async (text: string) => (await pool.query(text)).rows as Record<string, unknown>[];
-
-        // A policy naming a role the server never runs as filters every row, so
-        // the collection reads as empty. Report it without booting a server.
-        try {
-            await validatePolicyPgRoles(runSql, collections as never);
-            logger.info(chalk.green("  ✓ Policy roles are usable by this server"));
-        } catch (err) {
-            problems = true;
-            logger.info("");
-            logger.error(chalk.red(err instanceof Error ? err.message : String(err)));
-        }
-
-        // A rule that reads as a lockdown but is true for every caller compiles
-        // to a grant. Report it without booting a server.
-        warnOnAnonymousGrants(collections as never);
-
-        const drift = await checkPolicyDrift(pool as never, collections);
-        logger.info("");
-        if (hasDrift(drift)) {
-            problems = true;
-            logger.info(chalk.yellow("  RLS policies: database does not match your collections"));
-            logger.info(formatPolicyDrift(drift));
-        } else {
-            logger.info(chalk.green("  ✓ RLS policies match your collections"));
-        }
-    } catch (err) {
-        logger.warn(chalk.yellow("  ⚠ Could not check RLS policies"), { error: err });
-    } finally {
-        await pool.end();
-    }
-    return problems;
-}
+import { runDoctor } from "./doctor";
+import { exitCodeForPolicyGate, runPolicyChecks } from "./doctor-policy-checks";
 
 async function main() {
     const collectionsArg = process.argv.find((a) => a.startsWith("--collections="));
@@ -80,9 +26,9 @@ async function main() {
         const dotenv = await import("dotenv");
         const envPath = process.env.DOTENV_CONFIG_PATH;
         if (envPath) {
-            dotenv.config({ path: envPath });
+            dotenv.config({ path: envPath, quiet: true });
         } else {
-            dotenv.config();
+            dotenv.config({ quiet: true });
         }
     } catch {
         // dotenv may not be installed
@@ -91,9 +37,9 @@ async function main() {
     const databaseUrl = process.env.DATABASE_URL || process.env.ADMIN_CONNECTION_STRING;
 
     if (policiesOnly) {
-        // Non-zero so this can gate CI — the whole point of the flag.
-        if (await runPolicyChecks(collectionsPath, databaseUrl)) process.exit(1);
-        return;
+        // Non-zero so this can gate CI — the whole point of the flag, and a
+        // check that could not run has not passed. See exitCodeForPolicyGate.
+        process.exit(exitCodeForPolicyGate(await runPolicyChecks(collectionsPath, databaseUrl)));
     }
 
     const report = await runDoctor({
@@ -103,15 +49,18 @@ async function main() {
         databaseUrl: databaseUrl ?? undefined
     });
 
-    const policiesDrifted = await runPolicyChecks(collectionsPath, databaseUrl);
+    const policyStatus = await runPolicyChecks(collectionsPath, databaseUrl);
 
-    // Exit with non-zero code if there are errors
-    if (report.summary.errors > 0 || policiesDrifted) {
+    // Exit non-zero if there are errors. A policy run that could not happen is
+    // reported loudly above but does not fail the interactive command — the
+    // same treatment the skipped database phase gets. `--policies` is the gate,
+    // and that one fails closed.
+    if (report.summary.errors > 0 || policyStatus === "problems") {
         process.exit(1);
     }
 }
 
 main().catch((err) => {
-    logger.error(chalk.red("  ✗ Doctor failed"), { error: err });
+    console.error(chalk.red("  ✗ Doctor failed"), err instanceof Error ? (err.stack ?? err.message) : String(err));
     process.exit(1);
 });