@sendinel/mcp-server 1.0.70 → 1.0.72

package/build/tools/advisor.js

@@ -1,3 +1,4 @@
+import { isBouncedRow } from "@sendinel/domain";
 import { z } from 'zod';
 import Anthropic from '@anthropic-ai/sdk';
 import { db } from '../db.js';
@@ -14,7 +15,7 @@ export function computeMetrics(rows) {
     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((r) => r.status === 'bounced').length;
+    const bounced = rows.filter(isBouncedRow).length;
     const complained = rows.filter((r) => r.status === 'complained').length;
     return {
         sent,
@@ -78,14 +79,14 @@ export function registerAdvisorTools(server) {
         const recommendations = [];
         let skipped = 0;
         for (const campaign of campaigns ?? []) {
-            const rows = await readAllRows(db().from('email_log').select('status')
+            const rows = await readAllRows(db().from('email_log').select("status, bounced_at")
                 .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;
             if (sends < 100) {
                 skipped++;
                 continue;
             }
-            const bounces = rows.filter((row) => row.status === 'bounced').length;
+            const bounces = rows.filter(isBouncedRow).length;
             const bounceRate = sends ? Number(((bounces / sends) * 100).toFixed(1)) : 0;
             recommendations.push({
                 campaign_id: campaign.id,
@@ -128,7 +129,7 @@ export function registerAdvisorTools(server) {
         // 1. Current period email_log
         let currentQuery = db()
             .from('email_log')
-            .select('status, created_at')
+            .select("status, created_at, bounced_at")
             .eq('project_id', projectId)
             .gte('created_at', periodStart.toISOString());
         if (site_id)
@@ -137,7 +138,7 @@ export function registerAdvisorTools(server) {
         // 2. Prior period
         let priorQuery = db()
             .from('email_log')
-            .select('status, created_at')
+            .select("status, created_at, bounced_at")
             .eq('project_id', projectId)
             .gte('created_at', priorStart.toISOString())
             .lt('created_at', periodStart.toISOString());
@@ -325,7 +326,7 @@ export function registerAdvisorTools(server) {
         // 2. Top-performing historical subjects
         let logQuery = db()
             .from('email_log')
-            .select('subject, status')
+            .select("subject, status, bounced_at")
             .eq('project_id', projectId)
             .in('status', ['delivered', 'opened', 'clicked']);
         if (site_id)
@@ -447,7 +448,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')
+            .select("campaign_id, subject, status, bounced_at")
             .eq('project_id', projectId)
             .eq('site_id', site_id)
             .gte('created_at', since)
@@ -583,7 +584,7 @@ Return ONLY valid JSON (no markdown fences): { "topics": [{ "title": "...", "rat
         // 2. Query email_log
         let query = db()
             .from('email_log')
-            .select('status, created_at')
+            .select("status, created_at, bounced_at")
             .eq('project_id', projectId)
             .eq('site_id', site_id)
             .gte('created_at', since)
@@ -667,13 +668,13 @@ 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')
+            .select("status, opened_at, clicked_at, bounced_at")
             .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) => l.status === 'bounced').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;

package/build/tools/analytics.d.ts

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

package/build/tools/analytics.js

@@ -1,3 +1,4 @@
+import { isBouncedRow } from "@sendinel/domain";
 import { withApproval } from '../lib/action-approvals.js';
 import { fetchAllRows, readAllRows } from '@sendinel/domain';
 import { z } from 'zod';
@@ -78,7 +79,7 @@ export function computeAnalyticsMetrics(rows, eventCounts) {
     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(r => r.status === 'bounced').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 {
@@ -326,7 +327,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')
+            rows = await readAllRows(db().from('email_log').select("site_id, status, sent_at, created_at, bounced_at")
                 .eq('project_id', getProjectId()).gte('created_at', since));
         }
         catch (readError) {
@@ -547,7 +548,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')
+            .select("id, provider_message_id, status, sent_at, bounced_at")
             .eq('project_id', projectId)
             .eq('site_id', site_id)
             .gte('sent_at', `${start_date}T00:00:00Z`)
@@ -700,7 +701,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')
+            .select("status, opened_at, clicked_at, sent_at, bounced_at")
             .eq('project_id', projectId)
             .gte('sent_at', since30d);
         if (site_id)
@@ -873,13 +874,13 @@ 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')
+            .select("status, bounced_at")
             .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) => l.status === 'bounced').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;
@@ -969,7 +970,7 @@ export function registerAnalyticsTools(server) {
             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 bounced = set.filter(r => r.status === 'bounced').length;
+            const bounced = set.filter(isBouncedRow).length;
             const complained = set.filter(r => r.status === 'complained').length;
             return {
                 total_sent: total, delivered, opened, clicked, bounced, complained,
@@ -1143,7 +1144,7 @@ export function registerAnalyticsTools(server) {
                 const projDb = client ?? adminDb();
                 const { data: logs } = await projDb
                     .from('email_log')
-                    .select('status, opened_at, clicked_at')
+                    .select("status, opened_at, clicked_at, bounced_at")
                     .eq('project_id', proj.id)
                     .gte('sent_at', since);
                 const rows = logs ?? [];
@@ -1151,7 +1152,7 @@ export function registerAnalyticsTools(server) {
                 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 bounced = rows.filter((r) => r.status === 'bounced').length;
+                const bounced = rows.filter(isBouncedRow).length;
                 const complained = rows.filter((r) => r.status === 'complained').length;
                 results.push({
                     project_id: proj.id,

package/build/tools/campaigns.d.ts

@@ -4,11 +4,15 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
  * row. Includes a warning when the campaign cannot fire yet (#3855).
  */
 export declare function buildCampaignFiresOn(campaign: Record<string, unknown>): string;
+/**
+ * Diagnostic warnings indicating why a campaign's trigger configuration cannot fire (#3852).
+ */
+export declare function buildCampaignTriggerDiagnostics(campaign: Record<string, unknown>): string[];
 export declare function applyCampaignTargetingFields(updates: Record<string, unknown>, input: {
     trigger_event_name?: string | null;
     trigger_tag?: string | null;
     trigger_type?: string | null;
     trigger_config?: Record<string, unknown> | null;
     segment_id?: string | null;
-}, projectId: string): Promise<string | null>;
+}, projectId: string, existingCampaign?: Record<string, unknown> | null): Promise<string | null>;
 export declare function registerCampaignTools(server: McpServer): void;

package/build/tools/campaigns.js

@@ -93,6 +93,37 @@ export function buildCampaignFiresOn(campaign) {
         summary += ` Warning: ${warnings.join('; ')}.`;
     return summary;
 }
+/**
+ * Diagnostic warnings indicating why a campaign's trigger configuration cannot fire (#3852).
+ */
+export function buildCampaignTriggerDiagnostics(campaign) {
+    const config = (campaign.trigger_config && typeof campaign.trigger_config === 'object' ? campaign.trigger_config : {});
+    const events = normalizeTriggerList([...normalizeTriggerList(config.events), campaign.trigger_event_name]);
+    const tags = normalizeTriggerList([...normalizeTriggerList(config.tags), campaign.trigger_tag]);
+    const diagnostics = [];
+    if ((events.length || tags.length) && campaign.type !== 'triggered') {
+        diagnostics.push(`campaign type is "${String(campaign.type)}"; event and tag triggers only start campaigns of type "triggered" (it will never fire)`);
+    }
+    if (campaign.trigger_type === 'date_field') {
+        const field = typeof config.field === 'string' && config.field ? config.field : null;
+        if (!field) {
+            diagnostics.push('trigger_type is "date_field", but no date field is set (it will never fire)');
+        }
+    }
+    else if (campaign.trigger_type === 'contact_event') {
+        const eventType = typeof config.event_type === 'string' && config.event_type ? config.event_type : null;
+        if (!eventType) {
+            diagnostics.push('trigger_type is "contact_event", but no event_type is set (it will never fire)');
+        }
+    }
+    if ((campaign.trigger_type === 'date_field' || campaign.trigger_type === 'contact_event') && (events.length || tags.length) && campaign.type === 'triggered') {
+        diagnostics.push(`trigger_type is "${String(campaign.trigger_type)}" but event/tag triggers are also set; event intake will start it immediately, outside the ${String(campaign.trigger_type)} schedule`);
+    }
+    if (campaign.status !== 'active') {
+        diagnostics.push(`it is ${String(campaign.status)}, so nothing starts until it is active`);
+    }
+    return diagnostics;
+}
 function applyCampaignSendAtField(updates, sendAt, campaignType) {
     if (sendAt === undefined)
         return null;
@@ -108,19 +139,22 @@ function applyCampaignSendAtField(updates, sendAt, campaignType) {
     updates.send_at = parsed.scheduledAt;
     return null;
 }
-export async function applyCampaignTargetingFields(updates, input, projectId) {
+export async function applyCampaignTargetingFields(updates, input, projectId, existingCampaign) {
+    const hasTriggerEvent = input.trigger_event_name !== undefined && input.trigger_event_name !== null && input.trigger_event_name.trim() !== '';
     if (input.trigger_event_name !== undefined)
         updates.trigger_event_name = input.trigger_event_name?.trim() || null;
     if (input.trigger_tag !== undefined)
         updates.trigger_tag = input.trigger_tag?.trim().toLowerCase() || null;
     if (input.trigger_type === null || input.trigger_type === 'manual') {
         // campaigns.trigger_type is NOT NULL DEFAULT 'manual', so "clear" means back to 'manual'.
-        // Also drops a stale date_field config unless the caller sent a new trigger_config (#3855).
+        // Also drops a stale date_field or contact_event config unless the caller sent a new trigger_config (#3855, #3852).
         updates.trigger_type = 'manual';
         if (input.trigger_config === undefined)
             updates.trigger_config = null;
     }
     if (input.trigger_type === 'date_field') {
+        if (hasTriggerEvent)
+            return 'cannot set trigger_event_name on a date_field campaign';
         const config = input.trigger_config ?? {};
         const field = typeof config.field === 'string' ? config.field.trim() : '';
         if (!/^[A-Za-z0-9_.-]{1,80}$/.test(field))
@@ -132,6 +166,23 @@ export async function applyCampaignTargetingFields(updates, input, projectId) {
             recurring: config.recurring !== false,
         };
     }
+    else if (input.trigger_type === 'contact_event') {
+        // trigger_event_name would also make event intake enroll at once, skipping days_after.
+        if (hasTriggerEvent)
+            return 'cannot set trigger_event_name on a contact_event campaign; use trigger_config.event_type';
+        const config = input.trigger_config ?? {};
+        const eventType = typeof config.event_type === 'string' ? config.event_type.trim() : '';
+        const daysAfter = Number(config.days_after ?? 0);
+        if (!eventType)
+            return 'event_type is required';
+        if (!Number.isInteger(daysAfter))
+            return 'days_after must be an integer';
+        updates.trigger_type = 'contact_event';
+        updates.trigger_config = {
+            event_type: eventType,
+            days_after: Math.max(0, Math.min(365, daysAfter)),
+        };
+    }
     else if (input.trigger_config !== undefined) {
         if (input.trigger_config === null) {
             updates.trigger_config = null;
@@ -143,6 +194,14 @@ export async function applyCampaignTargetingFields(updates, input, projectId) {
             updates.trigger_config = config;
         }
     }
+    // If trigger_type was not specified, but caller is setting an event trigger on a campaign
+    // whose current trigger_type is date_field or contact_event, normalize trigger_type to 'manual' (#3852).
+    const setsEventTrigger = hasTriggerEvent || (updates.trigger_config && typeof updates.trigger_config === 'object' && Array.isArray(updates.trigger_config.events) && updates.trigger_config.events.length > 0);
+    if (input.trigger_type === undefined && setsEventTrigger) {
+        if (existingCampaign?.trigger_type === 'date_field' || existingCampaign?.trigger_type === 'contact_event') {
+            updates.trigger_type = 'manual';
+        }
+    }
     if (input.segment_id !== undefined) {
         if (!input.segment_id) {
             updates.segment_id = null;
@@ -3287,7 +3346,7 @@ Return ONLY valid JSON with this exact shape:
             idempotentHint: true,
             openWorldHint: false,
         },
-        description: 'Update a campaign name, site, segment, send time, topic, trigger settings, or send class (broadcast vs product). trigger_type null (or manual) clears a date_field trigger; type switches a draft between sequence and triggered. The response includes fires_on, a plain summary of what the saved campaign fires on. send_at schedules a broadcast send (type=broadcast only) and must be a future ISO 8601 instant; set null to clear a pending schedule. Only provided fields are updated.',
+        description: 'Update a campaign name, site, segment, send time, topic, trigger settings, or send class (broadcast vs product). trigger_type null (or manual) clears a date_field or contact_event trigger; type switches a draft between sequence and triggered. The response includes fires_on, a plain summary of what the saved campaign fires on, and trigger_diagnostics naming any trigger problems. send_at schedules a broadcast send (type=broadcast only) and must be a future ISO 8601 instant; set null to clear a pending schedule. Only provided fields are updated.',
         inputSchema: {
             campaign_id: z.string().uuid(),
             name: z.string().min(1).max(200).optional(),
@@ -3297,7 +3356,7 @@ Return ONLY valid JSON with this exact shape:
             topic: z.string().nullable().optional(),
             trigger_event_name: z.string().nullable().optional(),
             trigger_tag: z.string().nullable().optional(),
-            trigger_type: z.enum(['date_field', 'manual']).nullable().optional().describe("'date_field' fires relative to a contact date field (needs trigger_config.field). null or 'manual' clears a date_field trigger."),
+            trigger_type: z.enum(['date_field', 'manual', 'contact_event']).nullable().optional().describe("'date_field' fires relative to a contact date field (needs trigger_config.field). 'contact_event' fires relative to a contact event (needs trigger_config.event_type and days_after). null or 'manual' clears a date_field or contact_event trigger."),
             trigger_config: z.record(z.string(), z.unknown()).nullable().optional(),
             type: z.enum(['sequence', 'triggered']).optional().describe("Switch a DRAFT campaign between 'sequence' and 'triggered'. Event and tag triggers only start campaigns of type 'triggered'."),
             sends_per_hour: z.number().int().min(1).nullable().optional().describe('Optional hourly send cap for wave sending. Set null to clear.'),
@@ -3309,12 +3368,21 @@ Return ONLY valid JSON with this exact shape:
         let campaignType;
         const loadExisting = () => db()
             .from('campaigns')
-            .select('id, type, status')
+            .select('id, type, status, trigger_type, trigger_config, trigger_event_name, trigger_tag')
             .eq('id', campaign_id)
             .eq('project_id', projectId)
             .maybeSingle();
+        let cachedExisting = null;
+        const getExisting = async () => {
+            if (cachedExisting)
+                return { data: cachedExisting, error: null };
+            const { data, error } = await loadExisting();
+            if (!error && data)
+                cachedExisting = data;
+            return { data, error };
+        };
         if (send_at !== undefined && send_at !== null) {
-            const { data: existing, error: fetchError } = await loadExisting();
+            const { data: existing, error: fetchError } = await getExisting();
             if (fetchError)
                 return j({ error: fetchError.message });
             if (!existing)
@@ -3322,7 +3390,7 @@ Return ONLY valid JSON with this exact shape:
             campaignType = existing.type;
         }
         if (type !== undefined) {
-            const { data: existing, error: fetchError } = await loadExisting();
+            const { data: existing, error: fetchError } = await getExisting();
             if (fetchError)
                 return j({ error: fetchError.message });
             if (!existing)
@@ -3334,6 +3402,16 @@ Return ONLY valid JSON with this exact shape:
                     return j({ error: `a ${existing.type} campaign cannot become ${type}`, code: 'INVALID_FIELD' });
             }
         }
+        const hasTriggerUpdate = trigger_event_name !== undefined || trigger_tag !== undefined || trigger_type !== undefined || trigger_config !== undefined;
+        let existingCampaignForTargeting = null;
+        if (hasTriggerUpdate) {
+            const { data: existing, error: fetchError } = await getExisting();
+            if (fetchError)
+                return j({ error: fetchError.message });
+            if (!existing)
+                return j({ error: 'Campaign not found', code: 'NOT_FOUND' });
+            existingCampaignForTargeting = existing;
+        }
         const updates = { updated_at: new Date().toISOString() };
         if (name !== undefined)
             updates.name = name;
@@ -3352,9 +3430,19 @@ Return ONLY valid JSON with this exact shape:
             updates.send_in_contact_timezone = send_in_contact_timezone;
         if (send_class !== undefined)
             updates.send_class = send_class;
-        const targetingError = await applyCampaignTargetingFields(updates, { trigger_event_name, trigger_tag, trigger_type, trigger_config, segment_id }, projectId);
+        const targetingError = await applyCampaignTargetingFields(updates, { trigger_event_name, trigger_tag, trigger_type, trigger_config, segment_id }, projectId, existingCampaignForTargeting);
         if (targetingError)
             return j({ error: targetingError, code: targetingError === 'Segment not found' ? 'NOT_FOUND' : 'INVALID_FIELD' });
+        // If type was not explicitly changed, but this update sets an event trigger on a draft sequence,
+        // normalize type to 'triggered' so that event intake matches and enrolls it (#3852).
+        if (type === undefined && existingCampaignForTargeting?.type === 'sequence' && existingCampaignForTargeting?.status === 'draft') {
+            const isSettingEvent = (updates.trigger_event_name !== undefined && updates.trigger_event_name !== null)
+                || (updates.trigger_tag !== undefined && updates.trigger_tag !== null)
+                || (updates.trigger_config && typeof updates.trigger_config === 'object' && Array.isArray(updates.trigger_config.events) && updates.trigger_config.events.length > 0);
+            if (isSettingEvent) {
+                updates.type = 'triggered';
+            }
+        }
         const { data, error } = await db()
             .from('campaigns')
             .update(updates)
@@ -3364,7 +3452,15 @@ Return ONLY valid JSON with this exact shape:
             .single();
         if (error)
             return j({ error: error.message });
-        return j({ ...data, fires_on: buildCampaignFiresOn(data) });
+        const diagnostics = buildCampaignTriggerDiagnostics(data);
+        const warning = diagnostics.find((d) => d.includes('never fire')) || (diagnostics.length ? diagnostics[0] : null);
+        return j({
+            ...data,
+            fires_on: buildCampaignFiresOn(data),
+            trigger_diagnostics: diagnostics,
+            warnings: diagnostics,
+            ...(warning ? { warning } : {}),
+        });
     });
     server.registerTool('get_campaign', {
         title: 'Get Campaign',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendinel/mcp-server",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "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",