@sendinel/mcp-server 1.0.42 → 1.0.43

package/build/tools/campaigns.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import Anthropic from '@anthropic-ai/sdk';
-import { NAME_FALLBACKS, normalizeTriggerConfig, renderTemplateString as renderTemplateVars, resolveBrandTokens, } from '@sendinel/domain';
+import { computeSendContentKey, NAME_FALLBACKS, ONE_SEND_MATCH_STATUSES, ONE_SEND_SENT_STATUSES, ONE_SEND_WINDOW_DAYS, normalizeTriggerConfig, renderTemplateString as renderTemplateVars, resolveBrandTokens, } 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
@@ -229,6 +229,25 @@ async function validateBranchTarget(campaignId, action, targetStepId, targetCamp
  * send_broadcast so both run the same steps. Enrolls exactly the given contact ids.
  */
 async function executeBroadcast(input) {
+    // #3749 One Send: the same email (site + subject + body) joins its existing active/completed
+    // campaign from the last 90 days instead of creating another. Same rule as the dashboard helper.
+    const contentKey = computeSendContentKey({ siteId: input.siteId, subject: input.subject, bodyHtml: input.bodyHtml });
+    const since = new Date(Date.now() - ONE_SEND_WINDOW_DAYS * 24 * 60 * 60 * 1000).toISOString();
+    const { data: matches, error: matchErr } = await db()
+        .from('campaigns')
+        .select('id, status')
+        .eq('project_id', input.projectId)
+        .eq('metadata->>content_key', contentKey)
+        .in('status', [...ONE_SEND_MATCH_STATUSES])
+        .gte('created_at', since)
+        .order('created_at', { ascending: false })
+        .limit(1);
+    if (matchErr) {
+        return { ok: false, error: matchErr.message, code: 'ONE_SEND_LOOKUP_FAILED' };
+    }
+    const match = (matches ?? [])[0];
+    if (match)
+        return attachBroadcastToExisting(input, match);
     const limit = await checkPlanLimit('active_campaigns');
     if (!limit.allowed) {
         return { ok: false, error: `Campaign limit reached (${limit.current}/${limit.limit}). Upgrade your plan for more campaigns.`, code: 'PLAN_LIMIT' };
@@ -246,7 +265,7 @@ async function executeBroadcast(input) {
         send_class: input.sendClass,
         sends_per_hour: input.sendsPerHour ?? null,
         requires_approval: false,
-        metadata: { source: input.source, ...(input.metadata ?? {}) },
+        metadata: { source: input.source, ...(input.metadata ?? {}), content_key: contentKey },
     })
         .select('id')
         .single();
@@ -305,6 +324,83 @@ async function executeBroadcast(input) {
     }
     return { ok: true, campaignId: campaign.id, stepId: step.id, enrolled: input.contactIds.length, nextSendAt };
 }
+/** #3749: enroll into the matched campaign, skipping anyone enrolled or already sent to. */
+async function attachBroadcastToExisting(input, match) {
+    const skip = new Set();
+    const sentStatuses = new Set(ONE_SEND_SENT_STATUSES);
+    const chunk = 200;
+    for (let i = 0; i < input.contactIds.length; i += chunk) {
+        const ids = input.contactIds.slice(i, i + chunk);
+        const { data: enrolledRows, error: enrolledErr } = await db()
+            .from('campaign_enrollments')
+            .select('contact_id')
+            .eq('campaign_id', match.id)
+            .in('contact_id', ids)
+            .limit(10000);
+        if (enrolledErr)
+            return { ok: false, error: enrolledErr.message, code: 'ONE_SEND_LOOKUP_FAILED', campaign_id: match.id };
+        for (const row of enrolledRows ?? [])
+            skip.add(row.contact_id);
+        const { data: logRows, error: logErr } = await db()
+            .from('email_log')
+            .select('contact_id, status')
+            .eq('project_id', input.projectId)
+            .eq('campaign_id', match.id)
+            .in('contact_id', ids)
+            .limit(10000);
+        if (logErr)
+            return { ok: false, error: logErr.message, code: 'ONE_SEND_LOOKUP_FAILED', campaign_id: match.id };
+        for (const row of logRows ?? [])
+            if (sentStatuses.has(row.status))
+                skip.add(row.contact_id);
+    }
+    const fresh = input.contactIds.filter((id) => !skip.has(id));
+    const alreadySent = input.contactIds.length - fresh.length;
+    const nextSendAt = input.sendAt ?? new Date().toISOString();
+    let enrolled = 0;
+    for (let i = 0; i < fresh.length; i += 500) {
+        const batch = fresh.slice(i, i + 500).map((contact_id) => ({
+            campaign_id: match.id,
+            contact_id,
+            next_send_at: nextSendAt,
+        }));
+        const { data: inserted, error: enrollErr } = await db()
+            .from('campaign_enrollments')
+            .upsert(batch, { onConflict: 'campaign_id,contact_id', ignoreDuplicates: true })
+            .select('contact_id');
+        if (enrollErr) {
+            return { ok: false, error: enrollErr.message, code: 'ENROLLMENT_FAILED', campaign_id: match.id, enrolled_before_failure: enrolled };
+        }
+        enrolled += (inserted ?? []).length;
+    }
+    if (enrolled > 0) {
+        const { count } = await db()
+            .from('campaign_enrollments')
+            .select('id', { count: 'exact', head: true })
+            .eq('campaign_id', match.id);
+        const update = { updated_at: new Date().toISOString() };
+        if (typeof count === 'number')
+            update.total_enrolled = count;
+        if (match.status === 'completed')
+            update.status = 'active';
+        const { error: updateErr } = await db()
+            .from('campaigns')
+            .update(update)
+            .eq('id', match.id)
+            .eq('project_id', input.projectId);
+        if (updateErr) {
+            return { ok: false, error: updateErr.message, code: 'ACTIVATION_FAILED', campaign_id: match.id, enrolled };
+        }
+    }
+    const { data: steps } = await db()
+        .from('campaign_steps')
+        .select('id')
+        .eq('campaign_id', match.id)
+        .order('step_order', { ascending: true })
+        .limit(1);
+    const stepId = (steps ?? [])[0]?.id ?? '';
+    return { ok: true, campaignId: match.id, stepId, enrolled, nextSendAt, grouped: true, alreadySent };
+}
 /** #3714: a send nobody could receive leaves one audit row (counts by reason, no addresses). */
 function logRefusedSend(kind, siteId, sendClass, audience, extra = {}) {
     const reasons = {};
@@ -993,7 +1089,7 @@ export function registerCampaignTools(server) {
             details: {
                 site_id,
                 segment_id,
-                contacts_enrolled: contactIds.length,
+                contacts_enrolled: executed.enrolled,
                 source: 'mcp',
             },
         }).catch(() => { });
@@ -1001,7 +1097,7 @@ export function registerCampaignTools(server) {
             campaign_id: campaign.id,
             campaign_name: campaignName,
             type: 'broadcast',
-            contacts_enrolled: contactIds.length,
+            contacts_enrolled: executed.enrolled,
             steps: 1,
         }).catch(() => { });
         return j({
@@ -1010,9 +1106,10 @@ export function registerCampaignTools(server) {
             name: campaignName,
             status: 'active',
             segment: { id: segment.id, name: segment.name },
-            contacts_enrolled: contactIds.length,
+            contacts_enrolled: executed.enrolled,
             next_send_at: sendAt,
-            message: `Broadcast "${campaignName}" is active with ${contactIds.length} contact(s) enrolled for immediate sending.`,
+            message: `Broadcast "${campaignName}" is active with ${executed.enrolled} contact(s) enrolled for immediate sending.`,
+            ...(executed.grouped ? { grouped: true, already_sent: executed.alreadySent ?? 0 } : {}),
         });
     });
     server.registerTool('send_broadcast', {
@@ -1108,6 +1205,7 @@ export function registerCampaignTools(server) {
                 status: 'active',
                 contacts_enrolled: executed.enrolled,
                 send_at: payload.send_at ?? 'now',
+                ...(executed.grouped ? { grouped: true, already_sent: executed.alreadySent ?? 0 } : {}),
                 message: payload.send_at
                     ? `Scheduled: "${payload.subject}" goes to ${executed.enrolled} people at ${payload.send_at}.`
                     : `Sending: "${payload.subject}" is going to ${executed.enrolled} people now. Delivery happens over the next few minutes; check the campaign for results.`,

package/package.json

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