@promptowl/contextnest-community 1.6.0 → 1.7.0

package/dist/{chunk-7V33Z6CS.js → chunk-QMLAXQES.js}

@@ -764,6 +764,131 @@ function runMigrations(db) {
     })();
     recordMigration("011_comments");
   }
+  if (!hasMigration("012_merge_case_colliding_users")) {
+    db.transaction(() => {
+      const { groups, merged } = mergeCaseCollidingUsers(db);
+      if (merged > 0) {
+        console.warn(
+          `[migration 012] merged ${merged} duplicate user row(s) across ${groups} case-collision group(s).`
+        );
+      }
+      db.exec(
+        "UPDATE users SET email = LOWER(email) WHERE email <> LOWER(email)"
+      );
+      db.exec(
+        "CREATE UNIQUE INDEX IF NOT EXISTS idx_users_email_nocase ON users(email COLLATE NOCASE)"
+      );
+    })();
+    recordMigration("012_merge_case_colliding_users");
+  }
+}
+function mergeCaseCollidingUsers(db) {
+  const groups = db.prepare(
+    `SELECT LOWER(email) AS le
+         FROM users
+        WHERE id != ?
+        GROUP BY LOWER(email)
+       HAVING COUNT(*) > 1`
+  ).all(ANON_USER_ID);
+  const emailCols = [
+    ["annotation_threads", "created_by"],
+    ["annotation_threads", "resolved_by"],
+    ["annotation_comments", "author"],
+    ["review_requests", "requested_by"],
+    ["review_requests", "resolved_by"],
+    ["node_versions", "author"],
+    ["approved_versions", "approved_by"],
+    ["comments", "author"],
+    ["comments", "resolved_by"],
+    ["license_cache", "owner_email"],
+    ["stewards", "assigned_by"]
+  ];
+  let merged = 0;
+  for (const { le } of groups) {
+    const rows = db.prepare(
+      `SELECT u.id, u.email, u.is_invited, u.is_admin, u.name, u.created_at,
+                (SELECT COUNT(*) FROM api_keys k WHERE k.user_id = u.id) AS keys,
+                (SELECT COUNT(*) FROM sessions s WHERE s.user_id = u.id) AS sessions
+           FROM users u
+          WHERE LOWER(u.email) = ? AND u.id != ?`
+    ).all(le, ANON_USER_ID);
+    if (rows.length < 2) continue;
+    rows.sort((a, b) => {
+      if (a.is_invited !== b.is_invited) return a.is_invited - b.is_invited;
+      const aCred = a.keys + a.sessions > 0 ? 1 : 0;
+      const bCred = b.keys + b.sessions > 0 ? 1 : 0;
+      if (aCred !== bCred) return bCred - aCred;
+      return b.created_at.localeCompare(a.created_at);
+    });
+    const winner = rows[0];
+    const losers = rows.slice(1);
+    const anyAdmin = rows.some((r) => r.is_admin) ? 1 : 0;
+    const winnerName = winner.name ?? rows.find((r) => r.name)?.name ?? null;
+    for (const loser of losers) {
+      const w = winner.id;
+      const l = loser.id;
+      const loserLower = loser.email.toLowerCase();
+      db.prepare("UPDATE sessions SET user_id = ? WHERE user_id = ?").run(w, l);
+      db.prepare(
+        "UPDATE nest_collaborators SET granted_by = ? WHERE granted_by = ?"
+      ).run(w, l);
+      db.prepare("UPDATE stewards SET user_id = ? WHERE user_id = ?").run(w, l);
+      db.prepare(
+        `UPDATE nests SET user_id = ?
+           WHERE user_id = ?
+             AND slug NOT IN (SELECT slug FROM nests WHERE user_id = ?)`
+      ).run(w, l, w);
+      db.prepare(
+        `UPDATE nests
+            SET slug = slug || '-merged-' || substr(id, 1, 8), user_id = ?
+          WHERE user_id = ?`
+      ).run(w, l);
+      db.prepare(
+        `DELETE FROM api_keys
+           WHERE user_id = ?
+             AND EXISTS (SELECT 1 FROM api_keys WHERE user_id = ?)`
+      ).run(l, w);
+      db.prepare("UPDATE api_keys SET user_id = ? WHERE user_id = ?").run(w, l);
+      db.prepare(
+        `DELETE FROM nest_collaborators
+           WHERE user_id = ?
+             AND nest_id IN (SELECT nest_id FROM nest_collaborators WHERE user_id = ?)`
+      ).run(l, w);
+      db.prepare(
+        "UPDATE nest_collaborators SET user_id = ? WHERE user_id = ?"
+      ).run(w, l);
+      db.prepare(
+        `DELETE FROM nest_collaborators
+           WHERE user_id = ?
+             AND nest_id IN (SELECT id FROM nests WHERE user_id = ?)`
+      ).run(w, w);
+      for (const [table, col] of emailCols) {
+        db.prepare(
+          `UPDATE ${table} SET ${col} = ? WHERE LOWER(${col}) = ?`
+        ).run(le, loserLower);
+      }
+      db.prepare(
+        `DELETE FROM stewards
+           WHERE is_active = 1
+             AND LOWER(user_email) = ?
+             AND id NOT IN (
+               SELECT MIN(id) FROM stewards
+                WHERE is_active = 1 AND LOWER(user_email) = ?
+                GROUP BY nest_id, scope,
+                         IFNULL(node_pattern, ''), IFNULL(tag_name, '')
+             )`
+      ).run(le, le);
+      db.prepare(
+        "UPDATE stewards SET user_email = ?, user_id = ? WHERE LOWER(user_email) = ?"
+      ).run(le, w, le);
+      db.prepare("DELETE FROM users WHERE id = ?").run(l);
+      merged++;
+    }
+    db.prepare(
+      "UPDATE users SET email = ?, is_admin = ?, name = ? WHERE id = ?"
+    ).run(le, anyAdmin, winnerName, winner.id);
+  }
+  return { groups: groups.length, merged };
 }
 
 // src/db/adapter.sqlite.ts
@@ -873,7 +998,7 @@ async function initDb() {
   if (config.DB_DRIVER === "postgres") {
     const { Pool } = await import("pg");
     const { PostgresAdapter } = await import("./adapter.postgres-YOODX2BI.js");
-    const { runPostgresMigrations } = await import("./migrations.postgres-NVJAGBSF.js");
+    const { runPostgresMigrations } = await import("./migrations.postgres-3HMGLKOV.js");
     const pool = new Pool(buildPgConfig());
     adapter = new PostgresAdapter(pool);
     await runPostgresMigrations(adapter);

package/dist/{chunk-T5L4LYU4.js → chunk-VD5QX2ZQ.js}

@@ -2,7 +2,7 @@ import {
   getDb,
   insertOrReplace,
   nowExpr
-} from "./chunk-7V33Z6CS.js";
+} from "./chunk-QMLAXQES.js";
 
 // src/governance/version-service.ts
 import { createHash } from "crypto";