@sendinel/mcp-server 1.0.72 → 1.0.74

package/build/lib/campaign-engagement.d.ts

@@ -1,18 +1,21 @@
-export type CampaignPeopleCounts = {
+import { countUniqueEngagementByCampaign as readPeople } from "@sendinel/domain";
+export type CampaignPeopleCounts = Awaited<ReturnType<typeof readPeople>>;
+export declare function countUniqueEngagementByCampaign(sb: {
+    from: (table: string) => any;
+}, projectId: string, ids: string[]): Promise<{
     ok: true;
     opened: Map<string, number>;
     clicked: Map<string, number>;
+    sent: Map<string, number>;
+    delivered: Map<string, number>;
+    error?: undefined;
 } | {
     ok: false;
-    error: unknown;
-};
-/**
- * Distinct recipients who opened / clicked, per campaign. `campaigns.total_opened` / `total_clicked`
- * are event counters and can exceed total_sent (#3788). Mirrors the dashboard's
- * `countUniqueEngagementByCampaign` (packages/dashboard/lib/campaign-step-engagement.ts): the MCP
- * package cannot import dashboard code, so keep the two in step. A click counts as an open.
- * One paged email_log query for the whole id set; a failed read is `{ ok: false }`, never zeros.
- */
-export declare function countUniqueEngagementByCampaign(sb: {
-    from: (table: string) => any;
-}, projectId: string, campaignIds: string[]): Promise<CampaignPeopleCounts>;
+    error: {
+        message: string;
+    };
+    opened?: undefined;
+    clicked?: undefined;
+    sent?: undefined;
+    delivered?: undefined;
+}>;

package/build/lib/campaign-engagement.js

@@ -1,56 +1,5 @@
-import { readAllPages } from '@sendinel/domain';
-/** PostgREST caps a response at 1,000 rows, so page explicitly. */
-const PAGE_SIZE = 1000;
-/**
- * Distinct recipients who opened / clicked, per campaign. `campaigns.total_opened` / `total_clicked`
- * are event counters and can exceed total_sent (#3788). Mirrors the dashboard's
- * `countUniqueEngagementByCampaign` (packages/dashboard/lib/campaign-step-engagement.ts): the MCP
- * package cannot import dashboard code, so keep the two in step. A click counts as an open.
- * One paged email_log query for the whole id set; a failed read is `{ ok: false }`, never zeros.
- */
-export async function countUniqueEngagementByCampaign(sb, projectId, campaignIds) {
-    const opened = new Map();
-    const clicked = new Map();
-    if (campaignIds.length === 0)
-        return { ok: true, opened, clicked };
-    const read = await readAllPages((from, to) => sb
-        .from('email_log')
-        .select('id, campaign_id, contact_id, to_email, opened_at, clicked_at')
-        .eq('project_id', projectId)
-        .in('campaign_id', campaignIds)
-        .or('opened_at.not.is.null,clicked_at.not.is.null')
-        .order('id', { ascending: true })
-        .range(from, to), { cap: Number.MAX_SAFE_INTEGER, pageSize: PAGE_SIZE });
-    if (!read.ok)
-        return { ok: false, error: read.error };
-    const openedRecipients = new Map();
-    const clickedRecipients = new Map();
-    const add = (bucket, campaignId, recipient) => {
-        let set = bucket.get(campaignId);
-        if (!set) {
-            set = new Set();
-            bucket.set(campaignId, set);
-        }
-        set.add(recipient);
-    };
-    for (const row of read.rows) {
-        if (!row.campaign_id)
-            continue;
-        const recipient = row.contact_id
-            ? row.contact_id
-            : row.to_email
-                ? row.to_email.trim().toLowerCase()
-                : null;
-        if (!recipient)
-            continue;
-        if (row.opened_at || row.clicked_at)
-            add(openedRecipients, row.campaign_id, recipient);
-        if (row.clicked_at)
-            add(clickedRecipients, row.campaign_id, recipient);
-    }
-    for (const [id, set] of openedRecipients)
-        opened.set(id, set.size);
-    for (const [id, set] of clickedRecipients)
-        clicked.set(id, set.size);
-    return { ok: true, opened, clicked };
+import { countUniqueEngagementByCampaign as readPeople } from "@sendinel/domain";
+export function countUniqueEngagementByCampaign(sb, projectId, ids) {
+    // MCP's db() is already an email-scoped query client.
+    return readPeople({ schema: () => sb }, projectId, ids);
 }

package/build/tools/advisor.js

@@ -1,4 +1,4 @@
-import { isBouncedRow } from "@sendinel/domain";
+import { countEmailRows, groupMetricRows, percentRate, isDeliveredRow, isOpenedRow, countPeople, isComplainedRow, isBouncedRow, assertUsableStopReason, readAllRows } from "@sendinel/domain";
 import { z } from 'zod';
 import Anthropic from '@anthropic-ai/sdk';
 import { db } from '../db.js';
@@ -6,54 +6,28 @@ import { getProjectId } from '../project.js';
 import { buildVoicePrompt } from '../lib/voice.js';
 import { getAnthropicModelId } from '../anthropic-model.js';
 import { dkimRemediationText } from '../lib/email-provider.js';
-import { assertUsableStopReason, readAllRows } from '@sendinel/domain';
 const txt = (text) => ({ content: [{ type: 'text', text }] });
 const j = (data) => txt(JSON.stringify(data, null, 2));
 const DAY_NAMES = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
 export function computeMetrics(rows) {
-    const sent = rows.length;
-    const delivered = rows.filter((r) => ['delivered', 'opened', 'clicked'].includes(r.status)).length;
-    const opened = rows.filter((r) => ['opened', 'clicked'].includes(r.status)).length;
-    const clicked = rows.filter((r) => r.status === 'clicked').length;
-    const bounced = rows.filter(isBouncedRow).length;
-    const complained = rows.filter((r) => r.status === 'complained').length;
-    return {
-        sent,
-        delivered,
-        opened,
-        clicked,
-        bounced,
-        complained,
-        open_rate: sent > 0 ? +(opened / sent * 100).toFixed(2) : 0,
-        click_rate: sent > 0 ? +(clicked / sent * 100).toFixed(2) : 0,
-        bounce_rate: sent > 0 ? +(bounced / sent * 100).toFixed(2) : 0,
-        complaint_rate: sent > 0 ? +(complained / sent * 100).toFixed(2) : 0,
+    const counts = countEmailRows(rows);
+    return { ...counts,
+        open_rate: percentRate(counts.opened, counts.delivered, 2) ?? 0,
+        click_rate: percentRate(counts.clicked, counts.delivered, 2) ?? 0,
+        bounce_rate: percentRate(counts.bounced, counts.sent, 2) ?? 0,
+        complaint_rate: percentRate(counts.complained, counts.sent, 2) ?? 0,
     };
 }
 export function buildTimeBuckets(rows, groupBy, metric) {
-    const buckets = new Map();
-    for (const row of rows) {
-        const date = new Date(row.created_at);
-        const key = groupBy === 'hour' ? date.getUTCHours() : date.getUTCDay();
-        const entry = buckets.get(key) ?? { sends: 0, engagements: 0 };
-        entry.sends++;
-        const engaged = metric === 'click_rate'
-            ? row.status === 'clicked'
-            : ['opened', 'clicked'].includes(row.status);
-        if (engaged)
-            entry.engagements++;
-        buckets.set(key, entry);
-    }
+    const buckets = groupMetricRows(rows, row => String(groupBy === "hour" ? new Date(row.created_at).getUTCHours() : new Date(row.created_at).getUTCDay()));
     const results = [];
-    for (const [key, val] of buckets.entries()) {
-        if (val.sends < 10)
+    for (const [key, rows] of buckets) {
+        const counts = countEmailRows(rows);
+        if (counts.sent < 10)
             continue;
-        results.push({
-            label: groupBy === 'hour' ? `${key.toString().padStart(2, '0')}:00 UTC` : DAY_NAMES[key],
-            sends: val.sends,
-            engagements: val.engagements,
-            rate: +(val.engagements / val.sends * 100).toFixed(2),
-        });
+        const engagements = metric === "click_rate" ? counts.clicked : counts.opened;
+        results.push({ label: groupBy === "hour" ? `${key.padStart(2, "0")}:00 UTC` : DAY_NAMES[Number(key)],
+            sends: counts.sent, engagements, rate: percentRate(engagements, counts.delivered, 2) ?? 0 });
     }
     results.sort((a, b) => b.rate - a.rate);
     return results;
@@ -79,9 +53,9 @@ export function registerAdvisorTools(server) {
         const recommendations = [];
         let skipped = 0;
         for (const campaign of campaigns ?? []) {
-            const rows = await readAllRows(db().from('email_log').select("status, bounced_at")
+            const rows = await readAllRows(db().from('email_log').select("status, bounced_at, opened_at, clicked_at, contact_id, to_email")
                 .eq('project_id', projectId).eq('campaign_id', campaign.id).gte('created_at', since));
-            const sends = rows.filter((row) => ['sent', 'delivered', 'opened', 'clicked', 'bounced', 'complained'].includes(row.status)).length;
+            const sends = countEmailRows(rows).sent;
             if (sends < 100) {
                 skipped++;
                 continue;
@@ -129,7 +103,7 @@ export function registerAdvisorTools(server) {
         // 1. Current period email_log
         let currentQuery = db()
             .from('email_log')
-            .select("status, created_at, bounced_at")
+            .select("status, created_at, bounced_at, opened_at, clicked_at, contact_id, to_email")
             .eq('project_id', projectId)
             .gte('created_at', periodStart.toISOString());
         if (site_id)
@@ -138,7 +112,7 @@ export function registerAdvisorTools(server) {
         // 2. Prior period
         let priorQuery = db()
             .from('email_log')
-            .select("status, created_at, bounced_at")
+            .select("status, created_at, bounced_at, opened_at, clicked_at, contact_id, to_email")
             .eq('project_id', projectId)
             .gte('created_at', priorStart.toISOString())
             .lt('created_at', periodStart.toISOString());
@@ -214,7 +188,7 @@ export function registerAdvisorTools(server) {
         }
         // Low click-to-open
         if (current.opened >= 50) {
-            const cto = +(current.clicked / current.opened * 100).toFixed(2);
+            const cto = percentRate(current.clicked, current.opened, 2) ?? 0;
             if (cto < 5) {
                 recommendations.push({
                     type: 'low_click_to_open',
@@ -326,28 +300,19 @@ export function registerAdvisorTools(server) {
         // 2. Top-performing historical subjects
         let logQuery = db()
             .from('email_log')
-            .select("subject, status, bounced_at")
-            .eq('project_id', projectId)
-            .in('status', ['delivered', 'opened', 'clicked']);
+            .select("subject, status, bounced_at, opened_at, clicked_at, contact_id, to_email")
+            .eq('project_id', projectId);
         if (site_id)
             logQuery = logQuery.eq('site_id', site_id);
         const logRows = await readAllRows(logQuery);
         // Aggregate by subject
-        const subjectStats = new Map();
-        for (const row of logRows ?? []) {
-            if (!row.subject)
-                continue;
-            const entry = subjectStats.get(row.subject) ?? { sent: 0, opened: 0 };
-            entry.sent++;
-            if (['opened', 'clicked'].includes(row.status))
-                entry.opened++;
-            subjectStats.set(row.subject, entry);
-        }
+        const subjectStats = new Map([...groupMetricRows(logRows ?? [], row => row.subject ?? "")]
+            .filter(([subject]) => subject).map(([subject, rows]) => [subject, countEmailRows(rows)]));
         const topPerformers = Array.from(subjectStats.entries())
             .filter(([, stats]) => stats.sent >= 50)
             .map(([subject, stats]) => ({
             subject,
-            open_rate: +(stats.opened / stats.sent * 100).toFixed(1),
+            open_rate: percentRate(stats.opened, stats.delivered, 1) ?? 0,
             sample_size: stats.sent,
         }))
             .sort((a, b) => b.open_rate - a.open_rate)
@@ -448,7 +413,7 @@ Each subject should be distinct in approach (urgency, curiosity, benefit, social
         // 1. Query email_log with campaign step subjects
         const logRows = await readAllRows(db()
             .from('email_log')
-            .select("campaign_id, subject, status, bounced_at")
+            .select("campaign_id, subject, status, bounced_at, opened_at, clicked_at, contact_id, to_email")
             .eq('project_id', projectId)
             .eq('site_id', site_id)
             .gte('created_at', since)
@@ -460,26 +425,17 @@ Each subject should be distinct in approach (urgency, curiosity, benefit, social
             });
         }
         // 2. Group by campaign + subject, compute engagement
-        const campaignStats = new Map();
-        for (const row of logRows) {
-            const key = `${row.campaign_id}::${row.subject ?? '(no subject)'}`;
-            const entry = campaignStats.get(key) ?? { subject: row.subject ?? '(no subject)', sent: 0, opened: 0, clicked: 0 };
-            entry.sent++;
-            if (['opened', 'clicked'].includes(row.status))
-                entry.opened++;
-            if (row.status === 'clicked')
-                entry.clicked++;
-            campaignStats.set(key, entry);
-        }
+        const campaignStats = new Map([...groupMetricRows(logRows, row => `${row.campaign_id}::${row.subject ?? '(no subject)'}`)]
+            .map(([key, rows]) => [key, { subject: rows[0].subject ?? '(no subject)', ...countEmailRows(rows) }]));
         // 3. Compute rates and sort by composite score
         const ranked = Array.from(campaignStats.values())
             .filter(s => s.sent >= 5)
             .map(s => ({
             subject: s.subject,
             sent: s.sent,
-            open_rate: +(s.opened / s.sent * 100).toFixed(1),
-            click_rate: +(s.clicked / s.sent * 100).toFixed(1),
-            score: +(s.opened / s.sent * 0.6 + s.clicked / s.sent * 0.4).toFixed(4),
+            open_rate: (percentRate(s.opened, s.delivered, 1) ?? 0),
+            click_rate: (percentRate(s.clicked, s.delivered, 1) ?? 0),
+            score: +((percentRate(s.opened, s.delivered, 6) ?? 0) / 100 * 0.6 + (percentRate(s.clicked, s.delivered, 6) ?? 0) / 100 * 0.4).toFixed(4),
         }))
             .sort((a, b) => b.score - a.score);
         const topPerformers = ranked.slice(0, 10);
@@ -584,11 +540,10 @@ Return ONLY valid JSON (no markdown fences): { "topics": [{ "title": "...", "rat
         // 2. Query email_log
         let query = db()
             .from('email_log')
-            .select("status, created_at, bounced_at")
+            .select("status, created_at, bounced_at, opened_at, clicked_at, contact_id, to_email")
             .eq('project_id', projectId)
             .eq('site_id', site_id)
-            .gte('created_at', since)
-            .in('status', ['delivered', 'opened', 'clicked']);
+            .gte('created_at', since);
         if (contactFilter) {
             query = query.in('contact_id', contactFilter.slice(0, 500));
         }
@@ -668,19 +623,19 @@ Return ONLY valid JSON (no markdown fences): { "topics": [{ "title": "...", "rat
         const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString();
         const { data: recentLogs } = await db()
             .from('email_log')
-            .select("status, opened_at, clicked_at, bounced_at")
+            .select("status, opened_at, clicked_at, bounced_at, contact_id, to_email")
             .eq('project_id', projectId)
             .eq('site_id', site_id)
             .gte('sent_at', sevenDaysAgo);
         const logs = recentLogs ?? [];
         const totalSent = logs.length;
         const bounced = logs.filter(isBouncedRow).length;
-        const complained = logs.filter((l) => l.status === 'complained').length;
-        const delivered = logs.filter((l) => ['delivered', 'opened', 'clicked'].includes(l.status)).length;
-        const opened = logs.filter((l) => l.opened_at).length;
-        const bounceRate = totalSent > 0 ? +(bounced / totalSent * 100).toFixed(2) : 0;
-        const complaintRate = totalSent > 0 ? +(complained / totalSent * 100).toFixed(2) : 0;
-        const openRate = totalSent > 0 ? +(opened / totalSent * 100).toFixed(2) : 0;
+        const complained = logs.filter(isComplainedRow).length;
+        const delivered = logs.filter(isDeliveredRow).length;
+        const opened = countPeople(logs, isOpenedRow);
+        const bounceRate = percentRate(bounced, totalSent, 2) ?? 0;
+        const complaintRate = percentRate(complained, totalSent, 2) ?? 0;
+        const openRate = percentRate(opened, delivered, 2) ?? 0;
         // 4. Fetch new suppressions this week
         const { count: newSuppressions } = await db()
             .from('suppressions')

package/build/tools/analytics.d.ts

@@ -1,5 +1,6 @@
+import { type MetricRow } from "@sendinel/domain";
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-type EmailLogRow = {
+type EmailLogRow = MetricRow & {
     bounced_at: string | null;
     id?: string;
     provider_message_id?: string | null;

package/build/tools/analytics.js

@@ -1,6 +1,6 @@
-import { isBouncedRow } from "@sendinel/domain";
+import { isTrueConversionEvent, TRUE_CONVERSION_DEFINITION } from "@sendinel/domain";
+import { percentRate, groupMetricRows, readRevenue, isComplainedRow, isOpenedRow, countPeople, isClickedRow, summarizeEmailRows, countEmailRows, isDeliveredRow, isBouncedRow, fetchAllRows, readAllRows } from "@sendinel/domain";
 import { withApproval } from '../lib/action-approvals.js';
-import { fetchAllRows, readAllRows } from '@sendinel/domain';
 import { z } from 'zod';
 import { db, adminDb, requestContext } from '../db.js';
 import { getProjectId } from '../project.js';
@@ -75,28 +75,10 @@ async function publishViaByoPublisher(publisher, credentials, params) {
     throw new Error('Buffer publisher is not yet implemented. Connect UploadPost instead.');
 }
 export function computeAnalyticsMetrics(rows, eventCounts) {
-    const sent = rows.length;
-    const delivered = rows.filter(r => ['delivered', 'opened', 'clicked'].includes(r.status)).length;
-    const opened = eventCounts?.opened ?? rows.filter(r => r.status === 'opened' || r.status === 'clicked').length;
-    const clicked = eventCounts?.clicked ?? rows.filter(r => r.status === 'clicked').length;
-    const bounced = rows.filter(isBouncedRow).length;
-    const complained = rows.filter(r => r.status === 'complained').length;
-    const unsubscribed = rows.filter(r => r.status === 'unsubscribed').length;
-    return {
-        sent,
-        delivered,
-        opened,
-        clicked,
-        bounced,
-        complained,
-        unsubscribed,
-        delivery_rate: sent > 0 ? delivered / sent : 0,
-        open_rate: delivered > 0 ? opened / delivered : 0,
-        click_rate: delivered > 0 ? clicked / delivered : 0,
-        bounce_rate: sent > 0 ? bounced / sent : 0,
-        complaint_rate: sent > 0 ? complained / sent : 0,
-        unsubscribe_rate: sent > 0 ? unsubscribed / sent : 0,
-    };
+    const metrics = summarizeEmailRows(rows);
+    return { ...metrics, delivery_rate: metrics.delivery_rate ?? 0, open_rate: metrics.open_rate ?? 0,
+        click_rate: metrics.click_rate ?? 0, bounce_rate: metrics.bounce_rate ?? 0,
+        complaint_rate: metrics.complaint_rate ?? 0, unsubscribe_rate: metrics.unsubscribe_rate ?? 0 };
 }
 export function computeSenderHealthScore(metrics, trackingEnabled) {
     let score = 100;
@@ -207,15 +189,9 @@ function distinctEventCount(events, eventType, messageIds) {
         .filter(event => event.event_type === eventType && event.provider_message_id && messageIds.has(event.provider_message_id))
         .map(event => event.provider_message_id)).size;
 }
-function isTrueConversionEvent(event) {
-    const normalized = (event ?? '').trim().toLowerCase().replace(/[\s-]+/g, '_');
-    if (!normalized)
-        return false;
-    return !['open', 'opened', 'email_open', 'click', 'clicked', 'email_click', 'page_view', 'view', 'impression'].includes(normalized);
-}
 function buildTrueConversionAnalytics(params) {
     const sent = params.logs.length;
-    const delivered = params.logs.filter(row => ['delivered', 'opened', 'clicked'].includes(row.status)).length;
+    const delivered = params.logs.filter(isDeliveredRow).length;
     const trueRows = params.attributionRows.filter(row => isTrueConversionEvent(row.conversion_event));
     const campaignDenominators = new Map();
     for (const row of params.logs) {
@@ -241,7 +217,7 @@ function buildTrueConversionAnalytics(params) {
         variantStats.revenue += revenue;
         byVariant.set(variantKey, variantStats);
     }
-    const percentOf = (count, denominator) => denominator > 0 ? `${((count / denominator) * 100).toFixed(1)}%` : 'N/A';
+    const percentOf = (count, denominator) => denominator > 0 ? `${percentRate(count, denominator, 1)?.toFixed(1)}%` : 'N/A';
     const stage = (name, count, prior) => ({
         stage: name,
         count,
@@ -250,7 +226,7 @@ function buildTrueConversionAnalytics(params) {
         drop_off_from_previous: prior == null ? 0 : Math.max(0, prior - count),
     });
     return {
-        definition: 'revenue_attribution rows excluding open/click/page-view vanity events',
+        definition: TRUE_CONVERSION_DEFINITION,
         true_conversions: trueRows.length,
         true_conversion_rate: percentOf(trueRows.length, sent),
         revenue: Number(totalRevenue.toFixed(2)),
@@ -327,7 +303,7 @@ export function registerAnalyticsTools(server) {
         const since = new Date(Date.now() - period_days * 86400000).toISOString();
         let rows;
         try {
-            rows = await readAllRows(db().from('email_log').select("site_id, status, sent_at, created_at, bounced_at")
+            rows = await readAllRows(db().from('email_log').select("site_id, status, sent_at, created_at, bounced_at, opened_at, clicked_at, contact_id, to_email")
                 .eq('project_id', getProjectId()).gte('created_at', since));
         }
         catch (readError) {
@@ -548,7 +524,7 @@ export function registerAnalyticsTools(server) {
         const trackingEnabled = site?.tracking_enabled ?? false;
         const { data, error, pageCount: logPageCount } = await fetchAllRows(async (offset, limit) => db()
             .from('email_log')
-            .select("id, provider_message_id, status, sent_at, bounced_at")
+            .select("id, provider_message_id, status, sent_at, bounced_at, opened_at, clicked_at, contact_id, to_email")
             .eq('project_id', projectId)
             .eq('site_id', site_id)
             .gte('sent_at', `${start_date}T00:00:00Z`)
@@ -701,7 +677,7 @@ export function registerAnalyticsTools(server) {
         const since7d = new Date(Date.now() - 7 * 86_400_000).toISOString();
         let q = db()
             .from('email_log')
-            .select("status, opened_at, clicked_at, sent_at, bounced_at")
+            .select("status, opened_at, clicked_at, sent_at, bounced_at, contact_id, to_email")
             .eq('project_id', projectId)
             .gte('sent_at', since30d);
         if (site_id)
@@ -874,16 +850,16 @@ export function registerAnalyticsTools(server) {
         const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString();
         const { data: recentLogs } = await db()
             .from('email_log')
-            .select("status, bounced_at")
+            .select("status, bounced_at, opened_at, clicked_at, contact_id, to_email")
             .eq('project_id', projectId)
             .eq('site_id', site_id)
             .gte('sent_at', sevenDaysAgo);
         const logs = recentLogs ?? [];
         const totalSent = logs.length;
         const bounced = logs.filter((l) => isBouncedRow(l)).length;
-        const complained = logs.filter((l) => l.status === 'complained').length;
-        const bounceRate = totalSent > 0 ? (bounced / totalSent * 100) : 0;
-        const complaintRate = totalSent > 0 ? (complained / totalSent * 100) : 0;
+        const complained = logs.filter(isComplainedRow).length;
+        const bounceRate = percentRate(bounced, totalSent, 8) ?? 0;
+        const complaintRate = percentRate(complained, totalSent, 8) ?? 0;
         const risks = [];
         if (verificationSource === 'dns_lookup') {
             if (!dnsResults.spf?.found)
@@ -938,7 +914,7 @@ export function registerAnalyticsTools(server) {
         const since = new Date(Date.now() - days * 24 * 60 * 60 * 1000).toISOString();
         let q = db()
             .from('email_log')
-            .select('id, site_id, campaign_id, contact_id, status, category, sent_at, opened_at, clicked_at, bounced_at, complained_at')
+            .select("id, site_id, campaign_id, contact_id, status, category, sent_at, opened_at, clicked_at, bounced_at, complained_at, to_email")
             .eq('project_id', projectId)
             .gte('sent_at', since);
         if (site_id)
@@ -951,35 +927,25 @@ export function registerAnalyticsTools(server) {
         const rows = logs ?? [];
         if (!rows.length)
             return j({ message: `No email activity in the last ${days} days.`, total: 0 });
-        let attributionQuery = db()
-            .from('revenue_attribution')
-            .select('campaign_id, conversion_event, utm_content, revenue_amount')
-            .eq('project_id', projectId)
-            .gte('converted_at', since);
-        if (campaign_id)
-            attributionQuery = attributionQuery.eq('campaign_id', campaign_id);
-        const { data: attributionRows, error: attributionError } = await attributionQuery;
+        const { data: attributionRows, error: attributionError } = await readRevenue({ sb: db(), projectId, siteId: site_id, campaignId: campaign_id, start: since });
         if (attributionError)
             return txt(`Error: ${attributionError.message}`);
-        const campaignIdsInScope = new Set(rows.map((row) => typeof row.campaign_id === 'string' ? row.campaign_id : null).filter(Boolean));
-        const scopedAttributionRows = site_id
-            ? (attributionRows ?? []).filter((row) => row.campaign_id && campaignIdsInScope.has(row.campaign_id))
-            : (attributionRows ?? []);
+        const scopedAttributionRows = attributionRows ?? [];
         const computeMetrics = (set) => {
             const total = set.length;
-            const delivered = set.filter(r => ['delivered', 'opened', 'clicked'].includes(r.status)).length;
-            const opened = set.filter(r => r.opened_at).length;
-            const clicked = set.filter(r => r.clicked_at).length;
+            const delivered = set.filter(isDeliveredRow).length;
+            const opened = countPeople(set, isOpenedRow);
+            const clicked = countPeople(set, isClickedRow);
             const bounced = set.filter(isBouncedRow).length;
-            const complained = set.filter(r => r.status === 'complained').length;
+            const complained = set.filter(isComplainedRow).length;
             return {
                 total_sent: total, delivered, opened, clicked, bounced, complained,
-                delivery_rate: total > 0 ? `${((delivered / total) * 100).toFixed(1)}%` : 'N/A',
-                open_rate: total > 0 ? `${((opened / total) * 100).toFixed(1)}%` : 'N/A',
-                click_rate: total > 0 ? `${((clicked / total) * 100).toFixed(1)}%` : 'N/A',
-                bounce_rate: total > 0 ? `${((bounced / total) * 100).toFixed(1)}%` : 'N/A',
-                complaint_rate: total > 0 ? `${((complained / total) * 100).toFixed(3)}%` : 'N/A',
-                click_to_open: opened > 0 ? `${((clicked / opened) * 100).toFixed(1)}%` : 'N/A',
+                delivery_rate: total > 0 ? `${percentRate(delivered, total, 1)?.toFixed(1)}%` : 'N/A',
+                open_rate: delivered > 0 ? `${percentRate(opened, delivered, 1)?.toFixed(1)}%` : 'N/A',
+                click_rate: delivered > 0 ? `${percentRate(clicked, delivered, 1)?.toFixed(1)}%` : 'N/A',
+                bounce_rate: total > 0 ? `${percentRate(bounced, total, 1)?.toFixed(1)}%` : 'N/A',
+                complaint_rate: total > 0 ? `${percentRate(complained, total, 3)?.toFixed(3)}%` : 'N/A',
+                click_to_open: opened > 0 ? `${percentRate(clicked, opened, 1)?.toFixed(1)}%` : 'N/A',
             };
         };
         const overall = computeMetrics(rows);
@@ -989,23 +955,11 @@ export function registerAnalyticsTools(server) {
             opened: parseInt(String(overall.opened), 10) || 0,
             clicked: parseInt(String(overall.clicked), 10) || 0,
         });
-        const hourBuckets = {};
-        rows.forEach((r) => {
-            if (!r.sent_at)
-                return;
-            const hour = new Date(r.sent_at).getUTCHours();
-            if (!hourBuckets[hour])
-                hourBuckets[hour] = { sent: 0, opened: 0 };
-            hourBuckets[hour].sent++;
-            if (r.opened_at)
-                hourBuckets[hour].opened++;
-        });
-        const bestHours = Object.entries(hourBuckets)
-            .map(([hour, b]) => ({ hour: Number(hour), sent: b.sent, open_rate: b.sent > 0 ? (b.opened / b.sent * 100) : 0 }))
-            .filter(h => h.sent >= 5)
-            .sort((a, b) => b.open_rate - a.open_rate)
-            .slice(0, 3)
-            .map(h => ({ hour_utc: h.hour, sent: h.sent, open_rate: `${h.open_rate.toFixed(1)}%` }));
+        const bestHours = [...groupMetricRows(rows, (row) => row.sent_at ? String(new Date(row.sent_at).getUTCHours()) : "")]
+            .filter(([hour]) => hour !== "")
+            .map(([hour, rows]) => { const counts = countEmailRows(rows); return { hour: Number(hour), sent: counts.sent, open_rate: percentRate(counts.opened, counts.delivered, 6) ?? 0 }; })
+            .filter(row => row.sent >= 5).sort((a, b) => b.open_rate - a.open_rate).slice(0, 3)
+            .map(row => ({ hour_utc: row.hour, sent: row.sent, open_rate: `${row.open_rate.toFixed(1)}%` }));
         let grouped = null;
         if (group_by === 'campaign' || group_by === 'site') {
             const byKey = {};
@@ -1144,16 +1098,16 @@ export function registerAnalyticsTools(server) {
                 const projDb = client ?? adminDb();
                 const { data: logs } = await projDb
                     .from('email_log')
-                    .select("status, opened_at, clicked_at, bounced_at")
+                    .select("status, opened_at, clicked_at, bounced_at, contact_id, to_email")
                     .eq('project_id', proj.id)
                     .gte('sent_at', since);
                 const rows = logs ?? [];
                 const sent = rows.length;
-                const delivered = rows.filter((r) => ['delivered', 'opened', 'clicked'].includes(r.status)).length;
-                const opened = rows.filter((r) => r.opened_at).length;
-                const clicked = rows.filter((r) => r.clicked_at).length;
+                const delivered = rows.filter(isDeliveredRow).length;
+                const opened = countPeople(rows, isOpenedRow);
+                const clicked = countPeople(rows, isClickedRow);
                 const bounced = rows.filter(isBouncedRow).length;
-                const complained = rows.filter((r) => r.status === 'complained').length;
+                const complained = rows.filter(isComplainedRow).length;
                 results.push({
                     project_id: proj.id,
                     name: proj.name,
@@ -1163,8 +1117,8 @@ export function registerAnalyticsTools(server) {
                     clicked,
                     bounced,
                     complained,
-                    open_rate: sent > 0 ? Math.round((opened / sent) * 1000) / 10 : 0,
-                    click_rate: sent > 0 ? Math.round((clicked / sent) * 1000) / 10 : 0,
+                    open_rate: percentRate(opened, delivered, 1) ?? 0,
+                    click_rate: percentRate(clicked, delivered, 1) ?? 0,
                 });
             }
             catch {
@@ -1190,8 +1144,8 @@ export function registerAnalyticsTools(server) {
             projects: results,
             totals: {
                 ...totals,
-                open_rate: totals.sent > 0 ? Math.round((totals.opened / totals.sent) * 1000) / 10 : 0,
-                click_rate: totals.sent > 0 ? Math.round((totals.clicked / totals.sent) * 1000) / 10 : 0,
+                open_rate: percentRate(totals.opened, totals.delivered, 1) ?? 0,
+                click_rate: percentRate(totals.clicked, totals.delivered, 1) ?? 0,
             },
         });
     });

package/build/tools/data-proposals.js

@@ -1,26 +1,26 @@
+import { countEmailRows, fractionRate, isOpenedRow, countPeople, isClickedRow, readAllRows } from "@sendinel/domain";
 import { z } from 'zod';
 import { db } from '../db.js';
 import { getProjectId } from '../project.js';
 import { getAnthropicModelId } from '../anthropic-model.js';
-import { readAllRows } from '@sendinel/domain';
 const txt = (text) => ({ content: [{ type: 'text', text }] });
 const j = (data) => txt(JSON.stringify(data, null, 2));
 async function engagementSnapshot(projectId) {
     const since = new Date(Date.now() - 7 * 86400000).toISOString();
     const [logs, { count: audienceSize }, { data: segments }] = await Promise.all([
-        readAllRows(db().from('email_log').select('status, created_at').eq('project_id', projectId).gte('created_at', since)),
+        readAllRows(db().from('email_log').select("status, created_at, opened_at, clicked_at, contact_id, to_email, bounced_at").eq('project_id', projectId).gte('created_at', since)),
         db().from('subscribers').select('id', { count: 'exact', head: true }).eq('project_id', projectId).eq('is_test', false).eq('global_unsubscribed', false),
         db().from('segments').select('id, name, subscriber_count:cached_count, updated_at').eq('project_id', projectId).order('updated_at', { ascending: false }).limit(5),
     ]);
     const rows = logs;
-    const sent = rows.filter((row) => ['sent', 'delivered', 'opened', 'clicked', 'bounced', 'complained'].includes(row.status)).length;
-    const opened = rows.filter((row) => row.status === 'opened' || row.status === 'clicked').length;
-    const clicked = rows.filter((row) => row.status === 'clicked').length;
+    const { sent, delivered } = countEmailRows(rows);
+    const opened = countPeople(rows, isOpenedRow);
+    const clicked = countPeople(rows, isClickedRow);
     return {
         period_days: 7,
         sent,
-        open_rate: sent > 0 ? Number((opened / sent).toFixed(4)) : 0,
-        click_rate: sent > 0 ? Number((clicked / sent).toFixed(4)) : 0,
+        open_rate: fractionRate(opened, delivered, 4) ?? 0,
+        click_rate: fractionRate(clicked, delivered, 4) ?? 0,
         audience_size: audienceSize ?? 0,
         recent_segments: segments ?? [],
     };

package/build/tools/org.js

@@ -1,3 +1,4 @@
+import { readPlanUsage, readAllRows } from "@sendinel/domain";
 import { randomBytes } from 'crypto';
 import { z } from 'zod';
 import { logAudit } from '../audit.js';
@@ -5,7 +6,6 @@ import { adminDb, db } from '../db.js';
 import { getProjectId } from '../project.js';
 import { assertChannelCanExecute, checkApproval, currentChannelContext, requestApproval, withApproval } from '../lib/action-approvals.js';
 import { callSendinelV1 } from '../lib/v1-client.js';
-import { readAllRows } from '@sendinel/domain';
 const j = (data) => ({ content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] });
 const PROVIDER_SWITCH_V1_PROVIDERS = ['resend', 'ses', 'elastic-email'];
 async function callProviderSwitchApi(path, init) {
@@ -544,15 +544,18 @@ export function registerOrgTools(server) {
         const { data: project } = await db().from('projects').select('plan').eq('id', projectId).maybeSingle();
         const plan = project?.plan ?? 'free';
         const limits = PLAN_LIMITS[plan] ?? PLAN_LIMITS.free ?? {};
-        const [{ count: contacts }, { count: sends }, { count: sites }] = await Promise.all([
-            db().from('subscribers').select('id', { count: 'exact', head: true }).eq('project_id', projectId),
-            db().from('email_log').select('id', { count: 'exact', head: true }).eq('project_id', projectId).gte('created_at', new Date(new Date().getUTCFullYear(), new Date().getUTCMonth(), 1).toISOString()),
+        const [contacts, sends, { count: sites }] = await Promise.all([
+            readPlanUsage(db(), projectId, "contacts"),
+            readPlanUsage(db(), projectId, "monthly_sends"),
             db().from('sites').select('id', { count: 'exact', head: true }).eq('project_id', projectId),
         ]);
+        if (contacts.error || sends.error || contacts.data?.error || sends.data?.error || !contacts.data || !sends.data) {
+            return j({ error: 'Unable to read plan usage' });
+        }
         return j({
             plan,
-            contacts: { used: contacts ?? 0, limit: limits.contacts ?? null },
-            monthly_sends: { used: sends ?? 0, limit: limits.monthly_sends ?? limits.emails_per_month ?? null },
+            contacts: { used: contacts.data.current, limit: contacts.data.limit },
+            monthly_sends: { used: sends.data.current, limit: sends.data.limit },
             sites: { used: sites ?? 0, limit: limits.sites ?? null },
             ai_drafts: { used: 0, limit: limits.ai_drafts ?? null },
             log_retention_days: limits.log_retention_days ?? null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendinel/mcp-server",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "description": "AI-controlled email operations control plane for campaigns, contacts, segments, analytics, and multi-provider sending via MCP.",
   "mcpName": "ai.sendinel/mcp-server",
   "type": "module",