@sendinel/mcp-server 1.0.146 → 1.0.148

package/build/tools/compound.js

@@ -6,6 +6,7 @@ import { getProjectId } from '../project.js';
 import { buildVoicePrompt, deriveTemplateVariables } from '../lib/voice.js';
 import { parseModelJson, getAnthropicFastModelId } from '../anthropic-model.js';
 import { BLOCK_GENERATION_SCHEMA, blocksToHtml, blocksToText, normalizeComposerBlocks } from '../lib/composer-blocks.js';
+import { dbToolError } from '../lib/db-error.js';
 // Haiku 5.5 (fast role) thinks before answering; thinking counts toward max_tokens (#4193).
 const FAST_MIN_MAX_TOKENS = 8000;
 const j = (data) => ({ content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] });
@@ -128,13 +129,13 @@ Respond with a JSON array.`,
             .select('id')
             .single();
         if (templateErr)
-            return j({ error: `Template creation failed: ${templateErr.message}` });
+            return j({ error: `Template creation failed: ${dbToolError(templateErr).error}` });
         const { data: campaign, error: campaignErr } = await sb.from('campaigns')
             .insert({ name: campaign_name, site_id, project_id: projectId, type: campaign_type, status: 'draft' })
             .select('id, name, status')
             .single();
         if (campaignErr)
-            return j({ error: `Campaign creation failed: ${campaignErr.message}` });
+            return j({ error: `Campaign creation failed: ${dbToolError(campaignErr).error}` });
         const createdSteps = [];
         for (let i = 0; i < steps.length; i++) {
             const step = steps[i];
@@ -153,7 +154,7 @@ Respond with a JSON array.`,
                 .select('id, step_order, subject')
                 .single();
             if (error)
-                return j({ error: `Step ${i + 1} creation failed: ${error.message}`, campaign_id: campaign.id });
+                return j({ error: `Step ${i + 1} creation failed: ${dbToolError(error).error}`, campaign_id: campaign.id });
             createdSteps.push(data);
         }
         return j({
@@ -236,7 +237,7 @@ Respond with JSON: { "subject": "...", "blocks": [...], "body_text": "..." }`,
             .select('id, name, subject_hint, created_at')
             .single();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ ok: true, template, preview: generated });
     });
     server.registerTool('diagnose_delivery_issue', {
@@ -354,7 +355,7 @@ Identify the most likely root cause and give 3-5 concise actionable next steps.`
             .select('id, name, provider, status, dns_records')
             .single();
         if (domainErr)
-            return j({ error: `Domain registration failed: ${domainErr.message}` });
+            return j({ error: `Domain registration failed: ${dbToolError(domainErr).error}` });
         const { data: site, error: siteErr } = await sb.from('sites')
             .insert({
             project_id: projectId,
@@ -372,7 +373,7 @@ Identify the most likely root cause and give 3-5 concise actionable next steps.`
             .select('id, name, slug, sending_domain, from_name, from_email, provider, created_at')
             .single();
         if (siteErr)
-            return j({ error: `Site creation failed: ${siteErr.message}` });
+            return j({ error: `Site creation failed: ${dbToolError(siteErr).error}` });
         const warmupPlan = [];
         let volume = Math.max(10, Math.floor(daily_send_volume * 0.05));
         for (let day = 1; day <= 14; day += 3) {

package/build/tools/connector.js

@@ -4,6 +4,7 @@ import { getProjectId } from '../project.js';
 import { listConnectorTablesFromDb } from '../lib/connector-table-discovery.js';
 import { callSendinelV1 } from '../lib/v1-client.js';
 import { assertChannelCanExecute, checkApproval, currentChannelContext, requestApproval, } from '../lib/action-approvals.js';
+import { dbToolError } from '../lib/db-error.js';
 const j = (data) => ({ content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] });
 const SECRET_RESPONSE_KEYS = new Set([
     'connector_supabase_key_enc',
@@ -144,7 +145,7 @@ export function registerConnectorTools(server) {
             data = await getConnectorStatus();
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Connector status query failed' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Connector status query failed' });
         }
         if (!data || typeof data !== 'object' || typeof data.viewInstalled !== 'boolean') {
             return j({ error: 'Connector status did not include the required viewInstalled boolean.' });
@@ -166,7 +167,7 @@ export function registerConnectorTools(server) {
         const { data: project, error } = await adminDb().schema('email').from('projects')
             .select('connector_type').eq('id', projectId).maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         if (project?.connector_type !== 'byod') {
             return j({ error: 'Connect your Supabase database in Settings before importing from it.' });
         }
@@ -174,7 +175,7 @@ export function registerConnectorTools(server) {
             return j({ tables: await listConnectorTablesFromDb(db()) });
         }
         catch (tableError) {
-            return j({ error: tableError instanceof Error ? tableError.message : 'Could not list database tables' });
+            return j({ error: tableError instanceof Error ? dbToolError(tableError).error : 'Could not list database tables' });
         }
     });
     server.registerTool('install_connector_schema', {

package/build/tools/contacts.js

@@ -1,5 +1,4 @@
 import { normalizeTagInput, tagInputWarnings } from '../lib/tags.js';
-import { dbErrorResult } from '../lib/db-errors.js';
 import { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { CONTACT_ENRICHMENT_PROVIDERS } from '@desler/models';
 import { createContactEnrichmentAdapters, enrichContactFromConnections, } from '@desler/models/contact-enrichment';
@@ -8,7 +7,7 @@ import { z } from 'zod';
 import { callSendinelV1 } from '../lib/v1-client.js';
 import { db, projectClientForWriteback } 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 { resolveSegmentContactIds } from '../lib/send-audience.js';
 import { checkPlanLimit, contactLimitMessage } from '../plan-limits.js';
 import { logConsent, logAudit } from '../audit.js';
@@ -336,7 +335,7 @@ async function resolveSubscriberViewSiteId(projectId, siteParam) {
         .eq('active', true)
         .order('name');
     if (error)
-        return { error: error.message };
+        return { ...dbToolError(error) };
     const all = (sites ?? []);
     if (SUBSCRIBER_VIEW_UUID_RE.test(siteParam)) {
         return { siteId: all.some((site) => site.id === siteParam) ? siteParam : undefined };
@@ -426,7 +425,7 @@ function isMissingRelationshipError(error) {
         return false;
     if (error.code === 'PGRST200')
         return true;
-    return /could not find a relationship/i.test(error.message ?? '');
+    return /could not find a relationship/i.test((error ? dbToolError(error).error : undefined) ?? '');
 }
 async function hasCompaniesEmbed(projectId) {
     const cached = companiesEmbedCache.get(projectId);
@@ -575,7 +574,7 @@ async function exportSubscriberData(projectId, contactId) {
         .eq('project_id', projectId)
         .maybeSingle();
     if (contactError)
-        return { error: contactError.message };
+        return { ...dbToolError(contactError) };
     if (!contact)
         return { error: 'Subscriber not found', code: 'NOT_FOUND' };
     const { data: emailHistory, error: logError } = await db()
@@ -586,7 +585,7 @@ async function exportSubscriberData(projectId, contactId) {
         .not('to_email', 'like', 'sha256:%')
         .order('sent_at', { ascending: false });
     if (logError)
-        return { error: logError.message };
+        return { ...dbToolError(logError) };
     const { data: suppression, error: suppressionError } = await db()
         .from('suppressions')
         .select('reason, created_at')
@@ -595,7 +594,7 @@ async function exportSubscriberData(projectId, contactId) {
         .not('email', 'like', 'sha256:%')
         .maybeSingle();
     if (suppressionError)
-        return { error: suppressionError.message };
+        return { ...dbToolError(suppressionError) };
     return {
         contact: {
             id: contact.id,
@@ -714,7 +713,7 @@ export function registerContactTools(server) {
     }, async () => {
         const { data, error } = await db().from('hygiene_config').select('*').eq('project_id', getProjectId()).maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j(data ?? { enabled: false, inactive_days: 90, action: 'tag', tag_name: 'cold', suppress_after_days: 180, activity_property: null, last_run_at: null });
     });
     server.registerTool('update_hygiene_config', {
@@ -747,7 +746,7 @@ export function registerContactTools(server) {
             row.activity_property = activityProperty;
         const { error } = await db().from('hygiene_config').upsert(row, { onConflict: 'project_id' });
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ updated: true });
     });
     server.registerTool('run_list_hygiene', {
@@ -767,7 +766,7 @@ export function registerContactTools(server) {
         // read past 1000 is now safe as a follow-up.
         const { data: contacts, error: readError } = await db().from('subscribers').select('id, email, first_name, last_name, custom_properties, tags, last_engaged_at').eq('project_id', projectId).lt('last_engaged_at', cutoff).limit(1000);
         if (readError)
-            return j({ error: readError.message });
+            return j(dbToolError(readError));
         let tagged = 0;
         let skipped = 0;
         let failed = 0;
@@ -908,7 +907,7 @@ export function registerContactTools(server) {
             q = q.contains('tags', [`segment:${segmentId}`]);
         const { data: sample, error } = await q;
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         const apiKey = process.env.ANTHROPIC_API_KEY;
         if (!apiKey)
             return j({ error: 'ANTHROPIC_API_KEY not configured', code: 'AI_UNAVAILABLE' });
@@ -984,7 +983,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 .eq('project_id', projectId)
                 .maybeSingle();
             if (viewError)
-                return txt(`Error: ${viewError.message}`);
+                return txt(`Error: ${dbToolError(viewError).error}`);
             if (!view)
                 return txt('Error: View not found');
             viewFilters = normalizeSubscriberViewFilters(view.filters);
@@ -1050,7 +1049,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 .select('contact_id, subscribed')
                 .eq('site_id', statusSiteId);
             if (siteSubscriptionsError)
-                return txt(`Error: ${siteSubscriptionsError.message}`);
+                return txt(`Error: ${dbToolError(siteSubscriptionsError).error}`);
             if (viewStatus === 'not_subscribed') {
                 const subscribedIds = (siteSubscriptions ?? [])
                     .map((subscription) => subscription.contact_id)
@@ -1082,7 +1081,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
         }
         const { data, error } = await q;
         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('list_subscriber_views', {
@@ -1102,7 +1101,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .eq('project_id', getProjectId())
             .order('created_at', { ascending: true });
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j({ views: data ?? [] });
     });
     server.registerTool('create_subscriber_view', {
@@ -1220,7 +1219,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .select('id')
             .maybeSingle();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (!data)
             return txt('View not found');
         return j({ deleted: true, view_id });
@@ -1251,7 +1250,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
         }
         const { data: companies, error } = await query;
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         const rows = companies ?? [];
         if (!rows.length)
             return j([]);
@@ -1266,7 +1265,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 .order('id')
                 .range(offset, offset + 999);
             if (subscriberError)
-                return txt(`Error: ${subscriberError.message}`);
+                return txt(`Error: ${dbToolError(subscriberError).error}`);
             for (const subscriber of subscribers ?? []) {
                 const companyId = typeof subscriber.company_id === 'string' ? subscriber.company_id : null;
                 if (!companyId)
@@ -1531,7 +1530,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .upsert(rows, { onConflict: 'project_id,email', ignoreDuplicates: false })
             .select('id, email, first_name, last_name, custom_properties');
         if (uErr)
-            return { content: [{ type: 'text', text: `Error: ${uErr.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(uErr).error}` }] };
         const contactRows = upserted ?? [];
         const subRows = contactRows.map((c) => ({ contact_id: c.id, site_id, subscribed: true }));
         if (subRows.length) {
@@ -1564,7 +1563,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .select('id, email, first_name, last_name, custom_properties')
             .single();
         if (error)
-            return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(error).error}` }] };
         if (data) {
             // Cascade to site subscriptions
             await db()
@@ -1637,7 +1636,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             q = q.ilike('subject', `%${subject_contains.replace(/[\\%_]/g, (c) => `\\${c}`)}%`);
         const { data, error } = await q;
         if (error)
-            return { content: [{ type: 'text', text: `Error: ${error.message}` }] };
+            return { content: [{ type: 'text', text: `Error: ${dbToolError(error).error}` }] };
         const fetched = (data ?? []);
         const hasMore = fetched.length > pageSize;
         // source: where the email came from. A campaign id wins; otherwise the stored category (transactional, test, marketing).
@@ -1672,7 +1671,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             q = q.eq('reason', reason);
         const { data, error } = await q;
         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('add_suppression', {
@@ -1696,7 +1695,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .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, null, 2) }] };
     });
     server.registerTool('list_subscribers_by_segment', {
@@ -1735,7 +1734,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 segmentIds = await resolveSegmentContactIds(projectId, segment.rules);
             }
             catch (error) {
-                return toolError(isSegmentRulesError(error) ? { error: error.message, code: 'validation_failed' } : { error: 'Unable to evaluate segment', code: 'internal_error' });
+                return toolError(isSegmentRulesError(error) ? { ...dbToolError(error), code: 'validation_failed' } : { error: 'Unable to evaluate segment', code: 'internal_error' });
             }
             if (!segmentIds.length)
                 return j([]);
@@ -2045,7 +2044,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             return txt('Provide either contact_id or email.');
         const { data, error } = await q.maybeSingle();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j(data);
     });
     server.registerTool('enrich_subscriber', {
@@ -2071,7 +2070,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .eq('id', contact_id)
             .maybeSingle();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (!contact?.email)
             return j({ error: 'Subscriber not found', code: 'NOT_FOUND' });
         const enriched = await enrichContactFromProviders(projectId, contact.email, provider);
@@ -2109,7 +2108,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .select(embedOk ? '*, company:companies(id, name, domain)' : '*')
             .single();
         if (updateError)
-            return txt(`Error: ${updateError.message}`);
+            return txt(`Error: ${dbToolError(updateError).error}`);
         const appliedFields = [];
         if (!contact.first_name && enriched.firstName)
             appliedFields.push('first_name');
@@ -2355,7 +2354,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             }
             catch (error) {
                 if (isSegmentRulesError(error))
-                    return txt(`Error: ${error.message}`);
+                    return txt(`Error: ${dbToolError(error).error}`);
                 throw error;
             }
         }
@@ -2380,7 +2379,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
         }
         const { data, error } = await q.order('engagement_score', { ascending: false }).limit(sampleSize);
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         // Get full count separately
         let countQ = db()
             .from('subscribers')
@@ -2466,7 +2465,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 .order('email')
                 .range(offset, offset + 999);
             if (suppressionError)
-                return txt(`Error: ${suppressionError.message}`);
+                return txt(`Error: ${dbToolError(suppressionError).error}`);
             for (const suppression of suppressed ?? [])
                 suppressedSet.add(suppression.email);
             if ((suppressed ?? []).length < 1000)
@@ -2474,7 +2473,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
         }
         const { data: contacts, error } = await q.order('engagement_score', { ascending: true }).limit(sampleLimit);
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         const inactive = (contacts ?? []).filter((c) => !suppressedSet.has(c.email));
         if (!dry_run && inactive.length > 0) {
             const channelContext = currentChannelContext();
@@ -2506,7 +2505,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 .from('suppressions')
                 .upsert(suppressionRows, { onConflict: 'project_id,email', ignoreDuplicates: true });
             if (supErr)
-                return txt(`Error suppressing: ${supErr.message}`);
+                return txt(`Error suppressing: ${dbToolError(supErr).error}`);
             return j({ suppressed: inactive.length, days_threshold: days, sample: inactive });
         }
         return j({
@@ -2542,7 +2541,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .select()
             .single();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (!data)
             return txt(`No suppression found for ${email}.`);
         return j({ removed: true, email, previous_reason: data.reason });
@@ -2625,7 +2624,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             for (const ids of chunkIds(siteIds)) {
                 const part = await scanChunk(ids);
                 if (!part.ok)
-                    return txt(`Error: ${part.error.message}`);
+                    return txt(`Error: ${dbToolError(part.error).error}`);
                 all.push(...part.rows);
                 total = total === null || part.total === null ? null : total + part.total;
             }
@@ -2637,7 +2636,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             scan = await scanChunk(siteIds);
         }
         if (!scan.ok)
-            return txt(`Error: ${scan.error.message}`);
+            return txt(`Error: ${dbToolError(scan.error).error}`);
         const contacts = scan.rows;
         // #3604: say when the scan stopped at the limit instead of presenting a partial scan as complete.
         const scanned = contacts?.length ?? 0;
@@ -2713,7 +2712,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             p_source_ids: source_ids,
         });
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         logAudit({ action: 'contacts.merged', resourceType: 'contact', resourceId: target_id, details: { source_ids, result: data } });
         return j(data);
     });
@@ -2737,7 +2736,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
                 ...(siteScope ? { p_site_id: siteScope } : {}),
             });
             if (error)
-                return { error: `Error: ${error.message}` };
+                return { error: `Error: ${dbToolError(error).error}` };
             const result = (Array.isArray(data) ? data[0] : data);
             if (typeof result?.has_membership !== 'boolean' || !Array.isArray(result.keys)) {
                 return { error: 'Error: get_contact_schema_keys returned an unreadable result' };
@@ -2842,7 +2841,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
         if (error) {
             if (error.code === '23505')
                 return contactInputError('conflict', `Error: A custom field with key "${key}" already exists.`);
-            return j({ error: `Error: ${error.message}`, code: 'INTERNAL_ERROR' });
+            return j({ error: `Error: ${dbToolError(error).error}`, code: 'INTERNAL_ERROR' });
         }
         await logAudit({
             action: 'custom_field.created',
@@ -2873,7 +2872,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .eq('project_id', projectId)
             .maybeSingle();
         if (currentError)
-            return txt(`Error: ${currentError.message}`);
+            return txt(`Error: ${dbToolError(currentError).error}`);
         if (!current)
             return j({ error: 'Custom field not found', code: 'NOT_FOUND' });
         const nextType = (type ?? current.type);
@@ -2899,7 +2898,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .select('id, key, label, type, required, options, display_order')
             .maybeSingle();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (!data)
             return j({ error: 'Custom field not found', code: 'NOT_FOUND' });
         await logAudit({
@@ -2925,7 +2924,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             .select('id, key')
             .maybeSingle();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (!data)
             return j({ error: 'Custom field not found', code: 'NOT_FOUND' });
         await logAudit({
@@ -2952,7 +2951,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
     }, async ({ contact_id, window_hours }) => {
         const { data, error } = await getContactNeighborhood(db(), getProjectId(), contact_id, window_hours);
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (data == null)
             return j({ error: 'Subscriber not found', code: 'NOT_FOUND' });
         return j({ ...data, attention: buildPreviewAttentionEnvelope() });
@@ -2973,7 +2972,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
     }, async ({ contact_id, window_hours }) => {
         const { data, error } = await getScheduledTouches(db(), getProjectId(), contact_id, window_hours);
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (data == null)
             return j({ error: 'Subscriber not found', code: 'NOT_FOUND' });
         return j({ ...data, attention: buildPreviewAttentionEnvelope() });
@@ -3000,7 +2999,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             enrollmentId: enrollment_id,
         });
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (data == null)
             return j({ error: 'Not found', code: 'NOT_FOUND' });
         return j(data);
@@ -3025,7 +3024,7 @@ Requirements: urgency without desperation, acknowledge the gap, one clear CTA, v
             }
             const { data, error } = await getContactNeighborhood(db(), getProjectId(), contactId);
             const payload = error
-                ? { error: error.message }
+                ? { ...dbToolError(error) }
                 : data == null
                     ? { error: 'Subscriber not found', code: 'NOT_FOUND' }
                     : data;

package/build/tools/content.js

@@ -133,7 +133,7 @@ export function registerContentTools(server) {
         if (error?.code === '23505')
             return j({ error: 'slug already exists', code: 'conflict' });
         if (error)
-            return j({ error: error.message, code: error.code });
+            return j({ ...dbToolError(error), code: error.code });
         const appUrl = process.env.NEXT_PUBLIC_APP_URL ?? process.env.SENDINEL_APP_URL ?? 'https://sendinel.ai';
         return j({ asset_link: { ...data, url: `${appUrl.replace(/\/$/, '')}/a/${data.slug}` } });
     });
@@ -160,7 +160,7 @@ export function registerContentTools(server) {
             query = query.eq('status', status);
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         const appUrl = (process.env.NEXT_PUBLIC_APP_URL ?? process.env.SENDINEL_APP_URL ?? 'https://sendinel.ai').replace(/\/$/, '');
         return j({ asset_links: (data ?? []).map((row) => ({ ...row, url: `${appUrl}/a/${row.slug}` })) });
     });
@@ -192,7 +192,7 @@ export function registerContentTools(server) {
             .order('viewed_at', { ascending: false })
             .limit(limit);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ views: data ?? [] });
     });
     server.registerTool('list_content_blocks', {
@@ -211,7 +211,7 @@ export function registerContentTools(server) {
             query = query.eq('category', category);
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ blocks: data ?? [] });
     });
     server.registerTool('create_content_block', {
@@ -258,7 +258,7 @@ export function registerContentTools(server) {
     }, withApproval('delete_content_block', async ({ block_id }) => {
         const { error } = await db().from('content_blocks').delete().eq('project_id', getProjectId()).eq('id', block_id);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ deleted: true });
     }));
     server.registerTool('list_content_sources', {
@@ -277,7 +277,7 @@ export function registerContentTools(server) {
             .eq('project_id', getProjectId())
             .order('created_at', { ascending: false });
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ sources: (data ?? []).map((row) => ({ id: row.id, name: row.name, type: row.source_type, url: row.feed_url, active: row.active, last_fetched: row.last_polled_at, draft_count: row.items_generated ?? 0 })) });
     });
     server.registerTool('trigger_content_pipeline', {
@@ -296,7 +296,7 @@ export function registerContentTools(server) {
             query = query.eq('id', source_id);
         const { error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ drafts_created: 0, queued_for_pipeline: true });
     });
     // Blogs (#2033): the primary agent door for ingesting a blog written by the
@@ -350,7 +350,7 @@ export function registerContentTools(server) {
                 .eq('project_id', getProjectId())
                 .eq('is_active', true);
             if (destErr)
-                return j({ error: destErr.message });
+                return j(dbToolError(destErr));
             const target = publish_to.trim().toLowerCase();
             const match = (dests ?? []).find((d) => d.id === publish_to || String(d.name ?? '').toLowerCase() === target);
             if (!match) {
@@ -382,7 +382,7 @@ export function registerContentTools(server) {
             .select('id, title, slug, status, source, scheduled_at, created_at')
             .single();
         if (error)
-            return j({ error: error.message, code: error.code });
+            return j({ ...dbToolError(error), code: error.code });
         return j({ blog_post: data, ...(auto_publish ? { note: scheduled_at ? 'Scheduled — the publish worker will send it at scheduled_at.' : 'Queued for immediate publish — the worker publishes it within a few minutes.' } : {}) });
     }));
     server.registerTool('list_blog_posts', {
@@ -410,7 +410,7 @@ export function registerContentTools(server) {
             query = query.neq('status', 'archived');
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ blog_posts: data ?? [] });
     });
     server.registerTool('get_blog_post', {
@@ -432,7 +432,7 @@ export function registerContentTools(server) {
             .eq('id', blog_post_id)
             .maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         if (!data)
             return j({ error: 'Blog post not found', code: 'NOT_FOUND' });
         return j({ blog_post: data });
@@ -460,7 +460,7 @@ export function registerContentTools(server) {
             .eq('id', blog_post_id)
             .maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         if (!post)
             return j({ error: 'Blog post not found', code: 'NOT_FOUND' });
         const tags = Array.isArray(post.tags) ? post.tags.map((tag) => String(tag).toLowerCase()) : [];
@@ -499,7 +499,7 @@ export function registerContentTools(server) {
             .eq('id', blog_post_id)
             .maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         if (!post)
             return j({ error: 'Blog post not found', code: 'NOT_FOUND' });
         const scene = BLOG_IMAGE_SCENES.find((s) => s.id === scene_id);
@@ -542,7 +542,7 @@ export function registerContentTools(server) {
                 .select('id, title, cover_image_url, updated_at')
                 .maybeSingle();
             if (updateErr)
-                return j({ error: updateErr.message, code: updateErr.code });
+                return j({ ...dbToolError(updateErr), code: updateErr.code });
             await adminDb().from('audit_log').insert({
                 project_id: projectId,
                 org_id: post.org_id ?? null,
@@ -556,7 +556,7 @@ export function registerContentTools(server) {
             return j({ scene_id, format: chosenFormat, asset: generated.asset, prompt: generated.prompt, blog_post: updated });
         }
         catch (err) {
-            return j({ error: err instanceof Error ? err.message : 'Image generation failed', code: 'IMAGE_GENERATION_FAILED' });
+            return j({ error: err instanceof Error ? dbToolError(err).error : 'Image generation failed', code: 'IMAGE_GENERATION_FAILED' });
         }
     });
     server.registerTool('list_blog_destinations', {
@@ -576,7 +576,7 @@ export function registerContentTools(server) {
             .eq('is_active', true)
             .order('created_at', { ascending: false });
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ destinations: data ?? [] });
     });
 }