@sendinel/mcp-server 1.0.174 → 1.0.175

package/build/tools/contacts.js

@@ -2337,55 +2337,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 return toolError({ error: error.message, code: 'validation_failed' });
             throw error;
         }
-        let q = db()
-            .from('subscribers')
-            .select('id, email, first_name, last_name, engagement_score, lifecycle_stage, source, created_at, last_opened_at, last_clicked_at')
-            .eq('project_id', projectId)
-            .eq('global_unsubscribed', false);
-        if (params.lifecycle_stage)
-            q = q.eq('lifecycle_stage', params.lifecycle_stage);
-        if (params.min_score !== undefined)
-            q = q.gte('engagement_score', params.min_score);
-        if (params.max_score !== undefined)
-            q = q.lte('engagement_score', params.max_score);
-        if (params.source)
-            q = q.eq('source', params.source);
-        if (params.subscribed_after)
-            q = q.gte('created_at', `${params.subscribed_after}T00:00:00Z`);
-        if (params.subscribed_before)
-            q = q.lte('created_at', `${params.subscribed_before}T23:59:59Z`);
-        if (params.has_opened === true)
-            q = q.not('last_opened_at', 'is', null);
-        if (params.has_opened === false)
-            q = q.is('last_opened_at', null);
-        if (params.has_clicked === true)
-            q = q.not('last_clicked_at', 'is', null);
-        if (params.has_clicked === false)
-            q = q.is('last_clicked_at', null);
-        if (params.tag)
-            q = q.contains('tags', [params.tag]);
-        if (params.company_id)
-            q = q.eq('company_id', params.company_id);
-        const fieldTypes = params.custom_property ? await loadContactPropertyDefinitions(projectId) : {};
-        if (params.custom_property) {
-            try {
-                // #4270: the query runs as-is, so a filter it cannot express is an error, not dropped.
-                ({ query: q } = await applySegmentRules(q, { custom_property: params.custom_property }, db(), projectId, fieldTypes, { pushDownOnly: true }));
-            }
-            catch (error) {
-                if (isSegmentRulesError(error))
-                    return toolError({ error: error.message, code: 'validation_failed' });
-                throw error;
-            }
-        }
-        if (params.site_id) {
-            // Shared site filter: an inner join, not an id list that overflows past ~350 contacts (#3674).
-            // Deliberately everyone on the site, so allowEmpty.
-            const siteFiltered = await applySegmentRules(q, { site_id: params.site_id }, db(), projectId, {}, { allowEmpty: true });
-            if (siteFiltered.siteContactIds && siteFiltered.siteContactIds.length === 0)
-                return j({ total: 0, sample: [] });
-            q = siteFiltered.query;
-        }
+        let companyIds;
         if (params.company_domain) {
             const { data: companies, error } = await db()
                 .from('companies')
@@ -2397,45 +2349,86 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             const ids = (companies ?? []).map((company) => company.id);
             if (!ids.length)
                 return j({ total: 0, sample: [] });
-            q = q.in('company_id', ids);
+            companyIds = ids;
         }
+        const fieldTypes = params.custom_property ? await loadContactPropertyDefinitions(projectId) : {};
+        const applyEstimateFilters = async (baseQuery) => {
+            let filtered = baseQuery;
+            if (params.lifecycle_stage)
+                filtered = filtered.eq('lifecycle_stage', params.lifecycle_stage);
+            if (params.min_score !== undefined)
+                filtered = filtered.gte('engagement_score', params.min_score);
+            if (params.max_score !== undefined)
+                filtered = filtered.lte('engagement_score', params.max_score);
+            if (params.source)
+                filtered = filtered.eq('source', params.source);
+            if (params.subscribed_after)
+                filtered = filtered.gte('created_at', `${params.subscribed_after}T00:00:00Z`);
+            if (params.subscribed_before)
+                filtered = filtered.lte('created_at', `${params.subscribed_before}T23:59:59Z`);
+            if (params.has_opened === true)
+                filtered = filtered.not('last_opened_at', 'is', null);
+            if (params.has_opened === false)
+                filtered = filtered.is('last_opened_at', null);
+            if (params.has_clicked === true)
+                filtered = filtered.not('last_clicked_at', 'is', null);
+            if (params.has_clicked === false)
+                filtered = filtered.is('last_clicked_at', null);
+            if (params.tag)
+                filtered = filtered.contains('tags', [params.tag]);
+            if (params.company_id)
+                filtered = filtered.eq('company_id', params.company_id);
+            if (companyIds)
+                filtered = filtered.in('company_id', companyIds);
+            if (params.custom_property) {
+                try {
+                    // #4270: the query runs as-is, so a filter it cannot express is an error, not dropped.
+                    const res = await applySegmentRules(filtered, { custom_property: params.custom_property }, db(), projectId, fieldTypes, { pushDownOnly: true });
+                    filtered = res.query;
+                }
+                catch (error) {
+                    if (isSegmentRulesError(error))
+                        return { query: filtered, error: toolError({ error: error.message, code: 'validation_failed' }) };
+                    throw error;
+                }
+            }
+            if (params.site_id) {
+                // Shared site filter: an inner join, not an id list that overflows past ~350 contacts (#3674).
+                // Deliberately everyone on the site, so allowEmpty.
+                const siteFiltered = await applySegmentRules(filtered, { site_id: params.site_id }, db(), projectId, {}, { allowEmpty: true });
+                if (siteFiltered.siteContactIds && siteFiltered.siteContactIds.length === 0) {
+                    return { query: siteFiltered.query, empty: true };
+                }
+                filtered = siteFiltered.query;
+            }
+            return { query: filtered };
+        };
+        let sampleBase = db()
+            .from('subscribers')
+            .select('id, email, first_name, last_name, engagement_score, lifecycle_stage, source, created_at, last_opened_at, last_clicked_at')
+            .eq('project_id', projectId)
+            .eq('global_unsubscribed', false);
+        const sampleFilterResult = await applyEstimateFilters(sampleBase);
+        if (sampleFilterResult.error)
+            return sampleFilterResult.error;
+        if (sampleFilterResult.empty)
+            return j({ total: 0, sample: [] });
+        let q = sampleFilterResult.query;
         const { data, error } = await q.order('engagement_score', { ascending: false }).limit(sampleSize);
         if (error)
             return dbErrorResult(error);
-        // Get full count separately
-        let countQ = db()
+        // Get full count separately using the exact same filters
+        let countBase = db()
             .from('subscribers')
             .select('id', { count: 'exact', head: true })
             .eq('project_id', projectId)
             .eq('global_unsubscribed', false);
-        if (params.lifecycle_stage)
-            countQ = countQ.eq('lifecycle_stage', params.lifecycle_stage);
-        if (params.min_score !== undefined)
-            countQ = countQ.gte('engagement_score', params.min_score);
-        if (params.max_score !== undefined)
-            countQ = countQ.lte('engagement_score', params.max_score);
-        if (params.source)
-            countQ = countQ.eq('source', params.source);
-        if (params.subscribed_after)
-            countQ = countQ.gte('created_at', `${params.subscribed_after}T00:00:00Z`);
-        if (params.subscribed_before)
-            countQ = countQ.lte('created_at', `${params.subscribed_before}T23:59:59Z`);
-        if (params.has_opened === true)
-            countQ = countQ.not('last_opened_at', 'is', null);
-        if (params.has_opened === false)
-            countQ = countQ.is('last_opened_at', null);
-        if (params.has_clicked === true)
-            countQ = countQ.not('last_clicked_at', 'is', null);
-        if (params.has_clicked === false)
-            countQ = countQ.is('last_clicked_at', null);
-        if (params.tag)
-            countQ = countQ.contains('tags', [params.tag]);
-        if (params.custom_property) {
-            ({ query: countQ } = await applySegmentRules(countQ, { custom_property: params.custom_property }, db(), projectId, fieldTypes, { pushDownOnly: true }));
-        }
-        // The total must count the same site the sample came from (#3674).
-        if (params.site_id)
-            ({ query: countQ } = await applySegmentRules(countQ, { site_id: params.site_id }, db(), projectId, {}, { allowEmpty: true }));
+        const countFilterResult = await applyEstimateFilters(countBase);
+        if (countFilterResult.error)
+            return countFilterResult.error;
+        if (countFilterResult.empty)
+            return j({ total: 0, sample: [] });
+        let countQ = countFilterResult.query;
         const { count, error: countError } = await countQ;
         if (countError)
             return dbErrorResult(countError);

package/build/tools/segments.js

@@ -248,14 +248,14 @@ export function registerSegmentTools(server) {
             if (error)
                 return dbErrorResult(error);
             if (!seg)
-                return txt('Error: segment not found');
+                return toolError({ error: 'Segment not found', code: 'not_found' });
             segRules = seg.rules;
         }
         else if (rules !== undefined) {
             segRules = rules;
         }
         else {
-            return txt('Provide either segment_id or rules.');
+            return toolError({ error: 'Provide either segment_id or rules.', code: 'validation_failed' });
         }
         let ids;
         try {

package/package.json

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