@sendinel/mcp-server 1.0.152 → 1.0.154

package/build/lib/approval-exempt.js

@@ -23,7 +23,6 @@ export const APPROVAL_EXEMPT = {
     approve_approval: "is the approval step itself: only a person-role OAuth connection can decide its own pending request, bound to that token and project, audited; sends nothing",
     approve_data_proposal: "turns a proposal into an AI draft for review; sends nothing",
     approve_draft: "marks a draft ready; sending still requires a gated send or activation",
-    cancel_approval: "only moves an unused approval to rejected (never grants anything); reduces what can run",
     cancel_send_queue_rows: "cancels queued mail before it sends; reduces sending",
     clone_campaign: "creates a draft copy of a campaign; nothing sends until activated (gated)",
     clone_sequence_template: "creates a draft campaign from a template; nothing sends until activated (gated)",

package/build/lib/approval-tool-decisions.js

@@ -22,8 +22,10 @@ async function clientName(fallback) {
 }
 export async function cancelApproval(approvalId, transportClientName) {
     const actor = requestContext();
-    if (!actor?.scopes?.some(scope => scope === 'write' || scope === 'admin')) {
-        return refuse('approval_forbidden', 'Cancelling an approval requires write scope.');
+    const canCancelProject = actor?.scopes?.some(scope => scope === 'write' || scope === 'admin');
+    const ownTokenId = actor?.authKind === 'oauth' && actor.scopes?.includes('read') ? actor.oauthTokenId : null;
+    if (!actor || (!canCancelProject && !ownTokenId)) {
+        return refuse('approval_forbidden', 'Cancellation requires write scope or the requesting OAuth token.');
     }
     try {
         const projectId = getProjectId();
@@ -31,13 +33,17 @@ export async function cancelApproval(approvalId, transportClientName) {
         const now = new Date().toISOString();
         // A single conditional write arbitrates cancellation versus approval/consumption.
         // Preserve the original decision provenance; cancellation never grants authority.
-        const { data, error } = await store().from('action_approvals')
+        const cancellation = store().from('action_approvals')
             .update({ status: 'rejected' })
             .eq('id', approvalId).eq('project_id', projectId)
-            .in('status', ['pending', 'approved']).is('used_at', null).gt('expires_at', now)
-            .select('id').maybeSingle();
+            .in('status', ['pending', 'approved']).is('used_at', null).gt('expires_at', now);
+        // Ownership is part of the write, so concurrent changes cannot cross tokens.
+        const bound = canCancelProject ? cancellation : cancellation.eq('oauth_token_id', ownTokenId);
+        const { data, error } = await bound.select('id').maybeSingle();
         if (error)
             return refuse('approval_update_failed', 'Unable to cancel the approval. Check its status before retrying.');
+        if (!data && !canCancelProject)
+            return refuse('approval_forbidden', 'No cancellable approval for this OAuth token in this project.');
         if (!data)
             return refuse('approval_not_cancellable', 'No unexpired, unused pending or approved approval found in this project.');
         const { error: auditError } = await store().from('audit_log').insert({

package/build/server.js

@@ -88,7 +88,7 @@ export const ALL_TOOL_GROUPS = Object.keys(GROUP_REGISTRY);
 // ── Scope enforcement ─────────────────────────────────────────────────────
 // Maps tool names to required scope. Mirrors dashboard's WRITE_TOOLS/ADMIN_TOOLS.
 const WRITE_TOOLS = new Set([
-    'cancel_approval', 'approve_approval',
+    'approve_approval',
     'recheck_domain_dns',
     'mark_agent_message', 'draft_agent_reply', 'create_agent_mailbox',
     'add_subscriber', 'identify_subscriber', 'emit_contact_event', 'import_subscribers', 'update_subscriber', 'bulk_update_subscribers',
@@ -188,7 +188,6 @@ export function testerConnectionAllowsTool(name) {
     // Retain the existing campaign activation path. A globally gated tool is not by itself
     // permission for a tester: sends, deletes and access/infrastructure writes stay refused.
     return getRequiredScope(name) === 'read'
-        || name === 'cancel_approval'
         || TESTER_REQUEST_TOOLS.has(name)
         || name === 'activate_campaigns'
         || name === 'update_campaign_status';
@@ -324,7 +323,7 @@ function createScopeProxy(server, scopes, toolGroup, allowedTools) {
                         const required = getRequiredScope(name);
                         const tester = isTesterConnection(scopes);
                         const agent = isAgentConnection(scopes);
-                        const allowed = () => name === 'cancel_approval' ? scopeAllows(scopes, 'write') : agent ? agentConnectionAllowsTool(name) : tester
+                        const allowed = () => agent ? agentConnectionAllowsTool(name) : tester
                             ? testerConnectionAllowsTool(name)
                             : scopeAllows(scopes, required) || (scopeAllows(scopes, 'read') && isHumanRequestableAdminTool(name));
                         if (!allowed()) {

package/build/tools/approvals.js

@@ -11,7 +11,7 @@ const j = (data) => txt(JSON.stringify(data, null, 2));
 export function registerApprovalTools(server, options) {
     server.registerTool('cancel_approval', {
         title: 'Cancel Approval',
-        description: 'Cancel an unexpired, unused pending or approved action approval in this project. Requires write scope. Sets it to rejected; cannot approve or undo cancellation.',
+        description: 'Cancel an unexpired, unused pending or approved action approval in this project. Read-scoped OAuth connections can cancel only their own token’s requests; write/admin credentials can cancel any eligible request in this project. Sets it to rejected; cannot approve or undo cancellation.',
         annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
         inputSchema: { approval_id: z.string().uuid() },
     }, async ({ approval_id }) => {

package/build/tools/contacts.js

@@ -2,7 +2,7 @@ import { normalizeTagInput, tagInputWarnings } from '../lib/tags.js';
 import { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { CONTACT_ENRICHMENT_PROVIDERS } from '@desler/models';
 import { createContactEnrichmentAdapters, enrichContactFromConnections, } from '@desler/models/contact-enrichment';
-import { buildPreviewAttentionEnvelope, applySegmentRules, isSegmentRulesError, ContactPropertyAnomalyLogger, normalizeContactProperties, getAttentionDecision, getContactNeighborhood, getScheduledTouches, findContactDuplicateGroups, readAllPages, readAllRows, chunkIds, } from '@sendinel/domain';
+import { buildPreviewAttentionEnvelope, applySegmentRules, isSegmentRulesError, ContactPropertyAnomalyLogger, normalizeContactProperties, validateContactPropertyPatch, getAttentionDecision, getContactNeighborhood, getScheduledTouches, findContactDuplicateGroups, readAllPages, readAllRows, chunkIds, } from '@sendinel/domain';
 import { z } from 'zod';
 import { callSendinelV1 } from '../lib/v1-client.js';
 import { db, projectClientForWriteback } from '../db.js';
@@ -45,22 +45,6 @@ const CUSTOM_FIELD_COLUMNS = 'id, key, label, type, required, options, display_o
 async function registeredCustomFields(projectId) {
     return readAllRows(db().from('custom_field_definitions').select(CUSTOM_FIELD_COLUMNS).eq('project_id', projectId));
 }
-function keyDistance(left, right) {
-    let row = Array.from({ length: right.length + 1 }, (_, index) => index);
-    for (let i = 0; i < left.length; i++) {
-        const next = [i + 1];
-        for (let j = 0; j < right.length; j++)
-            next.push(Math.min(next[j] + 1, row[j + 1] + 1, row[j] + (left[i] === right[j] ? 0 : 1)));
-        row = next;
-    }
-    return row[right.length];
-}
-function unknownCustomPropertyWarnings(patch, fields) {
-    return Object.keys(patch).filter(key => !Object.hasOwn(fields, key)).map(key => {
-        const near = Object.keys(fields).filter(known => keyDistance(key, known) <= 2);
-        return `Unknown custom property "${key}"${near.length ? `; did you mean ${near.map(value => `"${value}"`).join(' or ')}?` : '; no registered definition'}`;
-    });
-}
 const SUBSCRIBER_VIEW_MAX_NAME_LENGTH = 100;
 const SUBSCRIBER_VIEW_MAX_COLUMNS = 150;
 const SUBSCRIBER_VIEW_KEY_RE = /^[a-zA-Z0-9_.:-]{1,160}$/;
@@ -1836,21 +1820,10 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                     return j({ error: 'Custom field definitions unavailable; update not performed', code: 'INTERNAL_ERROR' });
                 }
                 fields = Object.fromEntries(definitions.map(field => [field.key, field]));
-                const values = Object.fromEntries(Object.entries(custom_properties).filter(([, value]) => value !== null));
-                const invalidShape = Object.entries(values).find(([key, value]) => {
-                    if (!Object.hasOwn(fields, key))
-                        return false;
-                    const type = fields[key].type;
-                    if (type === 'multi_select')
-                        return typeof value !== 'string' && (!Array.isArray(value) || value.some(item => typeof item !== 'string'));
-                    return typeof value === 'object' && type !== 'contact_reference';
-                });
-                const { anomalies } = normalizeContactProperties(values, { fields });
-                if (invalidShape || anomalies.length) {
-                    const key = invalidShape?.[0] ?? anomalies[0].key;
-                    return contactInputError('validation_failed', `custom_properties.${key} does not match its registered ${fields[key].type} definition or options`);
-                }
-                propertyWarnings = unknownCustomPropertyWarnings(custom_properties, fields);
+                const validation = validateContactPropertyPatch(custom_properties, fields);
+                if (validation.error)
+                    return contactInputError('validation_failed', validation.error);
+                propertyWarnings = validation.warnings;
             }
             const embedOk = await hasCompaniesEmbed(projectId);
             const updates = {};

package/package.json

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