@sendinel/mcp-server 1.0.21 → 1.0.23

package/build/tools/contacts.js

@@ -2283,82 +2283,47 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
         },
     }, async ({ site_id }) => {
         const projectId = getProjectId();
-        // Sample recent contacts to discover keys (LIMIT 500 is enough for schema discovery)
-        const { data, error } = await db().rpc('get_contact_schema_keys', {
-            p_project_id: projectId,
-            p_site_id: site_id,
-        });
-        if (error) {
-            // Fallback: inline query if RPC not yet available
-            const SCHEMA_SAMPLE_LIMIT = 500;
-            async function sampleSubscriberProperties(scopeToSite) {
-                let query = db()
-                    .from('subscribers')
-                    .select('custom_properties')
-                    .eq('project_id', projectId)
-                    .not('custom_properties', 'is', null)
-                    .order('created_at', { ascending: false });
-                if (scopeToSite)
-                    query = query.eq('source_site', site_id);
-                return query.limit(SCHEMA_SAMPLE_LIMIT);
-            }
-            const siteSample = await sampleSubscriberProperties(true);
-            if (siteSample.error)
-                return txt(`Error: ${siteSample.error.message}`);
-            let rows = siteSample.data ?? [];
-            let scope = 'site';
-            if (rows.length === 0) {
-                const projectSample = await sampleSubscriberProperties(false);
-                if (projectSample.error)
-                    return txt(`Error: ${projectSample.error.message}`);
-                rows = projectSample.data ?? [];
-                scope = 'project';
-            }
-            const keyMap = new Map();
-            for (const row of rows ?? []) {
-                const props = row.custom_properties;
-                if (!props)
-                    continue;
-                for (const [k, v] of Object.entries(props)) {
-                    if (!keyMap.has(k))
-                        keyMap.set(k, { values: new Set(), count: 0 });
-                    const entry = keyMap.get(k);
-                    entry.count++;
-                    if (v !== null && v !== undefined && entry.values.size < 3) {
-                        entry.values.add(String(v));
-                    }
-                }
-            }
-            const schema = Array.from(keyMap.entries())
-                .sort((a, b) => b[1].count - a[1].count)
-                .map(([key, { values, count }]) => ({
-                key,
-                merge_tag: `{{custom.${key}}}`,
-                merge_tag_with_fallback: `{{custom.${key}|fallback}}`,
-                example_values: Array.from(values),
-                contacts_with_this_key: count,
-            }));
-            return j({
-                site_id,
-                scope,
-                total_keys: schema.length,
-                schema,
-                note: scope === 'project'
-                    ? `No contacts are tagged to site ${site_id} via source_site — sampled custom_properties across the whole project instead. Use merge_tag syntax in email body/subject. For sensitive data, add a fallback: {{custom.plan|subscriber}}. ⚠️ custom_properties data passes through the Anthropic API — avoid storing sensitive PII (SSNs, passwords, financial account numbers).`
-                    : 'Use merge_tag syntax in email body/subject. For sensitive data, add a fallback: {{custom.plan|subscriber}}. ⚠️ custom_properties data passes through the Anthropic API — avoid storing sensitive PII (SSNs, passwords, financial account numbers).',
+        async function loadSchemaKeys(siteScope) {
+            const { data, error } = await db().rpc('get_contact_schema_keys', {
+                p_project_id: projectId,
+                ...(siteScope ? { p_site_id: siteScope } : {}),
             });
+            if (error)
+                return { error: `Error: ${error.message}` };
+            const result = (Array.isArray(data) ? data[0] : data);
+            if (typeof result?.has_membership !== 'boolean' || !Array.isArray(result.keys)) {
+                return { error: 'Error: get_contact_schema_keys returned an unreadable result' };
+            }
+            return result;
         }
+        // Site membership is hybrid (#3489): subscribers.source_site OR a site_subscriptions
+        // row, counted once. A real site whose members have no custom_properties yet is still
+        // site-scoped; project scope is only for a site with no members at all.
+        let loaded = await loadSchemaKeys(site_id);
+        if ('error' in loaded)
+            return txt(loaded.error);
+        let scope = 'site';
+        if (!loaded.has_membership) {
+            loaded = await loadSchemaKeys(null);
+            if ('error' in loaded)
+                return txt(loaded.error);
+            scope = 'project';
+        }
+        const schema = loaded.keys.map(({ key, contacts_with_this_key, example_values }) => ({
+            key,
+            merge_tag: `{{custom.${key}}}`,
+            merge_tag_with_fallback: `{{custom.${key}|fallback}}`,
+            example_values,
+            contacts_with_this_key,
+        }));
         return j({
             site_id,
-            total_keys: data.length,
-            schema: data.map(r => ({
-                key: r.key,
-                merge_tag: `{{custom.${r.key}}}`,
-                merge_tag_with_fallback: `{{custom.${r.key}|fallback}}`,
-                example_values: r.examples ?? [],
-                contacts_with_this_key: r.count,
-            })),
-            note: 'Use merge_tag syntax in email body/subject. For sensitive data, add a fallback: {{custom.plan|subscriber}}. ⚠️ custom_properties data passes through the Anthropic API — avoid storing sensitive PII (SSNs, passwords, financial account numbers).',
+            scope,
+            total_keys: schema.length,
+            schema,
+            note: scope === 'project'
+                ? `No contacts are linked to site ${site_id} via source_site or site_subscriptions — read custom_properties across the whole project instead. Use merge_tag syntax in email body/subject. For sensitive data, add a fallback: {{custom.plan|subscriber}}. ⚠️ custom_properties data passes through the Anthropic API — avoid storing sensitive PII (SSNs, passwords, financial account numbers).`
+                : 'Use merge_tag syntax in email body/subject. For sensitive data, add a fallback: {{custom.plan|subscriber}}. ⚠️ custom_properties data passes through the Anthropic API — avoid storing sensitive PII (SSNs, passwords, financial account numbers).',
         });
     });
     server.registerTool('create_custom_field', {

package/package.json

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