@sendinel/mcp-server 1.0.153 → 1.0.155

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/lib/tester-requests.js

@@ -10,9 +10,9 @@ import { TESTER_SITE_FIELDS } from './tester-policy.js';
 const text = (message) => ({ content: [{ type: 'text', text: message }] });
 /** Only installed for an authenticated tester connection, never selected by tool arguments. */
 export function testerRequestTool(action, config, handler) {
-    const original = z.object(config.inputSchema);
+    const original = config.inputSchema instanceof z.ZodObject ? config.inputSchema : z.object(config.inputSchema);
     // Wrapping before optional prevents Zod defaults from populating an approval-id-only retry.
-    const inputSchema = Object.fromEntries(Object.entries(config.inputSchema).map(([key, schema]) => [key, z.preprocess(value => value, schema).optional()]));
+    const inputSchema = Object.fromEntries(Object.entries(original.shape).map(([key, schema]) => [key, z.preprocess(value => value, schema).optional()]));
     inputSchema.approval_id = z.string().uuid().optional();
     return {
         config: { ...config, inputSchema },

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/campaigns.js

@@ -1,4 +1,4 @@
-import { validateStepMultiEventRules, stepMultiEventRulesView } from "@sendinel/domain";
+import { validateStepMultiEventRules, stepMultiEventRulesView, validateStepAbsenceRule, stepAbsenceRuleView } from "@sendinel/domain";
 import { readCampaignMetricGroups, SENT_STATUSES } from "@sendinel/domain";
 import { resolveCampaignReentry, readCampaignPeriods, campaignPeriodFields } from "@sendinel/domain";
 import { CAMPAIGN_BRANCH_CONDITIONS, campaignBranchConditionValue, isContactPropertyConditionList, STEP_PROPERTY_CONDITIONS_ERROR, validateStepPropertyRules } from "@sendinel/domain";
@@ -47,6 +47,12 @@ const multiEventFields = {
     send_only_if_events: z.array(z.string().trim().min(1)).min(1).max(10).nullable().optional().describe('Required events at send time, ALL by default; null clears. ANDed with legacy gates.'),
     send_only_if_events_mode: z.enum(['all', 'any']).nullable().optional().describe('Required-event list mode; omitted/null defaults to all on new steps. Omission preserves the mode on updates.'),
 };
+const absenceFields = {
+    send_only_if_no_event: z.string().trim().min(1).nullable().optional().describe('Send only if this event has NOT occurred in the last send_only_if_no_event_days days at send time. Supply both fields together; two nulls clear.'),
+    send_only_if_no_event_days: z.number().int().min(1).max(365).nullable().optional().describe('Rolling lookback in days (1–365), independent of enrollment/cycle bounds. Supply with send_only_if_no_event; two nulls clear.'),
+};
+const absencePairValid = (input) => validateStepAbsenceRule(input).ok;
+const absencePairError = 'send_only_if_no_event and send_only_if_no_event_days must both be set or both null';
 function stripHtml(value) {
     return value
         .replace(/<style[\s\S]*?<\/style>/gi, ' ')
@@ -884,7 +890,7 @@ export function registerCampaignTools(server) {
             openWorldHint: false,
         },
         description: 'Add an email step to a campaign. Requires a non-blank subject and body_html, body_text, or blocks that render to content. For A/B testing, add multiple steps with the same step_order but different variant_label values.',
-        inputSchema: {
+        inputSchema: z.object({
             campaign_id: z.string().uuid(),
             step_order: z.number().int().min(0).describe('Position in sequence (0 = first)'),
             subject: z.string().min(1),
@@ -899,11 +905,15 @@ export function registerCampaignTools(server) {
             skip_if_property: propertyConditions.describe('Skip when ALL 1–10 conditions match current custom_properties. Missing/null keys never match. null clears.'),
             send_only_if_property: propertyConditions.describe('Send only when ALL 1–10 conditions match current custom_properties. Unknown/non-match skips. null clears.'),
             ...multiEventFields,
+            ...absenceFields,
             skip_if_event: z.string().trim().min(1).optional().describe('Skip this step at send time if the contact already has an event with this name; the journey continues.'),
             send_only_if_event: z.string().trim().min(1).optional().describe('Send this step only if the contact has an event with this name by send time; otherwise skip it and continue the journey.'),
-        },
-    }, async ({ campaign_id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, variant_label, survey_id, brand_asset_ids, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, skip_if_property, send_only_if_property }) => {
+        }).refine(absencePairValid, { message: absencePairError }),
+    }, async ({ campaign_id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, variant_label, survey_id, brand_asset_ids, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, send_only_if_no_event, send_only_if_no_event_days, skip_if_property, send_only_if_property }) => {
         try {
+            const absence = validateStepAbsenceRule({ send_only_if_no_event, send_only_if_no_event_days });
+            if (!absence.ok)
+                return j({ error: absence.error, code: 'INVALID_INPUT' });
             const events = validateStepMultiEventRules({ skip_if_events, send_only_if_events, send_only_if_events_mode });
             if (!events.ok)
                 return j({ error: events.error, code: 'INVALID_INPUT' });
@@ -943,7 +953,7 @@ export function registerCampaignTools(server) {
             const renderedText = body_text !== undefined && survey_id ? renderTemplateVars(body_text, renderVars) : body_text;
             const { data, error } = await db()
                 .from('campaign_steps')
-                .insert({ campaign_id, step_order, subject: renderedSubject, body_html: renderedHtml, body_text: renderedText ?? (normalizedBlocks?.length ? blocksToText(normalizedBlocks) : undefined), blocks: normalizedBlocks ?? null, delay_days, delay_hours, variant_label: variant_label ?? 'A', skip_if_event: skip_if_event ?? null, send_only_if_event: send_only_if_event ?? null, ...events.rules, ...properties.rules })
+                .insert({ campaign_id, step_order, subject: renderedSubject, body_html: renderedHtml, body_text: renderedText ?? (normalizedBlocks?.length ? blocksToText(normalizedBlocks) : undefined), blocks: normalizedBlocks ?? null, delay_days, delay_hours, variant_label: variant_label ?? 'A', skip_if_event: skip_if_event ?? null, send_only_if_event: send_only_if_event ?? null, ...events.rules, ...absence.rules, ...properties.rules })
                 .select()
                 .single();
             if (error)
@@ -3125,6 +3135,7 @@ Return ONLY valid JSON with this exact shape:
             trigger_config: z.record(z.string(), z.unknown()).nullable().optional().describe('Event/tag lists with optional where filter, or date_field/contact_event configuration.'),
             steps: z.array(z.object({
                 ...multiEventFields,
+                ...absenceFields,
                 skip_if_event: z.string().trim().min(1).nullable().optional(),
                 send_only_if_event: z.string().trim().min(1).nullable().optional(),
                 subject: z.string().min(1).describe('Email subject line'),
@@ -3133,7 +3144,7 @@ Return ONLY valid JSON with this exact shape:
                 blocks: z.array(z.record(z.string(), z.unknown())).optional().describe('Optional structured Composer blocks that produced body_html.'),
                 delay_days: z.number().int().min(0).optional().default(0),
                 delay_hours: z.number().int().min(0).max(23).optional().default(0),
-            })).min(1).describe('Email steps with pre-built content'),
+            }).refine(absencePairValid, { message: absencePairError })).min(1).describe('Email steps with pre-built content'),
             segment_id: z.string().uuid().optional().describe('Segment to auto-enroll. Optional for triggered campaigns; future trigger matches enroll contacts.'),
             sends_per_hour: z.number().int().min(1).nullable().optional().describe('Optional hourly send cap for wave sending. Null or omitted sends without a campaign-specific cap.'),
             activate: z.boolean().optional().default(false).describe('Set to true to activate immediately after creation. Requires segment_id or a configured triggered campaign.'),
@@ -3142,10 +3153,13 @@ Return ONLY valid JSON with this exact shape:
         },
     }, async ({ site_id, name, type, steps, segment_id, sends_per_hour, activate, confirmed, approval_id, trigger_event_name, trigger_tag, trigger_type, trigger_config, send_class, unsub_footer_template, reentry_mode, period_key }) => {
         for (const step of steps) {
+            const absence = validateStepAbsenceRule(step);
+            if (!absence.ok)
+                return j({ error: absence.error, code: 'INVALID_INPUT' });
             const events = validateStepMultiEventRules(step);
             if (!events.ok)
                 return j({ error: events.error, code: 'INVALID_INPUT' });
-            Object.assign(step, events.rules);
+            Object.assign(step, events.rules, absence.rules);
         }
         const footerTemplate = unsub_footer_template?.trim() ?? null;
         if (footerTemplate !== null) {
@@ -3226,6 +3240,7 @@ Return ONLY valid JSON with this exact shape:
                     skip_if_event: s.skip_if_event ?? null,
                     send_only_if_event: s.send_only_if_event ?? null,
                     ...stepMultiEventRulesView(s),
+                    ...stepAbsenceRuleView(s),
                 })),
                 segment_id: segment_id ?? null,
                 sends_per_hour: sends_per_hour ?? null,
@@ -3267,6 +3282,7 @@ Return ONLY valid JSON with this exact shape:
             skip_if_event: s.skip_if_event ?? null,
             send_only_if_event: s.send_only_if_event ?? null,
             ...stepMultiEventRulesView(s),
+            ...stepAbsenceRuleView(s),
         }));
         const { error: stepErr } = await db()
             .from('campaign_steps')
@@ -3364,7 +3380,7 @@ Return ONLY valid JSON with this exact shape:
             return j({ error: (campaignErr ? dbToolError(campaignErr).error : undefined) ?? 'Campaign not found', code: 'NOT_FOUND' });
         const { data, error } = await db()
             .from('campaign_steps')
-            .select('id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, skip_if_property, send_only_if_property, created_at, updated_at')
+            .select('id, step_order, subject, body_html, body_text, blocks, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, send_only_if_no_event, send_only_if_no_event_days, skip_if_property, send_only_if_property, created_at, updated_at')
             .eq('campaign_id', campaign_id)
             .order('step_order', { ascending: true });
         if (error)
@@ -3380,7 +3396,7 @@ Return ONLY valid JSON with this exact shape:
             openWorldHint: false,
         },
         description: 'Update a campaign step — change subject, body, delay, or step_order.',
-        inputSchema: {
+        inputSchema: z.object({
             step_id: z.string().uuid(),
             subject: z.string().optional(),
             body_html: z.string().optional(),
@@ -3393,6 +3409,7 @@ Return ONLY valid JSON with this exact shape:
             skip_if_property: propertyConditions.describe('Skip when ALL 1–10 conditions match current custom_properties. Missing/null keys never match. null clears.'),
             send_only_if_property: propertyConditions.describe('Send only when ALL 1–10 conditions match current custom_properties. Unknown/non-match skips. null clears.'),
             ...multiEventFields,
+            ...absenceFields,
             skip_if_event: z.string().trim().min(1).nullable().optional().describe('Event name that skips this step at send time; null clears the rule.'),
             send_only_if_event: z.string().trim().min(1).nullable().optional().describe('Event required for this step to send; null clears the rule.'),
             link_actions: z.array(z.discriminatedUnion('action', [
@@ -3405,10 +3422,13 @@ Return ONLY valid JSON with this exact shape:
                     continue_url: z.string().url().max(500).optional().describe('Optional http(s) link shown on the thank-you page.'),
                 }),
             ])).max(10).optional().describe('Link actions for this step. set_property links show a Confirm page; only the Confirm click writes the property (last click wins). Replaces the whole list.'),
-        },
+        }).refine(absencePairValid, { message: absencePairError }),
     }, async ({ step_id, ...updates }) => {
         const projectId = getProjectId();
         const { survey_id, ...stepUpdates } = updates;
+        const absence = validateStepAbsenceRule(stepUpdates);
+        if (!absence.ok)
+            return j({ error: absence.error, code: 'INVALID_INPUT' });
         const events = validateStepMultiEventRules(stepUpdates);
         if (!events.ok)
             return j({ error: events.error, code: 'INVALID_INPUT' });
@@ -3441,6 +3461,7 @@ Return ONLY valid JSON with this exact shape:
         const renderedUpdates = {
             ...stepUpdates,
             ...events.rules,
+            ...absence.rules,
             ...(normalizedBlocks !== undefined ? { blocks: normalizedBlocks.length ? normalizedBlocks : null } : {}),
             ...(normalizedBlocks?.length && stepUpdates.body_html === undefined ? { body_html: blocksToHtml(normalizedBlocks) } : {}),
             ...(normalizedBlocks?.length && stepUpdates.body_text === undefined ? { body_text: blocksToText(normalizedBlocks) } : {}),
@@ -3452,7 +3473,7 @@ Return ONLY valid JSON with this exact shape:
             .from('campaign_steps')
             .update({ ...renderedUpdates, updated_at: new Date().toISOString() })
             .eq('id', step_id)
-            .select('id, step_order, subject, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, skip_if_property, send_only_if_property, updated_at')
+            .select('id, step_order, subject, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_events, send_only_if_events, send_only_if_events_mode, send_only_if_no_event, send_only_if_no_event_days, skip_if_property, send_only_if_property, updated_at')
             .single();
         if (error)
             return j(dbToolError(error));
@@ -3830,7 +3851,7 @@ Return ONLY valid JSON with this exact shape:
             total_sent: periods?.totals?.sent ?? sentCount ?? 0,
             ...(periods?.totals ? { unique_opened: periods.totals.opened, unique_clicked: periods.totals.clicked } : {}),
             ...campaignPeriodFields(periods, period),
-            steps: (steps ?? []).map((step) => ({ ...step, ...stepMultiEventRulesView(step), total_sent: stepMetrics.sent.get(step.id) ?? 0 })),
+            steps: (steps ?? []).map((step) => ({ ...step, ...stepMultiEventRulesView(step), ...stepAbsenceRuleView(step), total_sent: stepMetrics.sent.get(step.id) ?? 0 })),
             active_enrollments: enrollCount ?? 0,
             send_incomplete: queuedCount > 0 || failedCount > 0 || outstandingRows.length > 0 || unresolvedCount > 0,
             queued_email_count: queuedCount,

package/package.json

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