@sendinel/mcp-server 1.0.150 → 1.0.151

package/build/tools/campaigns.js

@@ -1,3 +1,4 @@
+import { validateStepMultiEventRules, stepMultiEventRulesView } from "@sendinel/domain";
 import { readCampaignMetricGroups, SENT_STATUSES } from "@sendinel/domain";
 import { resolveCampaignReentry, readCampaignPeriods, campaignPeriodFields } from "@sendinel/domain";
 import { CAMPAIGN_BRANCH_CONDITIONS, campaignBranchConditionValue, isContactPropertyConditionList, STEP_PROPERTY_CONDITIONS_ERROR, validateStepPropertyRules } from "@sendinel/domain";
@@ -40,6 +41,12 @@ const reentryFields = {
     reentry_mode: z.enum(['once_ever', 'per_event_period']).optional().describe(REENTRY_DESCRIPTION),
     period_key: z.string().min(1).max(64).nullable().optional().describe('Flat event-data key naming the period (starts with a letter; letters, digits and underscores only). Key alone selects per_event_period; null clears to once ever. ' + REENTRY_DESCRIPTION),
 };
+// Schema rejects empty/oversized writes; shared validation trims and deduplicates before storage.
+const multiEventFields = {
+    skip_if_events: z.array(z.string().trim().min(1)).min(1).max(10).nullable().optional().describe('Skip if ANY listed event has occurred. ANDed with legacy and required gates. null clears.'),
+    send_only_if_events: z.array(z.string().trim().min(1)).min(1).max(10).nullable().optional().describe('Required events at send time, ALL by default; null clears. ANDed with legacy gates.'),
+    send_only_if_events_mode: z.enum(['all', 'any']).nullable().optional().describe('Required-event list mode; omitted/null defaults to all on new steps. Omission preserves the mode on updates.'),
+};
 function stripHtml(value) {
     return value
         .replace(/<style[\s\S]*?<\/style>/gi, ' ')
@@ -891,11 +898,15 @@ export function registerCampaignTools(server) {
             brand_asset_ids: z.array(z.string().uuid()).optional().describe('Stable brand_media_assets ids explicitly referenced by this step.'),
             skip_if_property: propertyConditions.describe('Skip when ALL 1–10 conditions match current custom_properties. Missing/null keys never match. null clears.'),
             send_only_if_property: propertyConditions.describe('Send only when ALL 1–10 conditions match current custom_properties. Unknown/non-match skips. null clears.'),
+            ...multiEventFields,
             skip_if_event: z.string().trim().min(1).optional().describe('Skip this step at send time if the contact already has an event with this name; the journey continues.'),
             send_only_if_event: z.string().trim().min(1).optional().describe('Send this step only if the contact has an event with this name by send time; otherwise skip it and continue the journey.'),
         },
-    }, async ({ campaign_id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, variant_label, survey_id, brand_asset_ids, skip_if_event, send_only_if_event, skip_if_property, send_only_if_property }) => {
+    }, async ({ campaign_id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, variant_label, survey_id, brand_asset_ids, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, skip_if_property, send_only_if_property }) => {
         try {
+            const events = validateStepMultiEventRules({ skip_if_events, send_only_if_events, send_only_if_events_mode });
+            if (!events.ok)
+                return j({ error: events.error, code: 'INVALID_INPUT' });
             const properties = validateStepPropertyRules({ skip_if_property, send_only_if_property });
             if (!properties.ok)
                 return j({ error: properties.error, code: "INVALID_INPUT" });
@@ -932,7 +943,7 @@ export function registerCampaignTools(server) {
             const renderedText = body_text !== undefined && survey_id ? renderTemplateVars(body_text, renderVars) : body_text;
             const { data, error } = await db()
                 .from('campaign_steps')
-                .insert({ campaign_id, step_order, subject: renderedSubject, body_html: renderedHtml, body_text: renderedText ?? (normalizedBlocks?.length ? blocksToText(normalizedBlocks) : undefined), blocks: normalizedBlocks ?? null, delay_days, delay_hours, variant_label: variant_label ?? 'A', skip_if_event: skip_if_event ?? null, send_only_if_event: send_only_if_event ?? null, ...properties.rules })
+                .insert({ campaign_id, step_order, subject: renderedSubject, body_html: renderedHtml, body_text: renderedText ?? (normalizedBlocks?.length ? blocksToText(normalizedBlocks) : undefined), blocks: normalizedBlocks ?? null, delay_days, delay_hours, variant_label: variant_label ?? 'A', skip_if_event: skip_if_event ?? null, send_only_if_event: send_only_if_event ?? null, ...events.rules, ...properties.rules })
                 .select()
                 .single();
             if (error)
@@ -3112,6 +3123,9 @@ Return ONLY valid JSON with this exact shape:
             trigger_type: z.enum(['manual', 'date_field', 'contact_event']).nullable().optional(),
             trigger_config: z.record(z.string(), z.unknown()).nullable().optional().describe('Event/tag lists with optional where filter, or date_field/contact_event configuration.'),
             steps: z.array(z.object({
+                ...multiEventFields,
+                skip_if_event: z.string().trim().min(1).nullable().optional(),
+                send_only_if_event: z.string().trim().min(1).nullable().optional(),
                 subject: z.string().min(1).describe('Email subject line'),
                 body_html: z.string().min(1).describe('Full HTML email body'),
                 body_text: z.string().optional().describe('Plain text fallback'),
@@ -3126,6 +3140,12 @@ Return ONLY valid JSON with this exact shape:
             approval_id: z.string().uuid().optional().describe('Approval token from a previous call. Required when activate=true — get this by calling once without it, then have a human approve via the dashboard.'),
         },
     }, async ({ site_id, name, type, steps, segment_id, sends_per_hour, activate, confirmed, approval_id, trigger_event_name, trigger_tag, trigger_type, trigger_config, send_class, unsub_footer_template, reentry_mode, period_key }) => {
+        for (const step of steps) {
+            const events = validateStepMultiEventRules(step);
+            if (!events.ok)
+                return j({ error: events.error, code: 'INVALID_INPUT' });
+            Object.assign(step, events.rules);
+        }
         const footerTemplate = unsub_footer_template?.trim() ?? null;
         if (footerTemplate !== null) {
             const footerError = validateUnsubFooterTemplate(footerTemplate);
@@ -3202,6 +3222,9 @@ Return ONLY valid JSON with this exact shape:
                     delay: s.delay_days ? `${s.delay_days}d ${s.delay_hours ?? 0}h` : `${s.delay_hours ?? 0}h`,
                     has_html: !!s.body_html,
                     has_text: !!s.body_text,
+                    skip_if_event: s.skip_if_event ?? null,
+                    send_only_if_event: s.send_only_if_event ?? null,
+                    ...stepMultiEventRulesView(s),
                 })),
                 segment_id: segment_id ?? null,
                 sends_per_hour: sends_per_hour ?? null,
@@ -3240,6 +3263,9 @@ Return ONLY valid JSON with this exact shape:
             blocks: s.blocks ? normalizeComposerBlocks(s.blocks) : null,
             delay_days: s.delay_days ?? 0,
             delay_hours: s.delay_hours ?? 0,
+            skip_if_event: s.skip_if_event ?? null,
+            send_only_if_event: s.send_only_if_event ?? null,
+            ...stepMultiEventRulesView(s),
         }));
         const { error: stepErr } = await db()
             .from('campaign_steps')
@@ -3337,7 +3363,7 @@ Return ONLY valid JSON with this exact shape:
             return j({ error: (campaignErr ? dbToolError(campaignErr).error : undefined) ?? 'Campaign not found', code: 'NOT_FOUND' });
         const { data, error } = await db()
             .from('campaign_steps')
-            .select('id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_property, send_only_if_property, created_at, updated_at')
+            .select('id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, skip_if_property, send_only_if_property, created_at, updated_at')
             .eq('campaign_id', campaign_id)
             .order('step_order', { ascending: true });
         if (error)
@@ -3365,6 +3391,7 @@ Return ONLY valid JSON with this exact shape:
             survey_id: z.string().uuid().optional(),
             skip_if_property: propertyConditions.describe('Skip when ALL 1–10 conditions match current custom_properties. Missing/null keys never match. null clears.'),
             send_only_if_property: propertyConditions.describe('Send only when ALL 1–10 conditions match current custom_properties. Unknown/non-match skips. null clears.'),
+            ...multiEventFields,
             skip_if_event: z.string().trim().min(1).nullable().optional().describe('Event name that skips this step at send time; null clears the rule.'),
             send_only_if_event: z.string().trim().min(1).nullable().optional().describe('Event required for this step to send; null clears the rule.'),
             link_actions: z.array(z.discriminatedUnion('action', [
@@ -3381,6 +3408,9 @@ Return ONLY valid JSON with this exact shape:
     }, async ({ step_id, ...updates }) => {
         const projectId = getProjectId();
         const { survey_id, ...stepUpdates } = updates;
+        const events = validateStepMultiEventRules(stepUpdates);
+        if (!events.ok)
+            return j({ error: events.error, code: 'INVALID_INPUT' });
         const properties = validateStepPropertyRules(stepUpdates);
         if (!properties.ok)
             return j({ error: properties.error, code: "INVALID_INPUT" });
@@ -3409,6 +3439,7 @@ Return ONLY valid JSON with this exact shape:
         const normalizedBlocks = Array.isArray(stepUpdates.blocks) ? normalizeComposerBlocks(stepUpdates.blocks) : undefined;
         const renderedUpdates = {
             ...stepUpdates,
+            ...events.rules,
             ...(normalizedBlocks !== undefined ? { blocks: normalizedBlocks.length ? normalizedBlocks : null } : {}),
             ...(normalizedBlocks?.length && stepUpdates.body_html === undefined ? { body_html: blocksToHtml(normalizedBlocks) } : {}),
             ...(normalizedBlocks?.length && stepUpdates.body_text === undefined ? { body_text: blocksToText(normalizedBlocks) } : {}),
@@ -3420,7 +3451,7 @@ Return ONLY valid JSON with this exact shape:
             .from('campaign_steps')
             .update({ ...renderedUpdates, updated_at: new Date().toISOString() })
             .eq('id', step_id)
-            .select('id, step_order, subject, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_property, send_only_if_property, updated_at')
+            .select('id, step_order, subject, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, skip_if_property, send_only_if_property, updated_at')
             .single();
         if (error)
             return j(dbToolError(error));
@@ -3798,7 +3829,7 @@ Return ONLY valid JSON with this exact shape:
             total_sent: periods?.totals?.sent ?? sentCount ?? 0,
             ...(periods?.totals ? { unique_opened: periods.totals.opened, unique_clicked: periods.totals.clicked } : {}),
             ...campaignPeriodFields(periods, period),
-            steps: (steps ?? []).map((step) => ({ ...step, total_sent: stepMetrics.sent.get(step.id) ?? 0 })),
+            steps: (steps ?? []).map((step) => ({ ...step, ...stepMultiEventRulesView(step), total_sent: stepMetrics.sent.get(step.id) ?? 0 })),
             active_enrollments: enrollCount ?? 0,
             send_incomplete: queuedCount > 0 || failedCount > 0 || outstandingRows.length > 0 || unresolvedCount > 0,
             queued_email_count: queuedCount,

package/package.json

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