@sendinel/mcp-server 1.0.7 → 1.0.8

package/build/lib/composer-blocks.d.ts

@@ -0,0 +1,116 @@
+export type ComposerBlockType = 'text' | 'heading' | 'button' | 'columns' | 'image' | 'social' | 'divider' | 'spacer' | 'unsubscribe';
+export type ComposerBlock = {
+    id?: string;
+    type: ComposerBlockType;
+    content?: string;
+    align?: 'left' | 'center' | 'right';
+    level?: 1 | 2 | 3;
+    label?: string;
+    url?: string;
+    bg_color?: string;
+    text_color?: string;
+    border_radius?: number;
+    padding?: string;
+    left?: string;
+    right?: string;
+    split?: '50/50' | '60/40' | '40/60';
+    alt?: string;
+    width?: number | null;
+    brand_asset_id?: string | null;
+    links?: Array<{
+        platform: string;
+        url: string;
+    }>;
+    height?: number;
+};
+export declare const BLOCK_GENERATION_SCHEMA: {
+    readonly type: "array";
+    readonly minItems: 2;
+    readonly maxItems: 12;
+    readonly items: {
+        readonly type: "object";
+        readonly additionalProperties: false;
+        readonly properties: {
+            readonly type: {
+                readonly enum: readonly ["text", "heading", "button", "columns", "image", "social", "divider", "spacer", "unsubscribe"];
+            };
+            readonly content: {
+                readonly type: "string";
+            };
+            readonly align: {
+                readonly enum: readonly ["left", "center", "right"];
+            };
+            readonly level: {
+                readonly enum: readonly [1, 2, 3];
+            };
+            readonly label: {
+                readonly type: "string";
+            };
+            readonly url: {
+                readonly type: "string";
+            };
+            readonly bg_color: {
+                readonly type: "string";
+            };
+            readonly text_color: {
+                readonly type: "string";
+            };
+            readonly border_radius: {
+                readonly type: "number";
+                readonly minimum: 0;
+                readonly maximum: 24;
+            };
+            readonly padding: {
+                readonly type: "string";
+            };
+            readonly left: {
+                readonly type: "string";
+            };
+            readonly right: {
+                readonly type: "string";
+            };
+            readonly split: {
+                readonly enum: readonly ["50/50", "60/40", "40/60"];
+            };
+            readonly alt: {
+                readonly type: "string";
+            };
+            readonly width: {
+                readonly type: readonly ["number", "null"];
+                readonly minimum: 1;
+                readonly maximum: 1200;
+            };
+            readonly brand_asset_id: {
+                readonly type: readonly ["string", "null"];
+            };
+            readonly links: {
+                readonly type: "array";
+                readonly maxItems: 8;
+                readonly items: {
+                    readonly type: "object";
+                    readonly additionalProperties: false;
+                    readonly properties: {
+                        readonly platform: {
+                            readonly type: "string";
+                        };
+                        readonly url: {
+                            readonly type: "string";
+                        };
+                    };
+                    readonly required: readonly ["platform", "url"];
+                };
+            };
+            readonly height: {
+                readonly type: "number";
+                readonly minimum: 4;
+                readonly maximum: 96;
+            };
+        };
+        readonly required: readonly ["type"];
+    };
+};
+export declare function normalizeComposerBlocks(raw: unknown): ComposerBlock[];
+export declare function blocksToHtml(blocks: ComposerBlock[], ctx?: {
+    preheader?: string | null;
+}): string;
+export declare function blocksToText(blocks: ComposerBlock[]): string;

package/build/lib/composer-blocks.js

@@ -0,0 +1,187 @@
+export const BLOCK_GENERATION_SCHEMA = {
+    type: 'array',
+    minItems: 2,
+    maxItems: 12,
+    items: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+            type: { enum: ['text', 'heading', 'button', 'columns', 'image', 'social', 'divider', 'spacer', 'unsubscribe'] },
+            content: { type: 'string' },
+            align: { enum: ['left', 'center', 'right'] },
+            level: { enum: [1, 2, 3] },
+            label: { type: 'string' },
+            url: { type: 'string' },
+            bg_color: { type: 'string' },
+            text_color: { type: 'string' },
+            border_radius: { type: 'number', minimum: 0, maximum: 24 },
+            padding: { type: 'string' },
+            left: { type: 'string' },
+            right: { type: 'string' },
+            split: { enum: ['50/50', '60/40', '40/60'] },
+            alt: { type: 'string' },
+            width: { type: ['number', 'null'], minimum: 1, maximum: 1200 },
+            brand_asset_id: { type: ['string', 'null'] },
+            links: {
+                type: 'array',
+                maxItems: 8,
+                items: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                        platform: { type: 'string' },
+                        url: { type: 'string' },
+                    },
+                    required: ['platform', 'url'],
+                },
+            },
+            height: { type: 'number', minimum: 4, maximum: 96 },
+        },
+        required: ['type'],
+    },
+};
+const BLOCK_TYPES = new Set(['text', 'heading', 'button', 'columns', 'image', 'social', 'divider', 'spacer', 'unsubscribe']);
+const HEADING_SIZES = { 1: 32, 2: 24, 3: 18 };
+const SOCIAL_LABELS = { twitter: 'Twitter / X', x: 'Twitter / X', linkedin: 'LinkedIn', facebook: 'Facebook', instagram: 'Instagram', youtube: 'YouTube', website: 'Website' };
+function cleanText(value, max = 2000) {
+    return typeof value === 'string' ? value.replace(/\u2014/g, ' - ').trim().slice(0, max) : '';
+}
+function escapeHtml(value) {
+    return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
+}
+function escapeAttr(value) {
+    return escapeHtml(value).replace(/`/g, '&#96;');
+}
+function cleanAlign(value) {
+    return value === 'center' || value === 'right' ? value : 'left';
+}
+function cleanUrl(value) {
+    const url = cleanText(value, 2000);
+    if (/^https?:\/\//i.test(url))
+        return url;
+    if (/^mailto:[^\s<>"]+@[^\s<>"]+$/i.test(url))
+        return url;
+    if (/^\{\{[A-Za-z0-9_.-]+\}\}$/.test(url))
+        return url;
+    return '';
+}
+function cleanImageUrl(value) {
+    const url = cleanText(value, 2000);
+    return /^https:\/\//i.test(url) ? url : '';
+}
+function cleanColor(value, fallback) {
+    const color = cleanText(value, 32);
+    return /^#[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?([0-9A-Fa-f]{2})?$/.test(color) ? color : fallback;
+}
+function cleanPadding(value) {
+    const padding = cleanText(value, 80);
+    return /^([0-9]{1,2}px)(\s+[0-9]{1,2}px){0,3}$/.test(padding) ? padding : '12px 28px';
+}
+function cleanRichText(value, max = 2000) {
+    return cleanText(value, max)
+        .replace(/<\s*(script|style)[\s\S]*?<\s*\/\s*\1\s*>/gi, '')
+        .replace(/<a\b[^>]*\bhref\s*=\s*(["'])(.*?)\1[^>]*>([\s\S]*?)<\/a>/gi, (tag, _quote, href, label) => cleanUrl(href) ? tag : String(label))
+        .replace(/<\s*\/?\s*([a-z0-9]+)([^>]*)>/gi, (tag, rawName, rawAttrs) => {
+        const name = String(rawName).toLowerCase();
+        if (['strong', 'b', 'em', 'i', 'u'].includes(name))
+            return tag.startsWith('</') ? `</${name}>` : `<${name}>`;
+        if (name === 'br')
+            return '<br>';
+        if (name === 'a') {
+            if (tag.startsWith('</'))
+                return '</a>';
+            const href = cleanUrl(String(rawAttrs).match(/\bhref\s*=\s*(["'])(.*?)\1/i)?.[2]);
+            return href ? `<a href="${escapeAttr(href)}" target="_blank" style="color:var(--color-editor-link)">` : '';
+        }
+        return escapeHtml(tag);
+    });
+}
+function splitWidths(split) {
+    if (split === '60/40')
+        return [60, 40];
+    if (split === '40/60')
+        return [40, 60];
+    return [50, 50];
+}
+export function normalizeComposerBlocks(raw) {
+    if (!Array.isArray(raw))
+        return [];
+    return raw.slice(0, 12).flatMap((item, index) => {
+        if (!item || typeof item !== 'object' || !BLOCK_TYPES.has(String(item.type)))
+            return [];
+        const block = item;
+        const type = String(block.type);
+        const base = { id: cleanText(block.id, 80) || `ai-block-${index + 1}`, type };
+        if (type === 'text')
+            return [{ ...base, content: cleanRichText(block.content), align: cleanAlign(block.align) }];
+        if (type === 'heading')
+            return [{ ...base, content: cleanText(block.content, 300), level: ([1, 2, 3].includes(Number(block.level)) ? Number(block.level) : 2), align: cleanAlign(block.align) }];
+        if (type === 'button')
+            return [{ ...base, label: cleanText(block.label, 120) || 'Learn more', url: cleanUrl(block.url) || '{{cta_url}}', align: cleanAlign(block.align) === 'left' ? 'center' : cleanAlign(block.align), bg_color: cleanColor(block.bg_color, '#00BFFF'), text_color: cleanColor(block.text_color, '#ffffff'), border_radius: Math.max(0, Math.min(24, Number(block.border_radius ?? 6))), padding: cleanPadding(block.padding) }];
+        if (type === 'columns')
+            return [{ ...base, left: cleanRichText(block.left), right: cleanRichText(block.right), split: block.split === '60/40' || block.split === '40/60' ? block.split : '50/50' }];
+        if (type === 'image') {
+            const url = cleanImageUrl(block.url);
+            return url ? [{ ...base, url, alt: cleanText(block.alt, 300), width: block.width == null ? null : Math.max(1, Math.min(1200, Number(block.width))), brand_asset_id: cleanText(block.brand_asset_id, 80) || null }] : [];
+        }
+        if (type === 'social') {
+            const links = Array.isArray(block.links)
+                ? block.links.flatMap((link) => {
+                    if (!link || typeof link !== 'object')
+                        return [];
+                    const platform = cleanText(link.platform, 80).toLowerCase();
+                    const url = cleanUrl(link.url);
+                    return platform && url ? [{ platform, url }] : [];
+                })
+                : [];
+            return [{ ...base, align: cleanAlign(block.align), links }];
+        }
+        if (type === 'spacer')
+            return [{ ...base, height: Math.max(4, Math.min(96, Number(block.height ?? 24))) }];
+        return [base];
+    });
+}
+export function blocksToHtml(blocks, ctx) {
+    const body = normalizeComposerBlocks(blocks).map((b) => {
+        if (b.type === 'text')
+            return String(b.content ?? '').split(/\n\n+/).filter((p) => p.trim()).map((p) => p.trim() === '---' ? '<hr style="border:none;border-top:1px solid #374151;margin:24px 0;" />' : `<p style="margin-bottom:16px;line-height:1.6;text-align:${cleanAlign(b.align)};">${p.trim()}</p>`).join('\n');
+        if (b.type === 'heading') {
+            const level = [1, 2, 3].includes(Number(b.level)) ? Number(b.level) : 2;
+            return `<h${level} style="font-family:Arial,sans-serif;font-size:${HEADING_SIZES[level]}px;font-weight:700;line-height:1.2;margin:0 0 16px;color:#111827;text-align:${cleanAlign(b.align)};">${escapeHtml(b.content || 'Your heading here')}</h${level}>`;
+        }
+        if (b.type === 'button')
+            return `<table role="presentation" width="100%" cellpadding="0" cellspacing="0"><tr><td align="${cleanAlign(b.align || 'center')}"><a href="${escapeAttr(b.url || '{{cta_url}}')}" target="_blank" style="display:inline-block;padding:${escapeAttr(b.padding || '12px 28px')};background:${escapeAttr(b.bg_color || '#00BFFF')};color:${escapeAttr(b.text_color || '#ffffff')};font-weight:600;text-decoration:none;border-radius:${Math.max(0, Math.min(24, Number(b.border_radius ?? 6)))}px;font-family:Arial,sans-serif;font-size:15px;line-height:1;">${escapeHtml(b.label || 'Get Started')}</a></td></tr></table>`;
+        if (b.type === 'columns') {
+            const [left, right] = splitWidths(b.split);
+            return `<table role="presentation" width="100%" cellpadding="0" cellspacing="0"><tr><td width="${left}%" valign="top" style="padding-right:12px;">${b.left || ''}</td><td width="${right}%" valign="top" style="padding-left:12px;">${b.right || ''}</td></tr></table>`;
+        }
+        if (b.type === 'social') {
+            const items = (b.links ?? []).map((link) => `<a href="${escapeAttr(link.url)}" target="_blank" style="display:inline-block;margin:0 6px;color:#6b7280;font-size:12px;text-decoration:none;font-family:Arial,sans-serif;">${escapeHtml(SOCIAL_LABELS[link.platform] || link.platform)}</a>`).join('');
+            return items ? `<table role="presentation" width="100%" cellpadding="0" cellspacing="0"><tr><td align="${cleanAlign(b.align || 'center')}" style="padding:16px 0;">${items}</td></tr></table>` : '';
+        }
+        if (b.type === 'divider')
+            return '<hr style="border:none;border-top:1px solid #374151;margin:24px 0;" />';
+        if (b.type === 'spacer')
+            return `<div style="height:${Number(b.height || 20)}px;"></div>`;
+        if (b.type === 'image' && b.url)
+            return `<img src="${escapeAttr(b.url)}" alt="${escapeAttr(b.alt || '')}"${b.brand_asset_id ? ` data-brand-asset-id="${escapeAttr(b.brand_asset_id)}"` : ''} style="max-width:100%;height:auto;display:block;${b.width ? `width:${Number(b.width)}px;` : ''}margin-bottom:16px;" />`;
+        if (b.type === 'unsubscribe')
+            return '<p style="margin-bottom:0;font-size:12px;color:#6b7280;text-align:center;"><a href="{{unsubscribe_url}}" style="color:#6b7280;">Unsubscribe</a></p>';
+        return '';
+    }).join('\n');
+    const preheader = ctx?.preheader ? `<span style="display:none!important;opacity:0;color:transparent;height:0;width:0;overflow:hidden;">${escapeHtml(ctx.preheader)}</span>` : '';
+    return `${preheader}${body}`;
+}
+export function blocksToText(blocks) {
+    return normalizeComposerBlocks(blocks).map((block) => {
+        if (block.type === 'heading' || block.type === 'text')
+            return block.content;
+        if (block.type === 'button')
+            return [block.label, block.url].filter(Boolean).join(': ');
+        if (block.type === 'columns')
+            return [block.left, block.right].filter(Boolean).join('\n\n');
+        if (block.type === 'image')
+            return block.alt ? `[Image: ${block.alt}]` : '';
+        return '';
+    }).filter(Boolean).join('\n\n').replace(/<[^>]+>/g, ' ').replace(/\s+\n/g, '\n').replace(/[ \t]{2,}/g, ' ').trim();
+}

package/build/tools/campaigns.js

@@ -12,6 +12,7 @@ import { sendEmailForSite } from '../lib/email-provider.js';
 import { renderTemplateString, resolveSurveyShortLink } from '../lib/survey-link-resolver.js';
 import { logAudit } from '../audit.js';
 import { recordBrandAssetUsage } from '../lib/brand-asset-usage.js';
+import { BLOCK_GENERATION_SCHEMA, blocksToHtml, blocksToText, normalizeComposerBlocks } from '../lib/composer-blocks.js';
 const txt = (text) => ({ content: [{ type: 'text', text }] });
 const j = (data) => txt(JSON.stringify(data, null, 2));
 function normalizeTriggerValue(value) {
@@ -444,13 +445,14 @@ export function registerCampaignTools(server) {
             subject: z.string().min(1),
             body_html: z.string().optional(),
             body_text: z.string().optional(),
+            blocks: z.array(z.record(z.string(), z.unknown())).optional().describe('Optional structured Composer blocks that produced body_html.'),
             delay_days: z.number().int().min(0).optional().default(0),
             delay_hours: z.number().int().min(0).max(23).optional().default(0),
             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.'),
         },
-    }, async ({ campaign_id, step_order, subject, body_html, body_text, delay_days, delay_hours, variant_label, survey_id, brand_asset_ids }) => {
+    }, async ({ campaign_id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, variant_label, survey_id, brand_asset_ids }) => {
         const renderVars = {};
         if (survey_id) {
             const surveyLink = await resolveSurveyShortLink(db(), getProjectId(), survey_id);
@@ -459,11 +461,13 @@ export function registerCampaignTools(server) {
             renderVars.survey_link = surveyLink;
         }
         const renderedSubject = survey_id ? renderTemplateString(subject, renderVars) : subject;
-        const renderedHtml = body_html !== undefined && survey_id ? renderTemplateString(body_html, renderVars) : body_html;
+        const normalizedBlocks = blocks ? normalizeComposerBlocks(blocks) : undefined;
+        const htmlFromBlocks = normalizedBlocks?.length ? blocksToHtml(normalizedBlocks) : undefined;
+        const renderedHtml = body_html !== undefined && survey_id ? renderTemplateString(body_html, renderVars) : body_html ?? htmlFromBlocks;
         const renderedText = body_text !== undefined && survey_id ? renderTemplateString(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, delay_days, delay_hours, variant_label: variant_label ?? 'A' })
+            .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' })
             .select()
             .single();
         if (error)
@@ -956,6 +960,7 @@ export function registerCampaignTools(server) {
                 subject: s.subject,
                 body_html: s.body_html,
                 body_text: s.body_text,
+                blocks: s.blocks ?? null,
                 delay_days: s.delay_days,
                 delay_hours: s.delay_hours,
             }));
@@ -973,14 +978,15 @@ export function registerCampaignTools(server) {
             idempotentHint: true,
             openWorldHint: true,
         },
-        description: 'Generate email content (subject, HTML, plain text) from a brief using AI. Optionally provide contact_id to adapt tone based on recipient engagement data.',
+        description: 'Generate email content as editable Composer blocks plus rendered HTML/plain text from a brief using AI. Optionally provide contact_id to adapt tone based on recipient engagement data.',
         inputSchema: {
             site_id: z.string().uuid(),
             brief: z.string().min(1).describe('Description of the email to generate'),
             format: z.enum(['both', 'html', 'text']).optional().describe('Output format, default both'),
             contact_id: z.string().uuid().optional().describe('Optional contact UUID — when provided, AI adapts tone based on their engagement level and history'),
+            content_recommendation: z.unknown().optional().describe('Optional topic evidence from get_campaign_content_recommendations or another recommendation source.'),
         },
-    }, async ({ site_id, brief, format = 'both', contact_id }) => {
+    }, async ({ site_id, brief, format = 'both', contact_id, content_recommendation }) => {
         const apiKey = process.env.ANTHROPIC_API_KEY;
         if (!apiKey)
             return txt('Error: ANTHROPIC_API_KEY not configured');
@@ -1012,7 +1018,26 @@ export function registerCampaignTools(server) {
             ? `Brand: ${site.name}, Domain: ${site.sending_domain}, From: ${site.from_name} <${site.from_email}>`
             : 'No brand info available';
         const voicePrompt = buildVoicePrompt(site?.brand_voice, project?.brand_settings ?? null);
-        let systemPrompt = buildEmailSystemPrompt(brandContext, voicePrompt);
+        let systemPrompt = `${buildEmailSystemPrompt(brandContext, voicePrompt)}
+
+Generate structured Composer blocks first. Return ONLY valid JSON with:
+{
+  "execution_trace": object,
+  "conclusion": {
+    "subject": string,
+    "preview_text": string,
+    "blocks": ComposerBlock[],
+    "body_text": string,
+    "cta_text": string,
+    "reasoning_log": string,
+    "brand_voice_compliance": "PASS" | string
+  }
+}
+
+ComposerBlock[] must conform to this JSON Schema:
+${JSON.stringify(BLOCK_GENERATION_SCHEMA)}
+
+Do not include body_html in your response; Sendinel renders body_html from blocks.`;
         // Inject per-contact context when available
         if (contact) {
             const lastActivity = contact.last_opened_at
@@ -1035,14 +1060,28 @@ Adapt your tone accordingly:
         const anthropic = new Anthropic({ apiKey });
         const genResponse = await anthropic.messages.create({
             model: getAnthropicModelId(),
-            max_tokens: 2048,
+            max_tokens: 3000,
             system: systemPrompt,
-            messages: [{ role: 'user', content: brief }],
+            messages: [{ role: 'user', content: content_recommendation ? `${brief}\n\nContent recommendation evidence:\n${typeof content_recommendation === 'string' ? content_recommendation : JSON.stringify(content_recommendation, null, 2)}` : brief }],
         });
         const textBlock = genResponse.content.find((b) => b.type === 'text');
         const raw = textBlock && 'text' in textBlock ? textBlock.text : '{}';
         try {
-            const result = JSON.parse(raw.replace(/```json?\n?|```/g, '').trim());
+            const parsed = JSON.parse(raw.replace(/```json?\n?|```/g, '').trim());
+            const conclusion = parsed.conclusion ?? parsed;
+            const blocks = normalizeComposerBlocks(conclusion.blocks);
+            if (!blocks.length)
+                return txt(`Error: Generated email did not include Composer blocks. AI returned: ${raw.slice(0, 200)}`);
+            const result = {
+                subject: conclusion.subject,
+                preview_text: conclusion.preview_text,
+                body_html: blocksToHtml(blocks, { preheader: typeof conclusion.preview_text === 'string' ? conclusion.preview_text : null }),
+                body_text: typeof conclusion.body_text === 'string' && conclusion.body_text.trim() ? conclusion.body_text : blocksToText(blocks),
+                blocks,
+                cta_text: conclusion.cta_text,
+                reasoning_log: conclusion.reasoning_log,
+                brand_voice_compliance: conclusion.brand_voice_compliance,
+            };
             if (format === 'html')
                 delete result.body_text;
             if (format === 'text')
@@ -1283,13 +1322,32 @@ Adapt your tone accordingly:
             .maybeSingle();
         const brandCtx = site ? `Brand: ${site.name}, Domain: ${site.sending_domain}, From: ${site.from_name}` : '';
         const voicePrompt = buildVoicePrompt(site?.brand_voice);
-        const systemPrompt = buildEmailSystemPrompt(brandCtx, voicePrompt);
+        const systemPrompt = `${buildEmailSystemPrompt(brandCtx, voicePrompt)}
+
+Generate structured Composer blocks first. Return ONLY valid JSON with:
+{
+  "execution_trace": object,
+  "conclusion": {
+    "subject": string,
+    "preview_text": string,
+    "blocks": ComposerBlock[],
+    "body_text": string,
+    "cta_text": string,
+    "reasoning_log": string,
+    "brand_voice_compliance": "PASS" | string
+  }
+}
+
+ComposerBlock[] must conform to this JSON Schema:
+${JSON.stringify(BLOCK_GENERATION_SCHEMA)}
+
+Do not include body_html in your response; Sendinel renders body_html from blocks.`;
         const steps = [];
         for (let i = 0; i < emails.length; i++) {
             const email = emails[i];
             const genResp = await anthropic.messages.create({
                 model: getAnthropicModelId(),
-                max_tokens: 2048,
+                max_tokens: 3000,
                 system: systemPrompt,
                 messages: [{ role: 'user', content: email.brief }],
             });
@@ -1297,7 +1355,17 @@ Adapt your tone accordingly:
             const rawEmail = gtb && 'text' in gtb ? gtb.text : '{}';
             let emailContent;
             try {
-                emailContent = JSON.parse(rawEmail.replace(/```json?\n?|```/g, '').trim());
+                const parsed = JSON.parse(rawEmail.replace(/```json?\n?|```/g, '').trim());
+                const conclusion = parsed.conclusion ?? parsed;
+                const blocks = normalizeComposerBlocks(conclusion.blocks);
+                emailContent = blocks.length
+                    ? {
+                        subject: conclusion.subject,
+                        body_html: blocksToHtml(blocks, { preheader: typeof conclusion.preview_text === 'string' ? conclusion.preview_text : null }),
+                        body_text: typeof conclusion.body_text === 'string' && conclusion.body_text.trim() ? conclusion.body_text : blocksToText(blocks),
+                        blocks,
+                    }
+                    : parsed;
             }
             catch {
                 emailContent = { subject: `Step ${i + 1}`, body_html: '<p>' + email.brief + '</p>', body_text: email.brief };
@@ -1306,7 +1374,8 @@ Adapt your tone accordingly:
                 .from('campaign_steps')
                 .insert({
                 campaign_id: campaign.id, step_order: i,
-                subject: emailContent.subject, body_html: emailContent.body_html, body_text: emailContent.body_text,
+                subject: String(emailContent.subject ?? `Step ${i + 1}`), body_html: emailContent.body_html, body_text: emailContent.body_text,
+                blocks: Array.isArray(emailContent.blocks) ? emailContent.blocks : null,
                 delay_days: email.delay_days ?? 0, delay_hours: email.delay_hours ?? 0,
             })
                 .select('id, step_order, subject')
@@ -1716,6 +1785,7 @@ Return ONLY valid JSON with this exact shape:
                 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'),
+                blocks: z.array(z.record(z.string(), z.unknown())).optional().describe('Optional structured Composer blocks that produced body_html.'),
                 delay_days: z.number().int().min(0).optional().default(0),
                 delay_hours: z.number().int().min(0).max(23).optional().default(0),
             })).min(1).describe('Email steps with pre-built content'),
@@ -1813,6 +1883,7 @@ Return ONLY valid JSON with this exact shape:
             subject: s.subject,
             body_html: s.body_html,
             body_text: s.body_text ?? null,
+            blocks: s.blocks ? normalizeComposerBlocks(s.blocks) : null,
             delay_days: s.delay_days ?? 0,
             delay_hours: s.delay_hours ?? 0,
         }));
@@ -1906,7 +1977,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, delay_days, delay_hours, created_at, updated_at')
+            .select('id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, created_at, updated_at')
             .eq('campaign_id', campaign_id)
             .order('step_order', { ascending: true });
         if (error)
@@ -1927,6 +1998,7 @@ Return ONLY valid JSON with this exact shape:
             subject: z.string().optional(),
             body_html: z.string().optional(),
             body_text: z.string().optional(),
+            blocks: z.array(z.record(z.string(), z.unknown())).optional().describe('Optional structured Composer blocks that produced body_html.'),
             delay_days: z.number().int().min(0).optional(),
             delay_hours: z.number().int().min(0).optional(),
             step_order: z.number().int().min(0).optional(),
@@ -1957,8 +2029,12 @@ Return ONLY valid JSON with this exact shape:
                 return j({ error: 'Survey has no short link yet', code: 'SURVEY_LINK_NOT_READY' });
             renderVars.survey_link = surveyLink;
         }
+        const normalizedBlocks = Array.isArray(stepUpdates.blocks) ? normalizeComposerBlocks(stepUpdates.blocks) : undefined;
         const renderedUpdates = {
             ...stepUpdates,
+            ...(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) } : {}),
             ...(survey_id && stepUpdates.subject !== undefined ? { subject: renderTemplateString(stepUpdates.subject, renderVars) } : {}),
             ...(survey_id && stepUpdates.body_html !== undefined ? { body_html: renderTemplateString(stepUpdates.body_html, renderVars) } : {}),
             ...(survey_id && stepUpdates.body_text !== undefined ? { body_text: renderTemplateString(stepUpdates.body_text, renderVars) } : {}),

package/build/tools/compound.js

@@ -4,6 +4,7 @@ import { db } from '../db.js';
 import { getProjectId } from '../project.js';
 import { buildVoicePrompt } from '../lib/voice.js';
 import { getAnthropicFastModelId } from '../anthropic-model.js';
+import { BLOCK_GENERATION_SCHEMA, blocksToHtml, blocksToText, normalizeComposerBlocks } from '../lib/composer-blocks.js';
 const j = (data) => ({ content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] });
 function getAnthropicClient() {
     const apiKey = process.env.ANTHROPIC_API_KEY;
@@ -65,15 +66,30 @@ BRAND VOICE: ${voiceContext}
 
 Generate exactly ${num_steps} emails. For each email, provide:
 - subject
-- body_html
+- blocks (ComposerBlock[])
 - body_text
 - delay_hours_from_previous (0 for the first email, ${step_delay_hours} for subsequent ones)
 
+ComposerBlock[] must conform to this JSON Schema:
+${JSON.stringify(BLOCK_GENERATION_SCHEMA)}
+
+Do not include body_html. Sendinel renders body_html from blocks.
 Respond with a JSON array.`,
                     }],
             });
             const raw = msg.content[0].text;
-            steps = extractJsonArray(raw);
+            steps = extractJsonArray(raw).map((step, index) => {
+                const blocks = normalizeComposerBlocks(step.blocks);
+                return {
+                    subject: typeof step.subject === 'string' ? step.subject : `Step ${index + 1}`,
+                    body_html: blocks.length ? blocksToHtml(blocks) : '',
+                    body_text: typeof step.body_text === 'string' && step.body_text.trim() ? step.body_text : blocksToText(blocks),
+                    blocks,
+                    delay_hours_from_previous: Number(step.delay_hours_from_previous ?? (index === 0 ? 0 : step_delay_hours)),
+                };
+            });
+            if (steps.some((step) => !step.blocks?.length))
+                throw new Error('AI response did not include editable Composer blocks for every step');
         }
         catch (error) {
             return j({ error: `AI generation failed: ${error instanceof Error ? error.message : String(error)}`, code: 'GENERATION_FAILED' });
@@ -108,6 +124,7 @@ Respond with a JSON array.`,
                 subject: step.subject,
                 body_html: step.body_html,
                 body_text: step.body_text,
+                blocks: step.blocks ?? null,
                 delay_days: 0,
                 delay_hours: step.delay_hours_from_previous,
                 template_id: String(template.id),
@@ -158,11 +175,23 @@ Respond with a JSON array.`,
                         content: `Write an email for "${site?.name ?? 'our product'}".
 BRIEF: ${brief}
 BRAND VOICE: ${buildVoicePrompt(site?.brand_voice)}
-Respond with JSON: { "subject": "...", "body_html": "...", "body_text": "..." }`,
+Generate structured Composer blocks first. ComposerBlock[] must conform to this JSON Schema:
+${JSON.stringify(BLOCK_GENERATION_SCHEMA)}
+Do not include body_html. Sendinel renders body_html from blocks.
+Respond with JSON: { "subject": "...", "blocks": [...], "body_text": "..." }`,
                     }],
             });
             const raw = msg.content[0].text;
-            generated = extractJsonObject(raw);
+            const parsed = extractJsonObject(raw);
+            const blocks = normalizeComposerBlocks(parsed.blocks);
+            if (!blocks.length)
+                throw new Error('AI response did not include editable Composer blocks');
+            generated = {
+                subject: parsed.subject,
+                body_html: blocksToHtml(blocks),
+                body_text: parsed.body_text || blocksToText(blocks),
+                blocks,
+            };
         }
         catch (error) {
             return j({ error: `Generation failed: ${error instanceof Error ? error.message : String(error)}` });

package/package.json

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