@sendinel/mcp-server 1.0.145 → 1.0.147

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 ?? [] });
     });
 }

package/build/tools/convert-imported.js

@@ -7,6 +7,7 @@ import { validateTemplate } from '../lib/voice.js';
 import { logAudit } from '../audit.js';
 import { eventKeysFromHistory, contactPropertyKeys } from '../lib/content-sources.js';
 import { loadSet, previewOf, writeCampaignDrafts } from './campaign-sets.js';
+import { dbToolError } from '../lib/db-error.js';
 /**
  * convert_imported_campaigns (#3689): turns campaigns imported from another platform (Customer.io
  * first) into new Sendinel drafts that can send. Call it without create to preview: converted
@@ -44,7 +45,7 @@ function reviewView(plan) {
             original_subject: email.original_subject,
             subject: email.subject,
             text: email.preview_text,
-            check_these: email.flags.map((flag) => ({ kind: flag.kind, message: flag.message, ...(flag.excerpt ? { where: flag.excerpt } : {}) })),
+            check_these: email.flags.map((flag) => ({ kind: flag.kind, message: dbToolError(flag).error, ...(flag.excerpt ? { where: flag.excerpt } : {}) })),
         })),
         ...(plan.blocking.length ? { must_fix: plan.blocking } : {}),
         ...(plan.notes.length ? { notes: plan.notes } : {}),
@@ -70,7 +71,7 @@ export function registerConvertImportedTools(server) {
             .eq('project_id', projectId)
             .in('id', ids);
         if (sourceErr)
-            return j({ error: sourceErr.message, code: 'CAMPAIGN_LOOKUP_FAILED' });
+            return j({ ...dbToolError(sourceErr), code: 'CAMPAIGN_LOOKUP_FAILED' });
         const byId = new Map((sources ?? []).map((c) => [c.id, c]));
         const missing = ids.filter((id) => !byId.has(id));
         if (missing.length)
@@ -83,7 +84,7 @@ export function registerConvertImportedTools(server) {
             .select('campaign_id, step_order, subject, body_html, body_text, delay_days, delay_hours')
             .in('campaign_id', ids);
         if (stepErr)
-            return j({ error: stepErr.message, code: 'STEP_LOOKUP_FAILED' });
+            return j({ ...dbToolError(stepErr), code: 'STEP_LOOKUP_FAILED' });
         const steps = (stepRows ?? []);
         // Event data seen in history, per trigger. A failed lookup is reported, never treated as "none".
         const historyNotes = [];
@@ -110,7 +111,7 @@ export function registerConvertImportedTools(server) {
             .eq('project_id', projectId)
             .in('metadata->>converted_from', ids);
         if (existingErr)
-            return j({ error: existingErr.message, code: 'CAMPAIGN_LOOKUP_FAILED' });
+            return j({ ...dbToolError(existingErr), code: 'CAMPAIGN_LOOKUP_FAILED' });
         const earlier = (existing ?? []);
         plans.forEach((plan) => {
             const twin = earlier.find((e) => e.metadata?.converted_from === plan.source_campaign_id && e.name === plan.name);
@@ -138,7 +139,7 @@ export function registerConvertImportedTools(server) {
         // Sender: the given one, the imports' own, 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 importSites = [...new Set(ids.map((id) => byId.get(id).site_id).filter(Boolean))];
         const pick = site_id ?? (importSites.length === 1 ? importSites[0] : sites?.length === 1 ? sites[0].id : null);
         const site = (sites ?? []).find((s) => s.id === pick);
@@ -170,7 +171,7 @@ export function registerConvertImportedTools(server) {
                 metadata: {
                     converted_from: plan.source_campaign_id,
                     converted_from_name: plan.source_name,
-                    review_flags: plan.emails.flatMap((email) => email.flags.map((flag) => ({ email: email.email, kind: flag.kind, message: flag.message, ...(flag.excerpt ? { excerpt: flag.excerpt } : {}) }))),
+                    review_flags: plan.emails.flatMap((email) => email.flags.map((flag) => ({ email: email.email, kind: flag.kind, message: dbToolError(flag).error, ...(flag.excerpt ? { excerpt: flag.excerpt } : {}) }))),
                 },
                 emails: plan.emails.map((email) => ({
                     subject: email.subject,
@@ -200,7 +201,7 @@ export function registerConvertImportedTools(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,

package/build/tools/data-proposals.js

@@ -3,6 +3,7 @@ import { z } from 'zod';
 import { db } from '../db.js';
 import { getProjectId } from '../project.js';
 import { getAnthropicModelId } from '../anthropic-model.js';
+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 engagementSnapshot(projectId) {
@@ -47,7 +48,7 @@ export function registerDataProposalTools(server) {
             .eq('id', projectId)
             .maybeSingle();
         if (projectError)
-            return txt(`Error: ${projectError.message}`);
+            return txt(`Error: ${dbToolError(projectError).error}`);
         if (!project)
             return txt('Project not found.');
         const snapshot = await engagementSnapshot(projectId);
@@ -76,7 +77,7 @@ export function registerDataProposalTools(server) {
             .select('*')
             .single();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j({ proposal: data });
     });
     server.registerTool('list_data_proposals', {
@@ -103,7 +104,7 @@ export function registerDataProposalTools(server) {
             query = query.eq('status', status);
         const { data, error } = await query;
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j({ proposals: data ?? [] });
     });
     server.registerTool('approve_data_proposal', {
@@ -127,7 +128,7 @@ export function registerDataProposalTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (proposalError)
-            return txt(`Error: ${proposalError.message}`);
+            return txt(`Error: ${dbToolError(proposalError).error}`);
         if (!proposal)
             return txt('Proposal not found.');
         if (!['pending', 'approved'].includes(proposal.status))
@@ -141,7 +142,7 @@ export function registerDataProposalTools(server) {
             .limit(1)
             .maybeSingle();
         if (siteError)
-            return txt(`Error: ${siteError.message}`);
+            return txt(`Error: ${dbToolError(siteError).error}`);
         if (!site)
             return txt('No active site available for draft conversion.');
         const { data: draft, error: draftError } = await db()
@@ -158,7 +159,7 @@ export function registerDataProposalTools(server) {
             .select('id')
             .single();
         if (draftError)
-            return txt(`Error: ${draftError.message}`);
+            return txt(`Error: ${dbToolError(draftError).error}`);
         const { data: updated, error: updateError } = await db()
             .from('data_proposals')
             .update({
@@ -171,7 +172,7 @@ export function registerDataProposalTools(server) {
             .select('*')
             .single();
         if (updateError)
-            return txt(`Error: ${updateError.message}`);
+            return txt(`Error: ${dbToolError(updateError).error}`);
         return j({ proposal: updated, draft_id: draft.id });
     });
 }

package/build/tools/data.js

@@ -7,6 +7,7 @@ import { normalizeActiveCampaignAccountUrl } from '../lib/url-validation.js';
 import { assertChannelCanExecute, checkApproval, currentChannelContext, requestApproval, withApproval } from '../lib/action-approvals.js';
 import { getProjectId } from '../project.js';
 import { logAudit } from '../audit.js';
+import { dbToolError } from '../lib/db-error.js';
 const j = (data) => ({ content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] });
 function generateApiKey() {
     const secret = `snk_${randomBytes(32).toString('hex')}`;
@@ -263,14 +264,14 @@ export function registerDataTools(server) {
                 query = query.eq('is_active', true);
             const { data, error } = await query;
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             return j({
                 platforms: CONNECTED_PLATFORMS.filter((platform) => platform !== 'kit'),
                 connections: (data ?? []).map(sanitizeConnection),
             });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to list connected platforms' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to list connected platforms' });
         }
     });
     server.registerTool('list_provider_credentials', {
@@ -309,9 +310,9 @@ export function registerDataTools(server) {
                 .limit(50);
             const [platformResult, importResult] = await Promise.all([platformQuery, importQuery]);
             if (platformResult.error)
-                return j({ error: platformResult.error.message });
+                return j(dbToolError(platformResult.error));
             if (importResult.error)
-                return j({ error: importResult.error.message });
+                return j(dbToolError(importResult.error));
             const mapRow = (row, source) => {
                 let credential;
                 try {
@@ -351,7 +352,7 @@ export function registerDataTools(server) {
             return j({ credentials: [...platformCredentials, ...importCredentials] });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to list provider credentials' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to list provider credentials' });
         }
     });
     server.registerTool('delete_provider_credential', {
@@ -389,7 +390,7 @@ export function registerDataTools(server) {
                 .eq('project_id', context.projectId)
                 .maybeSingle();
             if (credentialErr)
-                return j({ error: credentialErr.message });
+                return j(dbToolError(credentialErr));
             if (!credential)
                 return j({ error: 'Credential not found' });
             const provider = parsed.source === 'platform' ? credential.platform : credential.provider;
@@ -449,7 +450,7 @@ export function registerDataTools(server) {
                     .select('id, platform')
                     .maybeSingle();
                 if (error)
-                    return j({ error: error.message });
+                    return j(dbToolError(error));
                 if (!data)
                     return j({ error: 'Credential not found' });
                 await logAudit({
@@ -471,7 +472,7 @@ export function registerDataTools(server) {
                 .select('id, provider')
                 .maybeSingle();
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             if (!data)
                 return j({ error: 'Credential not found' });
             await logAudit({
@@ -483,7 +484,7 @@ export function registerDataTools(server) {
             return j({ deleted: true, id: credential_id, source: 'import', provider: data.provider });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to delete provider credential' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to delete provider credential' });
         }
     });
     server.registerTool('connect_platform', {
@@ -535,7 +536,7 @@ export function registerDataTools(server) {
                 .select('id, org_id, project_id, platform, display_name, config, status, is_active, last_synced_at, last_error, created_at, updated_at')
                 .single();
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             await logAudit({
                 action: 'platform_connection.connected',
                 resourceType: 'platform_connection',
@@ -549,7 +550,7 @@ export function registerDataTools(server) {
             });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to connect platform' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to connect platform' });
         }
     });
     server.registerTool('disconnect_platform', {
@@ -585,7 +586,7 @@ export function registerDataTools(server) {
                 query = query.eq('platform', normalizePlatform(platform));
             const { data, error } = await query.select('id, platform');
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             await logAudit({
                 action: 'platform_connection.disconnected',
                 resourceType: 'platform_connection',
@@ -595,7 +596,7 @@ export function registerDataTools(server) {
             return j({ disconnected: data?.length ?? 0, connections: data ?? [] });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to disconnect platform' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to disconnect platform' });
         }
     }));
     server.registerTool('list_platform_events', {
@@ -628,11 +629,11 @@ export function registerDataTools(server) {
                 query = query.eq('platform', normalizePlatform(platform));
             const { data, error } = await query;
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             return j({ events: data ?? [] });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to list platform events' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to list platform events' });
         }
     });
     server.registerTool('configure_platform_trigger', {
@@ -673,7 +674,7 @@ export function registerDataTools(server) {
                 .eq('is_active', true)
                 .maybeSingle();
             if (connectionError)
-                return j({ error: connectionError.message });
+                return j(dbToolError(connectionError));
             if (!connection)
                 return j({ error: 'active platform connection not found' });
             const currentConfig = connection.config ?? connection.meta ?? {};
@@ -692,7 +693,7 @@ export function registerDataTools(server) {
                 .select('id, platform, display_name, config, status, is_active, last_synced_at, updated_at')
                 .single();
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             await logAudit({
                 action: 'platform_trigger.configured',
                 resourceType: 'platform_connection',
@@ -702,7 +703,7 @@ export function registerDataTools(server) {
             return j({ connection: sanitizeConnection(data), trigger });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to configure platform trigger' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to configure platform trigger' });
         }
     });
     server.registerTool('list_custom_webhooks', {
@@ -734,7 +735,7 @@ export function registerDataTools(server) {
                 query = query.eq('is_active', true);
             const { data, error } = await query;
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             return j({
                 connections: (data ?? []).map((connection) => ({
                     id: connection.id,
@@ -749,7 +750,7 @@ export function registerDataTools(server) {
             });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to list custom webhooks' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to list custom webhooks' });
         }
     });
     server.registerTool('create_custom_webhook', {
@@ -798,7 +799,7 @@ export function registerDataTools(server) {
                 .select('id')
                 .single();
             if (error || !data)
-                return j({ error: error?.message ?? 'Failed to create custom webhook' });
+                return j({ error: (error ? dbToolError(error).error : undefined) ?? 'Failed to create custom webhook' });
             const endpointUrl = customWebhookEndpointUrl(data.id);
             await client
                 .schema('email')
@@ -818,7 +819,7 @@ export function registerDataTools(server) {
             });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to create custom webhook' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to create custom webhook' });
         }
     });
     server.registerTool('rotate_custom_webhook_secret', {
@@ -849,7 +850,7 @@ export function registerDataTools(server) {
                 .eq('is_active', true)
                 .maybeSingle();
             if (lookupError)
-                return j({ error: lookupError.message });
+                return j(dbToolError(lookupError));
             if (!connection)
                 return j({ error: 'Custom webhook not found' });
             if (!confirmed) {
@@ -903,7 +904,7 @@ export function registerDataTools(server) {
                 .select('id')
                 .maybeSingle();
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             if (!updated)
                 return j({ error: 'Custom webhook is no longer active' });
             await logAudit({
@@ -919,7 +920,7 @@ export function registerDataTools(server) {
             });
         }
         catch (error) {
-            return j({ error: error instanceof Error ? error.message : 'Failed to rotate custom webhook secret' });
+            return j({ error: error instanceof Error ? dbToolError(error).error : 'Failed to rotate custom webhook secret' });
         }
     });
     server.registerTool('list_import_history', {
@@ -939,7 +940,7 @@ export function registerDataTools(server) {
             .order('created_at', { ascending: false })
             .limit(limit);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({
             imports: (data ?? []).map((row) => ({
                 ...row,
@@ -966,7 +967,7 @@ export function registerDataTools(server) {
             .is('revoked_at', null)
             .order('created_at', { ascending: false });
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ keys: data ?? [] });
     });
     server.registerTool('create_api_key', {
@@ -997,7 +998,7 @@ export function registerDataTools(server) {
             .select('id, name, slug')
             .single();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ key_id: data.id, name: data.name, slug: data.slug, secret });
     }));
     server.registerTool('revoke_api_key', {
@@ -1013,7 +1014,7 @@ export function registerDataTools(server) {
     }, withApproval('revoke_api_key', async ({ key_id }) => {
         const { error } = await db().from('api_keys').update({ revoked_at: new Date().toISOString() }).eq('project_id', getProjectId()).eq('id', key_id);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ revoked: true });
     }));
     server.registerTool('migrate_campaigns_from', {
@@ -1042,7 +1043,7 @@ export function registerDataTools(server) {
             .eq('id', projectId)
             .maybeSingle();
         if (projectError)
-            return j({ error: projectError.message });
+            return j(dbToolError(projectError));
         if (!project?.org_id)
             return j({ error: 'project not found' });
         let normalizedAccountUrl = account_url;
@@ -1051,7 +1052,7 @@ export function registerDataTools(server) {
                 normalizedAccountUrl = normalizeActiveCampaignAccountUrl(account_url ?? '');
             }
             catch (error) {
-                return j({ error: error instanceof Error ? error.message : 'Invalid ActiveCampaign account URL' });
+                return j({ error: error instanceof Error ? dbToolError(error).error : 'Invalid ActiveCampaign account URL' });
             }
         }
         const credentials = { api_key: oauth_token, account_url: normalizedAccountUrl };
@@ -1073,7 +1074,7 @@ export function registerDataTools(server) {
             .select('id')
             .single();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({
             job_id: data.id,
             status: 'pending',
@@ -1116,7 +1117,7 @@ export function registerDataTools(server) {
             .eq('is_active', true)
             .maybeSingle();
         if (connectionError)
-            return j({ error: connectionError.message });
+            return j(dbToolError(connectionError));
         if (!connection)
             return j({ error: 'platform connection not found' });
         if (!MIGRATION_PROVIDERS.includes(connection.platform))
@@ -1142,7 +1143,7 @@ export function registerDataTools(server) {
             .select('id')
             .single();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         await client.schema('email').from('platform_connections').update({ last_synced_at: new Date().toISOString() }).eq('id', connection_id);
         return j({ job_id: data.id, status: 'pending', connection_id, provider: connection.platform });
     });
@@ -1165,7 +1166,7 @@ export function registerDataTools(server) {
             query = query.eq('read', false);
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ notifications: (data ?? []).map((row) => ({ ...row, read: row.read === true, read_at: null })) });
     });
     server.registerTool('mark_notifications_read', {
@@ -1184,7 +1185,7 @@ export function registerDataTools(server) {
             query = query.in('id', ids);
         const { data, error } = await query.select('id');
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ updated: data?.length ?? 0 });
     });
     server.registerTool('tenant_export_full', {
@@ -1278,10 +1279,10 @@ export function registerDataTools(server) {
             upload = await client.storage.from(bucket).upload(path, createZip(files), { contentType: 'application/zip', upsert: true });
         }
         if (upload.error)
-            return j({ error: upload.error.message });
+            return j(dbToolError(upload.error));
         const { data, error } = await client.storage.from(bucket).createSignedUrl(path, 24 * 3600);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({
             download_url: data.signedUrl,
             expires_at: new Date(Date.now() + 24 * 3600 * 1000).toISOString(),