tacilytics 2.0.2 → 2.2.0

package/server.js

@@ -34,6 +34,8 @@ const INSIDE_NODE_MODULES = __dirname.split(path.sep).includes('node_modules');
 const DB_PATH = process.env.DB_PATH || path.join(INSIDE_NODE_MODULES ? process.cwd() : __dirname, 'data', 'analytics.db');
 fs.mkdirSync(path.dirname(DB_PATH), { recursive: true });
 if (!process.env.WEB_PASSWORD) console.warn('⚠ WEB_PASSWORD is not set — the dashboard uses the default passphrase "tacilytics". Set your own in .env.');
+// Webhook for the daily digest and the default alerts (Discord/Slack-compatible).
+const DIGEST_WEBHOOK_URL = /^(off|none|false|0)$/i.test(process.env.DIGEST_WEBHOOK_URL || '') ? '' : (process.env.DIGEST_WEBHOOK_URL || ''); // 'off' disables it (an empty value would be refilled from .env)
 const RETENTION_DAYS = parseInt(process.env.DATA_RETENTION_DAYS, 10) || 0; // 0 = keep forever; >0 purges older raw events (data minimisation)
 
 // ── DB ──────────────────────────────────────────────────────────────────────
@@ -101,11 +103,48 @@ db.exec(`
     steps TEXT NOT NULL, -- JSON array of {type:'page'|'goal', value}
     created INTEGER NOT NULL
   );
+  -- imported history (Plausible / Google Analytics): daily aggregates, never visitor rows
+  CREATE TABLE IF NOT EXISTS imported (
+    import_id INTEGER NOT NULL,
+    site_id INTEGER NOT NULL,
+    day TEXT NOT NULL,
+    dim TEXT NOT NULL,          -- '' totals · page · source · country · browser · os · device · event
+    name TEXT NOT NULL,
+    visitors INTEGER NOT NULL DEFAULT 0,
+    pageviews INTEGER NOT NULL DEFAULT 0,
+    visits INTEGER NOT NULL DEFAULT 0,
+    bounces INTEGER NOT NULL DEFAULT 0,
+    duration INTEGER NOT NULL DEFAULT 0
+  );
+  CREATE INDEX IF NOT EXISTS idx_imported_site_dim_day ON imported(site_id, dim, day);
+  CREATE TABLE IF NOT EXISTS imports (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    site_id INTEGER NOT NULL,
+    source TEXT NOT NULL,       -- 'plausible' | 'ga'
+    first_day TEXT, last_day TEXT,
+    rows INTEGER NOT NULL DEFAULT 0,
+    pageviews INTEGER NOT NULL DEFAULT 0,
+    files TEXT,
+    created_by TEXT,
+    created INTEGER NOT NULL
+  );
+  -- chart annotations ("Newsletter sent", "Release 2.0") — one calendar day each
+  CREATE TABLE IF NOT EXISTS annotations (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    site_id INTEGER NOT NULL,
+    day TEXT NOT NULL,          -- YYYY-MM-DD (UTC, like events.day)
+    text TEXT NOT NULL,
+    created_by TEXT,
+    created INTEGER NOT NULL
+  );
+  CREATE INDEX IF NOT EXISTS idx_annotations_site_day ON annotations(site_id, day);
 `);
 
 const norm = (d) => String(d || '').toLowerCase().replace(/^www\./, '').replace(/\/.*$/, '').trim();
+// per-site time zone (Fabian): only query boundaries move, stored days stay UTC (Tyto). Old installs → 'UTC'.
+if (!db.prepare('PRAGMA table_info(sites)').all().some((c) => c.name === 'timezone')) db.exec("ALTER TABLE sites ADD COLUMN timezone TEXT NOT NULL DEFAULT 'UTC'");
 const getSiteByDomain = db.prepare('SELECT * FROM sites WHERE domain = ?');
-const insSite = db.prepare('INSERT OR IGNORE INTO sites (domain, name, created) VALUES (?, ?, ?)');
+const insSite = db.prepare("INSERT OR IGNORE INTO sites (domain, name, created, timezone) VALUES (?, ?, ?, COALESCE(?, 'UTC'))");
 const allSites = db.prepare('SELECT * FROM sites ORDER BY domain');
 const insEvent = db.prepare(`INSERT INTO events (site_id, ts, day, path, source, referrer, country, tz, browser, os, device, lang, name, utm_medium, utm_campaign, dur, props, vh, platform, app_version)
   VALUES (@site_id, @ts, @day, @path, @source, @referrer, @country, @tz, @browser, @os, @device, @lang, @name, @utm_medium, @utm_campaign, @dur, @props, @vh, @platform, @app_version)`);
@@ -216,16 +255,35 @@ function visitorHash(siteId, ip, ua, day) {
   if (!salt) return crypto.randomBytes(12).toString('hex'); // unlinkable one-off visitor
   return crypto.createHash('sha256').update(`${INGEST_SALT}|${salt}|${day}|${siteId}|${ip}|${ua}`).digest('hex').slice(0, 24);
 }
+// The client writes the FIRST X-Forwarded-For entry itself, so it must never be used for rate limits.
+// req.ip honours 'trust proxy': with TRUST_PROXY=1 (default, one reverse proxy in front) it is the
+// entry that proxy appended. Set TRUST_PROXY=0 when the server is reachable without a proxy.
 function clientIp(req) {
-  const xff = (req.headers['x-forwarded-for'] || '').split(',')[0].trim();
-  return xff || req.socket.remoteAddress || '0.0.0.0';
+  return req.ip || req.socket.remoteAddress || '0.0.0.0';
 }
 
 // ── app ─────────────────────────────────────────────────────────────────────
 const app = express();
-app.set('trust proxy', 1);
+const TRUST_PROXY = Number.isFinite(+process.env.TRUST_PROXY) && process.env.TRUST_PROXY !== '' && process.env.TRUST_PROXY != null ? +process.env.TRUST_PROXY : 1;
+app.set('trust proxy', TRUST_PROXY);
+// A real HTTP proxy always appends X-Forwarded-For. A request without it means something else
+// (socat, ssh -L, a TCP forwarder) is in front: then the last XFF entry is client-written and the
+// limits can be bypassed. Normal visitors never send XFF themselves, so they trigger this; an
+// attacker who forges XFF does not, but the warning is already in the log by then. Warn once.
+let warnedNoXff = false;
+if (TRUST_PROXY > 0) {
+  app.use((req, _res, next) => {
+    if (!warnedNoXff && !req.headers['x-forwarded-for']) {
+      warnedNoXff = true;
+      console.warn(`⚠️  TRUST_PROXY=${TRUST_PROXY}, but a request arrived without X-Forwarded-For (from ${req.socket.remoteAddress}, ${req.method} ${req.path}, ${new Date().toISOString()}). Harmless for local health checks/CLI or an ssh -L to the dashboard. Only if ALL traffic comes through a TCP forwarder (socat, ssh -L), set TRUST_PROXY=0.`);
+    }
+    next();
+  });
+}
 // Accept both application/json (dashboard) and text/plain (cross-origin beacons).
-app.use(express.json({ limit: '32kb', type: ['application/json', 'text/plain'] }));
+// /api/imports takes raw files (handled there); everything else is JSON (text/plain = cross-origin beacons)
+const jsonBody = express.json({ limit: '32kb', type: ['application/json', 'text/plain'] });
+app.use((req, res, next) => (req.path === '/api/imports' ? next() : jsonBody(req, res, next)));
 app.disable('x-powered-by');
 
 // Lightweight in-memory rate limiter (fixed window per key). No external dep.
@@ -326,35 +384,16 @@ app.options('/api/collect', (_req, res) => { res.set('Access-Control-Allow-Origi
 app.post('/api/collect', collect);
 app.get('/api/collect', collect);
 
-// ── auth (password → in-memory session token) ──────────────
-const sessions = new Map();
-function newToken() { return crypto.randomBytes(24).toString('hex'); }
-app.post('/auth/login', (req, res) => {
-  if (rateLimited('login:' + clientIp(req), 10, 15 * 60000)) return res.status(429).json({ error: 'Too many attempts — wait 15 minutes' });
-  const pw = String((req.body && req.body.password) || '');
-  const ok = pw.length === WEB_PASSWORD.length && crypto.timingSafeEqual(Buffer.from(pw), Buffer.from(WEB_PASSWORD));
-  if (!ok) return res.status(401).json({ error: 'Wrong password' });
-  const token = newToken();
-  sessions.set(token, { expires: Date.now() + 7 * 864e5 });
-  res.json({ token });
+// ── auth: accounts, team, optional 2FA + passkeys (auth.js) ───────────────────
+const { setupAuth } = require('./auth');
+const { auth, requireRole, siteAllowed, audit } = setupAuth({
+  app, db, WEB_PASSWORD, API_KEY, rateLimited, clientIp,
+  allSiteIds: () => db.prepare('SELECT id FROM sites').all().map((r) => r.id),
 });
-function checkApiKey(req) {
-  if (!API_KEY) return false;
-  const hdr = String(req.headers['authorization'] || '');
-  const key = hdr.startsWith('Bearer ') ? hdr.slice(7) : String(req.headers['x-api-key'] || '');
-  return key.length === API_KEY.length && crypto.timingSafeEqual(Buffer.from(key), Buffer.from(API_KEY));
-}
-function auth(req, res, next) {
-  if (checkApiKey(req)) return next(); // agents / CLI
-  const t = req.headers['x-session-token'];
-  const s = t && sessions.get(t);
-  if (s && s.expires > Date.now()) return next();
-  if (s) sessions.delete(t);
-  res.status(401).json({ error: 'Not authenticated' });
-}
+const adminOnly = requireRole('admin');
 
 // share-token auth: read-only stats access scoped to exactly one site.
-// Accepted as ?share=<token>; the handler must verify req.shareSite matches the queried site.
+// Accepted as ?share=<token>; the handler must check siteOk(req, site).
 const getShare = db.prepare('SELECT * FROM shares WHERE token = ?');
 function authOrShare(req, res, next) {
   const tok = String(req.query.share || '');
@@ -364,10 +403,13 @@ function authOrShare(req, res, next) {
   }
   return auth(req, res, next);
 }
-function shareScopeOk(req, site) { return req.shareSiteId == null || req.shareSiteId === site.id; }
+// share links see exactly their site; viewers only the sites they were given
+const siteOk = (req, site) => siteAllowed(req, site.id);
+const NO_SITE = { error: 'You have no access to this site' };
+function newToken() { return crypto.randomBytes(24).toString('hex'); }
 
 // ── sites management ─────────────────────────────────────────────────────────
-const sitesListHandler = (_req, res) => res.json(allSites.all());
+const sitesListHandler = (req, res) => res.json(allSites.all().filter((st) => siteAllowed(req, st.id)));
 const sitesCreateHandler = (req, res) => {
   const rawDomain = norm(req.body && req.body.domain);
   let domain = rawDomain;
@@ -378,14 +420,37 @@ const sitesCreateHandler = (req, res) => {
   }
   // Allow ASCII domains AND Punycode (xn--...). Unicode input was converted above.
   if (!domain || !/^[a-z0-9.-]+\.[a-z0-9-]{2,}$/.test(domain)) return res.status(400).json({ error: 'Enter a valid domain, e.g. example.com' });
-  insSite.run(domain, (req.body && req.body.name) || displayName, Date.now());
+  const rawTz = req.body && req.body.timezone;
+  const timezone = rawTz == null || rawTz === '' ? null : TZ.validTz(String(rawTz));
+  if (rawTz != null && rawTz !== '' && !timezone) return res.status(400).json({ error: 'Unknown time zone' });
+  insSite.run(domain, (req.body && req.body.name) || displayName, Date.now(), timezone);
+  audit(res, 'site.add', domain);
   res.json(getSiteByDomain.get(domain));
 };
 app.get('/api/sites', auth, sitesListHandler);
-app.post('/api/sites', auth, sitesCreateHandler);
-app.delete('/api/sites/:id', auth, (req, res) => {
+app.post('/api/sites', adminOnly, sitesCreateHandler);
+// change a site's time zone (IANA names only — anything Intl rejects is a 400, never stored)
+app.patch('/api/sites/:id', adminOnly, (req, res) => {
+  const id = Number(req.params.id);
+  if (!siteAllowed(req, id)) return res.status(403).json(NO_SITE);
+  const site = db.prepare('SELECT * FROM sites WHERE id = ?').get(id);
+  if (!site) return res.status(404).json({ error: 'Unknown site' });
+  const timezone = TZ.validTz(String((req.body && req.body.timezone) || ''));
+  if (!timezone) return res.status(400).json({ error: 'Unknown time zone' });
+  db.prepare('UPDATE sites SET timezone = ? WHERE id = ?').run(timezone, id);
+  if (timezone !== site.timezone) audit(res, 'site.timezone', site.domain + ': ' + site.timezone + ' → ' + timezone);
+  res.json(db.prepare('SELECT * FROM sites WHERE id = ?').get(id));
+});
+app.delete('/api/sites/:id', adminOnly, (req, res) => {
   const id = Number(req.params.id);
+  if (!siteAllowed(req, id)) return res.status(403).json(NO_SITE);
+  const gone = db.prepare('SELECT domain FROM sites WHERE id = ?').get(id);
+  audit(res, 'site.remove', gone ? gone.domain : '#' + id);
   db.prepare('DELETE FROM events WHERE site_id = ?').run(id);
+  db.prepare('DELETE FROM annotations WHERE site_id = ?').run(id);
+  db.prepare('DELETE FROM alerts WHERE site_id = ?').run(id);
+  db.prepare('DELETE FROM imported WHERE site_id = ?').run(id);
+  db.prepare('DELETE FROM imports WHERE site_id = ?').run(id);
   db.prepare('DELETE FROM sites WHERE id = ?').run(id);
   res.json({ ok: true });
 });
@@ -403,27 +468,33 @@ app.get('/api/v1', (_req, res) => res.json({
   filters: 'add any of country,source,page,browser,os,device,lang,medium,campaign,goal to /stats to segment',
 }));
 app.get('/api/v1/sites', auth, sitesListHandler);
-app.post('/api/v1/sites', auth, sitesCreateHandler);
+app.post('/api/v1/sites', adminOnly, sitesCreateHandler);
 
 // ── stats ────────────────────────────────────────────────────────────────────
+const TZ = require('./tz');
 const PERIODS = { today: 1, '7d': 7, '30d': 30, '90d': 90, '12mo': 365 };
-function rangeFor(query) {
+// Whole LOCAL days of the site's time zone: "7d" = today + the 6 full days before it, each day with
+// its own boundaries (23/25 h on DST days). Starting at now - 7×24h would cut the oldest day off at the
+// current clock time and undercount it.
+function rangeFor(query, tz) {
+  tz = tz || 'UTC';
   const now = Date.now();
-  // custom range: from/to are YYYY-MM-DD (inclusive)
-  const from = /^\d{4}-\d{2}-\d{2}$/.test(query.from || '') ? Date.parse(query.from + 'T00:00:00Z') : null;
-  if (from != null && !Number.isNaN(from)) {
-    const toRaw = /^\d{4}-\d{2}-\d{2}$/.test(query.to || '') ? Date.parse(query.to + 'T00:00:00Z') : from;
-    const end = Math.min(now, (Number.isNaN(toRaw) ? from : toRaw) + 864e5); // inclusive end day
-    const days = Math.max(1, Math.round((end - from) / 864e5));
-    return { start: from, end, days, period: 'custom', hourly: days <= 1 };
+  const today = TZ.localDay(tz, now);
+  // custom range: from/to are local YYYY-MM-DD (inclusive)
+  const isDay = (d) => /^\d{4}-\d{2}-\d{2}$/.test(d || '') && !Number.isNaN(Date.parse(d + 'T00:00:00Z'));
+  if (isDay(query.from)) {
+    let fromDay = query.from, toDay = isDay(query.to) ? query.to : query.from;
+    if (toDay < fromDay) toDay = fromDay;
+    const start = TZ.dayStart(tz, fromDay);
+    const end = Math.max(start + 1, Math.min(now, TZ.dayStart(tz, TZ.addDays(toDay, 1))));
+    const days = Math.max(1, Math.round((Date.parse(toDay + 'T00:00:00Z') - Date.parse(fromDay + 'T00:00:00Z')) / 864e5) + 1);
+    const lastDay = TZ.localDay(tz, end - 1) < toDay ? TZ.localDay(tz, end - 1) : toDay;
+    return { start, end, days: Math.min(days, Math.round((Date.parse(lastDay + 'T00:00:00Z') - Date.parse(fromDay + 'T00:00:00Z')) / 864e5) + 1), period: 'custom', hourly: days <= 1, tz, fromDay, toDay: lastDay };
   }
   const period = PERIODS[query.period] ? query.period : '7d';
   const days = PERIODS[period];
-  // Whole UTC days: "7d" = today + the 6 full days before it. Starting at now - 7×24h would
-  // cut the oldest day off at the current clock time and undercount it.
-  const today0 = Date.parse(new Date(now).toISOString().slice(0, 10) + 'T00:00:00Z');
-  const start = today0 - (days - 1) * 864e5;
-  return { start, end: now, days, period, hourly: period === 'today' };
+  const fromDay = TZ.addDays(today, -(days - 1));
+  return { start: TZ.dayStart(tz, fromDay), end: now, days, period, hourly: period === 'today', tz, fromDay, toDay: today };
 }
 
 // Whitelisted segmentation filters — click any breakdown row in the dashboard to drill in.
@@ -449,12 +520,51 @@ function eventPlatformFilter(query) {
   return f;
 }
 
+// name shown as "created by" (same wording as the activity log)
+function whoDid(req) {
+  const p = req.principal;
+  if (!p) return null;
+  if (p.kind === 'user') return p.user.username;
+  if (p.kind === 'userkey') return p.user.username + ' (API key)';
+  if (p.kind === 'apikey') return 'API key';
+  if (p.kind === 'legacy') return 'passphrase';
+  return null;
+}
+
+// ── imported history helpers ──
+const firstNativeTs = db.prepare('SELECT MIN(ts) t FROM events WHERE site_id = ?');
+// first LOCAL day with own data in the site's time zone (import boundary — shown in the import dialog too)
+function firstOwnDay(site) { const t = firstNativeTs.get(site.id).t; return t == null ? null : TZ.localDay(site.timezone || 'UTC', t); }
+function importedFor(siteId, start, end, filtered, tz) {
+  const exists = !!db.prepare('SELECT 1 FROM imports WHERE site_id = ? LIMIT 1').get(siteId);
+  const off = { exists, on: false, filtered: exists && filtered, tot: { pageviews: 0, visitors: 0 }, days: [], top: () => [], until: null };
+  if (!exists || filtered) return off;
+  // imported days count only before the first LOCAL day with own data (events.day is the UTC day)
+  const firstTs = firstNativeTs.get(siteId).t;
+  const first = firstTs == null ? null : TZ.localDay(tz, firstTs);
+  // imported rows are calendar days of the source; they are matched against the site's local days
+  const from = TZ.localDay(tz, start);
+  const lastDay = TZ.localDay(tz, end - 1);
+  const to = first && first <= lastDay ? TZ.addDays(first, -1) : lastDay;
+  if (to < from) return { ...off, until: first };
+  const days = db.prepare("SELECT day, SUM(visitors) visitors, SUM(pageviews) pageviews FROM imported WHERE site_id = ? AND dim = '' AND day >= ? AND day <= ? GROUP BY day").all(siteId, from, to);
+  const tot = days.reduce((a, r) => ({ pageviews: a.pageviews + r.pageviews, visitors: a.visitors + r.visitors }), { pageviews: 0, visitors: 0 });
+  const top = (dim) => db.prepare('SELECT name, SUM(pageviews) pageviews, SUM(visitors) visitors FROM imported WHERE site_id = ? AND dim = ? AND day >= ? AND day <= ? GROUP BY name ORDER BY visitors DESC, pageviews DESC LIMIT 200').all(siteId, dim, from, to);
+  return { exists, on: days.length > 0, filtered: false, tot, days, top, until: first };
+}
+function mergeTop(native, imported, limit) {
+  const m = new Map();
+  for (const r of native) m.set(r.name, { name: r.name, pageviews: r.pageviews, visitors: r.visitors });
+  for (const r of imported) { const e = m.get(r.name) || { name: r.name, pageviews: 0, visitors: 0 }; e.pageviews += r.pageviews; e.visitors += r.visitors; m.set(r.name, e); }
+  return [...m.values()].sort((a, b) => b.visitors - a.visitors || b.pageviews - a.pageviews).slice(0, limit);
+}
+
 function statsHandler(req, res) {
   const site = getSiteByDomain.get(norm(req.query.site));
   if (!site) return res.status(404).json({ error: 'Unknown site' });
-  if (!shareScopeOk(req, site)) return res.status(403).json({ error: 'Share link is limited to another site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
   const sid = site.id;
-  const { start, end, days, period, hourly } = rangeFor(req.query);
+  const { start, end, days, period, hourly, tz, fromDay, toDay } = rangeFor(req.query, site.timezone);
   const { clauses, params, goal } = buildFilters(req.query);
   const evf = eventPlatformFilter(req.query); // platform/version also narrow event panels (revenue, search, 404)
 
@@ -466,6 +576,10 @@ function statsHandler(req, res) {
   if (goal) { where += ' AND vh IN (SELECT vh FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name = ?)'; args.push(sid, start, end, goal); }
 
   const totals = db.prepare(`SELECT COUNT(*) AS pageviews, COUNT(DISTINCT vh) AS visitors FROM events WHERE ${where}`).get(...args);
+  // imported history counts only for days before the site's first own event (no double counting)
+  // and only without segment filters (imported data is pre-aggregated per single dimension).
+  const imp = importedFor(sid, start, end, clauses.length > 0 || !!goal || !!evf, tz);
+  if (imp.on) { totals.pageviews += imp.tot.pageviews; totals.visitors += imp.tot.visitors; }
   const bounceRow = db.prepare(`SELECT COUNT(*) AS bounced FROM (SELECT vh, COUNT(*) c FROM events WHERE ${where} GROUP BY vh HAVING c = 1)`).get(...args);
   const bounce = totals.visitors ? Math.round((bounceRow.bounced / totals.visitors) * 100) : 0;
   const viewsPerVisitor = totals.visitors ? +(totals.pageviews / totals.visitors).toFixed(1) : 0;
@@ -477,30 +591,37 @@ function statsHandler(req, res) {
   const prevArgs = args.slice(); prevArgs[1] = start - len; prevArgs[2] = start;
   if (goal) { prevArgs[prevArgs.length - 3] = start - len; prevArgs[prevArgs.length - 2] = start; }
   const prev = db.prepare(`SELECT COUNT(*) pageviews, COUNT(DISTINCT vh) visitors FROM events WHERE ${where}`).get(...prevArgs);
+  if (imp.on) { const pi = importedFor(sid, start - len, start, false, tz); if (pi.on) { prev.pageviews += pi.tot.pageviews; prev.visitors += pi.tot.visitors; } }
   const pct = (cur, was) => (was ? Math.round(((cur - was) / was) * 100) : null);
 
   // time series (per hour for a single day, else per day)
   let series;
   if (hourly) {
-    const rows = db.prepare(`SELECT CAST((ts/3600000) AS INT) AS bucket, COUNT(*) pv, COUNT(DISTINCT vh) v FROM events WHERE ${where} GROUP BY bucket`).all(...args);
+    // one bucket per real hour of the local day (23 or 25 on DST days), labelled with the local
+    // hour. Buckets start at local midnight, so +5:45 zones are not cut at UTC hours.
+    const dayEnd = TZ.dayStart(tz, TZ.addDays(fromDay, 1));
+    const rows = db.prepare(`SELECT CAST(((ts - ${Math.trunc(start)}) / 3600000) AS INT) AS bucket, COUNT(*) pv, COUNT(DISTINCT vh) v FROM events WHERE ${where} GROUP BY bucket`).all(...args);
     const map = new Map(rows.map((r) => [r.bucket, r]));
-    const startH = Math.floor(start / 3600000);
-    series = Array.from({ length: 24 }, (_, i) => {
-      const r = map.get(startH + i);
-      return { label: String(i).padStart(2, '0'), visitors: r ? r.v : 0, pageviews: r ? r.pv : 0 };
+    const n = Math.round((dayEnd - start) / 3600000);
+    series = Array.from({ length: n }, (_, i) => {
+      const r = map.get(i);
+      const t = start + i * 3600000;
+      const lab = new Date(t + TZ.offsetMin(tz, t) * 60000).toISOString().slice(11, 13);
+      return { label: lab, visitors: r ? r.v : 0, pageviews: r ? r.pv : 0 };
     });
   } else {
-    const rows = db.prepare(`SELECT day, COUNT(*) pv, COUNT(DISTINCT vh) v FROM events WHERE ${where} GROUP BY day`).all(...args);
-    const map = new Map(rows.map((r) => [r.day, r]));
+    const rows = db.prepare(`SELECT ${TZ.daySql(tz, start, end)} AS lday, COUNT(*) pv, COUNT(DISTINCT vh) v FROM events WHERE ${where} GROUP BY lday`).all(...args);
+    const map = new Map(rows.map((r) => [r.lday, r]));
+    if (imp.on) for (const r of imp.days) { const e = map.get(r.day) || { lday: r.day, pv: 0, v: 0 }; e.pv += r.pageviews; e.v += r.visitors; map.set(r.day, e); }
     series = Array.from({ length: days }, (_, i) => {
-      const d = new Date(start + i * 864e5).toISOString().slice(0, 10);
+      const d = TZ.addDays(fromDay, i);
       const r = map.get(d);
       return { label: d.slice(5), day: d, visitors: r ? r.v : 0, pageviews: r ? r.pv : 0 };
     });
   }
 
   // previous year: same window shifted by 364 days (same weekdays). Null until data reaches back that far.
-  const yoyStart = start - 364 * 864e5, yoyEnd = end - 364 * 864e5;
+  const yoyStart = TZ.dayStart(tz, TZ.addDays(fromDay, -364)), yoyEnd = yoyStart + (end - start);
   const firstTs = db.prepare('SELECT MIN(ts) t FROM events WHERE site_id = ?').get(sid).t;
   let yoy = null;
   if (firstTs != null && firstTs <= yoyStart) {
@@ -510,9 +631,13 @@ function statsHandler(req, res) {
     yoy = { visitors: pct(totals.visitors, y.visitors), pageviews: pct(totals.pageviews, y.pageviews), was: y };
   }
 
-  const topBy = (col, limit = 8) => db.prepare(
+  const topByRaw = (col, limit = 8) => db.prepare(
     `SELECT ${col} AS name, COUNT(*) AS pageviews, COUNT(DISTINCT vh) AS visitors FROM events WHERE ${where} AND ${col} IS NOT NULL AND ${col} != '' GROUP BY ${col} ORDER BY visitors DESC, pageviews DESC LIMIT ${limit}`,
   ).all(...args);
+  const IMP_DIM = { path: 'page', country: 'country', browser: 'browser', os: 'os', device: 'device' };
+  // native + imported for the same dimension; visitors are summed per day-bucket (an approximation,
+  // like every imported breakdown — imported data has no visitor identity to deduplicate)
+  const topBy = (col, limit = 8) => (imp.on && IMP_DIM[col] ? mergeTop(topByRaw(col, 200), imp.top(IMP_DIM[col]), limit) : topByRaw(col, limit));
 
   // entry / exit pages: first / last pageview of each visit (vh,day), counted as visits.
   const edge = (dir, limit = 8) => db.prepare(
@@ -525,7 +650,8 @@ function statsHandler(req, res) {
   const goalRows = db.prepare(
     `SELECT name, COUNT(*) AS pageviews, COUNT(DISTINCT vh) AS visitors FROM events WHERE site_id = ? AND ts >= ? AND ts < ?${evf} AND name IS NOT NULL GROUP BY name ORDER BY visitors DESC, pageviews DESC LIMIT 12`,
   ).all(sid, start, end);
-  const goals = goalRows.map((g) => ({ ...g, cr: totals.visitors ? +((g.visitors / totals.visitors) * 100).toFixed(1) : 0 }));
+  const goalRowsAll = imp.on ? mergeTop(goalRows, imp.top('event'), 12) : goalRows;
+  const goals = goalRowsAll.map((g) => ({ ...g, cr: totals.visitors ? +((g.visitors / totals.visitors) * 100).toFixed(1) : 0 }));
 
   // properties: only meaningful when drilled into a single goal — top values per property key.
   let properties = null;
@@ -551,6 +677,7 @@ function statsHandler(req, res) {
   const srcAll = db.prepare(
     `SELECT source AS name, COUNT(*) AS pageviews, COUNT(DISTINCT vh) AS visitors FROM events WHERE ${where} AND source IS NOT NULL AND source != '' GROUP BY source ORDER BY visitors DESC, pageviews DESC LIMIT 40`,
   ).all(...args);
+  if (imp.on) { const merged = mergeTop(srcAll, imp.top('source'), 40); srcAll.length = 0; srcAll.push(...merged); }
   const sourcesClean = srcAll.filter((r) => !isPaymentHost(r.name)).slice(0, 8);
   const paymentReturns = srcAll.filter((r) => isPaymentHost(r.name));
 
@@ -630,14 +757,17 @@ function statsHandler(req, res) {
 
   res.json({
     site: { domain: site.domain, name: site.name },
-    period, range: { from: new Date(start).toISOString().slice(0, 10), to: new Date(end - 1).toISOString().slice(0, 10) },
+    period, timezone: tz, range: { from: fromDay, to: toDay },
     filters: Object.assign({}, ...Object.keys(FILTER_COLS).filter((k) => req.query[k]).map((k) => ({ [k]: req.query[k] })), goal ? { goal } : {}),
     totals: { visitors: totals.visitors, pageviews: totals.pageviews, bounce, viewsPerVisitor, duration },
     trend: { visitors: pct(totals.visitors, prev.visitors), pageviews: pct(totals.pageviews, prev.pageviews) },
     previous: { visitors: prev.visitors, pageviews: prev.pageviews },
     yoy,
-    dataSince: firstTs ? new Date(firstTs).toISOString().slice(0, 10) : null,
+    dataSince: firstTs ? TZ.localDay(tz, firstTs) : null,
+    imported: imp.exists ? { included: imp.on, excludedByFilter: imp.filtered, until: imp.until } : null,
     series,
+    annotations: db.prepare('SELECT id, day, text, created_by FROM annotations WHERE site_id = ? AND day >= ? AND day <= ? ORDER BY day, id')
+      .all(sid, fromDay, toDay),
     pages: topBy('path', 10),
     entryPages: edge('ASC', 8),
     exitPages: edge('DESC', 8),
@@ -669,7 +799,7 @@ app.get('/api/v1/stats', authOrShare, statsHandler);
 function realtimeHandler(req, res) {
   const site = getSiteByDomain.get(norm(req.query.site));
   if (!site) return res.status(404).json({ error: 'Unknown site' });
-  if (!shareScopeOk(req, site)) return res.status(403).json({ error: 'Share link is limited to another site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
   const sid = site.id, now = Date.now(), since = now - 30 * 60000;
   const online = db.prepare('SELECT COUNT(DISTINCT vh) v FROM events WHERE site_id = ? AND name IS NULL AND ts >= ?').get(sid, now - 5 * 60000).v;
   const rows = db.prepare('SELECT CAST((ts/60000) AS INT) b, COUNT(*) pv, COUNT(DISTINCT vh) v FROM events WHERE site_id = ? AND name IS NULL AND ts >= ? GROUP BY b').all(sid, since);
@@ -683,18 +813,24 @@ app.get('/api/realtime', authOrShare, realtimeHandler);
 app.get('/api/v1/realtime', authOrShare, realtimeHandler);
 
 // ── share links: create / list / revoke (owner only) + resolve (public) ──────────
-app.get('/api/shares', auth, (req, res) => {
-  const rows = db.prepare('SELECT s.token, s.created, st.domain FROM shares s JOIN sites st ON st.id = s.site_id ORDER BY s.created DESC').all();
+app.get('/api/shares', adminOnly, (req, res) => {
+  const rows = db.prepare('SELECT s.token, s.created, s.site_id, st.domain FROM shares s JOIN sites st ON st.id = s.site_id ORDER BY s.created DESC').all()
+    .filter((r) => siteAllowed(req, r.site_id)).map(({ site_id, ...r }) => r);
   res.json(rows);
 });
-app.post('/api/shares', auth, (req, res) => {
+app.post('/api/shares', adminOnly, (req, res) => {
   const site = getSiteByDomain.get(norm(req.body && req.body.site));
   if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
   const token = newToken();
   db.prepare('INSERT INTO shares (token, site_id, created) VALUES (?, ?, ?)').run(token, site.id, Date.now());
+  audit(res, 'share.add', site.domain);
   res.json({ token, domain: site.domain, url: '/share/' + token });
 });
-app.delete('/api/shares/:token', auth, (req, res) => {
+app.delete('/api/shares/:token', adminOnly, (req, res) => {
+  const sh = getShare.get(String(req.params.token));
+  if (sh && !siteAllowed(req, sh.site_id)) return res.status(403).json(NO_SITE);
+  if (sh) { const st = db.prepare('SELECT domain FROM sites WHERE id = ?').get(sh.site_id); audit(res, 'share.revoke', st ? st.domain : null); }
   db.prepare('DELETE FROM shares WHERE token = ?').run(String(req.params.token));
   res.json({ ok: true });
 });
@@ -706,15 +842,94 @@ app.get('/api/share-info/:token', (req, res) => {
   res.json({ domain: site.domain, name: site.name });
 });
 
+// ── import history: Plausible export ZIP / CSVs, Google Analytics 4 CSVs (owner/admin) ──
+const { parseImport } = require('./importers');
+app.post('/api/imports', adminOnly, express.raw({ type: ['application/zip', 'application/octet-stream', 'text/csv', 'text/plain'], limit: '60mb' }), async (req, res) => {
+  const site = getSiteByDomain.get(norm(req.query.site));
+  if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
+  const source = String(req.query.source || '');
+  if (!['plausible', 'ga'].includes(source)) return res.status(400).json({ error: 'source must be plausible or ga' });
+  if (!Buffer.isBuffer(req.body) || !req.body.length) return res.status(400).json({ error: 'Upload a .zip or .csv file' });
+  const isZip = req.body.readUInt32LE(0) === 0x04034b50;
+  let parsed;
+  try { parsed = await parseImport(source, isZip ? { zip: req.body } : { files: [{ name: String(req.query.name || 'upload.csv').slice(0, 120), text: req.body.toString('utf8') }] }); }
+  catch (e) { return res.status(400).json({ error: e.message }); }
+  const rows = parsed.rows.filter((r) => r.visitors || r.pageviews);
+  if (!rows.length) return res.status(400).json({ error: 'The file contains no daily numbers' });
+  if (rows.length > 2e6) return res.status(400).json({ error: 'Too many rows' });
+  const daysTot = rows.filter((r) => r.dim === '').map((r) => r.day).sort();
+  const first = firstOwnDay(site);
+  const by = whoDid(req);
+  const id = db.transaction(() => {
+    const info = db.prepare('INSERT INTO imports (site_id, source, first_day, last_day, rows, pageviews, files, created_by, created) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)')
+      .run(site.id, source, daysTot[0] || null, daysTot[daysTot.length - 1] || null, rows.length, rows.filter((r) => r.dim === '').reduce((a, r) => a + r.pageviews, 0), parsed.files.join(', ').slice(0, 500), by, Date.now());
+    const ins = db.prepare('INSERT INTO imported (import_id, site_id, day, dim, name, visitors, pageviews, visits, bounces, duration) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
+    for (const r of rows) ins.run(info.lastInsertRowid, site.id, r.day, r.dim, r.name || '', r.visitors, r.pageviews, r.visits || 0, r.bounces || 0, r.duration || 0);
+    return info.lastInsertRowid;
+  })();
+  const imp = db.prepare('SELECT * FROM imports WHERE id = ?').get(id);
+  audit(res, 'import.add', `${site.domain}: ${source} ${imp.first_day || '?'} – ${imp.last_day || '?'} (${imp.pageviews} views)`);
+  res.json({ ...imp, countsUntil: first, note: first && imp.last_day && imp.last_day >= first ? `Days from ${first} on already have own data — imported numbers count only before that day.` : null });
+});
+app.get('/api/imports', auth, (req, res) => {
+  const site = getSiteByDomain.get(norm(req.query.site));
+  if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
+  res.json({ countsUntil: firstOwnDay(site), imports: db.prepare('SELECT id, source, first_day, last_day, rows, pageviews, files, created_by, created FROM imports WHERE site_id = ? ORDER BY id DESC').all(site.id) });
+});
+app.delete('/api/imports/:id', adminOnly, (req, res) => {
+  const imp = db.prepare('SELECT * FROM imports WHERE id = ?').get(Number(req.params.id));
+  if (!imp) return res.json({ ok: true });
+  if (!siteAllowed(req, imp.site_id)) return res.status(403).json(NO_SITE);
+  db.transaction(() => { db.prepare('DELETE FROM imported WHERE import_id = ?').run(imp.id); db.prepare('DELETE FROM imports WHERE id = ?').run(imp.id); })();
+  audit(res, 'import.remove', `${imp.source} ${imp.first_day || ''} – ${imp.last_day || ''}`);
+  res.json({ ok: true });
+});
+
+// ── chart annotations: list for a site (any reader of the site), add/remove (admin) ──
+app.get('/api/annotations', authOrShare, (req, res) => {
+  const site = getSiteByDomain.get(norm(req.query.site));
+  if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
+  res.json(db.prepare('SELECT id, day, text, created_by, created FROM annotations WHERE site_id = ? ORDER BY day DESC, id DESC LIMIT 500').all(site.id));
+});
+app.post('/api/annotations', adminOnly, (req, res) => {
+  const b = req.body || {};
+  const site = getSiteByDomain.get(norm(b.site));
+  if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
+  const day = String(b.day || '');
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(day) || isNaN(Date.parse(day + 'T00:00:00Z')) || new Date(day + 'T00:00:00Z').toISOString().slice(0, 10) !== day) {
+    return res.status(400).json({ error: 'day must be a date like 2026-10-15' });
+  }
+  const text = String(b.text || '').replace(/\s+/g, ' ').trim().slice(0, 140);
+  if (!text) return res.status(400).json({ error: 'Write a short note' });
+  const by = whoDid(req);
+  const info = db.prepare('INSERT INTO annotations (site_id, day, text, created_by, created) VALUES (?, ?, ?, ?, ?)').run(site.id, day, text, by, Date.now());
+  audit(res, 'note.add', `${site.domain} ${day}: ${text}`);
+  res.json({ id: info.lastInsertRowid, day, text, created_by: by });
+});
+app.delete('/api/annotations/:id', adminOnly, (req, res) => {
+  const a = db.prepare('SELECT * FROM annotations WHERE id = ?').get(Number(req.params.id));
+  if (!a) return res.json({ ok: true });
+  if (!siteAllowed(req, a.site_id)) return res.status(403).json(NO_SITE);
+  db.prepare('DELETE FROM annotations WHERE id = ?').run(a.id);
+  audit(res, 'note.remove', `${a.day}: ${a.text}`);
+  res.json({ ok: true });
+});
+
 // ── funnels: ordered steps (pages or goals), conversion measured per visitor in-range ──
 app.get('/api/funnels', auth, (req, res) => {
   const site = getSiteByDomain.get(norm(req.query.site));
   if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
   res.json(db.prepare('SELECT id, name, steps, created FROM funnels WHERE site_id = ? ORDER BY id').all(site.id).map((f) => ({ ...f, steps: JSON.parse(f.steps) })));
 });
-app.post('/api/funnels', auth, (req, res) => {
+app.post('/api/funnels', adminOnly, (req, res) => {
   const site = getSiteByDomain.get(norm(req.body && req.body.site));
   if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
   const name = String((req.body && req.body.name) || '').slice(0, 80).trim();
   const raw = (req.body && req.body.steps) || [];
   if (!name) return res.status(400).json({ error: 'Funnel needs a name' });
@@ -726,9 +941,13 @@ app.post('/api/funnels', auth, (req, res) => {
   }));
   if (steps.some((s) => !s.value)) return res.status(400).json({ error: 'Every step needs a value' });
   const info = db.prepare('INSERT INTO funnels (site_id, name, steps, created) VALUES (?, ?, ?, ?)').run(site.id, name, JSON.stringify(steps), Date.now());
+  audit(res, 'funnel.add', `${site.domain}: ${name}`);
   res.json({ id: info.lastInsertRowid, name, steps });
 });
-app.delete('/api/funnels/:id', auth, (req, res) => {
+app.delete('/api/funnels/:id', adminOnly, (req, res) => {
+  const f = db.prepare('SELECT site_id, name FROM funnels WHERE id = ?').get(Number(req.params.id));
+  if (f && !siteAllowed(req, f.site_id)) return res.status(403).json(NO_SITE);
+  if (f) audit(res, 'funnel.remove', f.name);
   db.prepare('DELETE FROM funnels WHERE id = ?').run(Number(req.params.id));
   res.json({ ok: true });
 });
@@ -737,8 +956,8 @@ app.get('/api/funnels/:id/stats', authOrShare, (req, res) => {
   const f = db.prepare('SELECT * FROM funnels WHERE id = ?').get(Number(req.params.id));
   if (!f) return res.status(404).json({ error: 'Unknown funnel' });
   const site = db.prepare('SELECT * FROM sites WHERE id = ?').get(f.site_id);
-  if (!shareScopeOk(req, site)) return res.status(403).json({ error: 'Share link is limited to another site' });
-  const { start, end } = rangeFor(req.query);
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
+  const { start, end, fromDay, toDay } = rangeFor(req.query, site.timezone);
   const steps = JSON.parse(f.steps);
   // one pass per visitor: fetch matching events sorted by time, walk the step ladder.
   const conds = steps.map((s) => (s.type === 'goal' ? 'name = ?' : "(name IS NULL AND path = ?)"));
@@ -760,7 +979,7 @@ app.get('/api/funnels/:id/stats', authOrShare, (req, res) => {
     pctOfFirst: counts[0] ? +((counts[i] / counts[0]) * 100).toFixed(1) : 0,
     dropFromPrev: i > 0 && counts[i - 1] ? +((1 - counts[i] / counts[i - 1]) * 100).toFixed(1) : 0,
   }));
-  res.json({ id: f.id, name: f.name, range: { from: new Date(start).toISOString().slice(0, 10), to: new Date(end - 1).toISOString().slice(0, 10) }, steps: out });
+  res.json({ id: f.id, name: f.name, range: { from: fromDay, to: toDay }, steps: out });
 });
 
 // ── static dashboard ─────────────────────────────────────────────────────────
@@ -771,8 +990,8 @@ app.use(express.static(path.join(__dirname, 'public')));
 app.get('/api/journeys', authOrShare, (req, res) => {
   const site = getSiteByDomain.get(norm(req.query.site));
   if (!site) return res.status(404).json({ error: 'Unknown site' });
-  if (!shareScopeOk(req, site)) return res.status(403).json({ error: 'Share link is limited to another site' });
-  const { start, end } = rangeFor(req.query);
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
+  const { start, end } = rangeFor(req.query, site.timezone);
   const maxDepth = Math.min(5, Math.max(2, parseInt(req.query.depth, 10) || 4));
   const GAP = 30 * 60000;
   const rows = db.prepare('SELECT vh, ts, path FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name IS NULL ORDER BY vh, ts, id').all(site.id, start, end);
@@ -813,7 +1032,199 @@ app.get('/api/journeys', authOrShare, (req, res) => {
 });
 
 
-app.get('*', (_req, res) => res.sendFile(path.join(__dirname, 'public', 'index.html')));
+// ── alerts: per-site rules (traffic spike / drop / goal reached), delivered to a webhook ──────────
+// Rules live in the DB and are managed from the dashboard (admin+). Delivery: the rule's own webhook,
+// else DIGEST_WEBHOOK_URL. Discord / Slack / generic JSON. Each rule has a cooldown so a long spike
+// sends one message, not twelve.
+db.exec(`
+  CREATE TABLE IF NOT EXISTS alerts (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    site_id INTEGER NOT NULL,
+    kind TEXT NOT NULL,          -- 'spike' | 'drop' | 'goal'
+    goal TEXT,                   -- event name for kind = goal
+    threshold INTEGER,           -- goal: events within the window; spike/drop: unused (baseline-based)
+    window_hours INTEGER NOT NULL DEFAULT 24,
+    webhook TEXT,                -- NULL = DIGEST_WEBHOOK_URL
+    enabled INTEGER NOT NULL DEFAULT 1,
+    last_fired INTEGER,
+    created INTEGER NOT NULL
+  );
+`);
+const ALERT_KINDS = ['spike', 'drop', 'goal'];
+// SSRF guard (webhook.js): https only, public addresses only — checked when saved AND at
+// connect time (the dialled IP itself), so DNS rebinding between check and send does not help.
+const { webhookProblem, resolvesPublic: webhookResolvesPublic, postJson: postWebhook } = require('./webhook');
+// tests only: a local http receiver (never set this in production)
+const TEST_WEBHOOK_BASE = process.env.TACILYTICS_TEST_HOOKS === '1' ? (process.env.TACILYTICS_TEST_WEBHOOK_BASE || '') : '';
+const isTestWebhook = (u) => !!TEST_WEBHOOK_BASE && String(u).startsWith(TEST_WEBHOOK_BASE);
+// The operator's DIGEST_WEBHOOK_URL (.env) is trusted as before (may be internal, e.g. ntfy on localhost).
+// Webhooks typed into the dashboard are checked, because a teammate must not reach internal services.
+// tests only: a fake resolver (TACILYTICS_TEST_DNS='{"name":["1.2.3.4","127.0.0.1"]}' → answers in turn)
+let webhookLookup = require('dns').lookup;
+if (process.env.TACILYTICS_TEST_HOOKS === '1' && process.env.TACILYTICS_TEST_DNS) {
+  const table = JSON.parse(process.env.TACILYTICS_TEST_DNS), seen = {};
+  const real = webhookLookup;
+  webhookLookup = (host, opts, cb) => {
+    if (typeof opts === 'function') { cb = opts; opts = {}; }
+    if (!table[host]) return real(host, opts, cb);
+    const list = table[host], i = Math.min(seen[host] = (seen[host] || 0) + 1, list.length) - 1;
+    const address = list[i], family = address.includes(':') ? 6 : 4;
+    return opts.all ? cb(null, [{ address, family }]) : cb(null, address, family);
+  };
+}
+async function deliver(url, text) {
+  const trusted = url && (url === DIGEST_WEBHOOK_URL || isTestWebhook(url));
+  if (!url || (!trusted && (webhookProblem(url) || !(await webhookResolvesPublic(url, webhookLookup))))) { console.error('alert: webhook refused'); return false; }
+  const isSlack = /hooks\.slack\.com/.test(url);
+  const body = isSlack ? { text } : { username: 'Tacilytics', content: text, text };
+  try {
+    const r = trusted
+      ? await fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body), signal: AbortSignal.timeout(10000) })
+      : await postWebhook(url, body, { lookup: webhookLookup }); // no redirects, IP checked on connect
+    if (!r.ok) console.error('alert webhook failed:', r.status);
+    return r.ok;
+  } catch (e) { console.error(e.code === 'EWEBHOOKPRIVATE' ? 'alert: webhook refused (resolved to a private address)' : 'alert webhook error: ' + e.message); return false; }
+}
+function publicAlert(a, domain) {
+  return { id: a.id, site: domain, kind: a.kind, goal: a.goal, threshold: a.threshold, window_hours: a.window_hours,
+    webhook: a.webhook ? new URL(a.webhook).hostname : null, enabled: !!a.enabled, last_fired: a.last_fired };
+}
+app.get('/api/alerts', auth, (req, res) => {
+  const site = getSiteByDomain.get(norm(req.query.site));
+  if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
+  res.json({ fallbackWebhook: !!DIGEST_WEBHOOK_URL, alerts: db.prepare('SELECT * FROM alerts WHERE site_id = ? ORDER BY id').all(site.id).map((a) => publicAlert(a, site.domain)) });
+});
+app.post('/api/alerts', adminOnly, async (req, res) => {
+  const b = req.body || {};
+  const site = getSiteByDomain.get(norm(b.site));
+  if (!site) return res.status(404).json({ error: 'Unknown site' });
+  if (!siteOk(req, site)) return res.status(403).json(NO_SITE);
+  if (!ALERT_KINDS.includes(b.kind)) return res.status(400).json({ error: 'kind must be spike, drop or goal' });
+  let goal = null, threshold = null, windowHours = 1;
+  if (b.kind === 'goal') {
+    goal = String(b.goal || '').trim().slice(0, 80);
+    threshold = Math.floor(Number(b.threshold));
+    windowHours = Math.floor(Number(b.window_hours) || 24);
+    if (!goal) return res.status(400).json({ error: 'Name the goal (event name), e.g. Purchase' });
+    if (!(threshold >= 1 && threshold <= 1e6)) return res.status(400).json({ error: 'Threshold must be at least 1' });
+    if (![1, 24, 168].includes(windowHours)) return res.status(400).json({ error: 'Window must be 1, 24 or 168 hours' });
+  }
+  let webhook = null;
+  if (b.webhook && isTestWebhook(b.webhook)) {
+    webhook = String(b.webhook);
+  } else if (b.webhook) {
+    const prob = webhookProblem(b.webhook);
+    if (prob) return res.status(400).json({ error: prob });
+    if (!(await webhookResolvesPublic(b.webhook, webhookLookup))) return res.status(400).json({ error: 'Webhook must point to a public address' });
+    webhook = String(b.webhook);
+  } else if (!DIGEST_WEBHOOK_URL) return res.status(400).json({ error: 'Add a webhook URL (no default DIGEST_WEBHOOK_URL is set)' });
+  if (db.prepare('SELECT COUNT(*) n FROM alerts WHERE site_id = ?').get(site.id).n >= 20) return res.status(400).json({ error: 'At most 20 alerts per site' });
+  const info = db.prepare('INSERT INTO alerts (site_id, kind, goal, threshold, window_hours, webhook, created) VALUES (?, ?, ?, ?, ?, ?, ?)')
+    .run(site.id, b.kind, goal, threshold, windowHours, webhook, Date.now());
+  audit(res, 'alert.add', `${site.domain}: ${b.kind}${goal ? ' ' + goal + ' ≥ ' + threshold + '/' + windowHours + 'h' : ''}`);
+  res.json(publicAlert(db.prepare('SELECT * FROM alerts WHERE id = ?').get(info.lastInsertRowid), site.domain));
+});
+app.patch('/api/alerts/:id', adminOnly, (req, res) => {
+  const a = db.prepare('SELECT * FROM alerts WHERE id = ?').get(Number(req.params.id));
+  if (!a) return res.status(404).json({ error: 'Unknown alert' });
+  if (!siteAllowed(req, a.site_id)) return res.status(403).json(NO_SITE);
+  db.prepare('UPDATE alerts SET enabled = ? WHERE id = ?').run((req.body || {}).enabled ? 1 : 0, a.id);
+  audit(res, (req.body || {}).enabled ? 'alert.on' : 'alert.off', `${a.kind}${a.goal ? ' ' + a.goal : ''}`);
+  res.json({ ok: true });
+});
+app.delete('/api/alerts/:id', adminOnly, (req, res) => {
+  const a = db.prepare('SELECT * FROM alerts WHERE id = ?').get(Number(req.params.id));
+  if (!a) return res.json({ ok: true });
+  if (!siteAllowed(req, a.site_id)) return res.status(403).json(NO_SITE);
+  db.prepare('DELETE FROM alerts WHERE id = ?').run(a.id);
+  audit(res, 'alert.remove', `${a.kind}${a.goal ? ' ' + a.goal : ''}`);
+  res.json({ ok: true });
+});
+app.post('/api/alerts/:id/test', adminOnly, async (req, res) => {
+  const a = db.prepare('SELECT * FROM alerts WHERE id = ?').get(Number(req.params.id));
+  if (!a) return res.status(404).json({ error: 'Unknown alert' });
+  if (!siteAllowed(req, a.site_id)) return res.status(403).json(NO_SITE);
+  if (rateLimited('alert-test:' + a.id, 5, 60 * 60000)) return res.status(429).json({ error: 'Max. 5 test messages per hour' });
+  const site = db.prepare('SELECT domain FROM sites WHERE id = ?').get(a.site_id);
+  const ok = await deliver(a.webhook || DIGEST_WEBHOOK_URL, `🔔 **${site.domain}** test message from Tacilytics — this alert works.`);
+  res.status(ok ? 200 : 502).json(ok ? { ok: true } : { error: 'The webhook did not accept the message' });
+});
+
+// ── weekly report by e-mail ──────────────────────────────────────────────────────────────
+// Every account can opt in (Settings → Security) with an address; it gets one mail per week
+// (Monday, REPORT_HOUR_UTC) covering the sites it can see: last 7 days vs. the 7 before.
+// Needs SMTP_URL (smtp://user:pass@host:587 or smtps://…:465) and REPORT_FROM in .env.
+const SMTP_URL = process.env.SMTP_URL || '';
+const REPORT_FROM = process.env.REPORT_FROM || '';
+const REPORT_HOUR_UTC = Math.min(23, Math.max(0, parseInt(process.env.REPORT_HOUR_UTC, 10) || 6));
+const PUBLIC_URL = (process.env.TACILYTICS_ORIGIN || '').replace(/\/$/, '');
+for (const col of ['report_email TEXT', 'report_weekly INTEGER NOT NULL DEFAULT 0', 'report_last INTEGER', 'report_lang TEXT']) {
+  const name = col.split(' ')[0];
+  if (!db.prepare('PRAGMA table_info(users)').all().some((c) => c.name === name)) db.exec(`ALTER TABLE users ADD COLUMN ${col}`);
+}
+let mailer = null;
+function getMailer() {
+  if (!SMTP_URL || !REPORT_FROM) return null;
+  if (!mailer) mailer = require('nodemailer').createTransport(SMTP_URL);
+  return mailer;
+}
+const validEmail = (e) => /^[^\s@<>",;]{1,64}@[^\s@<>",;]{1,190}\.[A-Za-z]{2,}$/.test(e);
+const { createReport, REPORT_LANGS } = require('./report');
+const reporter = createReport(db);
+function buildReport(user, now) {
+  const sites = allSites.all().filter((st) => !user.sites || JSON.parse(user.sites).includes(st.id));
+  return reporter.build(user, sites, now, { publicUrl: PUBLIC_URL, lang: REPORT_LANGS.includes(user.report_lang) ? user.report_lang : 'en' });
+}
+async function sendReport(user, now = Date.now()) {
+  const m = getMailer();
+  if (!m) throw new Error('E-mail is not configured on this server (SMTP_URL, REPORT_FROM)');
+  const r = buildReport(user, now);
+  if (!r) return { skipped: 'no traffic' };
+  await m.sendMail({ from: REPORT_FROM, to: user.report_email, subject: r.subject, text: r.text, html: r.html });
+  return { sent: true };
+}
+async function reportTick(now = Date.now()) {
+  const d = new Date(now);
+  if (d.getUTCDay() !== 1 || d.getUTCHours() !== REPORT_HOUR_UTC || !getMailer()) return [];
+  const due = db.prepare('SELECT * FROM users WHERE report_weekly = 1 AND report_email IS NOT NULL AND (report_last IS NULL OR report_last < ?)').all(now - 6 * 864e5);
+  const out = [];
+  for (const u of due) {
+    db.prepare('UPDATE users SET report_last = ? WHERE id = ?').run(now, u.id); // first: a crash must not mean two mails
+    try { out.push({ user: u.username, ...(await sendReport(u, now)) }); } catch (e) { console.error('weekly report:', e.message); out.push({ user: u.username, error: e.message }); }
+  }
+  return out;
+}
+if (process.env.TACILYTICS_ALERT_TICK !== 'off') setInterval(() => { reportTick().catch((e) => console.error('reports:', e.message)); }, 10 * 60000).unref();
+
+app.get('/api/me/report', auth, (req, res) => {
+  if (!req.principal.user || req.principal.kind !== 'user') return res.status(400).json({ error: 'Sign in with an account' });
+  const u = db.prepare('SELECT report_email, report_weekly, report_last, report_lang FROM users WHERE id = ?').get(req.principal.user.id);
+  res.json({ configured: !!getMailer(), email: u.report_email, weekly: !!u.report_weekly, last: u.report_last, lang: u.report_lang || null });
+});
+app.post('/api/me/report', auth, (req, res) => {
+  if (!req.principal.user || req.principal.kind !== 'user') return res.status(400).json({ error: 'Sign in with an account' });
+  const b = req.body || {};
+  const email = String(b.email || '').trim();
+  if (b.weekly && !validEmail(email)) return res.status(400).json({ error: 'Enter a valid e-mail address' });
+  if (email && !validEmail(email)) return res.status(400).json({ error: 'Enter a valid e-mail address' });
+  if (b.lang != null && !REPORT_LANGS.includes(b.lang)) return res.status(400).json({ error: 'Unknown language' });
+  db.prepare('UPDATE users SET report_email = ?, report_weekly = ?, report_lang = COALESCE(?, report_lang) WHERE id = ?').run(email || null, b.weekly ? 1 : 0, b.lang || null, req.principal.user.id);
+  audit(res, b.weekly ? 'me.report.on' : 'me.report.off');
+  res.json({ ok: true });
+});
+app.post('/api/me/report/send', auth, async (req, res) => {
+  if (!req.principal.user || req.principal.kind !== 'user') return res.status(400).json({ error: 'Sign in with an account' });
+  if (rateLimited('report-now:' + req.principal.user.id, 3, 60 * 60000)) return res.status(429).json({ error: 'Max. 3 test reports per hour' });
+  const u = db.prepare('SELECT * FROM users WHERE id = ?').get(req.principal.user.id);
+  if (!u.report_email) return res.status(400).json({ error: 'Save an e-mail address first' });
+  try { const r = await sendReport(u); res.json(r.skipped ? { error: 'No traffic in the last two weeks — nothing to report' } : { ok: true }); }
+  catch (e) { res.status(502).json({ error: e.message.startsWith('E-mail is not') ? e.message : 'Sending failed: ' + e.message.slice(0, 120) }); }
+});
+if (process.env.TACILYTICS_TEST_HOOKS === '1') {
+  app.post('/api/_test/report-tick', requireRole('owner'), async (req, res) => res.json(await reportTick(Number((req.body || {}).now) || Date.now())));
+}
+
 
 // ── data retention (privacy by design: minimise what we keep) ─────────────────
 // When DATA_RETENTION_DAYS > 0, raw events older than the window are purged daily.
@@ -829,24 +1240,31 @@ if (RETENTION_DAYS > 0) { purgeOld(); setInterval(purgeOld, 24 * 3600 * 1000).un
 
 // ── daily digest: one webhook message per day summarising every site (yesterday vs the day before).
 // Configure DIGEST_WEBHOOK_URL (Discord-compatible) and optionally DIGEST_HOUR_UTC (default 7).
-const DIGEST_WEBHOOK_URL = process.env.DIGEST_WEBHOOK_URL || '';
 const DIGEST_HOUR_UTC = Math.min(23, Math.max(0, parseInt(process.env.DIGEST_HOUR_UTC, 10) || 7));
 let lastDigestDay = null;
-async function sendDigest() {
-  const yStart = new Date(new Date(Date.now() - 864e5).toISOString().slice(0, 10)).getTime();
-  const yEnd = yStart + 864e5, pStart = yStart - 864e5;
+function digestBody(now = Date.now()) {
+  // "yesterday" per site, in the site's time zone (23/25 h on DST days)
   const lines = [];
+  let label = null;
   for (const site of allSites.all()) {
+    const tz = site.timezone || 'UTC';
+    const yDay = TZ.addDays(TZ.localDay(tz, now), -1);
+    const yStart = TZ.dayStart(tz, yDay), yEnd = TZ.dayStart(tz, TZ.addDays(yDay, 1)), pStart = TZ.dayStart(tz, TZ.addDays(yDay, -1));
+    if (!label) label = yDay;
     const cur = db.prepare('SELECT COUNT(*) pv, COUNT(DISTINCT vh) v FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name IS NULL').get(site.id, yStart, yEnd);
     if (!cur.pv) continue; // silent sites stay out of the report
     const was = db.prepare('SELECT COUNT(*) pv, COUNT(DISTINCT vh) v FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name IS NULL').get(site.id, pStart, yStart);
     const top = db.prepare("SELECT path, COUNT(*) c FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name IS NULL GROUP BY path ORDER BY c DESC LIMIT 1").get(site.id, yStart, yEnd);
     const goals = db.prepare('SELECT COUNT(*) c FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name IS NOT NULL').get(site.id, yStart, yEnd).c;
     const arrow = was.v ? (cur.v > was.v ? '⬆️' : cur.v < was.v ? '⬇️' : '➡️') : '✨';
-    lines.push(`**${site.domain}** ${arrow} ${cur.v} visitors · ${cur.pv} views${goals ? ` · ${goals} events` : ''}${top ? ` · top \`${top.path}\`` : ''}`);
+    lines.push(`**${site.domain}**${yDay !== label ? ` (${yDay})` : ''} ${arrow} ${cur.v} visitors · ${cur.pv} views${goals ? ` · ${goals} events` : ''}${top ? ` · top \`${top.path}\`` : ''}`);
   }
-  if (!lines.length) return;
-  const body = { username: 'Tacilytics', content: `📊 **Daily digest — ${new Date(yStart).toISOString().slice(0, 10)}**\n` + lines.join('\n') };
+  if (!lines.length) return null;
+  return { username: 'Tacilytics', content: `📊 **Daily digest — ${label}**\n` + lines.join('\n') };
+}
+async function sendDigest(now = Date.now()) {
+  const body = digestBody(now);
+  if (!body) return;
   try {
     const r = await fetch(DIGEST_WEBHOOK_URL, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
     if (!r.ok) console.error('digest webhook failed:', r.status);
@@ -860,37 +1278,81 @@ if (DIGEST_WEBHOOK_URL) {
   }, 5 * 60000).unref();
 }
 
-// ── anomaly watchdog: hourly check of the last hour vs. the same hour on previous days.
-// Baseline = median of the same UTC hour over the last 14 days — same-hour compare avoids
-// the classic "every night is an incident" trap of naive averages. Cooldown 6h per site+kind.
+// ── alert engine: every 10 min. Spike/drop compare the last hour with the median of the same LOCAL
+// hour (site time zone — after a DST switch that is 23/25 h away, not 24) over 14 days (avoids "every night is an incident"); goals count events in a rolling window.
+// Sites without own rules keep the old behaviour when DIGEST_WEBHOOK_URL is set: spike + drop.
 const WATCH_MIN_VISITORS = Math.max(1, parseInt(process.env.WATCH_MIN_VISITORS, 10) || 10);
-const watchAlerted = new Map(); // "siteId|spike" / "siteId|drop" → last alert ts
+const legacyFired = new Map(); // "siteId|kind" → ts, for the implicit default rules
 function median(a) { const s = [...a].sort((x, y) => x - y); return s.length ? (s[s.length >> 1] + s[(s.length - 1) >> 1]) / 2 : 0; }
-async function watchdogTick() {
-  const now = Date.now();
+function trafficVerdict(siteId, now, tz) {
   const hourStart = now - 3600e3;
+  const cur = db.prepare('SELECT COUNT(DISTINCT vh) v FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name IS NULL').get(siteId, hourStart, now).v;
+  const hist = [];
+  for (let d = 1; d <= 14; d++) {
+    const s0 = TZ.sameLocalTime(tz || 'UTC', hourStart, d);
+    hist.push(db.prepare('SELECT COUNT(DISTINCT vh) v FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name IS NULL').get(siteId, s0, s0 + 3600e3).v);
+  }
+  const base = median(hist);
+  // abstain when the baseline is too thin to mean anything — a default is not a measurement
+  if (base < WATCH_MIN_VISITORS && cur < WATCH_MIN_VISITORS) return { cur, base, kind: null };
+  if (base >= 1 && cur >= Math.max(3 * base, base + WATCH_MIN_VISITORS)) return { cur, base, kind: 'spike' };
+  if (base >= WATCH_MIN_VISITORS && cur <= base * 0.2) return { cur, base, kind: 'drop' };
+  return { cur, base, kind: null };
+}
+const COOLDOWN = { spike: 6 * 3600e3, drop: 6 * 3600e3 };
+async function alertTick(now = Date.now()) {
+  const fired = [];
   for (const site of allSites.all()) {
-    const cur = db.prepare('SELECT COUNT(DISTINCT vh) v FROM events WHERE site_id = ? AND ts >= ? AND name IS NULL').get(site.id, hourStart).v;
-    const hist = [];
-    for (let d = 1; d <= 14; d++) {
-      const s = hourStart - d * 864e5;
-      hist.push(db.prepare('SELECT COUNT(DISTINCT vh) v FROM events WHERE site_id = ? AND ts >= ? AND ts < ? AND name IS NULL').get(site.id, s, s + 3600e3).v);
+    const rules = db.prepare('SELECT * FROM alerts WHERE site_id = ? AND enabled = 1').all(site.id);
+    const hasOwn = db.prepare('SELECT COUNT(*) n FROM alerts WHERE site_id = ?').get(site.id).n > 0;
+    let verdict = null;
+    const traffic = () => verdict || (verdict = trafficVerdict(site.id, now, site.timezone));
+    const msgFor = (kind, v) => kind === 'spike'
+      ? `🚀 **${site.domain}** traffic spike: **${v.cur}** visitors in the last hour (usually ~${v.base})`
+      : `📉 **${site.domain}** traffic drop: **${v.cur}** visitors in the last hour (usually ~${v.base}) — tracker offline?`;
+    for (const r of rules) {
+      let text = null;
+      if (r.kind === 'goal') {
+        // fire once per window: after firing, wait until the window has passed
+        if (r.last_fired && now - r.last_fired < r.window_hours * 3600e3) continue;
+        const n = db.prepare('SELECT COUNT(*) c FROM events WHERE site_id = ? AND name = ? AND ts >= ? AND ts < ?').get(site.id, r.goal, now - r.window_hours * 3600e3, now).c;
+        if (n >= r.threshold) text = `🎯 **${site.domain}** goal reached: **${n}× ${r.goal}** in the last ${r.window_hours === 1 ? 'hour' : r.window_hours === 24 ? '24 hours' : '7 days'} (threshold ${r.threshold})`;
+      } else {
+        if (r.last_fired && now - r.last_fired < COOLDOWN[r.kind]) continue;
+        const v = traffic();
+        if (v.kind === r.kind) text = msgFor(r.kind, v);
+      }
+      if (!text) continue;
+      db.prepare('UPDATE alerts SET last_fired = ? WHERE id = ?').run(now, r.id); // before sending: a slow webhook must not double-fire
+      fired.push({ site: site.domain, kind: r.kind, text });
+      await deliver(r.webhook || DIGEST_WEBHOOK_URL, text);
+    }
+    if (!hasOwn && DIGEST_WEBHOOK_URL) {
+      const v = traffic();
+      if (v.kind) {
+        const key = site.id + '|' + v.kind;
+        if (now - (legacyFired.get(key) || 0) >= COOLDOWN[v.kind]) {
+          legacyFired.set(key, now);
+          const text = msgFor(v.kind, v);
+          fired.push({ site: site.domain, kind: v.kind, text, implicit: true });
+          await deliver(DIGEST_WEBHOOK_URL, text);
+        }
+      }
     }
-    const base = median(hist);
-    // abstain when the baseline is too thin to mean anything — a default is not a measurement
-    if (base < WATCH_MIN_VISITORS && cur < WATCH_MIN_VISITORS) continue;
-    let kind = null, emoji = '', text = '';
-    if (base >= 1 && cur >= Math.max(3 * base, base + WATCH_MIN_VISITORS)) { kind = 'spike'; emoji = '🚀'; text = `traffic spike: **${cur}** visitors last hour (usually ~${base})`; }
-    else if (base >= WATCH_MIN_VISITORS && cur <= base * 0.2) { kind = 'drop'; emoji = '📉'; text = `traffic drop: **${cur}** visitors last hour (usually ~${base}) — tracker offline?`; }
-    if (!kind) continue;
-    const key = site.id + '|' + kind;
-    if (now - (watchAlerted.get(key) || 0) < 6 * 3600e3) continue; // cooldown
-    watchAlerted.set(key, now);
-    try {
-      await fetch(DIGEST_WEBHOOK_URL, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ username: 'Tacilytics', content: `${emoji} **${site.domain}** ${text}` }) });
-    } catch (e) { console.error('watchdog webhook error:', e.message); }
   }
+  return fired;
+}
+if (process.env.TACILYTICS_ALERT_TICK !== 'off') setInterval(() => { alertTick().catch((e) => console.error('alerts:', e.message)); }, 10 * 60000).unref();
+// test hook: run one evaluation on demand (only with the server API_KEY, only when enabled explicitly)
+if (process.env.TACILYTICS_TEST_HOOKS === '1') {
+  app.post('/api/_test/digest', requireRole('owner'), (req, res) => res.json(digestBody(Number((req.body || {}).now) || Date.now())));
+  app.post('/api/_test/alert-tick', requireRole('owner'), async (req, res) => res.json(await alertTick(Number((req.body || {}).now) || Date.now())));
 }
-if (DIGEST_WEBHOOK_URL) setInterval(watchdogTick, 3600e3).unref();
+
+// ── fallbacks: LAST, after every route (a route registered below these would never be reached) ──
+// unknown API paths are a 404 in JSON — never the SPA page. A client that asks an older/newer server for a
+// route it doesn't have must get an error it can show, not HTML it would try to read as data (Kiro, 2.2.0).
+app.all(/^\/(api|auth)(\/|$)/, (_req, res) => res.status(404).json({ error: 'Not found' }));
+app.get('*', (_req, res) => res.sendFile(path.join(__dirname, 'public', 'index.html')));
 
 app.listen(PORT, '127.0.0.1', () => console.log(`Tacilytics on http://127.0.0.1:${PORT}${RETENTION_DAYS ? ` · retention ${RETENTION_DAYS}d` : ''}${DIGEST_WEBHOOK_URL ? ` · digest ${DIGEST_HOUR_UTC}:00 UTC` : ''}`));