@everystack/cli 0.4.52 → 0.4.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/cli",
-  "version": "0.4.52",
+  "version": "0.4.53",
   "description": "CLI and OTA updates for Expo apps on everystack",
   "license": "AGPL-3.0-only",
   "author": "Scalable Technology, Inc. <licensing@scalable.technology>",

package/src/cli/authz-compile.ts

@@ -23,6 +23,7 @@
 import { isColumnAbility, type ModelDescriptor, type Ability } from '@everystack/model';
 import type { PolicyContract, TableContract, PolicyCommand } from './authz-contract.js';
 import { parenthesizeOnce } from './authz-contract.js';
+import { normalizeDeparsedExpr } from './deparse-normal.js';
 
 export interface CompileOptions {
   /** Schema the table lives in. Default: `public`. */
@@ -400,7 +401,14 @@ export function compileTableContract(model: ModelDescriptor, opts: CompileOption
     name: string, command: PolicyCommand, roles: string[],
     using: string | null, check: string | null,
   ): void => {
-    policies.push({ name, command, roles, permissive: true, using, check });
+    // Same normalization the live producer applies (authz-contract's `predicate`): a model
+    // pulled on one PostgreSQL major carries that major's deparse spelling in its predicates,
+    // and it must compare equal against a stage on another. One rule table, two producers.
+    policies.push({
+      name, command, roles, permissive: true,
+      using: using == null ? null : normalizeDeparsedExpr(using),
+      check: check == null ? null : normalizeDeparsedExpr(check),
+    });
   };
 
   // admin-bypass — one ALL policy, true/true.

package/src/cli/authz-contract.ts

@@ -24,6 +24,7 @@
 import { parsePgArray } from './security-catalog.js';
 import { INTROSPECTION_SESSION, type SessionRunner } from './session.js';
 import { matchPolicies, roleSetEqual } from './authz-identity.js';
+import { normalizeDeparsedExpr } from './deparse-normal.js';
 
 // ---------------------------------------------------------------------------
 // The contract format — the frozen, reviewable, version-controlled shape.
@@ -270,6 +271,15 @@ export interface FunctionContract {
 export interface AuthzContract {
   tables: TableContract[];
   functions: FunctionContract[];
+  /**
+   * Schema-level ACLs (pg_namespace.nspacl), schema → grantee → sorted privileges
+   * (USAGE | CREATE). `PUBLIC` is the pseudo-role entry. A schema with a NULL acl is
+   * ABSENT — owner-default, no explicit grants — so absence means "the grant does not
+   * exist" and an emitter may emit it. Optional: contracts assembled from older recorders
+   * or hand-built fixtures simply carry no schema knowledge, and consumers must treat
+   * that as "unknown", never as "no grants".
+   */
+  schemaAcls?: Record<string, Record<string, string[]>>;
 }
 
 export type PolicyCommand = 'ALL' | 'SELECT' | 'INSERT' | 'UPDATE' | 'DELETE';
@@ -398,6 +408,82 @@ WHERE c.relkind = 'r'
 ORDER BY n.nspname, c.relname;
 `.trim();
 
+/**
+ * Schema ACLs, for the emitters that grant schema USAGE. The consumer bug this closes: the
+ * usage phase emitted `GRANT USAGE ON SCHEMA` with no live read at all, so every plan with
+ * any authz statement re-granted what the database already held — two false statements on
+ * every stage plan, forever. `nspacl` casts to its array-literal text; NULL stays NULL
+ * (owner default — no explicit grants — which the parser must NOT read as an empty grant
+ * list on purpose: for nspacl the two mean the same emittable thing, but the distinction
+ * is kept so the contract says what the catalog said).
+ */
+export const SCHEMA_ACL_SQL = `
+SELECT n.nspname AS schema, n.nspacl::text AS acl
+FROM pg_namespace n
+WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')
+  AND n.nspname NOT LIKE 'pg_%'
+ORDER BY n.nspname;
+`.trim();
+
+export interface SchemaAclRow {
+  schema: string;
+  acl: unknown;
+}
+
+/** The two privileges a schema ACL can carry, in aclitem letter form. */
+const SCHEMA_PRIV_LETTERS: Record<string, string> = { U: 'USAGE', C: 'CREATE' };
+
+/**
+ * Parse one `aclitem[]::text` literal — `{postgres=UC/postgres,authenticator=U/postgres}` —
+ * into grantee → privileges. An empty grantee (`=U/postgres`) is PUBLIC. A quoted grantee
+ * (`"odd,role"=U/postgres`) is unwrapped with its doubled-quote escapes. A `*` (grant
+ * option) rides the letter before it and is dropped — holding WITH GRANT OPTION still
+ * holds the privilege. Unparseable input returns null: the caller treats it as unknown,
+ * never as "no grants".
+ */
+export function parseSchemaAcl(text: string | null | undefined): Record<string, string[]> | null {
+  if (text == null) return null;
+  const s = String(text).trim();
+  if (!s.startsWith('{') || !s.endsWith('}')) return null;
+  const body = s.slice(1, -1);
+  if (body.trim() === '') return {};
+  const out: Record<string, string[]> = {};
+  // Split items at top-level commas — a quoted region may contain commas.
+  const items: string[] = [];
+  let start = 0;
+  for (let j = 0; j < body.length; j++) {
+    if (body[j] === '"') {
+      for (j++; j < body.length; j++) {
+        if (body[j] !== '"') continue;
+        if (body[j + 1] === '"') { j++; continue; }
+        break;
+      }
+    } else if (body[j] === ',') {
+      items.push(body.slice(start, j));
+      start = j + 1;
+    }
+  }
+  items.push(body.slice(start));
+  for (const item of items) {
+    // grantee=letters/grantor — grantee may be quoted; the grantor half is irrelevant here.
+    const eq = item.indexOf('=', item.startsWith('"') ? item.indexOf('"', 1) + 1 : 0);
+    if (eq === -1) return null;
+    let grantee = item.slice(0, eq);
+    if (grantee.startsWith('"') && grantee.endsWith('"')) grantee = grantee.slice(1, -1).replace(/""/g, '"');
+    if (grantee === '') grantee = 'PUBLIC';
+    const slash = item.indexOf('/', eq);
+    const letters = item.slice(eq + 1, slash === -1 ? undefined : slash);
+    const privs = new Set<string>();
+    for (const ch of letters) {
+      if (ch === '*') continue;
+      const p = SCHEMA_PRIV_LETTERS[ch];
+      if (p) privs.add(p);
+    }
+    if (privs.size) out[grantee] = [...privs].sort();
+  }
+  return out;
+}
+
 // ---------------------------------------------------------------------------
 // Pure mappers — one catalog row -> one descriptor.
 // ---------------------------------------------------------------------------
@@ -411,7 +497,10 @@ function truthy(v: unknown): boolean {
 function predicate(v: unknown): string | null {
   if (v == null) return null;
   const s = String(v).trim();
-  return s.length > 0 ? s : null;
+  // Normalized at the PRODUCER, so the matcher, the canonical hash, and the drift detail
+  // all see one spelling — a live tree deparsed by an older major must compare equal to
+  // the same predicate parsed on a newer one. See deparse-normal.ts for the rule table.
+  return s.length > 0 ? normalizeDeparsedExpr(s) : null;
 }
 
 export interface PolicyRow {
@@ -524,6 +613,8 @@ export interface ContractRows {
   policies: PolicyRow[];
   grants: GrantRow[];
   columnGrants?: ColumnGrantRow[];
+  /** pg_namespace ACL rows (SCHEMA_ACL_SQL) — optional; absent means schema ACLs unknown. */
+  schemaAcls?: SchemaAclRow[];
   /** Already-mapped function descriptors (from security-catalog's FUNCTIONS_SQL). */
   functions: { schema: string; name: string; securityDefiner: boolean; hasSearchPath: boolean; owner?: string; ownerBypassesRls?: boolean }[];
 }
@@ -585,9 +676,22 @@ export function assembleContract(rows: ContractRows): AuthzContract {
     }))
     .sort((a, b) => a.name.localeCompare(b.name));
 
+  // Schema ACLs, keyed only when the read ran (absent = unknown, per the contract's doc).
+  // A NULL acl (owner default) contributes an empty entry so "we looked, nothing granted"
+  // is distinguishable from "we never looked".
+  let schemaAcls: Record<string, Record<string, string[]>> | undefined;
+  if (rows.schemaAcls) {
+    schemaAcls = {};
+    for (const row of rows.schemaAcls) {
+      if (IGNORED_SCHEMAS.has(row.schema)) continue;
+      schemaAcls[row.schema] = parseSchemaAcl(row.acl == null ? '{}' : String(row.acl)) ?? {};
+    }
+  }
+
   return {
     tables: [...tables.values()].sort((a, b) => a.table.localeCompare(b.table)),
     functions,
+    ...(schemaAcls ? { schemaAcls } : {}),
   };
 }
 
@@ -597,11 +701,11 @@ export async function introspectContract(
   mapFunctionRow: (row: any) => { schema: string; name: string; securityDefiner: boolean; hasSearchPath: boolean },
   functionsSql: string,
 ): Promise<AuthzContract> {
-  // ONE session: the five queries describe one moment under one pinned search_path.
+  // ONE session: the six queries describe one moment under one pinned search_path.
   // Policy USING / WITH CHECK expressions deparse relative to that path, so a read spread
   // across connections can report authz drift that does not exist.
-  const [rls, policies, grants, columnGrants, fnRows] = await session(
-    [RLS_SQL, POLICIES_SQL, GRANTS_SQL, COLUMN_GRANTS_SQL, functionsSql],
+  const [rls, policies, grants, columnGrants, schemaAcls, fnRows] = await session(
+    [RLS_SQL, POLICIES_SQL, GRANTS_SQL, COLUMN_GRANTS_SQL, SCHEMA_ACL_SQL, functionsSql],
     INTROSPECTION_SESSION,
   );
   return assembleContract({
@@ -609,6 +713,7 @@ export async function introspectContract(
     policies: policies as PolicyRow[],
     grants: grants as GrantRow[],
     columnGrants: columnGrants as ColumnGrantRow[],
+    schemaAcls: schemaAcls as SchemaAclRow[],
     functions: (fnRows as any[]).map(mapFunctionRow),
   });
 }

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

@@ -440,6 +440,7 @@ export async function dbPullCommand(flags: Record<string, string>): Promise<void
     const stageName = flags.stage;
     if (!stageName) {
       note(`No --stage, so ${BASELINE_FILE} was not written. The foreign grantees above are recorded per stage; re-run with --stage <name> to adopt them, or db:plan will refuse until you do.`);
+      note(`--stage composes with --database-url: the URL stays the connection, the stage only LABELS the baseline entry — a local clone can adopt for a deployed stage without touching it.`);
     } else {
       const entry = buildStageBaseline(pulledExemptions, { observedAt: new Date().toISOString(), fingerprint: pulledFingerprint });
       const merged = mergeBaseline(await readBaselineFile(), stageName, entry);

package/src/cli/deparse-normal.ts

@@ -0,0 +1,137 @@
+/**
+ * deparse-normal — cross-version normalization of `pg_get_expr` output.
+ *
+ * A policy predicate's stored tree is built by whichever server PARSED the DDL, and
+ * different PostgreSQL majors const-fold the same source differently. The measured case
+ * (a consumer's stage, 2026-08-08): an older major stores an array cast OUTSIDE the array,
+ *
+ *     (ARRAY['a'::character varying, 'b'::character varying])::text[]
+ *
+ * while PG17 distributes it over the elements at parse time,
+ *
+ *     ARRAY[('a'::character varying)::text, ('b'::character varying)::text]
+ *
+ * Text-identity across venues is then unreachable: models pulled on one major can never
+ * equal a stage on another, the differ plans DROP+CREATE forever (the stage re-deparses in
+ * its own spelling), and the fingerprint gate cannot MATCH. Identity must not depend on the
+ * two venues sharing a parser.
+ *
+ * THE RULE TABLE IS DELIBERATELY SMALL. Each rewrite must be provably semantics-preserving,
+ * because this text feeds the policy matcher, whose safety property is "misses are safe,
+ * false matches are the disaster". One rule today:
+ *
+ *   ARRAY-CAST DISTRIBUTION: `(ARRAY[e1, …, en])::T[]  ==  ARRAY[(e1)::T, …, (en)::T]`
+ *   for n ≥ 1. PostgreSQL defines an array-to-array cast element-wise (parse_coerce), so
+ *   the two expressions denote the same value for every input; wrapping an element in
+ *   parentheses is parse-neutral. The empty array is EXCLUDED: `ARRAY[]` without a cast has
+ *   no type, so its cast is load-bearing and stays.
+ *
+ * Anything the scanner does not positively recognize is left byte-for-byte unchanged — an
+ * unrecognized spelling is a MISS (drop + create, the pre-existing behavior), never a guess.
+ * Escalation is named, not implied: the SECOND cross-version variant found in the field is
+ * the trigger to adopt libpg_query and move identity onto normalized ASTs (Ty, 2026-08-09) —
+ * a growing rule table over raw text is where scanning stops being defensible.
+ *
+ * Applied at the PRODUCERS (live introspection's `predicate()`, the compiler's policy
+ * assembly), so every downstream comparison — the identity matcher, the canonical hash, the
+ * drift detail — sees normalized text without holding its own copy of this rule.
+ */
+
+/** `::text[]` / `::character varying[]` — the cast suffix after `(ARRAY[…])`. */
+const ARRAY_CAST_SUFFIX = /^::([A-Za-z_][A-Za-z0-9_]*(?:\s[A-Za-z_][A-Za-z0-9_]*)*)\[\]/;
+
+/**
+ * From an opening single or double quote, the index of its closing quote.
+ * SQL escapes a quote by doubling it; a doubled quote is content, not a close.
+ * Returns -1 on an unterminated literal (the caller then leaves the text alone).
+ */
+function skipQuoted(s: string, at: number): number {
+  const q = s[at];
+  for (let j = at + 1; j < s.length; j++) {
+    if (s[j] !== q) continue;
+    if (s[j + 1] === q) { j++; continue; }
+    return j;
+  }
+  return -1;
+}
+
+/** The index of the `]` closing the `[` at `open`, honoring nesting and quoted regions. */
+function matchBracket(s: string, open: number): number {
+  let sq = 0;
+  let par = 0;
+  for (let j = open; j < s.length; j++) {
+    const c = s[j];
+    if (c === "'" || c === '"') {
+      j = skipQuoted(s, j);
+      if (j < 0) return -1;
+    } else if (c === '[') sq++;
+    else if (c === ']') { sq--; if (sq === 0 && par === 0) return j; }
+    else if (c === '(') par++;
+    else if (c === ')') par--;
+  }
+  return -1;
+}
+
+/** Split on top-level commas (both nesting depths zero), or null on an unterminated literal. */
+function splitTopLevel(s: string): string[] | null {
+  const out: string[] = [];
+  let start = 0;
+  let sq = 0;
+  let par = 0;
+  for (let j = 0; j < s.length; j++) {
+    const c = s[j];
+    if (c === "'" || c === '"') {
+      j = skipQuoted(s, j);
+      if (j < 0) return null;
+    } else if (c === '[') sq++;
+    else if (c === ']') sq--;
+    else if (c === '(') par++;
+    else if (c === ')') par--;
+    else if (c === ',' && sq === 0 && par === 0) {
+      out.push(s.slice(start, j));
+      start = j + 1;
+    }
+  }
+  out.push(s.slice(start));
+  return out;
+}
+
+/** One left-to-right pass: rewrite the first recognized `(ARRAY[…])::T[]`, or null if none. */
+function distributeOnce(s: string): string | null {
+  let i = 0;
+  while ((i = s.indexOf('(ARRAY[', i)) !== -1) {
+    const open = i + 6; // the '['
+    const close = matchBracket(s, open);
+    if (close === -1) return null; // unparseable text — leave everything alone
+    if (s[close + 1] === ')') {
+      const m = ARRAY_CAST_SUFFIX.exec(s.slice(close + 2));
+      if (m) {
+        const inner = s.slice(open + 1, close);
+        const elements = splitTopLevel(inner);
+        // Empty array excluded: its cast carries the type. A failed split leaves the text alone.
+        if (elements !== null && inner.trim().length > 0) {
+          const t = m[1];
+          const rewritten = `ARRAY[${elements.map((e) => `(${e.trim()})::${t}`).join(', ')}]`;
+          return s.slice(0, i) + rewritten + s.slice(close + 2 + m[0].length);
+        }
+      }
+    }
+    i = open;
+  }
+  return null;
+}
+
+/**
+ * Normalize one deparsed expression. Idempotent; unrecognized text returns unchanged.
+ * Fixpoint-bounded: nesting deeper than the cap returns its progress, which is still
+ * deterministic — both sides of every comparison run this same function.
+ */
+export function normalizeDeparsedExpr(text: string): string {
+  let s = text;
+  for (let n = 0; n < 64; n++) {
+    const next = distributeOnce(s);
+    if (next === null) return s;
+    s = next;
+  }
+  return s;
+}

package/src/cli/migration-generate.ts

@@ -90,7 +90,11 @@ function holdDrop(sql: string): string {
  */
 export function unmodeledTables(models: ModelDescriptor[], current: SchemaSnapshot, opts: GenerateOptions = {}): string[] {
   const schema = opts.schema ?? 'public';
-  const declared = new Set(models.map((m) => `${schema}.${m.table}`));
+  // The model's OWN schema first — the same rule the compiler applies. Qualifying every
+  // model with the call default read a multi-schema checkout's non-public models as
+  // unmodeled: a consumer's plan listed three modeled tables as riding through untouched,
+  // which is a false statement about what the plan governs.
+  const declared = new Set(models.map((m) => `${m.schema ?? schema}.${m.table}`));
   // A pending table rename's OR move's source is ours — declared under its new (qualified)
   // name; without this it reads as an undeclared orphan (F1) and the move/rename silently
   // degrades to CREATE + leave-behind, the exact bug the markers exist to prevent.
@@ -233,6 +237,20 @@ export function generateMigrationSql(models: ModelDescriptor[], current: SchemaS
   // The from-scratch path had this from the start; the diff path did not, so a non-public
   // model reached through db:sync/db:generate was unreachable by every role that did not
   // pick up USAGE some other way. The example app's analytics schema is what surfaced it.
+  // Diffed against the LIVE schema ACLs when the contract carries them. This phase used to
+  // emit unconditionally, so any plan with an authz statement re-granted USAGE the database
+  // already held — two false statements on every one of a consumer's stage plans (measured,
+  // catalog-verified, 2026-08-08). A role holds USAGE when its own nspacl entry says so or
+  // when PUBLIC's does (PUBLIC reaches every role). Membership-derived usage is invisible
+  // here and stays emitted — idempotent, and rarer than the direct grants that were the bug.
+  // No schemaAcls (fresh compose, older recorder) = unknown = emit, exactly as before.
+  const liveSchemaAcls = liveAuthzRenamed?.schemaAcls;
+  const hasLiveUsage = (s: string, role: string): boolean => {
+    const acl = liveSchemaAcls?.[s];
+    if (!acl) return false;
+    const key = role.toUpperCase() === 'PUBLIC' ? 'PUBLIC' : role;
+    return (acl[key] ?? []).includes('USAGE') || (acl.PUBLIC ?? []).includes('USAGE');
+  };
   const usagePhase = authzPhase.length
     ? [...new Set(desiredContracts.map((c) => c.table.split('.')[0]))]
         .filter((s) => s !== 'public')
@@ -244,8 +262,9 @@ export function generateMigrationSql(models: ModelDescriptor[], current: SchemaS
             for (const r of Object.keys(c.grants)) roles.add(r);
             for (const r of Object.keys(c.columnGrants ?? {})) roles.add(r);
           }
-          if (!roles.size) return [];
-          const targets = [...roles].sort().map((r) => (r.toUpperCase() === 'PUBLIC' ? 'PUBLIC' : r)).join(', ');
+          const missing = [...roles].filter((r) => !hasLiveUsage(s, r));
+          if (!missing.length) return [];
+          const targets = missing.sort().map((r) => (r.toUpperCase() === 'PUBLIC' ? 'PUBLIC' : r)).join(', ');
           return [`GRANT USAGE ON SCHEMA "${s}" TO ${targets}`];
         })
     : [];

package/src/cli/schema-fingerprint.ts

@@ -110,7 +110,7 @@ import { normalizeDefault, normalizeCheck, indexKey } from './schema-diff.js';
 // it from the canonical form AND the reconciler leaves it alone, before and after. Restrictive
 // policies are never subsumed (they AND, so removing one would WIDEN), and the rule must match
 // exactly including the effective WITH CHECK.
-export const FINGERPRINT_VERSION = 8;
+export const FINGERPRINT_VERSION = 9;
 
 // ---------------------------------------------------------------------------
 // Canonical form.