@vellumai/assistant 0.4.26 → 0.4.29

package/src/memory/migrations/120-fk-cascade-rebuilds.ts

@@ -1,4 +1,4 @@
-import { type DrizzleDb, getSqliteFrom } from '../db-connection.js';
+import { type DrizzleDb, getSqliteFrom } from "../db-connection.js";
 
 /**
  * Rebuild messages, task_runs, and assistant_ingress_members tables to add
@@ -16,16 +16,21 @@ export function migrateFkCascadeRebuilds(database: DrizzleDb): void {
   rebuildAssistantIngressMembers(raw);
 }
 
-function hasCascade(raw: ReturnType<typeof getSqliteFrom>, tableName: string): boolean {
-  const row = raw.query(`SELECT sql FROM sqlite_master WHERE type='table' AND name=?`).get(tableName) as { sql: string } | null;
+function hasCascade(
+  raw: ReturnType<typeof getSqliteFrom>,
+  tableName: string,
+): boolean {
+  const row = raw
+    .query(`SELECT sql FROM sqlite_master WHERE type='table' AND name=?`)
+    .get(tableName) as { sql: string } | null;
   if (!row) return true; // table doesn't exist yet — will be created with correct DDL
-  return row.sql.includes('ON DELETE CASCADE');
+  return row.sql.includes("ON DELETE CASCADE");
 }
 
 function rebuildMessages(raw: ReturnType<typeof getSqliteFrom>): void {
-  if (hasCascade(raw, 'messages')) return;
+  if (hasCascade(raw, "messages")) return;
 
-  raw.exec('PRAGMA foreign_keys = OFF');
+  raw.exec("PRAGMA foreign_keys = OFF");
   try {
     raw.exec(/*sql*/ `
       BEGIN;
@@ -71,17 +76,21 @@ function rebuildMessages(raw: ReturnType<typeof getSqliteFrom>): void {
       COMMIT;
     `);
   } catch (e) {
-    try { raw.exec('ROLLBACK'); } catch { /* no active transaction */ }
+    try {
+      raw.exec("ROLLBACK");
+    } catch {
+      /* no active transaction */
+    }
     throw e;
   } finally {
-    raw.exec('PRAGMA foreign_keys = ON');
+    raw.exec("PRAGMA foreign_keys = ON");
   }
 }
 
 function rebuildTaskRuns(raw: ReturnType<typeof getSqliteFrom>): void {
-  if (hasCascade(raw, 'task_runs')) return;
+  if (hasCascade(raw, "task_runs")) return;
 
-  raw.exec('PRAGMA foreign_keys = OFF');
+  raw.exec("PRAGMA foreign_keys = OFF");
   try {
     raw.exec(/*sql*/ `
       BEGIN;
@@ -108,17 +117,23 @@ function rebuildTaskRuns(raw: ReturnType<typeof getSqliteFrom>): void {
       COMMIT;
     `);
   } catch (e) {
-    try { raw.exec('ROLLBACK'); } catch { /* no active transaction */ }
+    try {
+      raw.exec("ROLLBACK");
+    } catch {
+      /* no active transaction */
+    }
     throw e;
   } finally {
-    raw.exec('PRAGMA foreign_keys = ON');
+    raw.exec("PRAGMA foreign_keys = ON");
   }
 }
 
-function rebuildAssistantIngressMembers(raw: ReturnType<typeof getSqliteFrom>): void {
-  if (hasCascade(raw, 'assistant_ingress_members')) return;
+function rebuildAssistantIngressMembers(
+  raw: ReturnType<typeof getSqliteFrom>,
+): void {
+  if (hasCascade(raw, "assistant_ingress_members")) return;
 
-  raw.exec('PRAGMA foreign_keys = OFF');
+  raw.exec("PRAGMA foreign_keys = OFF");
   try {
     raw.exec(/*sql*/ `
       BEGIN;
@@ -153,9 +168,13 @@ function rebuildAssistantIngressMembers(raw: ReturnType<typeof getSqliteFrom>):
       COMMIT;
     `);
   } catch (e) {
-    try { raw.exec('ROLLBACK'); } catch { /* no active transaction */ }
+    try {
+      raw.exec("ROLLBACK");
+    } catch {
+      /* no active transaction */
+    }
     throw e;
   } finally {
-    raw.exec('PRAGMA foreign_keys = ON');
+    raw.exec("PRAGMA foreign_keys = ON");
   }
 }

package/src/memory/migrations/121-canonical-guardian-requests.ts

@@ -1,4 +1,4 @@
-import type { DrizzleDb } from '../db-connection.js';
+import type { DrizzleDb } from "../db-connection.js";
 
 /**
  * Create canonical_guardian_requests and canonical_guardian_deliveries tables.
@@ -33,12 +33,24 @@ export function createCanonicalGuardianTables(database: DrizzleDb): void {
     )
   `);
 
-  database.run(/*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_status ON canonical_guardian_requests(status)`);
-  database.run(/*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_guardian ON canonical_guardian_requests(guardian_external_user_id, status)`);
-  database.run(/*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_conversation ON canonical_guardian_requests(conversation_id, status)`);
-  database.run(/*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_source ON canonical_guardian_requests(source_type, status)`);
-  database.run(/*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_kind ON canonical_guardian_requests(kind, status)`);
-  database.run(/*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_request_code ON canonical_guardian_requests(request_code)`);
+  database.run(
+    /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_status ON canonical_guardian_requests(status)`,
+  );
+  database.run(
+    /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_guardian ON canonical_guardian_requests(guardian_external_user_id, status)`,
+  );
+  database.run(
+    /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_conversation ON canonical_guardian_requests(conversation_id, status)`,
+  );
+  database.run(
+    /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_source ON canonical_guardian_requests(source_type, status)`,
+  );
+  database.run(
+    /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_kind ON canonical_guardian_requests(kind, status)`,
+  );
+  database.run(
+    /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_requests_request_code ON canonical_guardian_requests(request_code)`,
+  );
 
   database.run(/*sql*/ `
     CREATE TABLE IF NOT EXISTS canonical_guardian_deliveries (
@@ -54,6 +66,10 @@ export function createCanonicalGuardianTables(database: DrizzleDb): void {
     )
   `);
 
-  database.run(/*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_deliveries_request_id ON canonical_guardian_deliveries(request_id)`);
-  database.run(/*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_deliveries_status ON canonical_guardian_deliveries(status)`);
+  database.run(
+    /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_deliveries_request_id ON canonical_guardian_deliveries(request_id)`,
+  );
+  database.run(
+    /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_deliveries_status ON canonical_guardian_deliveries(status)`,
+  );
 }

package/src/memory/migrations/122-canonical-guardian-requester-chat-id.ts

@@ -1,4 +1,4 @@
-import type { DrizzleDb } from '../db-connection.js';
+import type { DrizzleDb } from "../db-connection.js";
 
 /**
  * Add requester_chat_id column to canonical_guardian_requests.
@@ -10,6 +10,14 @@ import type { DrizzleDb } from '../db-connection.js';
  * Uses ALTER TABLE ADD COLUMN with try/catch for idempotency — no registry
  * entry needed.
  */
-export function migrateCanonicalGuardianRequesterChatId(database: DrizzleDb): void {
-  try { database.run(/*sql*/ `ALTER TABLE canonical_guardian_requests ADD COLUMN requester_chat_id TEXT`); } catch { /* already exists */ }
+export function migrateCanonicalGuardianRequesterChatId(
+  database: DrizzleDb,
+): void {
+  try {
+    database.run(
+      /*sql*/ `ALTER TABLE canonical_guardian_requests ADD COLUMN requester_chat_id TEXT`,
+    );
+  } catch {
+    /* already exists */
+  }
 }

package/src/memory/migrations/123-canonical-guardian-deliveries-destination-index.ts

@@ -1,4 +1,4 @@
-import type { DrizzleDb } from '../db-connection.js';
+import type { DrizzleDb } from "../db-connection.js";
 
 /**
  * Add composite index on canonical_guardian_deliveries(destination_channel, destination_chat_id).
@@ -8,7 +8,9 @@ import type { DrizzleDb } from '../db-connection.js';
  * guardian replies back to canonical requests. Without an index these
  * degrade to full table scans as delivery history grows.
  */
-export function migrateCanonicalGuardianDeliveriesDestinationIndex(database: DrizzleDb): void {
+export function migrateCanonicalGuardianDeliveriesDestinationIndex(
+  database: DrizzleDb,
+): void {
   database.run(
     /*sql*/ `CREATE INDEX IF NOT EXISTS idx_canonical_guardian_deliveries_destination ON canonical_guardian_deliveries(destination_channel, destination_chat_id)`,
   );

package/src/memory/migrations/124-voice-invite-display-metadata.ts

@@ -1,4 +1,4 @@
-import type { DrizzleDb } from '../db-connection.js';
+import type { DrizzleDb } from "../db-connection.js";
 
 /**
  * Add display metadata columns to assistant_ingress_invites for personalized
@@ -9,6 +9,18 @@ import type { DrizzleDb } from '../db-connection.js';
  * - guardian_name: the name of the guardian who created the invite (used in prompts)
  */
 export function migrateVoiceInviteDisplayMetadata(database: DrizzleDb): void {
-  try { database.run(/*sql*/ `ALTER TABLE assistant_ingress_invites ADD COLUMN friend_name TEXT`); } catch { /* already exists */ }
-  try { database.run(/*sql*/ `ALTER TABLE assistant_ingress_invites ADD COLUMN guardian_name TEXT`); } catch { /* already exists */ }
+  try {
+    database.run(
+      /*sql*/ `ALTER TABLE assistant_ingress_invites ADD COLUMN friend_name TEXT`,
+    );
+  } catch {
+    /* already exists */
+  }
+  try {
+    database.run(
+      /*sql*/ `ALTER TABLE assistant_ingress_invites ADD COLUMN guardian_name TEXT`,
+    );
+  } catch {
+    /* already exists */
+  }
 }

package/src/memory/migrations/125-guardian-principal-id-columns.ts

@@ -1,4 +1,4 @@
-import type { DrizzleDb } from '../db-connection.js';
+import type { DrizzleDb } from "../db-connection.js";
 
 /**
  * Add guardian_principal_id columns to channel_guardian_bindings and
@@ -13,7 +13,25 @@ import type { DrizzleDb } from '../db-connection.js';
  * Uses ALTER TABLE ADD COLUMN with try/catch for idempotency.
  */
 export function migrateGuardianPrincipalIdColumns(database: DrizzleDb): void {
-  try { database.run(/*sql*/ `ALTER TABLE channel_guardian_bindings ADD COLUMN guardian_principal_id TEXT`); } catch { /* already exists */ }
-  try { database.run(/*sql*/ `ALTER TABLE canonical_guardian_requests ADD COLUMN guardian_principal_id TEXT`); } catch { /* already exists */ }
-  try { database.run(/*sql*/ `ALTER TABLE canonical_guardian_requests ADD COLUMN decided_by_principal_id TEXT`); } catch { /* already exists */ }
+  try {
+    database.run(
+      /*sql*/ `ALTER TABLE channel_guardian_bindings ADD COLUMN guardian_principal_id TEXT`,
+    );
+  } catch {
+    /* already exists */
+  }
+  try {
+    database.run(
+      /*sql*/ `ALTER TABLE canonical_guardian_requests ADD COLUMN guardian_principal_id TEXT`,
+    );
+  } catch {
+    /* already exists */
+  }
+  try {
+    database.run(
+      /*sql*/ `ALTER TABLE canonical_guardian_requests ADD COLUMN decided_by_principal_id TEXT`,
+    );
+  } catch {
+    /* already exists */
+  }
 }

package/src/memory/migrations/126-backfill-guardian-principal-id.ts

@@ -1,5 +1,5 @@
-import { type DrizzleDb, getSqliteFrom } from '../db-connection.js';
-import { withCrashRecovery } from './validate-migration-state.js';
+import { type DrizzleDb, getSqliteFrom } from "../db-connection.js";
+import { withCrashRecovery } from "./validate-migration-state.js";
 
 /**
  * Backfill guardianPrincipalId for existing channel_guardian_bindings and
@@ -32,31 +32,40 @@ import { withCrashRecovery } from './validate-migration-state.js';
  *    guardianPrincipalId.
  */
 export function migrateBackfillGuardianPrincipalId(database: DrizzleDb): void {
-  withCrashRecovery(database, 'migration_backfill_guardian_principal_id_v3', () => {
-    const raw = getSqliteFrom(database);
-
-    // Guard: tables must exist
-    const bindingsTableExists = raw.query(
-      `SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'channel_guardian_bindings'`,
-    ).get();
-    if (!bindingsTableExists) return;
-
-    const requestsTableExists = raw.query(
-      `SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'canonical_guardian_requests'`,
-    ).get();
-
-    // Guard: guardian_principal_id column must exist on bindings table
-    const bindingColExists = raw.query(
-      `SELECT 1 FROM pragma_table_info('channel_guardian_bindings') WHERE name = 'guardian_principal_id'`,
-    ).get();
-    if (!bindingColExists) return;
-
-    try {
-      raw.exec('BEGIN');
-
-      // ── Step 1a: Backfill vellum binding first ─────────────────────
-      // The vellum binding's external user ID IS the canonical principal.
-      raw.exec(/*sql*/ `
+  withCrashRecovery(
+    database,
+    "migration_backfill_guardian_principal_id_v3",
+    () => {
+      const raw = getSqliteFrom(database);
+
+      // Guard: tables must exist
+      const bindingsTableExists = raw
+        .query(
+          `SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'channel_guardian_bindings'`,
+        )
+        .get();
+      if (!bindingsTableExists) return;
+
+      const requestsTableExists = raw
+        .query(
+          `SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'canonical_guardian_requests'`,
+        )
+        .get();
+
+      // Guard: guardian_principal_id column must exist on bindings table
+      const bindingColExists = raw
+        .query(
+          `SELECT 1 FROM pragma_table_info('channel_guardian_bindings') WHERE name = 'guardian_principal_id'`,
+        )
+        .get();
+      if (!bindingColExists) return;
+
+      try {
+        raw.exec("BEGIN");
+
+        // ── Step 1a: Backfill vellum binding first ─────────────────────
+        // The vellum binding's external user ID IS the canonical principal.
+        raw.exec(/*sql*/ `
         UPDATE channel_guardian_bindings
         SET guardian_principal_id = guardian_external_user_id,
             updated_at = ${Date.now()}
@@ -66,27 +75,31 @@ export function migrateBackfillGuardianPrincipalId(database: DrizzleDb): void {
           AND guardian_principal_id IS NULL
       `);
 
-      // ── Step 1b: Derive canonical principal from vellum binding ──
-      const vellumRow = raw.query(
-        `SELECT guardian_principal_id FROM channel_guardian_bindings
+        // ── Step 1b: Derive canonical principal from vellum binding ──
+        const vellumRow = raw
+          .query(
+            `SELECT guardian_principal_id FROM channel_guardian_bindings
          WHERE assistant_id = 'self' AND channel = 'vellum' AND status = 'active'
          AND guardian_principal_id IS NOT NULL LIMIT 1`,
-      ).get() as { guardian_principal_id: string } | null;
+          )
+          .get() as { guardian_principal_id: string } | null;
 
-      if (vellumRow) {
-        // Unify non-vellum bindings onto the canonical principal
-        raw.query(
-          `UPDATE channel_guardian_bindings
+        if (vellumRow) {
+          // Unify non-vellum bindings onto the canonical principal
+          raw
+            .query(
+              `UPDATE channel_guardian_bindings
            SET guardian_principal_id = ?,
                updated_at = ${Date.now()}
            WHERE status = 'active'
              AND channel != 'vellum'
              AND guardian_external_user_id IS NOT NULL
              AND guardian_principal_id IS NULL`,
-        ).run(vellumRow.guardian_principal_id);
-      } else {
-        // No vellum binding — fallback to channel-specific principal
-        raw.exec(/*sql*/ `
+            )
+            .run(vellumRow.guardian_principal_id);
+        } else {
+          // No vellum binding — fallback to channel-specific principal
+          raw.exec(/*sql*/ `
           UPDATE channel_guardian_bindings
           SET guardian_principal_id = guardian_external_user_id,
               updated_at = ${Date.now()}
@@ -94,117 +107,152 @@ export function migrateBackfillGuardianPrincipalId(database: DrizzleDb): void {
             AND guardian_external_user_id IS NOT NULL
             AND guardian_principal_id IS NULL
         `);
-      }
+        }
+
+        // ── Step 2: Derive assistant principal from vellum binding ─────
+        // The vellum binding's guardianExternalUserId is the canonical
+        // assistant principal used for desktop-originated requests.
+        const vellumBinding = raw
+          .query(
+            `SELECT guardian_external_user_id, guardian_principal_id FROM channel_guardian_bindings WHERE assistant_id = 'self' AND channel = 'vellum' AND status = 'active' LIMIT 1`,
+          )
+          .get() as {
+          guardian_external_user_id: string;
+          guardian_principal_id: string | null;
+        } | null;
+
+        // Use the (now-backfilled) principal from the vellum binding
+        const assistantPrincipal =
+          vellumBinding?.guardian_principal_id ??
+          vellumBinding?.guardian_external_user_id ??
+          null;
+
+        // ── Step 3: Backfill canonical_guardian_requests ────────────────
+        if (requestsTableExists) {
+          const requestColExists = raw
+            .query(
+              `SELECT 1 FROM pragma_table_info('canonical_guardian_requests') WHERE name = 'guardian_principal_id'`,
+            )
+            .get();
+
+          if (requestColExists) {
+            const now = new Date().toISOString();
 
-      // ── Step 2: Derive assistant principal from vellum binding ─────
-      // The vellum binding's guardianExternalUserId is the canonical
-      // assistant principal used for desktop-originated requests.
-      const vellumBinding = raw.query(
-        `SELECT guardian_external_user_id, guardian_principal_id FROM channel_guardian_bindings WHERE assistant_id = 'self' AND channel = 'vellum' AND status = 'active' LIMIT 1`,
-      ).get() as { guardian_external_user_id: string; guardian_principal_id: string | null } | null;
-
-      // Use the (now-backfilled) principal from the vellum binding
-      const assistantPrincipal = vellumBinding?.guardian_principal_id ?? vellumBinding?.guardian_external_user_id ?? null;
-
-      // ── Step 3: Backfill canonical_guardian_requests ────────────────
-      if (requestsTableExists) {
-        const requestColExists = raw.query(
-          `SELECT 1 FROM pragma_table_info('canonical_guardian_requests') WHERE name = 'guardian_principal_id'`,
-        ).get();
-
-        if (requestColExists) {
-          const now = new Date().toISOString();
-
-          // 3a. Pending requests with a guardianExternalUserId that maps
-          // to an active binding — use the binding's principal.
-          // Includes all kinds; binding is always useful when available.
-          const pendingWithGuardian = raw.query(
-            `SELECT r.id, r.guardian_external_user_id, r.kind
+            // 3a. Pending requests with a guardianExternalUserId that maps
+            // to an active binding — use the binding's principal.
+            // Includes all kinds; binding is always useful when available.
+            const pendingWithGuardian = raw
+              .query(
+                `SELECT r.id, r.guardian_external_user_id, r.kind
              FROM canonical_guardian_requests r
              WHERE r.status = 'pending'
                AND r.guardian_principal_id IS NULL
                AND r.guardian_external_user_id IS NOT NULL`,
-          ).all() as Array<{ id: string; guardian_external_user_id: string; kind: string }>;
+              )
+              .all() as Array<{
+              id: string;
+              guardian_external_user_id: string;
+              kind: string;
+            }>;
 
-          // Build a lookup of guardianExternalUserId -> principalId from
-          // active bindings (all already backfilled in step 1).
-          const activeBindings = raw.query(
-            `SELECT guardian_external_user_id, guardian_principal_id
+            // Build a lookup of guardianExternalUserId -> principalId from
+            // active bindings (all already backfilled in step 1).
+            const activeBindings = raw
+              .query(
+                `SELECT guardian_external_user_id, guardian_principal_id
              FROM channel_guardian_bindings
              WHERE assistant_id = 'self' AND status = 'active' AND guardian_principal_id IS NOT NULL`,
-          ).all() as Array<{ guardian_external_user_id: string; guardian_principal_id: string }>;
+              )
+              .all() as Array<{
+              guardian_external_user_id: string;
+              guardian_principal_id: string;
+            }>;
 
-          const externalToP = new Map<string, string>();
-          for (const b of activeBindings) {
-            externalToP.set(b.guardian_external_user_id, b.guardian_principal_id);
-          }
+            const externalToP = new Map<string, string>();
+            for (const b of activeBindings) {
+              externalToP.set(
+                b.guardian_external_user_id,
+                b.guardian_principal_id,
+              );
+            }
+
+            const updateStmt = raw.prepare(
+              `UPDATE canonical_guardian_requests SET guardian_principal_id = ?, updated_at = ? WHERE id = ?`,
+            );
+            const expireStmt = raw.prepare(
+              `UPDATE canonical_guardian_requests SET status = 'expired', updated_at = ? WHERE id = ?`,
+            );
 
-          const updateStmt = raw.prepare(
-            `UPDATE canonical_guardian_requests SET guardian_principal_id = ?, updated_at = ? WHERE id = ?`,
-          );
-          const expireStmt = raw.prepare(
-            `UPDATE canonical_guardian_requests SET status = 'expired', updated_at = ? WHERE id = ?`,
-          );
-
-          const unboundRequestIds: string[] = [];
-
-          for (const req of pendingWithGuardian) {
-            const principal = externalToP.get(req.guardian_external_user_id);
-            if (principal) {
-              updateStmt.run(principal, now, req.id);
-            } else {
-              // Cannot deterministically map — will expire below.
-              unboundRequestIds.push(req.id);
+            const unboundRequestIds: string[] = [];
+
+            for (const req of pendingWithGuardian) {
+              const principal = externalToP.get(req.guardian_external_user_id);
+              if (principal) {
+                updateStmt.run(principal, now, req.id);
+              } else {
+                // Cannot deterministically map — will expire below.
+                unboundRequestIds.push(req.id);
+              }
             }
-          }
 
-          // 3b. Desktop-originated pending requests missing guardian info
-          // entirely — bind to the assistant principal. Only applies to
-          // requests that also lack a guardian external user ID; requests
-          // that carry an external ID but failed step 3a mapping should be
-          // expired, not reassigned.
-          if (assistantPrincipal) {
-            raw.query(
-              `UPDATE canonical_guardian_requests
+            // 3b. Desktop-originated pending requests missing guardian info
+            // entirely — bind to the assistant principal. Only applies to
+            // requests that also lack a guardian external user ID; requests
+            // that carry an external ID but failed step 3a mapping should be
+            // expired, not reassigned.
+            if (assistantPrincipal) {
+              raw
+                .query(
+                  `UPDATE canonical_guardian_requests
                SET guardian_principal_id = ?, updated_at = ?
                WHERE status = 'pending'
                  AND guardian_principal_id IS NULL
                  AND guardian_external_user_id IS NULL
                  AND (source_type = 'desktop' OR source_channel = 'vellum')`,
-            ).run(assistantPrincipal, now);
-          }
+                )
+                .run(assistantPrincipal, now);
+            }
 
-          // 3c. Expire remaining pending requests that still have no
-          // guardian_principal_id. These requests can never be approved
-          // in the principal-based system, so they must be expired
-          // proactively. This includes access_request rows which are
-          // now decisionable and principal-bound.
-          const stillUnbound = raw.query(
-            `SELECT id FROM canonical_guardian_requests
+            // 3c. Expire remaining pending requests that still have no
+            // guardian_principal_id. These requests can never be approved
+            // in the principal-based system, so they must be expired
+            // proactively. This includes access_request rows which are
+            // now decisionable and principal-bound.
+            const stillUnbound = raw
+              .query(
+                `SELECT id FROM canonical_guardian_requests
              WHERE guardian_principal_id IS NULL
                AND status = 'pending'`,
-          ).all() as Array<{ id: string }>;
+              )
+              .all() as Array<{ id: string }>;
 
-          for (const req of stillUnbound) {
-            expireStmt.run(now, req.id);
-          }
+            for (const req of stillUnbound) {
+              expireStmt.run(now, req.id);
+            }
 
-          // Also expire requests identified in 3a that had no binding match.
-          for (const id of unboundRequestIds) {
-            const check = raw.query(
-              `SELECT guardian_principal_id FROM canonical_guardian_requests WHERE id = ? AND status = 'pending'`,
-            ).get(id) as { guardian_principal_id: string | null } | null;
-            if (check && !check.guardian_principal_id) {
-              expireStmt.run(now, id);
+            // Also expire requests identified in 3a that had no binding match.
+            for (const id of unboundRequestIds) {
+              const check = raw
+                .query(
+                  `SELECT guardian_principal_id FROM canonical_guardian_requests WHERE id = ? AND status = 'pending'`,
+                )
+                .get(id) as { guardian_principal_id: string | null } | null;
+              if (check && !check.guardian_principal_id) {
+                expireStmt.run(now, id);
+              }
             }
           }
         }
-      }
 
-      raw.exec('COMMIT');
-    } catch (e) {
-      try { raw.exec('ROLLBACK'); } catch { /* no active transaction */ }
-      throw e;
-    }
-  });
+        raw.exec("COMMIT");
+      } catch (e) {
+        try {
+          raw.exec("ROLLBACK");
+        } catch {
+          /* no active transaction */
+        }
+        throw e;
+      }
+    },
+  );
 }