@sendinel/mcp-server 1.0.146 → 1.0.148

package/build/tools/analytics.js

@@ -1,3 +1,4 @@
+import { isSentRow } from "@sendinel/domain";
 import { readPeriodCampaigns, campaignPeriodFields, filterPlanContacts } from "@sendinel/domain";
 import { isTrueConversionEvent, TRUE_CONVERSION_DEFINITION } from "@sendinel/domain";
 import { percentRate, groupMetricRows, readRevenue, isComplainedRow, isOpenedRow, countPeople, isClickedRow, summarizeEmailRows, countEmailRows, isDeliveredRow, isBouncedRow, fetchAllRows, readAllRows } from "@sendinel/domain";
@@ -42,7 +43,7 @@ export function computeSenderHealthScore(metrics, trackingEnabled) {
 function sendVolumeByDay(rows) {
     const byDay = new Map();
     for (const row of rows) {
-        if (!row.sent_at)
+        if (!row.sent_at || !isSentRow(row))
             continue;
         const date = new Date(row.sent_at).toISOString().slice(0, 10);
         byDay.set(date, (byDay.get(date) ?? 0) + 1);
@@ -133,12 +134,12 @@ function distinctEventCount(events, eventType, messageIds) {
         .map(event => event.provider_message_id)).size;
 }
 function buildTrueConversionAnalytics(params) {
-    const sent = params.logs.length;
+    const sent = countEmailRows(params.logs).sent;
     const delivered = params.logs.filter(isDeliveredRow).length;
     const trueRows = params.attributionRows.filter(row => isTrueConversionEvent(row.conversion_event));
     const campaignDenominators = new Map();
     for (const row of params.logs) {
-        if (typeof row.campaign_id !== 'string')
+        if (typeof row.campaign_id !== 'string' || !isSentRow(row))
             continue;
         campaignDenominators.set(row.campaign_id, (campaignDenominators.get(row.campaign_id) ?? 0) + 1);
     }
@@ -229,7 +230,7 @@ export function registerAnalyticsTools(server) {
             query = query.eq('site_id', site_id);
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ events: data ?? [] });
     });
     server.registerTool('get_portfolio_analytics', {
@@ -288,9 +289,9 @@ export function registerAnalyticsTools(server) {
                     .eq('role', 'owner'),
             ]);
             if (directError)
-                return txt(`Error: ${directError.message}`);
+                return txt(`Error: ${dbToolError(directError).error}`);
             if (ownerError)
-                return txt(`Error: ${ownerError.message}`);
+                return txt(`Error: ${dbToolError(ownerError).error}`);
             const directProjectIds = Array.from(new Set((directAccess ?? []).map((row) => row.project_id).filter(Boolean)));
             const ownedOrgIds = Array.from(new Set((ownedOrgs ?? []).map((row) => row.org_id).filter(Boolean)));
             const [{ data: directProjects, error: directProjectsError }, { data: ownedProjects, error: ownedProjectsError }] = await Promise.all([
@@ -302,9 +303,9 @@ export function registerAnalyticsTools(server) {
                     : Promise.resolve({ data: [], error: null }),
             ]);
             if (directProjectsError)
-                return txt(`Error: ${directProjectsError.message}`);
+                return txt(`Error: ${dbToolError(directProjectsError).error}`);
             if (ownedProjectsError)
-                return txt(`Error: ${ownedProjectsError.message}`);
+                return txt(`Error: ${dbToolError(ownedProjectsError).error}`);
             const byId = new Map();
             for (const project of [...(directProjects ?? []), ...(ownedProjects ?? [])]) {
                 if (ctx.invitationProjectIds != null && !ctx.invitationProjectIds.includes(project.id))
@@ -316,7 +317,7 @@ export function registerAnalyticsTools(server) {
                 ? await adminDb().from('organizations').select('id, name').in('id', orgIds)
                 : { data: [], error: null };
             if (organizationsError)
-                return txt(`Error: ${organizationsError.message}`);
+                return txt(`Error: ${dbToolError(organizationsError).error}`);
             const orgNames = new Map((organizations ?? []).map((org) => [org.id, org.name]));
             return j({
                 projects: Array.from(byId.values())
@@ -353,7 +354,7 @@ export function registerAnalyticsTools(server) {
             .eq('org_id', project.org_id)
             .order('name');
         if (listErr)
-            return txt(`Error: ${listErr.message}`);
+            return txt(`Error: ${dbToolError(listErr).error}`);
         // Get org info
         const { data: org } = await adminDb()
             .from('organizations')
@@ -396,7 +397,7 @@ export function registerAnalyticsTools(server) {
             p_project_id: project_id,
         });
         if (accessError)
-            return j({ error: accessError.message });
+            return j(dbToolError(accessError));
         if (!hasAccess)
             return j({ error: 'You do not have access to this project.', code: 'PROJECT_ACCESS_DENIED' });
         if (ctx.invitationProjectIds != null && !ctx.invitationProjectIds.includes(project_id.toLowerCase())) {
@@ -408,7 +409,7 @@ export function registerAnalyticsTools(server) {
             .update({ active_project_id: project_id })
             .eq('id', ctx.oauthTokenId);
         if (updateError)
-            return j({ error: updateError.message });
+            return j(dbToolError(updateError));
         const { data: project } = await adminDb()
             .from('projects')
             .select('id, name, org_id')
@@ -445,7 +446,7 @@ export function registerAnalyticsTools(server) {
             .eq('project_id', getProjectId())
             .order('name');
         if (error)
-            return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(error).error}` }] };
         return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     });
     server.registerTool('get_stats', {
@@ -591,7 +592,7 @@ export function registerAnalyticsTools(server) {
             .order('check_date', { ascending: false })
             .limit(days);
         if (error)
-            return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(error).error}` }] };
         return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     });
     server.registerTool('get_engagement_insights', {
@@ -611,7 +612,7 @@ export function registerAnalyticsTools(server) {
         const { data, error } = await db()
             .rpc('get_engagement_summary', site_id ? { p_project_id: projectId, p_site_id: site_id } : { p_project_id: projectId });
         if (error)
-            return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(error).error}` }] };
         let trackingEnabled = true;
         if (site_id) {
             const { data: site, error: siteError } = await db()
@@ -621,7 +622,7 @@ export function registerAnalyticsTools(server) {
                 .eq('id', site_id)
                 .maybeSingle();
             if (siteError)
-                return { content: [{ type: 'text', text: `Error: ${siteError.message}` }] };
+                return { content: [{ type: 'text', text: `Error: ${dbToolError(siteError).error}` }] };
             trackingEnabled = site?.tracking_enabled ?? false;
         }
         else {
@@ -630,7 +631,7 @@ export function registerAnalyticsTools(server) {
                 .select('tracking_enabled')
                 .eq('project_id', projectId);
             if (sitesError)
-                return { content: [{ type: 'text', text: `Error: ${sitesError.message}` }] };
+                return { content: [{ type: 'text', text: `Error: ${dbToolError(sitesError).error}` }] };
             trackingEnabled = (sites ?? []).some((site) => site.tracking_enabled);
         }
         const since30d = new Date(Date.now() - 30 * 86_400_000).toISOString();
@@ -644,7 +645,7 @@ export function registerAnalyticsTools(server) {
             q = q.eq('site_id', site_id);
         const { data: logs, error: logsError } = await q;
         if (logsError)
-            return { content: [{ type: 'text', text: `Error: ${logsError.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(logsError).error}` }] };
         const rows = (logs ?? []);
         const metrics30d = computeAnalyticsMetrics(rows);
         const metrics7d = computeAnalyticsMetrics(rows.filter(row => row.sent_at && row.sent_at >= since7d));
@@ -714,7 +715,7 @@ export function registerAnalyticsTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (siteErr || !site)
-            return txt(`Error: Site not found — ${siteErr?.message ?? 'not found'}`);
+            return txt(`Error: Site not found — ${(siteErr ? dbToolError(siteErr).error : undefined) ?? 'not found'}`);
         const domain = site.sending_domain;
         const dnsResults = { spf: null, dkim: null, dmarc: null };
         let verificationSource = 'dns_lookup';
@@ -815,7 +816,7 @@ export function registerAnalyticsTools(server) {
             .eq('site_id', site_id)
             .gte('sent_at', sevenDaysAgo);
         const logs = recentLogs ?? [];
-        const totalSent = logs.length;
+        const totalSent = countEmailRows(logs).sent;
         const bounced = logs.filter((l) => isBouncedRow(l)).length;
         const complained = logs.filter(isComplainedRow).length;
         const bounceRate = percentRate(bounced, totalSent, 8) ?? 0;
@@ -884,7 +885,7 @@ export function registerAnalyticsTools(server) {
             q = q.eq('campaign_id', campaign_id);
         const { data: logs, error } = await q;
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         let periodCampaigns;
         try {
             periodCampaigns = campaign_id || group_by === 'campaign' ? await readPeriodCampaigns(db(), projectId, { siteId: site_id, campaignId: campaign_id, start: since }) : new Map();
@@ -898,7 +899,7 @@ export function registerAnalyticsTools(server) {
             return j({ message: `No email activity in the last ${days} days.`, total: 0 });
         const { data: attributionRows, error: attributionError } = await readRevenue({ sb: db(), projectId, siteId: site_id, campaignId: campaign_id, start: since });
         if (attributionError)
-            return txt(`Error: ${attributionError.message}`);
+            return txt(`Error: ${dbToolError(attributionError).error}`);
         const scopedAttributionRows = attributionRows ?? [];
         const computeMetrics = (set, counts) => {
             const sharedCounts = counts ?? countEmailRows(set);
@@ -1012,7 +1013,7 @@ export function registerAnalyticsTools(server) {
         if (firstHalf.length > 0 && secondHalf.length > 0) {
             trend.open_rate = `${(parseRate(secondMetrics.open_rate) - parseRate(firstMetrics.open_rate) >= 0 ? '+' : '')}${(parseRate(secondMetrics.open_rate) - parseRate(firstMetrics.open_rate)).toFixed(1)}pp`;
             trend.click_rate = `${(parseRate(secondMetrics.click_rate) - parseRate(firstMetrics.click_rate) >= 0 ? '+' : '')}${(parseRate(secondMetrics.click_rate) - parseRate(firstMetrics.click_rate)).toFixed(1)}pp`;
-            trend.volume = `${firstHalf.length} → ${secondHalf.length} emails`;
+            trend.volume = `${firstMetrics.total_sent} → ${secondMetrics.total_sent} emails`;
         }
         return j({
             period: `Last ${days} days`,
@@ -1077,7 +1078,7 @@ export function registerAnalyticsTools(server) {
                     .eq('project_id', proj.id)
                     .gte('sent_at', since);
                 const rows = logs ?? [];
-                const sent = rows.length;
+                const sent = countEmailRows(rows).sent;
                 const delivered = rows.filter(isDeliveredRow).length;
                 const opened = countPeople(rows, isOpenedRow);
                 const clicked = countPeople(rows, isClickedRow);
@@ -1154,9 +1155,9 @@ export function registerAnalyticsTools(server) {
         }
         const [subscriptionRes, invoiceRes] = await Promise.all([subscriptionQuery, invoiceQuery]);
         if (subscriptionRes.error)
-            return j({ error: subscriptionRes.error.message });
+            return j(dbToolError(subscriptionRes.error));
         if (invoiceRes.error)
-            return j({ error: invoiceRes.error.message });
+            return j(dbToolError(invoiceRes.error));
         return j(buildRevenueAnalytics({
             days,
             start,
@@ -1185,14 +1186,14 @@ export function registerAnalyticsTools(server) {
             .eq('project_id', getProjectId())
             .maybeSingle();
         if (siteErr || !site)
-            return j({ error: siteErr?.message ?? 'Site not found', code: 'NOT_FOUND' });
+            return j({ error: (siteErr ? dbToolError(siteErr).error : undefined) ?? 'Site not found', code: 'NOT_FOUND' });
         const { data, error } = await db()
             .from('tenant_email_metrics')
             .select('site_id, window_30d_sent, window_30d_complaints, window_30d_opens, complaint_rate, pause_level, paused_at, pause_reason, updated_at')
             .eq('site_id', siteId)
             .maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         const since = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000).toISOString();
         const { count: reputationSignals30d, error: reputationErr } = await db()
             .from('email_events')
@@ -1202,7 +1203,7 @@ export function registerAnalyticsTools(server) {
             .eq('bounce_category', 'reputation_signal')
             .gte('occurred_at', since);
         if (reputationErr)
-            return j({ error: reputationErr.message });
+            return j(dbToolError(reputationErr));
         return j({
             site_id: siteId,
             metrics: data ?? null,
@@ -1231,7 +1232,7 @@ export function registerAnalyticsTools(server) {
             .eq('id', site_id)
             .maybeSingle();
         if (siteError)
-            return txt(`Error: ${siteError.message}`);
+            return txt(`Error: ${dbToolError(siteError).error}`);
         if (!site)
             return j({ error: 'Site not found', code: 'NOT_FOUND' });
         let q = db()
@@ -1245,7 +1246,7 @@ export function registerAnalyticsTools(server) {
             q = q.is('dismissed_at', null);
         const { data, error } = await q;
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         const rank = { critical: 0, warning: 1, info: 2 };
         return j((data ?? []).sort((a, b) => (rank[a.severity] ?? 9) - (rank[b.severity] ?? 9)));
     });
@@ -1276,7 +1277,7 @@ export function registerAnalyticsTools(server) {
             q = q.eq('status', p.status);
         const { data, error } = await q;
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j({ campaigns: data ?? [] });
     });
 }

package/build/tools/approvals.js

@@ -53,7 +53,9 @@ export function registerApprovalTools(server, options) {
         },
     }, async ({ approval_id }) => {
         const result = await checkApproval(approval_id);
-        return j(result);
+        return result.status === 'not_found'
+            ? toolError({ ...result, code: 'not_found' })
+            : j(result);
     });
     server.registerTool('list_pending_approvals', {
         title: 'List Pending Approvals',

package/build/tools/automations.js

@@ -8,6 +8,7 @@ import { buildVoicePrompt, buildEmailSystemPrompt } from '../lib/voice.js';
 import { getAnthropicModelId } from '../anthropic-model.js';
 // Shared with the dashboard, including trigger_config.where event-data filters (#3689).
 import { AI_MAX_TOKENS, outputConfig, anthropicCheckedText, campaignMatchesTrigger, normalizeTriggerList as normalizeList } from '@sendinel/domain';
+import { dbToolError } from '../lib/db-error.js';
 const txt = (text) => ({ content: [{ type: 'text', text }] });
 const j = (data) => txt(JSON.stringify(data, null, 2));
 async function enrollSubscriberIntoTriggeredCampaigns(input) {
@@ -22,7 +23,7 @@ async function enrollSubscriberIntoTriggeredCampaigns(input) {
         .eq('project_id', projectId)
         .maybeSingle();
     if (subscriberError)
-        return txt(`Error: ${subscriberError.message}`);
+        return txt(`Error: ${dbToolError(subscriberError).error}`);
     if (!subscriber)
         return j({ error: 'Subscriber not found', code: 'NOT_FOUND' });
     if (subscriber.global_unsubscribed)
@@ -52,7 +53,7 @@ async function enrollSubscriberIntoTriggeredCampaigns(input) {
     }
     const { data: candidateCampaigns, error: campaignError } = await query;
     if (campaignError)
-        return txt(`Error: ${campaignError.message}`);
+        return txt(`Error: ${dbToolError(campaignError).error}`);
     const campaigns = campaign_id
         ? (candidateCampaigns ?? [])
         : (candidateCampaigns ?? []).filter((campaign) => triggerEvents.some(event => campaignMatchesTrigger(campaign, { event, tags: triggerTags, data: context ?? null }))
@@ -74,7 +75,7 @@ async function enrollSubscriberIntoTriggeredCampaigns(input) {
         .upsert(rows, { onConflict: 'campaign_id,contact_id', ignoreDuplicates: true })
         .select('id, campaign_id');
     if (enrollError)
-        return txt(`Error: ${enrollError.message}`);
+        return txt(`Error: ${dbToolError(enrollError).error}`);
     if (inserted?.length) {
         for (const campaign of campaigns) {
             const count = inserted.filter((row) => row.campaign_id === campaign.id).length;
@@ -121,7 +122,7 @@ export function registerAutomationTools(server) {
             q = q.eq('active', true);
         const { data, error } = await q;
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j(data ?? []);
     });
     server.registerTool('enroll_automation', {
@@ -175,7 +176,7 @@ export function registerAutomationTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (campaignError)
-            return txt(`Error: ${campaignError.message}`);
+            return txt(`Error: ${dbToolError(campaignError).error}`);
         if (!campaign)
             return j({ error: 'Campaign not found', code: 'NOT_FOUND' });
         if (campaign.type !== 'triggered')
@@ -196,7 +197,7 @@ export function registerAutomationTools(server) {
             .select('id, campaign_id, step_index, wait_hours, channel, action_type, content_ref, response_gate')
             .order('step_index', { ascending: true });
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j({
             campaign_id,
             campaign_name: campaign.name,
@@ -231,7 +232,7 @@ export function registerAutomationTools(server) {
             .limit(1)
             .maybeSingle();
         if (gateError)
-            return txt(`Error: ${gateError.message}`);
+            return txt(`Error: ${dbToolError(gateError).error}`);
         if (!gate)
             return j({ enrolled: 0, skipped: 'no_escalation_ladder_steps' });
         return enrollSubscriberIntoTriggeredCampaigns({
@@ -262,7 +263,7 @@ export function registerAutomationTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (campaignError)
-            return txt(`Error: ${campaignError.message}`);
+            return txt(`Error: ${dbToolError(campaignError).error}`);
         if (!campaign)
             return j({ error: 'Campaign not found', code: 'NOT_FOUND' });
         const [{ data: steps, error: stepsError }, { data: enrollments, error: enrollmentsError }] = await Promise.all([
@@ -278,9 +279,9 @@ export function registerAutomationTools(server) {
                 .order('enrolled_at', { ascending: false }),
         ]);
         if (stepsError)
-            return txt(`Error: ${stepsError.message}`);
+            return txt(`Error: ${dbToolError(stepsError).error}`);
         if (enrollmentsError)
-            return txt(`Error: ${enrollmentsError.message}`);
+            return txt(`Error: ${dbToolError(enrollmentsError).error}`);
         const contactIds = [...new Set((enrollments ?? []).map((row) => row.contact_id))];
         let contactsById = new Map();
         if (contactIds.length) {
@@ -523,7 +524,7 @@ End with a CTA to view the full changelog on GitHub.`;
             .select('id')
             .single();
         if (draftErr)
-            return txt(`Failed to save draft: ${draftErr.message}`);
+            return txt(`Failed to save draft: ${dbToolError(draftErr).error}`);
         await db()
             .from('content_sources')
             .update({ last_polled_at: new Date().toISOString(), items_generated: (source.items_generated ?? 0) + 1 })

package/build/tools/brand-kit.js

@@ -5,6 +5,7 @@ import { getProjectId } from '../project.js';
 import { downloadPublicAsset } from '../lib/ssrf-pinned-fetch.js';
 import { callSendinelV1 } from '../lib/v1-client.js';
 import { BRAND_ASSET_KINDS, isValidKind, persistBrandAsset, resolveKind, resolveMime, } from '../lib/brand-asset-persist.js';
+import { dbToolError } from '../lib/db-error.js';
 const j = (data) => ({ content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] });
 // import_brand_kit_text parses free-form Brand Core/Brand Brain/Content Library
 // markdown into voice fields, colors, templates, and social posts — a different,
@@ -99,7 +100,7 @@ export function registerBrandKitTools(server) {
             .eq('review_status', 'confirmed')
             .order('created_at', { ascending: false });
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         // Project-wide across ALL brand kits — deliberately not scoped to a single
         // kit_id, so projects with more than one kit aren't silently truncated.
         let rows = (data ?? []);
@@ -214,7 +215,7 @@ export function registerBrandKitTools(server) {
             });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Upload failed' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Upload failed' });
         }
     });
     server.registerTool('ingest_brand_assets_by_url', {
@@ -249,7 +250,7 @@ export function registerBrandKitTools(server) {
             }
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Project lookup failed' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Project lookup failed' });
         }
         const results = [];
         for (const asset of assets) {

package/build/tools/campaign-sets.js

@@ -12,6 +12,7 @@ import { logAudit } from '../audit.js';
 import { applyCampaignTargetingFields } from './campaigns.js';
 import { checkCampaignContent, contentNotReadyResponse, contentWarningView, summarizeContentWarnings } from '../lib/content-sources.js';
 import { captureBroadcastAudience } from '../lib/approval-snapshot.js';
+import { dbToolError } from '../lib/db-error.js';
 /**
  * Campaign sets (#3669): build a whole set of triggered campaigns as drafts in one call, then
  * activate the set behind one human approval. Built for Cyber Wingman's lifecycle emails
@@ -148,7 +149,7 @@ export async function writeCampaignDrafts(projectId, siteId, drafts, source) {
             return { error: { error: targetingError, code: 'INVALID_FIELD', campaign: c.name, created_before_failure: createdIds } };
         const { data: campaign, error } = await db().from('campaigns').insert(insertPayload).select('id').single();
         if (error || !campaign)
-            return { error: { error: error?.message ?? 'Failed to create campaign', code: 'CAMPAIGN_CREATE_FAILED', campaign: c.name, created_before_failure: createdIds } };
+            return { error: { error: (error ? dbToolError(error).error : undefined) ?? 'Failed to create campaign', code: 'CAMPAIGN_CREATE_FAILED', campaign: c.name, created_before_failure: createdIds } };
         createdIds.push(campaign.id);
         const rows = c.emails.map((e, k) => ({
             campaign_id: campaign.id,
@@ -163,7 +164,7 @@ export async function writeCampaignDrafts(projectId, siteId, drafts, source) {
         }));
         const { error: stepError } = await db().from('campaign_steps').insert(rows);
         if (stepError)
-            return { error: { error: stepError.message, code: 'STEP_CREATE_FAILED', campaign: c.name, created_before_failure: createdIds } };
+            return { error: { ...dbToolError(stepError), code: 'STEP_CREATE_FAILED', campaign: c.name, created_before_failure: createdIds } };
     }
     return { setId, createdIds };
 }
@@ -181,7 +182,7 @@ export function registerCampaignSetTools(server) {
         // Sender: the given one, or the only one. Never guessed between several.
         const { data: sites, error: sitesErr } = await db().from('sites').select('id, name, from_email, unsub_link_enabled').eq('project_id', projectId);
         if (sitesErr)
-            return j({ error: sitesErr.message, code: 'SITE_LOOKUP_FAILED' });
+            return j({ ...dbToolError(sitesErr), code: 'SITE_LOOKUP_FAILED' });
         const site = site_id ? (sites ?? []).find((s) => s.id === site_id) : (sites?.length === 1 ? sites[0] : null);
         if (!site) {
             return j({
@@ -227,7 +228,7 @@ export function registerCampaignSetTools(server) {
                         email = { subject: e.subject ?? g.subject, body_html: g.body_html, body_text: g.body_text, blocks: g.blocks, delay_days: e.delay_days ?? 0, delay_hours: e.delay_hours ?? 0 };
                     }
                     catch (error) {
-                        return j({ error: `Nothing was created. Drafting campaigns[${i}].emails[${k}] failed: ${error instanceof Error ? error.message : String(error)}`, code: 'DRAFT_FAILED' });
+                        return j({ error: `Nothing was created. Drafting campaigns[${i}].emails[${k}] failed: ${error instanceof Error ? dbToolError(error).error : String(error)}`, code: 'DRAFT_FAILED' });
                     }
                 }
                 else {
@@ -263,7 +264,7 @@ export function registerCampaignSetTools(server) {
             preview = previewOf(loaded.campaigns, loaded.steps);
         }
         catch (error) {
-            return j({ campaign_set_id: setId, campaign_ids: createdIds, status: 'draft', warning: `Created, but the preview could not be read back: ${error instanceof Error ? error.message : String(error)}` });
+            return j({ campaign_set_id: setId, campaign_ids: createdIds, status: 'draft', warning: `Created, but the preview could not be read back: ${error instanceof Error ? dbToolError(error).error : String(error)}` });
         }
         return j({
             campaign_set_id: setId,
@@ -292,7 +293,7 @@ export function registerCampaignSetTools(server) {
                 return j({ error: `Call activate_campaigns with only approval_id. Remove: ${extras.join(', ')}.`, code: 'APPROVAL_CALL_TAKES_ONLY_APPROVAL_ID' });
             const { data: row, error: rowErr } = await db().from('action_approvals').select('params').eq('id', approval_id).eq('project_id', projectId).eq('action', 'activate_campaigns').maybeSingle();
             if (rowErr)
-                return j({ error: rowErr.message, code: 'APPROVAL_LOOKUP_FAILED' });
+                return j({ ...dbToolError(rowErr), code: 'APPROVAL_LOOKUP_FAILED' });
             if (!row)
                 return j({ error: `Approval ${approval_id} is not_found. Request a new approval.`, code: 'not_found' });
             const stored = (row.params ?? {});
@@ -303,7 +304,7 @@ export function registerCampaignSetTools(server) {
                 current = await loadSet(projectId, ids);
             }
             catch (error) {
-                return j({ error: `Could not load the campaigns: ${error instanceof Error ? error.message : String(error)}`, code: 'SET_LOOKUP_FAILED' });
+                return j({ error: `Could not load the campaigns: ${error instanceof Error ? dbToolError(error).error : String(error)}`, code: 'SET_LOOKUP_FAILED' });
             }
             if (current.campaigns.length !== ids.length || campaignSetContentHash(current.campaigns, current.steps) !== stored.content_hash) {
                 return j({ error: 'A campaign or email changed (or was deleted) after approval. Nothing was activated. Request a new approval.', code: 'CONTENT_CHANGED_SINCE_APPROVAL' });
@@ -325,7 +326,7 @@ export function registerCampaignSetTools(server) {
                     .eq('project_id', projectId)
                     .in('status', ['draft', 'paused']);
                 if (error) {
-                    failed.push({ campaign_id: c.id, error: error.message });
+                    failed.push({ campaign_id: c.id, ...dbToolError(error) });
                     continue;
                 }
                 activated.push(c.id);
@@ -351,7 +352,7 @@ export function registerCampaignSetTools(server) {
         if (args.campaign_set_id) {
             const { data, error } = await db().from('campaigns').select('id').eq('project_id', projectId).eq('metadata->>campaign_set_id', args.campaign_set_id);
             if (error)
-                return j({ error: error.message, code: 'SET_LOOKUP_FAILED' });
+                return j({ ...dbToolError(error), code: 'SET_LOOKUP_FAILED' });
             ids = [...new Set([...ids, ...(data ?? []).map((r) => r.id)])];
         }
         if (!ids.length)
@@ -361,7 +362,7 @@ export function registerCampaignSetTools(server) {
             set = await loadSet(projectId, ids);
         }
         catch (error) {
-            return j({ error: `Could not load the campaigns: ${error instanceof Error ? error.message : String(error)}`, code: 'SET_LOOKUP_FAILED' });
+            return j({ error: `Could not load the campaigns: ${error instanceof Error ? dbToolError(error).error : String(error)}`, code: 'SET_LOOKUP_FAILED' });
         }
         const missing = ids.filter((id) => !set.campaigns.some((c) => c.id === id));
         if (missing.length)