@sequenceholdings/orm 2.0.0 → 2.1.1

package/dist/compiler.cjs

@@ -7,9 +7,26 @@ var graphql = require('graphql');
 // src/compiler-gql/artifact.ts
 
 // src/constants.ts
-var CAPABILITY_KEY_PATTERN = /^(?:org\/)?[a-z0-9-]{1,64}$/;
+var COLUMN_IDENTIFIER_PATTERN = /^_?[a-z][a-z0-9_]*$/;
+var MAX_IDENTIFIER_LENGTH = 63;
+var CAPABILITY_KEY_PATTERN = /^(?:org\/|app\/[a-z][a-z0-9-]{0,63}\/)?[a-z0-9-]{1,64}$/;
 var ORM_SCHEMA_PREFIX = "orm_";
 var ormSchemaName = (namespace) => `${ORM_SCHEMA_PREFIX}${namespace}`;
+var CELL_PARTS = ["at", "by", "rev", "source", "conflicts"];
+var CELL_PART_SUFFIX = {
+  at: "__at",
+  by: "__by",
+  rev: "__rev",
+  source: "__src",
+  conflicts: "__lost"
+};
+var MAX_TRACKED_COLUMN_NAME = MAX_IDENTIFIER_LENGTH - 6;
+var CELLS_FIELD = "cells";
+function cellColumnName(column, part) {
+  return `${column}${CELL_PART_SUFFIX[part]}`;
+}
+var MATERIALIZE_ACTOR = "orm:materialize";
+JSON.stringify({ sub: MATERIALIZE_ACTOR, org: null, roles: [], capabilities: [] });
 
 // src/hash.ts
 function stableJson(value) {
@@ -18,9 +35,469 @@ function stableJson(value) {
   const entries = Object.entries(value).filter(([, entryValue]) => entryValue !== void 0).sort(([a], [b]) => a < b ? -1 : 1).map(([key, entryValue]) => `${JSON.stringify(key)}:${stableJson(entryValue)}`);
   return `{${entries.join(",")}}`;
 }
+var quoteIdentifier = (name) => `"${name.replaceAll('"', '""')}"`;
+var quoteLiteral = (value) => `'${value.replaceAll("'", "''")}'`;
+
+// src/checks/compile.ts
+function tokenize(source) {
+  const tokens = [];
+  for (let position = 0; position < source.length; ) {
+    const char = source[position];
+    if (/\s/.test(char)) {
+      position++;
+      continue;
+    }
+    if (char === "(" || char === ")" || char === ",") {
+      tokens.push({ kind: char === "(" ? "lparen" : char === ")" ? "rparen" : "comma", value: char, position });
+      position++;
+      continue;
+    }
+    if (char === "'") {
+      const start = position++;
+      let value = "";
+      let closed = false;
+      while (position < source.length) {
+        if (source[position] !== "'") {
+          value += source[position++];
+          continue;
+        }
+        if (source[position + 1] === "'") {
+          value += "'";
+          position += 2;
+          continue;
+        }
+        position++;
+        closed = true;
+        break;
+      }
+      if (!closed) throw new Error(`unterminated string at position ${start}`);
+      if (/[\x00-\x1f\x7f]/.test(value)) throw new Error(`control character in string at position ${start}`);
+      tokens.push({ kind: "string", value, position: start });
+      continue;
+    }
+    const operator = /^(<=|>=|<>|!=|!~|=|<|>|~)/.exec(source.slice(position));
+    if (operator) {
+      tokens.push({ kind: "operator", value: operator[0] === "<>" ? "!=" : operator[0], position });
+      position += operator[0].length;
+      continue;
+    }
+    const number = /^-?\d+(?:\.\d+)?/.exec(source.slice(position));
+    if (number) {
+      tokens.push({ kind: "number", value: number[0], position });
+      position += number[0].length;
+      continue;
+    }
+    const identifier3 = /^[a-zA-Z_][a-zA-Z_0-9]*/.exec(source.slice(position));
+    if (identifier3) {
+      tokens.push({ kind: "identifier", value: identifier3[0], position });
+      position += identifier3[0].length;
+      continue;
+    }
+    throw new Error(`unexpected character '${char}' at position ${position}`);
+  }
+  tokens.push({ kind: "end", value: "", position: source.length });
+  if (tokens.length > 256) throw new Error("check expression exceeds 256 tokens");
+  return tokens;
+}
+var Parser = class {
+  constructor(tokens, columns) {
+    this.tokens = tokens;
+    this.columns = /* @__PURE__ */ new Map();
+    for (const column of columns) {
+      for (const alias of [column.name, column.columnName]) {
+        const previous = this.columns.get(alias);
+        if (previous && previous.columnName !== column.columnName) {
+          throw new Error(`ambiguous check column '${alias}'`);
+        }
+        this.columns.set(alias, column);
+      }
+    }
+  }
+  index = 0;
+  depth = 0;
+  columns;
+  parse() {
+    const expression = this.parseOr();
+    this.expect("end", "end of expression");
+    return expression;
+  }
+  parseOr() {
+    let left = this.parseAnd();
+    while (this.matchKeyword("or")) left = `(${left} OR ${this.parseAnd()})`;
+    return left;
+  }
+  parseAnd() {
+    let left = this.parseNot();
+    while (this.matchKeyword("and")) left = `(${left} AND ${this.parseNot()})`;
+    return left;
+  }
+  parseNot() {
+    if (this.matchKeyword("not")) return `(NOT ${this.parseNot()})`;
+    return this.parsePrimary();
+  }
+  parsePrimary() {
+    if (this.peek().kind === "lparen") {
+      if (++this.depth > 32) throw new Error("check expression nesting exceeds 32 levels");
+      this.advance();
+      const expression = this.parseOr();
+      this.expect("rparen", "')'");
+      this.depth--;
+      return `(${expression})`;
+    }
+    return this.parseComparison();
+  }
+  parseComparison() {
+    const left = this.parseValue();
+    if (this.matchKeyword("is")) {
+      const negate = this.matchKeyword("not");
+      this.expectKeyword("null");
+      return `${left.sql} IS ${negate ? "NOT " : ""}NULL`;
+    }
+    if (this.matchKeyword("between")) {
+      const lower = this.parseValue();
+      this.expectKeyword("and");
+      const upper = this.parseValue();
+      return `${left.sql} BETWEEN ${lower.sql} AND ${upper.sql}`;
+    }
+    if (this.matchKeyword("in")) {
+      this.expect("lparen", "'(' after IN");
+      const values = [this.parseValue()];
+      while (this.peek().kind === "comma") {
+        this.advance();
+        values.push(this.parseValue());
+      }
+      this.expect("rparen", "')' after IN values");
+      if (values.some((value) => !value.literal)) throw new Error("IN values must be literals");
+      return `${left.sql} IN (${values.map((value) => value.sql).join(", ")})`;
+    }
+    const operator = this.expect("operator", "a comparison operator");
+    const right = this.parseValue();
+    if (operator.value === "~" || operator.value === "!~") {
+      if (left.column && left.column.type !== "text") throw new Error("regex checks require a text column");
+      if (!right.literal) throw new Error("regex pattern must be a literal");
+    }
+    return `${left.sql} ${operator.value} ${right.sql}`;
+  }
+  parseValue() {
+    const token = this.advance();
+    if (token.kind === "string") return { sql: quoteLiteral(token.value), literal: true };
+    if (token.kind === "number") {
+      const number = Number(token.value);
+      if (!Number.isFinite(number) || Number.isInteger(number) && !Number.isSafeInteger(number)) {
+        throw new Error(`unsafe numeric literal at position ${token.position}`);
+      }
+      return { sql: token.value, literal: true };
+    }
+    if (token.kind !== "identifier") throw new Error(`expected a column or literal at position ${token.position}`);
+    const keyword = token.value.toLowerCase();
+    if (keyword === "true" || keyword === "false" || keyword === "null") return { sql: keyword.toUpperCase(), literal: true };
+    if (keyword === "btrim") {
+      this.expect("lparen", "'(' after btrim");
+      const column2 = this.parseColumn();
+      this.expect("rparen", "')' after btrim column");
+      if (column2.type !== "text") throw new Error("btrim requires a text column");
+      return { sql: `btrim(${quoteIdentifier(column2.columnName)})`, column: column2 };
+    }
+    const column = this.columns.get(token.value);
+    if (!column) throw new Error(`unknown check column '${token.value}'`);
+    return { sql: quoteIdentifier(column.columnName), column };
+  }
+  parseColumn() {
+    const token = this.expect("identifier", "a column name");
+    const column = this.columns.get(token.value);
+    if (!column) throw new Error(`unknown check column '${token.value}'`);
+    return column;
+  }
+  peek() {
+    return this.tokens[this.index];
+  }
+  advance() {
+    const token = this.peek();
+    if (token.kind !== "end") this.index++;
+    return token;
+  }
+  matchKeyword(keyword) {
+    if (this.peek().kind !== "identifier" || this.peek().value.toLowerCase() !== keyword) return false;
+    this.advance();
+    return true;
+  }
+  expectKeyword(keyword) {
+    if (!this.matchKeyword(keyword)) throw new Error(`expected '${keyword}' at position ${this.peek().position}`);
+  }
+  expect(kind, description) {
+    const token = this.peek();
+    if (token.kind !== kind) throw new Error(`expected ${description} at position ${token.position}`);
+    return this.advance();
+  }
+};
+function compileCheckExpression(source, columns) {
+  return new Parser(tokenize(source), columns).parse();
+}
+var policyVariantSchema = zod.z.object({
+  /** Claims-only guard (capability()/role()/claim() comparisons — no columns). */
+  when: zod.z.string().min(1).max(1e3),
+  /** Exactly one of: allow-all bypass, or a row predicate. */
+  allow: zod.z.literal(true).optional(),
+  policy: zod.z.string().min(1).max(2e3).optional()
+}).refine((v) => v.allow === true !== (typeof v.policy === "string"), {
+  message: "A variant declares exactly one of allow: true or policy"
+});
+var policyExpressionSchema = zod.z.union([
+  zod.z.string().min(1).max(2e3),
+  zod.z.object({
+    default: zod.z.string().min(1).max(2e3),
+    variants: zod.z.array(policyVariantSchema).max(10).default([])
+  })
+]);
+function parseDurationMs(input) {
+  if (typeof input === "number") return Number.isInteger(input) && input > 0 ? input : void 0;
+  const match = /^(\d+(?:\.\d+)?)(ms|s|m)$/.exec(input);
+  if (!match) return void 0;
+  const factor = match[2] === "ms" ? 1 : match[2] === "s" ? 1e3 : 6e4;
+  const value = Math.round(Number(match[1]) * factor);
+  return value > 0 ? value : void 0;
+}
+var identifier = zod.z.string().min(1).max(63).regex(/^[a-z][a-z0-9_]*$/);
+var durationMs = zod.z.number().int().positive().max(24 * 60 * 60 * 1e3);
+var RESOLVED_VIEW_SYSTEM_COLUMNS = {
+  writebackStatus: { name: "writebackStatus", columnName: "_writeback_status", type: "text" },
+  writebackError: { name: "writebackError", columnName: "_writeback_error", type: "text" }
+};
+var RESOLVED_SOURCE_SYSTEM_COLUMNS = {
+  tombstoned: { name: "sysTombstoned", columnName: "_tombstoned" },
+  fetchedAt: { name: "sysFetchedAt", columnName: "_fetched_at" },
+  writebackStatus: { name: "sysWritebackStatus", columnName: "_writeback_status" },
+  writebackError: { name: "sysWritebackError", columnName: "_writeback_error" },
+  writebackAt: { name: "sysWritebackAt", columnName: "_writeback_at" }
+};
+var RESOLVED_VIEW_CELL_PARTS = ["source", "at", "by", "conflicts"];
+/* @__PURE__ */ new Set([
+  ...Object.values(RESOLVED_VIEW_SYSTEM_COLUMNS).flatMap((c) => [c.name, c.columnName]),
+  ...Object.values(RESOLVED_SOURCE_SYSTEM_COLUMNS).flatMap((c) => [c.name, c.columnName])
+]);
+var COMPARATORS = ["latest", "highest", "lowest", "priority", "nonNullFirst", "custom"];
+var canonicalFunctionRefSchema = zod.z.object({
+  /** `managed` = a Managed Function id/slug; `native` = an in-process Atlas function (reserved). */
+  kind: zod.z.enum(["managed", "native"]),
+  id: zod.z.string().min(1).max(200)
+}).strict();
+var canonicalFetchShapeSchema = zod.z.union([
+  zod.z.object({ shape: zod.z.literal("single") }).strict(),
+  zod.z.object({ shape: zod.z.literal("batch"), maxKeys: zod.z.number().int().min(2).max(500) }).strict()
+]);
+var canonicalResolvedSourceSchema = zod.z.object({
+  name: identifier,
+  kind: zod.z.enum(["manual", "etl", "prefetch"]),
+  /** Backing relation in this namespace: an internal table (manual/prefetch) or a synced table (etl). */
+  table: identifier,
+  /** Resolved columns (logical names) this source supplies — the primary key is implicit. */
+  columns: zod.z.array(zod.z.string().min(1).max(63)).min(1).max(500),
+  /** etl: logical timestamptz/date column on the synced table used as every cell's updated_at. */
+  updatedAt: zod.z.string().min(1).max(63).optional(),
+  /** prefetch: resolved column holding the source system's key (may be the primary key). */
+  key: zod.z.string().min(1).max(63).optional(),
+  fetch: canonicalFetchShapeSchema.optional(),
+  function: canonicalFunctionRefSchema.optional(),
+  prefetchDefaults: zod.z.object({
+    maxStalenessMs: durationMs,
+    timeoutMs: durationMs,
+    onError: zod.z.enum(["fallback", "fail"])
+  }).strict().optional(),
+  writeback: zod.z.object({
+    columns: zod.z.array(zod.z.string().min(1).max(63)).min(1).max(500),
+    defaultMode: zod.z.enum(["sync", "async"]),
+    timeoutMs: durationMs,
+    /** Remove confirmed cells from the manual source so a stale edit cannot shadow the source. */
+    clearManualOnConfirm: zod.z.boolean()
+  }).strict().optional()
+}).strict();
+var canonicalResolveRuleSchema = zod.z.object({
+  column: zod.z.string().min(1).max(63),
+  comparator: zod.z.enum(COMPARATORS),
+  /** Source names, in tie-break order. */
+  candidates: zod.z.array(identifier).min(1).max(16),
+  /** custom only: SQL ORDER BY key over value / updated_at / source / actor / ord. */
+  orderBy: zod.z.string().min(1).max(2e3).optional()
+}).strict();
+var canonicalResolvedSchema = zod.z.object({
+  sources: zod.z.array(canonicalResolvedSourceSchema).min(1).max(16),
+  /** One rule per resolved (non-pk) column; documents the generated view for tooling. */
+  resolve: zod.z.array(canonicalResolveRuleSchema).max(500),
+  /** Sources whose tombstone hides the resolved row (v1: the manual source only). */
+  deletedBy: zod.z.array(identifier).max(1).default([]),
+  /**
+   * Materialized: the view reads an indexed internal table (`table`) that the
+   * data plane keeps in step with `compute`, the internal view holding the
+   * resolution query. Omitted when the view computes on read.
+   */
+  materialized: zod.z.object({ table: identifier, compute: identifier }).strict().optional(),
+  /** Write policies evaluated against the RESOLVED row (reads use the view's read policy). */
+  policies: zod.z.object({
+    write: policyExpressionSchema.optional(),
+    insert: policyExpressionSchema.optional(),
+    update: policyExpressionSchema.optional()
+  }).strict().default({})
+}).strict();
+function validateResolvedView({ view, tables, views = [] }) {
+  const resolved = view.resolved;
+  if (!resolved) return [];
+  const errors = [];
+  const fail3 = (message) => errors.push(`resolved table '${view.view}': ${message}`);
+  const pkColumn = view.primaryKey?.length === 1 ? view.columns.find((c) => c.columnName === view.primaryKey?.[0]) : void 0;
+  if (!pkColumn) {
+    fail3("requires exactly one primary-key column");
+    return errors;
+  }
+  const systemNames = new Set(Object.values(RESOLVED_VIEW_SYSTEM_COLUMNS).map((c) => c.name));
+  const scope = {
+    view,
+    resolved,
+    pkColumn,
+    dataColumns: new Map(view.columns.filter((c) => !systemNames.has(c.name) && c.cell === void 0).map((c) => [c.name, c])),
+    sourceByName: /* @__PURE__ */ new Map(),
+    fail: fail3
+  };
+  if (resolved.sources.filter((source) => source.kind === "manual").length !== 1) fail3("requires exactly one manual source");
+  const tableByName = new Map(tables.map((table) => [table.table, table]));
+  for (const source of resolved.sources) {
+    if (scope.sourceByName.has(source.name)) fail3(`duplicate source '${source.name}'`);
+    scope.sourceByName.set(source.name, source);
+    const table = tableByName.get(source.table);
+    if (!table) fail3(`source '${source.name}' references unknown table '${source.table}'`);
+    else validateSource({ scope, source, table });
+  }
+  validateRules(scope);
+  validateViewCells(scope);
+  if (resolved.materialized) validateMaterialized({ scope, tableByName, views });
+  for (const name of resolved.deletedBy) {
+    if (scope.sourceByName.get(name)?.kind !== "manual") fail3(`deletedBy '${name}' must be the manual source`);
+  }
+  return errors;
+}
+function validateSource({ scope, source, table }) {
+  const { fail: fail3 } = scope;
+  if (source.kind === "etl" && table.source === void 0) fail3(`etl source '${source.name}' must reference a synced table`);
+  if (source.kind !== "etl" && (table.internal !== true || table.cellMetadata !== true)) {
+    fail3(`${source.kind} source '${source.name}' must reference an internal table with cell metadata`);
+  }
+  const hasRev = table.columns.some((column) => column.cell?.part === "rev");
+  if (source.kind === "manual" && !hasRev) fail3(`manual source '${source.name}' must carry '__rev' cell columns`);
+  if (source.kind === "prefetch" && hasRev) fail3(`prefetch source '${source.name}' must not carry '__rev' cell columns`);
+  const byName = new Map(table.columns.map((c) => [c.name, c]));
+  validateSourceColumns({ scope, source, byName });
+  if (source.kind === "etl") {
+    const updatedAt = source.updatedAt === void 0 ? void 0 : byName.get(source.updatedAt);
+    if (source.updatedAt !== void 0 && updatedAt?.type !== "timestamptz" && updatedAt?.type !== "date") {
+      fail3(`etl source '${source.name}' updatedAt must name a timestamptz/date column on '${source.table}'`);
+    }
+  }
+  validatePrefetchFields({ scope, source });
+}
+function validatePrefetchFields({ scope, source }) {
+  const { fail: fail3, pkColumn } = scope;
+  if (source.kind !== "prefetch") {
+    if (source.key || source.fetch || source.function || source.prefetchDefaults || source.writeback) {
+      fail3(`only prefetch sources may declare key/fetch/function/prefetchDefaults/writeback ('${source.name}')`);
+    }
+    return;
+  }
+  if (!source.key || !source.fetch || !source.function || !source.prefetchDefaults) {
+    fail3(`prefetch source '${source.name}' requires key, fetch, function and prefetchDefaults`);
+  } else if (source.key !== pkColumn.name && !source.columns.includes(source.key)) {
+    fail3(`prefetch source '${source.name}' key '${source.key}' must be the primary key or one of its columns`);
+  }
+  for (const column of source.writeback?.columns ?? []) {
+    if (!source.columns.includes(column)) fail3(`prefetch source '${source.name}' writes back '${column}', which it does not supply`);
+  }
+}
+function validateSourceColumns({ scope, source, byName }) {
+  const { fail: fail3, pkColumn, dataColumns } = scope;
+  for (const column of [pkColumn.name, ...source.columns]) {
+    const own = column === pkColumn.name ? pkColumn : dataColumns.get(column);
+    const theirs = byName.get(column);
+    if (!own) fail3(`source '${source.name}' supplies unknown column '${column}'`);
+    else if (!theirs) fail3(`source '${source.name}' table '${source.table}' has no column '${column}'`);
+    else if (JSON.stringify(theirs.type) !== JSON.stringify(own.type)) fail3(`column '${column}' has a different type on source '${source.name}'`);
+  }
+}
+function validateRules({ resolved, pkColumn, dataColumns, sourceByName, fail: fail3 }) {
+  const ruled = /* @__PURE__ */ new Set();
+  for (const rule of resolved.resolve) {
+    if (!dataColumns.has(rule.column) || rule.column === pkColumn.name) {
+      fail3(`resolve rule targets unknown column '${rule.column}'`);
+      continue;
+    }
+    if (ruled.has(rule.column)) fail3(`column '${rule.column}' has more than one resolve rule`);
+    ruled.add(rule.column);
+    if (rule.comparator === "custom" !== (rule.orderBy !== void 0)) {
+      fail3(`column '${rule.column}': orderBy is required for custom comparators and only allowed there`);
+    }
+    if (new Set(rule.candidates).size !== rule.candidates.length) fail3(`column '${rule.column}' repeats a candidate`);
+    for (const candidate of rule.candidates) {
+      const source = sourceByName.get(candidate);
+      if (!source) fail3(`column '${rule.column}' names unknown candidate source '${candidate}'`);
+      else if (!source.columns.includes(rule.column)) fail3(`column '${rule.column}' candidate '${candidate}' does not supply it`);
+    }
+  }
+  for (const column of dataColumns.keys()) {
+    if (column !== pkColumn.name && !ruled.has(column)) fail3(`column '${column}' has no resolve rule`);
+  }
+}
+var VIEW_CELL_TYPES = {
+  source: "text",
+  at: "timestamptz",
+  by: "text",
+  conflicts: "jsonb"
+};
+function validateViewCells({ view, dataColumns, pkColumn, fail: fail3 }) {
+  const expected = /* @__PURE__ */ new Map();
+  for (const column of dataColumns.values()) {
+    if (column.name === pkColumn.name) continue;
+    for (const part of RESOLVED_VIEW_CELL_PARTS) {
+      expected.set(cellColumnName(column.name, part), { part, columnName: cellColumnName(column.columnName, part) });
+    }
+  }
+  for (const column of view.columns) {
+    if (!column.cell) continue;
+    const want = expected.get(column.name);
+    if (!want || want.part !== column.cell.part || want.columnName !== column.columnName || cellColumnName(column.cell.of, column.cell.part) !== column.name) {
+      fail3(`unexpected cell column '${column.name}'`);
+      continue;
+    }
+    if (column.type !== VIEW_CELL_TYPES[column.cell.part]) fail3(`cell column '${column.name}' must be ${VIEW_CELL_TYPES[column.cell.part]}`);
+    expected.delete(column.name);
+  }
+  for (const name of expected.keys()) fail3(`missing cell column '${name}'`);
+}
+var columnSignature = (columns) => JSON.stringify(columns.map((column) => [column.name, column.columnName, column.type]));
+function validateMaterialized({ scope, tableByName, views }) {
+  const { view, resolved, fail: fail3 } = scope;
+  const { table: tableName, compute: computeName } = resolved.materialized;
+  const table = tableByName.get(tableName);
+  if (!table || table.internal !== true || table.materializes !== view.view) {
+    fail3(`materialized table '${tableName}' must be an internal table that materializes '${view.view}'`);
+  } else {
+    if (columnSignature(table.columns) !== columnSignature(view.columns)) fail3(`materialized table '${tableName}' must have exactly the view's columns`);
+    if (JSON.stringify(table.primaryKey ?? []) !== JSON.stringify(view.primaryKey ?? [])) fail3(`materialized table '${tableName}' must share the view's primary key`);
+  }
+  const compute = views.find((candidate) => candidate.view === computeName);
+  if (!compute || compute.internal !== true) fail3(`compute view '${computeName}' must be an internal view`);
+  else if (columnSignature(compute.columns) !== columnSignature(view.columns)) fail3(`compute view '${computeName}' must have exactly the view's columns`);
+  for (const source of resolved.sources) {
+    if (source.kind !== "etl") continue;
+    const read = tableByName.get(source.table)?.policies?.read;
+    const unconditional = typeof read === "string" ? read.trim() === "true" : read !== void 0 && read.default.trim() === "true" && read.variants.length === 0;
+    if (!unconditional) {
+      fail3(`etl source '${source.name}' must have read policy 'true' to be materialized (the copy is shared by every caller)`);
+    }
+  }
+}
+
+// src/canonical/v2.ts
 var CANONICAL_FORMAT = 2;
 var IDENTIFIER_RE = /^[a-z][a-z0-9_]*$/;
-var identifier = zod.z.string().min(1).max(63).regex(IDENTIFIER_RE);
+var identifier2 = zod.z.string().min(1).max(63).regex(IDENTIFIER_RE);
+var columnIdentifier = zod.z.string().min(1).max(63).regex(COLUMN_IDENTIFIER_PATTERN);
 var COLUMN_TYPES = [
   "uuid",
   "text",
@@ -35,59 +512,71 @@ var COLUMN_TYPES = [
 ];
 var columnTypeSchema = zod.z.enum(COLUMN_TYPES);
 var canonicalEnumSchema = zod.z.object({
-  name: identifier,
+  name: identifier2,
   values: zod.z.array(zod.z.string().min(1).max(63)).min(1).max(100)
 });
 var canonicalColumnSchema = zod.z.object({
   /** Property name in TS (camelCase); columnName is the Postgres name. */
   name: zod.z.string().min(1).max(63),
-  columnName: identifier,
-  type: zod.z.union([columnTypeSchema, zod.z.object({ enum: identifier })]),
+  columnName: columnIdentifier,
+  type: zod.z.union([columnTypeSchema, zod.z.object({ enum: identifier2 })]),
   nullable: zod.z.boolean().default(true),
   unique: zod.z.boolean().default(false),
   /** Literal default, or one of the allowlisted SQL functions. */
   default: zod.z.union([zod.z.string(), zod.z.number(), zod.z.boolean(), zod.z.null()]).optional(),
   defaultFn: zod.z.enum(["gen_random_uuid()", "now()"]).optional(),
+  /**
+   * Stamp this column from the database clock on UPDATE (`now()`). The
+   * column stays insertable (defaults fill gaps) but is omitted from
+   * SetInput / settable so callers cannot backdate it.
+   */
+  onUpdateFn: zod.z.enum(["now()"]).optional(),
   description: zod.z.string().max(500).optional(),
   /** Migration hints — same semantics as v1. */
-  renamedFrom: identifier.optional(),
+  renamedFrom: columnIdentifier.optional(),
   cast: zod.z.string().max(200).optional(),
-  deprecated: zod.z.boolean().default(false)
+  deprecated: zod.z.boolean().default(false),
+  /**
+   * Marks a system cell-metadata column (see CELL_PARTS in constants): part
+   * `part` of the cell of logical column `of`. Synthesized by authoring,
+   * never client-writable, absent from GraphQL scalar fields. Omitted on
+   * ordinary columns so their hashes are unchanged.
+   */
+  cell: zod.z.object({ of: zod.z.string().min(1).max(63), part: zod.z.enum(CELL_PARTS) }).strict().optional()
+}).superRefine((column, ctx) => {
+  if (column.onUpdateFn === void 0) return;
+  if (typeof column.type !== "string" || column.type !== "timestamptz" && column.type !== "date") {
+    ctx.addIssue({
+      code: "custom",
+      path: ["onUpdateFn"],
+      message: `onUpdateFn '${column.onUpdateFn}' is only valid on timestamptz/date columns`
+    });
+  }
 });
 var canonicalLinkSchema = zod.z.object({
   name: zod.z.string().min(1).max(63),
   kind: zod.z.enum(["toOne", "toMany", "toPlatformUser"]),
   /** Target table name (namespace-local). Absent for toPlatformUser. */
-  target: identifier.optional(),
+  target: identifier2.optional(),
   /** FK column on the owning side (toOne/toPlatformUser: on this table; toMany: on the target). */
-  on: identifier,
+  on: columnIdentifier,
   /** Referenced column on the target (default: target's PK / platform user `sub`). */
-  references: identifier.optional(),
+  references: columnIdentifier.optional(),
   /** enforce: true emits a real FK constraint (same-namespace toOne only). */
   enforce: zod.z.boolean().default(false),
+  onDelete: zod.z.enum(["cascade", "restrict", "no action", "set null", "set default"]).optional(),
+  onUpdate: zod.z.enum(["cascade", "restrict", "no action", "set null", "set default"]).optional(),
   description: zod.z.string().max(500).optional()
 });
 var canonicalIndexSchema = zod.z.object({
-  columns: zod.z.array(identifier).min(1),
+  columns: zod.z.array(columnIdentifier).min(1),
   unique: zod.z.boolean().default(false),
-  name: identifier.optional()
+  name: identifier2.optional()
 });
-var policyVariantSchema = zod.z.object({
-  /** Claims-only guard (capability()/role()/claim() comparisons — no columns). */
-  when: zod.z.string().min(1).max(1e3),
-  /** Exactly one of: allow-all bypass, or a row predicate. */
-  allow: zod.z.literal(true).optional(),
-  policy: zod.z.string().min(1).max(2e3).optional()
-}).refine((v) => v.allow === true !== (typeof v.policy === "string"), {
-  message: "A variant declares exactly one of allow: true or policy"
-});
-var policyExpressionSchema = zod.z.union([
-  zod.z.string().min(1).max(2e3),
-  zod.z.object({
-    default: zod.z.string().min(1).max(2e3),
-    variants: zod.z.array(policyVariantSchema).max(10).default([])
-  })
-]);
+var canonicalCheckSchema = zod.z.object({
+  name: identifier2,
+  expression: zod.z.string().min(1).max(2e3)
+}).strict();
 var canonicalPoliciesSchema = zod.z.object({
   read: policyExpressionSchema.optional(),
   write: policyExpressionSchema.optional(),
@@ -118,7 +607,7 @@ function isSingleViewQuerySql(value) {
   return state === "normal" && !/\$[a-z_0-9]*\$/i.test(query);
 }
 var canonicalActionSchema = zod.z.object({
-  name: identifier,
+  name: identifier2,
   requires: zod.z.string().max(1e3).optional(),
   params: zod.z.record(zod.z.string(), zod.z.object({
     type: columnTypeSchema,
@@ -130,9 +619,9 @@ var canonicalActionSchema = zod.z.object({
 });
 var canonicalCowMutationSchema = zod.z.object({
   kind: zod.z.enum(["override", "revert"]),
-  name: identifier,
+  name: identifier2,
   /** Synced table (same namespace) the overlay copies from / falls back to. */
-  synced: identifier,
+  synced: identifier2,
   /** Single-column primary key PROPERTY (TS camelCase, like column `name`) shared by overlay and synced. */
   pk: zod.z.string().min(1).max(63),
   /** Override: contract properties copied INSERT…SELECT from synced (pk included). Empty for revert. */
@@ -159,17 +648,28 @@ var canonicalCowMutationSchema = zod.z.object({
     }
   }
 });
+var canonicalForeignKeySchema = zod.z.object({
+  name: identifier2,
+  columns: zod.z.array(columnIdentifier).min(1).max(8),
+  target: identifier2,
+  references: zod.z.array(columnIdentifier).min(1).max(8),
+  deferrable: zod.z.enum(["initially-immediate", "initially-deferred"]).optional(),
+  onDelete: zod.z.enum(["cascade", "restrict", "no action", "set null", "set default"]).optional(),
+  onUpdate: zod.z.enum(["cascade", "restrict", "no action", "set null", "set default"]).optional()
+}).strict();
 var canonicalTableSchema = zod.z.object({
-  table: identifier,
+  table: identifier2,
   description: zod.z.string().max(2e3).optional(),
   /** Table-level rename hint (new in v2). */
-  renamedFrom: identifier.optional(),
+  renamedFrom: identifier2.optional(),
   /** Synced/reflected read-only tables (`source: gold.*`) — v1 semantics. */
   source: zod.z.string().regex(/^gold\.[a-z][a-z0-9_]*$/).optional(),
   columns: zod.z.array(canonicalColumnSchema).default([]),
-  primaryKey: zod.z.array(identifier).min(1).max(8).optional(),
+  primaryKey: zod.z.array(columnIdentifier).min(1).max(8).optional(),
   links: zod.z.array(canonicalLinkSchema).default([]),
   indexes: zod.z.array(canonicalIndexSchema).default([]),
+  /** Omitted by old definitions, preserving their existing content hashes. */
+  checks: zod.z.array(canonicalCheckSchema).max(100).optional(),
   policies: canonicalPoliciesSchema.default({}),
   /**
    * v1-conversion carry-over only. v2 has no action surface — the runtime
@@ -178,26 +678,64 @@ var canonicalTableSchema = zod.z.object({
    */
   actions: zod.z.array(canonicalActionSchema).default([]),
   /** Optional (not defaulted) so pre-CoW canonical documents keep byte-identical hashes. */
-  cowMutations: zod.z.array(canonicalCowMutationSchema).optional()
+  cowMutations: zod.z.array(canonicalCowMutationSchema).optional(),
+  /** Omitted by old definitions, preserving their existing content hashes. */
+  foreignKeys: zod.z.array(canonicalForeignKeySchema).max(100).optional(),
+  /**
+   * Per-cell edit metadata (`cellMetadata: true` in authoring): every tracked
+   * column `c` carries typed `c__at` / `c__by` system columns (plus `c__rev`
+   * on a resolved table's internal sources), listed explicitly in `columns`
+   * with a `cell` marker so DDL and migrations treat them as ordinary columns.
+   * Omitted when off so existing definitions hash unchanged.
+   */
+  cellMetadata: zod.z.literal(true).optional(),
+  /**
+   * System-owned backing table of a resolved table (its manual or prefetch
+   * source). Internal tables get DDL and IR metadata but no GraphQL surface;
+   * only the data plane writes them. Omitted when false.
+   */
+  internal: zod.z.literal(true).optional(),
+  /**
+   * The materialized copy of resolved table `materializes` (internal): the
+   * same columns as that view, including its cell parts, maintained by the
+   * data plane. Omitted otherwise.
+   */
+  materializes: identifier2.optional()
 });
+var MAX_VIEW_QUERY = 1e5;
+var MAX_RESOLVED_VIEW_QUERY = 5e6;
 var canonicalViewSchema = zod.z.object({
-  view: identifier,
+  view: identifier2,
   description: zod.z.string().max(2e3).optional(),
   columns: zod.z.array(canonicalColumnSchema).min(1),
   /** Logical identity for GraphQL only; PostgreSQL views have no PK constraint. */
-  primaryKey: zod.z.array(identifier).min(1).max(8).optional(),
+  primaryKey: zod.z.array(columnIdentifier).min(1).max(8).optional(),
   links: zod.z.array(canonicalLinkSchema).default([]),
   policies: zod.z.object({ read: policyExpressionSchema }).strict(),
-  query: zod.z.string().min(1).max(1e5).refine(isSingleViewQuerySql, {
+  query: zod.z.string().min(1).max(MAX_RESOLVED_VIEW_QUERY).refine(isSingleViewQuerySql, {
     message: "view query must be one SELECT/WITH statement without comments or dollar-quoted bodies"
   }),
   /** Namespace-local logical relation names, sorted for deterministic hashing. */
-  dependencies: zod.z.array(identifier).max(500)
+  dependencies: zod.z.array(identifier2).max(500),
+  /**
+   * Present when this view is a resolved table (defineResolvedTable): the
+   * multi-source metadata behind its generated query. Omitted otherwise so
+   * existing views hash unchanged.
+   */
+  resolved: canonicalResolvedSchema.optional(),
+  /** System-owned view (a materialized resolved table's compute view): no GraphQL surface. */
+  internal: zod.z.literal(true).optional()
 }).superRefine((view, ctx) => {
+  if (view.resolved === void 0 && view.query.length > MAX_VIEW_QUERY) {
+    ctx.addIssue({ code: "custom", path: ["query"], message: `view query must be at most ${MAX_VIEW_QUERY} characters` });
+  }
   for (const [index, column] of view.columns.entries()) {
     if (column.default !== void 0 || column.defaultFn !== void 0) {
       ctx.addIssue({ code: "custom", path: ["columns", index], message: `view column '${column.name}' cannot declare a default` });
     }
+    if (column.onUpdateFn !== void 0) {
+      ctx.addIssue({ code: "custom", path: ["columns", index], message: `view column '${column.name}' cannot declare onUpdateFn` });
+    }
     if (column.unique) {
       ctx.addIssue({ code: "custom", path: ["columns", index], message: `view column '${column.name}' cannot declare unique` });
     }
@@ -205,15 +743,82 @@ var canonicalViewSchema = zod.z.object({
       ctx.addIssue({ code: "custom", path: ["columns", index], message: `view column '${column.name}' cannot declare migration hints` });
     }
   }
+  if (view.resolved === void 0 && view.internal !== true) {
+    for (const [index, column] of view.columns.entries()) {
+      if (column.cell) ctx.addIssue({ code: "custom", path: ["columns", index], message: `only resolved tables carry cell columns ('${column.name}')` });
+    }
+  }
   for (const [index, link] of view.links.entries()) {
     if (link.enforce) {
       ctx.addIssue({ code: "custom", path: ["links", index, "enforce"], message: `view link '${link.name}' cannot enforce a foreign key` });
     }
+    if (link.onDelete !== void 0 || link.onUpdate !== void 0) {
+      ctx.addIssue({ code: "custom", path: ["links", index], message: `view link '${link.name}' cannot declare referential actions` });
+    }
   }
 });
+var CELL_PART_TYPES = {
+  at: "timestamptz",
+  by: "text",
+  rev: "uuid",
+  source: "text",
+  conflicts: "jsonb"
+};
+function trackedCellColumns(table) {
+  const pk = new Set(table.primaryKey ?? []);
+  return table.columns.filter((column) => column.cell === void 0 && !pk.has(column.columnName) && column.onUpdateFn === void 0);
+}
+var SUFFIXES = Object.values(CELL_PART_SUFFIX);
+function validateCellMetadata(table, index, ctx) {
+  const fail3 = (message, path = ["tables", index]) => ctx.addIssue({ code: "custom", path, message });
+  const cells = table.columns.flatMap((column, position) => column.cell ? [{ column, position, cell: column.cell }] : []);
+  if (table.materializes !== void 0) return;
+  if (table.cellMetadata !== true) {
+    for (const { position } of cells) fail3(`cell-metadata columns require cellMetadata on table '${table.table}'`, ["tables", index, "columns", position]);
+    return;
+  }
+  if (table.source !== void 0) {
+    fail3(`synced table '${table.table}' cannot track cell metadata`);
+    return;
+  }
+  const tracked = trackedCellColumns(table);
+  const byName = new Map(tracked.map((column) => [column.name, column]));
+  const withRev = cells.some(({ cell }) => cell.part === "rev");
+  if (withRev && table.internal !== true) fail3(`only a resolved table's internal sources carry '__rev' cell columns ('${table.table}')`);
+  const seen = /* @__PURE__ */ new Set();
+  for (const { column, position, cell } of cells) {
+    const path = ["tables", index, "columns", position];
+    const owner = byName.get(cell.of);
+    if (!owner) {
+      fail3(`cell column '${column.name}' belongs to '${cell.of}', which is not a tracked column`, path);
+      continue;
+    }
+    if (cell.part !== "at" && cell.part !== "by" && cell.part !== "rev") fail3(`a table cell column must be part at/by/rev, not '${cell.part}'`, path);
+    if (column.name !== cellColumnName(owner.name, cell.part) || column.columnName !== cellColumnName(owner.columnName, cell.part)) {
+      fail3(`cell column for '${owner.name}' ${cell.part} must be named '${cellColumnName(owner.name, cell.part)}' / '${cellColumnName(owner.columnName, cell.part)}'`, path);
+    }
+    if (column.type !== CELL_PART_TYPES[cell.part] || !column.nullable || column.unique || column.default !== void 0 || column.defaultFn !== void 0) {
+      fail3(`cell column '${column.name}' must be a nullable, default-less ${CELL_PART_TYPES[cell.part]}`, path);
+    }
+    const key = `${cell.of}:${cell.part}`;
+    if (seen.has(key)) fail3(`duplicate cell column '${column.name}'`, path);
+    seen.add(key);
+  }
+  for (const column of tracked) {
+    if (column.columnName.length > MAX_TRACKED_COLUMN_NAME) {
+      fail3(`column '${column.columnName}' is too long to track cell metadata (max ${MAX_TRACKED_COLUMN_NAME} characters)`);
+    }
+    if (SUFFIXES.some((suffix) => column.columnName.endsWith(suffix))) {
+      fail3(`column '${column.columnName}' ends in a reserved cell-metadata suffix (${SUFFIXES.join(", ")})`);
+    }
+    for (const part of withRev ? ["at", "by", "rev"] : ["at", "by"]) {
+      if (!seen.has(`${column.name}:${part}`)) fail3(`tracked column '${column.name}' is missing its '${cellColumnName(column.columnName, part)}' cell column`);
+    }
+  }
+}
 var canonicalDefinitionSchema = zod.z.object({
   definition_format: zod.z.literal(CANONICAL_FORMAT),
-  namespace: identifier.max(41),
+  namespace: identifier2.max(41),
   description: zod.z.string().max(2e3).optional(),
   enums: zod.z.array(canonicalEnumSchema).default([]),
   tables: zod.z.array(canonicalTableSchema).min(0).max(500),
@@ -231,6 +836,74 @@ var canonicalDefinitionSchema = zod.z.object({
       ctx.addIssue({ code: "custom", path: ["tables", index, "table"], message: `duplicate relation '${table.table}'` });
     }
     seen.add(table.table);
+    validateCellMetadata(table, index, ctx);
+    if (table.source !== void 0) {
+      for (const [columnIndex, column] of table.columns.entries()) {
+        if (column.onUpdateFn !== void 0) {
+          ctx.addIssue({
+            code: "custom",
+            path: ["tables", index, "columns", columnIndex],
+            message: `synced table '${table.table}' column '${column.name}' cannot declare onUpdateFn`
+          });
+        }
+      }
+    }
+  }
+  const fkTables = new Map(definition.tables.map((table) => [table.table, table]));
+  for (const [tableIndex, table] of definition.tables.entries()) {
+    const names = /* @__PURE__ */ new Set([
+      ...table.primaryKey?.length ? [`${table.table}_pkey`] : [],
+      ...table.columns.filter((column) => column.unique && !(table.primaryKey?.length === 1 && table.primaryKey[0] === column.columnName)).map((column) => `${table.table}_${column.columnName}_unique`),
+      ...table.links.filter((link) => link.enforce).map((link) => `fk_${table.table}_${link.name}`)
+    ]);
+    for (const [index, link] of table.links.entries()) {
+      if ((link.onDelete !== void 0 || link.onUpdate !== void 0) && (!link.enforce || link.kind !== "toOne")) {
+        ctx.addIssue({ code: "custom", path: ["tables", tableIndex, "links", index], message: "referential actions require an enforced toOne link" });
+      }
+      if (link.onDelete === "set null" || link.onUpdate === "set null") {
+        const source = table.columns.find((column) => column.columnName === link.on);
+        if (source?.nullable === false || table.primaryKey?.includes(link.on)) ctx.addIssue({ code: "custom", path: ["tables", tableIndex, "links", index], message: "SET NULL requires a nullable source column" });
+      }
+    }
+    for (const [index, check] of (table.checks ?? []).entries()) {
+      const fail3 = (message) => ctx.addIssue({ code: "custom", path: ["tables", tableIndex, "checks", index], message });
+      if (table.source) fail3("synced tables cannot declare checks");
+      if (names.has(check.name)) fail3(`duplicate constraint '${check.name}'`);
+      names.add(check.name);
+      try {
+        compileCheckExpression(check.expression, table.columns);
+      } catch (error) {
+        fail3(error instanceof Error ? error.message : String(error));
+      }
+    }
+    for (const [index, fk] of (table.foreignKeys ?? []).entries()) {
+      const fail3 = (message) => ctx.addIssue({ code: "custom", path: ["tables", tableIndex, "foreignKeys", index], message });
+      if (names.has(fk.name)) fail3(`duplicate foreign key '${fk.name}'`);
+      names.add(fk.name);
+      const target = fkTables.get(fk.target);
+      if (table.source || !target || target.source) {
+        fail3("foreign keys must connect owned tables in the same namespace");
+        continue;
+      }
+      if (fk.columns.length !== fk.references.length) fail3("foreign key columns and references must have the same number of columns");
+      if (new Set(fk.columns).size !== fk.columns.length || new Set(fk.references).size !== fk.references.length) fail3("foreign key columns must not repeat");
+      for (const [position, name] of fk.columns.entries()) {
+        const sourceColumn = table.columns.find((column) => column.columnName === name);
+        const targetColumn = target.columns.find((column) => column.columnName === fk.references[position]);
+        if (!sourceColumn || !targetColumn) fail3("foreign key references an unknown column");
+        else if (JSON.stringify(sourceColumn.type) !== JSON.stringify(targetColumn.type)) fail3("foreign key column types must match");
+      }
+      if (fk.onDelete === "set null" || fk.onUpdate === "set null") {
+        if (fk.columns.some((name) => table.columns.find((column) => column.columnName === name)?.nullable === false || table.primaryKey?.includes(name))) fail3("SET NULL requires nullable source columns");
+      }
+      const uniqueKeys = [target.primaryKey ?? [], ...target.indexes.filter((index2) => index2.unique).map((index2) => index2.columns), ...target.columns.filter((column) => column.unique).map((column) => [column.columnName])];
+      if (!uniqueKeys.some((key) => key.length === fk.references.length && key.every((column) => fk.references.includes(column)))) fail3("foreign key target columns must form a unique key");
+    }
+  }
+  for (const [viewIndex, view] of (definition.views ?? []).entries()) {
+    for (const message of validateResolvedView({ view, tables: definition.tables, views: definition.views ?? [] })) {
+      ctx.addIssue({ code: "custom", path: ["views", viewIndex, "resolved"], message });
+    }
   }
   const tableByName = new Map(definition.tables.map((table) => [table.table, table]));
   for (const [tableIndex, table] of definition.tables.entries()) {
@@ -326,7 +999,7 @@ var canonicalDefinitionSchema = zod.z.object({
   const visiting = /* @__PURE__ */ new Set();
   const visited = /* @__PURE__ */ new Set();
   let cycleReported = false;
-  const visit = (name, path) => {
+  const visit2 = (name, path) => {
     if (visited.has(name) || cycleReported) return;
     if (visiting.has(name)) {
       cycleReported = true;
@@ -340,12 +1013,12 @@ var canonicalDefinitionSchema = zod.z.object({
     visiting.add(name);
     const view = viewByName.get(name);
     for (const dependency of view?.dependencies ?? []) {
-      if (viewByName.has(dependency)) visit(dependency, [...path, name]);
+      if (viewByName.has(dependency)) visit2(dependency, [...path, name]);
     }
     visiting.delete(name);
     visited.add(name);
   };
-  for (const view of views) visit(view.view, []);
+  for (const view of views) visit2(view.view, []);
 });
 function canonicalRelations(definition) {
   const views = (definition.views ?? []).map((view) => ({
@@ -355,8 +1028,12 @@ function canonicalRelations(definition) {
     ...view.primaryKey !== void 0 ? { primaryKey: view.primaryKey } : {},
     links: view.links,
     indexes: [],
-    policies: { read: view.policies.read },
-    actions: []
+    // A resolved table's write policies (evaluated against the resolved row)
+    // ride alongside the view's read policy.
+    policies: { read: view.policies.read, ...view.resolved?.policies ?? {} },
+    actions: [],
+    ...view.resolved !== void 0 ? { resolved: view.resolved } : {},
+    ...view.internal ? { internal: true } : {}
   }));
   return [...definition.tables, ...views].sort((a, b) => a.table.localeCompare(b.table));
 }
@@ -366,12 +1043,14 @@ function normalizeCanonical(definition) {
     ...definition,
     enums: sortByName(definition.enums),
     tables: [...definition.tables].sort((a, b) => a.table.localeCompare(b.table)).map((t) => {
-      const { cowMutations, ...rest } = t;
+      const { cowMutations, foreignKeys, checks, ...rest } = t;
       return {
         ...rest,
         links: sortByName(t.links),
         indexes: [...t.indexes].sort((a, b) => (a.name ?? a.columns.join("_")).localeCompare(b.name ?? b.columns.join("_"))),
         actions: sortByName(t.actions),
+        ...foreignKeys?.length ? { foreignKeys: sortByName(foreignKeys) } : {},
+        ...checks?.length ? { checks: sortByName(checks) } : {},
         // Omitted entirely when absent/empty so pre-CoW documents hash unchanged.
         ...cowMutations !== void 0 && cowMutations.length > 0 ? { cowMutations: sortByName(cowMutations) } : {}
       };
@@ -388,7 +1067,18 @@ function normalizeCanonical(definition) {
 }
 
 // src/ir/index.ts
-var IR_VERSION = 1;
+var IR_VERSION = 2;
+var LEGACY_IR_VERSION = 1;
+var irVersionSchema = zod.z.union([zod.z.literal(LEGACY_IR_VERSION), zod.z.literal(IR_VERSION)]);
+var operationVersionSchema = zod.z.object({ irVersion: irVersionSchema });
+function requiredArtifactIrVersion(operations) {
+  let required = LEGACY_IR_VERSION;
+  for (const operation of operations) {
+    const { irVersion } = operationVersionSchema.parse(operation);
+    if (irVersion > required) required = irVersion;
+  }
+  return required;
+}
 var CLAIMS_CONTRACT = {
   sub: "string",
   org: "string?",
@@ -460,6 +1150,21 @@ var selectionIrSchema = zod.z.lazy(
   () => zod.z.object({
     typename: zod.z.string(),
     columns: zod.z.array(zod.z.object({ alias: zod.z.string(), column: zod.z.string() })),
+    cells: zod.z.object({
+      alias: zod.z.string(),
+      typename: zod.z.string(),
+      fields: zod.z.array(zod.z.object({
+        alias: zod.z.string(),
+        column: zod.z.string(),
+        typename: zod.z.string(),
+        parts: zod.z.array(zod.z.object({
+          alias: zod.z.string(),
+          part: zod.z.enum(["source", "at", "by", "conflicts"]),
+          fields: zod.z.array(zod.z.object({ alias: zod.z.string(), field: zod.z.enum(["source", "at", "value"]) })).optional(),
+          typename: zod.z.string().optional()
+        }))
+      }))
+    }).optional(),
     relations: zod.z.array(zod.z.object({
       alias: zod.z.string(),
       link: zod.z.string(),
@@ -481,6 +1186,11 @@ var selectionIrSchema = zod.z.lazy(
   })
 );
 var includeIfSchema = zod.z.object({ variable: zod.z.string(), negated: zod.z.boolean() });
+var prefetchPlanIrSchema = zod.z.object({
+  source: zod.z.string(),
+  maxStalenessMs: zod.z.number().int().positive().optional(),
+  key: zod.z.union([zod.z.object({ one: valueIrSchema }), zod.z.object({ many: valueIrSchema })])
+});
 var selectRootSchema = zod.z.object({
   kind: zod.z.literal("select"),
   alias: zod.z.string(),
@@ -492,7 +1202,8 @@ var selectRootSchema = zod.z.object({
   distinctOn: zod.z.union([zod.z.array(zod.z.string()), zod.z.object({ slot: zod.z.string() })]).optional(),
   limit: limitIrSchema,
   offset: zod.z.object({ variable: zod.z.string().optional(), value: zod.z.number().int().optional() }).optional(),
-  includeIf: includeIfSchema.optional()
+  includeIf: includeIfSchema.optional(),
+  prefetch: zod.z.array(prefetchPlanIrSchema).optional()
 });
 var byPkRootSchema = zod.z.object({
   kind: zod.z.literal("byPk"),
@@ -502,7 +1213,8 @@ var byPkRootSchema = zod.z.object({
   pk: zod.z.array(zod.z.object({ column: zod.z.string(), value: valueIrSchema })).min(1),
   /** Policy predicate — ANDed with the PK match. */
   where: predIrSchema,
-  includeIf: includeIfSchema.optional()
+  includeIf: includeIfSchema.optional(),
+  prefetch: zod.z.array(prefetchPlanIrSchema).optional()
 });
 var aggregateRootSchema = zod.z.object({
   kind: zod.z.literal("aggregate"),
@@ -515,6 +1227,33 @@ var aggregateRootSchema = zod.z.object({
   nodes: selectionIrSchema.optional(),
   includeIf: includeIfSchema.optional()
 });
+var DATE_BUCKETS = ["year", "quarter", "month", "week", "day", "hour"];
+var groupByKeyIrSchema = zod.z.object({
+  column: zod.z.string(),
+  bucket: zod.z.enum(DATE_BUCKETS).optional()
+});
+var aggregateGroupsRootSchema = zod.z.object({
+  kind: zod.z.literal("aggregateGroups"),
+  alias: zod.z.string(),
+  table: zod.z.string(),
+  /** Composed at compile time: AND(policy, documentWhere?, dynamicFilter?). */
+  where: predIrSchema,
+  groupBy: zod.z.array(groupByKeyIrSchema).min(1),
+  /**
+   * The `key { … }` projection: which group columns appear in each entry's key
+   * object, in selection order. A subset of `groupBy` (the compiler rejects a
+   * key field that is not a group key — it would be indeterminate within the
+   * group). Empty when the document selects only `aggregate`.
+   */
+  key: zod.z.array(zod.z.object({ alias: zod.z.string(), column: zod.z.string() })).default([]),
+  count: zod.z.object({ columns: zod.z.array(zod.z.string()).optional(), distinct: zod.z.boolean().optional() }).optional(),
+  sum: zod.z.array(zod.z.string()).optional(),
+  avg: zod.z.array(zod.z.string()).optional(),
+  /** Bounds the GROUP count, not the scanned rows — see MAX_GROUPS. */
+  limit: limitIrSchema,
+  offset: zod.z.object({ variable: zod.z.string().optional(), value: zod.z.number().int().optional() }).optional(),
+  includeIf: includeIfSchema.optional()
+});
 var writeValuesSchema = zod.z.union([
   zod.z.object({ slot: zod.z.string() }),
   zod.z.object({ entries: zod.z.array(zod.z.object({ column: zod.z.string(), value: valueIrSchema })) })
@@ -533,7 +1272,20 @@ var mutationRootSchema = zod.z.object({
    * coalesce view falls back to synced. Both are gated on a matching synced
    * row and carry the write policy in `where` like update/delete.
    */
-  op: zod.z.enum(["insert", "insertOne", "update", "updateByPk", "delete", "deleteByPk", "cowOverride", "cowRevert"]),
+  op: zod.z.enum(["insert", "insertOne", "update", "updateByPk", "delete", "deleteByPk", "cowOverride", "cowRevert", "resolvedWrite"]),
+  /**
+   * resolvedWrite: a write to a resolved table (`table` is its view). The
+   * executor gates on the resolved row (write policy in `where`), writes only
+   * the touched cells into the manual source, then re-checks `insertCheck`
+   * against the resolved row. `revert` clears `revertColumns` from the manual
+   * source; `delete` tombstones the row there.
+   */
+  resolvedAction: zod.z.enum(["insert", "update", "delete", "revert"]).optional(),
+  revertColumns: zod.z.array(zod.z.string()).optional(),
+  /** `@writeback(source:, mode:)` directives on this root. */
+  writeback: zod.z.array(zod.z.object({ source: zod.z.string(), mode: zod.z.enum(["sync", "async"]) })).optional(),
+  /** `@localOnly(source:)` — writeback columns deliberately kept local for these sources. */
+  localOnly: zod.z.array(zod.z.string()).optional(),
   alias: zod.z.string(),
   table: zod.z.string(),
   /** CoW ops: logical name of the synced twin (read through its policy-filtered view). */
@@ -560,12 +1312,15 @@ var mutationRootSchema = zod.z.object({
   insertCheck: predIrSchema.optional(),
   returning: selectionIrSchema.nullable(),
   affectedRows: zod.z.boolean().default(false),
+  /** v2: abort the transaction when the actual write count differs, regardless of selection. */
+  assertAffectedRows: zod.z.number().int().min(0).max(2147483647).optional(),
   includeIf: includeIfSchema.optional()
 });
 var rootIrSchema = zod.z.discriminatedUnion("kind", [
   selectRootSchema,
   byPkRootSchema,
   aggregateRootSchema,
+  aggregateGroupsRootSchema,
   mutationRootSchema
 ]);
 var INPUT_REF_KINDS = [
@@ -595,7 +1350,7 @@ var variableIrSchema = zod.z.object({
   defaultValue: variableDefaultIrSchema.optional()
 });
 var compiledOperationSchema = zod.z.object({
-  irVersion: zod.z.literal(IR_VERSION),
+  irVersion: irVersionSchema,
   name: zod.z.string(),
   opHash: zod.z.string().regex(/^sha256:[0-9a-f]{64}$/),
   kind: zod.z.enum(["query", "mutation"]),
@@ -607,6 +1362,50 @@ var compiledOperationSchema = zod.z.object({
   /** Every table the op touches — data-token scoping + audit. */
   tableSet: zod.z.array(zod.z.string()).min(1),
   roots: zod.z.array(rootIrSchema).min(1)
+}).superRefine((operation, ctx) => {
+  for (const [index, root] of operation.roots.entries()) {
+    if (root.kind !== "mutation" || root.assertAffectedRows === void 0) continue;
+    if (operation.irVersion < 2 || operation.kind !== "mutation" || root.includeIf !== void 0) {
+      ctx.addIssue({ code: "custom", path: ["roots", index], message: "affected-row assertions require unconditional mutation roots and IR v2" });
+    }
+  }
+});
+var resolvedSourceIrSchema = zod.z.object({
+  name: zod.z.string(),
+  kind: zod.z.enum(["manual", "etl", "prefetch"]),
+  /** Logical table key of the backing relation. */
+  table: zod.z.string(),
+  columns: zod.z.array(zod.z.string()),
+  key: zod.z.string().optional(),
+  fetch: zod.z.union([
+    zod.z.object({ shape: zod.z.literal("single") }),
+    zod.z.object({ shape: zod.z.literal("batch"), maxKeys: zod.z.number().int().positive() })
+  ]).optional(),
+  function: zod.z.object({ kind: zod.z.enum(["managed", "native"]), id: zod.z.string() }).optional(),
+  prefetchDefaults: zod.z.object({
+    maxStalenessMs: zod.z.number().int().positive(),
+    timeoutMs: zod.z.number().int().positive(),
+    onError: zod.z.enum(["fallback", "fail"])
+  }).optional(),
+  writeback: zod.z.object({
+    columns: zod.z.array(zod.z.string()),
+    defaultMode: zod.z.enum(["sync", "async"]),
+    timeoutMs: zod.z.number().int().positive(),
+    clearManualOnConfirm: zod.z.boolean()
+  }).optional()
+});
+var resolvedMetaIrSchema = zod.z.object({
+  /** Logical pk column of the resolved view (single-column). */
+  pk: zod.z.string(),
+  /** Source name of the manual source. */
+  manual: zod.z.string(),
+  sources: zod.z.array(resolvedSourceIrSchema),
+  deletedBy: zod.z.array(zod.z.string()),
+  /**
+   * Materialized: the view reads `table`, which the data plane refreshes from
+   * the `compute` view (claims-gated) whenever it writes a source row.
+   */
+  materialized: zod.z.object({ table: zod.z.string(), compute: zod.z.string() }).optional()
 });
 var tableMetaIrSchema = zod.z.object({
   table: zod.z.string(),
@@ -643,18 +1442,45 @@ var tableMetaIrSchema = zod.z.object({
   insertable: zod.z.array(zod.z.string()),
   settable: zod.z.array(zod.z.string()),
   appendable: zod.z.array(zod.z.string()),
+  /**
+   * Logical columns stamped with Postgres `now()` on UPDATE (canonical
+   * `onUpdateFn`). Omitted when empty so pre-onUpdate artifacts still parse.
+   */
+  touchOnUpdate: zod.z.array(zod.z.string()).optional(),
+  /**
+   * Per-cell metadata: logical column → the logical names of its cell-part
+   * columns (which are listed in `columns`, but never filterable, orderable or
+   * writable). Tables stamp `at`/`by` (and a manual source `rev`) on every
+   * write; resolved views expose `source`/`at`/`by`/`conflicts`. Omitted when
+   * the relation tracks no cells.
+   */
+  cells: zod.z.record(zod.z.string(), zod.z.object({
+    at: zod.z.string().optional(),
+    by: zod.z.string().optional(),
+    rev: zod.z.string().optional(),
+    source: zod.z.string().optional(),
+    conflicts: zod.z.string().optional()
+  }).strict()).optional(),
+  /** Resolved-table view metadata (sources, prefetch/writeback config) for the data plane. */
+  resolved: resolvedMetaIrSchema.optional(),
   constraints: zod.z.array(zod.z.object({ name: zod.z.string(), columns: zod.z.array(zod.z.string()) })),
   /** Depth/node caps for dynamic filter trees on this table. */
   dynamicFilterMaxDepth: zod.z.number().int().positive().default(6),
   dynamicFilterMaxNodes: zod.z.number().int().positive().default(64)
 });
 var compiledArtifactSchema = zod.z.object({
-  irVersion: zod.z.literal(IR_VERSION),
+  irVersion: irVersionSchema,
   namespace: zod.z.string(),
   schemaHash: zod.z.string(),
   opsHash: zod.z.string(),
   tables: zod.z.record(zod.z.string(), tableMetaIrSchema),
   operations: zod.z.record(zod.z.string(), compiledOperationSchema)
+}).superRefine((artifact, ctx) => {
+  for (const [name, operation] of Object.entries(artifact.operations)) {
+    if (operation.irVersion > artifact.irVersion) {
+      ctx.addIssue({ code: "custom", path: ["operations", name, "irVersion"], message: "operation requires a newer IR version than its artifact" });
+    }
+  }
 });
 var IrVersionError = class extends Error {
   constructor(found) {
@@ -665,19 +1491,128 @@ var IrVersionError = class extends Error {
 function normalizeIr(raw) {
   if (!raw || typeof raw !== "object") throw new IrVersionError(void 0);
   const version = raw.irVersion;
-  if (version !== IR_VERSION) throw new IrVersionError(version);
+  if (version !== LEGACY_IR_VERSION && version !== IR_VERSION) throw new IrVersionError(version);
   return compiledArtifactSchema.parse(raw);
 }
 
+// src/sdl/naming.ts
+function camelCase(name) {
+  const segments = name.split("_").filter((segment) => segment.length > 0);
+  const first = segments[0];
+  if (first === void 0) return name;
+  const head = first.charAt(0).toLowerCase() + first.slice(1);
+  return head + segments.slice(1).map(capitalizeFirst).join("");
+}
+function pascalCase(name) {
+  return capitalizeFirst(camelCase(name));
+}
+function capitalizeFirst(segment) {
+  return segment.charAt(0).toUpperCase() + segment.slice(1);
+}
+function singularizeWord(word) {
+  if (word.endsWith("ies") && word.length > 3) return `${word.slice(0, -3)}y`;
+  for (const suffix of ["sses", "xes", "ches", "shes"]) {
+    if (word.endsWith(suffix)) return word.slice(0, -2);
+  }
+  if (word.endsWith("ss")) return word;
+  if (word.endsWith("s") && word.length > 1) return word.slice(0, -1);
+  return word;
+}
+function typeName(table) {
+  const segments = table.split("_").filter((segment) => segment.length > 0);
+  const last = segments[segments.length - 1];
+  if (last === void 0) return pascalCase(table);
+  return [...segments.slice(0, -1), singularizeWord(last)].map(capitalizeFirst).join("");
+}
+function enumTypeName(name) {
+  return pascalCase(name);
+}
+var SCALAR_FOR_COLUMN_TYPE = {
+  uuid: "uuid",
+  text: "String",
+  integer: "Int",
+  bigint: "bigint",
+  numeric: "numeric",
+  double: "Float",
+  boolean: "Boolean",
+  timestamptz: "timestamptz",
+  date: "date",
+  jsonb: "jsonb"
+};
+function graphqlScalarFor(type) {
+  return SCALAR_FOR_COLUMN_TYPE[type];
+}
+var COLUMN_TYPE_BY_SCALAR = new Map([
+  ["ID", "text"],
+  ...COLUMN_TYPES.map((type) => [graphqlScalarFor(type), type])
+]);
+function columnTypeForScalar(scalarName) {
+  return COLUMN_TYPE_BY_SCALAR.get(scalarName);
+}
+var VARIABLE_SCALAR_NAMES = [...COLUMN_TYPE_BY_SCALAR.keys()];
+var PLATFORM_USER_TYPENAME = "PlatformUser";
+function tableNames(table) {
+  const root = camelCase(table);
+  const rootPascal = pascalCase(table);
+  const type = typeName(table);
+  return {
+    typename: type,
+    selectRoot: root,
+    byPkRoot: `${root}ByPk`,
+    aggregateRoot: `${root}Aggregate`,
+    insertRoot: `insert${rootPascal}`,
+    insertOneRoot: `insert${rootPascal}One`,
+    updateRoot: `update${rootPascal}`,
+    updateByPkRoot: `update${rootPascal}ByPk`,
+    deleteRoot: `delete${rootPascal}`,
+    deleteByPkRoot: `delete${rootPascal}ByPk`,
+    revertByPkRoot: `revert${rootPascal}ByPk`,
+    boolExp: `${type}BoolExp`,
+    orderBy: `${type}OrderBy`,
+    selectColumn: `${type}SelectColumn`,
+    insertInput: `${type}InsertInput`,
+    setInput: `${type}SetInput`,
+    appendInput: `${type}AppendInput`,
+    incInput: `${type}IncInput`,
+    onConflict: `${type}OnConflict`,
+    pkColumnsInput: `${type}PkColumnsInput`,
+    constraintEnum: `${type}Constraint`,
+    updateColumnEnum: `${type}UpdateColumn`,
+    mutationResponse: `${type}MutationResponse`,
+    aggregate: `${type}Aggregate`,
+    aggregateFields: `${type}AggregateFields`,
+    sumFields: `${type}SumFields`,
+    avgFields: `${type}AvgFields`,
+    aggregateBoolExp: `${type}AggregateBoolExp`,
+    aggregateBoolExpCount: `${type}AggregateBoolExpCount`,
+    aggregateGroupsRoot: `${root}AggregateGroups`,
+    groupByColumnEnum: `${type}GroupByColumn`,
+    groupByInput: `${type}GroupBy`,
+    groupKey: `${type}GroupKey`,
+    aggregateGroup: `${type}AggregateGroup`
+  };
+}
+var CELL_TYPENAMES = {
+  /** A plain table's cell: when and by whom it was last written. */
+  stamp: "CellStamp",
+  /** A resolved table's cell: which source won, when, by whom, and newer losers. */
+  resolved: "ResolvedCell",
+  /** A newer candidate that lost to the column's rule. */
+  conflict: "CellConflict"
+};
+function cellsTypename(typename) {
+  return `${typename}Cells`;
+}
+
 // src/predicate-v2/ast.ts
 var POLICY_COMPARE_OPS = ["=", "!=", "<", "<=", ">", ">="];
-function walkPolicy(node, visit) {
-  visit(node);
+function walkPolicy(node, visit2) {
+  visit2(node);
   if (node.kind === "and" || node.kind === "or") {
-    for (const operand of node.operands) walkPolicy(operand, visit);
+    for (const operand of node.operands) walkPolicy(operand, visit2);
   }
-  if (node.kind === "not") walkPolicy(node.operand, visit);
-  if (node.kind === "exists") walkPolicy(node.where, visit);
+  if (node.kind === "not") walkPolicy(node.operand, visit2);
+  if (node.kind === "exists") walkPolicy(node.where, visit2);
 }
 
 // src/predicate-v2/errors.ts
@@ -705,7 +1640,7 @@ var IDENTIFIER_CHAR = /[a-zA-Z0-9_]/;
 var NUMBER_PATTERN = /^-?\d+(\.\d+)?/;
 var SCALAR_CLAIM_KEYS = Object.entries(CLAIMS_CONTRACT).filter(([, type]) => !type.endsWith("[]")).map(([key]) => key);
 var ARRAY_CLAIM_KEYS = Object.entries(CLAIMS_CONTRACT).filter(([, type]) => type.endsWith("[]")).map(([key]) => key);
-function tokenize(source) {
+function tokenize2(source) {
   const tokens = [];
   let position = 0;
   while (position < source.length) {
@@ -784,7 +1719,7 @@ function readString(source, start) {
   }
   throw new PolicyParseError("unterminated string literal", start);
 }
-var Parser = class {
+var Parser2 = class {
   constructor(tokens) {
     this.tokens = tokens;
   }
@@ -958,7 +1893,7 @@ var Parser = class {
 function parsePolicy(source) {
   const trimmed = source.trim();
   if (trimmed.length === 0) throw new PolicyParseError("empty policy expression", 0);
-  return { source: trimmed, ast: new Parser(tokenize(trimmed)).parse() };
+  return { source: trimmed, ast: new Parser2(tokenize2(trimmed)).parse() };
 }
 
 // src/predicate-v2/compile.ts
@@ -1183,21 +2118,21 @@ function andPred(...preds) {
   if (operands.length === 1) return operands[0];
   return { kind: "and", operands };
 }
-function walkPred(pred, visit) {
-  visit(pred);
+function walkPred(pred, visit2) {
+  visit2(pred);
   switch (pred.kind) {
     case "and":
     case "or":
-      for (const operand of pred.operands) walkPred(operand, visit);
+      for (const operand of pred.operands) walkPred(operand, visit2);
       return;
     case "not":
-      walkPred(pred.operand, visit);
+      walkPred(pred.operand, visit2);
       return;
     case "exists":
-      walkPred(pred.where, visit);
+      walkPred(pred.where, visit2);
       return;
     case "aggPredicate":
-      if (pred.where) walkPred(pred.where, visit);
+      if (pred.where) walkPred(pred.where, visit2);
       return;
     default:
       return;
@@ -1222,12 +2157,12 @@ function predContains(haystack, needle) {
 // src/compiler-gql/inject.ts
 function collectPinnedColumns(writePolicy) {
   const key = (pin) => `${pin.column}\0${pin.claim}`;
-  const visit = (node) => {
+  const visit2 = (node) => {
     if (node.kind === "and") {
       const merged = [];
       const seen2 = /* @__PURE__ */ new Set();
       for (const operand of node.operands) {
-        for (const pin of visit(operand)) {
+        for (const pin of visit2(operand)) {
           if (seen2.has(key(pin))) continue;
           seen2.add(key(pin));
           merged.push(pin);
@@ -1238,9 +2173,9 @@ function collectPinnedColumns(writePolicy) {
     if (node.kind === "or") {
       const [first, ...rest] = node.operands;
       if (first === void 0) return [];
-      let common = visit(first);
+      let common = visit2(first);
       for (const operand of rest) {
-        const branch = new Set(visit(operand).map(key));
+        const branch = new Set(visit2(operand).map(key));
         common = common.filter((pin) => branch.has(key(pin)));
         if (common.length === 0) break;
       }
@@ -1252,7 +2187,7 @@ function collectPinnedColumns(writePolicy) {
     return [];
   };
   const seen = /* @__PURE__ */ new Set();
-  return visit(writePolicy).filter((pin) => {
+  return visit2(writePolicy).filter((pin) => {
     if (seen.has(pin.column)) return false;
     seen.add(pin.column);
     return true;
@@ -1346,6 +2281,11 @@ var PolicyInjector = class {
           where: andPred(this.read(root.table), this.injectDocPred(root.where, root.table)),
           ...root.nodes ? { nodes: this.injectSelection(root.nodes, root.table) } : {}
         };
+      case "aggregateGroups":
+        return {
+          ...root,
+          where: andPred(this.read(root.table), this.injectDocPred(root.where, root.table))
+        };
       case "mutation":
         return this.injectMutation(root);
     }
@@ -1353,6 +2293,7 @@ var PolicyInjector = class {
   injectMutation(root) {
     const table = root.table;
     const returning = root.returning ? this.injectSelection(root.returning, table) : root.returning;
+    if (root.op === "resolvedWrite") return this.injectResolvedWrite(root, returning);
     if (root.op === "insert" || root.op === "insertOne") {
       const insertPolicy = this.insert(table);
       if (predContainsExists(insertPolicy)) {
@@ -1394,6 +2335,24 @@ var PolicyInjector = class {
     }
     return { ...root, where, returning };
   }
+  /**
+   * Resolved writes are policed against the RESOLVED row, not the sparse
+   * manual row: `where` gates the existing row (update/revert/delete) and
+   * `insertCheck` is re-evaluated as a SELECT over the view after the write,
+   * so link-traversing (exists) policies are representable here.
+   */
+  injectResolvedWrite(root, returning) {
+    const table = root.table;
+    if (root.resolvedAction === "insert") {
+      const pins = (this.ctx.pins.get(table) ?? []).map(
+        (pin) => ({ column: pin.column, value: { kind: "claim", key: pin.claim } })
+      );
+      return { ...root, pinnedColumns: pins, insertCheck: this.insert(table), returning };
+    }
+    const updatePolicy = this.update(table);
+    const where = andPred(updatePolicy, root.where ? this.injectDocPred(root.where, table) : void 0);
+    return root.resolvedAction === "delete" ? { ...root, where, returning } : { ...root, where, insertCheck: updatePolicy, returning };
+  }
 };
 function collectTableSet(roots, ctx) {
   const tables = /* @__PURE__ */ new Set();
@@ -1436,122 +2395,44 @@ function collectTableSet(roots, ctx) {
       if (aggregate.nodes) visitSelection(aggregate.nodes, target);
     }
   };
-  for (const root of roots) {
-    tables.add(root.table);
-    if (root.kind === "select" || root.kind === "byPk") {
-      visitPred(root.where, root.table);
-      visitSelection(root.selection, root.table);
-    }
-    if (root.kind === "aggregate") {
-      visitPred(root.where, root.table);
-      if (root.nodes) visitSelection(root.nodes, root.table);
-    }
-    if (root.kind === "mutation") {
-      if (root.cowSynced !== void 0) tables.add(root.cowSynced);
-      if (root.where) visitPred(root.where, root.table);
-      if (root.insertCheck) visitPred(root.insertCheck, root.table);
-      if (root.cowCopyCheck) visitPred(root.cowCopyCheck, root.table);
-      if (root.returning) visitSelection(root.returning, root.table);
-    }
-  }
-  return [...tables].sort();
-}
-function injectPolicies({ roots, ctx }) {
-  const injector = new PolicyInjector(ctx);
-  const injected = roots.map((root) => injector.injectRoot(root));
-  return { roots: injected, tableSet: collectTableSet(injected, ctx) };
-}
-
-// src/sdl/naming.ts
-function camelCase(name) {
-  const segments = name.split("_").filter((segment) => segment.length > 0);
-  const first = segments[0];
-  if (first === void 0) return name;
-  const head = first.charAt(0).toLowerCase() + first.slice(1);
-  return head + segments.slice(1).map(capitalizeFirst).join("");
-}
-function pascalCase(name) {
-  return capitalizeFirst(camelCase(name));
-}
-function capitalizeFirst(segment) {
-  return segment.charAt(0).toUpperCase() + segment.slice(1);
-}
-function singularizeWord(word) {
-  if (word.endsWith("ies") && word.length > 3) return `${word.slice(0, -3)}y`;
-  for (const suffix of ["sses", "xes", "ches", "shes"]) {
-    if (word.endsWith(suffix)) return word.slice(0, -2);
+  for (const root of roots) {
+    tables.add(root.table);
+    switch (root.kind) {
+      case "select":
+      case "byPk":
+        visitPred(root.where, root.table);
+        visitSelection(root.selection, root.table);
+        break;
+      case "aggregate":
+        visitPred(root.where, root.table);
+        if (root.nodes) visitSelection(root.nodes, root.table);
+        break;
+      case "aggregateGroups":
+        visitPred(root.where, root.table);
+        break;
+      case "mutation":
+        if (root.cowSynced !== void 0) tables.add(root.cowSynced);
+        for (const source of ctx.tables[root.table]?.resolved?.sources ?? []) tables.add(source.table);
+        if (root.where) visitPred(root.where, root.table);
+        if (root.insertCheck) visitPred(root.insertCheck, root.table);
+        if (root.cowCopyCheck) visitPred(root.cowCopyCheck, root.table);
+        if (root.returning) visitSelection(root.returning, root.table);
+        break;
+      default: {
+        const exhausted = root;
+        throw new DocumentCompileError(
+          `internal: unhandled root kind in tableSet collection ${JSON.stringify(exhausted)}`,
+          "internal"
+        );
+      }
+    }
   }
-  if (word.endsWith("ss")) return word;
-  if (word.endsWith("s") && word.length > 1) return word.slice(0, -1);
-  return word;
-}
-function typeName(table) {
-  const segments = table.split("_").filter((segment) => segment.length > 0);
-  const last = segments[segments.length - 1];
-  if (last === void 0) return pascalCase(table);
-  return [...segments.slice(0, -1), singularizeWord(last)].map(capitalizeFirst).join("");
-}
-function enumTypeName(name) {
-  return pascalCase(name);
-}
-var SCALAR_FOR_COLUMN_TYPE = {
-  uuid: "uuid",
-  text: "String",
-  integer: "Int",
-  bigint: "bigint",
-  numeric: "numeric",
-  double: "Float",
-  boolean: "Boolean",
-  timestamptz: "timestamptz",
-  date: "date",
-  jsonb: "jsonb"
-};
-function graphqlScalarFor(type) {
-  return SCALAR_FOR_COLUMN_TYPE[type];
-}
-var COLUMN_TYPE_BY_SCALAR = new Map([
-  ["ID", "text"],
-  ...COLUMN_TYPES.map((type) => [graphqlScalarFor(type), type])
-]);
-function columnTypeForScalar(scalarName) {
-  return COLUMN_TYPE_BY_SCALAR.get(scalarName);
+  return [...tables].sort();
 }
-var VARIABLE_SCALAR_NAMES = [...COLUMN_TYPE_BY_SCALAR.keys()];
-var PLATFORM_USER_TYPENAME = "PlatformUser";
-function tableNames(table) {
-  const root = camelCase(table);
-  const rootPascal = pascalCase(table);
-  const type = typeName(table);
-  return {
-    typename: type,
-    selectRoot: root,
-    byPkRoot: `${root}ByPk`,
-    aggregateRoot: `${root}Aggregate`,
-    insertRoot: `insert${rootPascal}`,
-    insertOneRoot: `insert${rootPascal}One`,
-    updateRoot: `update${rootPascal}`,
-    updateByPkRoot: `update${rootPascal}ByPk`,
-    deleteRoot: `delete${rootPascal}`,
-    deleteByPkRoot: `delete${rootPascal}ByPk`,
-    boolExp: `${type}BoolExp`,
-    orderBy: `${type}OrderBy`,
-    selectColumn: `${type}SelectColumn`,
-    insertInput: `${type}InsertInput`,
-    setInput: `${type}SetInput`,
-    appendInput: `${type}AppendInput`,
-    incInput: `${type}IncInput`,
-    onConflict: `${type}OnConflict`,
-    pkColumnsInput: `${type}PkColumnsInput`,
-    constraintEnum: `${type}Constraint`,
-    updateColumnEnum: `${type}UpdateColumn`,
-    mutationResponse: `${type}MutationResponse`,
-    aggregate: `${type}Aggregate`,
-    aggregateFields: `${type}AggregateFields`,
-    sumFields: `${type}SumFields`,
-    avgFields: `${type}AvgFields`,
-    aggregateBoolExp: `${type}AggregateBoolExp`,
-    aggregateBoolExpCount: `${type}AggregateBoolExpCount`
-  };
+function injectPolicies({ roots, ctx }) {
+  const injector = new PolicyInjector(ctx);
+  const injected = roots.map((root) => injector.injectRoot(root));
+  return { roots: injected, tableSet: collectTableSet(injected, ctx) };
 }
 
 // src/compiler-gql/naming.ts
@@ -1561,7 +2442,12 @@ function typeNameForTable(table) {
 }
 function queryRootNames(table) {
   const names = tableNames(table);
-  return { select: names.selectRoot, byPk: names.byPkRoot, aggregate: names.aggregateRoot };
+  return {
+    select: names.selectRoot,
+    byPk: names.byPkRoot,
+    aggregate: names.aggregateRoot,
+    aggregateGroups: names.aggregateGroupsRoot
+  };
 }
 function mutationRootNames(table) {
   const names = tableNames(table);
@@ -1654,7 +2540,15 @@ function resolveColumnEntries(table, enums, diagnostics) {
         type = { enum: enumDef.name, values: [...enumDef.values] };
       }
     }
-    return { name: column.name, columnName: column.columnName, type, nullable: column.nullable, deprecated: column.deprecated };
+    return {
+      name: column.name,
+      columnName: column.columnName,
+      type,
+      nullable: column.nullable,
+      deprecated: column.deprecated,
+      onUpdateFn: column.onUpdateFn !== void 0,
+      ...column.cell ? { cell: column.cell } : {}
+    };
   });
 }
 function logicalColumn(entries, ref) {
@@ -1690,8 +2584,8 @@ function buildCompileContext(rawCanonical) {
     const pkRefs = table.primaryKey ?? (isView ? [] : ["id"]);
     const primaryKey = [];
     for (const ref of pkRefs) {
-      const resolved = logicalColumn(entries, ref);
-      if (!resolved) {
+      const resolved2 = logicalColumn(entries, ref);
+      if (!resolved2) {
         diagnostics.push({
           severity: "error",
           code: "unknown-pk-column",
@@ -1700,9 +2594,13 @@ function buildCompileContext(rawCanonical) {
         });
         continue;
       }
-      primaryKey.push(resolved);
+      primaryKey.push(resolved2);
     }
-    const active = entries.filter((c) => !c.deprecated);
+    const resolved = isView ? table.resolved : void 0;
+    const data = entries.filter((c) => c.cell === void 0);
+    const cells = cellMap(entries);
+    const active = data.filter((c) => !c.deprecated);
+    const touchOnUpdate = isView ? [] : active.filter((c) => c.onUpdateFn).map((c) => c.name);
     const constraints = [];
     if (primaryKey.length > 0) constraints.push({ name: `${table.table}_pkey`, columns: [...primaryKey] });
     for (const column of table.columns) {
@@ -1723,14 +2621,17 @@ function buildCompileContext(rawCanonical) {
       // Synced twins (and views reading them, resolved transitively below)
       // are claims-gated — see tableMetaIrSchema.claimsGated.
       claimsGated: relationIsClaimsGated(table.table),
-      columns: entries.map(({ deprecated: _deprecated, ...column }) => column),
+      columns: entries.map(({ deprecated: _deprecated, onUpdateFn: _onUpdateFn, ...column }) => column),
       primaryKey: isView ? primaryKey : primaryKey.length > 0 ? primaryKey : ["id"],
       links: [],
-      filterable: entries.map((c) => c.name),
-      orderable: entries.filter((c) => c.type !== "jsonb").map((c) => c.name),
-      insertable: isView ? [] : active.map((c) => c.name),
-      settable: isView ? [] : active.map((c) => c.name),
+      filterable: data.map((c) => c.name),
+      orderable: data.filter((c) => c.type !== "jsonb").map((c) => c.name),
+      insertable: resolved ? resolvedWritable(data) : isView ? [] : active.map((c) => c.name),
+      settable: resolved ? resolvedWritable(data).filter((name) => !primaryKey.includes(name)) : isView ? [] : active.filter((c) => !c.onUpdateFn).map((c) => c.name),
       appendable: isView ? [] : active.filter((c) => c.type === "jsonb").map((c) => c.name),
+      ...touchOnUpdate.length > 0 ? { touchOnUpdate } : {},
+      ...cells ? { cells } : {},
+      ...resolved ? { resolved: resolvedMeta({ resolved, pk: primaryKey[0] }) } : {},
       constraints: isView ? [] : constraints,
       dynamicFilterMaxDepth: 6,
       dynamicFilterMaxNodes: 64
@@ -1751,7 +2652,7 @@ function buildCompileContext(rawCanonical) {
         });
         continue;
       }
-      const targetEntries = targetName === PLATFORM_USER_TABLE ? target.columns.map((c) => ({ ...c, deprecated: false })) : columnEntries.get(targetName);
+      const targetEntries = targetName === PLATFORM_USER_TABLE ? target.columns.map((c) => ({ ...c, deprecated: false, onUpdateFn: false })) : columnEntries.get(targetName);
       const onEntries = link.kind === "toMany" ? targetEntries : entries;
       const referencesEntries = link.kind === "toMany" ? entries : targetEntries;
       const on = logicalColumn(onEntries, link.on);
@@ -1803,7 +2704,7 @@ function buildCompileContext(rawCanonical) {
     compilePolicyFor("write", writePolicies);
     compilePolicyFor("insert", insertPolicies);
     compilePolicyFor("update", updatePolicies);
-    if (isView) {
+    if (isView && table.resolved === void 0) {
       writePolicies.set(table.table, CONST_FALSE);
       insertPolicies.set(table.table, CONST_FALSE);
       updatePolicies.set(table.table, CONST_FALSE);
@@ -1842,18 +2743,23 @@ function buildCompileContext(rawCanonical) {
   const queryRoots = /* @__PURE__ */ new Map();
   const mutationRoots = /* @__PURE__ */ new Map();
   for (const table of relations) {
+    if (table.internal === true) continue;
     const roots = queryRootNames(table.table);
     queryRoots.set(roots.select, { kind: "select", table: table.table });
     if ((tables[table.table]?.primaryKey.length ?? 0) > 0) {
       queryRoots.set(roots.byPk, { kind: "byPk", table: table.table });
     }
     queryRoots.set(roots.aggregate, { kind: "aggregate", table: table.table });
+    if (table.columns.some((column) => column.type !== "jsonb")) {
+      queryRoots.set(roots.aggregateGroups, { kind: "aggregateGroups", table: table.table });
+    }
     const hasWritePolicy = table.policies.write !== void 0 || table.policies.insert !== void 0 || table.policies.update !== void 0;
     if (!viewNames.has(table.table) && table.source === void 0 && hasWritePolicy) {
       for (const [op, field] of Object.entries(mutationRootNames(table.table))) {
         mutationRoots.set(field, { op, table: table.table });
       }
     }
+    if (table.resolved !== void 0) registerResolvedRoots({ table, mutationRoots });
   }
   for (const table of relations) {
     for (const mutation of table.cowMutations ?? []) {
@@ -1924,6 +2830,49 @@ function buildCompileContext(rawCanonical) {
     diagnostics
   };
 }
+function registerResolvedRoots({ table, mutationRoots }) {
+  const names = tableNames(table.table);
+  const canInsert = table.policies.write !== void 0 || table.policies.insert !== void 0;
+  const canUpdate = table.policies.write !== void 0 || table.policies.update !== void 0;
+  const add = (field, action) => mutationRoots.set(field, { op: "resolvedWrite", action, table: table.table });
+  if (canInsert) add(names.insertOneRoot, "insert");
+  if (canUpdate) {
+    add(names.updateByPkRoot, "update");
+    add(names.revertByPkRoot, "revert");
+    if ((table.resolved?.deletedBy.length ?? 0) > 0) add(names.deleteByPkRoot, "delete");
+  }
+}
+function cellMap(entries) {
+  const cells = {};
+  for (const entry of entries) {
+    if (entry.cell) cells[entry.cell.of] = { ...cells[entry.cell.of], [entry.cell.part]: entry.name };
+  }
+  return Object.keys(cells).length > 0 ? cells : void 0;
+}
+function resolvedWritable(entries) {
+  const system = new Set(Object.values(RESOLVED_VIEW_SYSTEM_COLUMNS).map((column) => column.name));
+  return entries.filter((entry) => !entry.deprecated && !system.has(entry.name)).map((entry) => entry.name);
+}
+function resolvedMeta({ resolved, pk }) {
+  const manual = resolved.sources.find((source) => source.kind === "manual");
+  return {
+    pk,
+    manual: manual?.name ?? "",
+    deletedBy: [...resolved.deletedBy],
+    ...resolved.materialized ? { materialized: { ...resolved.materialized } } : {},
+    sources: resolved.sources.map((source) => ({
+      name: source.name,
+      kind: source.kind,
+      table: source.table,
+      columns: [...source.columns],
+      ...source.key !== void 0 ? { key: source.key } : {},
+      ...source.fetch !== void 0 ? { fetch: source.fetch } : {},
+      ...source.function !== void 0 ? { function: source.function } : {},
+      ...source.prefetchDefaults !== void 0 ? { prefetchDefaults: source.prefetchDefaults } : {},
+      ...source.writeback !== void 0 ? { writeback: source.writeback } : {}
+    }))
+  };
+}
 function flattenSelectionSet(selectionSet, fragments, stack) {
   const selections = [];
   for (const selection of selectionSet.selections) {
@@ -1981,8 +2930,148 @@ function computeOpsHash(opHashes) {
   const digest = crypto.createHash("sha256").update(OPS_HASH_DOMAIN).update([...opHashes].sort().join("\n")).digest("hex");
   return `sha256:${digest}`;
 }
+var SOURCE_DIRECTIVES = /* @__PURE__ */ new Set(["prefetch", "writeback", "localOnly"]);
+var fail = (message, code) => {
+  throw new DocumentCompileError(message, code);
+};
+function readArgs(node, name) {
+  return (node.directives ?? []).filter((directive) => directive.name.value === name).map((directive) => {
+    const args = {};
+    for (const arg of directive.arguments ?? []) {
+      const key = arg.name.value;
+      if (key === "source" || key === "maxStaleness") {
+        if (arg.value.kind !== graphql.Kind.STRING) fail(`@${name}(${key}:) must be a string literal`, "invalid-source-directive");
+        args[key] = arg.value.value;
+      } else if (key === "mode" && name === "writeback") {
+        if (arg.value.kind !== graphql.Kind.ENUM || !["SYNC", "ASYNC"].includes(arg.value.value)) {
+          fail("@writeback(mode:) must be SYNC or ASYNC", "invalid-source-directive");
+        }
+        args.mode = arg.value.value === "SYNC" ? "sync" : "async";
+      } else {
+        fail(`@${name} does not take argument '${key}'`, "invalid-source-directive");
+      }
+    }
+    if (!args.source) fail(`@${name} needs a source: argument`, "invalid-source-directive");
+    return args;
+  });
+}
+function prefetchSourceFor({ resolved, name, directive, table }) {
+  if (!resolved) return fail(`@${directive} is only valid on resolved tables \u2014 '${table}' is not one`, "invalid-source-directive");
+  const source = resolved.sources.find((entry) => entry.name === name);
+  if (!source || source.kind !== "prefetch") {
+    const options = resolved.sources.filter((entry) => entry.kind === "prefetch").map((entry) => entry.name);
+    return fail(`@${directive}(source: "${name}") on '${table}' must name a prefetch source (${options.join(", ") || "none declared"})`, "invalid-source-directive");
+  }
+  return source;
+}
+function applyPrefetchDirectives({ node, root, meta }) {
+  const directives = readArgs(node, "prefetch");
+  for (const name of ["writeback", "localOnly"]) {
+    if (readArgs(node, name).length > 0) fail(`@${name} is only valid on resolved-table mutation roots`, "invalid-source-directive");
+  }
+  if (directives.length === 0) return root;
+  if (root.kind !== "select" && root.kind !== "byPk") {
+    return fail(`@prefetch is only valid on select and byPk roots, not '${root.alias}'`, "invalid-source-directive");
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const plans = directives.map((directive) => {
+    const source = prefetchSourceFor({ resolved: meta.resolved, name: directive.source, directive: "prefetch", table: root.table });
+    if (seen.has(source.name)) fail(`@prefetch(source: "${source.name}") appears twice on '${root.alias}'`, "invalid-source-directive");
+    seen.add(source.name);
+    const maxStalenessMs = directive.maxStaleness === void 0 ? void 0 : parseDurationMs(directive.maxStaleness);
+    if (directive.maxStaleness !== void 0 && maxStalenessMs === void 0) {
+      fail(`@prefetch(maxStaleness: "${directive.maxStaleness}") must look like '500ms', '30s' or '5m'`, "invalid-source-directive");
+    }
+    const key = root.kind === "byPk" ? { one: root.pk[0].value } : selectKey({ where: root.where, pk: meta.resolved.pk, source, alias: root.alias });
+    return { source: source.name, ...maxStalenessMs !== void 0 ? { maxStalenessMs } : {}, key };
+  });
+  return { ...root, prefetch: plans };
+}
+function selectKey({ where, pk, source, alias }) {
+  const leaves = where.kind === "and" ? where.operands : [where];
+  const pinned = leaves.find((leaf) => leaf.kind === "cmp" && leaf.column === pk && (leaf.op === "eq" || leaf.op === "in"));
+  const shape = source.fetch?.shape ?? "single";
+  if (!pinned || pinned.kind !== "cmp") {
+    return fail(
+      `@prefetch(source: "${source.name}") on '${alias}': the root is not key-addressed \u2014 its where must pin '${pk}' with _eq${shape === "batch" ? " or _in" : ""} (${source.name} supports ${shape === "batch" ? "batch" : "single-key"} fetch)`,
+      "prefetch-shape-mismatch"
+    );
+  }
+  if (pinned.op === "in" && shape !== "batch") {
+    return fail(`@prefetch(source: "${source.name}") on '${alias}': ${source.name} only supports single-key fetch, but the root selects '${pk}' with _in`, "prefetch-shape-mismatch");
+  }
+  return pinned.op === "eq" ? { one: pinned.value } : { many: pinned.value };
+}
+function applyWritebackDirectives({ node, root, meta }) {
+  if (readArgs(node, "prefetch").length > 0) fail("@prefetch is only valid on query roots", "invalid-source-directive");
+  const writebacks = readArgs(node, "writeback");
+  const localOnly = readArgs(node, "localOnly");
+  if (root.kind !== "mutation" || root.op !== "resolvedWrite" || !meta.resolved) {
+    if (writebacks.length + localOnly.length > 0) fail("@writeback/@localOnly are only valid on resolved-table mutation roots", "invalid-source-directive");
+    return root;
+  }
+  const resolved = meta.resolved;
+  const declared = /* @__PURE__ */ new Map();
+  const bindings = [];
+  for (const directive of writebacks) {
+    const source = prefetchSourceFor({ resolved, name: directive.source, directive: "writeback", table: root.table });
+    if (!source.writeback) fail(`@writeback(source: "${source.name}"): source '${source.name}' declares no writeback columns`, "invalid-source-directive");
+    if (root.resolvedAction !== "update") {
+      fail(`@writeback on '${root.alias}': only update roots write back in v1 (use @localOnly for ${root.resolvedAction ?? "this"} roots)`, "writeback-shape-mismatch");
+    }
+    if (declared.has(source.name)) fail(`source '${source.name}' is declared twice on '${root.alias}'`, "invalid-source-directive");
+    declared.set(source.name, "writeback");
+    bindings.push({ source: source.name, mode: directive.mode ?? source.writeback.defaultMode });
+  }
+  for (const directive of localOnly) {
+    const source = prefetchSourceFor({ resolved, name: directive.source, directive: "localOnly", table: root.table });
+    if (declared.has(source.name)) fail(`source '${source.name}' is declared twice on '${root.alias}'`, "invalid-source-directive");
+    declared.set(source.name, "localOnly");
+  }
+  assertWritebacksDeclared({ root, meta, resolved, declared });
+  return {
+    ...root,
+    ...bindings.length > 0 ? { writeback: bindings } : {},
+    ...localOnly.length > 0 ? { localOnly: localOnly.map((directive) => directive.source) } : {}
+  };
+}
+function assertWritebacksDeclared({ root, meta, resolved, declared }) {
+  const written = writtenColumns({ root, meta });
+  for (const source of resolved.sources) {
+    const columns = source.writeback?.columns.filter((column) => written.has(column)) ?? [];
+    if (columns.length > 0 && !declared.has(source.name)) {
+      fail(
+        `'${root.alias}' sets ${columns.map((column) => `'${column}'`).join(", ")}, which source '${source.name}' writes back \u2014 add @writeback(source: "${source.name}") to push the change or @localOnly(source: "${source.name}") to keep it local`,
+        "writeback-undeclared"
+      );
+    }
+  }
+}
+function writtenColumns({ root, meta }) {
+  if (root.resolvedAction === "update") {
+    if (!root.set || "slot" in root.set) return new Set(meta.settable);
+    return new Set(root.set.entries.map((entry) => entry.column));
+  }
+  if (root.resolvedAction === "insert") {
+    if (!root.objects || "slot" in root.objects) return new Set(meta.insertable);
+    return new Set(root.objects.rows.flatMap((row) => row.map((entry) => entry.column)));
+  }
+  return /* @__PURE__ */ new Set();
+}
+
+// src/compiler-gql/lower.ts
 var DEFAULT_LIMIT = 100;
 var MAX_LIMIT = 1e3;
+var MAX_GROUPS = 1e3;
+var DATE_BUCKET_BY_ENUM = {
+  YEAR: "year",
+  QUARTER: "quarter",
+  MONTH: "month",
+  WEEK: "week",
+  DAY: "day",
+  HOUR: "hour"
+};
+var BUCKETABLE_TYPES = /* @__PURE__ */ new Set(["timestamptz", "date"]);
 var BOOLEXP_OPS = {
   _eq: "eq",
   _neq: "neq",
@@ -2008,16 +3097,24 @@ var ORDER_DIRECTIONS = {
   DESC_NULLS_LAST: { direction: "desc", nulls: "last" }
 };
 var NUMERIC_TYPES = /* @__PURE__ */ new Set(["integer", "bigint", "numeric", "double"]);
-function fail(message, code, candidates = []) {
+function fail2(message, code, candidates = []) {
   throw new DocumentCompileError(message, code, candidates);
 }
 function argsByName(field) {
   return new Map((field.arguments ?? []).map((arg) => [arg.name.value, arg]));
 }
+function* aggregateBlockFields(selectionSet) {
+  for (const node of selectionSet.selections) {
+    if (node.kind !== graphql.Kind.FIELD) fail2("fragments must be flattened before lowering", "internal");
+    if (node.name.value === "__typename") continue;
+    if (node.alias) fail2(`aliases are not supported inside aggregate blocks ('${node.alias.value}')`, "invalid-aggregate");
+    yield node;
+  }
+}
 function assertKnownArgs(field, allowed) {
   for (const arg of field.arguments ?? []) {
     if (!allowed.includes(arg.name.value)) {
-      fail(`argument '${arg.name.value}' on '${field.name.value}' is not supported in v2.0`, "unsupported-argument", allowed);
+      fail2(`argument '${arg.name.value}' on '${field.name.value}' is not supported in v2.0`, "unsupported-argument", allowed);
     }
   }
 }
@@ -2030,8 +3127,11 @@ var OperationLowerer = class {
   meta(table) {
     return this.ctx.tables[table];
   }
+  /** A data column — cell-metadata columns are reachable only through `cells { … }`. */
   column(table, name) {
-    return this.meta(table).columns.find((c) => c.name === name);
+    const meta = this.meta(table);
+    const column = meta.columns.find((c) => c.name === name);
+    return column && !isCellColumn(meta, name) ? column : void 0;
   }
   link(table, name) {
     return this.meta(table).links.find((l) => l.name === name);
@@ -2039,7 +3139,8 @@ var OperationLowerer = class {
   fieldCandidates(table) {
     const meta = this.meta(table);
     return [
-      ...meta.columns.map((c) => c.name),
+      ...meta.columns.filter((c) => !isCellColumn(meta, c.name)).map((c) => c.name),
+      ...meta.cells ? [CELLS_FIELD] : [],
       ...meta.links.map((l) => l.name),
       ...meta.links.filter((l) => l.kind === "toMany").map((l) => `${l.name}Aggregate`)
     ];
@@ -2048,7 +3149,7 @@ var OperationLowerer = class {
   slot(name, input, table) {
     const variable = this.variables.get(name);
     if (!variable || variable.type.kind !== "inputRef" || variable.type.input !== input || variable.type.table !== table) {
-      fail(`variable $${name} must be declared as the ${input} input type for table '${table}'`, "slot-mismatch");
+      fail2(`variable $${name} must be declared as the ${input} input type for table '${table}'`, "slot-mismatch");
     }
     return name;
   }
@@ -2073,14 +3174,14 @@ var OperationLowerer = class {
         const items = node.values.map((item) => {
           const lowered = this.lowerValue(item);
           if (lowered.kind !== "literal" || Array.isArray(lowered.value)) {
-            fail("list literals must contain scalar literals only \u2014 pass the whole list as a variable instead", "unsupported-literal");
+            fail2("list literals must contain scalar literals only \u2014 pass the whole list as a variable instead", "unsupported-literal");
           }
           return lowered.value;
         });
         return { kind: "literal", value: items };
       }
       case graphql.Kind.OBJECT:
-        fail("literal JSON objects are not supported in documents \u2014 pass the value via a variable", "unsupported-literal");
+        fail2("literal JSON objects are not supported in documents \u2014 pass the value via a variable", "unsupported-literal");
     }
   }
   // -------------------------------------------------------------------------
@@ -2090,7 +3191,7 @@ var OperationLowerer = class {
     if (node.kind === graphql.Kind.VARIABLE) {
       return { kind: "dynamicFilter", slot: this.slot(node.name.value, "boolExp", table) };
     }
-    if (node.kind !== graphql.Kind.OBJECT) fail(`a boolean expression on '${table}' must be an object or a variable`, "invalid-boolexp");
+    if (node.kind !== graphql.Kind.OBJECT) fail2(`a boolean expression on '${table}' must be an object or a variable`, "invalid-boolexp");
     const operands = [];
     for (const field of node.fields) {
       const key = field.name.value;
@@ -2121,45 +3222,45 @@ var OperationLowerer = class {
           continue;
         }
       }
-      fail(`unknown field '${key}' in a boolean expression on '${table}'`, "unknown-column", this.fieldCandidates(table));
+      fail2(`unknown field '${key}' in a boolean expression on '${table}'`, "unknown-column", this.fieldCandidates(table));
     }
     if (operands.length === 0) return CONST_TRUE;
     return operands.length === 1 ? operands[0] : { kind: "and", operands };
   }
   lowerComparison(node, column, table) {
     if (node.kind !== graphql.Kind.OBJECT) {
-      fail(`comparison on '${table}.${column}' must be an object like { _eq: \u2026 }`, "invalid-comparison", Object.keys(BOOLEXP_OPS));
+      fail2(`comparison on '${table}.${column}' must be an object like { _eq: \u2026 }`, "invalid-comparison", Object.keys(BOOLEXP_OPS));
     }
     return node.fields.map((field) => {
       const op = BOOLEXP_OPS[field.name.value];
       if (!op) {
-        fail(`unknown comparison operator '${field.name.value}' on '${table}.${column}'`, "unknown-operator", Object.keys(BOOLEXP_OPS));
+        fail2(`unknown comparison operator '${field.name.value}' on '${table}.${column}'`, "unknown-operator", Object.keys(BOOLEXP_OPS));
       }
       return { kind: "cmp", op, column, value: this.lowerValue(field.value) };
     });
   }
   /** Hasura aggregation predicate: `{ count: { predicate: { _gt: 2 }, filter: {…} } }`. */
   lowerAggPredicate(node, link, target) {
-    if (node.kind !== graphql.Kind.OBJECT) fail(`aggregate predicate through '${link}' must be an object`, "invalid-agg-predicate");
+    if (node.kind !== graphql.Kind.OBJECT) fail2(`aggregate predicate through '${link}' must be an object`, "invalid-agg-predicate");
     const countField = node.fields.find((f) => f.name.value === "count");
     if (!countField || node.fields.length !== 1) {
-      fail(`aggregate predicates support { count: \u2026 } only in v2.0 (through '${link}')`, "invalid-agg-predicate", ["count"]);
+      fail2(`aggregate predicates support { count: \u2026 } only in v2.0 (through '${link}')`, "invalid-agg-predicate", ["count"]);
     }
-    if (countField.value.kind !== graphql.Kind.OBJECT) fail(`count predicate through '${link}' must be an object`, "invalid-agg-predicate");
+    if (countField.value.kind !== graphql.Kind.OBJECT) fail2(`count predicate through '${link}' must be an object`, "invalid-agg-predicate");
     let predicate;
     let where;
     for (const field of countField.value.fields) {
       if (field.name.value === "predicate") {
         if (field.value.kind !== graphql.Kind.OBJECT || field.value.fields.length !== 1) {
-          fail(`count predicate through '${link}' needs exactly one operator`, "invalid-agg-predicate", [...AGG_PREDICATE_OPS]);
+          fail2(`count predicate through '${link}' needs exactly one operator`, "invalid-agg-predicate", [...AGG_PREDICATE_OPS]);
         }
         const opField = field.value.fields[0];
         const opName = opField.name.value;
         if (!AGG_PREDICATE_OPS.includes(opName)) {
-          fail(`aggregate count predicates support ${AGG_PREDICATE_OPS.join("/")} only, got '${opName}'`, "invalid-agg-predicate");
+          fail2(`aggregate count predicates support ${AGG_PREDICATE_OPS.join("/")} only, got '${opName}'`, "invalid-agg-predicate");
         }
         if (opField.value.kind !== graphql.Kind.INT) {
-          fail(`aggregate count predicate value must be an integer literal`, "invalid-agg-predicate");
+          fail2(`aggregate count predicate value must be an integer literal`, "invalid-agg-predicate");
         }
         predicate = { op: opName.slice(1), value: Number(opField.value.value) };
         continue;
@@ -2168,9 +3269,9 @@ var OperationLowerer = class {
         where = this.lowerBoolExp(field.value, target);
         continue;
       }
-      fail(`unknown key '${field.name.value}' in a count predicate`, "invalid-agg-predicate", ["predicate", "filter"]);
+      fail2(`unknown key '${field.name.value}' in a count predicate`, "invalid-agg-predicate", ["predicate", "filter"]);
     }
-    if (!predicate) fail(`count predicate through '${link}' needs a { predicate: { _gt: n } }`, "invalid-agg-predicate");
+    if (!predicate) fail2(`count predicate through '${link}' needs a { predicate: { _gt: n } }`, "invalid-agg-predicate");
     return { kind: "aggPredicate", link, fn: "count", op: predicate.op, value: predicate.value, ...where ? { where } : {} };
   }
   lowerOrderBy(node, table) {
@@ -2180,7 +3281,7 @@ var OperationLowerer = class {
     const items = node.kind === graphql.Kind.LIST ? node.values : [node];
     const lowered = [];
     for (const item of items) {
-      if (item.kind !== graphql.Kind.OBJECT) fail(`orderBy entries on '${table}' must be objects`, "invalid-orderby");
+      if (item.kind !== graphql.Kind.OBJECT) fail2(`orderBy entries on '${table}' must be objects`, "invalid-orderby");
       for (const field of item.fields) {
         const key = field.name.value;
         const column = this.column(table, key);
@@ -2191,25 +3292,25 @@ var OperationLowerer = class {
         const link = this.link(table, key);
         if (link && link.kind !== "toMany") {
           if (field.value.kind !== graphql.Kind.OBJECT || field.value.fields.length !== 1) {
-            fail(`orderBy through '${key}' needs exactly one target column`, "invalid-orderby");
+            fail2(`orderBy through '${key}' needs exactly one target column`, "invalid-orderby");
           }
           const inner = field.value.fields[0];
           const targetColumn = this.column(link.target, inner.name.value);
           if (!targetColumn) {
-            fail(`unknown column '${inner.name.value}' on '${link.target}' in orderBy`, "unknown-column", this.meta(link.target).columns.map((c) => c.name));
+            fail2(`unknown column '${inner.name.value}' on '${link.target}' in orderBy`, "unknown-column", this.meta(link.target).columns.map((c) => c.name));
           }
           lowered.push({ kind: "column", column: inner.name.value, link: key, ...this.lowerDirection(inner.value, link.target, inner.name.value) });
           continue;
         }
-        fail(`unknown orderBy key '${key}' on '${table}' (to-one links only)`, "invalid-orderby", this.fieldCandidates(table));
+        fail2(`unknown orderBy key '${key}' on '${table}' (to-one links only)`, "invalid-orderby", this.fieldCandidates(table));
       }
     }
     return lowered;
   }
   lowerDirection(node, table, column) {
-    if (node.kind !== graphql.Kind.ENUM) fail(`orderBy direction on '${table}.${column}' must be a direction enum`, "invalid-orderby", Object.keys(ORDER_DIRECTIONS));
+    if (node.kind !== graphql.Kind.ENUM) fail2(`orderBy direction on '${table}.${column}' must be a direction enum`, "invalid-orderby", Object.keys(ORDER_DIRECTIONS));
     const direction = ORDER_DIRECTIONS[node.value];
-    if (!direction) fail(`unknown orderBy direction '${node.value}'`, "invalid-orderby", Object.keys(ORDER_DIRECTIONS));
+    if (!direction) fail2(`unknown orderBy direction '${node.value}'`, "invalid-orderby", Object.keys(ORDER_DIRECTIONS));
     return direction.nulls ? { direction: direction.direction, nulls: direction.nulls } : { direction: direction.direction };
   }
   lowerDistinctOn(node, table) {
@@ -2218,9 +3319,9 @@ var OperationLowerer = class {
     }
     const items = node.kind === graphql.Kind.LIST ? node.values : [node];
     return items.map((item) => {
-      if (item.kind !== graphql.Kind.ENUM) fail(`distinctOn entries on '${table}' must be select-column enum values`, "invalid-distinct-on");
+      if (item.kind !== graphql.Kind.ENUM) fail2(`distinctOn entries on '${table}' must be select-column enum values`, "invalid-distinct-on");
       if (!this.column(table, item.value)) {
-        fail(`unknown distinctOn column '${item.value}' on '${table}'`, "unknown-column", this.meta(table).columns.map((c) => c.name));
+        fail2(`unknown distinctOn column '${item.value}' on '${table}'`, "unknown-column", this.meta(table).columns.map((c) => c.name));
       }
       return item.value;
     });
@@ -2231,16 +3332,16 @@ var OperationLowerer = class {
     if (node.kind === graphql.Kind.VARIABLE) return { ...base, variable: node.name.value };
     if (node.kind === graphql.Kind.INT) {
       const value = Number(node.value);
-      if (value < 1) fail("limit must be a positive integer", "invalid-limit");
+      if (value < 1) fail2("limit must be a positive integer", "invalid-limit");
       return { ...base, value: Math.min(value, MAX_LIMIT) };
     }
-    fail("limit must be an integer literal or a variable", "invalid-limit");
+    fail2("limit must be an integer literal or a variable", "invalid-limit");
   }
   lowerOffset(node) {
     if (!node) return void 0;
     if (node.kind === graphql.Kind.VARIABLE) return { variable: node.name.value };
     if (node.kind === graphql.Kind.INT) return { value: Number(node.value) };
-    fail("offset must be an integer literal or a variable", "invalid-offset");
+    fail2("offset must be an integer literal or a variable", "invalid-offset");
   }
   // -------------------------------------------------------------------------
   // Selections
@@ -2249,9 +3350,9 @@ var OperationLowerer = class {
     const meta = this.meta(table);
     const selection = { typename: meta.typename, columns: [], relations: [], aggregates: [] };
     for (const node of selectionSet.selections) {
-      if (node.kind !== graphql.Kind.FIELD) fail("fragments must be flattened before lowering", "internal");
+      if (node.kind !== graphql.Kind.FIELD) fail2("fragments must be flattened before lowering", "internal");
       if (node.directives && node.directives.length > 0) {
-        fail(`@include/@skip are supported on root fields only ('${node.name.value}' is nested)`, "nested-directive");
+        fail2(`@include/@skip are supported on root fields only ('${node.name.value}' is nested)`, "nested-directive");
       }
       const name = node.name.value;
       if (name === "__typename") continue;
@@ -2259,14 +3360,19 @@ var OperationLowerer = class {
       const column = this.column(table, name);
       if (column) {
         if (node.arguments !== void 0 && node.arguments.length > 0 || node.selectionSet !== void 0) {
-          fail(`column '${table}.${name}' takes no arguments or sub-selection`, "invalid-selection");
+          fail2(`column '${table}.${name}' takes no arguments or sub-selection`, "invalid-selection");
         }
         selection.columns.push({ alias, column: name });
         continue;
       }
+      if (name === CELLS_FIELD && meta.cells) {
+        if (selection.cells) fail2(`'${CELLS_FIELD}' may be selected once per object`, "invalid-selection");
+        selection.cells = this.lowerCells(node, table, alias);
+        continue;
+      }
       const link = this.link(table, name);
       if (link) {
-        if (!node.selectionSet) fail(`link '${table}.${name}' needs a selection set`, "invalid-selection");
+        if (!node.selectionSet) fail2(`link '${table}.${name}' needs a selection set`, "invalid-selection");
         const relation = {
           alias,
           link: name,
@@ -2285,7 +3391,7 @@ var OperationLowerer = class {
             if (offset) relation.offset = offset;
           }
         } else if (node.arguments && node.arguments.length > 0) {
-          fail(`to-one link '${table}.${name}' takes no arguments`, "invalid-selection");
+          fail2(`to-one link '${table}.${name}' takes no arguments`, "invalid-selection");
         }
         selection.relations.push(relation);
         continue;
@@ -2293,7 +3399,7 @@ var OperationLowerer = class {
       if (name.endsWith("Aggregate")) {
         const aggLink = this.link(table, name.slice(0, -"Aggregate".length));
         if (aggLink && aggLink.kind === "toMany") {
-          if (!node.selectionSet) fail(`'${name}' needs a selection set`, "invalid-selection");
+          if (!node.selectionSet) fail2(`'${name}' needs a selection set`, "invalid-selection");
           assertKnownArgs(node, ["where"]);
           const whereArg = argsByName(node).get("where");
           const aggregate = this.lowerAggregateSelection(node.selectionSet, aggLink.target);
@@ -2306,70 +3412,182 @@ var OperationLowerer = class {
           continue;
         }
       }
-      fail(`unknown field '${name}' on '${table}'`, "unknown-field", this.fieldCandidates(table));
+      fail2(`unknown field '${name}' on '${table}'`, "unknown-field", this.fieldCandidates(table));
     }
     return selection;
   }
+  /**
+   * `cells { <column> { at by … } }` — typed per-cell metadata. Plain tables
+   * offer `at`/`by`; resolved tables add the winning `source` and newer
+   * `conflicts { source at value }`.
+   */
+  lowerCells(node, table, alias) {
+    const meta = this.meta(table);
+    const cells = meta.cells ?? {};
+    if (node.arguments && node.arguments.length > 0) fail2(`'${CELLS_FIELD}' takes no arguments`, "invalid-selection");
+    if (!node.selectionSet) fail2(`'${CELLS_FIELD}' needs a selection set`, "invalid-selection");
+    const fields = [];
+    for (const cellNode of fieldNodes(node.selectionSet)) {
+      const column = cellNode.name.value;
+      const parts = cells[column];
+      if (!parts || parts.at === void 0 && parts.source === void 0) {
+        fail2(`unknown cell '${column}' on '${table}'`, "unknown-field", Object.keys(cells));
+      }
+      if (!cellNode.selectionSet) fail2(`cell '${column}' needs a selection set`, "invalid-selection");
+      const resolved = parts.source !== void 0;
+      const allowed = resolved ? ["source", "at", "by", "conflicts"] : ["at", "by"];
+      const selected = [];
+      for (const partNode of fieldNodes(cellNode.selectionSet)) {
+        const part = partNode.name.value;
+        if (!allowed.includes(part)) fail2(`unknown field '${part}' on cell '${column}'`, "unknown-field", allowed);
+        const partAlias = partNode.alias?.value ?? part;
+        if (part !== "conflicts") {
+          if (partNode.selectionSet) fail2(`cell field '${part}' takes no sub-selection`, "invalid-selection");
+          selected.push({ alias: partAlias, part });
+          continue;
+        }
+        if (!partNode.selectionSet) fail2(`'conflicts' needs a selection set`, "invalid-selection");
+        const conflictFields = fieldNodes(partNode.selectionSet).map((fieldNode) => {
+          const field = fieldNode.name.value;
+          if (field !== "source" && field !== "at" && field !== "value") fail2(`unknown field '${field}' on a cell conflict`, "unknown-field", ["source", "at", "value"]);
+          return { alias: fieldNode.alias?.value ?? field, field };
+        });
+        selected.push({ alias: partAlias, part: "conflicts", fields: conflictFields, typename: CELL_TYPENAMES.conflict });
+      }
+      fields.push({
+        alias: cellNode.alias?.value ?? column,
+        column,
+        typename: resolved ? CELL_TYPENAMES.resolved : CELL_TYPENAMES.stamp,
+        parts: selected
+      });
+    }
+    return { alias, typename: cellsTypename(meta.typename), fields };
+  }
   /** The `{ aggregate { count sum {…} avg {…} } nodes {…} }` block shared by roots and relations. */
   lowerAggregateSelection(selectionSet, table) {
     const result = {};
     let sawAggregate = false;
-    for (const node of selectionSet.selections) {
-      if (node.kind !== graphql.Kind.FIELD) fail("fragments must be flattened before lowering", "internal");
+    for (const node of aggregateBlockFields(selectionSet)) {
       const name = node.name.value;
-      if (name === "__typename") continue;
-      if (node.alias) fail(`aliases are not supported inside aggregate blocks ('${node.alias.value}')`, "invalid-aggregate");
       if (name === "nodes") {
-        if (!node.selectionSet) fail("'nodes' needs a selection set", "invalid-aggregate");
+        if (!node.selectionSet) fail2("'nodes' needs a selection set", "invalid-aggregate");
         result.nodes = this.lowerSelection(node.selectionSet, table);
         continue;
       }
-      if (name !== "aggregate") fail(`unknown aggregate field '${name}'`, "invalid-aggregate", ["aggregate", "nodes"]);
-      if (sawAggregate) fail("one aggregate block per field \u2014 alias the root instead", "invalid-aggregate");
+      if (name !== "aggregate") fail2(`unknown aggregate field '${name}'`, "invalid-aggregate", ["aggregate", "nodes"]);
+      if (sawAggregate) fail2("one aggregate block per field \u2014 alias the root instead", "invalid-aggregate");
       sawAggregate = true;
-      if (!node.selectionSet) fail("'aggregate' needs a selection set", "invalid-aggregate");
-      for (const aggField of node.selectionSet.selections) {
-        if (aggField.kind !== graphql.Kind.FIELD) fail("fragments must be flattened before lowering", "internal");
-        const aggName = aggField.name.value;
-        if (aggName === "__typename") continue;
-        if (aggField.alias) fail(`aliases are not supported inside aggregate blocks ('${aggField.alias.value}')`, "invalid-aggregate");
-        if (aggName === "count") {
-          assertKnownArgs(aggField, ["columns", "distinct"]);
-          const args = argsByName(aggField);
-          const count = {};
-          const columns = args.get("columns");
-          if (columns) count.columns = this.lowerDistinctOn(columns.value, table);
-          const distinct = args.get("distinct");
-          if (distinct) {
-            if (distinct.value.kind !== graphql.Kind.BOOLEAN) fail("count(distinct:) must be a boolean literal", "invalid-aggregate");
-            count.distinct = distinct.value.value;
-          }
-          result.count = count;
-          continue;
+      if (!node.selectionSet) fail2("'aggregate' needs a selection set", "invalid-aggregate");
+      Object.assign(result, this.lowerAggregateFields(node.selectionSet, table));
+    }
+    if (!sawAggregate && !result.nodes) fail2("aggregate selection needs an aggregate or nodes block", "invalid-aggregate");
+    return result;
+  }
+  /**
+   * The `{ key {…} aggregate {…} }` block of a grouped aggregate root. Same
+   * `aggregate` sub-block as the ungrouped shape (shared via
+   * `lowerAggregateFields`), but `key` replaces `nodes` — see the IR comment on
+   * `aggregateGroupsRootSchema` for why grouped roots have no `nodes`.
+   */
+  lowerGroupedAggregateSelection(selectionSet, table, groupBy) {
+    const groupColumns = new Set(groupBy.map((entry) => entry.column));
+    const result = { key: [] };
+    let sawAggregate = false;
+    let sawKey = false;
+    for (const node of aggregateBlockFields(selectionSet)) {
+      const name = node.name.value;
+      if (name === "key") {
+        if (sawKey) fail2("one key block per grouped aggregate", "invalid-aggregate");
+        sawKey = true;
+        if (!node.selectionSet) fail2("'key' needs a selection set", "invalid-aggregate");
+        result.key = this.lowerGroupKeySelection(node.selectionSet, table, groupColumns);
+        continue;
+      }
+      if (name === "nodes") {
+        fail2("'nodes' is not available on a grouped aggregate \u2014 query the rows separately", "invalid-aggregate", ["key", "aggregate"]);
+      }
+      if (name !== "aggregate") fail2(`unknown grouped-aggregate field '${name}'`, "invalid-aggregate", ["key", "aggregate"]);
+      if (sawAggregate) fail2("one aggregate block per field \u2014 alias the root instead", "invalid-aggregate");
+      sawAggregate = true;
+      if (!node.selectionSet) fail2("'aggregate' needs a selection set", "invalid-aggregate");
+      Object.assign(result, this.lowerAggregateFields(node.selectionSet, table));
+    }
+    const rendersAggregate = result.count !== void 0 || (result.sum?.length ?? 0) > 0 || (result.avg?.length ?? 0) > 0;
+    if (result.key.length === 0 && !rendersAggregate) {
+      fail2(
+        "grouped aggregate needs at least one key column or an aggregate \u2014 a block selecting only __typename produces nothing",
+        "invalid-aggregate",
+        ["key", "aggregate"]
+      );
+    }
+    return result;
+  }
+  /**
+   * `key { month officer }` → the projected group columns. Every field must be
+   * one of the query's own group keys: any other column is indeterminate
+   * within a group, so selecting it is a document error rather than an
+   * arbitrary pick.
+   */
+  lowerGroupKeySelection(selectionSet, table, groupColumns) {
+    const key = [];
+    for (const node of selectionSet.selections) {
+      if (node.kind !== graphql.Kind.FIELD) fail2("fragments must be flattened before lowering", "internal");
+      const name = node.name.value;
+      if (name === "__typename") continue;
+      if (!this.column(table, name)) {
+        fail2(`unknown key column '${name}' on '${table}'`, "unknown-column", [...groupColumns]);
+      }
+      if (!groupColumns.has(name)) {
+        fail2(
+          `key column '${name}' is not one of this query's groupBy keys \u2014 it has no single value within a group`,
+          "invalid-group-key",
+          [...groupColumns]
+        );
+      }
+      key.push({ alias: node.alias?.value ?? name, column: name });
+    }
+    return key;
+  }
+  /** The `count` / `sum {…}` / `avg {…}` fields inside an `aggregate { … }` block. */
+  lowerAggregateFields(selectionSet, table) {
+    const result = {};
+    for (const aggField of aggregateBlockFields(selectionSet)) {
+      const aggName = aggField.name.value;
+      if (aggName === "count") {
+        assertKnownArgs(aggField, ["columns", "distinct"]);
+        const args = argsByName(aggField);
+        const count = {};
+        const columns = args.get("columns");
+        if (columns) count.columns = this.lowerDistinctOn(columns.value, table);
+        const distinct = args.get("distinct");
+        if (distinct) {
+          if (distinct.value.kind !== graphql.Kind.BOOLEAN) fail2("count(distinct:) must be a boolean literal", "invalid-aggregate");
+          count.distinct = distinct.value.value;
         }
-        if (aggName === "sum" || aggName === "avg") {
-          if (!aggField.selectionSet) fail(`'${aggName}' needs a column selection`, "invalid-aggregate");
-          const columns = [];
-          for (const columnField of aggField.selectionSet.selections) {
-            if (columnField.kind !== graphql.Kind.FIELD) fail("fragments must be flattened before lowering", "internal");
-            if (columnField.name.value === "__typename") continue;
-            const column = this.column(table, columnField.name.value);
-            if (!column || typeof column.type !== "string" || !NUMERIC_TYPES.has(column.type)) {
-              fail(
-                `'${aggName}' supports numeric columns only, got '${columnField.name.value}' on '${table}'`,
-                "invalid-aggregate",
-                this.meta(table).columns.filter((c) => typeof c.type === "string" && NUMERIC_TYPES.has(c.type)).map((c) => c.name)
-              );
-            }
-            columns.push(columnField.name.value);
+        result.count = count;
+        continue;
+      }
+      if (aggName === "sum" || aggName === "avg") {
+        if (!aggField.selectionSet) fail2(`'${aggName}' needs a column selection`, "invalid-aggregate");
+        const columns = [];
+        for (const columnField of aggField.selectionSet.selections) {
+          if (columnField.kind !== graphql.Kind.FIELD) fail2("fragments must be flattened before lowering", "internal");
+          if (columnField.name.value === "__typename") continue;
+          const column = this.column(table, columnField.name.value);
+          if (!column || typeof column.type !== "string" || !NUMERIC_TYPES.has(column.type)) {
+            fail2(
+              `'${aggName}' supports numeric columns only, got '${columnField.name.value}' on '${table}'`,
+              "invalid-aggregate",
+              this.meta(table).columns.filter((c) => typeof c.type === "string" && NUMERIC_TYPES.has(c.type)).map((c) => c.name)
+            );
           }
-          result[aggName] = columns;
-          continue;
+          columns.push(columnField.name.value);
         }
-        fail(`aggregate '${aggName}' is not supported in v2.0 (count/sum/avg only)`, "invalid-aggregate", ["count", "sum", "avg"]);
+        result[aggName] = columns;
+        continue;
       }
+      fail2(`aggregate '${aggName}' is not supported in v2.0 (count/sum/avg only)`, "invalid-aggregate", ["count", "sum", "avg"]);
     }
-    if (!sawAggregate && !result.nodes) fail("aggregate selection needs an aggregate or nodes block", "invalid-aggregate");
     return result;
   }
   // -------------------------------------------------------------------------
@@ -2378,32 +3596,65 @@ var OperationLowerer = class {
   lowerRoots(operation, kind) {
     const roots = [];
     for (const node of operation.selectionSet.selections) {
-      if (node.kind !== graphql.Kind.FIELD) fail("fragments are not supported at the operation root", "invalid-root");
+      if (node.kind !== graphql.Kind.FIELD) fail2("fragments are not supported at the operation root", "invalid-root");
+      if (node.selectionSet) graphql.visit(node.selectionSet, {
+        Directive(directive) {
+          if (directive.name.value === "assertAffectedRows") {
+            fail2("@assertAffectedRows is supported on mutation roots only", "invalid-affected-row-assertion");
+          }
+        }
+      });
+      const assertion = this.parseAffectedRowAssertion(node, kind);
       const gate = this.parseRootDirectives(node);
       if (gate.omit) continue;
-      const root = kind === "query" ? this.lowerQueryRoot(node) : this.lowerMutationRoot(node);
-      roots.push(gate.includeIf ? { ...root, includeIf: gate.includeIf } : root);
+      const lowered = kind === "query" ? this.lowerQueryRoot(node) : this.lowerMutationRoot(node);
+      const meta = this.meta(lowered.table);
+      const root = kind === "query" ? applyPrefetchDirectives({ node, root: lowered, meta }) : applyWritebackDirectives({ node, root: lowered, meta });
+      const guarded = root.kind === "mutation" && assertion !== void 0 ? { ...root, assertAffectedRows: assertion } : root;
+      roots.push(gate.includeIf ? { ...guarded, includeIf: gate.includeIf } : guarded);
     }
-    if (roots.length === 0) fail("operation has no roots (all statically skipped?)", "invalid-root");
+    if (roots.length === 0) fail2("operation has no roots (all statically skipped?)", "invalid-root");
     return roots;
   }
+  parseAffectedRowAssertion(node, kind) {
+    const assertions = node.directives?.filter((directive) => directive.name.value === "assertAffectedRows") ?? [];
+    if (!assertions.length) return void 0;
+    if (kind !== "mutation" || assertions.length !== 1) {
+      fail2("@assertAffectedRows is supported once per mutation root", "invalid-affected-row-assertion");
+    }
+    if (node.directives?.some((directive) => ["include", "skip"].includes(directive.name.value))) {
+      fail2("an @assertAffectedRows root cannot use @include or @skip", "invalid-affected-row-assertion");
+    }
+    const args = assertions[0].arguments;
+    const arg = args?.[0];
+    if (args?.length !== 1 || arg?.name.value !== "exactly" || arg.value.kind !== graphql.Kind.INT) {
+      fail2("@assertAffectedRows(exactly:) requires a document-authored nonnegative Int literal", "invalid-affected-row-assertion");
+    }
+    const count = Number(arg.value.value);
+    if (!Number.isInteger(count) || count < 0 || count > 2147483647) {
+      fail2("@assertAffectedRows(exactly:) must be between 0 and 2147483647", "invalid-affected-row-assertion");
+    }
+    return count;
+  }
   parseRootDirectives(node) {
     let includeIf;
     let omit = false;
     for (const directive of node.directives ?? []) {
       const name = directive.name.value;
+      if (name === "assertAffectedRows") continue;
+      if (SOURCE_DIRECTIVES.has(name)) continue;
       if (name !== "include" && name !== "skip") {
-        fail(`directive @${name} is not supported on fields`, "unknown-directive", ["include", "skip"]);
+        fail2(`directive @${name} is not supported on fields`, "unknown-directive", ["include", "skip"]);
       }
       const ifArg = directive.arguments?.find((a) => a.name.value === "if");
-      if (!ifArg) fail(`@${name} needs an if: argument`, "invalid-directive");
+      if (!ifArg) fail2(`@${name} needs an if: argument`, "invalid-directive");
       if (ifArg.value.kind === graphql.Kind.BOOLEAN) {
         const keep = name === "include" ? ifArg.value.value : !ifArg.value.value;
         if (!keep) omit = true;
         continue;
       }
-      if (ifArg.value.kind !== graphql.Kind.VARIABLE) fail(`@${name}(if:) must be a boolean literal or variable`, "invalid-directive");
-      if (includeIf) fail("at most one of @include/@skip per root field", "invalid-directive");
+      if (ifArg.value.kind !== graphql.Kind.VARIABLE) fail2(`@${name}(if:) must be a boolean literal or variable`, "invalid-directive");
+      if (includeIf) fail2("at most one of @include/@skip per root field", "invalid-directive");
       includeIf = { variable: ifArg.value.name.value, negated: name === "skip" };
     }
     return omit ? { omit: true } : { includeIf, omit: false };
@@ -2412,12 +3663,12 @@ var OperationLowerer = class {
     const name = node.name.value;
     const alias = node.alias?.value ?? name;
     const rootInfo = this.ctx.queryRoots.get(name);
-    if (!rootInfo) fail(`unknown query root '${name}'`, "unknown-root", [...this.ctx.queryRoots.keys()]);
+    if (!rootInfo) fail2(`unknown query root '${name}'`, "unknown-root", [...this.ctx.queryRoots.keys()]);
     const { table } = rootInfo;
     const args = argsByName(node);
     if (rootInfo.kind === "select") {
       assertKnownArgs(node, ["where", "orderBy", "distinctOn", "limit", "offset"]);
-      if (!node.selectionSet) fail(`'${name}' needs a selection set`, "invalid-selection");
+      if (!node.selectionSet) fail2(`'${name}' needs a selection set`, "invalid-selection");
       const where = args.get("where");
       const orderBy = args.get("orderBy");
       const distinctOn = args.get("distinctOn");
@@ -2436,12 +3687,15 @@ var OperationLowerer = class {
       };
     }
     if (rootInfo.kind === "byPk") {
-      if (!node.selectionSet) fail(`'${name}' needs a selection set`, "invalid-selection");
+      if (!node.selectionSet) fail2(`'${name}' needs a selection set`, "invalid-selection");
       const pk = this.lowerPkArgs(node, table);
       return { kind: "byPk", alias, table, selection: this.lowerSelection(node.selectionSet, table), pk, where: CONST_TRUE };
     }
+    if (rootInfo.kind === "aggregateGroups") {
+      return this.lowerAggregateGroupsRoot(node, { alias, table });
+    }
     assertKnownArgs(node, ["where"]);
-    if (!node.selectionSet) fail(`'${name}' needs a selection set`, "invalid-selection");
+    if (!node.selectionSet) fail2(`'${name}' needs a selection set`, "invalid-selection");
     const whereArg = args.get("where");
     const aggregate = this.lowerAggregateSelection(node.selectionSet, table);
     return {
@@ -2452,6 +3706,108 @@ var OperationLowerer = class {
       ...aggregate
     };
   }
+  /** `<t>AggregateGroups(where:, groupBy:, limit:, offset:)` → an aggregateGroups root. */
+  lowerAggregateGroupsRoot(node, { alias, table }) {
+    assertKnownArgs(node, ["where", "groupBy", "limit", "offset"]);
+    if (!node.selectionSet) fail2(`'${node.name.value}' needs a selection set`, "invalid-selection");
+    const args = argsByName(node);
+    const groupByArg = args.get("groupBy");
+    if (!groupByArg) fail2(`'${node.name.value}' requires a 'groupBy' argument`, "missing-group-by");
+    const whereArg = args.get("where");
+    const groupBy = this.lowerGroupBy(groupByArg.value, table);
+    const aggregate = this.lowerGroupedAggregateSelection(node.selectionSet, table, groupBy);
+    const offset = this.lowerOffset(args.get("offset")?.value);
+    return {
+      kind: "aggregateGroups",
+      alias,
+      table,
+      where: whereArg ? this.lowerBoolExp(whereArg.value, table) : CONST_TRUE,
+      groupBy,
+      key: aggregate.key,
+      ...aggregate.count ? { count: aggregate.count } : {},
+      ...aggregate.sum ? { sum: aggregate.sum } : {},
+      ...aggregate.avg ? { avg: aggregate.avg } : {},
+      limit: this.lowerGroupLimit(args.get("limit")?.value),
+      ...offset ? { offset } : {}
+    };
+  }
+  /**
+   * `groupBy: [{ column: startedAt, bucket: MONTH }, …]` → GroupByKeyIr[].
+   *
+   * Document-authored only: a whole-argument variable is rejected rather than
+   * becoming a §4f slot. Group keys choose which expressions reach GROUP BY,
+   * and dynamic-input.ts refuses aggregation shapes from client input on the
+   * same reasoning — `where` stays dynamic, which is what runtime filtering
+   * actually needs.
+   */
+  lowerGroupBy(node, table) {
+    if (node.kind === graphql.Kind.VARIABLE) {
+      fail2(
+        `groupBy on '${table}' must be written in the document \u2014 it cannot come from a variable`,
+        "dynamic-group-by"
+      );
+    }
+    const items = node.kind === graphql.Kind.LIST ? node.values : [node];
+    if (items.length === 0) fail2(`groupBy on '${table}' needs at least one key`, "invalid-group-by");
+    const seen = /* @__PURE__ */ new Set();
+    return items.map((item) => {
+      if (item.kind !== graphql.Kind.OBJECT) {
+        fail2(`groupBy entries on '${table}' must be objects like { column: foo }`, "invalid-group-by");
+      }
+      const fields = new Map(item.fields.map((field) => [field.name.value, field.value]));
+      for (const key of fields.keys()) {
+        if (key !== "column" && key !== "bucket") {
+          fail2(`unknown groupBy field '${key}' on '${table}'`, "invalid-group-by", ["column", "bucket"]);
+        }
+      }
+      const columnNode = fields.get("column");
+      if (!columnNode) fail2(`groupBy entries on '${table}' need a 'column'`, "invalid-group-by");
+      if (columnNode.kind !== graphql.Kind.ENUM) {
+        fail2(`groupBy column on '${table}' must be a group-by column enum value`, "invalid-group-by");
+      }
+      const column = this.column(table, columnNode.value);
+      if (!column) {
+        fail2(`unknown groupBy column '${columnNode.value}' on '${table}'`, "unknown-column", this.meta(table).columns.map((c) => c.name));
+      }
+      if (column.type === "jsonb") {
+        fail2(`groupBy column '${table}.${columnNode.value}' is jsonb and cannot be a group key`, "invalid-group-by");
+      }
+      const bucketNode = fields.get("bucket");
+      let bucket;
+      if (bucketNode) {
+        if (bucketNode.kind !== graphql.Kind.ENUM) {
+          fail2(`groupBy bucket on '${table}.${columnNode.value}' must be a DateBucket enum value`, "invalid-group-by", Object.keys(DATE_BUCKET_BY_ENUM));
+        }
+        bucket = DATE_BUCKET_BY_ENUM[bucketNode.value];
+        if (!bucket) {
+          fail2(`unknown DateBucket '${bucketNode.value}'`, "invalid-group-by", Object.keys(DATE_BUCKET_BY_ENUM));
+        }
+        if (typeof column.type !== "string" || !BUCKETABLE_TYPES.has(column.type)) {
+          fail2(
+            `groupBy bucket is only valid on date/timestamptz columns \u2014 '${table}.${columnNode.value}' is ${typeof column.type === "string" ? column.type : "an enum"}`,
+            "invalid-group-by"
+          );
+        }
+      }
+      if (seen.has(columnNode.value)) {
+        fail2(`duplicate groupBy column '${columnNode.value}' on '${table}'`, "invalid-group-by");
+      }
+      seen.add(columnNode.value);
+      return bucket ? { column: columnNode.value, bucket } : { column: columnNode.value };
+    });
+  }
+  /** Like lowerLimit, but bounded by MAX_GROUPS and defaulting to it. */
+  lowerGroupLimit(node) {
+    const base = { default: MAX_GROUPS, max: MAX_GROUPS };
+    if (!node) return base;
+    if (node.kind === graphql.Kind.VARIABLE) return { ...base, variable: node.name.value };
+    if (node.kind === graphql.Kind.INT) {
+      const value = Number(node.value);
+      if (value < 1) fail2("limit must be a positive integer", "invalid-limit");
+      return { ...base, value: Math.min(value, MAX_GROUPS) };
+    }
+    fail2("limit must be an integer literal or a variable", "invalid-limit");
+  }
   /** byPk-style pk arguments: one argument per primary-key column, exactly. */
   lowerPkArgs(node, table) {
     const meta = this.meta(table);
@@ -2459,7 +3815,7 @@ var OperationLowerer = class {
     assertKnownArgs(node, meta.primaryKey);
     return meta.primaryKey.map((column) => {
       const arg = args.get(column);
-      if (!arg) fail(`'${node.name.value}' is missing primary-key argument '${column}'`, "missing-pk-argument", meta.primaryKey);
+      if (!arg) fail2(`'${node.name.value}' is missing primary-key argument '${column}'`, "missing-pk-argument", meta.primaryKey);
       return { column, value: this.lowerValue(arg.value) };
     });
   }
@@ -2470,19 +3826,22 @@ var OperationLowerer = class {
     const name = node.name.value;
     const alias = node.alias?.value ?? name;
     const rootInfo = this.ctx.mutationRoots.get(name);
-    if (!rootInfo) fail(`unknown mutation root '${name}'`, "unknown-root", [...this.ctx.mutationRoots.keys()]);
+    if (!rootInfo) fail2(`unknown mutation root '${name}'`, "unknown-root", [...this.ctx.mutationRoots.keys()]);
     if (rootInfo.op === "cowOverride" || rootInfo.op === "cowRevert") {
       return this.lowerCowRoot(node, rootInfo);
     }
+    if (rootInfo.op === "resolvedWrite") {
+      return this.lowerResolvedRoot(node, rootInfo);
+    }
     const { op, table } = rootInfo;
     const args = argsByName(node);
-    if (!node.selectionSet) fail(`'${name}' needs a selection set`, "invalid-selection");
+    if (!node.selectionSet) fail2(`'${name}' needs a selection set`, "invalid-selection");
     const base = { kind: "mutation", op, alias, table, pinnedColumns: [], affectedRows: false };
     switch (op) {
       case "insert": {
         assertKnownArgs(node, ["objects", "onConflict"]);
         const objects = args.get("objects");
-        if (!objects) fail(`'${name}' needs objects:`, "missing-argument");
+        if (!objects) fail2(`'${name}' needs objects:`, "missing-argument");
         const response = this.lowerMutationResponse(node.selectionSet, table);
         return {
           ...base,
@@ -2494,7 +3853,7 @@ var OperationLowerer = class {
       case "insertOne": {
         assertKnownArgs(node, ["object", "onConflict"]);
         const object = args.get("object");
-        if (!object) fail(`'${name}' needs object:`, "missing-argument");
+        if (!object) fail2(`'${name}' needs object:`, "missing-argument");
         return {
           ...base,
           objects: this.lowerInsertObjects(object.value, table, { list: false }),
@@ -2505,7 +3864,7 @@ var OperationLowerer = class {
       case "update": {
         assertKnownArgs(node, ["where", "_set", "_append", "_inc"]);
         const where = args.get("where");
-        if (!where) fail(`'${name}' needs where: (bulk updates without a filter are not allowed)`, "missing-argument");
+        if (!where) fail2(`'${name}' needs where: (bulk updates without a filter are not allowed)`, "missing-argument");
         return {
           ...base,
           ...this.lowerMutationResponse(node.selectionSet, table),
@@ -2516,7 +3875,7 @@ var OperationLowerer = class {
       case "updateByPk": {
         assertKnownArgs(node, ["pkColumns", "_set", "_append", "_inc"]);
         const pkColumns = args.get("pkColumns");
-        if (!pkColumns) fail(`'${name}' needs pkColumns:`, "missing-argument");
+        if (!pkColumns) fail2(`'${name}' needs pkColumns:`, "missing-argument");
         return {
           ...base,
           pk: this.lowerPkColumnsArg(pkColumns.value, table),
@@ -2527,7 +3886,7 @@ var OperationLowerer = class {
       case "delete": {
         assertKnownArgs(node, ["where"]);
         const where = args.get("where");
-        if (!where) fail(`'${name}' needs where: (bulk deletes without a filter are not allowed)`, "missing-argument");
+        if (!where) fail2(`'${name}' needs where: (bulk deletes without a filter are not allowed)`, "missing-argument");
         return {
           ...base,
           ...this.lowerMutationResponse(node.selectionSet, table),
@@ -2554,11 +3913,11 @@ var OperationLowerer = class {
     const name = node.name.value;
     const alias = node.alias?.value ?? name;
     const { table } = rootInfo;
-    if (!node.selectionSet) fail(`'${name}' needs a selection set`, "invalid-selection");
+    if (!node.selectionSet) fail2(`'${name}' needs a selection set`, "invalid-selection");
     const meta = this.meta(table);
     const args = argsByName(node);
     const pkArg = args.get(rootInfo.pk);
-    if (!pkArg) fail(`'${name}' is missing primary-key argument '${rootInfo.pk}'`, "missing-pk-argument", [rootInfo.pk]);
+    if (!pkArg) fail2(`'${name}' is missing primary-key argument '${rootInfo.pk}'`, "missing-pk-argument", [rootInfo.pk]);
     const pk = [{ column: rootInfo.pk, value: this.lowerValue(pkArg.value) }];
     const base = {
       kind: "mutation",
@@ -2579,24 +3938,78 @@ var OperationLowerer = class {
     const entries = rootInfo.set.map((column) => {
       const arg = args.get(column);
       if (!arg) {
-        fail(
+        fail2(
           `'${name}' is missing set argument '${column}' \u2014 a cow override writes every declared set column (pass null to clear a nullable one)`,
           "missing-argument",
           [...rootInfo.set]
         );
       }
       if (!meta.settable.includes(column)) {
-        fail(`column '${table}.${column}' is not updatable (pinned by the write policy or deprecated)`, "column-not-settable", meta.settable);
+        fail2(`column '${table}.${column}' is not updatable (pinned by the write policy or deprecated)`, "column-not-settable", meta.settable);
       }
       return { column, value: this.lowerValue(arg.value) };
     });
     return { ...base, set: { entries }, cowCopyColumns: [...rootInfo.copyColumns] };
   }
+  /**
+   * Resolved-table roots: insertOne(object), updateByPk(pkColumns, _set),
+   * deleteByPk(pk…), revertByPk(pkColumns, columns). The executor writes only
+   * the touched cells into the manual source; `returning` reads the view.
+   */
+  lowerResolvedRoot(node, rootInfo) {
+    const name = node.name.value;
+    const alias = node.alias?.value ?? name;
+    const { table, action } = rootInfo;
+    if (!node.selectionSet) fail2(`'${name}' needs a selection set`, "invalid-selection");
+    const args = argsByName(node);
+    const base = {
+      kind: "mutation",
+      op: "resolvedWrite",
+      resolvedAction: action,
+      alias,
+      table,
+      pinnedColumns: [],
+      affectedRows: false,
+      returning: this.lowerSelection(node.selectionSet, table)
+    };
+    switch (action) {
+      case "insert": {
+        assertKnownArgs(node, ["object"]);
+        const object = args.get("object");
+        if (!object) fail2(`'${name}' needs object:`, "missing-argument");
+        return { ...base, objects: this.lowerInsertObjects(object.value, table, { list: false }) };
+      }
+      case "update": {
+        assertKnownArgs(node, ["pkColumns", "_set"]);
+        const pkColumns = args.get("pkColumns");
+        if (!pkColumns || !args.get("_set")) fail2(`'${name}' needs pkColumns: and _set:`, "missing-argument");
+        return { ...base, pk: this.lowerPkColumnsArg(pkColumns.value, table), ...this.lowerWriteValues(args, table) };
+      }
+      case "delete":
+        return { ...base, pk: this.lowerPkArgs(node, table) };
+      case "revert": {
+        assertKnownArgs(node, ["pkColumns", "columns"]);
+        const pkColumns = args.get("pkColumns");
+        const columns = args.get("columns");
+        if (!pkColumns || !columns) fail2(`'${name}' needs pkColumns: and columns:`, "missing-argument");
+        const items = columns.value.kind === graphql.Kind.LIST ? columns.value.values : [columns.value];
+        const meta = this.meta(table);
+        const revertColumns = items.map((item) => {
+          if (item.kind !== graphql.Kind.ENUM || !meta.settable.includes(item.value)) {
+            fail2(`'${name}' columns: must list update-column enum values written in the document`, "invalid-revert-columns", meta.settable);
+          }
+          return item.value;
+        });
+        if (revertColumns.length === 0) fail2(`'${name}' columns: must name at least one column`, "invalid-revert-columns");
+        return { ...base, pk: this.lowerPkColumnsArg(pkColumns.value, table), revertColumns: [...new Set(revertColumns)] };
+      }
+    }
+  }
   lowerMutationResponse(selectionSet, table) {
     let affectedRows = false;
     let returning = null;
     for (const node of selectionSet.selections) {
-      if (node.kind !== graphql.Kind.FIELD) fail("fragments must be flattened before lowering", "internal");
+      if (node.kind !== graphql.Kind.FIELD) fail2("fragments must be flattened before lowering", "internal");
       const name = node.name.value;
       if (name === "__typename") continue;
       if (name === "affectedRows") {
@@ -2604,34 +4017,34 @@ var OperationLowerer = class {
         continue;
       }
       if (name === "returning") {
-        if (!node.selectionSet) fail("'returning' needs a selection set", "invalid-selection");
+        if (!node.selectionSet) fail2("'returning' needs a selection set", "invalid-selection");
         returning = this.lowerSelection(node.selectionSet, table);
         continue;
       }
-      fail(`unknown mutation-response field '${name}'`, "invalid-selection", ["affectedRows", "returning"]);
+      fail2(`unknown mutation-response field '${name}'`, "invalid-selection", ["affectedRows", "returning"]);
     }
     return { affectedRows, returning };
   }
   lowerInsertObjects(node, table, { list }) {
     if (node.kind === graphql.Kind.VARIABLE) return { slot: this.slot(node.name.value, "insertInput", table) };
     if (list) {
-      if (node.kind !== graphql.Kind.LIST) fail(`objects: must be a list literal or a variable`, "invalid-insert");
+      if (node.kind !== graphql.Kind.LIST) fail2(`objects: must be a list literal or a variable`, "invalid-insert");
       return { rows: node.values.map((item) => this.lowerInsertRow(item, table)) };
     }
     return { rows: [this.lowerInsertRow(node, table)] };
   }
   lowerInsertRow(node, table) {
-    if (node.kind !== graphql.Kind.OBJECT) fail(`insert rows on '${table}' must be objects`, "invalid-insert");
+    if (node.kind !== graphql.Kind.OBJECT) fail2(`insert rows on '${table}' must be objects`, "invalid-insert");
     const meta = this.meta(table);
     return node.fields.map((field) => {
       const key = field.name.value;
       if (this.link(table, key)) {
-        fail(`nested inserts are not supported in v2.0 \u2014 '${key}' is a link on '${table}'`, "nested-insert-unsupported");
+        fail2(`nested inserts are not supported in v2.0 \u2014 '${key}' is a link on '${table}'`, "nested-insert-unsupported");
       }
       if (!meta.insertable.includes(key)) {
         const column = this.column(table, key);
-        if (column) fail(`column '${table}.${key}' is not insertable (pinned by the write policy or deprecated)`, "column-not-insertable", meta.insertable);
-        fail(`unknown column '${key}' in an insert on '${table}'`, "unknown-column", meta.insertable);
+        if (column) fail2(`column '${table}.${key}' is not insertable (pinned by the write policy or deprecated)`, "column-not-insertable", meta.insertable);
+        fail2(`unknown column '${key}' in an insert on '${table}'`, "unknown-column", meta.insertable);
       }
       return { column: key, value: this.lowerValue(field.value) };
     });
@@ -2640,32 +4053,32 @@ var OperationLowerer = class {
     if (!arg) return {};
     const node = arg.value;
     if (node.kind === graphql.Kind.VARIABLE) return { onConflict: { slot: this.slot(node.name.value, "onConflict", table) } };
-    if (node.kind !== graphql.Kind.OBJECT) fail("onConflict: must be an object literal or a variable", "invalid-on-conflict");
+    if (node.kind !== graphql.Kind.OBJECT) fail2("onConflict: must be an object literal or a variable", "invalid-on-conflict");
     const meta = this.meta(table);
     let constraint;
     const updateColumns = [];
     for (const field of node.fields) {
       if (field.name.value === "constraint") {
-        if (field.value.kind !== graphql.Kind.ENUM) fail("onConflict.constraint must be a constraint enum value", "invalid-on-conflict");
+        if (field.value.kind !== graphql.Kind.ENUM) fail2("onConflict.constraint must be a constraint enum value", "invalid-on-conflict");
         constraint = field.value.value;
         continue;
       }
       if (field.name.value === "updateColumns") {
         const items = field.value.kind === graphql.Kind.LIST ? field.value.values : [field.value];
         for (const item of items) {
-          if (item.kind !== graphql.Kind.ENUM) fail("onConflict.updateColumns must be update-column enum values", "invalid-on-conflict");
+          if (item.kind !== graphql.Kind.ENUM) fail2("onConflict.updateColumns must be update-column enum values", "invalid-on-conflict");
           if (!meta.settable.includes(item.value)) {
-            fail(`onConflict.updateColumns: '${item.value}' is not updatable on '${table}'`, "invalid-on-conflict", meta.settable);
+            fail2(`onConflict.updateColumns: '${item.value}' is not updatable on '${table}'`, "invalid-on-conflict", meta.settable);
           }
           updateColumns.push(item.value);
         }
         continue;
       }
-      fail(`unknown onConflict key '${field.name.value}'`, "invalid-on-conflict", ["constraint", "updateColumns"]);
+      fail2(`unknown onConflict key '${field.name.value}'`, "invalid-on-conflict", ["constraint", "updateColumns"]);
     }
-    if (!constraint) fail("onConflict needs a constraint", "invalid-on-conflict", meta.constraints.map((c) => c.name));
+    if (!constraint) fail2("onConflict needs a constraint", "invalid-on-conflict", meta.constraints.map((c) => c.name));
     if (!meta.constraints.some((c) => c.name === constraint)) {
-      fail(`unknown constraint '${constraint}' on '${table}'`, "invalid-on-conflict", meta.constraints.map((c) => c.name));
+      fail2(`unknown constraint '${constraint}' on '${table}'`, "invalid-on-conflict", meta.constraints.map((c) => c.name));
     }
     return { onConflict: { constraint, updateColumns } };
   }
@@ -2683,36 +4096,36 @@ var OperationLowerer = class {
     const inc = args.get("_inc");
     if (inc) {
       if (inc.value.kind === graphql.Kind.VARIABLE) {
-        fail("_inc has no dynamic input type \u2014 inline the columns with variable leaf values", "invalid-inc");
+        fail2("_inc has no dynamic input type \u2014 inline the columns with variable leaf values", "invalid-inc");
       }
       const numeric = meta.columns.filter((c) => typeof c.type === "string" && NUMERIC_TYPES.has(c.type) && meta.settable.includes(c.name)).map((c) => c.name);
       result.inc = { entries: this.lowerColumnEntries(inc.value, table, numeric, "_inc") };
     }
     if (!result.set && !result.append && !result.inc) {
-      fail(`an update on '${table}' needs at least one of _set/_append/_inc`, "missing-argument");
+      fail2(`an update on '${table}' needs at least one of _set/_append/_inc`, "missing-argument");
     }
     return result;
   }
   lowerColumnEntries(node, table, whitelist, argName) {
-    if (node.kind !== graphql.Kind.OBJECT) fail(`${argName} on '${table}' must be an object literal or a variable`, "invalid-write-values");
+    if (node.kind !== graphql.Kind.OBJECT) fail2(`${argName} on '${table}' must be an object literal or a variable`, "invalid-write-values");
     return node.fields.map((field) => {
       const key = field.name.value;
       if (!whitelist.includes(key)) {
-        fail(`${argName}: column '${key}' is not allowed on '${table}'`, "column-not-settable", [...whitelist]);
+        fail2(`${argName}: column '${key}' is not allowed on '${table}'`, "column-not-settable", [...whitelist]);
       }
       return { column: key, value: this.lowerValue(field.value) };
     });
   }
   lowerPkColumnsArg(node, table) {
-    if (node.kind !== graphql.Kind.OBJECT) fail(`pkColumns on '${table}' must be an object literal`, "invalid-pk-columns");
+    if (node.kind !== graphql.Kind.OBJECT) fail2(`pkColumns on '${table}' must be an object literal`, "invalid-pk-columns");
     const meta = this.meta(table);
     const provided = new Map(node.fields.map((field) => [field.name.value, field.value]));
     for (const key of provided.keys()) {
-      if (!meta.primaryKey.includes(key)) fail(`pkColumns: '${key}' is not a primary-key column of '${table}'`, "invalid-pk-columns", meta.primaryKey);
+      if (!meta.primaryKey.includes(key)) fail2(`pkColumns: '${key}' is not a primary-key column of '${table}'`, "invalid-pk-columns", meta.primaryKey);
     }
     return meta.primaryKey.map((column) => {
       const value = provided.get(column);
-      if (!value) fail(`pkColumns is missing '${column}'`, "invalid-pk-columns", meta.primaryKey);
+      if (!value) fail2(`pkColumns is missing '${column}'`, "invalid-pk-columns", meta.primaryKey);
       return { column, value: this.lowerValue(value) };
     });
   }
@@ -2721,6 +4134,19 @@ function lowerOperation({ restricted, ctx }) {
   const lowerer = new OperationLowerer(ctx, restricted);
   return lowerer.lowerRoots(restricted.definition, restricted.kind);
 }
+function isCellColumn(meta, name) {
+  if (!meta.cells) return false;
+  return Object.values(meta.cells).some((parts) => Object.values(parts).includes(name));
+}
+function fieldNodes(selectionSet) {
+  const out = [];
+  for (const node of selectionSet.selections) {
+    if (node.kind !== graphql.Kind.FIELD) fail2("fragments must be flattened before lowering", "internal");
+    if (node.directives && node.directives.length > 0) fail2(`@include/@skip are supported on root fields only ('${node.name.value}' is nested)`, "nested-directive");
+    if (node.name.value !== "__typename") out.push(node);
+  }
+  return out;
+}
 function parseSdl(sdl) {
   return graphql.buildSchema(sdl);
 }
@@ -2961,7 +4387,7 @@ function compileNamespace({ canonical, sdl, documents }) {
         const loweredRoots = lowerOperation({ restricted: { ...restricted, definition: flattened }, ctx });
         const { roots, tableSet } = injectPolicies({ roots: loweredRoots, ctx });
         operations[restricted.name] = {
-          irVersion: IR_VERSION,
+          irVersion: roots.some((root) => root.kind === "mutation" && root.assertAffectedRows !== void 0) ? IR_VERSION : LEGACY_IR_VERSION,
           name: restricted.name,
           opHash: computeOpHash({ definition: flattened, schemaHash }),
           kind: restricted.kind,
@@ -2988,7 +4414,7 @@ function compileNamespace({ canonical, sdl, documents }) {
   }
   if (diagnostics.some((d) => d.severity === "error")) return { ok: false, diagnostics };
   const artifact = {
-    irVersion: IR_VERSION,
+    irVersion: requiredArtifactIrVersion(Object.values(operations)),
     namespace: ctx.namespace,
     schemaHash,
     opsHash: computeOpsHash(Object.values(operations).map((op) => op.opHash)),