hecks 3.13.0 → 4.0.0

data/rust/host/src/mint.rs

@@ -1,17 +1,17 @@
 //! Mints Postgres eras, porting `lib/hecks/adapters/driven/postgres_era/
 //! lineage/*.rb`'s SQL verbatim; this crate has no bluebook parser (ADR 0012).
 
-use anyhow::Context;
 use crate::journal::quote_ident;
 use crate::reference_transform;
 use crate::reference_validate;
 use crate::storage_shape;
+use anyhow::Context;
 use serde_json::Value;
 use sha2::{Digest, Sha256};
 use tokio_postgres::GenericClient;
 
 fn journal_table(domain: &str) -> String {
-    format!("hecks_journal_{}", storage_shape_snake(domain))
+    format!("hecks_journal_{}", crate::journal::snake(domain))
 }
 
 fn sequence(domain: &str) -> String {
@@ -36,12 +36,6 @@ fn head_view(domain: &str, storage_name: &str) -> String {
     crate::journal::qualified_name(domain, &format!("{storage_name}_head"))
 }
 
-// `Naming.snake` — same pure syntactic transform `crate::journal::snake`
-// already ports; reused directly rather than duplicated a second time.
-fn storage_shape_snake(name: &str) -> String {
-    crate::journal::snake(name)
-}
-
 fn text_literal(text: &str) -> String {
     format!("'{}'", text.replace('\'', "''"))
 }
@@ -59,7 +53,6 @@ pub struct Aggregate {
 pub struct EdgeAggregate {
     pub name: String,
     pub was: Option<String>,
-    pub has_compute_or_rekey: bool,
     pub compiled_state_expression: String,
     pub compiled_id_expression: Option<String>,
 }
@@ -87,24 +80,37 @@ pub fn parse_edges(ir: &Value, domain: &str) -> Vec<Edge> {
             list.iter()
                 .filter(|edge| edge.get("domain").and_then(Value::as_str) == Some(domain))
                 .map(|edge| Edge {
-                    from: edge.get("from").and_then(Value::as_str).unwrap_or_default().to_string(),
-                    to: edge.get("to").and_then(Value::as_str).unwrap_or_default().to_string(),
+                    from: edge
+                        .get("from")
+                        .and_then(Value::as_str)
+                        .unwrap_or_default()
+                        .to_string(),
+                    to: edge
+                        .get("to")
+                        .and_then(Value::as_str)
+                        .unwrap_or_default()
+                        .to_string(),
                     aggregates: edge
                         .get("aggregates")
                         .and_then(Value::as_array)
                         .map(|aggs| {
                             aggs.iter()
                                 .map(|agg| EdgeAggregate {
-                                    name: agg.get("name").and_then(Value::as_str).unwrap_or_default().to_string(),
+                                    name: agg
+                                        .get("name")
+                                        .and_then(Value::as_str)
+                                        .unwrap_or_default()
+                                        .to_string(),
                                     was: agg.get("was").and_then(Value::as_str).map(str::to_string),
-                                    has_compute_or_rekey: !agg.get("computes").and_then(Value::as_array).map(Vec::is_empty).unwrap_or(true)
-                                        || !agg.get("rekeys").and_then(Value::as_array).map(Vec::is_empty).unwrap_or(true),
                                     compiled_state_expression: agg
                                         .get("compiled_state_expression")
                                         .and_then(Value::as_str)
                                         .unwrap_or("state")
                                         .to_string(),
-                                    compiled_id_expression: agg.get("compiled_id_expression").and_then(Value::as_str).map(str::to_string),
+                                    compiled_id_expression: agg
+                                        .get("compiled_id_expression")
+                                        .and_then(Value::as_str)
+                                        .map(str::to_string),
                                 })
                                 .collect()
                         })
@@ -146,7 +152,11 @@ pub enum BootDecision {
     HoldFirst,
     /// The latest held era differs from this binary's shape — walk the
     /// edge chain from it and mint the next ordinal.
-    Mint { ordinal: i32, from_ordinal: i32, from_label: String },
+    Mint {
+        ordinal: i32,
+        from_ordinal: i32,
+        from_label: String,
+    },
     /// The latest held era has no label yet — this crate has no parser to
     /// name it, so it refuses rather than guess whether it matches.
     LatestUnnamed { ordinal: i32 },
@@ -154,33 +164,39 @@ pub enum BootDecision {
 
 impl BootDecision {
     /// The outcome's name, as the boot log reports it.
-    pub fn name(&self) -> &'static str {
+    pub const fn name(&self) -> &'static str {
         match self {
-            BootDecision::UseExisting { .. } => "use_existing",
-            BootDecision::HoldFirst => "hold_first",
-            BootDecision::Mint { .. } => "mint",
-            BootDecision::LatestUnnamed { .. } => "latest_unnamed",
+            Self::UseExisting { .. } => "use_existing",
+            Self::HoldFirst => "hold_first",
+            Self::Mint { .. } => "mint",
+            Self::LatestUnnamed { .. } => "latest_unnamed",
         }
     }
 }
 
 /// `held` must already be in ordinal order (as `journal::held_eras` returns it).
 pub fn decide_boot_action(held: &[crate::journal::HeldEra], my_label: &str) -> BootDecision {
-    if let Some(matching) = held.iter().find(|held_era| held_era.label.as_deref() == Some(my_label)) {
-        return BootDecision::UseExisting { ordinal: matching.ordinal };
+    if let Some(matching) = held
+        .iter()
+        .find(|held_era| held_era.label.as_deref() == Some(my_label))
+    {
+        return BootDecision::UseExisting {
+            ordinal: matching.ordinal,
+        };
     }
-    if held.is_empty() {
+    let Some(latest) = held.last() else {
         return BootDecision::HoldFirst;
-    }
-    let latest = held.last().expect("checked non-empty above");
-    match &latest.label {
-        None => BootDecision::LatestUnnamed { ordinal: latest.ordinal },
-        Some(label) => BootDecision::Mint {
+    };
+    latest.label.as_ref().map_or(
+        BootDecision::LatestUnnamed {
+            ordinal: latest.ordinal,
+        },
+        |label| BootDecision::Mint {
             ordinal: latest.ordinal + 1,
             from_ordinal: latest.ordinal,
             from_label: label.clone(),
         },
-    }
+    )
 }
 
 async fn provisioner<C: GenericClient>(client: &C, journal: &str) -> anyhow::Result<bool> {
@@ -190,13 +206,14 @@ async fn provisioner<C: GenericClient>(client: &C, journal: &str) -> anyhow::Res
             &[&journal],
         )
         .await?;
-    Ok(match row {
-        None => true,
-        Some(row) => row.get::<_, bool>("owned"),
-    })
+    Ok(row.is_none_or(|row| row.get::<_, bool>("owned")))
 }
 
-async fn partition_attached<C: GenericClient>(client: &C, partition_name: &str, journal: &str) -> anyhow::Result<bool> {
+async fn partition_attached<C: GenericClient>(
+    client: &C,
+    partition_name: &str,
+    journal: &str,
+) -> anyhow::Result<bool> {
     let row = client
         .query_opt(
             "SELECT 1 FROM pg_inherits i \
@@ -210,24 +227,36 @@ async fn partition_attached<C: GenericClient>(client: &C, partition_name: &str,
     Ok(row.is_some())
 }
 
-async fn ensure_partition<C: GenericClient>(client: &C, domain: &str, era: i32) -> anyhow::Result<()> {
+async fn ensure_partition<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    era: i32,
+) -> anyhow::Result<()> {
     let journal = journal_table(domain);
     let part = partition(domain, era);
     if partition_attached(client, &part, &journal).await? {
         return Ok(());
     }
     client
-        .batch_execute(&format!("CREATE TABLE IF NOT EXISTS {} (LIKE {} INCLUDING DEFAULTS)", quote_ident(&part), quote_ident(&journal)))
+        .batch_execute(&format!(
+            "CREATE TABLE IF NOT EXISTS {} (LIKE {} INCLUDING DEFAULTS)",
+            quote_ident(&part),
+            quote_ident(&journal)
+        ))
         .await?;
     client
-        .batch_execute(&format!("ALTER TABLE {} ATTACH PARTITION {} FOR VALUES IN ({era})", quote_ident(&journal), quote_ident(&part)))
+        .batch_execute(&format!(
+            "ALTER TABLE {} ATTACH PARTITION {} FOR VALUES IN ({era})",
+            quote_ident(&journal),
+            quote_ident(&part)
+        ))
         .await?;
     Ok(())
 }
 
 async fn install_transforms<C: GenericClient>(client: &C) -> anyhow::Result<()> {
     const FUNCTIONS: &[&str] = &[
-        r#"CREATE OR REPLACE FUNCTION hecks_tr_extract(state jsonb, path text[], OUT remaining jsonb, OUT value jsonb, OUT present boolean)
+        r"CREATE OR REPLACE FUNCTION hecks_tr_extract(state jsonb, path text[], OUT remaining jsonb, OUT value jsonb, OUT present boolean)
 LANGUAGE plpgsql IMMUTABLE AS $fn$
 DECLARE parent jsonb; leaf text;
 BEGIN
@@ -253,8 +282,8 @@ BEGIN
       remaining := jsonb_set(state, path[1:array_upper(path, 1) - 1], parent);
     END IF;
   END IF;
-END $fn$"#,
-        r#"CREATE OR REPLACE FUNCTION hecks_tr_insert(state jsonb, path text[], value jsonb, rule_label text) RETURNS jsonb
+END $fn$",
+        r"CREATE OR REPLACE FUNCTION hecks_tr_insert(state jsonb, path text[], value jsonb, rule_label text) RETURNS jsonb
 LANGUAGE plpgsql IMMUTABLE AS $fn$
 BEGIN
   IF array_length(path, 1) = 1 THEN
@@ -268,22 +297,22 @@ BEGIN
     state := state || jsonb_build_object(path[1], '{}'::jsonb);
   END IF;
   RETURN jsonb_set(state, path, value);
-END $fn$"#,
-        r#"CREATE OR REPLACE FUNCTION hecks_tr_rename(state jsonb, old_name text, new_name text) RETURNS jsonb
+END $fn$",
+        r"CREATE OR REPLACE FUNCTION hecks_tr_rename(state jsonb, old_name text, new_name text) RETURNS jsonb
 LANGUAGE sql IMMUTABLE AS $fn$
   SELECT CASE WHEN state ? old_name
     THEN (state - old_name) || jsonb_build_object(new_name, state -> old_name)
     ELSE state END
-$fn$"#,
-        r#"CREATE OR REPLACE FUNCTION hecks_tr_move(state jsonb, from_path text[], to_path text[], rule_label text) RETURNS jsonb
+$fn$",
+        r"CREATE OR REPLACE FUNCTION hecks_tr_move(state jsonb, from_path text[], to_path text[], rule_label text) RETURNS jsonb
 LANGUAGE plpgsql IMMUTABLE AS $fn$
 DECLARE extracted record;
 BEGIN
   SELECT * INTO extracted FROM hecks_tr_extract(state, from_path);
   IF NOT extracted.present THEN RETURN state; END IF;
   RETURN hecks_tr_insert(extracted.remaining, to_path, extracted.value, rule_label);
-END $fn$"#,
-        r#"CREATE OR REPLACE FUNCTION hecks_tr_convert(state jsonb, from_path text[], to_path text[], pairs jsonb, from_label text, rule_label text) RETURNS jsonb
+END $fn$",
+        r"CREATE OR REPLACE FUNCTION hecks_tr_convert(state jsonb, from_path text[], to_path text[], pairs jsonb, from_label text, rule_label text) RETURNS jsonb
 LANGUAGE plpgsql IMMUTABLE AS $fn$
 DECLARE extracted record; pair jsonb;
 BEGIN
@@ -296,14 +325,14 @@ BEGIN
   END LOOP;
   RAISE EXCEPTION 'cannot translate %: % has no mapping in its convert''s values: table. Add % => ... to cover it.',
     from_label, extracted.value, extracted.value;
-END $fn$"#,
-        r#"CREATE OR REPLACE FUNCTION hecks_tr_drop(state jsonb, path text[]) RETURNS jsonb
+END $fn$",
+        r"CREATE OR REPLACE FUNCTION hecks_tr_drop(state jsonb, path text[]) RETURNS jsonb
 LANGUAGE plpgsql IMMUTABLE AS $fn$
 DECLARE extracted record;
 BEGIN
   SELECT * INTO extracted FROM hecks_tr_extract(state, path);
   RETURN extracted.remaining;
-END $fn$"#,
+END $fn$",
     ];
     for sql in FUNCTIONS {
         client.batch_execute(sql).await?;
@@ -327,9 +356,15 @@ pub async fn ensure_base<C: GenericClient>(client: &C, domain: &str) -> anyhow::
              PRIMARY KEY (domain, ordinal))",
         )
         .await?;
-    client.batch_execute("ALTER TABLE hecks_eras ADD COLUMN IF NOT EXISTS held_digest text").await?;
-    client.batch_execute("ALTER TABLE hecks_eras ADD COLUMN IF NOT EXISTS held_projection jsonb").await?;
-    client.batch_execute("ALTER TABLE hecks_eras ADD COLUMN IF NOT EXISTS canon_form int").await?;
+    client
+        .batch_execute("ALTER TABLE hecks_eras ADD COLUMN IF NOT EXISTS held_digest text")
+        .await?;
+    client
+        .batch_execute("ALTER TABLE hecks_eras ADD COLUMN IF NOT EXISTS held_projection jsonb")
+        .await?;
+    client
+        .batch_execute("ALTER TABLE hecks_eras ADD COLUMN IF NOT EXISTS canon_form int")
+        .await?;
     client
         .batch_execute(
             "CREATE TABLE IF NOT EXISTS hecks_era_texts (\
@@ -340,18 +375,19 @@ pub async fn ensure_base<C: GenericClient>(client: &C, domain: &str) -> anyhow::
         .await?;
     client
         .batch_execute(
-            "CREATE TABLE IF NOT EXISTS hecks_approvals (\
-             domain text NOT NULL, from_label text NOT NULL, to_label text NOT NULL, \
-             edge_digest text NOT NULL, reviewed_ordinal bigint NOT NULL, \
-             approved_at timestamptz NOT NULL DEFAULT now())",
+            "CREATE TABLE IF NOT EXISTS hecks_backfill_progress (\
+             target text PRIMARY KEY, cursor text, completed boolean NOT NULL DEFAULT false, \
+             updated_at timestamptz NOT NULL DEFAULT now())",
         )
         .await?;
-    client.batch_execute("CREATE TABLE IF NOT EXISTS hecks_backfill_progress (\
-             target text PRIMARY KEY, cursor text, completed boolean NOT NULL DEFAULT false, \
-             updated_at timestamptz NOT NULL DEFAULT now())").await?;
 
     let seq = sequence(domain);
-    client.batch_execute(&format!("CREATE SEQUENCE IF NOT EXISTS {}", quote_ident(&seq))).await?;
+    client
+        .batch_execute(&format!(
+            "CREATE SEQUENCE IF NOT EXISTS {}",
+            quote_ident(&seq)
+        ))
+        .await?;
     client
         .batch_execute(&format!(
             "CREATE TABLE IF NOT EXISTS {} (\
@@ -373,10 +409,14 @@ pub async fn ensure_base<C: GenericClient>(client: &C, domain: &str) -> anyhow::
             &[&journal],
         )
         .await?
-        .map(|row| row.get::<_, bool>(0))
-        .unwrap_or(true);
+        .is_none_or(|row| row.get::<_, bool>(0));
     if relacl_null {
-        client.batch_execute(&format!("REVOKE UPDATE, DELETE ON {} FROM PUBLIC", quote_ident(&journal))).await?;
+        client
+            .batch_execute(&format!(
+                "REVOKE UPDATE, DELETE ON {} FROM PUBLIC",
+                quote_ident(&journal)
+            ))
+            .await?;
     }
 
     let current = client
@@ -385,12 +425,27 @@ pub async fn ensure_base<C: GenericClient>(client: &C, domain: &str) -> anyhow::
             &[&journal],
         )
         .await?;
-    let (rowsecurity, forcerowsecurity) = current.map(|row| (row.get::<_, bool>("relrowsecurity"), row.get::<_, bool>("relforcerowsecurity"))).unwrap_or((false, false));
+    let (rowsecurity, forcerowsecurity) = current.map_or((false, false), |row| {
+        (
+            row.get::<_, bool>("relrowsecurity"),
+            row.get::<_, bool>("relforcerowsecurity"),
+        )
+    });
     if !rowsecurity {
-        client.batch_execute(&format!("ALTER TABLE {} ENABLE ROW LEVEL SECURITY", quote_ident(&journal))).await?;
+        client
+            .batch_execute(&format!(
+                "ALTER TABLE {} ENABLE ROW LEVEL SECURITY",
+                quote_ident(&journal)
+            ))
+            .await?;
     }
     if !forcerowsecurity {
-        client.batch_execute(&format!("ALTER TABLE {} FORCE ROW LEVEL SECURITY", quote_ident(&journal))).await?;
+        client
+            .batch_execute(&format!(
+                "ALTER TABLE {} FORCE ROW LEVEL SECURITY",
+                quote_ident(&journal)
+            ))
+            .await?;
     }
 
     install_transforms(client).await?;
@@ -399,15 +454,27 @@ pub async fn ensure_base<C: GenericClient>(client: &C, domain: &str) -> anyhow::
 
 const CHUNK_SIZE: i64 = 5_000;
 
-async fn backfill_progress<C: GenericClient>(client: &C, target: &str) -> anyhow::Result<(Option<String>, bool)> {
-    let row = client.query_opt("SELECT cursor, completed FROM hecks_backfill_progress WHERE target = $1", &[&target]).await?;
-    Ok(match row {
-        None => (None, false),
-        Some(row) => (row.get("cursor"), row.get("completed")),
-    })
+async fn backfill_progress<C: GenericClient>(
+    client: &C,
+    target: &str,
+) -> anyhow::Result<(Option<String>, bool)> {
+    let row = client
+        .query_opt(
+            "SELECT cursor, completed FROM hecks_backfill_progress WHERE target = $1",
+            &[&target],
+        )
+        .await?;
+    Ok(row.map_or((None, false), |row| {
+        (row.get("cursor"), row.get("completed"))
+    }))
 }
 
-async fn upsert_backfill_progress<C: GenericClient>(client: &C, target: &str, cursor: Option<&str>, completed: bool) -> anyhow::Result<()> {
+async fn upsert_backfill_progress<C: GenericClient>(
+    client: &C,
+    target: &str,
+    cursor: Option<&str>,
+    completed: bool,
+) -> anyhow::Result<()> {
     client
         .execute(
             "INSERT INTO hecks_backfill_progress (target, cursor, completed, updated_at) VALUES ($1, $2, $3, now()) \
@@ -420,8 +487,16 @@ async fn upsert_backfill_progress<C: GenericClient>(client: &C, target: &str, cu
 
 /// One chunk of `head_snapshot`'s backfill, SAVEPOINT-nested since this
 /// always runs inside the mint transaction `mint_era` already opened.
-async fn run_backfill_chunk<C: GenericClient>(client: &C, domain: &str, storage_name: &str, era: i32, target: &str) -> anyhow::Result<bool> {
-    client.batch_execute("SAVEPOINT hecks_backfill_chunk").await?;
+async fn run_backfill_chunk<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    storage_name: &str,
+    era: i32,
+    target: &str,
+) -> anyhow::Result<bool> {
+    client
+        .batch_execute("SAVEPOINT hecks_backfill_chunk")
+        .await?;
     let result: anyhow::Result<bool> = async {
         client.execute("SELECT pg_advisory_xact_lock(hashtext('hecks_field_cache:' || $1))", &[&target]).await?;
         let (cursor, completed) = backfill_progress(client, target).await?;
@@ -463,20 +538,35 @@ async fn run_backfill_chunk<C: GenericClient>(client: &C, domain: &str, storage_
                 .await?;
         }
         let done = (rows.len() as i64) < CHUNK_SIZE;
-        let last_cursor: String = rows.last().unwrap().get("id");
-        upsert_backfill_progress(client, target, Some(&last_cursor), done).await?;
+        if let Some(last) = rows.last() {
+            let last_cursor: String = last.get("id");
+            upsert_backfill_progress(client, target, Some(&last_cursor), done).await?;
+        }
         Ok(done)
     }
     .await;
 
     match &result {
-        Ok(_) => client.batch_execute("RELEASE SAVEPOINT hecks_backfill_chunk").await?,
-        Err(_) => client.batch_execute("ROLLBACK TO SAVEPOINT hecks_backfill_chunk").await?,
+        Ok(_) => {
+            client
+                .batch_execute("RELEASE SAVEPOINT hecks_backfill_chunk")
+                .await?;
+        }
+        Err(_) => {
+            client
+                .batch_execute("ROLLBACK TO SAVEPOINT hecks_backfill_chunk")
+                .await?;
+        }
     }
     result
 }
 
-async fn backfill_head_snapshot<C: GenericClient>(client: &C, domain: &str, storage_name: &str, era: i32) -> anyhow::Result<()> {
+async fn backfill_head_snapshot<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    storage_name: &str,
+    era: i32,
+) -> anyhow::Result<()> {
     let target = head_snapshot(domain, storage_name, era);
     loop {
         if run_backfill_chunk(client, domain, storage_name, era, &target).await? {
@@ -501,36 +591,61 @@ pub async fn adopt_head_snapshots<C: GenericClient>(
     aggregates: &[Aggregate],
     era: i32,
 ) -> anyhow::Result<()> {
-    client.batch_execute("BEGIN").await.context("opening a transaction to adopt head snapshots")?;
+    client
+        .batch_execute("BEGIN")
+        .await
+        .context("opening a transaction to adopt head snapshots")?;
     let result: anyhow::Result<()> = async {
         for aggregate in aggregates {
-            create_head_snapshot(client, domain, &aggregate.storage_name, era).await.with_context(|| {
-                format!("provisioning {domain}'s {} head snapshot for era {era}", aggregate.storage_name)
-            })?;
+            create_head_snapshot(client, domain, &aggregate.storage_name, era)
+                .await
+                .with_context(|| {
+                    format!(
+                        "provisioning {domain}'s {} head snapshot for era {era}",
+                        aggregate.storage_name
+                    )
+                })?;
         }
         Ok(())
     }
     .await;
     match &result {
-        Ok(_) => client.batch_execute("COMMIT").await?,
+        Ok(()) => client.batch_execute("COMMIT").await?,
         Err(_) => client.batch_execute("ROLLBACK").await?,
     }
     result
 }
 
-async fn ensure_head_snapshot<C: GenericClient>(client: &C, domain: &str, storage_name: &str, era: i32) -> anyhow::Result<()> {
+async fn ensure_head_snapshot<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    storage_name: &str,
+    era: i32,
+) -> anyhow::Result<()> {
     create_head_snapshot(client, domain, storage_name, era).await?;
     backfill_head_snapshot(client, domain, storage_name, era).await
 }
 
 /// The create half, shared by minting and adopting. Columns match Ruby's
 /// own shape, so a Ruby runtime can still compile a head view over this table.
-async fn create_head_snapshot<C: GenericClient>(client: &C, domain: &str, storage_name: &str, era: i32) -> anyhow::Result<()> {
+async fn create_head_snapshot<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    storage_name: &str,
+    era: i32,
+) -> anyhow::Result<()> {
     let name = head_snapshot(domain, storage_name, era);
     if !table_exists(client, &name).await? {
-        client.batch_execute("SAVEPOINT hecks_head_snapshot").await?;
+        client
+            .batch_execute("SAVEPOINT hecks_head_snapshot")
+            .await?;
         let result: anyhow::Result<()> = async {
-            client.execute("SELECT pg_advisory_xact_lock(hashtext('hecks_head_snapshot:' || $1))", &[&name]).await?;
+            client
+                .execute(
+                    "SELECT pg_advisory_xact_lock(hashtext('hecks_head_snapshot:' || $1))",
+                    &[&name],
+                )
+                .await?;
             if !table_exists(client, &name).await? {
                 client
                     .batch_execute(&format!(
@@ -544,8 +659,16 @@ async fn create_head_snapshot<C: GenericClient>(client: &C, domain: &str, storag
         }
         .await;
         match &result {
-            Ok(_) => client.batch_execute("RELEASE SAVEPOINT hecks_head_snapshot").await?,
-            Err(_) => client.batch_execute("ROLLBACK TO SAVEPOINT hecks_head_snapshot").await?,
+            Ok(()) => {
+                client
+                    .batch_execute("RELEASE SAVEPOINT hecks_head_snapshot")
+                    .await?;
+            }
+            Err(_) => {
+                client
+                    .batch_execute("ROLLBACK TO SAVEPOINT hecks_head_snapshot")
+                    .await?;
+            }
         }
         result?;
     }
@@ -559,18 +682,30 @@ fn names_by_era(current_name: &str, edges: &[&Edge]) -> (Vec<String>, Vec<String
     current[edges.len()] = current_name.to_string();
     for index in (0..edges.len()).rev() {
         let declared = edges[index].for_aggregate(&current[index + 1]);
-        current[index] = declared.and_then(|d| d.was.clone()).unwrap_or_else(|| current[index + 1].clone());
+        current[index] = declared
+            .and_then(|d| d.was.clone())
+            .unwrap_or_else(|| current[index + 1].clone());
     }
-    let storage = current.iter().map(|name| storage_shape_snake(name)).collect();
+    let storage = current
+        .iter()
+        .map(|name| crate::journal::snake(name))
+        .collect();
     (current, storage)
 }
 
-fn ancestor_tail_sql(domain: &str, era: i32, storage_names: &[String], watermarks: &std::collections::HashMap<i32, Option<i64>>) -> String {
+fn ancestor_tail_sql(
+    domain: &str,
+    era: i32,
+    storage_names: &[String],
+    watermarks: &std::collections::HashMap<i32, Option<i64>>,
+) -> String {
     let journal = quote_ident(&journal_table(domain));
     (1..era)
         .map(|ancestor| {
             let cut = watermarks.get(&(ancestor + 1)).copied().flatten();
-            let cut_clause = cut.map(|c| format!(" AND ordinal <= {c}")).unwrap_or_default();
+            let cut_clause = cut
+                .map(|c| format!(" AND ordinal <= {c}"))
+                .unwrap_or_default();
             format!(
                 "SELECT ordinal, era, aggregate, aggregate_id, operation, state FROM {journal} \
                  WHERE era = {ancestor} AND aggregate = {}{cut_clause}",
@@ -590,7 +725,13 @@ fn latest_per_id(tail: &str) -> String {
 
 // Each edge CTE is `MATERIALIZED` — unfenced, Postgres re-inlines every edge's
 // expression at each read of `state`, and the plan grows exponentially with the chain.
-fn chain_sql(domain: &str, current_name: &str, era: i32, edges: &[&Edge], watermarks: &std::collections::HashMap<i32, Option<i64>>) -> String {
+fn chain_sql(
+    domain: &str,
+    current_name: &str,
+    era: i32,
+    edges: &[&Edge],
+    watermarks: &std::collections::HashMap<i32, Option<i64>>,
+) -> String {
     chain_sql_with(domain, current_name, era, edges, watermarks, true)
 }
 
@@ -602,7 +743,11 @@ fn chain_sql_with(
     watermarks: &std::collections::HashMap<i32, Option<i64>>,
     materialize_edges: bool,
 ) -> String {
-    let fence = if materialize_edges { "MATERIALIZED " } else { "" };
+    let fence = if materialize_edges {
+        "MATERIALIZED "
+    } else {
+        ""
+    };
     let (current_names, storage_names) = names_by_era(current_name, edges);
     let tail = latest_per_id(&ancestor_tail_sql(domain, era, &storage_names, watermarks));
 
@@ -611,15 +756,18 @@ fn chain_sql_with(
         .enumerate()
         .map(|(index, edge)| {
             let declared = edge.for_aggregate(&current_names[index + 1]);
-            let expression = declared.map(|d| d.compiled_state_expression.clone()).unwrap_or_else(|| "state".to_string());
+            let expression = declared.map_or_else(|| "state".to_string(), |d| d.compiled_state_expression.clone());
             let guard = format!("era <= {} AND operation = 'save'", index + 1);
-            let id_column = match declared.filter(|d| d.compiled_id_expression.is_some()) {
-                Some(d) => format!(
-                    "CASE WHEN {guard} THEN {} ELSE aggregate_id END AS aggregate_id",
-                    d.compiled_id_expression.as_deref().unwrap()
-                ),
-                None => "aggregate_id".to_string(),
-            };
+            let id_column = declared
+                .and_then(|d| d.compiled_id_expression.as_deref())
+                .map_or_else(
+                    || "aggregate_id".to_string(),
+                    |id_expression| {
+                        format!(
+                            "CASE WHEN {guard} THEN {id_expression} ELSE aggregate_id END AS aggregate_id"
+                        )
+                    },
+                );
             let from = if index == 0 { "tail".to_string() } else { format!("edge_{index}") };
             format!(
                 "edge_{} AS {fence}(SELECT ordinal, era, {id_column}, operation, CASE WHEN {guard} THEN {expression} ELSE state END AS state FROM {from})",
@@ -632,7 +780,10 @@ fn chain_sql_with(
 }
 
 /// Reduces a chain SQL to one row per id: the latest entry, only if it was a save.
-async fn latest_of<C: GenericClient>(client: &C, inner_sql: &str) -> anyhow::Result<std::collections::HashMap<String, Value>> {
+async fn latest_of<C: GenericClient>(
+    client: &C,
+    inner_sql: &str,
+) -> anyhow::Result<std::collections::HashMap<String, Value>> {
     let sql = format!(
         "SELECT aggregate_id, state FROM (\
            SELECT DISTINCT ON (aggregate_id) aggregate_id, operation, state \
@@ -640,7 +791,15 @@ async fn latest_of<C: GenericClient>(client: &C, inner_sql: &str) -> anyhow::Res
          ) latest WHERE operation = 'save'"
     );
     let rows = client.query(&sql, &[]).await?;
-    Ok(rows.into_iter().map(|row| (row.get::<_, String>("aggregate_id"), row.get::<_, Value>("state"))).collect())
+    Ok(rows
+        .into_iter()
+        .map(|row| {
+            (
+                row.get::<_, String>("aggregate_id"),
+                row.get::<_, Value>("state"),
+            )
+        })
+        .collect())
 }
 
 /// The translated tail at era `era`, latest per id, saves only — the audit's `after`.
@@ -652,7 +811,11 @@ async fn translated_latest<C: GenericClient>(
     edges: &[&Edge],
     watermarks: &std::collections::HashMap<i32, Option<i64>>,
 ) -> anyhow::Result<std::collections::HashMap<String, Value>> {
-    latest_of(client, &chain_sql(domain, current_name, era, edges, watermarks)).await
+    latest_of(
+        client,
+        &chain_sql(domain, current_name, era, edges, watermarks),
+    )
+    .await
 }
 
 /// The untranslated ancestor tail, latest per id — the "before" side of the
@@ -670,12 +833,21 @@ async fn ancestor_latest<C: GenericClient>(
     if tail.is_empty() {
         return Ok(std::collections::HashMap::new());
     }
-    latest_of(client, &format!("SELECT ordinal, era, aggregate_id, operation, state FROM ({tail}) tail_rows")).await
+    latest_of(
+        client,
+        &format!("SELECT ordinal, era, aggregate_id, operation, state FROM ({tail}) tail_rows"),
+    )
+    .await
 }
 
 /// One aggregate's raw rule JSON within one edge; `reference_transform::translate`
 /// needs the declarative rules themselves, not just the compiled SQL.
-fn raw_declared<'a>(raw_edges: &'a [Value], domain: &str, edge: &Edge, aggregate_name: &str) -> Option<&'a Value> {
+fn raw_declared<'a>(
+    raw_edges: &'a [Value],
+    domain: &str,
+    edge: &Edge,
+    aggregate_name: &str,
+) -> Option<&'a Value> {
     raw_edges
         .iter()
         .find(|candidate| {
@@ -684,7 +856,10 @@ fn raw_declared<'a>(raw_edges: &'a [Value], domain: &str, edge: &Edge, aggregate
                 && candidate.get("to").and_then(Value::as_str) == Some(edge.to.as_str())
         })
         .and_then(|raw_edge| raw_edge.get("aggregates").and_then(Value::as_array))
-        .and_then(|aggs| aggs.iter().find(|agg| agg.get("name").and_then(Value::as_str) == Some(aggregate_name)))
+        .and_then(|aggs| {
+            aggs.iter()
+                .find(|agg| agg.get("name").and_then(Value::as_str) == Some(aggregate_name))
+        })
 }
 
 /// Layer 2 of the mint audit for one aggregate: per-rule value preservation
@@ -693,6 +868,7 @@ fn raw_declared<'a>(raw_edges: &'a [Value], domain: &str, edge: &Edge, aggregate
 ///
 /// `declared` is the raw rule JSON for the edge being minted this boot only —
 /// earlier edges in a multi-hop drift were already minted and audited.
+#[allow(clippy::too_many_arguments)]
 async fn audit_layer_two<C: GenericClient>(
     client: &C,
     domain: &str,
@@ -705,14 +881,28 @@ async fn audit_layer_two<C: GenericClient>(
     violations: &mut Vec<String>,
 ) -> anyhow::Result<()> {
     let before = if edges.len() > 1 {
-        translated_latest(client, domain, &aggregate.name, ordinal, &edges[..edges.len() - 1], watermarks).await?
+        translated_latest(
+            client,
+            domain,
+            &aggregate.name,
+            ordinal,
+            &edges[..edges.len() - 1],
+            watermarks,
+        )
+        .await?
     } else {
         ancestor_latest(client, domain, &aggregate.name, ordinal, edges, watermarks).await?
     };
 
-    let last_edge = edges.last().expect("mint always audits at least one edge");
+    let Some(last_edge) = edges.last() else {
+        return Ok(()); // nothing to audit across zero edges
+    };
     let declared = raw_declared(raw_edges, domain, last_edge, &aggregate.name);
-    let rekeyed = declared.map(|d| !d.get("rekeys").and_then(Value::as_array).map(Vec::is_empty).unwrap_or(true)).unwrap_or(false);
+    let rekeyed = declared.is_some_and(|d| {
+        !d.get("rekeys")
+            .and_then(Value::as_array)
+            .is_none_or(Vec::is_empty)
+    });
 
     if rekeyed {
         if before.len() != after.len() {
@@ -725,8 +915,14 @@ async fn audit_layer_two<C: GenericClient>(
             ));
         }
     } else {
-        let mut lost: Vec<&String> = before.keys().filter(|id| !after.contains_key(*id)).collect();
-        let mut gained: Vec<&String> = after.keys().filter(|id| !before.contains_key(*id)).collect();
+        let mut lost: Vec<&String> = before
+            .keys()
+            .filter(|id| !after.contains_key(*id))
+            .collect();
+        let mut gained: Vec<&String> = after
+            .keys()
+            .filter(|id| !before.contains_key(*id))
+            .collect();
         if !lost.is_empty() || !gained.is_empty() {
             lost.sort();
             gained.sort();
@@ -737,31 +933,20 @@ async fn audit_layer_two<C: GenericClient>(
         }
     }
 
-    let Some(declared) = declared else { return Ok(()) };
+    let Some(declared) = declared else {
+        return Ok(());
+    };
     if rekeyed {
         return Ok(());
     }
 
-    let compute_tops: std::collections::HashSet<String> = declared
-        .get("computes")
-        .and_then(Value::as_array)
-        .map(|computes| {
-            computes
-                .iter()
-                .flat_map(|c| [c.get("from"), c.get("to")])
-                .flatten()
-                .filter_map(Value::as_str)
-                .map(|path| path.split('.').next().unwrap_or(path).to_string())
-                .collect()
-        })
-        .unwrap_or_default();
-
     for (id, state) in &before {
-        let Some(actual_after) = after.get(id) else { continue };
+        let Some(actual_after) = after.get(id) else {
+            continue;
+        };
         let expected = reference_transform::translate(declared, state)?;
-        let expected = strip_keys(&expected, &compute_tops);
-        let actual = strip_keys(actual_after, &compute_tops);
-        if expected != actual {
+        let actual = actual_after;
+        if &expected != actual {
             let mut diverged: Vec<String> = expected
                 .as_object()
                 .into_iter()
@@ -772,23 +957,22 @@ async fn audit_layer_two<C: GenericClient>(
                 .collect();
             diverged.sort();
             diverged.dedup();
-            violations.push(format!("{}#{id}: the translated state diverges from the reference transform at {}", aggregate.name, diverged.join(", ")));
+            violations.push(format!(
+                "{}#{id}: the translated state diverges from the reference transform at {}",
+                aggregate.name,
+                diverged.join(", ")
+            ));
         }
     }
     Ok(())
 }
 
-fn strip_keys(state: &Value, keys: &std::collections::HashSet<String>) -> Value {
-    match state {
-        Value::Object(map) => Value::Object(map.iter().filter(|(k, _)| !keys.contains(*k)).map(|(k, v)| (k.clone(), v.clone())).collect()),
-        other => other.clone(),
-    }
-}
-
 /// The whole mint-time audit, over every lineage-capable aggregate. Runs
 /// before anything is minted, so a refusal leaves no half-born era.
 ///
 /// `ir` is the whole `ir.json` value; Layer 1 looks up each aggregate's node from it.
+#[allow(clippy::implicit_hasher)] // reason: callers build the map with the default hasher; no caller needs another
+#[allow(clippy::too_many_arguments)]
 pub async fn audit_before_mint<C: GenericClient>(
     client: &C,
     domain: &str,
@@ -802,13 +986,21 @@ pub async fn audit_before_mint<C: GenericClient>(
     let ir_aggregates: std::collections::HashMap<&str, &Value> = ir
         .get("aggregates")
         .and_then(Value::as_array)
-        .map(|list| list.iter().filter_map(|agg| agg.get("name").and_then(Value::as_str).map(|n| (n, agg))).collect())
+        .map(|list| {
+            list.iter()
+                .filter_map(|agg| agg.get("name").and_then(Value::as_str).map(|n| (n, agg)))
+                .collect()
+        })
         .unwrap_or_default();
 
     let mut violations = Vec::new();
     for aggregate in aggregates {
-        let phase = crate::log::phase_with("audit_aggregate", serde_json::json!({ "aggregate": &aggregate.storage_name }));
-        let after = translated_latest(client, domain, &aggregate.name, ordinal, edges, watermarks).await?;
+        let phase = crate::log::phase_with(
+            "audit_aggregate",
+            serde_json::json!({ "aggregate": &aggregate.storage_name }),
+        );
+        let after =
+            translated_latest(client, domain, &aggregate.name, ordinal, edges, watermarks).await?;
 
         // Layer 1 — structural (types/patterns/admits/lifecycle) — over
         // every record `after` actually holds, matching Ruby's own
@@ -821,13 +1013,27 @@ pub async fn audit_before_mint<C: GenericClient>(
 
         // Layer 2 — per-rule value preservation against the reference
         // transform, id-set/count conservation.
-        audit_layer_two(client, domain, aggregate, ordinal, edges, raw_edges, watermarks, &after, &mut violations).await?;
+        audit_layer_two(
+            client,
+            domain,
+            aggregate,
+            ordinal,
+            edges,
+            raw_edges,
+            watermarks,
+            &after,
+            &mut violations,
+        )
+        .await?;
         phase.end_with(serde_json::json!({ "records": after.len() }));
     }
     if violations.is_empty() {
         return Ok(());
     }
-    anyhow::bail!("cannot mint era {ordinal} of {domain}: the audit refused —\n  - {}", violations.join("\n  - "));
+    anyhow::bail!(
+        "cannot mint era {ordinal} of {domain}: the audit refused —\n  - {}",
+        violations.join("\n  - ")
+    );
 }
 
 /// `compile_head!` — one aggregate's matview + head-snapshot + head
@@ -845,7 +1051,12 @@ async fn compile_head<C: GenericClient>(
     let view = matview(domain, storage_name, era, label);
     let body = chain_sql(domain, &aggregate.name, era, edges, watermarks);
 
-    client.batch_execute(&format!("CREATE MATERIALIZED VIEW {} AS\n{body}", quote_ident(&view))).await?;
+    client
+        .batch_execute(&format!(
+            "CREATE MATERIALIZED VIEW {} AS\n{body}",
+            quote_ident(&view)
+        ))
+        .await?;
     client
         .batch_execute(&format!(
             "CREATE INDEX IF NOT EXISTS {} ON {} (aggregate_id, ordinal DESC)",
@@ -856,7 +1067,12 @@ async fn compile_head<C: GenericClient>(
 
     ensure_head_snapshot(client, domain, storage_name, era).await?;
 
-    client.batch_execute(&format!("DROP VIEW IF EXISTS {}", quote_ident(&head_view(domain, storage_name)))).await?;
+    client
+        .batch_execute(&format!(
+            "DROP VIEW IF EXISTS {}",
+            quote_ident(&head_view(domain, storage_name))
+        ))
+        .await?;
     client
         .batch_execute(&format!(
             "CREATE VIEW {} AS \
@@ -874,8 +1090,15 @@ async fn compile_head<C: GenericClient>(
         .await?;
     Ok(())
 }
-/// Mints era 1: fresh domain, no edge, never needs the approval gate.
-pub async fn hold_first<C: GenericClient>(client: &C, domain: &str, held_text: &str, ir: &Value, aggregates: &[Aggregate], role: Option<&str>) -> anyhow::Result<()> {
+/// Mints era 1: fresh domain, no edge to translate.
+pub async fn hold_first<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    held_text: &str,
+    ir: &Value,
+    aggregates: &[Aggregate],
+    role: Option<&str>,
+) -> anyhow::Result<()> {
     ensure_base(client, domain).await?;
 
     // Own transaction: `ensure_first_head`'s `ensure_head_snapshot` backfill
@@ -883,7 +1106,7 @@ pub async fn hold_first<C: GenericClient>(client: &C, domain: &str, held_text: &
     client.batch_execute("BEGIN").await?;
     let result = hold_first_body(client, domain, held_text, ir, aggregates, role).await;
     match &result {
-        Ok(_) => client.batch_execute("COMMIT").await?,
+        Ok(()) => client.batch_execute("COMMIT").await?,
         Err(_) => {
             let _ = client.batch_execute("ROLLBACK").await;
         }
@@ -891,7 +1114,14 @@ pub async fn hold_first<C: GenericClient>(client: &C, domain: &str, held_text: &
     result
 }
 
-async fn hold_first_body<C: GenericClient>(client: &C, domain: &str, held_text: &str, ir: &Value, aggregates: &[Aggregate], role: Option<&str>) -> anyhow::Result<()> {
+async fn hold_first_body<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    held_text: &str,
+    ir: &Value,
+    aggregates: &[Aggregate],
+    role: Option<&str>,
+) -> anyhow::Result<()> {
     let hash = storage_shape::mint_hash(ir);
     let label = storage_shape::mint_label(ir);
     let digest = format!("{:x}", Sha256::digest(held_text.as_bytes()));
@@ -917,7 +1147,11 @@ async fn hold_first_body<C: GenericClient>(client: &C, domain: &str, held_text:
 /// `ensure_first_head!` — era 1's head is a plain view over its own
 /// (immediately-created) snapshot table, no chain to compile, no
 /// translation possible from nothing.
-async fn ensure_first_head<C: GenericClient>(client: &C, domain: &str, storage_name: &str) -> anyhow::Result<()> {
+async fn ensure_first_head<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    storage_name: &str,
+) -> anyhow::Result<()> {
     ensure_head_snapshot(client, domain, storage_name, 1).await?;
     client
         .batch_execute(&format!(
@@ -929,7 +1163,13 @@ async fn ensure_first_head<C: GenericClient>(client: &C, domain: &str, storage_n
     Ok(())
 }
 
-async fn archive_text<C: GenericClient>(client: &C, domain: &str, ordinal: i32, text: &str, digest: &str) -> anyhow::Result<()> {
+async fn archive_text<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    ordinal: i32,
+    text: &str,
+    digest: &str,
+) -> anyhow::Result<()> {
     client
         .execute(
             "INSERT INTO hecks_era_texts (domain, ordinal, digest, held_text) VALUES ($1, $2, $3, $4) ON CONFLICT DO NOTHING",
@@ -939,25 +1179,57 @@ async fn archive_text<C: GenericClient>(client: &C, domain: &str, ordinal: i32,
     Ok(())
 }
 
-pub(crate) async fn advance_era<C: GenericClient>(client: &C, domain: &str, ordinal: i32) -> anyhow::Result<()> {
+pub(crate) async fn advance_era<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    ordinal: i32,
+) -> anyhow::Result<()> {
     let journal = quote_ident(&journal_table(domain));
-    client.batch_execute(&format!("DROP POLICY IF EXISTS hecks_current_era ON {journal}")).await?;
+    client
+        .batch_execute(&format!(
+            "DROP POLICY IF EXISTS hecks_current_era ON {journal}"
+        ))
+        .await?;
     client
         .batch_execute(&format!("CREATE POLICY hecks_current_era ON {journal} FOR INSERT TO PUBLIC WITH CHECK (era = {ordinal})"))
         .await?;
-    client.batch_execute(&format!("DROP POLICY IF EXISTS hecks_read_all ON {journal}")).await?;
-    client.batch_execute(&format!("CREATE POLICY hecks_read_all ON {journal} FOR SELECT TO PUBLIC USING (true)")).await?;
+    client
+        .batch_execute(&format!(
+            "DROP POLICY IF EXISTS hecks_read_all ON {journal}"
+        ))
+        .await?;
+    client
+        .batch_execute(&format!(
+            "CREATE POLICY hecks_read_all ON {journal} FOR SELECT TO PUBLIC USING (true)"
+        ))
+        .await?;
     Ok(())
 }
 
-async fn grant_role<C: GenericClient>(client: &C, domain: &str, role: &str, aggregates: &[Aggregate], era: Option<i32>) -> anyhow::Result<()> {
+async fn grant_role<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    role: &str,
+    aggregates: &[Aggregate],
+    era: Option<i32>,
+) -> anyhow::Result<()> {
     let journal = journal_table(domain);
     if !provisioner(client, &journal).await? {
         return Ok(());
     }
     let quoted_role = quote_ident(role);
-    client.batch_execute(&format!("GRANT INSERT, SELECT ON {} TO {quoted_role}", quote_ident(&journal))).await?;
-    client.batch_execute(&format!("GRANT USAGE ON SEQUENCE {} TO {quoted_role}", quote_ident(&sequence(domain)))).await?;
+    client
+        .batch_execute(&format!(
+            "GRANT INSERT, SELECT ON {} TO {quoted_role}",
+            quote_ident(&journal)
+        ))
+        .await?;
+    client
+        .batch_execute(&format!(
+            "GRANT USAGE ON SEQUENCE {} TO {quoted_role}",
+            quote_ident(&sequence(domain))
+        ))
+        .await?;
     let Some(era) = era else { return Ok(()) };
     for aggregate in aggregates {
         let storage_name = &aggregate.storage_name;
@@ -969,7 +1241,12 @@ async fn grant_role<C: GenericClient>(client: &C, domain: &str, role: &str, aggr
             .await?;
         let view = head_view(domain, storage_name);
         if table_or_view_exists(client, &view).await? {
-            client.batch_execute(&format!("GRANT SELECT ON {} TO {quoted_role}", quote_ident(&view))).await?;
+            client
+                .batch_execute(&format!(
+                    "GRANT SELECT ON {} TO {quoted_role}",
+                    quote_ident(&view)
+                ))
+                .await?;
         }
     }
     Ok(())
@@ -982,8 +1259,8 @@ async fn table_or_view_exists<C: GenericClient>(client: &C, name: &str) -> anyho
     Ok(row.is_some())
 }
 
-/// The one transaction that makes era `ordinal` real. Approval-gate checking
-/// is the caller's job; this function mints once asked to.
+/// The one transaction that makes era `ordinal` real; the caller decides when
+/// to mint, and this function mints once asked to.
 #[allow(clippy::too_many_arguments)]
 pub async fn mint_era<C: GenericClient>(
     client: &C,
@@ -998,10 +1275,23 @@ pub async fn mint_era<C: GenericClient>(
     lifecycle_defaults: &[LifecycleDefault],
 ) -> anyhow::Result<()> {
     client.batch_execute("BEGIN").await?;
-    let result = mint_era_body(client, domain, ordinal, hash, label, held_text, aggregates, edges, role, lifecycle_defaults).await;
+    let result = mint_era_body(
+        client,
+        domain,
+        ordinal,
+        hash,
+        label,
+        held_text,
+        aggregates,
+        edges,
+        role,
+        lifecycle_defaults,
+    )
+    .await;
     match &result {
-        Ok(_) => {
-            let phase = crate::log::phase_with("mint_commit", serde_json::json!({ "era": ordinal }));
+        Ok(()) => {
+            let phase =
+                crate::log::phase_with("mint_commit", serde_json::json!({ "era": ordinal }));
             client.batch_execute("COMMIT").await?;
             phase.end();
         }
@@ -1011,7 +1301,6 @@ pub async fn mint_era<C: GenericClient>(
     }
     result
 }
-
 #[allow(clippy::too_many_arguments)]
 async fn mint_era_body<C: GenericClient>(
     client: &C,
@@ -1025,12 +1314,25 @@ async fn mint_era_body<C: GenericClient>(
     role: Option<&str>,
     lifecycle_defaults: &[LifecycleDefault],
 ) -> anyhow::Result<()> {
-    client.batch_execute("SET LOCAL lock_timeout = '10s'").await?;
     client
-        .execute(&format!("SELECT pg_advisory_xact_lock(hashtext('hecks_eras:' || {}))", text_literal(domain)), &[])
+        .batch_execute("SET LOCAL lock_timeout = '10s'")
+        .await?;
+    client
+        .execute(
+            &format!(
+                "SELECT pg_advisory_xact_lock(hashtext('hecks_eras:' || {}))",
+                text_literal(domain)
+            ),
+            &[],
+        )
         .await?;
 
-    let already_minted = client.query_opt("SELECT 1 FROM hecks_eras WHERE domain = $1 AND ordinal = $2", &[&domain, &ordinal]).await?;
+    let already_minted = client
+        .query_opt(
+            "SELECT 1 FROM hecks_eras WHERE domain = $1 AND ordinal = $2",
+            &[&domain, &ordinal],
+        )
+        .await?;
     if already_minted.is_some() {
         anyhow::bail!("era {ordinal} of {domain} is already minted — nothing to do");
     }
@@ -1050,11 +1352,26 @@ async fn mint_era_body<C: GenericClient>(
     // Every held era's watermark, for `ancestor_tail_sql`'s cut — includes
     // the row just inserted, which bounds era `ordinal - 1`'s tail read.
     let held = crate::journal::held_eras(client, domain).await?;
-    let watermarks: std::collections::HashMap<i32, Option<i64>> = held.iter().map(|era| (era.ordinal, era.watermark)).collect();
+    let watermarks: std::collections::HashMap<i32, Option<i64>> = held
+        .iter()
+        .map(|era| (era.ordinal, era.watermark))
+        .collect();
 
     for aggregate in aggregates {
-        let phase = crate::log::phase_with("compile_head", serde_json::json!({ "aggregate": &aggregate.storage_name, "era": ordinal }));
-        compile_head(client, domain, aggregate, ordinal, label, edges, &watermarks).await?;
+        let phase = crate::log::phase_with(
+            "compile_head",
+            serde_json::json!({ "aggregate": &aggregate.storage_name, "era": ordinal }),
+        );
+        compile_head(
+            client,
+            domain,
+            aggregate,
+            ordinal,
+            label,
+            edges,
+            &watermarks,
+        )
+        .await?;
         phase.end();
     }
 
@@ -1073,7 +1390,7 @@ async fn mint_era_body<C: GenericClient>(
 
 /// A lifecycle field an aggregate's instances must carry, and its default
 /// for new instances. `key_prefix` matches the kernel's `instances()` dump key shape.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct LifecycleDefault {
     pub key_prefix: String,
     pub field: String,
@@ -1108,13 +1425,22 @@ pub fn lifecycle_defaults(ir: &Value) -> Vec<LifecycleDefault> {
 /// Fills a missing lifecycle field into every seeded instance; returns how
 /// many changed. Idempotent, since the kernel's `from_json` requires the field on load.
 pub fn fill_lifecycle_defaults(seed: &mut Value, defaults: &[LifecycleDefault]) -> usize {
-    let Some(instances) = seed.as_object_mut() else { return 0 };
+    let Some(instances) = seed.as_object_mut() else {
+        return 0;
+    };
     let mut changed = 0;
     for (key, instance) in instances.iter_mut() {
-        let Some(default) = defaults.iter().find(|d| key.starts_with(&d.key_prefix)) else { continue };
-        let Some(fields) = instance.as_object_mut() else { continue };
+        let Some(default) = defaults.iter().find(|d| key.starts_with(&d.key_prefix)) else {
+            continue;
+        };
+        let Some(fields) = instance.as_object_mut() else {
+            continue;
+        };
         if fields.get(&default.field).is_none_or(Value::is_null) {
-            fields.insert(default.field.clone(), Value::String(default.default.clone()));
+            fields.insert(
+                default.field.clone(),
+                Value::String(default.default.clone()),
+            );
             changed += 1;
         }
     }
@@ -1125,38 +1451,69 @@ pub fn fill_lifecycle_defaults(seed: &mut Value, defaults: &[LifecycleDefault])
 /// transaction — without this, a request right after the mint can hit
 /// `invalid seed` on the old-shaped snapshot. Takes the same advisory lock a
 /// dispatch holds, so an in-flight dispatch saves first.
-async fn fill_snapshot_lifecycle_defaults<C: GenericClient>(client: &C, domain: &str, defaults: &[LifecycleDefault]) -> anyhow::Result<usize> {
+async fn fill_snapshot_lifecycle_defaults<C: GenericClient>(
+    client: &C,
+    domain: &str,
+    defaults: &[LifecycleDefault],
+) -> anyhow::Result<usize> {
     if defaults.is_empty() {
         return Ok(0);
     }
-    let table_exists: bool = client.query_one("SELECT to_regclass('hecks_lambda_snapshot') IS NOT NULL", &[]).await?.get(0);
+    let table_exists: bool = client
+        .query_one(
+            "SELECT to_regclass('hecks_lambda_snapshot') IS NOT NULL",
+            &[],
+        )
+        .await?
+        .get(0);
     if !table_exists {
         return Ok(0);
     }
-    client.execute("SELECT pg_advisory_xact_lock(hashtext('hecks_lambda_journal.' || $1::text))", &[&domain]).await?;
-    let Some(row) = client.query_opt("SELECT seed FROM hecks_lambda_snapshot FOR UPDATE", &[]).await? else { return Ok(0) };
+    client
+        .execute(
+            "SELECT pg_advisory_xact_lock(hashtext('hecks_lambda_journal.' || $1::text))",
+            &[&domain],
+        )
+        .await?;
+    let Some(row) = client
+        .query_opt("SELECT seed FROM hecks_lambda_snapshot FOR UPDATE", &[])
+        .await?
+    else {
+        return Ok(0);
+    };
     let mut seed: Value = row.get(0);
     let changed = fill_lifecycle_defaults(&mut seed, defaults);
     if changed > 0 {
-        client.execute("UPDATE hecks_lambda_snapshot SET seed = $1", &[&seed]).await.context("filling lifecycle defaults into the snapshot")?;
+        client
+            .execute("UPDATE hecks_lambda_snapshot SET seed = $1", &[&seed])
+            .await
+            .context("filling lifecycle defaults into the snapshot")?;
     }
     Ok(changed)
 }
 
 #[cfg(test)]
+#[allow(clippy::items_after_statements)] // reason: tests declare a one-off fixture next to the statement that uses it
 mod tests {
 
     /// A throwaway database of its own — `mint.rs` also compiles into
     /// `bin/mint_harness`, which has no `dispatch` module to borrow a helper from.
     async fn own_scratch_db(name: &str) -> tokio_postgres::Client {
         let (admin, connection) =
-            tokio_postgres::connect(&crate::test_pg::conninfo("postgres"), NoTls).await.expect("connect as admin");
+            tokio_postgres::connect(&crate::test_pg::conninfo("postgres"), NoTls)
+                .await
+                .expect("connect as admin");
         tokio::spawn(async move {
             let _ = connection.await;
         });
-        let _ = admin.batch_execute(&format!("DROP DATABASE IF EXISTS {name} WITH (FORCE)")).await;
-        admin.batch_execute(&format!("CREATE DATABASE {name}")).await.expect("create scratch db");
-        let (client, connection) = tokio_postgres::connect(&crate::test_pg::conninfo(&name), NoTls)
+        let _ = admin
+            .batch_execute(&format!("DROP DATABASE IF EXISTS {name} WITH (FORCE)"))
+            .await;
+        admin
+            .batch_execute(&format!("CREATE DATABASE {name}"))
+            .await
+            .expect("create scratch db");
+        let (client, connection) = tokio_postgres::connect(&crate::test_pg::conninfo(name), NoTls)
             .await
             .expect("connect to scratch db");
         tokio::spawn(async move {
@@ -1175,23 +1532,42 @@ mod tests {
         super::adopt_head_snapshots(
             &guard,
             "SampleApp",
-            &[super::Aggregate { name: "StateStyle".to_string(), storage_name: "state_style".to_string() }],
+            &[super::Aggregate {
+                name: "StateStyle".to_string(),
+                storage_name: "state_style".to_string(),
+            }],
             1,
         )
         .await
         .expect("era 1 exists, as Ruby left it");
 
         let missing = super::head_snapshot("SampleApp", "state_style", 2);
-        assert!(!super::table_exists(&guard, &missing).await.expect("a lookup"), "era 2 starts absent");
+        assert!(
+            !super::table_exists(&guard, &missing)
+                .await
+                .expect("a lookup"),
+            "era 2 starts absent"
+        );
 
-        let aggregates =
-            vec![super::Aggregate { name: "StateStyle".to_string(), storage_name: "state_style".to_string() }];
-        super::adopt_head_snapshots(&guard, "SampleApp", &aggregates, 2).await.expect("adopts");
+        let aggregates = vec![super::Aggregate {
+            name: "StateStyle".to_string(),
+            storage_name: "state_style".to_string(),
+        }];
+        super::adopt_head_snapshots(&guard, "SampleApp", &aggregates, 2)
+            .await
+            .expect("adopts");
 
-        assert!(super::table_exists(&guard, &missing).await.expect("a lookup"), "era 2 is provisioned now");
+        assert!(
+            super::table_exists(&guard, &missing)
+                .await
+                .expect("a lookup"),
+            "era 2 is provisioned now"
+        );
 
         // Idempotent — every boot runs it, the same way Ruby's does.
-        super::adopt_head_snapshots(&guard, "SampleApp", &aggregates, 2).await.expect("adopts again");
+        super::adopt_head_snapshots(&guard, "SampleApp", &aggregates, 2)
+            .await
+            .expect("adopts again");
     }
 
     /// The columns match Ruby's, so a table this crate creates is one Ruby can
@@ -1199,8 +1575,13 @@ mod tests {
     #[tokio::test]
     async fn a_head_snapshot_this_crate_creates_carries_rubys_own_columns() {
         let guard = own_scratch_db("hecks_host_head_snapshot_columns").await;
-        let aggregates = vec![super::Aggregate { name: "Widget".to_string(), storage_name: "widget".to_string() }];
-        super::adopt_head_snapshots(&guard, "Fixtures", &aggregates, 1).await.expect("adopts");
+        let aggregates = vec![super::Aggregate {
+            name: "Widget".to_string(),
+            storage_name: "widget".to_string(),
+        }];
+        super::adopt_head_snapshots(&guard, "Fixtures", &aggregates, 1)
+            .await
+            .expect("adopts");
 
         let name = super::head_snapshot("Fixtures", "widget", 1);
         let rows = guard
@@ -1214,19 +1595,40 @@ mod tests {
         let columns: Vec<String> = rows.iter().map(|r| r.get::<_, String>(0)).collect();
         assert_eq!(columns, vec!["id", "ordinal", "operation", "state"]);
 
-        let operation = rows.iter().find(|r| r.get::<_, String>(0) == "operation").expect("operation");
+        let operation = rows
+            .iter()
+            .find(|r| r.get::<_, String>(0) == "operation")
+            .expect("operation");
         assert_eq!(operation.get::<_, String>(1), "NO", "operation is NOT NULL");
-        assert!(operation.get::<_, Option<String>>(2).unwrap_or_default().contains("save"), "defaults to 'save'");
+        assert!(
+            operation
+                .get::<_, Option<String>>(2)
+                .unwrap_or_default()
+                .contains("save"),
+            "defaults to 'save'"
+        );
 
-        let state = rows.iter().find(|r| r.get::<_, String>(0) == "state").expect("state");
-        assert_eq!(state.get::<_, String>(1), "YES", "state is nullable, for a delete tombstone");
+        let state = rows
+            .iter()
+            .find(|r| r.get::<_, String>(0) == "state")
+            .expect("state");
+        assert_eq!(
+            state.get::<_, String>(1),
+            "YES",
+            "state is nullable, for a delete tombstone"
+        );
     }
     use super::*;
     use crate::journal;
     use tokio_postgres::NoTls;
 
     fn rule(name: &str, was: Option<&str>, expression: &str) -> EdgeAggregate {
-        EdgeAggregate { name: name.to_string(), was: was.map(str::to_string), has_compute_or_rekey: false, compiled_state_expression: expression.to_string(), compiled_id_expression: None }
+        EdgeAggregate {
+            name: name.to_string(),
+            was: was.map(str::to_string),
+            compiled_state_expression: expression.to_string(),
+            compiled_id_expression: None,
+        }
     }
 
     // A multi-hop chain: era1 "Pizza" -> era2 renamed to "Order" -> era3 an
@@ -1234,8 +1636,20 @@ mod tests {
     // correctly for chain_sql's per-ancestor filter to read the right era.
     #[test]
     fn names_by_era_walks_a_multi_hop_rename_chain_backward_correctly() {
-        let edge_1_to_2 = Edge { from: "aaa".to_string(), to: "bbb".to_string(), aggregates: vec![rule("Order", Some("Pizza"), "hecks_tr_rename(state, 'x', 'y')")] };
-        let edge_2_to_3 = Edge { from: "bbb".to_string(), to: "ccc".to_string(), aggregates: vec![rule("Order", None, "hecks_tr_rename(state, 'y', 'z')")] };
+        let edge_1_to_2 = Edge {
+            from: "aaa".to_string(),
+            to: "bbb".to_string(),
+            aggregates: vec![rule(
+                "Order",
+                Some("Pizza"),
+                "hecks_tr_rename(state, 'x', 'y')",
+            )],
+        };
+        let edge_2_to_3 = Edge {
+            from: "bbb".to_string(),
+            to: "ccc".to_string(),
+            aggregates: vec![rule("Order", None, "hecks_tr_rename(state, 'y', 'z')")],
+        };
         let edges: Vec<&Edge> = vec![&edge_1_to_2, &edge_2_to_3];
 
         let (current, storage) = names_by_era("Order", &edges);
@@ -1243,25 +1657,53 @@ mod tests {
         // era 1 (index 0): the old name, "Pizza" -- read from edge_1_to_2's
         // own `was:`. era 2 (index 1) and era 3 (index 2): "Order",
         // unchanged since nothing renamed it again.
-        assert_eq!(current, vec!["Pizza".to_string(), "Order".to_string(), "Order".to_string()]);
-        assert_eq!(storage, vec!["pizza".to_string(), "order".to_string(), "order".to_string()]);
+        assert_eq!(
+            current,
+            vec![
+                "Pizza".to_string(),
+                "Order".to_string(),
+                "Order".to_string()
+            ]
+        );
+        assert_eq!(
+            storage,
+            vec![
+                "pizza".to_string(),
+                "order".to_string(),
+                "order".to_string()
+            ]
+        );
     }
 
     #[test]
     fn edge_chain_finds_the_real_path_and_refuses_a_broken_one() {
-        let edge = Edge { from: "aaa".to_string(), to: "bbb".to_string(), aggregates: vec![] };
-        let edges = vec![edge.clone()];
+        let edge = Edge {
+            from: "aaa".to_string(),
+            to: "bbb".to_string(),
+            aggregates: vec![],
+        };
+        let edges = vec![edge];
 
-        let found = edge_chain(&edges, &["aaa".to_string(), "bbb".to_string()]).expect("a real edge connects aaa to bbb");
+        let found = edge_chain(&edges, &["aaa".to_string(), "bbb".to_string()])
+            .expect("a real edge connects aaa to bbb");
         assert_eq!(found.len(), 1);
         assert_eq!(found[0].to, "bbb");
 
         let broken = edge_chain(&edges, &["aaa".to_string(), "zzz".to_string()]);
-        assert!(broken.is_err(), "no edge leads aaa to zzz -- must refuse, not silently skip");
+        assert!(
+            broken.is_err(),
+            "no edge leads aaa to zzz -- must refuse, not silently skip"
+        );
     }
 
     fn held(ordinal: i32, label: Option<&str>) -> journal::HeldEra {
-        journal::HeldEra { ordinal, hash: label.map(|_| "irrelevant".to_string()), label: label.map(str::to_string), held_text: String::new(), watermark: None }
+        journal::HeldEra {
+            ordinal,
+            hash: label.map(|_| "irrelevant".to_string()),
+            label: label.map(str::to_string),
+            held_text: String::new(),
+            watermark: None,
+        }
     }
 
     // The four branches `main.rs`'s boot gate calls into — pure, so each
@@ -1275,21 +1717,34 @@ mod tests {
         // even if it's not the latest one (an operator could roll back
         // to an older binary whose shape a prior era already covers).
         let already_named = vec![held(1, Some("aaa111")), held(2, Some("bbb222"))];
-        assert_eq!(decide_boot_action(&already_named, "aaa111"), BootDecision::UseExisting { ordinal: 1 });
-        assert_eq!(decide_boot_action(&already_named, "bbb222"), BootDecision::UseExisting { ordinal: 2 });
+        assert_eq!(
+            decide_boot_action(&already_named, "aaa111"),
+            BootDecision::UseExisting { ordinal: 1 }
+        );
+        assert_eq!(
+            decide_boot_action(&already_named, "bbb222"),
+            BootDecision::UseExisting { ordinal: 2 }
+        );
 
         // Held, but the latest doesn't match this binary's shape -- mint
         // the next ordinal from the latest's own label.
         let drifted = vec![held(1, Some("aaa111"))];
         assert_eq!(
             decide_boot_action(&drifted, "ccc333"),
-            BootDecision::Mint { ordinal: 2, from_ordinal: 1, from_label: "aaa111".to_string() }
+            BootDecision::Mint {
+                ordinal: 2,
+                from_ordinal: 1,
+                from_label: "aaa111".to_string()
+            }
         );
 
         // The latest held era has no label yet (Ruby minted it, never
         // named it) -- refuse rather than guess whether it matches.
         let unnamed = vec![held(1, Some("aaa111")), held(2, None)];
-        assert_eq!(decide_boot_action(&unnamed, "ccc333"), BootDecision::LatestUnnamed { ordinal: 2 });
+        assert_eq!(
+            decide_boot_action(&unnamed, "ccc333"),
+            BootDecision::LatestUnnamed { ordinal: 2 }
+        );
     }
 
     // Proves Rust needs no Ruby to mint at all: real Postgres, zero Ruby
@@ -1305,21 +1760,47 @@ mod tests {
         tokio::spawn(async move {
             let _ = admin_connection.await;
         });
-        let _ = admin_client.batch_execute(&format!("DROP DATABASE IF EXISTS {db} WITH (FORCE)")).await;
-        admin_client.batch_execute(&format!("CREATE DATABASE {db}")).await.expect("create scratch db");
-        let _ = admin_client.batch_execute(&format!("DROP ROLE IF EXISTS {owner}")).await;
-        admin_client.batch_execute(&format!("CREATE ROLE {owner} {}", crate::test_pg::login_clause())).await.expect("create owner role");
-        admin_client.batch_execute(&format!("GRANT CONNECT ON DATABASE {db} TO {owner}")).await.expect("grant connect");
-
-        let grant = tokio_postgres::connect(&crate::test_pg::conninfo(&db), NoTls).await;
-        let (grant_client, grant_connection) = grant.expect("connect to scratch db as superuser to grant schema rights");
+        let _ = admin_client
+            .batch_execute(&format!("DROP DATABASE IF EXISTS {db} WITH (FORCE)"))
+            .await;
+        admin_client
+            .batch_execute(&format!("CREATE DATABASE {db}"))
+            .await
+            .expect("create scratch db");
+        let _ = admin_client
+            .batch_execute(&format!("DROP ROLE IF EXISTS {owner}"))
+            .await;
+        admin_client
+            .batch_execute(&format!(
+                "CREATE ROLE {owner} {}",
+                crate::test_pg::login_clause()
+            ))
+            .await
+            .expect("create owner role");
+        admin_client
+            .batch_execute(&format!("GRANT CONNECT ON DATABASE {db} TO {owner}"))
+            .await
+            .expect("grant connect");
+
+        let grant = tokio_postgres::connect(&crate::test_pg::conninfo(db), NoTls).await;
+        let (grant_client, grant_connection) =
+            grant.expect("connect to scratch db as superuser to grant schema rights");
         tokio::spawn(async move {
             let _ = grant_connection.await;
         });
-        grant_client.batch_execute(&format!("GRANT USAGE, CREATE ON SCHEMA public TO {owner}")).await.expect("grant schema rights");
-        grant_client.batch_execute(&format!("ALTER DATABASE {db} OWNER TO {owner}")).await.expect("make owner the db owner");
+        grant_client
+            .batch_execute(&format!("GRANT USAGE, CREATE ON SCHEMA public TO {owner}"))
+            .await
+            .expect("grant schema rights");
+        grant_client
+            .batch_execute(&format!("ALTER DATABASE {db} OWNER TO {owner}"))
+            .await
+            .expect("make owner the db owner");
 
-        let (client, connection) = tokio_postgres::connect(&crate::test_pg::conninfo_as(&db, &owner), NoTls).await.expect("connect as owner");
+        let (client, connection) =
+            tokio_postgres::connect(&crate::test_pg::conninfo_as(db, owner), NoTls)
+                .await
+                .expect("connect as owner");
         tokio::spawn(async move {
             let _ = connection.await;
         });
@@ -1348,21 +1829,47 @@ mod tests {
         let v2_ir = shape("amount");
 
         // era 1: Rust mints it, no Ruby, no edge needed.
-        let aggregate = Aggregate { name: "Widget".to_string(), storage_name: "widget".to_string() };
-        hold_first(&client, domain, "v1 source text (opaque to this crate)", &v1_ir, &[aggregate.clone()], None).await.expect("hold_first");
+        let aggregate = Aggregate {
+            name: "Widget".to_string(),
+            storage_name: "widget".to_string(),
+        };
+        hold_first(
+            &client,
+            domain,
+            "v1 source text (opaque to this crate)",
+            &v1_ir,
+            std::slice::from_ref(&aggregate),
+            None,
+        )
+        .await
+        .expect("hold_first");
 
-        let config = journal::LineageConfig { domain: domain.to_string(), era: Some(1), mirrored: None };
+        let config = journal::LineageConfig {
+            domain: domain.to_string(),
+            era: Some(1),
+            mirrored: None,
+        };
         journal::append_lineage_mutation(
             &client,
             &config,
-            &journal::Mutation { aggregate: "Widget", id: "w1", operation: "save", state: &serde_json::json!({"cost": {"cents": 100}, "kind": {"label": "w1"}}) },
+            &journal::Mutation {
+                aggregate: "Widget",
+                id: "w1",
+                operation: "save",
+                state: &serde_json::json!({"cost": {"cents": 100}, "kind": {"label": "w1"}}),
+            },
         )
         .await
         .expect("write w1 under era 1");
         journal::append_lineage_mutation(
             &client,
             &config,
-            &journal::Mutation { aggregate: "Widget", id: "w2", operation: "save", state: &serde_json::json!({"cost": {"cents": 200}, "kind": {"label": "w2"}}) },
+            &journal::Mutation {
+                aggregate: "Widget",
+                id: "w2",
+                operation: "save",
+                state: &serde_json::json!({"cost": {"cents": 200}, "kind": {"label": "w2"}}),
+            },
         )
         .await
         .expect("write w2 under era 1");
@@ -1378,31 +1885,53 @@ mod tests {
             aggregates: vec![EdgeAggregate {
                 name: "Widget".to_string(),
                 was: None,
-                has_compute_or_rekey: false,
                 compiled_state_expression: "hecks_tr_rename(state, 'cost', 'amount')".to_string(),
                 compiled_id_expression: None,
             }],
         };
 
-        mint_era(&client, domain, 2, &storage_shape::mint_hash(&v2_ir), &to_label, "v2 source text", &[aggregate], &[&edge], None, &[])
-            .await
-            .expect("mint_era");
+        mint_era(
+            &client,
+            domain,
+            2,
+            &storage_shape::mint_hash(&v2_ir),
+            &to_label,
+            "v2 source text",
+            &[aggregate],
+            &[&edge],
+            None,
+            &[],
+        )
+        .await
+        .expect("mint_era");
 
         // Read back through the same generic function real deployment traffic
         // uses, proving the whole chain, not just that SQL ran.
-        let mut rows = journal::read_lineage_head_all(&client, domain, "widget").await.expect("read_lineage_head_all");
+        let mut rows = journal::read_lineage_head_all(&client, domain, "widget")
+            .await
+            .expect("read_lineage_head_all");
         rows.sort_by(|a, b| a.0.cmp(&b.0));
         assert_eq!(
             rows,
             vec![
-                ("w1".to_string(), serde_json::json!({"amount": {"cents": 100}, "kind": {"label": "w1"}})),
-                ("w2".to_string(), serde_json::json!({"amount": {"cents": 200}, "kind": {"label": "w2"}})),
+                (
+                    "w1".to_string(),
+                    serde_json::json!({"amount": {"cents": 100}, "kind": {"label": "w1"}})
+                ),
+                (
+                    "w2".to_string(),
+                    serde_json::json!({"amount": {"cents": 200}, "kind": {"label": "w2"}})
+                ),
             ]
         );
     }
 
     fn registration_default() -> LifecycleDefault {
-        LifecycleDefault { key_prefix: "Studio::Registration#".to_string(), field: "status".to_string(), default: "active".to_string() }
+        LifecycleDefault {
+            key_prefix: "Studio::Registration#".to_string(),
+            field: "status".to_string(),
+            default: "active".to_string(),
+        }
     }
 
     // A seed as the kernel's `instances()` dump writes it: one entry per
@@ -1429,16 +1958,25 @@ mod tests {
     #[test]
     fn a_missing_lifecycle_field_gets_the_default() {
         let mut seed = old_seed();
-        assert_eq!(fill_lifecycle_defaults(&mut seed, &[registration_default()]), 2);
+        assert_eq!(
+            fill_lifecycle_defaults(&mut seed, &[registration_default()]),
+            2
+        );
         assert_eq!(seed["Studio::Registration#r1"]["status"], "active");
         assert_eq!(seed["Studio::Registration#r2"]["status"], "active");
-        assert_eq!(seed["Studio::Registration#r1"]["attendee"]["email"], "ada@example.com", "everything else on the instance is kept");
+        assert_eq!(
+            seed["Studio::Registration#r1"]["attendee"]["email"], "ada@example.com",
+            "everything else on the instance is kept"
+        );
     }
 
     #[test]
     fn a_null_lifecycle_field_is_filled_too() {
         let mut seed = serde_json::json!({"Studio::Registration#r1": {"status": null}});
-        assert_eq!(fill_lifecycle_defaults(&mut seed, &[registration_default()]), 1);
+        assert_eq!(
+            fill_lifecycle_defaults(&mut seed, &[registration_default()]),
+            1
+        );
         assert_eq!(seed["Studio::Registration#r1"]["status"], "active");
     }
 
@@ -1446,7 +1984,10 @@ mod tests {
     fn an_existing_lifecycle_value_is_left_alone() {
         let mut seed = old_seed();
         seed["Studio::Registration#r2"]["status"] = serde_json::json!("archived");
-        assert_eq!(fill_lifecycle_defaults(&mut seed, &[registration_default()]), 1);
+        assert_eq!(
+            fill_lifecycle_defaults(&mut seed, &[registration_default()]),
+            1
+        );
         assert_eq!(seed["Studio::Registration#r2"]["status"], "archived");
         assert_eq!(seed["Studio::Registration#r1"]["status"], "active");
     }
@@ -1474,18 +2015,30 @@ mod tests {
         let mut seed = old_seed();
         fill_lifecycle_defaults(&mut seed, &[registration_default()]);
         let once = seed.clone();
-        assert_eq!(fill_lifecycle_defaults(&mut seed, &[registration_default()]), 0);
+        assert_eq!(
+            fill_lifecycle_defaults(&mut seed, &[registration_default()]),
+            0
+        );
         assert_eq!(seed, once);
     }
 
     #[test]
     fn a_seed_that_is_not_an_object_or_holds_a_non_object_instance_is_left_alone() {
         let mut empty = serde_json::json!({});
-        assert_eq!(fill_lifecycle_defaults(&mut empty, &[registration_default()]), 0);
+        assert_eq!(
+            fill_lifecycle_defaults(&mut empty, &[registration_default()]),
+            0
+        );
         let mut not_a_seed = serde_json::json!([1, 2]);
-        assert_eq!(fill_lifecycle_defaults(&mut not_a_seed, &[registration_default()]), 0);
+        assert_eq!(
+            fill_lifecycle_defaults(&mut not_a_seed, &[registration_default()]),
+            0
+        );
         let mut odd = serde_json::json!({"Studio::Registration#r1": "scalar"});
-        assert_eq!(fill_lifecycle_defaults(&mut odd, &[registration_default()]), 0);
+        assert_eq!(
+            fill_lifecycle_defaults(&mut odd, &[registration_default()]),
+            0
+        );
         assert_eq!(odd["Studio::Registration#r1"], "scalar");
     }
 
@@ -1503,7 +2056,11 @@ mod tests {
         assert_eq!(
             lifecycle_defaults(&ir),
             vec![
-                LifecycleDefault { key_prefix: "Studio::Event#".to_string(), field: "status".to_string(), default: "open".to_string() },
+                LifecycleDefault {
+                    key_prefix: "Studio::Event#".to_string(),
+                    field: "status".to_string(),
+                    default: "open".to_string()
+                },
                 registration_default(),
             ]
         );
@@ -1515,7 +2072,9 @@ mod tests {
     #[tokio::test]
     async fn minting_an_era_fills_lifecycle_defaults_into_the_stored_snapshot() {
         let client = own_scratch_db("hecks_host_mint_snapshot_fill").await;
-        journal::ensure_schema(&client).await.expect("ensure_schema");
+        journal::ensure_schema(&client)
+            .await
+            .expect("ensure_schema");
         ensure_base(&client, "Studio").await.expect("ensure_base");
 
         fn shape(with_status: bool) -> Value {
@@ -1527,14 +2086,29 @@ mod tests {
                 "entities": []
             });
             if with_status {
-                aggregate["lifecycle"] = serde_json::json!({"field": "status", "default": "active", "transitions": []});
+                aggregate["lifecycle"] =
+                    serde_json::json!({"field": "status", "default": "active", "transitions": []});
             }
             serde_json::json!({"name": "Studio", "aggregates": [aggregate]})
         }
         let (v1_ir, v2_ir) = (shape(false), shape(true));
-        let aggregate = Aggregate { name: "Registration".to_string(), storage_name: "registration".to_string() };
-        hold_first(&client, "Studio", "v1 source", &v1_ir, &[aggregate.clone()], None).await.expect("hold_first");
-        journal::save_snapshot(&client, 7, &old_seed()).await.expect("save_snapshot");
+        let aggregate = Aggregate {
+            name: "Registration".to_string(),
+            storage_name: "registration".to_string(),
+        };
+        hold_first(
+            &client,
+            "Studio",
+            "v1 source",
+            &v1_ir,
+            std::slice::from_ref(&aggregate),
+            None,
+        )
+        .await
+        .expect("hold_first");
+        journal::save_snapshot(&client, 7, &old_seed())
+            .await
+            .expect("save_snapshot");
 
         let to_label = storage_shape::mint_label(&v2_ir);
         let edge = Edge {
@@ -1543,36 +2117,76 @@ mod tests {
             aggregates: vec![EdgeAggregate {
                 name: "Registration".to_string(),
                 was: None,
-                has_compute_or_rekey: false,
-                compiled_state_expression: "state || jsonb_build_object('status', 'active')".to_string(),
+                compiled_state_expression: "state || jsonb_build_object('status', 'active')"
+                    .to_string(),
                 compiled_id_expression: None,
             }],
         };
         let defaults = lifecycle_defaults(&v2_ir);
         assert_eq!(defaults.len(), 1);
         // The defaults name "Studio::Registration#", matching the seed's keys.
-        mint_era(&client, "Studio", 2, &storage_shape::mint_hash(&v2_ir), &to_label, "v2 source", &[aggregate], &[&edge], None, &defaults)
-            .await
-            .expect("mint_era");
+        mint_era(
+            &client,
+            "Studio",
+            2,
+            &storage_shape::mint_hash(&v2_ir),
+            &to_label,
+            "v2 source",
+            &[aggregate],
+            &[&edge],
+            None,
+            &defaults,
+        )
+        .await
+        .expect("mint_era");
 
-        let snapshot = journal::load_snapshot(&client).await.unwrap().expect("the snapshot row is still there");
-        assert_eq!(snapshot.ordinal, 7, "the snapshot's ordinal is not touched, only its instances");
+        let snapshot = journal::load_snapshot(&client)
+            .await
+            .unwrap()
+            .expect("the snapshot row is still there");
+        assert_eq!(
+            snapshot.ordinal, 7,
+            "the snapshot's ordinal is not touched, only its instances"
+        );
         assert_eq!(snapshot.seed["Studio::Registration#r1"]["status"], "active");
         assert_eq!(snapshot.seed["Studio::Registration#r2"]["status"], "active");
-        assert!(snapshot.seed["Studio::Event#yoga"]["status"] == "open" && snapshot.seed["Payments::Payment#r1"]["status"] == "succeeded");
+        assert!(
+            snapshot.seed["Studio::Event#yoga"]["status"] == "open"
+                && snapshot.seed["Payments::Payment#r1"]["status"] == "succeeded"
+        );
     }
 
     #[tokio::test]
     async fn filling_a_database_with_no_snapshot_table_or_row_is_a_no_op() {
         let client = own_scratch_db("hecks_host_mint_snapshot_fill_absent").await;
-        assert_eq!(fill_snapshot_lifecycle_defaults(&client, "Studio", &[registration_default()]).await.unwrap(), 0, "no table");
-        journal::ensure_schema(&client).await.expect("ensure_schema");
-        assert_eq!(fill_snapshot_lifecycle_defaults(&client, "Studio", &[registration_default()]).await.unwrap(), 0, "no row");
+        assert_eq!(
+            fill_snapshot_lifecycle_defaults(&client, "Studio", &[registration_default()])
+                .await
+                .unwrap(),
+            0,
+            "no table"
+        );
+        journal::ensure_schema(&client)
+            .await
+            .expect("ensure_schema");
+        assert_eq!(
+            fill_snapshot_lifecycle_defaults(&client, "Studio", &[registration_default()])
+                .await
+                .unwrap(),
+            0,
+            "no row"
+        );
     }
 
     /// The compiled expression a backfill rule writes for one path, wrapped around `inner`.
     fn backfill_expression(inner: &str, path: &[&str], default_json: &str) -> String {
-        let array = format!("ARRAY[{}]::text[]", path.iter().map(|p| format!("'{p}'")).collect::<Vec<_>>().join(", "));
+        let array = format!(
+            "ARRAY[{}]::text[]",
+            path.iter()
+                .map(|p| format!("'{p}'"))
+                .collect::<Vec<_>>()
+                .join(", ")
+        );
         let label = path.join(".");
         format!(
             "(SELECT CASE WHEN (hecks_tr_extract(__s, {array})).present THEN __s ELSE hecks_tr_insert(__s, {array}, '{default_json}'::jsonb, 'backfill {label}') END FROM (SELECT ({inner}) AS __s) __outer)"
@@ -1599,7 +2213,6 @@ mod tests {
             aggregates: vec![EdgeAggregate {
                 name: aggregate.to_string(),
                 was: None,
-                has_compute_or_rekey: false,
                 compiled_state_expression: expression.to_string(),
                 compiled_id_expression: None,
             }],
@@ -1612,14 +2225,30 @@ mod tests {
     #[test]
     fn every_cte_of_the_chain_is_materialized() {
         let watermarks = std::collections::HashMap::new();
-        let edges: Vec<Edge> = (1..=6).map(|n| edge_of(&format!("e{n}"), &format!("e{}", n + 1), "Registration", "state")).collect();
+        let edges: Vec<Edge> = (1..=6)
+            .map(|n| {
+                edge_of(
+                    &format!("e{n}"),
+                    &format!("e{}", n + 1),
+                    "Registration",
+                    "state",
+                )
+            })
+            .collect();
         for n in 1..=6usize {
             let chain: Vec<&Edge> = edges[..n].iter().collect();
             let sql = chain_sql("Chain", "Registration", (n + 1) as i32, &chain, &watermarks);
             assert!(sql.starts_with("WITH tail AS MATERIALIZED ("), "{sql}");
-            assert_eq!(sql.matches("AS MATERIALIZED (").count(), n + 1, "the tail and each of the {n} edges: {sql}");
+            assert_eq!(
+                sql.matches("AS MATERIALIZED (").count(),
+                n + 1,
+                "the tail and each of the {n} edges: {sql}"
+            );
             for edge in 1..=n {
-                assert!(sql.contains(&format!("edge_{edge} AS MATERIALIZED (")), "edge {edge}: {sql}");
+                assert!(
+                    sql.contains(&format!("edge_{edge} AS MATERIALIZED (")),
+                    "edge {edge}: {sql}"
+                );
             }
         }
     }
@@ -1630,9 +2259,23 @@ mod tests {
     #[tokio::test]
     async fn the_chain_plan_grows_with_the_edges_not_exponentially() {
         let client = own_scratch_db("hecks_host_mint_chain_plan_size").await;
-        journal::ensure_schema(&client).await.expect("ensure_schema");
-        let aggregates = vec![Aggregate { name: "Registration".to_string(), storage_name: "registration".to_string() }];
-        hold_first(&client, "Plan", "era 1", &serde_json::json!({"name": "Plan", "aggregates": []}), &aggregates, None).await.expect("hold_first");
+        journal::ensure_schema(&client)
+            .await
+            .expect("ensure_schema");
+        let aggregates = vec![Aggregate {
+            name: "Registration".to_string(),
+            storage_name: "registration".to_string(),
+        }];
+        hold_first(
+            &client,
+            "Plan",
+            "era 1",
+            &serde_json::json!({"name": "Plan", "aggregates": []}),
+            &aggregates,
+            None,
+        )
+        .await
+        .expect("hold_first");
 
         let mut heavy = "hecks_tr_drop(state, ARRAY['attendee', 'name']::text[])".to_string();
         for field in ["first_name", "last_name", "phone", "how_heard", "aim"] {
@@ -1640,24 +2283,53 @@ mod tests {
         }
         let mut edges = vec![edge_of("e1", "e2", "Registration", &heavy)];
         for n in 2..=11 {
-            edges.push(edge_of(&format!("e{n}"), &format!("e{}", n + 1), "Registration", "state"));
+            edges.push(edge_of(
+                &format!("e{n}"),
+                &format!("e{}", n + 1),
+                "Registration",
+                "state",
+            ));
         }
-        edges.push(edge_of("e12", "e13", "Registration", &backfill_expression("state", &["status"], "\"active\"")));
+        edges.push(edge_of(
+            "e12",
+            "e13",
+            "Registration",
+            &backfill_expression("state", &["status"], "\"active\""),
+        ));
 
         let watermarks = std::collections::HashMap::new();
         let plan_lines = |chain: &[&Edge], materialize: bool| {
-            let sql = chain_sql_with("Plan", "Registration", (chain.len() + 1) as i32, chain, &watermarks, materialize);
+            let sql = chain_sql_with(
+                "Plan",
+                "Registration",
+                (chain.len() + 1) as i32,
+                chain,
+                &watermarks,
+                materialize,
+            );
             let client = &client;
-            async move { client.query(&format!("EXPLAIN (COSTS OFF) {sql}"), &[]).await.expect("explain").len() }
+            async move {
+                client
+                    .query(&format!("EXPLAIN (COSTS OFF) {sql}"), &[])
+                    .await
+                    .expect("explain")
+                    .len()
+            }
         };
 
         let all: Vec<&Edge> = edges.iter().collect();
         let fenced_12 = plan_lines(&all, true).await;
         let fenced_6 = plan_lines(&all[..6], true).await;
-        assert!(fenced_12 < 2 * fenced_6.max(500), "12 fenced edges plan to {fenced_12} lines, 6 to {fenced_6}");
+        assert!(
+            fenced_12 < 2 * fenced_6.max(500),
+            "12 fenced edges plan to {fenced_12} lines, 6 to {fenced_6}"
+        );
         let inlined_5 = plan_lines(&all[..5], false).await;
         let fenced_5 = plan_lines(&all[..5], true).await;
-        assert!(inlined_5 > 10 * fenced_5, "unfenced 5 edges: {inlined_5} plan lines; fenced: {fenced_5}");
+        assert!(
+            inlined_5 > 10 * fenced_5,
+            "unfenced 5 edges: {inlined_5} plan lines; fenced: {fenced_5}"
+        );
     }
 
     /// Materializing each edge's CTE must not change one row of any chain: five
@@ -1666,14 +2338,24 @@ mod tests {
     #[tokio::test]
     async fn materializing_the_edge_ctes_returns_exactly_the_rows_the_inlined_chain_does() {
         let client = own_scratch_db("hecks_host_mint_chain_differential").await;
-        journal::ensure_schema(&client).await.expect("ensure_schema");
+        journal::ensure_schema(&client)
+            .await
+            .expect("ensure_schema");
         let domain = "Chain";
         let aggregates = vec![
-            Aggregate { name: "Registration".to_string(), storage_name: "registration".to_string() },
-            Aggregate { name: "Event".to_string(), storage_name: "event".to_string() },
+            Aggregate {
+                name: "Registration".to_string(),
+                storage_name: "registration".to_string(),
+            },
+            Aggregate {
+                name: "Event".to_string(),
+                storage_name: "event".to_string(),
+            },
         ];
         let ir = serde_json::json!({"name": domain, "aggregates": []});
-        hold_first(&client, domain, "era 1", &ir, &aggregates, None).await.expect("hold_first");
+        hold_first(&client, domain, "era 1", &ir, &aggregates, None)
+            .await
+            .expect("hold_first");
 
         // Edge 1 backfills four nested paths; edges 2 and 3 carry no rule (as
         // most of a real deployment's edges do); edge 4 backfills one more.
@@ -1681,17 +2363,23 @@ mod tests {
         for field in ["first_name", "last_name", "phone", "aim"] {
             nested = backfill_expression(&nested, &["attendee", field], "\"(none)\"");
         }
-        let edges = vec![
+        let edges = [
             edge_of("e1", "e2", "Registration", &nested),
             edge_of("e2", "e3", "Event", "state"),
             edge_of("e3", "e4", "Event", "state"),
-            edge_of("e4", "e5", "Registration", &backfill_expression("state", &["status"], "\"active\"")),
+            edge_of(
+                "e4",
+                "e5",
+                "Registration",
+                &backfill_expression("state", &["status"], "\"active\""),
+            ),
         ];
 
         let journal_name = "hecks_journal_chain";
         let insert = |era: i32, aggregate: &str, id: &str, operation: &str, state: Value| {
             let client = &client;
-            let (aggregate, id, operation) = (aggregate.to_string(), id.to_string(), operation.to_string());
+            let (aggregate, id, operation) =
+                (aggregate.to_string(), id.to_string(), operation.to_string());
             async move {
                 client
                     .execute(
@@ -1704,36 +2392,86 @@ mod tests {
         };
         for era in 1..=5i32 {
             // era 1 carries the old attendee shape, later eras the new one
-            let attendee = |n: &str| if era == 1 { serde_json::json!({"name": n, "email": "a@example.com"}) } else { serde_json::json!({"first_name": n, "email": "a@example.com"}) };
+            let attendee = |n: &str| {
+                if era == 1 {
+                    serde_json::json!({"name": n, "email": "a@example.com"})
+                } else {
+                    serde_json::json!({"first_name": n, "email": "a@example.com"})
+                }
+            };
             for i in 0..6 {
                 let id = format!("r{}", (era as usize + i) % 5);
-                insert(era, "registration", &id, "save", serde_json::json!({"attendee": attendee(&format!("n{era}{i}"))})).await;
+                insert(
+                    era,
+                    "registration",
+                    &id,
+                    "save",
+                    serde_json::json!({"attendee": attendee(&format!("n{era}{i}"))}),
+                )
+                .await;
             }
-            insert(era, "event", &format!("e{era}"), "save", serde_json::json!({"name": {"value": format!("event {era}")}})).await;
-            insert(era, "event", "e1", "save", serde_json::json!({"name": {"value": "renamed"}})).await;
+            insert(
+                era,
+                "event",
+                &format!("e{era}"),
+                "save",
+                serde_json::json!({"name": {"value": format!("event {era}")}}),
+            )
+            .await;
+            insert(
+                era,
+                "event",
+                "e1",
+                "save",
+                serde_json::json!({"name": {"value": "renamed"}}),
+            )
+            .await;
             if era == 3 {
                 insert(era, "registration", "r0", "delete", Value::Null).await;
             }
             if era < 5 {
                 let chain: Vec<&Edge> = edges[..era as usize].iter().collect();
-                mint_era(&client, domain, era + 1, &"h".repeat(64), &format!("e{}", era + 1), "text", &aggregates, &chain, None, &[]).await.expect("mint_era");
+                mint_era(
+                    &client,
+                    domain,
+                    era + 1,
+                    &"h".repeat(64),
+                    &format!("e{}", era + 1),
+                    "text",
+                    &aggregates,
+                    &chain,
+                    None,
+                    &[],
+                )
+                .await
+                .expect("mint_era");
             }
         }
 
         let held = journal::held_eras(&client, domain).await.unwrap();
-        let watermarks: std::collections::HashMap<i32, Option<i64>> = held.iter().map(|h| (h.ordinal, h.watermark)).collect();
+        let watermarks: std::collections::HashMap<i32, Option<i64>> =
+            held.iter().map(|h| (h.ordinal, h.watermark)).collect();
         let mut compared = 0;
         for aggregate in &aggregates {
             for n in 1..=edges.len() {
                 let chain: Vec<&Edge> = edges[..n].iter().collect();
                 let era = (n + 1) as i32;
-                let inlined = chain_sql_with(domain, &aggregate.name, era, &chain, &watermarks, false);
-                let fenced = chain_sql_with(domain, &aggregate.name, era, &chain, &watermarks, true);
+                let inlined =
+                    chain_sql_with(domain, &aggregate.name, era, &chain, &watermarks, false);
+                let fenced =
+                    chain_sql_with(domain, &aggregate.name, era, &chain, &watermarks, true);
                 assert_ne!(inlined, fenced, "the two forms really differ");
                 assert!(fenced.contains("AS MATERIALIZED (") && !inlined.contains("MATERIALIZED"));
 
-                let (a, b) = (raw_rows(&client, &inlined).await, raw_rows(&client, &fenced).await);
-                assert!(!a.is_empty(), "{} chain of {n}: the fixture yields rows", aggregate.name);
+                let (a, b) = (
+                    raw_rows(&client, &inlined).await,
+                    raw_rows(&client, &fenced).await,
+                );
+                assert!(
+                    !a.is_empty(),
+                    "{} chain of {n}: the fixture yields rows",
+                    aggregate.name
+                );
                 assert_eq!(a, b, "{} chain of {n}: raw rows", aggregate.name);
                 assert_eq!(
                     latest_of(&client, &inlined).await.unwrap(),
@@ -1746,9 +2484,25 @@ mod tests {
         }
         assert_eq!(compared, 8);
         // and the fixture exercised what it claims to: a backfilled status reached the head
-        let translated = translated_latest(&client, domain, "Registration", 5, &edges.iter().collect::<Vec<_>>(), &watermarks).await.unwrap();
-        assert!(translated.values().all(|state| state["status"] == "active"), "{translated:?}");
-        assert_eq!(translated.len(), 5, "five registrations were ever saved: {translated:?}");
+        let translated = translated_latest(
+            &client,
+            domain,
+            "Registration",
+            5,
+            &edges.iter().collect::<Vec<_>>(),
+            &watermarks,
+        )
+        .await
+        .unwrap();
+        assert!(
+            translated.values().all(|state| state["status"] == "active"),
+            "{translated:?}"
+        );
+        assert_eq!(
+            translated.len(),
+            5,
+            "five registrations were ever saved: {translated:?}"
+        );
     }
 
     // Layer 2, proven live both directions: an edge whose declared rules agree
@@ -1764,21 +2518,47 @@ mod tests {
         tokio::spawn(async move {
             let _ = admin_connection.await;
         });
-        let _ = admin_client.batch_execute(&format!("DROP DATABASE IF EXISTS {db} WITH (FORCE)")).await;
-        admin_client.batch_execute(&format!("CREATE DATABASE {db}")).await.expect("create scratch db");
-        let _ = admin_client.batch_execute(&format!("DROP ROLE IF EXISTS {owner}")).await;
-        admin_client.batch_execute(&format!("CREATE ROLE {owner} {}", crate::test_pg::login_clause())).await.expect("create owner role");
-        admin_client.batch_execute(&format!("GRANT CONNECT ON DATABASE {db} TO {owner}")).await.expect("grant connect");
-
-        let grant = tokio_postgres::connect(&crate::test_pg::conninfo(&db), NoTls).await;
-        let (grant_client, grant_connection) = grant.expect("connect to scratch db as superuser to grant schema rights");
+        let _ = admin_client
+            .batch_execute(&format!("DROP DATABASE IF EXISTS {db} WITH (FORCE)"))
+            .await;
+        admin_client
+            .batch_execute(&format!("CREATE DATABASE {db}"))
+            .await
+            .expect("create scratch db");
+        let _ = admin_client
+            .batch_execute(&format!("DROP ROLE IF EXISTS {owner}"))
+            .await;
+        admin_client
+            .batch_execute(&format!(
+                "CREATE ROLE {owner} {}",
+                crate::test_pg::login_clause()
+            ))
+            .await
+            .expect("create owner role");
+        admin_client
+            .batch_execute(&format!("GRANT CONNECT ON DATABASE {db} TO {owner}"))
+            .await
+            .expect("grant connect");
+
+        let grant = tokio_postgres::connect(&crate::test_pg::conninfo(db), NoTls).await;
+        let (grant_client, grant_connection) =
+            grant.expect("connect to scratch db as superuser to grant schema rights");
         tokio::spawn(async move {
             let _ = grant_connection.await;
         });
-        grant_client.batch_execute(&format!("GRANT USAGE, CREATE ON SCHEMA public TO {owner}")).await.expect("grant schema rights");
-        grant_client.batch_execute(&format!("ALTER DATABASE {db} OWNER TO {owner}")).await.expect("make owner the db owner");
+        grant_client
+            .batch_execute(&format!("GRANT USAGE, CREATE ON SCHEMA public TO {owner}"))
+            .await
+            .expect("grant schema rights");
+        grant_client
+            .batch_execute(&format!("ALTER DATABASE {db} OWNER TO {owner}"))
+            .await
+            .expect("make owner the db owner");
 
-        let (client, connection) = tokio_postgres::connect(&crate::test_pg::conninfo_as(&db, &owner), NoTls).await.expect("connect as owner");
+        let (client, connection) =
+            tokio_postgres::connect(&crate::test_pg::conninfo_as(db, owner), NoTls)
+                .await
+                .expect("connect as owner");
         tokio::spawn(async move {
             let _ = connection.await;
         });
@@ -1803,17 +2583,43 @@ mod tests {
         }
         let v1_ir = shape("cost");
         let v2_ir = shape("amount");
-        let aggregate = Aggregate { name: "Widget".to_string(), storage_name: "widget".to_string() };
+        let aggregate = Aggregate {
+            name: "Widget".to_string(),
+            storage_name: "widget".to_string(),
+        };
         let from_label = storage_shape::mint_label(&v1_ir);
         let to_label = storage_shape::mint_label(&v2_ir);
 
-        async fn seed_era_one(client: &tokio_postgres::Client, domain: &str, v1_ir: &Value, aggregate: &Aggregate) {
-            hold_first(client, domain, "v1 source text", v1_ir, std::slice::from_ref(aggregate), None).await.expect("hold_first");
-            let config = journal::LineageConfig { domain: domain.to_string(), era: Some(1), mirrored: None };
+        async fn seed_era_one(
+            client: &tokio_postgres::Client,
+            domain: &str,
+            v1_ir: &Value,
+            aggregate: &Aggregate,
+        ) {
+            hold_first(
+                client,
+                domain,
+                "v1 source text",
+                v1_ir,
+                std::slice::from_ref(aggregate),
+                None,
+            )
+            .await
+            .expect("hold_first");
+            let config = journal::LineageConfig {
+                domain: domain.to_string(),
+                era: Some(1),
+                mirrored: None,
+            };
             journal::append_lineage_mutation(
                 client,
                 &config,
-                &journal::Mutation { aggregate: "Widget", id: "w1", operation: "save", state: &serde_json::json!({"cost": {"cents": 100}, "kind": {"label": "w1"}}) },
+                &journal::Mutation {
+                    aggregate: "Widget",
+                    id: "w1",
+                    operation: "save",
+                    state: &serde_json::json!({"cost": {"cents": 100}, "kind": {"label": "w1"}}),
+                },
             )
             .await
             .expect("write w1 under era 1");
@@ -1829,7 +2635,6 @@ mod tests {
             aggregates: vec![EdgeAggregate {
                 name: "Widget".to_string(),
                 was: None,
-                has_compute_or_rekey: false,
                 compiled_state_expression: "hecks_tr_rename(state, 'cost', 'amount')".to_string(),
                 compiled_id_expression: None,
             }],
@@ -1838,10 +2643,20 @@ mod tests {
             "domain": honest_domain, "from": from_label, "to": to_label,
             "aggregates": [{"name": "Widget", "renames": {"cost": "amount"}}]
         })];
-        let watermarks: std::collections::HashMap<i32, Option<i64>> = [(1, None)].into_iter().collect();
-        audit_before_mint(&client, honest_domain, &v2_ir, &[aggregate.clone()], 2, &[&honest_edge], &honest_raw_edges, &watermarks)
-            .await
-            .expect("an honest edge's audit must pass silently");
+        let watermarks: std::collections::HashMap<i32, Option<i64>> =
+            std::iter::once((1, None)).collect();
+        audit_before_mint(
+            &client,
+            honest_domain,
+            &v2_ir,
+            std::slice::from_ref(&aggregate),
+            2,
+            &[&honest_edge],
+            &honest_raw_edges,
+            &watermarks,
+        )
+        .await
+        .expect("an honest edge's audit must pass silently");
 
         // The lying edge: declared `renames:` claims a different destination
         // than the compiled SQL produces — the exact bug this audit exists to
@@ -1855,11 +2670,23 @@ mod tests {
             // still renames it to `amount`. A real divergence.
             "aggregates": [{"name": "Widget", "renames": {"cost": "price"}}]
         })];
-        let error = audit_before_mint(&client, lying_domain, &v2_ir, &[aggregate], 2, &[&lying_edge], &lying_raw_edges, &watermarks)
-            .await
-            .expect_err("a declared rename that disagrees with the compiled SQL must refuse");
+        let error = audit_before_mint(
+            &client,
+            lying_domain,
+            &v2_ir,
+            &[aggregate],
+            2,
+            &[&lying_edge],
+            &lying_raw_edges,
+            &watermarks,
+        )
+        .await
+        .expect_err("a declared rename that disagrees with the compiled SQL must refuse");
         let message = format!("{error:#}");
         assert!(message.contains("the audit refused"), "{message}");
-        assert!(message.contains("diverges from the reference transform"), "{message}");
+        assert!(
+            message.contains("diverges from the reference transform"),
+            "{message}"
+        );
     }
 }