@fuzdev/fuz_app 0.110.1 → 0.112.0

package/dist/auth/migrations.js

@@ -227,6 +227,16 @@ export const auth_migrations = [
         up: async (db) => {
             await db.query('CREATE INDEX IF NOT EXISTS idx_audit_log_metadata ON audit_log USING gin (metadata jsonb_path_ops)');
         }
+    },
+    // Drops `auth_session.last_seen_at`. The session lifetime is a hard cap
+    // set at mint — nothing updates the column post-mint on either spine, so
+    // it always equalled `created_at` (a decorative false signal the UIs
+    // stopped showing when the listings re-sorted by `created_at`).
+    {
+        name: 'drop_session_last_seen_at',
+        up: async (db) => {
+            await db.query('ALTER TABLE auth_session DROP COLUMN IF EXISTS last_seen_at');
+        }
     }
 ];
 /** Pre-composed migration namespace for auth tables. */

package/dist/auth/role_grant_offer_ddl.d.ts

@@ -1,6 +1,7 @@
 /**
- * Role grant offer DDL — `CREATE TABLE` + index statements and the index-side
- * sentinel constants the queries / migrations interpolate.
+ * Role grant offer DDL — `CREATE TABLE` + index statements, the index-side
+ * sentinel constants the queries / migrations interpolate, and the table's
+ * `ROLE_GRANT_OFFER_COLUMNS` projection const.
  *
  * Separated from `auth/role_grant_offer_schema.ts` so the schema module stays
  * Zod-only (paired with `auth/auth_ddl.ts` and `auth/audit_log_ddl.ts`).
@@ -22,6 +23,37 @@ export declare const ROLE_GRANT_OFFER_SCOPE_SENTINEL_UUID = "00000000-0000-0000-
  * `scope_kind = NULL` and `scope_id = NULL` together encode the global case.
  */
 export declare const ROLE_GRANT_OFFER_SCOPE_KIND_GLOBAL_TOKEN = "GLOBAL";
+/**
+ * The full `role_grant_offer` column set, named explicitly so a row read
+ * fails loud on schema drift (see `ACCOUNT_COLUMNS` in
+ * `auth/account_queries.ts` for the outage class). Column order follows
+ * `RoleGrantOffer` and `ROLE_GRANT_OFFER_SCHEMA` below.
+ *
+ * Lives here rather than in `auth/role_grant_offer_queries.ts` because two
+ * query modules project this table — see the placement rule in
+ * `db/sql_columns.ts`.
+ */
+export declare const ROLE_GRANT_OFFER_COLUMNS: readonly ["id", "from_actor_id", "to_account_id", "to_actor_id", "role", "scope_kind", "scope_id", "message", "created_at", "expires_at", "accepted_at", "declined_at", "decline_reason", "retracted_at", "superseded_at", "resulting_role_grant_id"];
+/**
+ * The `role_grant_offer` timestamp override, by row qualifier (`''` bare,
+ * `o` for the history JOIN, `u` for the `updated` CTE's outer select). Lives
+ * beside the const for the same reason the const does — both query modules
+ * that project this table need it.
+ *
+ * A cascade's inner `RETURNING` deliberately projects the *raw* columns: the
+ * outer select over the `updated` CTE applies this, and `to_char` over an
+ * already-formatted text column would fail.
+ */
+export declare const role_grant_offer_expr: (alias: string) => import("../db/sql_columns.js").ColumnExpr;
+/**
+ * Outer `SELECT` over an `updated` CTE of `role_grant_offer` rows, joining
+ * the grantor's `account_id` on as `from_account_id` — the `SupersededOffer` /
+ * `DeclinedOffer` shape every offer-superseding cascade returns (the revoke
+ * cascades in `auth/role_grant_queries.ts`, decline + accept-supersede in
+ * `auth/role_grant_offer_queries.ts`). The CTE must be named `updated` and
+ * `RETURNING` the full offer row.
+ */
+export declare const ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT: string;
 export declare const ROLE_GRANT_OFFER_SCHEMA = "\nCREATE TABLE IF NOT EXISTS role_grant_offer (\n  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),\n  from_actor_id UUID NOT NULL REFERENCES actor(id) ON DELETE CASCADE,\n  to_account_id UUID NOT NULL REFERENCES account(id) ON DELETE CASCADE,\n  to_actor_id UUID NULL REFERENCES actor(id) ON DELETE CASCADE,\n  role TEXT NOT NULL,\n  scope_kind TEXT NULL,\n  scope_id UUID NULL,\n  message TEXT NULL,\n  created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),\n  expires_at TIMESTAMPTZ NOT NULL,\n  accepted_at TIMESTAMPTZ NULL,\n  declined_at TIMESTAMPTZ NULL,\n  decline_reason TEXT NULL,\n  retracted_at TIMESTAMPTZ NULL,\n  superseded_at TIMESTAMPTZ NULL,\n  resulting_role_grant_id UUID NULL REFERENCES role_grant(id) ON DELETE SET NULL,\n  CONSTRAINT role_grant_offer_single_terminal CHECK (\n    (accepted_at IS NOT NULL)::int\n    + (declined_at IS NOT NULL)::int\n    + (retracted_at IS NOT NULL)::int\n    + (superseded_at IS NOT NULL)::int\n    <= 1\n  ),\n  CONSTRAINT role_grant_offer_role_grant_iff_accepted CHECK (\n    (accepted_at IS NOT NULL) = (resulting_role_grant_id IS NOT NULL)\n  ),\n  CONSTRAINT role_grant_offer_reason_iff_declined CHECK (\n    decline_reason IS NULL OR declined_at IS NOT NULL\n  ),\n  CONSTRAINT role_grant_offer_scope_kind_paired CHECK (\n    (scope_kind IS NULL) = (scope_id IS NULL)\n  )\n)";
 /**
  * At most one pending offer per (to_account, role, scope_kind, scope, from_actor).

package/dist/auth/role_grant_offer_ddl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role_grant_offer_ddl.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/auth/role_grant_offer_ddl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,mHAAmH;AACnH,eAAO,MAAM,oCAAoC,yCAAyC,CAAC;AAE3F;;;;;GAKG;AACH,eAAO,MAAM,wCAAwC,WAAW,CAAC;AAEjE,eAAO,MAAM,uBAAuB,qzCAkClC,CAAC;AAEH;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qCAAqC,2XAYpB,CAAC;AAE/B,+EAA+E;AAC/E,eAAO,MAAM,4BAA4B,kOAMX,CAAC"}
+{"version":3,"file":"role_grant_offer_ddl.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/auth/role_grant_offer_ddl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,mHAAmH;AACnH,eAAO,MAAM,oCAAoC,yCAAyC,CAAC;AAE3F;;;;;GAKG;AACH,eAAO,MAAM,wCAAwC,WAAW,CAAC;AAEjE;;;;;;;;;GASG;AACH,eAAO,MAAM,wBAAwB,uPAiBmB,CAAC;AAEzD;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,8DAOhC,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,oCAAoC,QAMI,CAAC;AAEtD,eAAO,MAAM,uBAAuB,qzCAkClC,CAAC;AAEH;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qCAAqC,2XAYpB,CAAC;AAE/B,+EAA+E;AAC/E,eAAO,MAAM,4BAA4B,kOAMX,CAAC"}

package/dist/auth/role_grant_offer_ddl.js

@@ -1,6 +1,7 @@
 /**
- * Role grant offer DDL — `CREATE TABLE` + index statements and the index-side
- * sentinel constants the queries / migrations interpolate.
+ * Role grant offer DDL — `CREATE TABLE` + index statements, the index-side
+ * sentinel constants the queries / migrations interpolate, and the table's
+ * `ROLE_GRANT_OFFER_COLUMNS` projection const.
  *
  * Separated from `auth/role_grant_offer_schema.ts` so the schema module stays
  * Zod-only (paired with `auth/auth_ddl.ts` and `auth/audit_log_ddl.ts`).
@@ -13,6 +14,7 @@
  *
  * @module
  */
+import { iso8601_timestamp_expr, qualify_columns } from '../db/sql_columns.js';
 /** Sentinel UUID used inside the partial unique indexes to collapse `scope_id IS NULL` into a comparable value. */
 export const ROLE_GRANT_OFFER_SCOPE_SENTINEL_UUID = '00000000-0000-0000-0000-000000000000';
 /**
@@ -22,6 +24,63 @@ export const ROLE_GRANT_OFFER_SCOPE_SENTINEL_UUID = '00000000-0000-0000-0000-000
  * `scope_kind = NULL` and `scope_id = NULL` together encode the global case.
  */
 export const ROLE_GRANT_OFFER_SCOPE_KIND_GLOBAL_TOKEN = 'GLOBAL';
+/**
+ * The full `role_grant_offer` column set, named explicitly so a row read
+ * fails loud on schema drift (see `ACCOUNT_COLUMNS` in
+ * `auth/account_queries.ts` for the outage class). Column order follows
+ * `RoleGrantOffer` and `ROLE_GRANT_OFFER_SCHEMA` below.
+ *
+ * Lives here rather than in `auth/role_grant_offer_queries.ts` because two
+ * query modules project this table — see the placement rule in
+ * `db/sql_columns.ts`.
+ */
+export const ROLE_GRANT_OFFER_COLUMNS = [
+    'id',
+    'from_actor_id',
+    'to_account_id',
+    'to_actor_id',
+    'role',
+    'scope_kind',
+    'scope_id',
+    'message',
+    'created_at',
+    'expires_at',
+    'accepted_at',
+    'declined_at',
+    'decline_reason',
+    'retracted_at',
+    'superseded_at',
+    'resulting_role_grant_id'
+];
+/**
+ * The `role_grant_offer` timestamp override, by row qualifier (`''` bare,
+ * `o` for the history JOIN, `u` for the `updated` CTE's outer select). Lives
+ * beside the const for the same reason the const does — both query modules
+ * that project this table need it.
+ *
+ * A cascade's inner `RETURNING` deliberately projects the *raw* columns: the
+ * outer select over the `updated` CTE applies this, and `to_char` over an
+ * already-formatted text column would fail.
+ */
+export const role_grant_offer_expr = iso8601_timestamp_expr(ROLE_GRANT_OFFER_COLUMNS, [
+    'created_at',
+    'expires_at',
+    'accepted_at',
+    'declined_at',
+    'retracted_at',
+    'superseded_at'
+]);
+/**
+ * Outer `SELECT` over an `updated` CTE of `role_grant_offer` rows, joining
+ * the grantor's `account_id` on as `from_account_id` — the `SupersededOffer` /
+ * `DeclinedOffer` shape every offer-superseding cascade returns (the revoke
+ * cascades in `auth/role_grant_queries.ts`, decline + accept-supersede in
+ * `auth/role_grant_offer_queries.ts`). The CTE must be named `updated` and
+ * `RETURNING` the full offer row.
+ */
+export const ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT = `SELECT ${qualify_columns(ROLE_GRANT_OFFER_COLUMNS, 'u', role_grant_offer_expr('u'))}, grantor.account_id AS from_account_id
+		FROM updated u
+		JOIN actor grantor ON grantor.id = u.from_actor_id`;
 export const ROLE_GRANT_OFFER_SCHEMA = `
 CREATE TABLE IF NOT EXISTS role_grant_offer (
   id UUID PRIMARY KEY DEFAULT gen_random_uuid(),

package/dist/auth/role_grant_offer_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role_grant_offer_queries.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/auth/role_grant_offer_queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"role_grant_offer_queries.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/auth/role_grant_offer_queries.ts"],"names":[],"mappings":"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"}

package/dist/auth/role_grant_offer_queries.js

@@ -12,7 +12,9 @@
  * @module
  */
 import { assert_row } from '../db/assert_row.js';
-import { ROLE_GRANT_OFFER_SCOPE_KIND_GLOBAL_TOKEN, ROLE_GRANT_OFFER_SCOPE_SENTINEL_UUID } from './role_grant_offer_ddl.js';
+import { columns_sql, qualify_columns } from '../db/sql_columns.js';
+import { ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr, ROLE_GRANT_OFFER_SCOPE_KIND_GLOBAL_TOKEN, ROLE_GRANT_OFFER_SCOPE_SENTINEL_UUID, ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT } from './role_grant_offer_ddl.js';
+import { query_create_role_grant, query_role_grant_by_id } from './role_grant_queries.js';
 import { query_audit_log } from './audit_log_queries.js';
 /**
  * Error thrown by offer-lifecycle queries when the offer is in a non-pending
@@ -152,7 +154,7 @@ export const query_role_grant_offer_create = async (deps, input) => {
 			 to_actor_id = EXCLUDED.to_actor_id,
 			 message = EXCLUDED.message,
 			 expires_at = EXCLUDED.expires_at
-		 RETURNING *`, [
+		 RETURNING ${columns_sql(ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr(''))}`, [
         input.from_actor_id,
         input.to_account_id,
         input.to_actor_id ?? null,
@@ -191,11 +193,10 @@ export const query_role_grant_offer_decline = async (deps, offer_id, to_account_
 			  AND declined_at IS NULL
 			  AND retracted_at IS NULL
 			  AND superseded_at IS NULL
-			RETURNING *
+			-- raw columns; the outer grantor select formats them
+			RETURNING ${columns_sql(ROLE_GRANT_OFFER_COLUMNS)}
 		)
-		SELECT u.*, grantor.account_id AS from_account_id
-		FROM updated u
-		JOIN actor grantor ON grantor.id = u.from_actor_id`, [offer_id, to_account_id, reason ?? null]);
+		${ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT}`, [offer_id, to_account_id, reason ?? null]);
     if (updated)
         return updated;
     return resolve_terminal_or_missing(deps, offer_id, { to_account_id });
@@ -220,7 +221,7 @@ export const query_role_grant_offer_retract = async (deps, offer_id, from_actor_
 		   AND declined_at IS NULL
 		   AND retracted_at IS NULL
 		   AND superseded_at IS NULL
-		 RETURNING *`, [offer_id, from_actor_id]);
+		 RETURNING ${columns_sql(ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr(''))}`, [offer_id, from_actor_id]);
     if (updated)
         return updated;
     return resolve_terminal_or_missing(deps, offer_id, { from_actor_id });
@@ -238,7 +239,7 @@ const resolve_terminal_or_missing = async (deps, offer_id, scope) => {
         conditions.push(`from_actor_id = $${idx++}`);
         params.push(scope.from_actor_id);
     }
-    const row = await deps.db.query_one(`SELECT * FROM role_grant_offer WHERE ${conditions.join(' AND ')}`, params);
+    const row = await deps.db.query_one(`SELECT ${columns_sql(ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr(''))} FROM role_grant_offer WHERE ${conditions.join(' AND ')}`, params);
     if (!row)
         return null;
     if (row.accepted_at || row.declined_at || row.retracted_at || row.superseded_at) {
@@ -254,14 +255,14 @@ const resolve_terminal_or_missing = async (deps, offer_id, scope) => {
  * sweep (`query_role_grant_offer_sweep_expired`) handles audit tombstoning.
  */
 export const query_role_grant_offer_list = async (deps, to_account_id) => {
-    return deps.db.query(`SELECT * FROM role_grant_offer
+    return deps.db.query(`SELECT ${columns_sql(ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr(''))} FROM role_grant_offer
 		 WHERE to_account_id = $1
 		   AND accepted_at IS NULL
 		   AND declined_at IS NULL
 		   AND retracted_at IS NULL
 		   AND superseded_at IS NULL
 		   AND expires_at > NOW()
-		 ORDER BY expires_at ASC`, [to_account_id]);
+		 ORDER BY role_grant_offer.expires_at ASC`, [to_account_id]);
 };
 /**
  * List every offer involving an account (either direction), newest first.
@@ -269,7 +270,7 @@ export const query_role_grant_offer_list = async (deps, to_account_id) => {
  * Includes terminal offers — used by the grantor-side admin / history view.
  */
 export const query_role_grant_offer_history_for_account = async (deps, account_id, limit = 100, offset = 0) => {
-    return deps.db.query(`SELECT o.* FROM role_grant_offer o
+    return deps.db.query(`SELECT ${qualify_columns(ROLE_GRANT_OFFER_COLUMNS, 'o', role_grant_offer_expr('o'))} FROM role_grant_offer o
 		 LEFT JOIN actor a ON a.id = o.from_actor_id
 		 WHERE o.to_account_id = $1 OR a.account_id = $1
 		 ORDER BY o.created_at DESC
@@ -280,7 +281,7 @@ export const query_role_grant_offer_history_for_account = async (deps, account_i
  * expired (server-side filter), or missing.
  */
 export const query_role_grant_offer_find_pending = async (deps, offer_id) => {
-    const row = await deps.db.query_one(`SELECT * FROM role_grant_offer
+    const row = await deps.db.query_one(`SELECT ${columns_sql(ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr(''))} FROM role_grant_offer
 		 WHERE id = $1
 		   AND accepted_at IS NULL
 		   AND declined_at IS NULL
@@ -298,13 +299,13 @@ export const query_role_grant_offer_find_pending = async (deps, offer_id) => {
  * already exists for the offer id).
  */
 export const query_role_grant_offer_sweep_expired = async (deps) => {
-    return deps.db.query(`SELECT * FROM role_grant_offer
+    return deps.db.query(`SELECT ${columns_sql(ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr(''))} FROM role_grant_offer
 		 WHERE accepted_at IS NULL
 		   AND declined_at IS NULL
 		   AND retracted_at IS NULL
 		   AND superseded_at IS NULL
 		   AND expires_at <= NOW()
-		 ORDER BY expires_at ASC`);
+		 ORDER BY role_grant_offer.expires_at ASC`);
 };
 /**
  * Accept an offer atomically: mark accepted, insert the role_grant, stamp
@@ -346,18 +347,27 @@ export const query_accept_offer = async (deps, input) => {
     // We defer writing `accepted_at` until the role_grant row exists — the
     // `role_grant_offer_role_grant_iff_accepted` CHECK constraint demands both be set
     // (or neither) at row-visibility time.
-    const locked = await deps.db.query_one(`SELECT * FROM role_grant_offer
+    //
+    // Trailing `expires_at > NOW() AS still_valid` rides on the FOR UPDATE row
+    // so the expiry branch below compares the **raw** column on Postgres' clock
+    // — the projected `expires_at` is floored to the second, so comparing it in
+    // JS would report expiry up to a second early. Twin of the Rust
+    // `query_accept_offer`'s `o.expires_at > NOW() AS still_valid`.
+    const locked_row = await deps.db.query_one(`SELECT ${columns_sql(ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr(''))},
+		        role_grant_offer.expires_at > NOW() AS still_valid
+		 FROM role_grant_offer
 		 WHERE id = $1 AND to_account_id = $2
 		 FOR UPDATE`, [offer_id, to_account_id]);
-    if (!locked) {
+    if (!locked_row) {
         throw new RoleGrantOfferNotFoundError(offer_id);
     }
+    // `still_valid` is the comparison result, not a column of the offer — split
+    // it off so `locked` stays exactly `ROLE_GRANT_OFFER_COLUMNS`.
+    const { still_valid, ...locked } = locked_row;
     if (locked.accepted_at) {
         // Race winner already committed; return the pre-existing role_grant.
         // `role_grant_offer_role_grant_iff_accepted` CHECK guarantees resulting_role_grant_id is non-null.
-        const role_grant = assert_row(await deps.db.query_one(`SELECT * FROM role_grant WHERE id = $1`, [
-            locked.resulting_role_grant_id
-        ]), 'resulting_role_grant lookup');
+        const role_grant = assert_row(await query_role_grant_by_id(deps, locked.resulting_role_grant_id), 'resulting_role_grant lookup');
         // Multi-actor guard: two actors on the same recipient account may
         // both race an account-grain offer — the loser must not silently
         // receive the winner's role_grant (which would tell them "you got it"
@@ -379,8 +389,9 @@ export const query_accept_offer = async (deps, input) => {
     }
     // Expiry check AFTER the accepted-path: a validly-accepted offer past its
     // expires_at still returns the role_grant idempotently. Only pending offers
-    // past expiry reach this branch.
-    if (new Date(locked.expires_at) <= new Date()) {
+    // past expiry reach this branch. `still_valid` rode on the FOR UPDATE row
+    // above, so the comparison stays on the raw column and Postgres' clock.
+    if (!still_valid) {
         throw new RoleGrantOfferExpiredError(offer_id);
     }
     // Actor-targeted offer gate. When the offer is account-grain
@@ -411,37 +422,22 @@ export const query_accept_offer = async (deps, input) => {
     if (!actor_check) {
         throw new Error(`Accepting actor ${actor_id} does not belong to account ${to_account_id} (offer ${offer_id})`);
     }
-    // Insert the role_grant. Uses the normal grant idempotency — if another
-    // code path already granted the same (actor, role, scope_kind, scope), reuse it.
-    const granted_role_grant = await deps.db.query_one(`INSERT INTO role_grant (actor_id, role, scope_kind, scope_id, granted_by, source_offer_id)
-		 VALUES ($1, $2, $3, $4, $5, $6)
-		 ON CONFLICT (
-		   actor_id,
-		   role,
-		   COALESCE(scope_kind, '${ROLE_GRANT_OFFER_SCOPE_KIND_GLOBAL_TOKEN}'),
-		   COALESCE(scope_id, '${ROLE_GRANT_OFFER_SCOPE_SENTINEL_UUID}'::uuid)
-		 )
-		   WHERE revoked_at IS NULL
-		 DO NOTHING
-		 RETURNING *`, [actor_id, locked.role, locked.scope_kind, locked.scope_id, locked.from_actor_id, locked.id]);
-    let role_grant;
-    if (granted_role_grant) {
-        role_grant = granted_role_grant;
-    }
-    else {
-        const existing = await deps.db.query_one(`SELECT * FROM role_grant
-			 WHERE actor_id = $1
-			   AND role = $2
-			   AND scope_kind IS NOT DISTINCT FROM $3
-			   AND scope_id IS NOT DISTINCT FROM $4
-			   AND revoked_at IS NULL`, [actor_id, locked.role, locked.scope_kind, locked.scope_id]);
-        role_grant = assert_row(existing, 'query_accept_offer idempotent role_grant lookup');
-    }
+    // Insert the role_grant through the shared idempotent grant — if another
+    // code path already granted the same (actor, role, scope_kind, scope), it
+    // returns that row. Stamps the grantor and the source offer on the row.
+    const role_grant = await query_create_role_grant(deps, {
+        actor_id,
+        role: locked.role,
+        scope_kind: locked.scope_kind,
+        scope_id: locked.scope_id,
+        granted_by: locked.from_actor_id,
+        source_offer_id: locked.id
+    });
     // Single UPDATE sets both sides of the CHECK constraint at once.
     const offer_accepted = await deps.db.query_one(`UPDATE role_grant_offer
 		 SET accepted_at = NOW(), resulting_role_grant_id = $2
 		 WHERE id = $1
-		 RETURNING *`, [locked.id, role_grant.id]);
+		 RETURNING ${columns_sql(ROLE_GRANT_OFFER_COLUMNS, role_grant_offer_expr(''))}`, [locked.id, role_grant.id]);
     const offer = assert_row(offer_accepted, 'mark offer accepted');
     // Supersede sibling pending offers for the same (to_account, role, scope).
     // Forecloses the "accept this other sibling later to get the role back
@@ -459,13 +455,12 @@ export const query_accept_offer = async (deps, input) => {
 			  AND declined_at IS NULL
 			  AND retracted_at IS NULL
 			  AND superseded_at IS NULL
-			RETURNING *
+			-- raw columns; the outer grantor select formats them
+			RETURNING ${columns_sql(ROLE_GRANT_OFFER_COLUMNS)}
 		)
-		SELECT u.*, grantor.account_id AS from_account_id
-		FROM updated u
-		JOIN actor grantor ON grantor.id = u.from_actor_id`, [to_account_id, offer.role, offer.scope_id, offer.id]);
+		${ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT}`, [to_account_id, offer.role, offer.scope_id, offer.id]);
     // Emit audit events in-transaction (atomic with the role_grant insert).
-    // `RETURNING *` after the SET guarantees `offer.resulting_role_grant_id === role_grant.id`.
+    // The `RETURNING` after the SET guarantees `offer.resulting_role_grant_id === role_grant.id`.
     // Accept binds the actor deterministically — populate both target
     // columns to mirror `role_grant_create` (the in-tx pair) so forensic
     // queries don't have to split between the two events.

package/dist/auth/role_grant_queries.d.ts

@@ -10,6 +10,15 @@ import type { Uuid } from '@fuzdev/fuz_util/id.ts';
 import type { QueryDeps } from '../db/query_deps.js';
 import type { RoleGrant, CreateRoleGrantInput } from './account_schema.js';
 import type { SupersededOffer } from './role_grant_offer_schema.js';
+/**
+ * The full `role_grant` column set, named explicitly so a row read fails loud
+ * on schema drift (see `ACCOUNT_COLUMNS` in `auth/account_queries.ts` for the
+ * outage class). Column order follows `RoleGrant` — the frozen `fuz_auth` v0
+ * body plus the appended `scope_kind` / `scope_id` / `revoked_reason` /
+ * `source_offer_id` columns. Keep in sync with `RoleGrant` and the
+ * `role_grant` migration chain in `auth/auth_ddl.ts`.
+ */
+export declare const ROLE_GRANT_COLUMNS: readonly ["id", "actor_id", "role", "scope_kind", "scope_id", "created_at", "expires_at", "revoked_at", "revoked_by", "revoked_reason", "granted_by", "source_offer_id"];
 /**
  * Grant a role_grant to an actor.
  * Idempotent — if an active role_grant already exists for this actor, role, and
@@ -31,6 +40,15 @@ import type { SupersededOffer } from './role_grant_offer_schema.js';
  * @mutates `role_grant` table - inserts a row when no active role_grant matches `(actor_id, role, scope_kind, scope_id)`
  */
 export declare const query_create_role_grant: (deps: QueryDeps, input: CreateRoleGrantInput) => Promise<RoleGrant>;
+/**
+ * Find a role_grant by id, regardless of revoked / expired state.
+ *
+ * Unscoped by design — the one caller is `query_accept_offer`'s race-loser
+ * path, which resolves an already-accepted offer's `resulting_role_grant_id`
+ * (a row the offer's own IDOR guard has already vouched for). Authority
+ * checks stay at the call site.
+ */
+export declare const query_role_grant_by_id: (deps: QueryDeps, id: Uuid) => Promise<RoleGrant | undefined>;
 /**
  * Look up the role of an active role_grant (constrained to a specific
  * actor) plus the actor's `account_id`.

package/dist/auth/role_grant_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role_grant_queries.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/auth/role_grant_queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"role_grant_queries.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/auth/role_grant_queries.ts"],"names":[],"mappings":"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"}

package/dist/auth/role_grant_queries.js

@@ -7,7 +7,41 @@
  * @module
  */
 import { assert_row } from '../db/assert_row.js';
-import { ROLE_GRANT_OFFER_SCOPE_KIND_GLOBAL_TOKEN, ROLE_GRANT_OFFER_SCOPE_SENTINEL_UUID } from './role_grant_offer_ddl.js';
+import { columns_sql, iso8601_timestamp_expr, qualify_columns } from '../db/sql_columns.js';
+import { ROLE_GRANT_OFFER_COLUMNS, ROLE_GRANT_OFFER_SCOPE_KIND_GLOBAL_TOKEN, ROLE_GRANT_OFFER_SCOPE_SENTINEL_UUID, ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT } from './role_grant_offer_ddl.js';
+/**
+ * The full `role_grant` column set, named explicitly so a row read fails loud
+ * on schema drift (see `ACCOUNT_COLUMNS` in `auth/account_queries.ts` for the
+ * outage class). Column order follows `RoleGrant` — the frozen `fuz_auth` v0
+ * body plus the appended `scope_kind` / `scope_id` / `revoked_reason` /
+ * `source_offer_id` columns. Keep in sync with `RoleGrant` and the
+ * `role_grant` migration chain in `auth/auth_ddl.ts`.
+ */
+export const ROLE_GRANT_COLUMNS = [
+    'id',
+    'actor_id',
+    'role',
+    'scope_kind',
+    'scope_id',
+    'created_at',
+    'expires_at',
+    'revoked_at',
+    'revoked_by',
+    'revoked_reason',
+    'granted_by',
+    'source_offer_id'
+];
+/**
+ * The `role_grant` timestamp override; every read here is on the bare table.
+ * `created_at` / `expires_at` ride `RoleGrantSummaryJson` (twin of the
+ * spine's `role_grant_summary_columns`); `revoked_at` is what
+ * `is_role_grant_active` reads.
+ */
+const role_grant_expr = iso8601_timestamp_expr(ROLE_GRANT_COLUMNS, [
+    'created_at',
+    'expires_at',
+    'revoked_at'
+])('');
 /**
  * Grant a role_grant to an actor.
  * Idempotent — if an active role_grant already exists for this actor, role, and
@@ -39,7 +73,7 @@ export const query_create_role_grant = async (deps, input) => {
 		 )
 		   WHERE revoked_at IS NULL
 		 DO NOTHING
-		 RETURNING *`, [
+		 RETURNING ${columns_sql(ROLE_GRANT_COLUMNS, role_grant_expr)}`, [
         input.actor_id,
         input.role,
         input.scope_kind ?? null,
@@ -51,7 +85,7 @@ export const query_create_role_grant = async (deps, input) => {
     if (inserted)
         return inserted;
     // Active role_grant already exists — return it (idempotent grant).
-    const existing = await deps.db.query_one(`SELECT * FROM role_grant
+    const existing = await deps.db.query_one(`SELECT ${columns_sql(ROLE_GRANT_COLUMNS, role_grant_expr)} FROM role_grant
 		 WHERE actor_id = $1
 		   AND role = $2
 		   AND scope_kind IS NOT DISTINCT FROM $3
@@ -59,6 +93,15 @@ export const query_create_role_grant = async (deps, input) => {
 		   AND revoked_at IS NULL`, [input.actor_id, input.role, input.scope_kind ?? null, input.scope_id ?? null]);
     return assert_row(existing, 'idempotent role_grant grant');
 };
+/**
+ * Find a role_grant by id, regardless of revoked / expired state.
+ *
+ * Unscoped by design — the one caller is `query_accept_offer`'s race-loser
+ * path, which resolves an already-accepted offer's `resulting_role_grant_id`
+ * (a row the offer's own IDOR guard has already vouched for). Authority
+ * checks stay at the call site.
+ */
+export const query_role_grant_by_id = async (deps, id) => deps.db.query_one(`SELECT ${columns_sql(ROLE_GRANT_COLUMNS, role_grant_expr)} FROM role_grant WHERE id = $1`, [id]);
 /**
  * Look up the role of an active role_grant (constrained to a specific
  * actor) plus the actor's `account_id`.
@@ -136,11 +179,10 @@ export const query_revoke_role_grant = async (deps, role_grant_id, actor_id, rev
 			  AND o.declined_at IS NULL
 			  AND o.retracted_at IS NULL
 			  AND o.superseded_at IS NULL
-			RETURNING o.*
+			-- raw columns; the outer grantor select formats them
+			RETURNING ${qualify_columns(ROLE_GRANT_OFFER_COLUMNS, 'o')}
 		)
-		SELECT u.*, grantor.account_id AS from_account_id
-		FROM updated u
-		JOIN actor grantor ON grantor.id = u.from_actor_id`, [actor_id, revoked.role, revoked.scope_id]);
+		${ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT}`, [actor_id, revoked.role, revoked.scope_id]);
     return {
         id: revoked.id,
         role: revoked.role,
@@ -153,11 +195,11 @@ export const query_revoke_role_grant = async (deps, role_grant_id, actor_id, rev
  * Find all active (non-revoked, non-expired) role_grants for an actor.
  */
 export const query_role_grant_find_active_for_actor = async (deps, actor_id) => {
-    return deps.db.query(`SELECT * FROM role_grant
+    return deps.db.query(`SELECT ${columns_sql(ROLE_GRANT_COLUMNS, role_grant_expr)} FROM role_grant
 		 WHERE actor_id = $1
 		   AND revoked_at IS NULL
 		   AND (expires_at IS NULL OR expires_at > NOW())
-		 ORDER BY created_at`, [actor_id]);
+		 ORDER BY role_grant.created_at`, [actor_id]);
 };
 /**
  * Check if an actor has an active role_grant for a given role.
@@ -284,7 +326,7 @@ export const query_count_active_accounts_with_global_role = async (deps, role) =
  * List all role_grants for an actor (including revoked/expired).
  */
 export const query_role_grant_list_for_actor = async (deps, actor_id) => {
-    return deps.db.query(`SELECT * FROM role_grant WHERE actor_id = $1 ORDER BY created_at DESC`, [actor_id]);
+    return deps.db.query(`SELECT ${columns_sql(ROLE_GRANT_COLUMNS, role_grant_expr)} FROM role_grant WHERE actor_id = $1 ORDER BY role_grant.created_at DESC`, [actor_id]);
 };
 /**
  * Find the account ID of an account that holds an active role_grant for a given role.
@@ -366,11 +408,10 @@ export const query_role_grant_revoke_for_scope = async (deps, scope_id, revoked_
 			  AND o.declined_at IS NULL
 			  AND o.retracted_at IS NULL
 			  AND o.superseded_at IS NULL
-			RETURNING o.*
+			-- raw columns; the outer grantor select formats them
+			RETURNING ${qualify_columns(ROLE_GRANT_OFFER_COLUMNS, 'o')}
 		)
-		SELECT u.*, grantor.account_id AS from_account_id
-		FROM updated u
-		JOIN actor grantor ON grantor.id = u.from_actor_id`, [scope_id]);
+		${ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT}`, [scope_id]);
     return { revoked, superseded_offers };
 };
 /**
@@ -420,10 +461,9 @@ export const query_role_grant_revoke_role = async (deps, actor_id, role, revoked
 			  AND o.declined_at IS NULL
 			  AND o.retracted_at IS NULL
 			  AND o.superseded_at IS NULL
-			RETURNING o.*
+			-- raw columns; the outer grantor select formats them
+			RETURNING ${qualify_columns(ROLE_GRANT_OFFER_COLUMNS, 'o')}
 		)
-		SELECT u.*, grantor.account_id AS from_account_id
-		FROM updated u
-		JOIN actor grantor ON grantor.id = u.from_actor_id`, [actor_id, role]);
+		${ROLE_GRANT_OFFER_WITH_GRANTOR_SELECT}`, [actor_id, role]);
     return { revoked, superseded_offers };
 };

package/dist/auth/session_queries.d.ts

@@ -43,6 +43,17 @@ export declare const generate_session_token: () => string;
  * @mutates `auth_session` table - inserts a row keyed by `token_hash`
  */
 export declare const query_create_session: (deps: QueryDeps, token_hash: string, account_id: string, expires_at: Date) => Promise<void>;
+/**
+ * The full `auth_session` column set, named explicitly so a row read fails
+ * loud on schema drift — `SELECT *` would silently carry a dropped or
+ * leftover column into the strict-validated wire shapes (see
+ * `ACCOUNT_COLUMNS` in `auth/account_queries.ts` for the outage class this
+ * discipline exists to prevent; the Rust twin already names columns at every
+ * session site). Keep in sync with `AuthSession` and the migration chain's
+ * end state — not the frozen v0 DDL in `auth/auth_ddl.ts`, which still
+ * creates `last_seen_at` for the appended drop migration to remove.
+ */
+export declare const AUTH_SESSION_COLUMNS: readonly ["id", "account_id", "created_at", "expires_at"];
 /**
  * Get a session if it exists, is not expired, and has not been revoked.
  *
@@ -132,9 +143,7 @@ export declare const query_session_enforce_limit: (deps: QueryDeps, account_id:
  * List all active sessions across all accounts with usernames.
  *
  * Ordered by `created_at DESC` (newest session first), matching the
- * per-account listing. `last_seen_at` is still selected for the wire shape
- * but is decorative — nothing updates it post-mint (it always equals
- * `created_at`); it is slated for removal on its own twin migration.
+ * per-account listing.
  *
  * @param deps - query dependencies
  * @param limit - maximum entries to return

package/dist/auth/session_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session_queries.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/auth/session_queries.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,QAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,SAElD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAAO,MAEzC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,GAChC,MAAM,SAAS,EACf,YAAY,MAAM,EAClB,YAAY,MAAM,EAClB,YAAY,IAAI,KACd,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GACnC,MAAM,SAAS,EACf,YAAY,MAAM,KAChB,OAAO,CAAC,WAAW,GAAG,SAAS,CAKjC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qCAAqC,GACjD,MAAM,SAAS,EACf,YAAY,MAAM,KAChB,OAAO,CAAC,IAAI,CAEd,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gCAAgC,GAC5C,MAAM,SAAS,EACf,YAAY,MAAM,EAClB,YAAY,MAAM,KAChB,OAAO,CAAC,OAAO,CAMjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oCAAoC,GAChD,MAAM,SAAS,EACf,YAAY,MAAM,KAChB,OAAO,CAAC,MAAM,CAMhB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B,GAC1C,MAAM,SAAS,EACf,YAAY,MAAM,EAClB,cAAU,KACR,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAK5B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,eAAO,MAAM,2BAA2B,GACvC,MAAM,SAAS,EACf,YAAY,MAAM,EAClB,cAAc,MAAM,KAClB,OAAO,CAAC,MAAM,CAYhB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,6BAA6B,GACzC,MAAM,SAAS,EACf,cAAW,KACT,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CASnD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,GAAU,MAAM,SAAS,KAAG,OAAO,CAAC,MAAM,CAKnF,CAAC"}
+{"version":3,"file":"session_queries.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/auth/session_queries.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,QAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,SAElD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAAO,MAEzC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,GAChC,MAAM,SAAS,EACf,YAAY,MAAM,EAClB,YAAY,MAAM,EAClB,YAAY,IAAI,KACd,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,2DAKoB,CAAC;AAQtD;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GACnC,MAAM,SAAS,EACf,YAAY,MAAM,KAChB,OAAO,CAAC,WAAW,GAAG,SAAS,CAKjC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qCAAqC,GACjD,MAAM,SAAS,EACf,YAAY,MAAM,KAChB,OAAO,CAAC,IAAI,CAEd,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gCAAgC,GAC5C,MAAM,SAAS,EACf,YAAY,MAAM,EAClB,YAAY,MAAM,KAChB,OAAO,CAAC,OAAO,CAMjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oCAAoC,GAChD,MAAM,SAAS,EACf,YAAY,MAAM,KAChB,OAAO,CAAC,MAAM,CAMhB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B,GAC1C,MAAM,SAAS,EACf,YAAY,MAAM,EAClB,cAAU,KACR,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAK5B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,eAAO,MAAM,2BAA2B,GACvC,MAAM,SAAS,EACf,YAAY,MAAM,EAClB,cAAc,MAAM,KAClB,OAAO,CAAC,MAAM,CAYhB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,6BAA6B,GACzC,MAAM,SAAS,EACf,cAAW,KACT,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CASnD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,GAAU,MAAM,SAAS,KAAG,OAAO,CAAC,MAAM,CAKnF,CAAC"}