@sendinel/mcp-server 1.0.213 → 1.0.214

package/build/tools/connector.js

@@ -178,6 +178,7 @@ export function registerConnectorTools(server) {
             return j({ error: tableError instanceof Error ? dbToolError(tableError).error : 'Could not list database tables' });
         }
     });
+    // No approval preflight (#4550): this tool has no target row to reject.
     server.registerTool('install_connector_schema', {
         title: 'Install Connector Schema',
         annotations: {
@@ -195,6 +196,7 @@ export function registerConnectorTools(server) {
         const result = await callConnectorApi('/api/dashboard/connector/schema/install', { method: 'POST' });
         return j(result.ok ? result.data : { error: result.error });
     });
+    // No approval preflight (#4550): this tool has no target row to reject.
     server.registerTool('install_connector_view', {
         title: 'Install Connector Live View',
         annotations: {
@@ -223,6 +225,7 @@ export function registerConnectorTools(server) {
         });
         return j(result.ok ? result.data : { error: result.error });
     });
+    // No approval preflight (#4550): mapping is validated by the dashboard route only after this gate.
     server.registerTool('set_connector_mapping', {
         title: 'Set Connector Mapping',
         annotations: {
@@ -271,6 +274,7 @@ export function registerConnectorTools(server) {
         });
         return j(result.ok ? result.data : { error: result.error });
     });
+    // No approval preflight (#4550): this tool has no target row to reject.
     server.registerTool('resync_connector', {
         title: 'Resync Connector Contacts',
         annotations: {

package/build/tools/contacts.js

@@ -2437,6 +2437,8 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             return dbErrorResult(countError);
         return j({ total: count ?? (data ?? []).length, sample: data ?? [] });
     });
+    // No approval preflight (#4550): nothing here rejects a missing target. An unknown site_id
+    // returns an empty inactive list, and the approval binds that computed preview.
     server.registerTool('identify_inactive', {
         title: 'Identify Inactive',
         annotations: {
@@ -2679,6 +2681,8 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
         // total_groups counts every group found; groups_truncated says when limit cut the list.
         return j({ duplicate_groups: result, total_groups: groups.length, groups_truncated: groups.length > result.length, coverage });
     });
+    // No approval preflight (#4550): a missing target or source is not rejected. The preview uses
+    // target?.email, and the post-approval path calls rpc merge_subscribers with no not-found refusal.
     server.registerTool('merge_subscribers', {
         title: 'Merge Subscribers',
         annotations: {

package/build/tools/data.js

@@ -4,7 +4,7 @@ import { z } from 'zod';
 import { adminDb, db } from '../db.js';
 import { decrypt, encrypt } from '../crypto.js';
 import { normalizeActiveCampaignAccountUrl } from '../lib/url-validation.js';
-import { approvalPageUrl, assertChannelCanExecute, checkApproval, currentChannelContext, currentExecutingApprovalId, requestApproval, withApproval } from '../lib/action-approvals.js';
+import { approvalPageUrl, assertChannelCanExecute, checkApproval, currentChannelContext, currentExecutingApprovalId, registerApprovalPreflight, requestApproval, withApproval } from '../lib/action-approvals.js';
 import { getProjectId } from '../project.js';
 import { logAudit } from '../audit.js';
 import { dbToolError, deleteBlockedToolResult } from '../lib/db-error.js';
@@ -161,6 +161,82 @@ async function getPlatformProjectContext(client = adminDb(), orgId) {
         throw new Error('organization has no Supabase-auth user to own the connection');
     return { projectId, orgId: project.org_id, userId: userId };
 }
+/** Shared by the handler and the request-only preflight so the refusal text cannot drift. */
+async function lookupSavedCredential(credentialId, orgId) {
+    const parsed = parseSavedCredentialId(credentialId);
+    if (!parsed)
+        return { ok: false, result: j({ error: 'Invalid credential_id' }) };
+    const client = adminDb();
+    let context;
+    try {
+        context = await getPlatformProjectContext(client, orgId);
+    }
+    catch (error) {
+        // Same catch body the handler used. These are business refusals, not a preflight outage.
+        return {
+            ok: false,
+            result: j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to delete provider credential' }),
+        };
+    }
+    const table = parsed.source === 'platform' ? 'platform_connections' : 'import_jobs';
+    const columns = parsed.source === 'platform'
+        ? 'id, platform, display_name, status, is_active, created_at'
+        : 'id, provider, status, created_at, completed_at';
+    const { data: credential, error: credentialErr } = await client
+        .schema('email')
+        .from(table)
+        .select(columns)
+        .eq('id', parsed.rowId)
+        .eq('org_id', context.orgId)
+        .eq('project_id', context.projectId)
+        .maybeSingle();
+    if (credentialErr)
+        return { ok: false, result: j(dbToolError(credentialErr)), dbError: credentialErr };
+    if (!credential)
+        return { ok: false, result: j({ error: 'Credential not found' }) };
+    return { ok: true, parsed, credential, context, client };
+}
+async function findActiveCustomWebhook(connectionId) {
+    const client = adminDb();
+    const projectId = getProjectId();
+    const { data: connection, error: lookupError } = await client
+        .schema('email')
+        .from('platform_connections')
+        .select('id, project_id, display_name, config')
+        .eq('id', connectionId)
+        .eq('project_id', projectId)
+        .eq('platform', 'custom')
+        .eq('is_active', true)
+        .maybeSingle();
+    return { client, projectId, connection, lookupError };
+}
+// Confirmed is not consulted. The outer request-only gate runs before the handler's
+// preview, so the target must exist in this project on the first call as well as on replay.
+async function deleteProviderCredentialPreflight(params) {
+    const credentialId = typeof params.credential_id === 'string' ? params.credential_id : '';
+    const orgId = typeof params.org_id === 'string' ? params.org_id : undefined;
+    const found = await lookupSavedCredential(credentialId, orgId);
+    if (!found.ok) {
+        if (found.dbError)
+            throw found.dbError;
+        return found.result;
+    }
+    return undefined;
+}
+async function rotateCustomWebhookSecretPreflight(params) {
+    const connectionId = typeof params.connection_id === 'string' ? params.connection_id : '';
+    const { connection, lookupError } = await findActiveCustomWebhook(connectionId);
+    if (lookupError)
+        throw lookupError;
+    if (!connection)
+        return j({ error: 'Custom webhook not found' });
+    return undefined;
+}
+// Partial test doubles of action-approvals omit this export. Production always provides it.
+if (typeof registerApprovalPreflight === 'function') {
+    registerApprovalPreflight('delete_provider_credential', deleteProviderCredentialPreflight);
+    registerApprovalPreflight('rotate_custom_webhook_secret', rotateCustomWebhookSecretPreflight);
+}
 function createCampaignMigrationTotals(options) {
     return {
         contacts: { total: options.includeContacts ? 1 : 0, processed: 0 },
@@ -401,27 +477,10 @@ export function registerDataTools(server) {
         },
     }, async ({ org_id, credential_id, confirmed, approval_id }) => {
         try {
-            const parsed = parseSavedCredentialId(credential_id);
-            if (!parsed)
-                return j({ error: 'Invalid credential_id' });
-            const client = adminDb();
-            const context = await getPlatformProjectContext(client, org_id);
-            const table = parsed.source === 'platform' ? 'platform_connections' : 'import_jobs';
-            const columns = parsed.source === 'platform'
-                ? 'id, platform, display_name, status, is_active, created_at'
-                : 'id, provider, status, created_at, completed_at';
-            const { data: credential, error: credentialErr } = await client
-                .schema('email')
-                .from(table)
-                .select(columns)
-                .eq('id', parsed.rowId)
-                .eq('org_id', context.orgId)
-                .eq('project_id', context.projectId)
-                .maybeSingle();
-            if (credentialErr)
-                return j(dbToolError(credentialErr));
-            if (!credential)
-                return j({ error: 'Credential not found' });
+            const found = await lookupSavedCredential(credential_id, org_id);
+            if (!found.ok)
+                return found.result;
+            const { parsed, credential, context, client } = found;
             const provider = parsed.source === 'platform' ? credential.platform : credential.provider;
             const approvalParams = {
                 credential_id,
@@ -870,21 +929,12 @@ export function registerDataTools(server) {
         },
     }, async ({ connection_id, confirmed, approval_id }) => {
         try {
-            const client = adminDb();
-            const projectId = getProjectId();
-            const { data: connection, error: lookupError } = await client
-                .schema('email')
-                .from('platform_connections')
-                .select('id, project_id, display_name, config')
-                .eq('id', connection_id)
-                .eq('project_id', projectId)
-                .eq('platform', 'custom')
-                .eq('is_active', true)
-                .maybeSingle();
-            if (lookupError)
-                return j(dbToolError(lookupError));
-            if (!connection)
+            const lookedUp = await findActiveCustomWebhook(connection_id);
+            if (lookedUp.lookupError)
+                return j(dbToolError(lookedUp.lookupError));
+            if (!lookedUp.connection)
                 return j({ error: 'Custom webhook not found' });
+            const { client, projectId, connection } = lookedUp;
             if (!confirmed) {
                 return j({
                     confirmation_required: true,

package/build/tools/gdpr.js

@@ -3,11 +3,81 @@ import { z } from 'zod';
 import { db } from '../db.js';
 import { getProjectId } from '../project.js';
 import { logAudit } from '../audit.js';
-import { approvalSatisfied, assertChannelCanExecute, currentChannelContext, requestApproval, checkApproval } from '../lib/action-approvals.js';
+import { approvalSatisfied, assertChannelCanExecute, currentChannelContext, requestApproval, checkApproval, registerApprovalPreflight } from '../lib/action-approvals.js';
 import { dbToolError, deleteBlockedToolResult } from '../lib/db-error.js';
 import { subscriberBlockers } from '../lib/delete-blockers.js';
 const txt = (text) => ({ content: [{ type: 'text', text }] });
 const j = (data) => txt(JSON.stringify(data, null, 2));
+async function findSubscriberForDeletion(contactId) {
+    const { data, error } = await db()
+        .from('subscribers')
+        .select('id, email')
+        .eq('id', contactId)
+        .eq('project_id', getProjectId())
+        .maybeSingle();
+    return { contact: (data ?? null), error };
+}
+// A database error is not "missing". The handler still maps it to the old not-found text;
+// the preflight throws so the registration boundary reports internal_error and writes no approval.
+async function deleteSubscriberDataPreflight(params) {
+    const contactId = typeof params.contact_id === 'string' ? params.contact_id : '';
+    const { contact, error } = await findSubscriberForDeletion(contactId);
+    if (error)
+        throw error;
+    if (!contact)
+        return txt('Contact not found or does not belong to this project.');
+    return undefined;
+}
+async function loadCcpaRequest(requestId) {
+    const projectId = getProjectId();
+    const { data, error } = await db()
+        .from('compliance_requests')
+        .select('id, email, request_type, status, expires_at')
+        .eq('id', requestId)
+        .eq('project_id', projectId)
+        .eq('regulation', 'ccpa')
+        .maybeSingle();
+    return { projectId, request: (data ?? null), error };
+}
+function ccpaNotActionable(request) {
+    if (!request)
+        return 'CCPA request not found or does not belong to this project.';
+    if (request.status === 'completed' || request.status === 'expired') {
+        return `Request is already "${request.status}" and cannot be actioned further.`;
+    }
+    return undefined;
+}
+function ccpaNotReadyToComplete(request) {
+    if (request.status !== 'verified') {
+        return `Request must be "verified" before it can be completed (currently "${request.status}"). Call this tool with status: "verified" first.`;
+    }
+    return undefined;
+}
+// Only completed + delete requests the hand-written approval. status:'verified' updates the row
+// with no approval, and a non-delete completion does too. approvalSatisfied can skip the gate
+// only after those refusals, so this preflight refuses the same rows the handler refuses first.
+async function actionCcpaRequestPreflight(params) {
+    if (params.status !== 'completed')
+        return undefined;
+    const requestId = typeof params.request_id === 'string' ? params.request_id : '';
+    const { request, error } = await loadCcpaRequest(requestId);
+    if (error)
+        throw error;
+    const closed = ccpaNotActionable(request);
+    if (closed)
+        return txt(closed);
+    const notReady = ccpaNotReadyToComplete(request);
+    if (notReady)
+        return txt(notReady);
+    if (request.request_type !== 'delete')
+        return undefined;
+    return undefined;
+}
+// Partial test doubles of action-approvals omit this export. Production always provides it.
+if (typeof registerApprovalPreflight === 'function') {
+    registerApprovalPreflight('delete_subscriber_data', deleteSubscriberDataPreflight);
+    registerApprovalPreflight('action_ccpa_request', actionCcpaRequestPreflight);
+}
 export function registerGdprTools(server) {
     server.registerTool('delete_subscriber_data', {
         title: 'Delete Subscriber Data',
@@ -24,13 +94,9 @@ export function registerGdprTools(server) {
             approval_id: z.string().uuid().optional().describe('Required — get this by calling once without it, then have a human approve via dashboard.'),
         },
     }, async ({ contact_id, reason, approval_id }) => {
-        // Verify contact belongs to this project (defense in depth)
-        const { data: contact } = await db()
-            .from('subscribers')
-            .select('id, email')
-            .eq('id', contact_id)
-            .eq('project_id', getProjectId())
-            .maybeSingle();
+        // Verify contact belongs to this project (defense in depth). A lookup error stays
+        // the historical not-found text; the registered preflight reports it as internal_error.
+        const { contact } = await findSubscriberForDeletion(contact_id);
         if (!contact)
             return txt('Contact not found or does not belong to this project.');
         const approvalParams = { contact_id, email: contact.email, reason };
@@ -132,21 +198,14 @@ export function registerGdprTools(server) {
             approval_id: z.string().uuid().optional().describe('Required to complete a delete request after a human approves the summary in the dashboard.'),
         },
     }, async ({ request_id, status, approval_id }) => {
-        const projectId = getProjectId();
-        const { data: request, error: fetchErr } = await db()
-            .from('compliance_requests')
-            .select('id, email, request_type, status, expires_at')
-            .eq('id', request_id)
-            .eq('project_id', projectId)
-            .eq('regulation', 'ccpa')
-            .maybeSingle();
+        const { projectId, request, error: fetchErr } = await loadCcpaRequest(request_id);
         if (fetchErr)
             return txt(`Error: ${dbToolError(fetchErr).error}`);
+        const closed = ccpaNotActionable(request);
+        if (closed)
+            return txt(closed);
         if (!request)
             return txt('CCPA request not found or does not belong to this project.');
-        if (request.status === 'completed' || request.status === 'expired') {
-            return txt(`Request is already "${request.status}" and cannot be actioned further.`);
-        }
         if (status === 'verified') {
             if (request.status !== 'pending') {
                 return txt(`Request must be "pending" to verify (currently "${request.status}").`);
@@ -177,9 +236,9 @@ export function registerGdprTools(server) {
             });
             return j({ ok: true, request: data });
         }
-        if (request.status !== 'verified') {
-            return txt(`Request must be "verified" before it can be completed (currently "${request.status}"). Call this tool with status: "verified" first.`);
-        }
+        const notReady = ccpaNotReadyToComplete(request);
+        if (notReady)
+            return txt(notReady);
         if (request.request_type === 'delete') {
             const approvalParams = {
                 request_id,

package/build/tools/org.js

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { logAudit } from '../audit.js';
 import { adminDb, db } from '../db.js';
 import { getProjectId } from '../project.js';
-import { assertChannelCanExecute, checkApproval, currentChannelContext, requestApproval, withApproval } from '../lib/action-approvals.js';
+import { assertChannelCanExecute, checkApproval, currentChannelContext, registerApprovalPreflight, requestApproval, withApproval } from '../lib/action-approvals.js';
 import { callSendinelV1 } from '../lib/v1-client.js';
 import { dbToolError } from '../lib/db-error.js';
 import { checkPlanLimit } from '../plan-limits.js';
@@ -62,7 +62,7 @@ async function resolveCurrentOrgId(requestedOrgId) {
         .eq('id', getProjectId())
         .maybeSingle();
     if (error)
-        return { ok: false, ...dbToolError(error) };
+        return { ok: false, ...dbToolError(error), cause: error };
     if (!project?.org_id)
         return { ok: false, error: 'Project has no organization', code: 'NO_ORG' };
     if (requestedOrgId && requestedOrgId !== project.org_id) {
@@ -70,6 +70,46 @@ async function resolveCurrentOrgId(requestedOrgId) {
     }
     return { ok: true, orgId: project.org_id };
 }
+/** Shared by the handler and the request-only preflight so the refusal text cannot drift. */
+async function lookupOrgMember(userId, orgId) {
+    const context = await resolveCurrentOrgId(orgId);
+    if (!context.ok) {
+        const dbError = 'cause' in context ? context.cause : undefined;
+        return { ok: false, result: j({ error: context.error, code: context.code }), dbError };
+    }
+    const { data: member, error: memberErr } = await db()
+        .from('org_members')
+        .select('id, user_id, role')
+        .eq('org_id', context.orgId)
+        .eq('user_id', userId)
+        .maybeSingle();
+    if (memberErr)
+        return { ok: false, result: j(dbToolError(memberErr)), dbError: memberErr };
+    if (!member)
+        return { ok: false, result: j({ error: 'Member not found', code: 'NOT_FOUND' }) };
+    return { ok: true, orgId: context.orgId, member: member };
+}
+function preflightOrgId(params) {
+    return typeof params.org_id === 'string' ? params.org_id : undefined;
+}
+// Existence and org ownership are checked whether or not confirmed is present (schema default
+// false). The last-owner refusal runs only after confirmed=true in the handler. Applying it
+// here would refuse an unconfirmed request-only call that currently receives an approval request.
+async function teamMemberTargetPreflight(params) {
+    const userId = typeof params.user_id === 'string' ? params.user_id : '';
+    const found = await lookupOrgMember(userId, preflightOrgId(params));
+    if (!found.ok) {
+        if (found.dbError)
+            throw found.dbError;
+        return found.result;
+    }
+    return undefined;
+}
+// Partial test doubles of action-approvals omit this export. Production always provides it.
+if (typeof registerApprovalPreflight === 'function') {
+    registerApprovalPreflight('remove_team_member', teamMemberTargetPreflight);
+    registerApprovalPreflight('set_team_member_role', teamMemberTargetPreflight);
+}
 function normalizeHost(host) {
     if (!host)
         return null;
@@ -208,33 +248,24 @@ export function registerOrgTools(server) {
             approval_id: z.string().uuid().optional().describe('Approval token from a previous confirmed call without approval_id. Required when the action is not autonomous.'),
         },
     }, async ({ user_id, org_id, confirmed, approval_id }) => {
-        const context = await resolveCurrentOrgId(org_id);
-        if (!context.ok)
-            return j({ error: context.error, code: context.code });
-        const { data: member, error: memberErr } = await db()
-            .from('org_members')
-            .select('id, user_id, role')
-            .eq('org_id', context.orgId)
-            .eq('user_id', user_id)
-            .maybeSingle();
-        if (memberErr)
-            return j(dbToolError(memberErr));
-        if (!member)
-            return j({ error: 'Member not found', code: 'NOT_FOUND' });
-        const approvalParams = { user_id, org_id: context.orgId };
+        const found = await lookupOrgMember(user_id, org_id);
+        if (!found.ok)
+            return found.result;
+        const { orgId, member } = found;
+        const approvalParams = { user_id, org_id: orgId };
         if (!confirmed) {
             return j({
                 confirmation_required: true,
                 tool: 'remove_team_member',
                 member: { user_id: member.user_id, role: member.role },
-                message: `Removing this member (role: ${member.role}) revokes their access to org ${context.orgId}. Call again with confirmed=true to proceed.`,
+                message: `Removing this member (role: ${member.role}) revokes their access to org ${orgId}. Call again with confirmed=true to proceed.`,
             });
         }
         if (member.role === 'owner') {
             const { count } = await db()
                 .from('org_members')
                 .select('id', { count: 'exact', head: true })
-                .eq('org_id', context.orgId)
+                .eq('org_id', orgId)
                 .eq('role', 'owner');
             if ((count ?? 0) <= 1)
                 return j({ error: 'Cannot remove the last owner', code: 'LAST_OWNER' });
@@ -257,7 +288,7 @@ export function registerOrgTools(server) {
         const { error } = await db()
             .from('org_members')
             .delete()
-            .eq('org_id', context.orgId)
+            .eq('org_id', orgId)
             .eq('user_id', user_id);
         if (error)
             return j(dbToolError(error));
@@ -265,7 +296,7 @@ export function registerOrgTools(server) {
             action: 'remove_member',
             resourceType: 'org_member',
             resourceId: member.id,
-            details: { org_id: context.orgId, removed_user: user_id, role: member.role },
+            details: { org_id: orgId, removed_user: user_id, role: member.role },
         }).catch(() => { });
         return j({ ok: true, removed_user_id: user_id });
     });
@@ -286,20 +317,11 @@ export function registerOrgTools(server) {
             approval_id: z.string().uuid().optional(),
         },
     }, async ({ user_id, role, org_id, confirmed, approval_id }) => {
-        const context = await resolveCurrentOrgId(org_id);
-        if (!context.ok)
-            return j({ error: context.error, code: context.code });
-        const { data: member, error: memberErr } = await db()
-            .from('org_members')
-            .select('id, user_id, role')
-            .eq('org_id', context.orgId)
-            .eq('user_id', user_id)
-            .maybeSingle();
-        if (memberErr)
-            return j(dbToolError(memberErr));
-        if (!member)
-            return j({ error: 'Member not found', code: 'NOT_FOUND' });
-        const approvalParams = { user_id, role, org_id: context.orgId };
+        const found = await lookupOrgMember(user_id, org_id);
+        if (!found.ok)
+            return found.result;
+        const { orgId, member } = found;
+        const approvalParams = { user_id, role, org_id: orgId };
         if (!confirmed) {
             return j({
                 confirmation_required: true,
@@ -326,7 +348,7 @@ export function registerOrgTools(server) {
         const { data, error } = await db()
             .from('org_members')
             .update({ role })
-            .eq('org_id', context.orgId)
+            .eq('org_id', orgId)
             .eq('user_id', user_id)
             .select('user_id, role')
             .maybeSingle();
@@ -336,7 +358,7 @@ export function registerOrgTools(server) {
             action: 'update_member_role',
             resourceType: 'org_member',
             resourceId: member.id,
-            details: { org_id: context.orgId, user_id, new_role: role },
+            details: { org_id: orgId, user_id, new_role: role },
         }).catch(() => { });
         return j({ member: data });
     });

package/package.json

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