@sendinel/mcp-server 1.0.146 → 1.0.147

package/build/tools/campaigns.js

@@ -1,4 +1,3 @@
-import { dbErrorResult } from '../lib/db-errors.js';
 import { resolveCampaignReentry, readCampaignPeriods, campaignPeriodFields } from "@sendinel/domain";
 import { CAMPAIGN_BRANCH_CONDITIONS, campaignBranchConditionValue, isContactPropertyConditionList, STEP_PROPERTY_CONDITIONS_ERROR, validateStepPropertyRules } from "@sendinel/domain";
 import { z } from 'zod';
@@ -13,7 +12,7 @@ import { ensureReplyActionSecretConfigured, mintReplyAction, } from '@sendinel/d
 import { finishCampaignEdit, resumeCampaignEdit, TRIGGER_EDIT_SELECT } from '../lib/campaign-trigger-approval.js';
 import { adminDb, db, requestContext } from '../db.js';
 import { getProjectId } from '../project.js';
-import { dbToolError, toolError } from '../lib/db-error.js';
+import { dbErrorResult, dbToolError, toolError } from '../lib/db-error.js';
 import { checkPlanLimit } from '../plan-limits.js';
 import { buildVoicePrompt, buildEmailSystemPrompt, deriveTemplateVariables, validateTemplate } from '../lib/voice.js';
 import { fireWebhookEvent } from '../lib/webhook-events.js';
@@ -296,7 +295,7 @@ export async function applyCampaignTargetingFields(updates, input, projectId, ex
                 .eq('project_id', projectId)
                 .maybeSingle();
             if (error)
-                return error.message;
+                return dbToolError(error).error;
             if (!segment)
                 return 'Segment not found';
             updates.segment_id = input.segment_id;
@@ -436,7 +435,7 @@ async function executeBroadcast(input) {
         .order('created_at', { ascending: false })
         .limit(1);
     if (matchErr) {
-        return { ok: false, error: matchErr.message, code: 'ONE_SEND_LOOKUP_FAILED' };
+        return { ok: false, ...dbToolError(matchErr), code: 'ONE_SEND_LOOKUP_FAILED' };
     }
     const match = (matches ?? [])[0];
     if (match)
@@ -463,7 +462,7 @@ async function executeBroadcast(input) {
         .select('id')
         .single();
     if (campaignErr || !campaign) {
-        return { ok: false, error: campaignErr?.message ?? 'Failed to create campaign', code: 'CAMPAIGN_CREATE_FAILED' };
+        return { ok: false, error: (campaignErr ? dbToolError(campaignErr).error : undefined) ?? 'Failed to create campaign', code: 'CAMPAIGN_CREATE_FAILED' };
     }
     const { data: step, error: stepErr } = await db()
         .from('campaign_steps')
@@ -480,7 +479,7 @@ async function executeBroadcast(input) {
         .select('id')
         .single();
     if (stepErr || !step) {
-        return { ok: false, error: stepErr?.message ?? 'Campaign created but failed to add broadcast step', code: 'STEP_CREATE_FAILED', campaign_id: campaign.id };
+        return { ok: false, error: (stepErr ? dbToolError(stepErr).error : undefined) ?? 'Campaign created but failed to add broadcast step', code: 'STEP_CREATE_FAILED', campaign_id: campaign.id };
     }
     await recordBrandAssetUsage({
         client: db(),
@@ -504,7 +503,7 @@ async function executeBroadcast(input) {
             .from('campaign_enrollments')
             .upsert(batch, { onConflict: 'campaign_id,contact_id', ignoreDuplicates: true });
         if (enrollErr) {
-            return { ok: false, error: enrollErr.message, code: 'ENROLLMENT_FAILED', campaign_id: campaign.id, enrolled_before_failure: i };
+            return { ok: false, ...dbToolError(enrollErr), code: 'ENROLLMENT_FAILED', campaign_id: campaign.id, enrolled_before_failure: i };
         }
     }
     const { error: activateErr } = await db()
@@ -513,7 +512,7 @@ async function executeBroadcast(input) {
         .eq('id', campaign.id)
         .eq('project_id', input.projectId);
     if (activateErr) {
-        return { ok: false, error: activateErr.message, code: 'ACTIVATION_FAILED', campaign_id: campaign.id, enrolled: input.contactIds.length };
+        return { ok: false, ...dbToolError(activateErr), code: 'ACTIVATION_FAILED', campaign_id: campaign.id, enrolled: input.contactIds.length };
     }
     return { ok: true, campaignId: campaign.id, stepId: step.id, enrolled: input.contactIds.length, nextSendAt };
 }
@@ -532,7 +531,7 @@ async function attachBroadcastToExisting(input, match) {
             // One enrollment per campaign/contact, and ids has at most 200 entries.
             .limit(200);
         if (enrolledErr)
-            return { ok: false, error: enrolledErr.message, code: 'ONE_SEND_LOOKUP_FAILED', campaign_id: match.id };
+            return { ok: false, ...dbToolError(enrolledErr), code: 'ONE_SEND_LOOKUP_FAILED', campaign_id: match.id };
         for (const row of enrolledRows ?? [])
             skip.add(row.contact_id);
         let logRows;
@@ -565,7 +564,7 @@ async function attachBroadcastToExisting(input, match) {
             .upsert(batch, { onConflict: 'campaign_id,contact_id', ignoreDuplicates: true })
             .select('contact_id');
         if (enrollErr) {
-            return { ok: false, error: enrollErr.message, code: 'ENROLLMENT_FAILED', campaign_id: match.id, enrolled_before_failure: enrolled };
+            return { ok: false, ...dbToolError(enrollErr), code: 'ENROLLMENT_FAILED', campaign_id: match.id, enrolled_before_failure: enrolled };
         }
         enrolled += (inserted ?? []).length;
     }
@@ -585,7 +584,7 @@ async function attachBroadcastToExisting(input, match) {
             .eq('id', match.id)
             .eq('project_id', input.projectId);
         if (updateErr) {
-            return { ok: false, error: updateErr.message, code: 'ACTIVATION_FAILED', campaign_id: match.id, enrolled };
+            return { ok: false, ...dbToolError(updateErr), code: 'ACTIVATION_FAILED', campaign_id: match.id, enrolled };
         }
     }
     const { data: steps } = await db()
@@ -674,7 +673,7 @@ export function registerCampaignTools(server) {
             query = query.eq('site_id', site_id);
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         const days = {};
         for (const campaign of data ?? []) {
             if (campaign.type === 'triggered') {
@@ -745,7 +744,7 @@ export function registerCampaignTools(server) {
             q = q.eq('status', status);
         const { data, error } = await q;
         if (error)
-            return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(error).error}` }] };
         // total_opened / total_clicked stay as the raw event counters (unchanged); unique_* are people
         // counts that cannot exceed total_sent. null = the people-count lookup failed (unknown, not 0).
         const rows = data ?? [];
@@ -791,7 +790,7 @@ export function registerCampaignTools(server) {
             .eq('campaigns.site_id', site_id)
             .order('next_send_at', { ascending: true });
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         const campaigns = groupScheduleByCampaign((data ?? []));
         const total_sends_scheduled = campaigns.reduce((sum, campaign) => sum + campaign.total_sends_scheduled, 0);
         return j({
@@ -862,7 +861,7 @@ export function registerCampaignTools(server) {
             .select()
             .single();
         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, requires_approval_description: ACTIVATION_APPROVAL_DESCRIPTION, fires_on: buildCampaignFiresOn(data), trigger_diagnostics: buildCampaignTriggerDiagnostics(data) }, null, 2) }] };
     });
     const propertyConditions = z.array(z.union([
@@ -980,7 +979,7 @@ export function registerCampaignTools(server) {
                 .is('delay_days', null)
                 .is('delay_hours', null);
             if (stepsErr)
-                return j({ error: `Could not check the campaign's emails: ${stepsErr.message}`, code: 'STEP_LOOKUP_FAILED' });
+                return j({ error: `Could not check the campaign's emails: ${dbToolError(stepsErr).error}`, code: 'STEP_LOOKUP_FAILED' });
             if (unsetSteps?.length) {
                 return j({
                     error: 'Some emails have no wait set. Set how long to wait before each one, then try again.',
@@ -996,7 +995,7 @@ export function registerCampaignTools(server) {
                 .eq('project_id', getProjectId())
                 .maybeSingle();
             if (campErr)
-                return j({ error: `Could not check the campaign: ${campErr.message}`, code: 'CAMPAIGN_LOOKUP_FAILED' });
+                return j({ error: `Could not check the campaign: ${dbToolError(campErr).error}`, code: 'CAMPAIGN_LOOKUP_FAILED' });
             if (campRow?.type === 'triggered' && campaignTriggerKind(campRow) === 'manual' && !campRow.segment_id) {
                 return j({ error: 'This triggered campaign has no trigger. Set an event, tag, date, contact event, or segment before activating it.', code: 'validation_failed' });
             }
@@ -1007,7 +1006,7 @@ export function registerCampaignTools(server) {
                     .select('campaign_id, step_order, subject, body_html, body_text')
                     .eq('campaign_id', campaign_id);
                 if (contentErr)
-                    return j({ error: `Could not check the campaign's emails: ${contentErr.message}`, code: 'STEP_LOOKUP_FAILED' });
+                    return j({ error: `Could not check the campaign's emails: ${dbToolError(contentErr).error}`, code: 'STEP_LOOKUP_FAILED' });
                 const readiness = await checkCampaignContent(getProjectId(), [campRow], contentSteps ?? []);
                 if (readiness.blocking.length)
                     return j(contentNotReadyResponse(readiness.blocking));
@@ -1049,7 +1048,7 @@ export function registerCampaignTools(server) {
             .select()
             .single();
         if (error)
-            return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(error).error}` }] };
         // Fire webhook for status changes
         const eventMap = { active: 'campaign.activated', completed: 'campaign.completed', paused: 'campaign.paused' };
         if (eventMap[status]) {
@@ -1084,7 +1083,7 @@ export function registerCampaignTools(server) {
             .eq('project_id', getProjectId())
             .maybeSingle();
         if (contactError)
-            return txt(`Error: ${contactError.message}`);
+            return txt(`Error: ${dbToolError(contactError).error}`);
         if (!contact)
             return j({ error: 'Contact not found', code: 'NOT_FOUND' });
         if (contact.global_unsubscribed)
@@ -1097,7 +1096,7 @@ export function registerCampaignTools(server) {
             .select()
             .single();
         if (error)
-            return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(error).error}` }] };
         // Update campaign enrolled counter
         const { data: campaign } = await db().from('campaigns').select('total_enrolled').eq('id', campaign_id).maybeSingle();
         if (campaign) {
@@ -1135,9 +1134,9 @@ export function registerCampaignTools(server) {
                 .maybeSingle(),
         ]);
         if (campaignRes.error)
-            return txt(`Error: ${campaignRes.error.message}`);
+            return txt(`Error: ${dbToolError(campaignRes.error).error}`);
         if (contactRes.error)
-            return txt(`Error: ${contactRes.error.message}`);
+            return txt(`Error: ${dbToolError(contactRes.error).error}`);
         if (!campaignRes.data || !contactRes.data)
             return j({ error: 'Campaign or contact not found', code: 'NOT_FOUND' });
         const { data: enrollment, error } = await db()
@@ -1147,7 +1146,7 @@ export function registerCampaignTools(server) {
             .eq('contact_id', contact_id)
             .maybeSingle();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (!enrollment) {
             return j({ enrolled: false, enrollment: null, campaign: campaignRes.data, contact: contactRes.data });
         }
@@ -1169,9 +1168,9 @@ export function registerCampaignTools(server) {
                     .maybeSingle(),
         ]);
         if (stepsSentError)
-            return txt(`Error: ${stepsSentError.message}`);
+            return txt(`Error: ${dbToolError(stepsSentError).error}`);
         if (currentStepResult.error)
-            return txt(`Error: ${currentStepResult.error.message}`);
+            return txt(`Error: ${dbToolError(currentStepResult.error).error}`);
         return j({
             enrolled: true,
             campaign: campaignRes.data,
@@ -1207,7 +1206,7 @@ export function registerCampaignTools(server) {
             .eq('site_id', site_id)
             .eq('subscribed', true);
         if (subErr)
-            return { content: [{ type: 'text', text: `Error: ${subErr.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(subErr).error}` }] };
         if (!subs?.length)
             return { content: [{ type: 'text', text: 'No active subscribers for this site.' }] };
         const ids = subs.map((s) => s.contact_id);
@@ -1227,7 +1226,7 @@ export function registerCampaignTools(server) {
             .from('campaign_enrollments')
             .upsert(rows, { onConflict: 'campaign_id,contact_id', ignoreDuplicates: true });
         if (enrollErr)
-            return { content: [{ type: 'text', text: `Error: ${enrollErr.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(enrollErr).error}` }] };
         // Update campaign enrolled counter
         const { data: campaign } = await db().from('campaigns').select('total_enrolled').eq('id', campaign_id).maybeSingle();
         if (campaign) {
@@ -1275,7 +1274,7 @@ export function registerCampaignTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (siteErr || !site)
-            return j({ error: siteErr?.message ?? 'Site not found', code: 'SITE_NOT_FOUND' });
+            return j({ error: (siteErr ? dbToolError(siteErr).error : undefined) ?? 'Site not found', code: 'SITE_NOT_FOUND' });
         const { data: segment, error: segmentErr } = await db()
             .from('segments')
             .select('id, name, rules, site_id')
@@ -1283,7 +1282,7 @@ export function registerCampaignTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (segmentErr || !segment)
-            return j({ error: segmentErr?.message ?? 'Segment not found', code: 'SEGMENT_NOT_FOUND' });
+            return j({ error: (segmentErr ? dbToolError(segmentErr).error : undefined) ?? 'Segment not found', code: 'SEGMENT_NOT_FOUND' });
         const rules = scopeSegmentRulesToSite(segment.rules, segment.site_id);
         // #3669: the same audience rules as send_broadcast and the dashboard: paged, signed up to this
         // sender, consent gate applied. The count shown is the count enrolled.
@@ -1295,7 +1294,7 @@ export function registerCampaignTools(server) {
             // #4270: a malformed segment enrolls nobody and says why.
             if (isSegmentRulesError(error))
                 return j({ error: error.message, code: 'INVALID_SEGMENT_RULES', errors: error.errors });
-            return j({ error: `Could not load this audience: ${error instanceof Error ? error.message : String(error)}`, code: 'AUDIENCE_LOOKUP_FAILED' });
+            return j({ error: `Could not load this audience: ${error instanceof Error ? dbToolError(error).error : String(error)}`, code: 'AUDIENCE_LOOKUP_FAILED' });
         }
         const contactIds = audience.contactIds;
         if (!confirmed) {
@@ -1437,7 +1436,7 @@ export function registerCampaignTools(server) {
                 .eq('action', 'send_broadcast')
                 .maybeSingle();
             if (rowErr)
-                return j({ error: rowErr.message, code: 'APPROVAL_LOOKUP_FAILED' });
+                return j({ ...dbToolError(rowErr), code: 'APPROVAL_LOOKUP_FAILED' });
             if (!row)
                 return txt(`Approval ${approval_id} is not_found. Request a new approval.`);
             const stored = (row.params ?? {});
@@ -1517,7 +1516,7 @@ export function registerCampaignTools(server) {
             .select('id, name, from_email')
             .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({
@@ -1540,7 +1539,7 @@ export function registerCampaignTools(server) {
                 .eq('project_id', projectId)
                 .maybeSingle();
             if (segmentErr)
-                return j({ error: segmentErr.message, code: 'SEGMENT_LOOKUP_FAILED' });
+                return j({ ...dbToolError(segmentErr), code: 'SEGMENT_LOOKUP_FAILED' });
             if (!segment)
                 return j({ error: 'Segment not found', code: 'SEGMENT_NOT_FOUND' });
             rules = scopeSegmentRulesToSite(segment.rules, segment.site_id);
@@ -1551,7 +1550,7 @@ export function registerCampaignTools(server) {
                 rules = await parseAudienceRules(anthropic, audience);
             }
             catch (error) {
-                return j({ error: error instanceof Error ? error.message : String(error), code: 'AUDIENCE_NOT_UNDERSTOOD' });
+                return j({ error: error instanceof Error ? dbToolError(error).error : String(error), code: 'AUDIENCE_NOT_UNDERSTOOD' });
             }
             segmentName = audience;
         }
@@ -1564,7 +1563,7 @@ export function registerCampaignTools(server) {
             // #4270: malformed segment or parsed audience rules send to nobody and say why.
             if (isSegmentRulesError(error))
                 return j({ error: error.message, code: 'INVALID_SEGMENT_RULES', errors: error.errors, rules });
-            return j({ error: `Could not load this audience: ${error instanceof Error ? error.message : String(error)}`, code: 'AUDIENCE_LOOKUP_FAILED' });
+            return j({ error: `Could not load this audience: ${error instanceof Error ? dbToolError(error).error : String(error)}`, code: 'AUDIENCE_LOOKUP_FAILED' });
         }
         if (resolved.contactIds.length === 0) {
             await logRefusedSend('send_broadcast', site.id, sendClass, resolved, { audience: segment_id ? { segment_id } : { inline_rules: true } });
@@ -1577,7 +1576,7 @@ export function registerCampaignTools(server) {
                 content = { subject: subject ?? generated.subject, body_html: generated.body_html, body_text: generated.body_text, blocks: generated.blocks };
             }
             catch (error) {
-                return j({ error: error instanceof Error ? error.message : String(error), code: 'DRAFT_FAILED' });
+                return j({ error: error instanceof Error ? dbToolError(error).error : String(error), code: 'DRAFT_FAILED' });
             }
         }
         else {
@@ -1717,7 +1716,7 @@ export function registerCampaignTools(server) {
             query = query.eq('category', category);
         const { data, error } = await query;
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j(data ?? []);
     });
     server.registerTool('clone_sequence_template', {
@@ -1742,7 +1741,7 @@ export function registerCampaignTools(server) {
             .eq('id', template_id)
             .maybeSingle();
         if (templateError)
-            return txt(`Error: ${templateError.message}`);
+            return txt(`Error: ${dbToolError(templateError).error}`);
         if (!template)
             return txt('Error: Template not found');
         const limit = await checkPlanLimit('active_campaigns');
@@ -1757,7 +1756,7 @@ export function registerCampaignTools(server) {
                 .eq('project_id', projectId)
                 .maybeSingle();
             if (targetSiteError)
-                return txt(`Error: ${targetSiteError.message}`);
+                return txt(`Error: ${dbToolError(targetSiteError).error}`);
             if (!targetSite)
                 return txt('Error: Site not found for this project');
         }
@@ -1771,7 +1770,7 @@ export function registerCampaignTools(server) {
                 .limit(1)
                 .maybeSingle();
             if (siteError)
-                return txt(`Error: ${siteError.message}`);
+                return txt(`Error: ${dbToolError(siteError).error}`);
             targetSiteId = site?.id ?? null;
         }
         if (!targetSiteId) {
@@ -1790,7 +1789,7 @@ export function registerCampaignTools(server) {
             .select()
             .single();
         if (campaignError)
-            return txt(`Error creating campaign: ${campaignError.message}`);
+            return txt(`Error creating campaign: ${dbToolError(campaignError).error}`);
         const steps = Array.isArray(template.template?.steps) ? template.template.steps : [];
         if (steps.length > 0) {
             const { error: stepsError } = await db()
@@ -1807,7 +1806,7 @@ export function registerCampaignTools(server) {
                 condition_lookback_hours: step.condition_lookback_hours ?? null,
             })));
             if (stepsError)
-                return txt(`Campaign created but steps failed: ${stepsError.message}`);
+                return txt(`Campaign created but steps failed: ${dbToolError(stepsError).error}`);
         }
         await logAudit({
             action: 'sequence_template.cloned',
@@ -2026,7 +2025,7 @@ Adapt your tone accordingly:
                     .select('id')
                     .single();
                 if (segErr)
-                    return txt(`Error creating segment: ${segErr.message}`);
+                    return txt(`Error creating segment: ${dbToolError(segErr).error}`);
                 segId = seg.id;
             }
             const campLimit = await checkPlanLimit('active_campaigns');
@@ -2038,7 +2037,7 @@ Adapt your tone accordingly:
                 .select('id')
                 .single();
             if (campErr)
-                return txt(`Error creating campaign: ${campErr.message}`);
+                return txt(`Error creating campaign: ${dbToolError(campErr).error}`);
             const steps = [];
             for (let i = 0; i < plan.steps.length; i++) {
                 const planned = plan.steps[i];
@@ -2053,7 +2052,7 @@ Adapt your tone accordingly:
                     .select('id, step_order, subject')
                     .single();
                 if (stepErr)
-                    return txt(`Error adding step ${i}: ${stepErr.message}`);
+                    return txt(`Error adding step ${i}: ${dbToolError(stepErr).error}`);
                 steps.push(step);
             }
             const enrollRows = plan.contact_ids.map((id) => ({ campaign_id: campaign.id, contact_id: id, next_send_at: new Date().toISOString() }));
@@ -2087,7 +2086,7 @@ Adapt your tone accordingly:
                 .eq('action', 'launch_campaign')
                 .maybeSingle();
             if (rowErr)
-                return txt(`Error reading approval ${approval_id}: ${rowErr.message}`);
+                return txt(`Error reading approval ${approval_id}: ${dbToolError(rowErr).error}`);
             if (!row)
                 return txt(`Approval ${approval_id} is not_found. Request a new approval.`);
             const stored = (row.params ?? {});
@@ -2682,7 +2681,7 @@ Do not include body_html in your response; Sendinel renders body_html from block
             ensureReplyActionSecretConfigured();
         }
         catch (err) {
-            return txt(`Error: ${err instanceof Error ? err.message : 'Reply action secret is not configured'}`);
+            return txt(`Error: ${err instanceof Error ? dbToolError(err).error : 'Reply action secret is not configured'}`);
         }
         // Suppression check
         const { data: suppression } = await db()
@@ -2732,7 +2731,7 @@ Do not include body_html in your response; Sendinel renders body_html from block
                 .eq('project_id', projectId)
                 .maybeSingle();
             if (templateError)
-                return txt(`Error: ${templateError.message}`);
+                return txt(`Error: ${dbToolError(templateError).error}`);
             if (!template)
                 return txt('Error: Template not found');
             const { data: project } = await adminDb().from('projects').select('brand_settings').eq('id', projectId).maybeSingle();
@@ -2814,7 +2813,7 @@ Do not include body_html in your response; Sendinel renders body_html from block
             }
         }
         if (logError || !logRow?.id) {
-            return txt(`Error: ${logError?.message ?? 'Failed to create email log row'}`);
+            return txt(`Error: ${(logError ? dbToolError(logError).error : undefined) ?? 'Failed to create email log row'}`);
         }
         let minted;
         try {
@@ -2853,7 +2852,7 @@ Do not include body_html in your response; Sendinel renders body_html from block
         }
         catch (error) {
             await db().from('email_log').update({ status: 'failed' }).eq('id', logRow.id);
-            return txt(`Error: Send failed — ${error instanceof Error ? error.message : 'unknown provider error'}`);
+            return txt(`Error: Send failed — ${error instanceof Error ? dbToolError(error).error : 'unknown provider error'}`);
         }
         await db().from('email_log').update({
             status: 'sent',
@@ -2896,7 +2895,7 @@ Do not include body_html in your response; Sendinel renders body_html from block
             .limit(1)
             .maybeSingle();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (!data)
             return j({ found: false, correlation_id });
         const outcome = data.status === 'pending' ? 'awaiting'
@@ -2929,7 +2928,7 @@ Do not include body_html in your response; Sendinel renders body_html from block
             .order('created_at', { ascending: false })
             .limit(limit);
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         const items = (data ?? []).map((row) => ({
             ...row,
             outcome: row.status === 'pending' ? 'awaiting'
@@ -3230,7 +3229,7 @@ Return ONLY valid JSON with this exact shape:
             .select()
             .single();
         if (campErr)
-            return txt(`Failed to create campaign: ${campErr.message}`);
+            return txt(`Failed to create campaign: ${dbToolError(campErr).error}`);
         // 2. Add steps
         const stepInserts = steps.map((s, i) => ({
             campaign_id: campaign.id,
@@ -3246,7 +3245,7 @@ Return ONLY valid JSON with this exact shape:
             .from('campaign_steps')
             .insert(stepInserts);
         if (stepErr)
-            return txt(`Campaign created (${campaign.id}) but failed to add steps: ${stepErr.message}`);
+            return txt(`Campaign created (${campaign.id}) but failed to add steps: ${dbToolError(stepErr).error}`);
         // 3. Enroll segment if provided
         let enrolled = 0;
         if (segment_id) {
@@ -3335,14 +3334,14 @@ Return ONLY valid JSON with this exact shape:
             .eq('project_id', projectId)
             .maybeSingle();
         if (campaignErr || !campaign)
-            return j({ error: campaignErr?.message ?? 'Campaign not found', code: 'NOT_FOUND' });
+            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_property, send_only_if_property, created_at, updated_at')
             .eq('campaign_id', campaign_id)
             .order('step_order', { ascending: true });
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ steps: data ?? [], count: data?.length ?? 0 });
     });
     server.registerTool('update_campaign_step', {
@@ -3391,7 +3390,7 @@ Return ONLY valid JSON with this exact shape:
             .eq('id', step_id)
             .maybeSingle();
         if (stepErr || !step)
-            return j({ error: stepErr?.message ?? 'Step not found', code: 'NOT_FOUND' });
+            return j({ error: (stepErr ? dbToolError(stepErr).error : undefined) ?? 'Step not found', code: 'NOT_FOUND' });
         const { data: campaign } = await db()
             .from('campaigns')
             .select('id')
@@ -3424,7 +3423,7 @@ Return ONLY valid JSON with this exact shape:
             .select('id, step_order, subject, delay_days, delay_hours, skip_if_event, send_only_if_event, skip_if_property, send_only_if_property, updated_at')
             .single();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         await logAudit({ action: 'campaign.step_updated', resourceType: 'campaign_step', resourceId: data.id, details: { property_rules: properties.rules } });
         return j({ step: data, ok: true });
     });
@@ -3463,7 +3462,7 @@ Return ONLY valid JSON with this exact shape:
             .delete()
             .eq('id', step_id);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ ok: true, deleted: step_id });
     }));
     server.registerTool('delete_campaign', {
@@ -3495,7 +3494,7 @@ Return ONLY valid JSON with this exact shape:
             .eq('id', campaign_id)
             .eq('project_id', projectId);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ success: true, deleted: campaign.name });
     }));
     server.registerTool('set_campaign_trigger', {
@@ -3524,7 +3523,7 @@ Return ONLY valid JSON with this exact shape:
             .select(TRIGGER_EDIT_SELECT)
             .eq('id', args.campaign_id).eq('project_id', projectId).maybeSingle();
         if (loadError)
-            return j({ error: loadError.message });
+            return j(dbToolError(loadError));
         if (!existing)
             return j({ error: 'Campaign not found', code: 'NOT_FOUND' });
         if (!['draft', 'active', 'paused'].includes(existing.status)) {
@@ -3618,7 +3617,7 @@ Return ONLY valid JSON with this exact shape:
         if (send_at !== undefined && send_at !== null) {
             const { data: existing, error: fetchError } = await getExisting();
             if (fetchError)
-                return j({ error: fetchError.message });
+                return j(dbToolError(fetchError));
             if (!existing)
                 return j({ error: 'Campaign not found', code: 'NOT_FOUND' });
             campaignType = existing.type;
@@ -3626,7 +3625,7 @@ Return ONLY valid JSON with this exact shape:
         if (type !== undefined) {
             const { data: existing, error: fetchError } = await getExisting();
             if (fetchError)
-                return j({ error: fetchError.message });
+                return j(dbToolError(fetchError));
             if (!existing)
                 return j({ error: 'Campaign not found', code: 'NOT_FOUND' });
             if (type !== existing.type) {
@@ -3641,7 +3640,7 @@ Return ONLY valid JSON with this exact shape:
         if (hasTriggerUpdate) {
             const { data: existing, error: fetchError } = await getExisting();
             if (fetchError)
-                return j({ error: fetchError.message });
+                return j(dbToolError(fetchError));
             if (!existing)
                 return j({ error: 'Campaign not found', code: 'NOT_FOUND' });
             existingCampaignForTargeting = existing;
@@ -3697,7 +3696,7 @@ Return ONLY valid JSON with this exact shape:
             const result = await db().from('campaigns').update({ ...updates, updated_at: new Date().toISOString() })
                 .eq('id', campaign_id).eq('project_id', projectId).select().single();
             if (result.error)
-                return j({ error: result.error.message });
+                return j(dbToolError(result.error));
             data = result.data;
             await logAudit({ action: 'campaign.updated', resourceType: 'campaign', resourceId: campaign_id, details: { updates } });
         }
@@ -3730,7 +3729,7 @@ Return ONLY valid JSON with this exact shape:
             .eq('project_id', projectId)
             .maybeSingle();
         if (campErr || !campaign)
-            return j({ error: campErr?.message ?? 'Campaign not found', code: 'NOT_FOUND' });
+            return j({ error: (campErr ? dbToolError(campErr).error : undefined) ?? 'Campaign not found', code: 'NOT_FOUND' });
         const [{ data: steps, error: stepsError }, { count: enrollCount, error: enrollError }, { count: sentCount, error: sentError }, { count: queuedEmailCount, error: queuedEmailError }, { count: failedSendCount, error: failedSendError }, { data: queueRows, error: queueError }, { count: dlqUnresolvedCount, error: dlqError },] = await Promise.all([
             db()
                 .from('campaign_steps')
@@ -3775,7 +3774,7 @@ Return ONLY valid JSON with this exact shape:
         ]);
         const visibilityError = stepsError ?? enrollError ?? sentError ?? queuedEmailError ?? failedSendError ?? queueError ?? dlqError;
         if (visibilityError)
-            return j({ error: visibilityError.message, code: 'CAMPAIGN_VISIBILITY_QUERY_FAILED' });
+            return j({ ...dbToolError(visibilityError), code: 'CAMPAIGN_VISIBILITY_QUERY_FAILED' });
         const periods = await readCampaignPeriods(db(), projectId, campaign);
         const outstandingRows = queueRows ?? [];
         const pendingOrRetryRows = outstandingRows.filter((row) => row.status !== 'processing');
@@ -3840,7 +3839,7 @@ Return ONLY valid JSON with this exact shape:
             .eq('campaign_id', campaign_id)
             .eq('contact_id', contact_id);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ success: true });
     });
     // #3348 - campaign branching and goals were fully built (schema, engine, dashboard API)
@@ -3869,7 +3868,7 @@ Return ONLY valid JSON with this exact shape:
             query = query.eq('from_step_id', step_id);
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ campaign_id, branches: data ?? [], count: (data ?? []).length });
     });
     server.registerTool('add_campaign_branch', {
@@ -3941,7 +3940,7 @@ Return ONLY valid JSON with this exact shape:
             .eq('id', branch_id)
             .eq('campaign_id', campaign_id);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         await logAudit({ action: 'remove_campaign_branch', resourceType: 'campaign', resourceId: campaign_id, details: { branch_id } }).catch(() => { });
         return j({ success: true, removed: branch_id });
     });
@@ -3959,7 +3958,7 @@ Return ONLY valid JSON with this exact shape:
             .eq('campaign_id', campaign_id)
             .order('created_at', { ascending: true });
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ campaign_id, goals: data ?? [], count: (data ?? []).length });
     });
     server.registerTool('set_campaign_goal', {
@@ -3995,7 +3994,7 @@ Return ONLY valid JSON with this exact shape:
             .select('id, goal_type, goal_value, action, target_campaign_id')
             .single();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         await logAudit({ action: 'set_campaign_goal', resourceType: 'campaign', resourceId: campaign_id, details: { goal_id: data?.id, goal_type, goal_action: resolvedAction } }).catch(() => { });
         return j({ success: true, goal: data });
     });
@@ -4013,7 +4012,7 @@ Return ONLY valid JSON with this exact shape:
             .eq('id', goal_id)
             .eq('campaign_id', campaign_id);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         await logAudit({ action: 'remove_campaign_goal', resourceType: 'campaign', resourceId: campaign_id, details: { goal_id } }).catch(() => { });
         return j({ success: true, removed: goal_id });
     });