@sendinel/mcp-server 1.0.82 → 1.0.83

package/build/tools/contacts.js

@@ -1140,7 +1140,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             idempotentHint: false,
             openWorldHint: false,
         },
-        description: 'Add a contact and subscribe them to a site',
+        description: 'Add a contact and subscribe them to a site. Existing contacts keep their source and stored fields; the response includes existing: true.',
         inputSchema: {
             email: z.string().email(),
             site_id: z.string().uuid(),
@@ -1157,6 +1157,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             utm_term: z.string().optional(),
         },
     }, async ({ email, site_id, first_name, last_name, company_id, company_name, company_domain, source, utm_source, utm_medium, utm_campaign, utm_content, utm_term }) => {
+        email = email.trim().toLowerCase();
         const projectId = getProjectId();
         const embedOk = await hasCompaniesEmbed(projectId);
         const resolvedCompanyId = await resolveCompanyId(projectId, { company_id, company_name, company_domain });
@@ -1174,23 +1175,30 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
         // Check if site requires double opt-in
         const { data: siteInfo } = await db().from('sites').select('double_opt_in').eq('id', site_id).maybeSingle();
         const needsConfirm = siteInfo?.double_opt_in === true;
-        const { data: existingContact } = await db()
+        let { data: existingContact, error: lookupError } = await db()
             .from('subscribers')
-            .select('id')
+            .select('id, source, first_name, last_name, company_id, custom_properties, opted_in_at')
             .eq('project_id', projectId)
             .eq('email', email)
             .maybeSingle();
-        const row = { project_id: projectId, email, first_name, last_name, company_id: resolvedCompanyId, source, source_site: site_id };
+        if (lookupError)
+            return txt(`Error looking up contact: ${lookupError.message}`);
+        let customProperties;
         if (company_name || company_domain) {
             const orgId = await getProjectOrgId(projectId);
-            row.custom_properties = await normalizeMcpContactPropertyPatch({
+            customProperties = await normalizeMcpContactPropertyPatch({
                 ...(company_name ? { company_name } : {}),
                 ...(company_domain ? { company_domain: company_domain.trim().toLowerCase() } : {}),
             }, { orgId, projectId });
         }
-        if (!needsConfirm)
-            row.opted_in_at = new Date().toISOString();
+        const selection = embedOk ? '*, company:companies(id, name, domain)' : '*';
+        let contact;
         if (!existingContact) {
+            const row = { project_id: projectId, email, first_name, last_name, company_id: resolvedCompanyId, source, source_site: site_id };
+            if (customProperties)
+                row.custom_properties = customProperties;
+            if (!needsConfirm)
+                row.opted_in_at = new Date().toISOString();
             if (utm_source)
                 row.utm_source = utm_source;
             if (utm_medium)
@@ -1201,30 +1209,76 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 row.utm_content = utm_content;
             if (utm_term)
                 row.utm_term = utm_term;
+            const { data, error } = await db().from('subscribers')
+                .upsert(row, { onConflict: 'project_id,email', ignoreDuplicates: true })
+                .select(selection).maybeSingle();
+            if (error)
+                return txt(`Error creating contact: ${error.message}`);
+            contact = data;
+            if (!contact) {
+                // A concurrent add won the unique key; its provenance belongs to that insert.
+                const result = await db().from('subscribers')
+                    .select('id, source, first_name, last_name, company_id, custom_properties, opted_in_at')
+                    .eq('project_id', projectId).eq('email', email).single();
+                if (result.error)
+                    return txt(`Error looking up contact: ${result.error.message}`);
+                existingContact = result.data;
+            }
         }
-        const { data: contact, error: cErr } = await db()
-            .from('subscribers')
-            .upsert(row, { onConflict: 'project_id,email' })
-            .select(embedOk ? '*, company:companies(id, name, domain)' : '*')
-            .single();
-        if (cErr)
-            return { content: [{ type: 'text', text: `Error creating contact: ${cErr.message}` }] };
+        const existing = !!existingContact;
+        if (existingContact) {
+            const empty = (value) => value == null || value === '';
+            const row = {};
+            for (const [key, value] of Object.entries({ first_name, last_name, company_id: resolvedCompanyId })) {
+                if (empty(existingContact[key]) && !empty(value))
+                    row[key] = value;
+            }
+            if (!needsConfirm && existingContact.opted_in_at == null)
+                row.opted_in_at = new Date().toISOString();
+            const missingProperties = Object.fromEntries(Object.entries(customProperties ?? {})
+                .filter(([key]) => !Object.hasOwn(existingContact.custom_properties ?? {}, key)));
+            if (Object.keys(missingProperties).length) {
+                row.custom_properties = { ...(existingContact.custom_properties ?? {}), ...missingProperties };
+            }
+            if (Object.keys(row).length) {
+                let update = db().from('subscribers').update(row)
+                    .eq('id', existingContact.id).eq('project_id', projectId);
+                // The stored values must still match: a concurrent edit always wins over a re-add.
+                for (const key of Object.keys(row)) {
+                    const previous = existingContact[key];
+                    update = previous == null ? update.is(key, null)
+                        : update.eq(key, key === 'custom_properties' ? JSON.stringify(previous) : previous);
+                }
+                const { error } = await update;
+                if (error)
+                    return txt(`Error updating contact: ${error.message}`);
+            }
+            const result = await db().from('subscribers').select(selection)
+                .eq('id', existingContact.id).eq('project_id', projectId).single();
+            if (result.error)
+                return txt(`Error reading contact: ${result.error.message}`);
+            contact = result.data;
+        }
+        const existingMessage = existing ? { message: 'Contact already existed; source and existing fields were not changed.' } : {};
         const { error: subErr } = await db()
             .from('site_subscriptions')
             .upsert({ contact_id: contact.id, site_id, subscribed: !needsConfirm }, { onConflict: 'contact_id,site_id' });
         if (subErr)
             return { content: [{ type: 'text', text: `Contact created but subscription failed: ${subErr.message}` }] };
+        if (existing)
+            logAudit({ action: 'contact.readded', resourceType: 'contact', resourceId: contact.id, details: { email, requested_source: source, existing: true } });
         if (needsConfirm) {
             // Create opt-in token (confirmation email must be sent externally in MCP context)
             await db().from('opt_in_tokens').insert({ contact_id: contact.id, site_id });
             await writeBackMcpContact(projectId, contact, { email, first_name: contact.first_name ?? null, last_name: contact.last_name ?? null });
             logConsent({ contactId: contact.id, siteId: site_id, action: 'grant', consentType: 'email_marketing', source: 'mcp_pending_double_opt_in' });
-            return { content: [{ type: 'text', text: JSON.stringify({ ...contact, confirmation: 'pending', message: 'Double opt-in required. Confirmation token created.' }, null, 2) }] };
+            return { content: [{ type: 'text', text: JSON.stringify({ ...contact, existing, confirmation: 'pending', message: 'Double opt-in required. Confirmation token created.', ...existingMessage }, null, 2) }] };
         }
         await writeBackMcpContact(projectId, contact, { email, first_name: contact.first_name ?? null, last_name: contact.last_name ?? null });
         logConsent({ contactId: contact.id, siteId: site_id, action: 'grant', consentType: 'email_marketing', source: 'mcp_add_subscriber' });
-        logAudit({ action: 'contact.created', resourceType: 'contact', resourceId: contact.id, details: { email, source } });
-        return { content: [{ type: 'text', text: JSON.stringify(contact, null, 2) }] };
+        if (!existing)
+            logAudit({ action: 'contact.created', resourceType: 'contact', resourceId: contact.id, details: { email, source } });
+        return { content: [{ type: 'text', text: JSON.stringify({ ...contact, existing, ...existingMessage }, null, 2) }] };
     });
     server.registerTool('import_subscribers', {
         title: 'Import Subscribers',

package/package.json

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