@wizeworks/lens-cloud 0.3.0-alpha.2 → 0.3.0-alpha.4

package/dist/notify/digest-data.js

@@ -1,23 +1,17 @@
-import { alignNow, FACT_SLOW_QUERY_MS, pageContext, runPage, TIME_RANGES } from "@wizeworks/lens-core";
-import { cloudExecutor, cloudSettling } from "../scale-exec.js";
+import { alignNow, FACT_SLOW_QUERY_MS, pageContext, runPage, SETTLE_BEHIND_MS, TIME_RANGES } from "@wizeworks/lens-core";
 const DAY_MS = 86_400_000;
 export const RANGE_OF = { daily: "24h", weekly: "7d", monthly: "30d" };
-async function slowest(q, projectId, from, to) {
-    const rows = await q.query(`SELECT endpoint, percentile_cont(0.95) WITHIN GROUP (ORDER BY duration_ms) AS p95, count(*)::int AS n FROM fact_requests
-     WHERE project_id = $1 AND start_ms >= $2 AND start_ms < $3 GROUP BY endpoint HAVING count(*) >= 5 ORDER BY p95 DESC LIMIT 5`, [projectId, from, to]);
-    return rows.map((r) => ({ endpoint: r.endpoint, p95Ms: Number(r.p95), count: r.n }));
-}
 async function alertsFired(q, projectId, from, to) {
     const [row] = await q.query("SELECT count(*)::int AS n FROM alert_events WHERE project_id = $1 AND kind = 'fired' AND time_ms >= $2 AND time_ms < $3", [projectId, from, to]);
     return row?.n ?? 0;
 }
 /** The digest's numbers, or null when the organization keeps data for less time than the digest covers. */
-export async function digestData(q, projectId, retentionDays, period, now) {
+export async function digestData(q, t, projectId, retentionDays, period, now) {
     const range = RANGE_OF[period];
     if (TIME_RANGES[range].ms > retentionDays * DAY_MS)
         return null;
-    const pc = pageContext(range, alignNow(now), {}, { slowQueryMs: FACT_SLOW_QUERY_MS }, await cloudSettling(q, projectId));
-    const ex = cloudExecutor(q, projectId, retentionDays * DAY_MS);
+    const pc = pageContext(range, alignNow(now), {}, { slowQueryMs: FACT_SLOW_QUERY_MS }, await t.settling(projectId, { before: now - SETTLE_BEHIND_MS }));
+    const ex = t.executor(projectId, retentionDays * DAY_MS);
     const [overview, errors] = await Promise.all([runPage("overview", pc, ex), runPage("errors", pc, ex)]);
     const { from, to } = pc.window;
     const h = overview.headlines;
@@ -29,7 +23,7 @@ export async function digestData(q, projectId, retentionDays, period, now) {
         sqlQueries: h.sqlQueries,
         p95Ms: overview.timing.find((t) => t.key === "request")?.p95 ?? null,
         errors: errors.groups.slice(0, 5).map((g) => ({ type: g.type, message: g.message, count: g.count })),
-        slowest: await slowest(q, projectId, from, to),
+        slowest: await t.slowestEndpoints(projectId, { from, to }, 5, 5),
         insights: overview.insights.map((i) => ({ title: i.title, occurrences: i.occurrences })),
         alertsFired: await alertsFired(q, projectId, from, to),
     };

package/dist/notify/digest-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"digest-data.js","sourceRoot":"","sources":["../../src/notify/digest-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAiB,WAAW,EAAE,OAAO,EAAE,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AAGtI,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEhE,MAAM,MAAM,GAAG,UAAU,CAAC;AAC1B,MAAM,CAAC,MAAM,QAAQ,GAAoC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAgBxG,KAAK,UAAU,OAAO,CAAC,CAAY,EAAE,SAAiB,EAAE,IAAY,EAAE,EAAU;IAC9E,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,KAAK,CACxB;iIAC6H,EAC7H,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,CACtB,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvF,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,CAAY,EAAE,SAAiB,EAAE,IAAY,EAAE,EAAU;IAClF,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,KAAK,CAAgB,yHAAyH,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IAC7L,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,2GAA2G;AAC3G,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,CAAY,EAAE,SAAiB,EAAE,aAAqB,EAAE,MAAoB,EAAE,GAAW;IACxH,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,aAAa,GAAG,MAAM;QAAE,OAAO,IAAI,CAAC;IAChE,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,kBAAkB,EAAE,EAAE,MAAM,aAAa,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IACzH,MAAM,EAAE,GAAG,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,GAAG,MAAM,CAAC,CAAC;IAC/D,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACvG,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC;IAC/B,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC;IAC7B,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;QAC1C,QAAQ,EAAE,CAAC,CAAC,KAAK;QACjB,SAAS,EAAE,CAAC,CAAC,SAAS;QACtB,KAAK,EAAE,CAAC,CAAC,WAAW;QACpB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,EAAE,GAAG,IAAI,IAAI;QACpE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QACpG,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;QAC9C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACxF,WAAW,EAAE,MAAM,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;KACvD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"digest-data.js","sourceRoot":"","sources":["../../src/notify/digest-data.ts"],"names":[],"mappings":"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"}

package/dist/notify/digest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"digest.d.ts","sourceRoot":"","sources":["../../src/notify/digest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAI1C,OAAO,EAAkB,KAAK,YAAY,EAAiB,MAAM,uBAAuB,CAAC;AAGzF,UAAU,KAAK;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,oEAAoE;AACpE,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAY3D;AAED,sHAAsH;AACtH,wBAAgB,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,CAMxE;AAwDD,yHAAyH;AACzH,wBAAsB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ9D"}
+{"version":3,"file":"digest.d.ts","sourceRoot":"","sources":["../../src/notify/digest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAI1C,OAAO,EAAkB,KAAK,YAAY,EAAiB,MAAM,uBAAuB,CAAC;AAKzF,UAAU,KAAK;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,oEAAoE;AACpE,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAY3D;AAED,sHAAsH;AACtH,wBAAgB,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,CAMxE;AAyDD,yHAAyH;AACzH,wBAAsB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ9D"}

package/dist/notify/digest.js

@@ -3,6 +3,8 @@ import { renderMail } from "../mail/templates.js";
 import { stopUrl } from "../mail/unsubscribe.js";
 import { DEFAULT_DIGEST, digestPrefsOf } from "../repo/mail-prefs.js";
 import { digestData } from "./digest-data.js";
+import { VISIBLE_TO_MEMBER } from "../repo/project-roles.js";
+import { KEEP_DAYS } from "../repo/settings.js";
 /** The date and hour in a time zone. Unknown zones count as UTC. */
 export function localOf(ms, timeZone) {
     const fmt = (tz) => new Intl.DateTimeFormat("en-CA", { timeZone: tz, year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", hourCycle: "h23", weekday: "short" }).formatToParts(new Date(ms));
@@ -42,7 +44,7 @@ async function sendOne(app, who, p, period, key, cache) {
     try {
         const id = `${p.id}:${period}`;
         if (!cache.has(id))
-            cache.set(id, digestData(app.db, p.id, p.retention_days, period, app.config.now()));
+            cache.set(id, digestData(app.db, app.telemetry, p.id, p.retention_days, period, app.config.now()));
         const data = await cache.get(id);
         if (!data || data.empty)
             return;
@@ -58,7 +60,8 @@ async function digestsFor(app, who, cache) {
     const due = dueKeys(localOf(app.config.now(), who.time_zone ?? "UTC"), who.digest_hour ?? 8);
     if (due.length === 0)
         return;
-    const projects = await app.db.query("SELECT p.id, p.name, o.name AS org, o.retention_days FROM members m JOIN orgs o ON o.id = m.org_id JOIN projects p ON p.org_id = o.id WHERE m.user_id = $1 ORDER BY p.name", [who.id]);
+    const projects = await app.db.query(`SELECT p.id, p.name, o.name AS org, ${KEEP_DAYS} AS retention_days FROM members m JOIN orgs o ON o.id = m.org_id JOIN projects p ON p.org_id = o.id
+     WHERE m.user_id = $1 AND ${VISIBLE_TO_MEMBER} ORDER BY p.name`, [who.id]);
     const prefs = await digestPrefsOf(app.db, who.id);
     for (const p of projects)
         for (const [period, key] of due)

package/dist/notify/digest.js.map

@@ -1 +1 @@
-{"version":3,"file":"digest.js","sourceRoot":"","sources":["../../src/notify/digest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAqB,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAmB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAU/D,oEAAoE;AACpE,MAAM,UAAU,OAAO,CAAC,EAAU,EAAE,QAAgB;IAClD,MAAM,GAAG,GAAG,CAAC,EAAU,EAAE,EAAE,CACzB,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACzL,IAAI,KAAgC,CAAC;IACrC,IAAI,CAAC;QACH,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;IACxE,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC;IAC9F,OAAO,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;AACxK,CAAC;AAED,sHAAsH;AACtH,MAAM,UAAU,OAAO,CAAC,CAAQ,EAAE,IAAY;IAC5C,IAAI,CAAC,CAAC,IAAI,GAAG,IAAI;QAAE,OAAO,EAAE,CAAC;IAC7B,MAAM,GAAG,GAA6B,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC;QAAE,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;QAAE,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACvD,OAAO,GAAG,CAAC;AACb,CAAC;AAgBD,4FAA4F;AAC5F,MAAM,KAAK,GAAG,KAAK,EAAE,GAAa,EAAE,MAAc,EAAE,SAAiB,EAAE,MAAoB,EAAE,GAAW,EAAE,EAAE,CAC1G,CACE,MAAM,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,iJAAiJ,EAAE;IACpK,MAAM;IACN,SAAS;IACT,MAAM;IACN,GAAG;IACH,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE;CACjB,CAAC,CACH,CAAC,MAAM,GAAG,CAAC,CAAC;AAIf,KAAK,UAAU,OAAO,CAAC,GAAa,EAAE,GAAW,EAAE,CAAa,EAAE,MAAoB,EAAE,GAAW,EAAE,KAAY;IAC/G,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAAE,OAAO;IAC3D,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACxG,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;QAClC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO;QAChC,MAAM,KAAK,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,yBAAyB,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACxJ,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,qGAAqG,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QACvJ,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,GAAa,EAAE,GAAW,EAAE,KAAY;IAChE,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,SAAS,IAAI,KAAK,CAAC,EAAE,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;IAC7F,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC7B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,KAAK,CACjC,4KAA4K,EAC5K,CAAC,GAAG,CAAC,EAAE,CAAC,CACT,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IAClD,KAAK,MAAM,CAAC,IAAI,QAAQ;QAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG;YAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC,MAAM,CAAC;gBAAE,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAC7J,CAAC;AAED,yHAAyH;AACzH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAa;IAC7C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,KAAK,CAC/B;sEACkE,EAClE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAClB,CAAC;IACF,MAAM,KAAK,GAAU,IAAI,GAAG,EAAE,CAAC;IAC/B,KAAK,MAAM,GAAG,IAAI,MAAM;QAAE,MAAM,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,+BAA+B,GAAG,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;AAC3J,CAAC"}
+{"version":3,"file":"digest.js","sourceRoot":"","sources":["../../src/notify/digest.ts"],"names":[],"mappings":"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"}

package/dist/notify/health.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/notify/health.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAQ1C,oFAAoF;AACpF,eAAO,MAAM,QAAQ,QAAW,CAAC;AA0CjC,+FAA+F;AAC/F,wBAAsB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAO9D"}
+{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/notify/health.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAQ1C,oFAAoF;AACpF,eAAO,MAAM,QAAQ,QAAW,CAAC;AAsCjC,+FAA+F;AAC/F,wBAAsB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAO9D"}

package/dist/notify/health.js

@@ -8,8 +8,7 @@ export const QUIET_MS = 2 * HOUR;
 /** "Around the clock": data in at least 58 of the 72 hours before the last data. */
 const BUSY_HOURS = 58;
 async function busy(app, projectId, lastMs) {
-    const [row] = await app.db.query("SELECT count(DISTINCT floor(start_ms / 3600000))::int AS n FROM traces WHERE project_id = $1 AND start_ms > $2 AND start_ms <= $3", [projectId, lastMs - 72 * HOUR, lastMs]);
-    return (row?.n ?? 0) >= BUSY_HOURS;
+    return (await app.telemetry.activeHours(projectId, lastMs - 72 * HOUR, lastMs)) >= BUSY_HOURS;
 }
 async function tell(app, p, make) {
     for (const m of await managersOf(app.db, p.org_id, "health", app.mailer.live))
@@ -35,9 +34,9 @@ async function checkProject(app, p, now) {
 /** Tell owners and admins when a busy project stops sending data, and when it starts again. */
 export async function checkHealth(app) {
     const now = app.config.now();
-    const projects = await app.db.query(`SELECT p.id, p.org_id, p.name, o.name AS org, (SELECT max(t.start_ms) FROM traces t WHERE t.project_id = p.id) AS last_ms, h.quiet, h.changed_ms
-     FROM projects p JOIN orgs o ON o.id = p.org_id LEFT JOIN project_health h ON h.project_id = p.id`);
+    const projects = await app.db.query("SELECT p.id, p.org_id, p.name, o.name AS org, h.quiet, h.changed_ms FROM projects p JOIN orgs o ON o.id = p.org_id LEFT JOIN project_health h ON h.project_id = p.id");
+    const last = await app.telemetry.lastTraceMs();
     for (const p of projects)
-        await checkProject(app, p, now);
+        await checkProject(app, { ...p, last_ms: last.get(p.id) ?? null }, now);
 }
 //# sourceMappingURL=health.js.map

package/dist/notify/health.js.map

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

package/dist/notify/team-describe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"team-describe.d.ts","sourceRoot":"","sources":["../../src/notify/team-describe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,iGAAiG;AACjG,eAAO,MAAM,OAAO,aAmBlB,CAAC;AAEH,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,gDAAgD;AAChD,wBAAgB,OAAO,CAAC,CAAC,EAAE,SAAS;IAKhC,IAAI,OAAO,MAAM;IACjB,MAAM,OAAO,MAAM;IACnB,OAAO,OAAO,MAAM;IACpB,GAAG,OAAO,MAAM;EAEnB;AAED,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC;AAS/C,kDAAkD;AAClD,wBAAsB,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CA0B3E"}
+{"version":3,"file":"team-describe.d.ts","sourceRoot":"","sources":["../../src/notify/team-describe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,iGAAiG;AACjG,eAAO,MAAM,OAAO,aA0BlB,CAAC;AAEH,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,gDAAgD;AAChD,wBAAgB,OAAO,CAAC,CAAC,EAAE,SAAS;IAKhC,IAAI,OAAO,MAAM;IACjB,MAAM,OAAO,MAAM;IACnB,OAAO,OAAO,MAAM;IACpB,GAAG,OAAO,MAAM;EAEnB;AAED,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC;AAS/C,kDAAkD;AAClD,wBAAsB,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAiC3E"}

package/dist/notify/team-describe.js

@@ -15,9 +15,16 @@ export const NOTICED = new Set([
     "project.create",
     "project.delete",
     "project.clear",
+    "project.update",
     "share.create",
     "share.revoke",
+    "status.enable",
+    "status.disable",
     "org.update",
+    "plan.change",
+    "billing.cap",
+    "scim.token.create",
+    "scim.token.revoke",
 ]);
 /** Names by id, each looked up once per run. */
 export function namesOf(q) {
@@ -58,9 +65,16 @@ export async function describe(row, names) {
         "project.create": async () => `${who} made the project ${await project()}.`,
         "project.delete": async () => `${who} deleted the project ${await project()}.`,
         "project.clear": async () => `${who} deleted all data of ${await project()}.`,
+        "project.update": async () => `${who} changed the settings of ${await project()}${typeof d.logRetentionDays === "number" ? ` (keep logs ${d.logRetentionDays} days)` : d.logRetentionDays === null ? " (logs follow the organization)" : ""}.`,
         "share.create": async () => `${who} shared a trace from ${await project()} for ${Number(d.days) || 7} days.`,
         "share.revoke": () => `${who} revoked a share link.`,
+        "status.enable": async () => `${who} ${d.newLink ? "made a new link for" : "turned on"} the public status page of ${await project()}.`,
+        "status.disable": async () => `${who} turned off the public status page of ${await project()}.`,
         "org.update": () => `${who} changed the organization settings${typeof d.retentionDays === "number" ? ` (keep data ${d.retentionDays} days)` : ""}.`,
+        "plan.change": () => `The plan changed from ${s(d.from) || "another plan"} to ${s(d.plan)}.`,
+        "billing.cap": () => `${who} ${d.capUsd === null ? "removed the spend cap" : `set the spend cap to $${String(d.capUsd)} a month`}.`,
+        "scim.token.create": () => `${who} made a SCIM token (${s(d.name)}).`,
+        "scim.token.revoke": () => `${who} revoked a SCIM token.`,
     };
     return (await say[row.action]?.()) ?? `${who}: ${row.action}.`;
 }

package/dist/notify/team-describe.js.map

@@ -1 +1 @@
-{"version":3,"file":"team-describe.js","sourceRoot":"","sources":["../../src/notify/team-describe.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"team-describe.js","sourceRoot":"","sources":["../../src/notify/team-describe.ts"],"names":[],"mappings":"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"}

package/dist/repo/alert-events.d.ts

@@ -0,0 +1,38 @@
+import type { AlertRule } from "@wizeworks/lens-core";
+import type { Queryable } from "../db/db.js";
+export type AlertEventKind = "fired" | "resolved" | "remind" | "test" | "ack" | "mute" | "unmute";
+export interface AlertEvent {
+    id: string;
+    ruleId: string;
+    ruleName: string;
+    kind: AlertEventKind;
+    value: number | null;
+    threshold: number;
+    message: string;
+    timeMs: number;
+    delivery: string;
+    /** The problem a fired notice named, or null. */
+    problem: EventProblem | null;
+}
+/** A problem card a notice linked to. */
+export interface EventProblem {
+    id: string;
+    title: string;
+    url: string;
+}
+/** Evaluated values are kept this long, for the rule's chart. */
+export declare const ALERT_VALUES_KEEP_MS: number;
+type NewEvent = Omit<AlertEvent, "id" | "ruleId" | "ruleName" | "threshold" | "problem"> & {
+    problem?: EventProblem | null;
+};
+export declare function addEvent(q: Queryable, rule: Pick<AlertRule, "id" | "projectId" | "threshold">, e: NewEvent): Promise<void>;
+export declare const listEvents: (q: Queryable, projectId: string, limit: number) => Promise<AlertEvent[]>;
+export declare const ruleEvents: (q: Queryable, ruleId: string, limit: number) => Promise<AlertEvent[]>;
+/** One rule's evaluated values in [from, to), oldest first. */
+export declare function ruleValues(q: Queryable, ruleId: string, from: number, to: number): Promise<{
+    timeMs: number;
+    value: number | null;
+}[]>;
+export declare function pruneAlertValues(q: Queryable, now: number): Promise<void>;
+export {};
+//# sourceMappingURL=alert-events.d.ts.map

package/dist/repo/alert-events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"alert-events.d.ts","sourceRoot":"","sources":["../../src/repo/alert-events.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;AAElG,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;CAC9B;AAED,yCAAyC;AACzC,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,iEAAiE;AACjE,eAAO,MAAM,oBAAoB,QAAkB,CAAC;AAEpD,KAAK,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,CAAC;AAE7H,wBAAsB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,GAAG,WAAW,GAAG,WAAW,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhI;AAeD,eAAO,MAAM,UAAU,MAAa,SAAS,aAAa,MAAM,SAAS,MAAM,KAAG,OAAO,CAAC,UAAU,EAAE,CACqG,CAAC;AAE5M,eAAO,MAAM,UAAU,MAAa,SAAS,UAAU,MAAM,SAAS,MAAM,KAAG,OAAO,CAAC,UAAU,EAAE,CACkG,CAAC;AAEtM,+DAA+D;AAC/D,wBAAsB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,CAAC,CAG5I;AAED,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/E"}

package/dist/repo/alert-events.js

@@ -0,0 +1,29 @@
+import { newId } from "../auth/crypto.js";
+/** Evaluated values are kept this long, for the rule's chart. */
+export const ALERT_VALUES_KEEP_MS = 30 * 86_400_000;
+export async function addEvent(q, rule, e) {
+    await q.query(`INSERT INTO alert_events (id, rule_id, project_id, kind, value, threshold, message, time_ms, delivery, problem) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`, [newId(), rule.id, rule.projectId, e.kind, e.value, rule.threshold, e.message, e.timeMs, e.delivery, e.problem ? JSON.stringify(e.problem) : ""]);
+}
+function problemOf(text) {
+    if (!text)
+        return null;
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return null;
+    }
+}
+const EVENT_COLUMNS = `e.id, e.rule_id AS "ruleId", r.name AS "ruleName", e.kind, e.value, e.threshold, e.message, e.time_ms AS "timeMs", e.delivery, e.problem`;
+const toEvent = (e) => ({ ...e, value: e.value === null ? null : Number(e.value), threshold: Number(e.threshold), timeMs: Number(e.timeMs), problem: problemOf(e.problem) });
+export const listEvents = async (q, projectId, limit) => (await q.query(`SELECT ${EVENT_COLUMNS} FROM alert_events e JOIN alert_rules r ON r.id = e.rule_id WHERE e.project_id = $1 ORDER BY e.time_ms DESC LIMIT $2`, [projectId, limit])).map(toEvent);
+export const ruleEvents = async (q, ruleId, limit) => (await q.query(`SELECT ${EVENT_COLUMNS} FROM alert_events e JOIN alert_rules r ON r.id = e.rule_id WHERE e.rule_id = $1 ORDER BY e.time_ms DESC LIMIT $2`, [ruleId, limit])).map(toEvent);
+/** One rule's evaluated values in [from, to), oldest first. */
+export async function ruleValues(q, ruleId, from, to) {
+    const rows = await q.query(`SELECT time_ms AS "timeMs", value FROM alert_values WHERE rule_id = $1 AND time_ms >= $2 AND time_ms < $3 ORDER BY time_ms`, [ruleId, from, to]);
+    return rows.map((r) => ({ timeMs: Number(r.timeMs), value: r.value === null ? null : Number(r.value) }));
+}
+export async function pruneAlertValues(q, now) {
+    await q.query("DELETE FROM alert_values WHERE time_ms < $1", [now - ALERT_VALUES_KEEP_MS]);
+}
+//# sourceMappingURL=alert-events.js.map

package/dist/repo/alert-events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"alert-events.js","sourceRoot":"","sources":["../../src/repo/alert-events.ts"],"names":[],"mappings":"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"}

package/dist/repo/alerts.d.ts

@@ -1,52 +1,22 @@
-import type { AlertMetric, AlertOp, MetricAlertStat } from "@wizeworks/lens-core";
+import type { AlertRule, AlertRuleInput } from "@wizeworks/lens-core";
 import type { Queryable } from "../db/db.js";
-/** Where a notice goes: a webhook, a Slack incoming webhook, or email to members of the organization. */
-export type Channel = {
-    kind: "webhook" | "slack";
-    url: string;
-} | {
-    kind: "email";
-    to: string[];
-};
-export interface AlertRule {
-    id: string;
-    projectId: string;
-    name: string;
-    /** A trace metric, or "metric" for one OpenTelemetry metric named by `metricName`. */
-    metric: AlertMetric | "metric";
-    /** For "metric" rules: the metric, what to read from it, and optionally one service. Empty otherwise. */
-    metricName: string;
-    metricStat: MetricAlertStat | "";
-    metricService: string;
-    op: AlertOp;
-    threshold: number;
-    windowMs: number;
-    env: string;
-    channels: Channel[];
-    enabled: boolean;
-    state: "ok" | "firing";
-    lastValue: number | null;
-    lastEvalMs: number | null;
-}
-export interface AlertEvent {
-    id: string;
-    ruleId: string;
-    ruleName: string;
-    kind: "fired" | "resolved" | "test";
-    value: number | null;
-    threshold: number;
-    message: string;
-    timeMs: number;
-    delivery: string;
-}
-export type RuleInput = Omit<AlertRule, "id" | "projectId" | "state" | "lastValue" | "lastEvalMs">;
+export type { AlertChannel as Channel, AlertRule } from "@wizeworks/lens-core";
+export type RuleInput = AlertRuleInput;
 export declare function listRules(q: Queryable, projectId: string): Promise<AlertRule[]>;
 export declare function enabledRules(q: Queryable): Promise<AlertRule[]>;
 export declare function ruleById(q: Queryable, projectId: string, id: string): Promise<AlertRule | undefined>;
 export declare function createRule(q: Queryable, projectId: string, r: RuleInput, by: string, now: number): Promise<string>;
+/** Turning a rule off also clears its firing state and acknowledgement. */
 export declare function updateRule(q: Queryable, projectId: string, id: string, r: RuleInput): Promise<void>;
 export declare function deleteRule(q: Queryable, projectId: string, id: string): Promise<boolean>;
-export declare function saveEvaluation(q: Queryable, id: string, state: AlertRule["state"], value: number | null, now: number): Promise<void>;
-export declare function addEvent(q: Queryable, rule: AlertRule, e: Omit<AlertEvent, "id" | "ruleId" | "ruleName" | "threshold">): Promise<void>;
-export declare const listEvents: (q: Queryable, projectId: string, limit: number) => Promise<AlertEvent[]>;
+/** Mute until a time (null unmutes). */
+export declare function muteRule(q: Queryable, projectId: string, id: string, untilMs: number | null): Promise<void>;
+/** Acknowledge the current firing: reminders stop until it resolves. */
+export declare function ackRule(q: Queryable, projectId: string, id: string, now: number): Promise<void>;
+/** Keep an evaluation: the state, its acknowledgement, the value (also in the rule's history), and when it last sent a notice. */
+export declare function saveEvaluation(q: Queryable, r: AlertRule, step: {
+    state: AlertRule["state"];
+    ackMs: number | null;
+    notified: boolean;
+}, value: number | null, now: number): Promise<void>;
 //# sourceMappingURL=alerts.d.ts.map

package/dist/repo/alerts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alerts.d.ts","sourceRoot":"","sources":["../../src/repo/alerts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"alerts.d.ts","sourceRoot":"","sources":["../../src/repo/alerts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,YAAY,EAAE,YAAY,IAAI,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC/E,MAAM,MAAM,SAAS,GAAG,cAAc,CAAC;AAuBvC,wBAAsB,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAErF;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAErE;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAG1G;AAID,wBAAsB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASxH;AAED,2EAA2E;AAC3E,wBAAsB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAOzG;AAED,wBAAsB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE9F;AAED,wCAAwC;AACxC,wBAAsB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjH;AAED,wEAAwE;AACxE,wBAAsB,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErG;AAED,kIAAkI;AAClI,wBAAsB,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE;IAAE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM/L"}

package/dist/repo/alerts.js

@@ -1,8 +1,22 @@
 import { newId } from "../auth/crypto.js";
 const RULE_COLUMNS = `id, project_id AS "projectId", name, metric, metric_name AS "metricName", metric_stat AS "metricStat",
-  metric_service AS "metricService", op, threshold, window_ms AS "windowMs", env, channels, enabled, state,
-  last_value AS "lastValue", last_eval_ms AS "lastEvalMs"`;
-const toRule = (r) => ({ ...r, channels: JSON.parse(r.channels) });
+  metric_service AS "metricService", slo_id AS "sloId", log_search AS "logSearch", op, threshold, window_ms AS "windowMs", env, service, endpoint, channels, enabled,
+  remind_ms AS "remindMs", state, last_value AS "lastValue", last_eval_ms AS "lastEvalMs", muted_until_ms AS "mutedUntilMs",
+  ack_ms AS "ackMs", last_notified_ms AS "lastNotifiedMs"`;
+const num = (v) => (v === null || v === undefined ? null : Number(v));
+const toRule = (r) => ({
+    ...r,
+    threshold: Number(r.threshold),
+    windowMs: Number(r.windowMs),
+    remindMs: Number(r.remindMs),
+    lastValue: num(r.lastValue),
+    lastEvalMs: num(r.lastEvalMs),
+    mutedUntilMs: num(r.mutedUntilMs),
+    ackMs: num(r.ackMs),
+    lastNotifiedMs: num(r.lastNotifiedMs),
+    channels: JSON.parse(r.channels),
+    logSearch: JSON.parse(r.logSearch || "{}"),
+});
 export async function listRules(q, projectId) {
     return (await q.query(`SELECT ${RULE_COLUMNS} FROM alert_rules WHERE project_id = $1 ORDER BY name`, [projectId])).map(toRule);
 }
@@ -13,26 +27,34 @@ export async function ruleById(q, projectId, id) {
     const [row] = await q.query(`SELECT ${RULE_COLUMNS} FROM alert_rules WHERE project_id = $1 AND id = $2`, [projectId, id]);
     return row && toRule(row);
 }
+const inputValues = (r) => [r.name, r.metric, r.op, r.threshold, r.windowMs, r.env, JSON.stringify(r.channels), r.enabled, r.metricName, r.metricStat, r.metricService, r.service, r.endpoint, r.remindMs, r.sloId, JSON.stringify(r.logSearch ?? {})];
 export async function createRule(q, projectId, r, by, now) {
     const id = newId();
-    await q.query(`INSERT INTO alert_rules (id, project_id, name, metric, op, threshold, window_ms, env, channels, enabled, created_by, created_ms,
-       metric_name, metric_stat, metric_service)
-     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)`, [id, projectId, r.name, r.metric, r.op, r.threshold, r.windowMs, r.env, JSON.stringify(r.channels), r.enabled, by, now, r.metricName, r.metricStat, r.metricService]);
+    await q.query(`INSERT INTO alert_rules (id, project_id, name, metric, op, threshold, window_ms, env, channels, enabled, metric_name, metric_stat,
+       metric_service, service, endpoint, remind_ms, slo_id, log_search, created_by, created_ms)
+     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)`, [id, projectId, ...inputValues(r), by, now]);
     return id;
 }
+/** Turning a rule off also clears its firing state and acknowledgement. */
 export async function updateRule(q, projectId, id, r) {
     await q.query(`UPDATE alert_rules SET name = $3, metric = $4, op = $5, threshold = $6, window_ms = $7, env = $8, channels = $9, enabled = $10,
-       metric_name = $11, metric_stat = $12, metric_service = $13, state = CASE WHEN $10 THEN state ELSE 'ok' END WHERE project_id = $1 AND id = $2`, [projectId, id, r.name, r.metric, r.op, r.threshold, r.windowMs, r.env, JSON.stringify(r.channels), r.enabled, r.metricName, r.metricStat, r.metricService]);
+       metric_name = $11, metric_stat = $12, metric_service = $13, service = $14, endpoint = $15, remind_ms = $16, slo_id = $17, log_search = $18,
+       state = CASE WHEN $10 THEN state ELSE 'ok' END, ack_ms = CASE WHEN $10 THEN ack_ms ELSE NULL END WHERE project_id = $1 AND id = $2`, [projectId, id, ...inputValues(r)]);
 }
 export async function deleteRule(q, projectId, id) {
     return (await q.query("DELETE FROM alert_rules WHERE project_id = $1 AND id = $2 RETURNING id", [projectId, id])).length > 0;
 }
-export async function saveEvaluation(q, id, state, value, now) {
-    await q.query("UPDATE alert_rules SET state = $2, last_value = $3, last_eval_ms = $4 WHERE id = $1", [id, state, value, now]);
+/** Mute until a time (null unmutes). */
+export async function muteRule(q, projectId, id, untilMs) {
+    await q.query("UPDATE alert_rules SET muted_until_ms = $3 WHERE project_id = $1 AND id = $2", [projectId, id, untilMs]);
 }
-export async function addEvent(q, rule, e) {
-    await q.query(`INSERT INTO alert_events (id, rule_id, project_id, kind, value, threshold, message, time_ms, delivery) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`, [newId(), rule.id, rule.projectId, e.kind, e.value, rule.threshold, e.message, e.timeMs, e.delivery]);
+/** Acknowledge the current firing: reminders stop until it resolves. */
+export async function ackRule(q, projectId, id, now) {
+    await q.query("UPDATE alert_rules SET ack_ms = $3 WHERE project_id = $1 AND id = $2 AND state = 'firing'", [projectId, id, now]);
+}
+/** Keep an evaluation: the state, its acknowledgement, the value (also in the rule's history), and when it last sent a notice. */
+export async function saveEvaluation(q, r, step, value, now) {
+    await q.query("UPDATE alert_rules SET state = $2, ack_ms = $3, last_value = $4, last_eval_ms = $5, last_notified_ms = CASE WHEN $6 THEN $5 ELSE last_notified_ms END WHERE id = $1", [r.id, step.state, step.ackMs, value, now, step.notified]);
+    await q.query("INSERT INTO alert_values (rule_id, time_ms, value) VALUES ($1, $2, $3) ON CONFLICT (rule_id, time_ms) DO UPDATE SET value = $3", [r.id, now, value]);
 }
-export const listEvents = (q, projectId, limit) => q.query(`SELECT e.id, e.rule_id AS "ruleId", r.name AS "ruleName", e.kind, e.value, e.threshold, e.message, e.time_ms AS "timeMs", e.delivery
-     FROM alert_events e JOIN alert_rules r ON r.id = e.rule_id WHERE e.project_id = $1 ORDER BY e.time_ms DESC LIMIT $2`, [projectId, limit]);
 //# sourceMappingURL=alerts.js.map

package/dist/repo/alerts.js.map

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

package/dist/repo/audit.d.ts

@@ -7,5 +7,23 @@ export interface AuditEntry {
 }
 /** Keep one line of who did what. Every MCP call and every change to members, keys, and projects writes one. */
 export declare function audit(q: Queryable, orgId: string, actor: string, action: string, detail: Record<string, unknown>, now: number): Promise<void>;
-export declare function listAudit(q: Queryable, orgId: string, limit: number, before?: number): Promise<AuditEntry[]>;
+export interface AuditFilter {
+    /** Older than this time. */
+    before?: number;
+    /** At or after this time. */
+    from?: number;
+    /** An action ("key.create") or a group ("key."). */
+    action?: string;
+    /** "user:<id>", "key:<id>", or "system". */
+    actor?: string;
+}
+/** Newest first, `limit` at most, with the filter. */
+export declare function listAudit(q: Queryable, orgId: string, limit: number, f?: AuditFilter): Promise<AuditEntry[]>;
+/** The actions and actors an organization's log has, for the filter menus. */
+export declare function auditFacets(q: Queryable, orgId: string): Promise<{
+    actions: string[];
+    actors: string[];
+}>;
+/** The filter from `before`, `from`, `action` ("key." for a group), and `actor`. */
+export declare function auditFilterOf(p: URLSearchParams): AuditFilter;
 //# sourceMappingURL=audit.d.ts.map

package/dist/repo/audit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/repo/audit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,gHAAgH;AAChH,wBAAsB,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASnJ;AAED,wBAAsB,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAMlH"}
+{"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/repo/audit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,gHAAgH;AAChH,wBAAsB,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASnJ;AAED,MAAM,WAAW,WAAW;IAC1B,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6BAA6B;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAID,sDAAsD;AACtD,wBAAsB,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAE,WAAgB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAWtH;AAED,8EAA8E;AAC9E,wBAAsB,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAI/G;AAED,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,CAAC,EAAE,eAAe,GAAG,WAAW,CAI7D"}

package/dist/repo/audit.js

@@ -10,8 +10,30 @@ export async function audit(q, orgId, actor, action, detail, now) {
         now,
     ]);
 }
-export async function listAudit(q, orgId, limit, before) {
-    const rows = await q.query(`SELECT actor, action, detail, time_ms FROM audit WHERE org_id = $1 AND time_ms < $2 ORDER BY time_ms DESC LIMIT $3`, [orgId, before ?? Number.MAX_SAFE_INTEGER, limit]);
+const like = (s) => s.replace(/[\\%_]/g, (c) => `\\${c}`);
+/** Newest first, `limit` at most, with the filter. */
+export async function listAudit(q, orgId, limit, f = {}) {
+    const where = ["org_id = $1", "time_ms < $2"];
+    const args = [orgId, f.before ?? Number.MAX_SAFE_INTEGER];
+    if (f.from !== undefined)
+        where.push(`time_ms >= $${args.push(f.from)}`);
+    if (f.action)
+        where.push(f.action.endsWith(".") ? `action LIKE $${args.push(`${like(f.action)}%`)}` : `action = $${args.push(f.action)}`);
+    if (f.actor)
+        where.push(`actor = $${args.push(f.actor)}`);
+    const rows = await q.query(`SELECT actor, action, detail, time_ms FROM audit WHERE ${where.join(" AND ")} ORDER BY time_ms DESC LIMIT $${args.push(limit)}`, args);
     return rows.map((r) => ({ actor: r.actor, action: r.action, detail: JSON.parse(r.detail), timeMs: r.time_ms }));
 }
+/** The actions and actors an organization's log has, for the filter menus. */
+export async function auditFacets(q, orgId) {
+    const actions = await q.query("SELECT DISTINCT action AS v FROM audit WHERE org_id = $1 ORDER BY v", [orgId]);
+    const actors = await q.query("SELECT DISTINCT actor AS v FROM audit WHERE org_id = $1 ORDER BY v", [orgId]);
+    return { actions: actions.map((r) => r.v), actors: actors.map((r) => r.v) };
+}
+/** The filter from `before`, `from`, `action` ("key." for a group), and `actor`. */
+export function auditFilterOf(p) {
+    const num = (k) => Number(p.get(k)) || undefined;
+    const text = (k) => p.get(k)?.trim().slice(0, 200) || undefined;
+    return { before: num("before"), from: num("from"), action: text("action"), actor: text("actor") };
+}
 //# sourceMappingURL=audit.js.map

package/dist/repo/audit.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../src/repo/audit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAU1C,gHAAgH;AAChH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,CAAY,EAAE,KAAa,EAAE,KAAa,EAAE,MAAc,EAAE,MAA+B,EAAE,GAAW;IAClI,MAAM,CAAC,CAAC,KAAK,CAAC,gGAAgG,EAAE;QAC9G,KAAK,EAAE;QACP,KAAK;QACL,KAAK;QACL,MAAM;QACN,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QACtB,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,CAAY,EAAE,KAAa,EAAE,KAAa,EAAE,MAAe;IACzF,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,KAAK,CACxB,oHAAoH,EACpH,CAAC,KAAK,EAAE,MAAM,IAAI,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAClD,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAA4B,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAC7I,CAAC"}
+{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../src/repo/audit.ts"],"names":[],"mappings":"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"}

package/dist/repo/auth-prune.d.ts

@@ -1,4 +1,4 @@
 import type { Queryable } from "../db/db.js";
-/** Remove expired sessions and links, and sign-in counters older than a day. Better Auth ignores them already; this keeps the tables small. */
+/** Remove expired sessions, links, and OAuth rows, and sign-in counters older than a day. Better Auth ignores them already; this keeps the tables small. */
 export declare function pruneAuthRows(q: Queryable): Promise<void>;
 //# sourceMappingURL=auth-prune.d.ts.map

package/dist/repo/auth-prune.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-prune.d.ts","sourceRoot":"","sources":["../../src/repo/auth-prune.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,+IAA+I;AAC/I,wBAAsB,aAAa,CAAC,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAK/D"}
+{"version":3,"file":"auth-prune.d.ts","sourceRoot":"","sources":["../../src/repo/auth-prune.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,4JAA4J;AAC5J,wBAAsB,aAAa,CAAC,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAM/D"}