@sendinel/mcp-server 1.0.96 → 1.0.98

package/build/tools/campaigns.js

@@ -1,7 +1,7 @@
-import { CAMPAIGN_BRANCH_CONDITIONS, campaignBranchConditionValue } from "@sendinel/domain";
+import { CAMPAIGN_BRANCH_CONDITIONS, campaignBranchConditionValue, isContactPropertyConditionList, STEP_PROPERTY_CONDITIONS_ERROR, validateStepPropertyRules } from "@sendinel/domain";
 import { z } from 'zod';
 import Anthropic from '@anthropic-ai/sdk';
-import { assertSendAccepted, SendRefusedError, BLOCKING_CONTENT_ISSUE_KINDS, computeSendContentKey, findContentIssues, sendingHostOf, NAME_FALLBACKS, ONE_SEND_MATCH_STATUSES, ONE_SEND_SENT_STATUSES, ONE_SEND_WINDOW_DAYS, normalizeTriggerConfig, renderTemplateString as renderTemplateVars, resolveBrandTokens, brandWarnings, readAllRows, } from '@sendinel/domain';
+import { assertSendAccepted, providerSendError, sendError, SendRefusedError, BLOCKING_CONTENT_ISSUE_KINDS, computeSendContentKey, findContentIssues, sendingHostOf, NAME_FALLBACKS, ONE_SEND_MATCH_STATUSES, ONE_SEND_SENT_STATUSES, ONE_SEND_WINDOW_DAYS, normalizeTriggerConfig, renderTemplateString as renderTemplateVars, resolveBrandTokens, brandWarnings, readAllRows, } from '@sendinel/domain';
 // Subpath import, not the barrel above -- reply-actions.ts uses node:crypto,
 // and MCP-server-side that's fine (this never runs in an Edge Function), but
 // keeping it off the shared barrel avoids re-creating the Edge-Function
@@ -764,6 +764,10 @@ export function registerCampaignTools(server) {
             return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
         return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     });
+    const propertyConditions = z.array(z.union([
+        z.object({ key: z.string(), op: z.enum(['eq', 'neq']), value: z.string() }).strict(),
+        z.object({ key: z.string(), op: z.literal('exists') }).strict(),
+    ])).min(1).max(10).refine(isContactPropertyConditionList, STEP_PROPERTY_CONDITIONS_ERROR).nullable().optional();
     server.registerTool('add_campaign_step', {
         title: 'Add Campaign Step',
         annotations: {
@@ -785,10 +789,15 @@ export function registerCampaignTools(server) {
             variant_label: z.string().optional().default('A').describe('Variant label for A/B testing (default: A). Use B, C, etc. for additional variants.'),
             survey_id: z.string().uuid().optional(),
             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.'),
             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 }) => {
+    }, 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 }) => {
+        const properties = validateStepPropertyRules({ skip_if_property, send_only_if_property });
+        if (!properties.ok)
+            return j({ error: properties.error, code: "INVALID_INPUT" });
         const renderVars = {};
         if (survey_id) {
             const surveyLink = await resolveSurveyShortLink(db(), getProjectId(), survey_id);
@@ -803,7 +812,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 })
+            .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 })
             .select()
             .single();
         if (error)
@@ -818,6 +827,7 @@ export function registerCampaignTools(server) {
         }).catch((err) => {
             console.warn('Failed to record brand asset usage for MCP campaign step:', err);
         });
+        await logAudit({ action: 'campaign.step_created', resourceType: 'campaign_step', resourceId: data.id, details: { property_rules: properties.rules } });
         return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     });
     server.registerTool('update_campaign_status', {
@@ -2321,7 +2331,7 @@ Do not include body_html in your response; Sendinel renders body_html from block
             .limit(1)
             .maybeSingle();
         if (suppression)
-            return txt(`Error: Recipient suppressed — ${suppression.reason}`);
+            return { ...txt('Error: Recipient is suppressed'), code: 'invalid_recipient' };
         // Idempotency check
         if (idempotency_key) {
             const { data: existing } = await db()
@@ -2359,8 +2369,10 @@ Do not include body_html in your response; Sendinel renders body_html from block
                 .eq('id', template_id)
                 .eq('project_id', projectId)
                 .maybeSingle();
-            if (templateError)
-                return txt(`Error: ${templateError.message}`);
+            if (templateError) {
+                console.error('MCP send template lookup failed:', templateError);
+                return { ...txt('Error: Internal server error'), ...sendError('internal_error') };
+            }
             if (!template)
                 return txt('Error: Template not found');
             const { data: project } = await adminDb().from('projects').select('brand_settings').eq('id', projectId).maybeSingle();
@@ -2415,10 +2427,13 @@ Do not include body_html in your response; Sendinel renders body_html from block
             assertSendAccepted(sendResult);
         }
         catch (error) {
+            console.error('MCP transactional send failed:', error);
             if (error instanceof SendRefusedError) {
                 await db().from('email_log').insert({ project_id: projectId, site_id, to_email: to, from_email: site.from_email, subject: resolvedSubject, category: 'transactional', status: 'failed', error_message: error.message });
             }
-            return txt(`Error: Send failed — ${error instanceof Error ? error.message : 'unknown provider error'}`);
+            const safe = providerSendError(error);
+            const code = error instanceof SendRefusedError ? error.refusal.code : safe.code;
+            return { ...txt(`Error: Send failed — ${safe.error} (${code})`), error: safe.error, code };
         }
         // Log to email_log
         const { data: logRow } = await db().from('email_log').insert({
@@ -3101,7 +3116,7 @@ Return ONLY valid JSON with this exact shape:
             return j({ error: campaignErr?.message ?? '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, 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_property, send_only_if_property, created_at, updated_at')
             .eq('campaign_id', campaign_id)
             .order('step_order', { ascending: true });
         if (error)
@@ -3127,6 +3142,8 @@ Return ONLY valid JSON with this exact shape:
             delay_hours: z.number().int().min(0).optional(),
             step_order: z.number().int().min(0).optional(),
             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.'),
             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', [
@@ -3143,6 +3160,9 @@ Return ONLY valid JSON with this exact shape:
     }, async ({ step_id, ...updates }) => {
         const projectId = getProjectId();
         const { survey_id, ...stepUpdates } = updates;
+        const properties = validateStepPropertyRules(stepUpdates);
+        if (!properties.ok)
+            return j({ error: properties.error, code: "INVALID_INPUT" });
         const { data: step, error: stepErr } = await db()
             .from('campaign_steps')
             .select('id, campaign_id')
@@ -3179,10 +3199,11 @@ 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, updated_at')
+            .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')
             .single();
         if (error)
             return j({ error: error.message });
+        await logAudit({ action: 'campaign.step_updated', resourceType: 'campaign_step', resourceId: data.id, details: { property_rules: properties.rules } });
         return j({ step: data, ok: true });
     });
     server.registerTool('delete_campaign_step', {

package/package.json

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