@everystack/cli 0.4.50 → 0.4.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/cli",
-  "version": "0.4.50",
+  "version": "0.4.52",
   "description": "CLI and OTA updates for Expo apps on everystack",
   "license": "AGPL-3.0-only",
   "author": "Scalable Technology, Inc. <licensing@scalable.technology>",
@@ -109,7 +109,7 @@
     "structured-headers": "1.0.1",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "@everystack/model": "0.4.13"
+    "@everystack/model": "0.4.14"
   },
   "peerDependencies": {
     "@everystack/server": ">=0.4.0",

package/src/cli/authz-compile.ts

@@ -555,7 +555,12 @@ export function compileTableContract(model: ModelDescriptor, opts: CompileOption
     // policies. 'app' writes through its policies -> FORCE; 'worker'/'functions'
     // write on the owner connection and bypass RLS -> ENABLE-not-FORCE (on RDS the
     // owner is not a superuser, so a FORCEd table would block the owner's own writes).
-    rls: { enabled: true, forced: model.writtenBy === 'app' },
+    // `rls: false` (grants-only table) declares the flag OFF — defineModel guarantees
+    // zero abilities and a non-'app' principal there. Compared against `false`, not
+    // truthiness: a descriptor minted by an older @everystack/model carries no `rls`
+    // key, and undefined must mean ENABLED — the pre-flag behavior — never a silent
+    // security downgrade via version skew.
+    rls: { enabled: model.rls !== false, forced: model.rls !== false && model.writtenBy === 'app' },
     grants: compileGrants(abilities, model.privileges),
     ...(compileColumnGrants(abilities) ? { columnGrants: compileColumnGrants(abilities) } : {}),
     policies,

package/src/cli/authz-derive.ts

@@ -326,8 +326,19 @@ function renderColumnAbility(
  * Deliberately conservative. Every branch that cannot prove what it would emit falls
  * through to `notes` rather than guessing — the caller renders those as comments beside
  * the model, so the human sees the real rule and decides.
+ *
+ * `governRoles` (db:pull --govern-roles) is the operator's EXPLICIT decision to transcribe a
+ * foreign role's grants into `privileges` — which GOVERNS the role, per the doctrine on
+ * GOVERNED_VOCABULARY. Never inferred: a re-pull must not silently convert a rendering
+ * decision into an access decision. Transcription is complete-or-refuse — a governed role
+ * holding a column-scoped grant THROWS, because the model cannot express it for a foreign
+ * role and governing the role would make the next plan REVOKE it.
  */
-export function deriveAbilities(contract: TableContract): DerivedAbilities {
+export function deriveAbilities(
+  contract: TableContract,
+  opts: { governRoles?: ReadonlySet<string> } = {},
+): DerivedAbilities {
+  const govern = opts.governRoles ?? new Set<string>();
   const abilities: string[] = [];
   const notes: string[] = [];
   const table = contract.table;
@@ -599,6 +610,20 @@ export function deriveAbilities(contract: TableContract): DerivedAbilities {
   const renderedColumnRoles = new Set<string>();
   for (const grantee of Object.keys(contract.columnGrants ?? {}).sort()) {
     const byPriv = contract.columnGrants![grantee];
+    if (govern.has(grantee)) {
+      // Complete-or-refuse. Governing this role reconciles ALL its grants, and `privileges`
+      // has no column axis for a foreign role — a partial transcription would leave this
+      // grant undeclared on a governed role, and the very next plan would REVOKE it.
+      const held = Object.entries(byPriv)
+        .filter(([, cols]) => (cols ?? []).length)
+        .map(([priv, cols]) => `${priv}(${(cols ?? []).join(', ')})`);
+      throw new Error(
+        `${table}: --govern-roles ${grantee} refused — the role holds a COLUMN-scoped grant here: ${held.join('; ')}. ` +
+          `Governing a role transcribes and reconciles ALL of its grants, and the model cannot express a ` +
+          `column-scoped grant for a foreign role, so the next plan would revoke it. Normalize the grant to ` +
+          `table-wide in the database first, or leave the role ungoverned.`,
+      );
+    }
     for (const priv of Object.keys(byPriv).sort()) {
       const cols = byPriv[priv] ?? [];
       if (!cols.length) continue;
@@ -621,7 +646,7 @@ export function deriveAbilities(contract: TableContract): DerivedAbilities {
 
   // --- roles the compiler has no vocabulary for ----------------------------------------
   const unmappedRoles = Object.keys(contract.grants).filter(
-    (r) => !KNOWN_ROLES.has(r) && r !== 'PUBLIC' && r !== 'public' && !renderedColumnRoles.has(r),
+    (r) => !KNOWN_ROLES.has(r) && r !== 'PUBLIC' && r !== 'public' && !renderedColumnRoles.has(r) && !govern.has(r),
   );
 
   if (!abilities.length && !notes.length && !unmappedRoles.length) {
@@ -636,6 +661,18 @@ export function deriveAbilities(contract: TableContract): DerivedAbilities {
     privileges[role] = [...new Set([...(privileges[role] ?? []), ...privs])].sort();
   }
 
+  // --- roles the operator chose to GOVERN (--govern-roles) ------------------------------
+  //
+  // The whole grant, verbatim — DML and beyond-CRUD alike. These are the grants a fresh
+  // build must recreate (the migrations being deleted are what used to create them); a
+  // declared grant with no policy stays subject to the naked-grant WARN, which on an
+  // rls: false table correctly names it as live, deliberate, table-wide access.
+  for (const role of Object.keys(contract.grants).sort()) {
+    if (!govern.has(role)) continue;
+    const held = (contract.grants[role] ?? []).sort();
+    if (held.length) privileges[role] = [...new Set([...(privileges[role] ?? []), ...held])].sort();
+  }
+
   return { abilities, notes, unmappedRoles, privileges };
 }
 

package/src/cli/authz-lint.ts

@@ -1,7 +1,7 @@
 /**
  * authz-lint — the "force-RLS with no read authz" gate.
  *
- * Every modeled table gets RLS enabled (`compileTableContract` emits `rls.enabled: true`), and the
+ * A modeled table gets RLS enabled unless it declares `rls: false` (grants-only), and the
  * model is default-deny: no matching `can()` means no policy. So an EXPOSED table that declares no
  * read ability is a superuser-drop landmine — it reads fine while a bypassing role (a superuser
  * api) is in front, then returns empty for every app role the instant that role becomes
@@ -37,11 +37,18 @@ export function findReadAuthzGaps(models: readonly ModelDescriptor[]): ReadAuthz
     gaps.push({
       schema: m.schema,
       table: m.table,
-      message:
-        `${m.schema}.${m.table} is exposed and RLS-enabled but declares no read ability — every app role ` +
-        `reads empty once it is RLS-subject (e.g. after dropping a superuser api). Declare a read: ` +
-        `can('read') for public data, can('read', { owner: '<col>' }) for private, or mark the model ` +
-        `private() if it is not part of the data API.`,
+      // An rls: false table cannot take the "declare a read" cure — defineModel refuses
+      // abilities there — so its message names the two options that exist. db:pull never
+      // authors this shape (it renders private: true beside rls: false); only a hand
+      // author can, and this is the line that stops them.
+      message: m.rls === false
+        ? `${m.schema}.${m.table} declares rls: false and is exposed to the generic data API — grants ` +
+          `are its only gate, so every granted role reads every row, unfiltered. A grants-only table ` +
+          `is operational, not API surface: mark it private(), or drop rls: false and declare abilities.`
+        : `${m.schema}.${m.table} is exposed and RLS-enabled but declares no read ability — every app role ` +
+          `reads empty once it is RLS-subject (e.g. after dropping a superuser api). Declare a read: ` +
+          `can('read') for public data, can('read', { owner: '<col>' }) for private, or mark the model ` +
+          `private() if it is not part of the data API.`,
     });
   }
   return gaps;
@@ -63,12 +70,12 @@ export function findReadAuthzGaps(models: readonly ModelDescriptor[]): ReadAuthz
  *
  * Severity is a WARNING, never fatal, and that is a considered narrowing of the original ruling.
  * The ruling asked for an ERROR on a table without RLS, where a naked grant is an unrestricted
- * table-wide privilege. That case cannot arise from models: `compileTableContract` emits
- * `rls: { enabled: true }` UNCONDITIONALLY for every modeled table (authz-compile.ts:558). So a
- * declared naked grant is always dead-on-arrival and only becomes live if someone later disables
- * RLS on that table — a real risk, but a future one, and failing CI over a faithful rendering of
- * a database the adopter is trying to adopt would make `db:pull` unusable on exactly the schemas
- * it exists for.
+ * table-wide privilege. Since `rls: false` landed, that case CAN arise from models — a
+ * grants-only table declares exactly that shape, deliberately: grants ARE its whole
+ * authorization, and there is no policy for the grant to be naked of. So the two RLS postures
+ * get two messages (dead grant vs live grants-only access), and both stay WARNINGs: failing CI
+ * over a faithful rendering of a database the adopter is trying to adopt would make `db:pull`
+ * unusable on exactly the schemas it exists for.
  */
 export interface NakedGrant {
   schema: string;
@@ -95,13 +102,20 @@ export function findNakedGrants(models: readonly ModelDescriptor[]): NakedGrant[
         table: m.table,
         role,
         privileges: dml,
-        message:
-          `${m.schema}.${m.table}: '${role}' holds ${dml.join(', ')} as a grant with no policy beside it. ` +
-          `It is dead while RLS is on — the role reads zero rows — and becomes an unrestricted ` +
-          `table-wide privilege the day RLS is disabled or a broad policy is added. If this came from ` +
-          `db:pull it is a faithful reading of the database; decide whether to give it a policy ` +
-          `(can(...)) or revoke it. If you wrote it by hand, you almost certainly want can() instead, ` +
-          `which decides the grant and the policy together.`,
+        // Two postures, two truths. Compared against literal `false`: a descriptor from an
+        // older @everystack/model has no rls key, and undefined means enabled (see
+        // authz-compile's identical guard).
+        message: m.rls === false
+          ? `${m.schema}.${m.table}: '${role}' holds ${dml.join(', ')} with rls: false — this is LIVE, ` +
+            `unrestricted table-wide access, not a dead grant: no row filter applies to '${role}' on ` +
+            `this table. That is what a grants-only table declares, so confirm it is deliberate; if ` +
+            `'${role}' should see only some rows, drop rls: false and declare can(...) instead.`
+          : `${m.schema}.${m.table}: '${role}' holds ${dml.join(', ')} as a grant with no policy beside it. ` +
+            `It is dead while RLS is on — the role reads zero rows — and becomes an unrestricted ` +
+            `table-wide privilege the day RLS is disabled or a broad policy is added. If this came from ` +
+            `db:pull it is a faithful reading of the database; decide whether to give it a policy ` +
+            `(can(...)) or revoke it. If you wrote it by hand, you almost certainly want can() instead, ` +
+            `which decides the grant and the policy together.`,
       });
     }
   }

package/src/cli/commands/db-check.ts

@@ -37,7 +37,8 @@ import { compileDrizzleSource } from '../schema-source.js';
 import { currentGitRef } from '../state-apply.js';
 import { createDatabase, dropDatabase, buildIntoDatabase, withDatabase } from '../db-build.js';
 import { resolveModelsPath } from '../models-path.js';
-import { loadModels } from './db-generate.js';
+import { loadModels, loadModules } from './db-generate.js';
+import { findUnexportedModels, scanModelDirectory, type ModelFileScan } from '../model-barrel-lint.js';
 import { loadDeclaredDerived, retiredSqlDirAnywhere, retiredSqlDirFlagRefusal, type DeclaredDerived } from '../declared-derived.js';
 import type { SequenceDescriptor } from '@everystack/model';
 import type { SourceObject } from '../derived-source.js';
@@ -67,6 +68,10 @@ export interface CheckFinding {
 
 export interface StaticCheckInput {
   modelsPath: string;
+  /** Barrel siblings and what each declares — the "on disk but ungoverned" scan. */
+  modelFileScans?: ModelFileScan[];
+  /** The module's extensions — the bootstrap the from-scratch compose needs. */
+  extensions?: string[];
   /** null = the barrel did not load — the gate's first failure. */
   models: ModelDescriptor[] | null;
   modelsError?: string;
@@ -104,6 +109,17 @@ export function runStaticChecks(input: StaticCheckInput): CheckFinding[] {
   }
   findings.push({ level: 'ok', area: 'models', message: `${input.models.length} model(s) loaded from ${input.modelsPath}` });
 
+  // A file on disk the barrel never exported is outside governance while looking declared.
+  // FAIL, not warn: it is absent from the fingerprint, so nothing downstream will ever
+  // notice, and the only other signal is a model COUNT nobody can compare against.
+  const barrelGaps = findUnexportedModels(
+    input.modelFileScans ?? [],
+    new Set(input.models.map((m) => `${m.schema}.${m.table}`)),
+  );
+  for (const gap of barrelGaps) {
+    findings.push({ level: 'fail', area: 'models', message: gap.message });
+  }
+
   // The semantic merge conflict git can't see: two branches declaring the
   // same table both merge cleanly — the merged state must still compose.
   const seen = new Map<string, number>();
@@ -144,7 +160,7 @@ export function runStaticChecks(input: StaticCheckInput): CheckFinding[] {
 
   try {
     compileDeclaredState(input.models);
-    const statements = compileMigration(input.models, { sequences: input.sequences });
+    const statements = compileMigration(input.models, { sequences: input.sequences, extensions: input.extensions });
     findings.push({ level: 'ok', area: 'compose', message: `declared state composes — ${statements.length} statement(s) from scratch` });
   } catch (err: any) {
     findings.push({ level: 'fail', area: 'compose', message: `the merged declared state does NOT compose: ${err.message}` });
@@ -281,7 +297,7 @@ export interface EphemeralComposeResult {
 export async function executeEphemeralCompose(
   adminUrl: string,
   models: ModelDescriptor[],
-  opts: { actor?: string | null; gitRef?: string | null; declared?: SourceObject[]; sequences?: SequenceDescriptor[] } = {},
+  opts: { actor?: string | null; gitRef?: string | null; declared?: SourceObject[]; sequences?: SequenceDescriptor[]; extensions?: string[] } = {},
 ): Promise<EphemeralComposeResult> {
   const database = `escheck_${process.pid}_${Date.now()}`;
   await createDatabase(adminUrl, database);
@@ -289,6 +305,7 @@ export async function executeEphemeralCompose(
     const built = await buildIntoDatabase(withDatabase(adminUrl, database), models, {
       declared: opts.declared,
       sequences: opts.sequences,
+      extensions: opts.extensions,
       actor: opts.actor ?? 'db:check',
       gitRef: opts.gitRef ?? null,
     });
@@ -315,6 +332,19 @@ export async function dbCheckCommand(flags: Record<string, string>): Promise<voi
     modelsError = err.message;
   }
 
+  // Only meaningful once the barrel itself loaded — otherwise every sibling reads as
+  // ungoverned and the real error is buried under the noise.
+  const modelFileScans = models ? await scanModelDirectory(modelsPath) : [];
+
+  // The module carries the extensions; `models` alone cannot. Without them the from-scratch
+  // compose builds a schema whose column types do not exist.
+  let extensions: string[] = [];
+  if (models) {
+    try {
+      extensions = [...new Set((await loadModules(modelsPath)).flatMap((m) => m.extensions ?? []))];
+    } catch { /* a models-only barrel has no modules export — nothing to bootstrap */ }
+  }
+
   const artifactPath = flags['schema-out'] || DEFAULT_SCHEMA_OUT;
   let artifactSource: string | null = null;
   try {
@@ -349,7 +379,7 @@ export async function dbCheckCommand(flags: Record<string, string>): Promise<voi
   } catch { /* no baseline — see above */ }
 
   const findings = runStaticChecks({
-    modelsPath, models, modelsError, artifactPath, artifactSource, sqlDirRetired,
+    modelsPath, models, modelsError, modelFileScans, extensions, artifactPath, artifactSource, sqlDirRetired,
     sequences: declaredDb?.sequences, derived: declaredDb?.derived, derivedError,
     moduleModels: declaredDb?.models ?? null,
     baselineSource,
@@ -374,6 +404,7 @@ export async function dbCheckCommand(flags: Record<string, string>): Promise<voi
         gitRef: currentGitRef(),
         declared: declaredDb?.objects,
         sequences: declaredDb?.sequences,
+        extensions,
       });
       for (const line of ephemeral.report) info(`  ${line}`);
     } catch (err: any) {
@@ -402,7 +433,11 @@ export async function dbCheckCommand(flags: Record<string, string>): Promise<voi
   } else if (failed) {
     fail('db:check FAILED — the merged declared state is not shippable as-is (findings above).');
   } else if (ephemeral !== null) {
-    success(`db:check passed — declared state composes from scratch and lands MATCH at ${ephemeral.fingerprint.slice(0, 12)}.`);
+    success(`db:check passed — the declared state composes from scratch and lands on its own fingerprint (${ephemeral.fingerprint.slice(0, 12)}).`);
+    // Named because it kept being read as the stronger claim (a consumer, 2026-08-07): this
+    // ring proves the checkout against ITSELF, on an empty database. Whether an existing
+    // database IS this state is a different question with a different verb.
+    info('This proves the checkout is self-consistent and buildable — not that any existing database matches it. For that claim, run db:fingerprint against the database.');
   } else {
     success('db:check passed (static ring only — no database provided for the ephemeral compose).');
   }

package/src/cli/commands/db-generate.ts

@@ -72,7 +72,7 @@ export async function loadModels(modelsPath: string): Promise<ModelDescriptor[]>
  * COMPLETE migration. Falls back to wrapping a bare `models` array in one module (an app on the
  * older models-only barrel still gets a schema+authz init, just no package functions).
  */
-async function loadModules(modelsPath: string): Promise<Module[]> {
+export async function loadModules(modelsPath: string): Promise<Module[]> {
   const abs = path.resolve(modelsPath);
   let mod: any;
   try {

package/src/cli/commands/db-plan.ts

@@ -221,6 +221,22 @@ export async function dbPlanCommand(flags: Record<string, string>): Promise<void
       }
     }
 
+    // The class rides on the ARTIFACT, not only the terminal — a reviewer reading
+    // db.plan.json had the aggregate and no way to reach the statements behind it, so
+    // `unclassified: 5` was unreadable by the only person positioned to catch what it meant.
+    //
+    // Attached HERE, before the plan is serialized AND before planHash is taken, because
+    // both must see the same object. It used to be assigned after the write, onto an
+    // instance nobody read again: the artifact carried no adoption at all, and the summary
+    // counted statements the file could not show. Hashing after attaching also keeps the
+    // ref db:plan prints equal to the one db:apply computes for that file — `planHash` is
+    // sha256 over the WHOLE plan, so a field added later silently changes the identity.
+    //
+    // Re-DERIVED from live every mint, never stored across mints: a recorded claim about
+    // what the models fail to capture goes stale the moment someone closes the gap.
+    const adoption = classifyAdoption(declaredAuthz, contract, { governedRoles: governedRoleSet(declaredAuthz, declaredGovernedRoles) });
+    plan.adoption = adoption.statements;
+
     const body = JSON.stringify(plan, null, 2) + '\n';
     if (out === '-') {
       console.log(body);
@@ -238,16 +254,11 @@ export async function dbPlanCommand(flags: Record<string, string>): Promise<void
     // fail to capture goes stale the moment someone closes the gap, and a stale note is worse
     // than none. `capability` is the count that says "this plan removes something the model
     // cannot express" — the operator reading this is the last one who can catch it.
-    const adoption = classifyAdoption(declaredAuthz, contract, { governedRoles: governedRoleSet(declaredAuthz, declaredGovernedRoles) });
     const adoptionTotal = Object.values(adoption.counts).reduce((a, b) => a + b, 0);
     if (adoptionTotal > 0) {
       info(`${adoptionTotal} authorization statement(s), by why they exist:`);
       for (const line of renderAdoptionReport(adoption.counts, adoption.statements)) info(line);
     }
-    // The class rides on the ARTIFACT too, not only the terminal. A reviewer reading
-    // db.plan.json had the aggregate and no way to reach the statements behind it, so
-    // `unclassified: 5` was unreadable by the only person positioned to catch what it meant.
-    plan.adoption = adoption.statements;
 
     // WHO owns the tables this plan authorizes, and does that owner obey the policies it
     // is about to write? Re-derived live every mint, never stored — the owner is a fact

package/src/cli/commands/db-pull.ts

@@ -42,7 +42,8 @@ import { introspectContract, type TableContract, type AuthzContract } from '../a
 import { introspectTableOwners, buildOwnershipReport, renderOwnershipReport, type TableOwner } from '../authz-ownership.js';
 import { FUNCTIONS_SQL, contractFunctionRow } from '../security-catalog.js';
 import { renderDerivedSource, renderDerivedFile, type DerivedRenderResult } from '../derived-render.js';
-import { renderModelSource, renderModelFiles, pullableTables, modelVarName, ABILITY_PRESETS } from '../model-render.js';
+import { renderModelSource, renderModelFiles, pullableTables, skippedInfrastructureTables, modelVarName, ABILITY_PRESETS } from '../model-render.js';
+import { deriveAbilities } from '../authz-derive.js';
 import type { QueryRunner } from '../authz-contract.js';
 import { resolveDbSource, createUrlRunner, connectingVia, type DbSource } from '../db-source.js';
 import { borrowedSessionRunner, type SessionRunner } from '../session.js';
@@ -108,7 +109,12 @@ export function derivedImportSpecifier(out: string, derivedOut: string): string
 }
 
 export async function dbPullCommand(flags: Record<string, string>): Promise<void> {
-  const schema = flags.schema || 'public';
+  // A LIST: `--schema public,auth,metrics`. One value still works. Without this there was
+  // no way to adopt a multi-schema database — `--out <dir>` regenerates the barrel, so a
+  // second pull replaced the first schema's models rather than joining them.
+  const schemas = (flags.schema || 'public').split(',').map((s) => s.trim()).filter(Boolean);
+  if (schemas.length === 0) fail('--schema needs at least one schema name.');
+  const schema = schemas.length === 1 ? schemas[0] : schemas;
 
   // --derived-out: the brownfield splice, first-class. A consumer with an existing
   // hand-maintained barrel wants the derived layer as its own file — not codemodded
@@ -127,6 +133,24 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
     process.exit(1);
   }
 
+  // --govern-roles: the operator's EXPLICIT decision to transcribe these foreign roles'
+  // grants into `privileges` — which governs them. Required for migration deletion when
+  // the migrations created grants to roles outside the vocabulary: a fresh build from
+  // models must recreate them. Never inferred from the database (a re-pull must not turn
+  // a rendering decision into an access decision); complete-or-refuse per role — a listed
+  // role holding a column-scoped grant fails the pull (see deriveAbilities).
+  const governRoles = (flags['govern-roles'] ?? '').split(',').map((s) => s.trim()).filter(Boolean);
+  if (governRoles.length && abilities !== 'live') {
+    fail(`--govern-roles transcribes LIVE grants, so it requires --abilities live.`);
+    process.exit(1);
+  }
+  for (const r of governRoles) {
+    if (['anon', 'authenticated', 'admin', 'PUBLIC', 'public'].includes(r)) {
+      fail(`--govern-roles ${r}: the vocabulary roles and PUBLIC are always governed — name only foreign roles (an ops/connection role the migrations granted to).`);
+      process.exit(1);
+    }
+  }
+
   let dbSource: DbSource;
   try {
     dbSource = resolveDbSource(flags);
@@ -167,7 +191,7 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
       runner = lambdaQueryRunner(config.region, opsFunction(config));
       session = lambdaSessionRunner(config.region, opsFunction(config));
     }
-    note(`Introspecting live database (schema: ${schema})...`);
+    note(`Introspecting live database (schema: ${schemas.join(", ")})...`);
     current = await introspectSchema(session);
     // The derived layer rides the same pull (B5) — views/matviews/functions/sequences
     // render as descriptors; adoption is pull → commit → --baseline → clean reconcile.
@@ -191,12 +215,15 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
       const unmapped = new Set<string>();
       for (const t of contract.tables) {
         for (const r of Object.keys(t.grants)) {
-          if (!['anon', 'authenticated', 'admin', 'PUBLIC', 'public'].includes(r)) unmapped.add(r);
+          if (!['anon', 'authenticated', 'admin', 'PUBLIC', 'public'].includes(r) && !governRoles.includes(r)) unmapped.add(r);
         }
       }
+      if (governRoles.length) {
+        note(`--govern-roles ${governRoles.join(', ')}: their grants are transcribed as privileges — the models now OWN them, and a fresh build recreates them.`);
+      }
       if (unmapped.size) {
         note(`Grants exist for ${[...unmapped].sort().join(', ')} — not rendered: abilities name the roles the model knows (anon/authenticated/admin).`);
-        detail(`These are left exactly as they are in the database. Add can(..., { role }) only if you want the models to own them.`);
+        detail(`These are left exactly as they are in the database. Add can(..., { role }) to own them, or re-pull with --govern-roles to transcribe their grants as privileges.`);
       }
       // ADOPTION: record the foreign grantees that were already here, per stage. The
       // reconciler exempts them from revocation, so this artifact is what stops that
@@ -204,10 +231,10 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
       // grown, refuses at db:plan. It lands as a reviewable diff, with writes flagged,
       // because nothing mechanical can tell a legitimate BI role from an attacker's on day
       // one; the defence is forcing the look and making it recur.
-      // The governed set at ADOPTION is the fixed vocabulary alone: the models being
-      // rendered here can only name anon/authenticated/admin, so every other grantee is
-      // foreign by construction — the same set `unmapped` just reported, with privileges.
-      pulledExemptions = ungovernedGrants(contract, new Set(ALWAYS_GOVERNED));
+      // The governed set at ADOPTION is the fixed vocabulary plus any --govern-roles: a
+      // governed role's grants are DECLARED (transcribed as privileges), so recording them
+      // as exemptions too would double-book them — declared and exempted at once.
+      pulledExemptions = ungovernedGrants(contract, new Set([...ALWAYS_GOVERNED, ...governRoles]));
       pulledFingerprint = fingerprintLive(current, contract).hash;
     }
     // --matviews-as-tables: the flip needs real fields — one extra catalog read for the
@@ -250,6 +277,33 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
     process.exit(1);
   }
 
+  // The denylist's consequence, stated at the moment it applies: a migration tool's
+  // bookkeeping is never modeled, so it can never enter the declared state — and a
+  // fully-declared database therefore cannot contain it.
+  const skippedInfra = skippedInfrastructureTables(current, schema);
+  if (skippedInfra.length) {
+    caution(
+      `${skippedInfra.length} migration-tool table(s) skipped, never modeled: ${skippedInfra.join(', ')} — `
+      + `a migration journal is the tool's own state, not the app's. To reach a fully-declared database, `
+      + `DROP them once the tool that owns them is retired.`,
+    );
+  }
+
+  // The --govern-roles complete-or-refuse gate, run BEFORE any file is written: a refusal
+  // mid-render would leave a half-written models directory. Pure re-derivation, pulled
+  // tables only — a governed role's column grant on an UNPULLED table is safe (that table
+  // is not declared, so nothing reconciles it).
+  if (governRoles.length && liveAuthz) {
+    const pulledNames = new Set(pulled.map((t) => t.table));
+    try {
+      const govern = new Set(governRoles);
+      for (const [name, c] of liveAuthz) if (pulledNames.has(name)) deriveAbilities(c, { governRoles: govern });
+    } catch (err: any) {
+      fail(err.message);
+      process.exit(1);
+    }
+  }
+
   // WHO owns the tables being pulled. Nothing is FLAGGED here: flagging needs a declared
   // write principal to contradict, and the models this pull is about to write do not exist
   // yet. Naming the owner is the half the pull genuinely saw — and the half that vanishes
@@ -323,7 +377,7 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
   if (flags.out && !flags.out.endsWith('.ts')) {
     // A directory: one file per model + index.ts — the default shape for a real app.
     const dir = path.resolve(flags.out);
-    const files = renderModelFiles(current, { schema, abilities, liveAuthz, derived: embeddedDerived, externalDerived });
+    const files = renderModelFiles(current, { schema, abilities, liveAuthz, governRoles, derived: embeddedDerived, externalDerived });
     try {
       await fs.mkdir(dir, { recursive: true });
       const written = new Set(files.map((f) => f.file));
@@ -340,7 +394,7 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
     source = files.map((f) => f.source).join('\n');
   } else if (flags.out) {
     const outPath = path.resolve(flags.out);
-    source = renderModelSource(current, { schema, abilities, liveAuthz, derived: embeddedDerived });
+    source = renderModelSource(current, { schema, abilities, liveAuthz, governRoles, derived: embeddedDerived });
     try {
       await fs.mkdir(path.dirname(outPath), { recursive: true });
       await fs.writeFile(outPath, source, 'utf8');
@@ -350,7 +404,7 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
     }
     ok(`Wrote ${path.relative(process.cwd(), outPath)} — ${pulled.length} model(s).`);
   } else {
-    source = renderModelSource(current, { schema, abilities, liveAuthz, derived: embeddedDerived });
+    source = renderModelSource(current, { schema, abilities, liveAuthz, governRoles, derived: embeddedDerived });
     process.stdout.write(source);
     ok(`Rendered ${pulled.length} model(s) from schema "${schema}" (stdout — redirect or pass --out to save).`);
   }

package/src/cli/db-build.ts

@@ -17,6 +17,7 @@ import type { SequenceDescriptor } from '@everystack/model';
 import { compileDeclaredState } from './declared-diff.js';
 import { createUrlRunner } from './db-source.js';
 import { executeSync, buildSyncReport } from './commands/db-sync.js';
+import { executeReconcile } from './commands/db-reconcile.js';
 
 const SAFE_NAME = /^[a-z_][a-z0-9_$]*$/;
 
@@ -93,6 +94,10 @@ export interface BuildOptions {
   declared?: SourceObject[];
   /** Standalone sequences (state — created before tables, in the fingerprint bar). */
   sequences?: SequenceDescriptor[];
+  /** Extensions the declared state needs. Applied BEFORE anything else — a column typed
+   *  `hstore` cannot be created until the type exists, and the sync path is a DIFF, which
+   *  has no bootstrap phase of its own. `IF NOT EXISTS`, so re-running is free. */
+  extensions?: string[];
   actor?: string | null;
   gitRef?: string | null;
 }
@@ -109,7 +114,62 @@ export async function buildIntoDatabase(
 ): Promise<BuildResult> {
   const { runner, session, end } = await createUrlRunner(url);
   try {
+    // Bootstrap FIRST: roles and tables both come after the types they use exist.
+    for (const ext of [...new Set(options.extensions ?? [])].sort()) {
+      await runner(`CREATE EXTENSION IF NOT EXISTS "${ext}"`);
+    }
+    // Schemas, for the same reason. This path is a DIFF (executeSync), and a diff has no
+    // bootstrap phase: `compileMigration` emits CREATE SCHEMA for every non-public schema a
+    // model lives in, but nothing on the sync path did — so a multi-schema declared state
+    // failed with `schema "auth" does not exist` before a single table was created. Taken
+    // from the MODELS and from the declared derived objects, because a schema can hold only
+    // functions (an `auth` of nothing but SECURITY DEFINER functions is a real shape).
+    const modelSchemas = models.map((m) => m.schema ?? 'public');
+    const derivedSchemas = (options.declared ?? []).map((o) => o.schema);
+    for (const schema of [...new Set([...modelSchemas, ...derivedSchemas])].filter((s) => s && s !== 'public').sort()) {
+      await runner(`CREATE SCHEMA IF NOT EXISTS "${schema}"`);
+    }
     const createdRoles = await ensureContractRoles(runner, models);
+
+    // FUNCTIONS BEFORE STATE. An RLS policy's predicate is resolved when the policy is
+    // created, so `USING (user_id = auth.user_id())` cannot be created before
+    // `auth.user_id()` exists — and the sync path applies state (tables, RLS, policies)
+    // before the derived layer. On a real brownfield schema that is not an edge case: 18 of
+    // one consumer's policies call an `auth.*` function, so the from-scratch build failed
+    // with `function auth.user_id() does not exist` before any of them could be created.
+    //
+    // Only FUNCTIONS move: views and triggers depend on TABLES, so the layers genuinely
+    // interleave and "derived before state" would just fail the other way round.
+    //
+    // `check_function_bodies = off` for this window — the pg_dump restore idiom. A
+    // SQL-language function whose body reads a table that does not exist yet is a forward
+    // reference, not an error; plpgsql bodies are never validated at creation, so only the
+    // SQL-language ones need it. MEASURED, not assumed: dropping this SET puts the reference
+    // brownfield schema straight back to failing, so the escape is load-bearing.
+    //
+    // It is a BARE set, not SET LOCAL, and that is deliberate: reconcile opens its own
+    // transaction, so this pass has none to scope to. It is safe under the rule the repo's
+    // own guard documents — `createUrlRunner` gives this command a dedicated max:1
+    // connection it owns for the run and closes in a finally, never a pooled or shared one.
+    // RESET in a finally so the window closes even on failure.
+    //
+    // Provenance is recorded by this pass, so executeSync's own reconcile below sees the
+    // functions already managed and unchanged, and plans nothing for them.
+    const declaredFunctions = (options.declared ?? []).filter((o) => o.kind === 'function');
+    if (declaredFunctions.length > 0) {
+      await runner('SET check_function_bodies = off');
+      try {
+        const pre = await executeReconcile(runner, session, {
+          declared: declaredFunctions,
+          apply: true,
+          actor: options.actor ?? 'db-build',
+          gitRef: options.gitRef ?? null,
+        });
+        if (pre.refusal) throw new Error(`could not create declared functions first: ${pre.refusal}`);
+      } finally {
+        await runner('RESET check_function_bodies');
+      }
+    }
     const run = await executeSync(runner, session, models, {
       declared: options.declared,
       sequences: options.sequences,

package/src/cli/derived-render.ts

@@ -16,7 +16,7 @@
 import type { DerivedCatalog, LiveObject } from './derived-introspect.js';
 import type { ColumnSchema, SequenceSchema, TableSchema } from './schema-introspect.js';
 import { parseIndexDefinition } from './schema-introspect.js';
-import { modelFileName, renderFieldLines } from './model-render.js';
+import { modelImportPath, renderFieldLines } from './model-render.js';
 import { splitFunctionIdentity } from './pg-argtypes.js';
 import { GOVERNED_VOCABULARY, KNOWN_ROLES } from './authz-derive.js';
 
@@ -676,7 +676,7 @@ export function renderDerivedFile(result: DerivedRenderResult, knownTables: Map<
     lines.push(`import { ${result.imports.join(', ')} } from '@everystack/model';`);
   }
   const refs = result.modelRefs
-    .map((table) => ({ varName: knownTables.get(table)!, path: `./${modelFileName(table).replace(/\.ts$/, '')}` }))
+    .map((table) => ({ varName: knownTables.get(table)!, path: modelImportPath(table) }))
     .sort((a, b) => a.path.localeCompare(b.path));
   for (const ref of refs) lines.push(`import { ${ref.varName} } from '${ref.path}';`);
   lines.push('', result.block, '');

package/src/cli/index.ts

@@ -359,7 +359,7 @@ Usage:
   everystack db:export         --schema <name> [--stage <name> | --database-url <url> [--out <file.dump>]] [--models <barrel>]  Schema-scoped pg_dump artifact, stamped with the DECLARED schema fingerprint (the canonical-sync export; db:swap gates on that stamp). --stage dumps the stage's private DB via the ops Lambda → S3; --database-url (explicit flag, never the env) dumps a reachable DB to a local .dump + .meta.json — the build-locally → publish → swap on-ramp
   everystack db:swap           --schema <name> --from <artifact.dump | artifact-id> [--stage <name> --direct | --database-url <url>] --confirm [--fingerprint <hash>] [--snapshot physical|logical|none] [--snapshot-ref <id>] [--rebuild-derived] [--dump-build <file.json>]  Land a schema artifact atomically: fingerprint gate → pre-flight refusals → CONFIRMED snapshot → restore into <schema>_incoming (COPY-safe rewrite) → build the paired derived layer → one txn (drop+rename+recreate app→schema FKs, re-apply authz + schema USAGE) → assertions → drop retiring. Refresh-free; app.* untouched; the derived layer is never absent. DESTRUCTIVE. The venue is EXPLICIT — DATABASE_URL in the env is refused, and --stage requires --direct (a multi-GB restore exceeds the ops-Lambda 900s clock). The rollback point defaults to a PHYSICAL RDS snapshot on a stage that exposes databaseInstanceId (no locks, no pg_dump contending with the restore) and a WAITED logical db:backup otherwise; a bare --database-url refuses without --snapshot-ref <id> or --snapshot none. docs/schema-swap.md
   everystack db:generate       [--stage <name> | --database-url <url>] [--name <label>] [--models db/models/index.ts] [--schema-out db/schema.generated.ts] [--allow-drops] [--apply] [--dry-run]  Diff models vs the live DB → next migration file, or with --apply execute it directly (one transaction, schema_log recorded, verified by re-diff — no drizzle folder needed; direct connection only; DROPs held back unless --allow-drops). --dry-run prints the edge and writes NOTHING (no migration, no journal entry, no schema refresh) — the preview verb; db:diff computes a models-vs-models edge with no database at all. The resolved --schema-out is recorded in the migration journal: later flag-less runs reuse it (flag > recorded > default), a differing flag updates the record and says so
-  everystack db:pull           [--stage <name> | --database-url <url>] [--schema public] [--out <dir | file.ts>] [--derived-out <file.ts>] [--abilities live|public-read]  Introspect the live DB → render field() Models (the brownfield on-ramp). --out <dir> writes one file per model + index.ts (the default shape); --out <file.ts> writes a single module; stdout otherwise. --derived-out <file.ts> extracts the derived layer (descriptors + sequences) as its own self-contained module — alone it leaves the models untouched (the hand-maintained-barrel splice); with --out the models render omits the now-external derived layer. Every model scaffolds its authz decision as comments (db:check fails until authored). **--abilities live is the brownfield mode**: derive each model's authz from the grants and policies the database ALREADY has, and write the foreign-grantee baseline (db/authz-baseline.json) — this is what you want when adopting an existing schema. --abilities public-read stamps the common stanza (public read, admin write) uncommented — greenfield only, since on an existing database it declares public read of every table. Both are explicit generated code, never a runtime default. --matviews-as-tables renders every matview as defineMaterializedTable with INTROSPECTED fields (the canonical-sync flip: a pipeline-owned table everystack migrates but never refreshes) — names land in an exported materializedTables array to spread into your models; fields come back nullable/unkeyed (matviews carry no PK/NOT NULL) — tighten on review; add --suggest-keys to probe the LIVE rows for functionally-unique columns (one scan per matview) and surface each as a commented .primaryKey() suggestion. docs/derived-objects.md#flipping-a-matview-to-a-materialized-table---matviews-as-tables
+  everystack db:pull           [--stage <name> | --database-url <url>] [--schema public] [--out <dir | file.ts>] [--derived-out <file.ts>] [--abilities live|public-read]  Introspect the live DB → render field() Models (the brownfield on-ramp). --out <dir> writes one file per model + index.ts (the default shape); --out <file.ts> writes a single module; stdout otherwise. --derived-out <file.ts> extracts the derived layer (descriptors + sequences) as its own self-contained module — alone it leaves the models untouched (the hand-maintained-barrel splice); with --out the models render omits the now-external derived layer. Every model scaffolds its authz decision as comments (db:check fails until authored). **--abilities live is the brownfield mode**: derive each model's authz from the grants and policies the database ALREADY has, and write the foreign-grantee baseline (db/authz-baseline.json) — this is what you want when adopting an existing schema. --abilities public-read stamps the common stanza (public read, admin write) uncommented — greenfield only, since on an existing database it declares public read of every table. Both are explicit generated code, never a runtime default. --govern-roles <r1,r2> (with --abilities live) transcribes the named FOREIGN roles' grants into privileges — the models then OWN them, so a fresh build recreates them; required for migration deletion when the migrations created grants to an ops/connection role. Explicit only (a re-pull must not silently govern), complete-or-refuse (a listed role holding a column-scoped grant fails the pull before anything is written). --matviews-as-tables renders every matview as defineMaterializedTable with INTROSPECTED fields (the canonical-sync flip: a pipeline-owned table everystack migrates but never refreshes) — names land in an exported materializedTables array to spread into your models; fields come back nullable/unkeyed (matviews carry no PK/NOT NULL) — tighten on review; add --suggest-keys to probe the LIVE rows for functionally-unique columns (one scan per matview) and surface each as a commented .primaryKey() suggestion. docs/derived-objects.md#flipping-a-matview-to-a-materialized-table---matviews-as-tables
                                Both introspect via the deployed ops Lambda by default; --database-url (or an inherited DATABASE_URL) connects directly — for a schema that exists only on a local Postgres.
   everystack db:fingerprint    [--stage <name> | --database-url <url>] [--models <barrel>] [--json]  Content-address the live base schema (tables+constraints+authz) and compare against the models — MATCH/MISMATCH (exit 1), plus the unfingerprinted-objects report
   everystack db:reconcile      [--stage <name> | --database-url <url>] [--apply] [--check] [--baseline] [--rebuild] [--overwrite-drift] [--only a,b] [--json]  Reconcile the derived layer (functions/views/matviews/triggers) against the DECLARED descriptors (defineView/defineMaterializedView/defineFunction/defineSql/trigger() on models, from the barrel) — the single home (db/sql is retired; leftover .sql files fail with the migration path): plan with rebuild-cost estimates by default; --check is the CI gate; --apply executes (atomic — DDL + provenance in one transaction) and records provenance + schema_log; --apply --stage runs credential-free in the ops Lambda (no admin URL on the deployer, the db:apply twin), --apply --database-url runs direct. Hand-edits are drift (never overwritten silently). First contact with existing objects: --baseline TRUSTS live == source (records provenance, verifies nothing), --rebuild GUARANTEES it (drop+create from source). They are mutually exclusive. --only <schema.name,…> restricts the run to the named objects (surgical); with --rebuild it FORCES those to rebuild from source even when the hashes show no diff — the recovery exit when a mistaken --rebaseline left a self-consistent-but-wrong provenance row (the dependency cascade rebuilds their live dependents).

package/src/cli/migration-compile.ts

@@ -38,10 +38,21 @@ function emptyTable(table: string): TableContract {
  * schema). Tables, then foreign keys, then authz — the order a fresh database must
  * apply them in.
  */
-export function compileMigration(models: ModelDescriptor[], opts: CompileTableOptions & { sequences?: SequenceDescriptor[] } = {}): string[] {
+export function compileMigration(
+  models: ModelDescriptor[],
+  opts: CompileTableOptions & { sequences?: SequenceDescriptor[]; extensions?: string[] } = {},
+): string[] {
   const sql: string[] = [];
   const schemaOf = (m: ModelDescriptor): string => m.schema ?? 'public';
 
+  // 0. Extensions — the BOOTSTRAP, before any table that might use one of their types.
+  //    compileModuleMigration has always emitted these; compileMigration had no way to,
+  //    so db:check's from-scratch ring compiled a state whose column types did not exist
+  //    and failed with `type "hstore" does not exist` on an otherwise clean schema.
+  //    Deduped + sorted, quoted so a hyphenated name (`uuid-ossp`) stays valid.
+  const extensions = [...new Set(opts.extensions ?? [])].sort();
+  sql.push(...extensions.map((e) => `CREATE EXTENSION IF NOT EXISTS "${e}";`));
+
   // 0a. Non-public schemas — `CREATE SCHEMA` for each distinct one a model lives in,
   //     before any table is created in it. public is the implicit default, never emitted.
   const schemas = [...new Set(models.map(schemaOf))].filter((s) => s !== 'public').sort();
@@ -137,12 +148,14 @@ export function compileMigration(models: ModelDescriptor[], opts: CompileTableOp
 export function compileModuleMigration(modules: Module[], opts: CompileTableOptions = {}): string[] {
   const sql: string[] = [];
 
-  // 1. Extensions — deduped + sorted, quoted so a hyphenated name (`uuid-ossp`) is valid.
-  const extensions = [...new Set(modules.flatMap((m) => m.extensions))].sort();
-  sql.push(...extensions.map((e) => `CREATE EXTENSION IF NOT EXISTS "${e}";`));
-
-  // 2. Schema + authz for every modeled table (plus the modules' standalone sequences).
-  sql.push(...compileMigration(modules.flatMap((m) => m.models), { ...opts, sequences: modules.flatMap((m) => m.sequences) }));
+  // 1+2. Extensions (the bootstrap) then schema + authz for every modeled table, plus the
+  //       modules' standalone sequences. compileMigration owns the extension emission now, so
+  //       the two entry points cannot disagree about the order or the quoting.
+  sql.push(...compileMigration(modules.flatMap((m) => m.models), {
+    ...opts,
+    sequences: modules.flatMap((m) => m.sequences),
+    extensions: modules.flatMap((m) => m.extensions),
+  }));
 
   // 3. Package SQL — functions + triggers, after the tables they reference. Each thunk's
   //    output is a self-contained multi-statement block applied as one unit.

package/src/cli/model-barrel-lint.ts

@@ -0,0 +1,115 @@
+/**
+ * model-barrel-lint — the file that is on disk and outside governance.
+ *
+ * Every verb reads the BARREL: `db:check`, `db:plan` and `db:fingerprint` all call
+ * `loadModels(modelsPath)` and see exactly what it exports. So a model file sitting in
+ * `db/models/` that `index.ts` never imports does not exist as far as any of them is
+ * concerned — it is absent from the fingerprint, absent from the plan, and absent from the
+ * check — while looking entirely declared to a human reading the directory.
+ *
+ * That is the failure the declared-state model exists to prevent: a table quietly outside
+ * governance, with a file that says otherwise. It is also silent by construction, because
+ * the only signal is a COUNT ("30 model(s)") that matches nothing the reader can compare it
+ * to. A consumer lost an hour to it and drew a false stage-drift conclusion from the
+ * resulting one-statement plan.
+ *
+ * The scan is deliberately shallow: the barrel's OWN directory, non-recursive. A models
+ * directory is a flat directory of models by convention, and walking deeper would start
+ * flagging fixtures and generated output.
+ */
+
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { pathToFileURL } from 'node:url';
+import type { ModelDescriptor } from '@everystack/model';
+
+/** One file's declared tables, as read off its own exports. */
+export interface ModelFileScan {
+  /** Basename, relative to the barrel's directory — what the operator has to go open. */
+  file: string;
+  /** Qualified tables (`schema.table`) the file declares, in any order. */
+  tables: string[];
+}
+
+export interface UnexportedModelGap {
+  file: string;
+  /** The declared tables no verb can see, sorted. */
+  tables: string[];
+  message: string;
+}
+
+/**
+ * Files declaring a table the barrel never exported. Pure — the caller does the reading, so
+ * the rule is testable without a filesystem.
+ *
+ * Findings are per FILE, because the file is the unit that gets fixed (add it to the
+ * barrel, or delete it). Everything is sorted: import order is not a contract, and a lint
+ * whose output reorders between runs is one nobody can diff.
+ */
+export function findUnexportedModels(
+  scans: readonly ModelFileScan[],
+  loadedTables: ReadonlySet<string>,
+): UnexportedModelGap[] {
+  const gaps: UnexportedModelGap[] = [];
+  for (const scan of scans) {
+    const missing = scan.tables.filter((t) => !loadedTables.has(t)).sort();
+    if (missing.length === 0) continue;
+    gaps.push({
+      file: scan.file,
+      tables: missing,
+      message:
+        `${scan.file} declares ${missing.join(', ')} but the barrel does not export it — so no verb can see it. ` +
+        `db:check, db:plan and db:fingerprint all read the barrel, which means the table is outside governance ` +
+        `while the file makes it look declared. Export it from the barrel, or delete the file.`,
+    });
+  }
+  return gaps.sort((a, b) => a.file.localeCompare(b.file));
+}
+
+/** A qualified table identity, matching the form the loaded models are keyed by. */
+export function modelIdentity(m: ModelDescriptor): string {
+  return `${m.schema}.${m.table}`;
+}
+
+/**
+ * Read the barrel's sibling files and report what each one declares.
+ *
+ * Import failures are SKIPPED, not raised: a sibling that does not compile is a different
+ * problem with its own error path, and a lint that turns an unrelated broken file into a
+ * governance finding would send the operator to the wrong place. A file exporting no model
+ * simply scans as zero tables.
+ */
+export async function scanModelDirectory(modelsPath: string): Promise<ModelFileScan[]> {
+  const abs = path.resolve(modelsPath);
+  const dir = path.dirname(abs);
+  const barrel = path.basename(abs);
+
+  let entries: string[];
+  try {
+    entries = await fs.readdir(dir);
+  } catch {
+    return []; // Not a directory-shaped barrel (a single-module app); nothing to scan.
+  }
+
+  const scans: ModelFileScan[] = [];
+  for (const entry of entries.sort()) {
+    if (entry === barrel) continue;
+    if (!entry.endsWith('.ts') || entry.endsWith('.d.ts')) continue;
+    let mod: Record<string, unknown>;
+    try {
+      mod = (await import(pathToFileURL(path.join(dir, entry)).href)) as Record<string, unknown>;
+    } catch {
+      continue;
+    }
+    const tables = Object.values(mod)
+      .filter((v): v is ModelDescriptor => (
+        typeof v === 'object' && v !== null
+        && typeof (v as ModelDescriptor).table === 'string'
+        && typeof (v as ModelDescriptor).schema === 'string'
+        && Array.isArray((v as ModelDescriptor).abilities)
+      ))
+      .map(modelIdentity);
+    scans.push({ file: entry, tables: [...new Set(tables)] });
+  }
+  return scans;
+}

package/src/cli/model-render.ts

@@ -61,7 +61,8 @@ export function checkToValidate(expr: string): { column: string; zod: string } |
 
 export interface RenderOptions {
   /** Only pull tables in this Postgres schema (others are framework-managed). Default: `public`. */
-  schema?: string;
+  /** One schema, or several — a database is not always one schema. Default `'public'`. */
+  schema?: string | string[];
   /**
    * The read-model scaffold. Default `'commented'`: every model carries the authz decision
    * as a commented stanza (same guidance as the db:check gate — the model fails the gate
@@ -78,6 +79,14 @@ export interface RenderOptions {
    * authz-derive.ts for the rule (policy presence is not effective privilege).
    */
   liveAuthz?: Map<string, TableContract>;
+  /**
+   * `--govern-roles` — the operator's explicit decision to transcribe these foreign roles'
+   * grants into `privileges`, which GOVERNS them. Required for migration deletion when the
+   * migrations created grants to roles outside the vocabulary (an ops/connection role): a
+   * fresh build from models must recreate them or the deletion loses the ops lane its
+   * access. Never inferred — see deriveAbilities. Complete-or-refuse per role.
+   */
+  governRoles?: string[];
   /** The rendered derived layer (B5) — rides the barrel: block after the models,
    *  sequences/derived arrays on the module wrapper, symbols on the import header. */
   derived?: DerivedRenderResult;
@@ -123,7 +132,7 @@ export function isPublicReadAbility(expr: string): boolean {
  * abilities, not a regex over the joined text (a live predicate can span lines and carry its
  * own braces). An unknown preset throws — grants are authored, never guessed.
  */
-function abilitiesStanza(mode: string, table?: TableSchema, liveAuthz?: Map<string, TableContract>): { text: string; publicRead: boolean } {
+function abilitiesStanza(mode: string, table?: TableSchema, liveAuthz?: Map<string, TableContract>, governRoles?: ReadonlySet<string>): { text: string; publicRead: boolean } {
   if (mode === 'live') {
     const contract = table && liveAuthz?.get(table.table);
     if (!contract) {
@@ -136,8 +145,20 @@ function abilitiesStanza(mode: string, table?: TableSchema, liveAuthz?: Map<stri
         publicRead: false,
       };
     }
-    const derived = deriveAbilities(contract);
-    return { text: renderDerivedAbilities(derived), publicRead: derived.abilities.some(isPublicReadAbility) };
+    const derived = deriveAbilities(contract, { governRoles });
+    const lines = [renderDerivedAbilities(derived)];
+    // A grants-only table: live RLS is OFF and no ability rendered. Transcribe the flag —
+    // without it the compiler declares RLS enabled and the first plan after adoption
+    // proposes ENABLE ROW LEVEL SECURITY, which with zero policies denies every non-owner
+    // role a table it already uses (a consumer's ops lane, measured 2026-08-07). Never
+    // rendered beside abilities: defineModel refuses the pair, and a live-off table whose
+    // grants DO derive abilities is adopt-mode territory, not a flag transcription.
+    // The writtenBy stanza always accompanies this line (live-off is never FORCEd), which
+    // is what lets the rendered model load — rls: false with the 'app' default is refused.
+    if (!derived.abilities.length && !contract.rls.enabled) {
+      lines.push(`  rls: false,   // live reality: row security is OFF — authorization here is grants-only.`);
+    }
+    return { text: lines.join('\n'), publicRead: derived.abilities.some(isPublicReadAbility) };
   }
   if (mode === 'commented') {
     return {
@@ -241,8 +262,40 @@ const INFRASTRUCTURE_TABLES = new Set([
  * database can carry `public.__drizzle_migrations` — the journal is tooling state,
  * never an app model. Exported so the command shell counts the same set it writes.
  */
-export function pullableTables(snapshot: SchemaSnapshot, schema: string): TableSchema[] {
-  return snapshot.tables.filter((t) => t.table.startsWith(`${schema}.`) && !INFRASTRUCTURE_TABLES.has(bareName(t.table)));
+export function pullableTables(snapshot: SchemaSnapshot, schema: string | string[]): TableSchema[] {
+  // A LIST, because a database is not one schema. `--schema` took a single value and
+  // `--out <dir>` regenerates the barrel, so pulling a second schema overwrote the first —
+  // there was no way to land a multi-schema database in one declared state at all.
+  //
+  // Matched on the exact prefix, never `startsWith(schema)` alone: `pub` must not match
+  // `public.users`.
+  const schemas = new Set(Array.isArray(schema) ? schema : [schema]);
+  return snapshot.tables.filter((t) => {
+    const dot = t.table.indexOf('.');
+    const owner = dot === -1 ? 'public' : t.table.slice(0, dot);
+    return schemas.has(owner) && !INFRASTRUCTURE_TABLES.has(bareName(t.table));
+  });
+}
+
+/**
+ * The infrastructure tables a pull SKIPPED, qualified — so the command can NAME them.
+ *
+ * The denylist has a consequence nothing used to state: these tables are never modeled,
+ * so an adopter with legacy bookkeeping (a retired Rails app's `schema_migrations`) can
+ * only reach a fully-declared database by DROPPING them. A consumer did that archaeology
+ * by hand (2026-08-07); one line at pull time is what it should have cost.
+ */
+export function skippedInfrastructureTables(snapshot: SchemaSnapshot, schema: string | string[]): string[] {
+  const schemas = new Set(Array.isArray(schema) ? schema : [schema]);
+  return snapshot.tables
+    .map((t) => t.table)
+    .filter((table) => schemas.has(schemaOf(table)) && INFRASTRUCTURE_TABLES.has(bareName(table)));
+}
+
+/** The schema a qualified (or bare) table lives in — bare means public. */
+function schemaOf(table: string): string {
+  const dot = table.indexOf('.');
+  return dot === -1 ? 'public' : table.slice(0, dot);
 }
 
 /**
@@ -258,7 +311,14 @@ export function pullableTables(snapshot: SchemaSnapshot, schema: string): TableS
 export function modelVarName(table: string): string {
   const bare = bareName(table);
   const singular = bare.endsWith('s') ? bare.slice(0, -1) : bare;
-  return singular.split('_').filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join('');
+  const pascal = (word: string): string =>
+    word.split('_').filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join('');
+  // Non-public schemas are QUALIFIED, so `public.users` and `auth.users` can live in one
+  // barrel. Public stays bare, so an existing single-schema barrel does not churn and
+  // nothing renames when a second schema arrives. Same rule the derived renderer already
+  // uses for its own symbols.
+  const owner = schemaOf(table);
+  return owner === 'public' ? pascal(singular) : pascal(owner) + pascal(singular);
 }
 
 /**
@@ -490,7 +550,7 @@ function renderConstraintsBlock(table: TableSchema, checks: CheckConstraint[], k
 }
 
 /** One `export const X = defineModel(...)` block for a table. */
-export function renderModelBlock(table: TableSchema, known: Set<string>, enums: Map<string, string[]> = new Map(), abilities = 'commented', liveAuthz?: Map<string, TableContract>): string {
+export function renderModelBlock(table: TableSchema, known: Set<string>, enums: Map<string, string[]> = new Map(), abilities = 'commented', liveAuthz?: Map<string, TableContract>, governRoles?: ReadonlySet<string>): string {
   // A CHECK that reverses to a single field's .validate() is rendered on the field (ergonomic);
   // the rest stay table-level check(). Both round-trip — this only chooses the nicer form.
   const validates = new Map<string, string>();
@@ -507,11 +567,19 @@ export function renderModelBlock(table: TableSchema, known: Set<string>, enums:
   // The authz decision renders FIRST — before fields — because it is the first thing a
   // reviewer must resolve about a model (and where the field-report consumer's codemod
   // put it, proving the position is mechanical-edit-friendly).
-  const stanza = abilitiesStanza(abilities, table, liveAuthz);
+  const stanza = abilitiesStanza(abilities, table, liveAuthz, governRoles);
   const writtenBy = writtenByStanza(table, liveAuthz);
   const softDelete = softDeleteStanza(table, stanza.publicRead);
 
-  return `export const ${modelVarName(table.table)} = defineModel('${bareName(table.table)}', {\n${stanza.text}\n${writtenBy}${softDelete}  fields: {\n${fields}\n  },${constraints}\n});`;
+  // A non-public table carries `schema:` — defineModel stores the name VERBATIM, so the
+  // qualification cannot ride in the first argument (that would make the table literally
+  // named `metrics.impressions`). Without it a multi-schema pull rendered
+  // `defineModel('impressions')`, which declares `public.impressions`, and the matview that
+  // selects FROM metrics.impressions then failed to build. Same idiom the derived renderer
+  // already uses for defineMaterializedTable.
+  const owner = schemaOf(table.table);
+  const schemaProp = owner === 'public' ? '' : `  schema: '${owner}',\n`;
+  return `export const ${modelVarName(table.table)} = defineModel('${bareName(table.table)}', {\n${stanza.text}\n${schemaProp}${writtenBy}${softDelete}  fields: {\n${fields}\n  },${constraints}\n});`;
 }
 
 /** The `import` lines a rendered body needs — only what it actually uses, so the file reads clean. */
@@ -548,6 +616,7 @@ function moduleFooter(
   derived?: DerivedRenderResult,
   multiline = false,
   external?: ExternalDerived,
+  extensions?: string[],
 ): string {
   // A materialized table (--matviews-as-tables) is a MODEL — its block rides the derived
   // render (topo-ordered with the objects around it) but its name belongs in `models`.
@@ -570,6 +639,22 @@ function moduleFooter(
     if (!external) parts.push(`export const derived = [${derived!.names.join(', ')}];`);
     keys.push('derived');
   }
+  // Extensions are the BOOTSTRAP half of a declared state: `field.pgType('hstore')` compiles
+  // to a column whose type does not exist unless something ran CREATE EXTENSION first.
+  // `defineModule` has always accepted the key and migration-compile has always emitted
+  // `CREATE EXTENSION IF NOT EXISTS` from it — the renderer was the only missing link, and a
+  // consumer found it when db:check's from-scratch ring failed with `type "hstore" does not
+  // exist` on a state that was otherwise clean.
+  //
+  // ALL installed extensions, not only those reachable from a declared column type: an
+  // adopter's `pg_stat_statements` and `unaccent` reach no column, and a from-scratch
+  // database without them is not their database.
+  if (extensions?.length) {
+    // Sorted HERE, not just at the introspection: the renderer owns byte-stability, and a
+    // caller passing an unsorted list must not produce a diff against an identical database.
+    parts.push(`export const extensions = [${[...extensions].sort().map((e) => `'${e}'`).join(', ')}];`);
+    keys.push('extensions');
+  }
   parts.push(`export const appModule = defineModule({ ${keys.join(', ')} });`);
   parts.push(`export const modules = [appModule];`);
   return parts.join('\n\n');
@@ -604,14 +689,14 @@ export function renderModelSource(snapshot: SchemaSnapshot, opts: RenderOptions
   const known = new Set(tables.map((t) => bareName(t.table)));
   const enums = new Map((snapshot.enums ?? []).map((e) => [e.name, e.values]));
 
-  const blocks = tables.map((t) => renderModelBlock(t, known, enums, opts.abilities ?? 'commented', opts.liveAuthz));
+  const blocks = tables.map((t) => renderModelBlock(t, known, enums, opts.abilities ?? 'commented', opts.liveAuthz, opts.governRoles && new Set(opts.governRoles)));
   // The derived layer (B5): sequences + views/matviews/functions, after the models they
   // reference, before the module wrapper that composes all three.
   if (opts.derived?.block) blocks.push(opts.derived.block);
 
   // Module composition is the norm: the pulled barrel exports `modules` alongside `models`,
   // so a fresh brownfield project lands on the same shape the framework composes.
-  const footer = moduleFooter(tables.map((t) => modelVarName(t.table)), opts.derived);
+  const footer = moduleFooter(tables.map((t) => modelVarName(t.table)), opts.derived, false, undefined, snapshot.extensions);
 
   const header = importHeader([...blocks, footer].join('\n\n'), opts.derived?.imports ?? []);
 
@@ -626,8 +711,18 @@ export function renderModelSource(snapshot: SchemaSnapshot, opts: RenderOptions
  * NAMING CONTRACT — changing this rule is a BREAKING CHANGE: index.ts and cross-file
  * FK imports reference these paths. Pinned by naming-contract.test.ts.
  */
+/** The import specifier a barrel (or a sibling file) uses for a model — the FILENAME rule
+ *  minus the extension. Derived from modelFileName so the two can never disagree; they did,
+ *  and a multi-schema pull emitted `import … from './refresh-tokens'` next to a file called
+ *  `auth-refresh-tokens.ts`. */
+export function modelImportPath(table: string): string {
+  return `./${modelFileName(table).replace(/\.ts$/, '')}`;
+}
+
 export function modelFileName(table: string): string {
-  return `${bareName(table).replace(/_/g, '-')}.ts`;
+  const owner = schemaOf(table);
+  const bare = bareName(table).replace(/_/g, '-');
+  return owner === 'public' ? `${bare}.ts` : `${owner.replace(/_/g, '-')}-${bare}.ts`;
 }
 
 /** The bare tables (other than itself) a table's rendered FKs reference within the pulled set. */
@@ -662,9 +757,9 @@ export function renderModelFiles(snapshot: SchemaSnapshot, opts: RenderOptions =
   const enums = new Map((snapshot.enums ?? []).map((e) => [e.name, e.values]));
 
   const files: RenderedModelFile[] = tables.map((t) => {
-    const block = renderModelBlock(t, known, enums, opts.abilities ?? 'commented', opts.liveAuthz);
+    const block = renderModelBlock(t, known, enums, opts.abilities ?? 'commented', opts.liveAuthz, opts.governRoles && new Set(opts.governRoles));
     const crossImports = referencedTables(t, known).map(
-      (target) => `import { ${modelVarName(target)} } from './${bareName(target).replace(/_/g, '-')}';`,
+      (target) => `import { ${modelVarName(target)} } from '${modelImportPath(target)}';`,
     );
     const header = [importHeader(block), ...crossImports].join('\n');
     return { file: modelFileName(t.table), source: `${header}\n\n${block}\n` };
@@ -683,13 +778,13 @@ export function renderModelFiles(snapshot: SchemaSnapshot, opts: RenderOptions =
       // The --derived-out layer, imported rather than re-declared — the barrel must WIRE it
       // or db:plan silently compares against models only.
       ...(extNames.length ? [`import { ${extNames.join(', ')} } from '${ext!.specifier}';`] : []),
-      ...names.map((n, i) => `import { ${n} } from './${bareName(tables[i].table).replace(/_/g, '-')}';`),
+      ...names.map((n, i) => `import { ${n} } from '${modelImportPath(tables[i].table)}';`),
     ].join('\n'),
     `export {\n${names.map((n) => `  ${n},`).join('\n')}\n};`,
     // Re-exported so the barrel remains the one place that describes the database.
     ...(extNames.length ? [`export { ${extNames.join(', ')} };`] : []),
     ...(opts.derived?.block ? [opts.derived.block] : []),
-    moduleFooter(names, opts.derived, true, ext),
+    moduleFooter(names, opts.derived, true, ext, snapshot.extensions),
   ].join('\n\n');
   files.push({ file: 'index.ts', source: index + '\n' });
 

package/src/cli/schema-introspect.ts

@@ -105,6 +105,8 @@ export interface SchemaSnapshot {
   enums?: EnumType[];
   /** Standalone sequences (serial-owned ones excluded). Absent/empty when none. */
   sequences?: SequenceSchema[];
+  /** Installed extensions, `plpgsql` excluded. Absent when the read predates this. */
+  extensions?: string[];
 }
 
 // ---------------------------------------------------------------------------
@@ -216,6 +218,27 @@ ORDER BY n.nspname, t.typname;
  * has an 'a'/'i' pg_depend link to its column and stays represented BY that column).
  * These hold state, so they are base-schema: migrated, diffed, fingerprinted.
  */
+/**
+ * Installed extensions — the bootstrap a declared state needs before anything else.
+ *
+ * Database-wide, not per-schema: `pg_extension` has no schema filter worth applying, and an
+ * extension installed into `public` is just as required by a model in `auth`. So this read
+ * ignores `--schema` deliberately.
+ *
+ * `plpgsql` is excluded because PostgreSQL installs it into every database by default —
+ * emitting `CREATE EXTENSION IF NOT EXISTS plpgsql` is noise, not bootstrap.
+ *
+ * Without this, a declared state that renders `field.pgType('hstore')` compiles to a CREATE
+ * TABLE whose type does not exist, and `db:check`'s from-scratch ring fails with
+ * `type "hstore" does not exist` — the state describes a database it cannot build.
+ */
+export const EXTENSIONS_SQL = `
+SELECT extname AS name
+FROM pg_extension
+WHERE extname <> 'plpgsql'
+ORDER BY extname;
+`.trim();
+
 export const SEQUENCES_SQL = `
 SELECT
   n.nspname AS schema,
@@ -540,6 +563,7 @@ export interface SchemaRows {
   enums?: EnumRow[];
   indexes?: IndexRow[];
   sequences?: SequenceRow[];
+  extensions?: ExtensionRow[];
 }
 
 /**
@@ -618,10 +642,18 @@ export function assembleSchema(rows: SchemaRows): SchemaSnapshot {
     .map(sequenceRowToDescriptor)
     .sort((a, b) => a.name.localeCompare(b.name));
 
+  // ABSENT vs EMPTY matters: a caller that did not run the extensions query leaves the key
+  // off entirely, and the renderer must not read that as "this database has none" and emit
+  // an empty list that later looks authoritative.
+  const extensions = rows.extensions === undefined
+    ? undefined
+    : rows.extensions.map((r) => r.name).sort();
+
   return {
     tables: [...tables.values()].sort((a, b) => a.table.localeCompare(b.table)),
     enums,
     ...(sequences.length ? { sequences } : {}),
+    ...(extensions !== undefined ? { extensions } : {}),
   };
 }
 
@@ -631,13 +663,15 @@ export function assembleSchema(rows: SchemaRows): SchemaSnapshot {
  * (the ops Lambda `db:query` in production, a fake in tests) and folds the rows with
  * `assembleSchema`. This is the `current` side `db:generate` diffs the compiled Models against.
  */
+export interface ExtensionRow { name: string }
+
 export async function introspectSchema(session: SessionRunner): Promise<SchemaSnapshot> {
   // ONE session, so all five queries see one database at one moment, under one pinned
   // search_path. Column defaults, CHECK constraints and index expressions all deparse
   // relative to that path — spread across separate connections these five rows can render
   // the same schema two ways, and a fingerprint minted from the mix describes nothing.
-  const [columns, constraints, enums, indexes, sequences] = await session(
-    [COLUMNS_SQL, CONSTRAINTS_SQL, ENUMS_SQL, INDEXES_SQL, SEQUENCES_SQL],
+  const [columns, constraints, enums, indexes, sequences, extensions] = await session(
+    [COLUMNS_SQL, CONSTRAINTS_SQL, ENUMS_SQL, INDEXES_SQL, SEQUENCES_SQL, EXTENSIONS_SQL],
     INTROSPECTION_SESSION,
   );
   return assembleSchema({
@@ -646,5 +680,6 @@ export async function introspectSchema(session: SessionRunner): Promise<SchemaSn
     enums: enums as EnumRow[],
     indexes: indexes as IndexRow[],
     sequences: sequences as SequenceRow[],
+    extensions: extensions as ExtensionRow[],
   });
 }