@sendinel/mcp-server 1.0.146 → 1.0.147

package/build/tools/lists.js

@@ -4,6 +4,7 @@ import { db } from '../db.js';
 import { getProjectId } from '../project.js';
 import { logAudit } from '../audit.js';
 import { assertChannelCanExecute, checkApproval, currentChannelContext, requestApproval, withApproval, } from '../lib/action-approvals.js';
+import { dbToolError } from '../lib/db-error.js';
 const LIST_MEMBER_BATCH_SIZE = 500;
 const txt = (text) => ({ content: [{ type: 'text', text }] });
 const j = (data) => txt(JSON.stringify(data, null, 2));
@@ -97,14 +98,14 @@ export function registerListTools(server) {
             .order('created_at', { ascending: false })
             .limit(limit);
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         const lists = data ?? [];
         const listIds = lists.map((list) => list.id);
         const countMap = new Map();
         if (listIds.length > 0) {
             const { data: counts, error: countError } = await db().rpc('get_list_member_counts', { p_list_ids: listIds });
             if (countError)
-                return txt(`Error: ${countError.message}`);
+                return txt(`Error: ${dbToolError(countError).error}`);
             for (const row of counts ?? []) {
                 countMap.set(row.list_id, Number(row.member_count));
             }
@@ -135,7 +136,7 @@ export function registerListTools(server) {
             .select('id, name, description, created_at')
             .single();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         await logAudit({
             action: 'list.created',
             resourceType: 'list',
@@ -170,7 +171,7 @@ export function registerListTools(server) {
             .select('id, name, description, updated_at')
             .maybeSingle();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         if (!data)
             return txt('List not found');
         await logAudit({
@@ -194,7 +195,7 @@ export function registerListTools(server) {
             .eq('id', list_id)
             .eq('project_id', projectId);
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         await logAudit({ action: 'list.deleted', resourceType: 'list', resourceId: list_id });
         return j({ deleted: true, list_id });
     }));
@@ -218,15 +219,15 @@ export function registerListTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (listError)
-            return j({ error: listError.message });
+            return j(dbToolError(listError));
         if (!list)
             return j({ error: 'List not found', code: 'LIST_NOT_FOUND' });
         const validResult = await readValidContactIds(projectId, contact_ids);
         if (validResult.error)
-            return j({ error: validResult.error.message });
+            return j(dbToolError(validResult.error));
         const memberResult = await readMemberIds(list_id, validResult.ids);
         if (memberResult.error)
-            return j({ error: memberResult.error.message });
+            return j(dbToolError(memberResult.error));
         const wouldAdd = difference(validResult.ids, memberResult.ids);
         if (!confirmed) {
             return j({
@@ -254,10 +255,10 @@ export function registerListTools(server) {
         }
         const freshValidResult = await readValidContactIds(projectId, contact_ids);
         if (freshValidResult.error)
-            return j({ error: freshValidResult.error.message });
+            return j(dbToolError(freshValidResult.error));
         const freshMemberResult = await readMemberIds(list_id, freshValidResult.ids);
         if (freshMemberResult.error)
-            return j({ error: freshMemberResult.error.message });
+            return j(dbToolError(freshMemberResult.error));
         const freshWouldAdd = difference(freshValidResult.ids, freshMemberResult.ids);
         let added = 0;
         if (freshWouldAdd.length > 0) {
@@ -269,7 +270,7 @@ export function registerListTools(server) {
             })
                 .select('id');
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             added = inserted?.length ?? 0;
         }
         await logAudit({
@@ -300,12 +301,12 @@ export function registerListTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (listError)
-            return j({ error: listError.message });
+            return j(dbToolError(listError));
         if (!list)
             return j({ error: 'List not found', code: 'LIST_NOT_FOUND' });
         const memberResult = await readMemberIds(list_id, contact_ids);
         if (memberResult.error)
-            return j({ error: memberResult.error.message });
+            return j(dbToolError(memberResult.error));
         if (!confirmed) {
             return j({
                 confirmation_required: true,
@@ -330,7 +331,7 @@ export function registerListTools(server) {
         }
         const freshMemberResult = await readMemberIds(list_id, contact_ids);
         if (freshMemberResult.error)
-            return j({ error: freshMemberResult.error.message });
+            return j(dbToolError(freshMemberResult.error));
         const removed = freshMemberResult.ids.length;
         if (removed > 0) {
             const { error } = await db()
@@ -339,7 +340,7 @@ export function registerListTools(server) {
                 .eq('list_id', list_id)
                 .in('contact_id', freshMemberResult.ids);
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
         }
         await logAudit({
             action: 'list.member_removed',
@@ -368,7 +369,7 @@ export function registerListTools(server) {
         catch (rulesError) {
             // #4270: invalid (or empty) filter rules add nobody and say why. Everyone is { match_all: true }.
             if (isSegmentRulesError(rulesError))
-                return j({ error: rulesError.message, code: 'INVALID_SEGMENT_RULES', errors: rulesError.errors });
+                return j({ ...dbToolError(rulesError), code: 'INVALID_SEGMENT_RULES', errors: rulesError.errors });
             throw rulesError;
         }
         const approvalParams = { list_id, rules: normalizedRules };
@@ -379,13 +380,13 @@ export function registerListTools(server) {
             .eq('project_id', projectId)
             .maybeSingle();
         if (listError)
-            return j({ error: listError.message });
+            return j(dbToolError(listError));
         if (!list)
             return j({ error: 'List not found', code: 'LIST_NOT_FOUND' });
         const matchedIds = await getSegmentContactIds(normalizedRules);
         const memberResult = await readMemberIds(list_id, matchedIds);
         if (memberResult.error)
-            return j({ error: memberResult.error.message });
+            return j(dbToolError(memberResult.error));
         const wouldAdd = difference(matchedIds, memberResult.ids);
         if (!confirmed) {
             return j({
@@ -413,7 +414,7 @@ export function registerListTools(server) {
         const freshMatchedIds = await getSegmentContactIds(normalizedRules);
         const freshMemberResult = await readMemberIds(list_id, freshMatchedIds);
         if (freshMemberResult.error)
-            return j({ error: freshMemberResult.error.message });
+            return j(dbToolError(freshMemberResult.error));
         const freshWouldAdd = difference(freshMatchedIds, freshMemberResult.ids);
         let added = 0;
         for (let index = 0; index < freshWouldAdd.length; index += LIST_MEMBER_BATCH_SIZE) {
@@ -423,7 +424,7 @@ export function registerListTools(server) {
                 .upsert(rows, { onConflict: 'list_id,contact_id', ignoreDuplicates: true })
                 .select('id');
             if (error)
-                return j({ error: error.message });
+                return j(dbToolError(error));
             added += inserted?.length ?? 0;
         }
         await logAudit({

package/build/tools/newsletters.js

@@ -4,6 +4,7 @@ import { stripActiveEmailContent } from '@sendinel/domain';
 import { db } from '../db.js';
 import { getProjectId } from '../project.js';
 import { parseFutureDate } from '../lib/schedule.js';
+import { dbToolError } from '../lib/db-error.js';
 const txt = (text) => ({ content: [{ type: 'text', text }] });
 const j = (data) => txt(JSON.stringify(data, null, 2));
 const NEWSLETTER_COLUMNS = 'id, org_id, project_id, site_id, name, slug, description, sender_name, sender_email, reply_to, cadence, branding, public_signup_enabled, double_opt_in, status, subscriber_count, source, source_payload, created_at, updated_at';
@@ -53,9 +54,9 @@ async function loadSendableIssue(newsletterId, issueId, projectId) {
             .maybeSingle(),
     ]);
     if (newsletterError)
-        return { error: newsletterError.message };
+        return { ...dbToolError(newsletterError) };
     if (issueError)
-        return { error: issueError.message };
+        return { ...dbToolError(issueError) };
     if (!newsletter)
         return { error: 'Newsletter not found', code: 'NOT_FOUND' };
     if (!issue)
@@ -82,7 +83,7 @@ async function ensureNewsletterCampaign(newsletter, issue, projectId, scheduledA
             .select('id')
             .maybeSingle();
         if (error)
-            return { error: error.message };
+            return { ...dbToolError(error) };
         if (!campaign)
             campaignId = null;
     }
@@ -98,7 +99,7 @@ async function ensureNewsletterCampaign(newsletter, issue, projectId, scheduledA
             metadata,
         }).select('id').single();
         if (error || !campaign)
-            return { error: error?.message ?? 'Campaign create failed' };
+            return { error: (error ? dbToolError(error).error : undefined) ?? 'Campaign create failed' };
         campaignId = campaign.id;
     }
     const { data: firstStep, error: stepFetchError } = await db().from('campaign_steps')
@@ -107,13 +108,13 @@ async function ensureNewsletterCampaign(newsletter, issue, projectId, scheduledA
         .eq('step_order', 0)
         .maybeSingle();
     if (stepFetchError)
-        return { error: stepFetchError.message };
+        return { ...dbToolError(stepFetchError) };
     if (firstStep?.id) {
         const { error } = await db().from('campaign_steps')
             .update({ subject: issue.subject, body_html: issue.content, body_text: issue.preheader })
             .eq('id', firstStep.id);
         if (error)
-            return { error: error.message };
+            return { ...dbToolError(error) };
     }
     else {
         const { error } = await db().from('campaign_steps').insert({
@@ -126,7 +127,7 @@ async function ensureNewsletterCampaign(newsletter, issue, projectId, scheduledA
             delay_hours: 0,
         });
         if (error)
-            return { error: error.message };
+            return { ...dbToolError(error) };
     }
     const { data: subscriptions, error: subscriptionError } = await db().from('newsletter_subscriptions')
         .select('subscriber_id')
@@ -135,7 +136,7 @@ async function ensureNewsletterCampaign(newsletter, issue, projectId, scheduledA
         .eq('status', 'active')
         .not('subscriber_id', 'is', null);
     if (subscriptionError)
-        return { error: subscriptionError.message };
+        return { ...dbToolError(subscriptionError) };
     const now = new Date().toISOString();
     const nextSendAt = scheduledAt ?? now;
     const rows = (subscriptions ?? []).map((subscription) => ({
@@ -151,14 +152,14 @@ async function ensureNewsletterCampaign(newsletter, issue, projectId, scheduledA
         const { error } = await db().from('campaign_enrollments')
             .upsert(rows, { onConflict: 'campaign_id,contact_id', ignoreDuplicates: true });
         if (error)
-            return { error: error.message };
+            return { ...dbToolError(error) };
     }
     const { error: statusError } = await db().from('campaigns')
         .update({ status: 'active', updated_at: now })
         .eq('id', campaignId)
         .eq('project_id', projectId);
     if (statusError)
-        return { error: statusError.message };
+        return { ...dbToolError(statusError) };
     return { campaignId, enrolled: rows.length };
 }
 export function registerNewsletterTools(server) {
@@ -181,7 +182,7 @@ export function registerNewsletterTools(server) {
         query = status ? query.eq('status', status) : query.neq('status', 'archived');
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ newsletters: data ?? [], count: data?.length ?? 0 });
     });
     server.registerTool('get_newsletter', {
@@ -197,7 +198,7 @@ export function registerNewsletterTools(server) {
     }, async ({ newsletter_id }) => {
         const { data, error } = await db().from('newsletters').select(NEWSLETTER_COLUMNS).eq('id', newsletter_id).eq('project_id', getProjectId()).maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         if (!data)
             return j({ error: 'Newsletter not found', code: 'NOT_FOUND' });
         return j(data);
@@ -256,7 +257,7 @@ export function registerNewsletterTools(server) {
         if (error?.code === '23505')
             return j({ error: 'slug already exists', code: 'conflict' });
         if (error)
-            return j({ error: error.message, code: 'INTERNAL_ERROR' });
+            return j({ ...dbToolError(error), code: 'INTERNAL_ERROR' });
         return j(data);
     });
     server.registerTool('update_newsletter', {
@@ -303,7 +304,7 @@ export function registerNewsletterTools(server) {
         if (error?.code === '23505')
             return j({ error: 'slug already exists', code: 'conflict' });
         if (error)
-            return j({ error: error.message, code: 'INTERNAL_ERROR' });
+            return j({ ...dbToolError(error), code: 'INTERNAL_ERROR' });
         if (!data)
             return j({ error: 'Newsletter not found', code: 'NOT_FOUND' });
         return j(data);
@@ -330,7 +331,7 @@ export function registerNewsletterTools(server) {
         const projectId = getProjectId();
         const { data: newsletter, error: newsletterError } = await db().from('newsletters').select('id, org_id').eq('id', newsletter_id).eq('project_id', projectId).maybeSingle();
         if (newsletterError)
-            return j({ error: newsletterError.message });
+            return j(dbToolError(newsletterError));
         if (!newsletter)
             return j({ error: 'Newsletter not found', code: 'NOT_FOUND' });
         const { data: latest } = await db().from('newsletter_issues').select('issue_number').eq('newsletter_id', newsletter_id).order('issue_number', { ascending: false }).limit(1).maybeSingle();
@@ -346,7 +347,7 @@ export function registerNewsletterTools(server) {
             source_payload: { newsletter_id, subject, content, preheader },
         }).select(ISSUE_COLUMNS).single();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j(data);
     });
     server.registerTool('list_newsletter_issues', {
@@ -374,7 +375,7 @@ export function registerNewsletterTools(server) {
             query = query.eq('status', status);
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ issues: data ?? [], count: data?.length ?? 0 });
     });
     server.registerTool('schedule_newsletter_issue', {
@@ -413,7 +414,7 @@ export function registerNewsletterTools(server) {
             .select(ISSUE_COLUMNS)
             .maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ issue: data, campaign_id: campaign.campaignId, enrolled: campaign.enrolled });
     }));
     server.registerTool('send_newsletter_issue', {
@@ -469,7 +470,7 @@ export function registerNewsletterTools(server) {
             .select(ISSUE_COLUMNS)
             .maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ issue: data, campaign_id: campaign.campaignId, enrolled: campaign.enrolled, blog_post_id: post?.id ?? null, archive_url: post?.external_url ?? null });
     }));
     server.registerTool('subscribe_to_newsletter', {
@@ -500,7 +501,7 @@ export function registerNewsletterTools(server) {
             .eq('status', 'active')
             .maybeSingle();
         if (newsletterError)
-            return j({ error: newsletterError.message });
+            return j(dbToolError(newsletterError));
         if (!newsletter)
             return j({ error: 'Newsletter not found', code: 'NOT_FOUND' });
         const { data: subscriber, error: subscriberError } = await db().from('subscribers').upsert({
@@ -511,7 +512,7 @@ export function registerNewsletterTools(server) {
             source,
         }, { onConflict: 'project_id,email' }).select('id').single();
         if (subscriberError || !subscriber)
-            return j({ error: subscriberError?.message ?? 'Subscriber upsert failed' });
+            return j({ error: (subscriberError ? dbToolError(subscriberError).error : undefined) ?? 'Subscriber upsert failed' });
         const activeImmediately = !newsletter.double_opt_in;
         const { data, error } = await db().from('newsletter_subscriptions').upsert({
             newsletter_id,
@@ -527,7 +528,7 @@ export function registerNewsletterTools(server) {
             unsubscribe_reason: null,
         }, { onConflict: 'newsletter_id,email' }).select(SUBSCRIPTION_COLUMNS).single();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j(data);
     });
     server.registerTool('unsubscribe_from_newsletter', {
@@ -560,7 +561,7 @@ export function registerNewsletterTools(server) {
             p_reason: reason,
         });
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         if (!data?.success)
             return j({ error: data?.reason ?? 'Unsubscribe failed', code: 'NOT_FOUND' });
         return j(data);
@@ -585,7 +586,7 @@ export function registerNewsletterTools(server) {
             query = query.eq('status', status);
         const { data, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ subscribers: data ?? [], count: data?.length ?? 0 });
     });
     server.registerTool('get_newsletter_stats', {
@@ -605,7 +606,7 @@ export function registerNewsletterTools(server) {
             .eq('project_id', getProjectId())
             .eq('status', 'active');
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ newsletter_id, active_subscribers: count ?? 0, issue_analytics_status: 'pending_phase_4' });
     });
 }

package/build/tools/org.js

@@ -5,6 +5,7 @@ import { adminDb, db } from '../db.js';
 import { getProjectId } from '../project.js';
 import { assertChannelCanExecute, checkApproval, currentChannelContext, requestApproval, withApproval } from '../lib/action-approvals.js';
 import { callSendinelV1 } from '../lib/v1-client.js';
+import { dbToolError } from '../lib/db-error.js';
 const j = (data) => ({ content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] });
 const PROVIDER_SWITCH_V1_PROVIDERS = ['resend', 'ses', 'elastic-email'];
 async function callProviderSwitchApi(path, init) {
@@ -60,7 +61,7 @@ async function resolveCurrentOrgId(requestedOrgId) {
         .eq('id', getProjectId())
         .maybeSingle();
     if (error)
-        return { ok: false, error: error.message };
+        return { ok: false, ...dbToolError(error) };
     if (!project?.org_id)
         return { ok: false, error: 'Project has no organization', code: 'NO_ORG' };
     if (requestedOrgId && requestedOrgId !== project.org_id) {
@@ -89,7 +90,7 @@ async function getCurrentProjectOrg() {
         .eq('id', getProjectId())
         .maybeSingle();
     if (error)
-        return { ok: false, error: error.message };
+        return { ok: false, ...dbToolError(error) };
     if (!data?.org_id)
         return { ok: false, error: 'Project organization not found', code: 'NOT_FOUND' };
     return { ok: true, project: data };
@@ -123,7 +124,7 @@ async function upsertWhiteLabelSettings(orgId, payload) {
     if (error) {
         if (error.code === '23505')
             return { ok: false, error: 'Custom domain is already claimed', code: 'CONFLICT' };
-        return { ok: false, error: error.message };
+        return { ok: false, ...dbToolError(error) };
     }
     return { ok: true, settings: formatWhiteLabelSettings(data) };
 }
@@ -141,21 +142,23 @@ export function registerOrgTools(server) {
     }, async ({ org_id }) => {
         let orgId = org_id;
         if (!orgId) {
-            const { data: project } = await db().from('projects').select('org_id').eq('id', getProjectId()).maybeSingle();
+            const { data: project, error } = await db().from('projects').select('org_id').eq('id', getProjectId()).maybeSingle();
+            if (error)
+                return j(dbToolError(error));
             orgId = project?.org_id;
         }
         if (!orgId)
             return j({ members: [] });
         const { data, error } = await db().from('org_members').select('user_id, role, created_at').eq('org_id', orgId);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         const membersWithUsers = await Promise.all((data ?? []).map(async (member) => {
             const { data: userData, error: userError } = await adminDb().auth.admin.getUserById(member.user_id);
             return { member, user: userData?.user ?? null, error: userError };
         }));
         const userError = membersWithUsers.find((result) => result.error)?.error;
         if (userError)
-            return j({ error: userError.message });
+            return j(dbToolError(userError));
         return j({
             members: membersWithUsers.map(({ member, user }) => ({
                 user_id: member.user_id,
@@ -214,7 +217,7 @@ export function registerOrgTools(server) {
             .eq('user_id', user_id)
             .maybeSingle();
         if (memberErr)
-            return j({ error: memberErr.message });
+            return j(dbToolError(memberErr));
         if (!member)
             return j({ error: 'Member not found', code: 'NOT_FOUND' });
         const approvalParams = { user_id, org_id: context.orgId };
@@ -256,7 +259,7 @@ export function registerOrgTools(server) {
             .eq('org_id', context.orgId)
             .eq('user_id', user_id);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         void logAudit({
             action: 'remove_member',
             resourceType: 'org_member',
@@ -292,7 +295,7 @@ export function registerOrgTools(server) {
             .eq('user_id', user_id)
             .maybeSingle();
         if (memberErr)
-            return j({ error: memberErr.message });
+            return j(dbToolError(memberErr));
         if (!member)
             return j({ error: 'Member not found', code: 'NOT_FOUND' });
         const approvalParams = { user_id, role, org_id: context.orgId };
@@ -327,7 +330,7 @@ export function registerOrgTools(server) {
             .select('user_id, role')
             .maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         void logAudit({
             action: 'update_member_role',
             resourceType: 'org_member',
@@ -362,7 +365,7 @@ export function registerOrgTools(server) {
             .eq('user_id', user_id)
             .maybeSingle();
         if (membershipErr)
-            return j({ error: membershipErr.message });
+            return j(dbToolError(membershipErr));
         if (!membership)
             return j({ error: 'Member not found', code: 'NOT_FOUND' });
         if (membership.role === 'owner') {
@@ -373,7 +376,7 @@ export function registerOrgTools(server) {
             .select('id')
             .eq('org_id', context.orgId);
         if (orgProjectsErr)
-            return j({ error: orgProjectsErr.message });
+            return j(dbToolError(orgProjectsErr));
         const validIds = new Set((orgProjects ?? []).map((project) => project.id));
         const assignmentMap = new Map();
         for (const project of projects)
@@ -391,7 +394,7 @@ export function registerOrgTools(server) {
                 .eq('user_id', user_id)
                 .in('project_id', idsToRemove);
             if (deleteErr)
-                return j({ error: deleteErr.message });
+                return j(dbToolError(deleteErr));
         }
         if (requestedProjects.length > 0) {
             const rows = requestedProjects.map((project) => ({ user_id, project_id: project.project_id, role: project.role }));
@@ -399,7 +402,7 @@ export function registerOrgTools(server) {
                 .from('user_project_access')
                 .upsert(rows, { onConflict: 'user_id,project_id' });
             if (upsertErr)
-                return j({ error: upsertErr.message });
+                return j(dbToolError(upsertErr));
         }
         void logAudit({
             action: 'set_member_project_access',
@@ -430,7 +433,7 @@ export function registerOrgTools(server) {
             .is('accepted_at', null)
             .gt('expires_at', new Date().toISOString());
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ invitations: data ?? [] });
     });
     server.registerTool('resend_invitation', {
@@ -459,7 +462,7 @@ export function registerOrgTools(server) {
             .gt('expires_at', new Date().toISOString())
             .maybeSingle();
         if (invitationErr)
-            return j({ error: invitationErr.message });
+            return j(dbToolError(invitationErr));
         if (!invitation)
             return j({ error: 'Invitation not found', code: 'NOT_FOUND' });
         const expiresAt = new Date(Date.now() + 7 * 86400000).toISOString();
@@ -472,7 +475,7 @@ export function registerOrgTools(server) {
             .select('id')
             .maybeSingle();
         if (updateErr)
-            return j({ error: updateErr.message });
+            return j(dbToolError(updateErr));
         if (!updated)
             return j({ error: 'Invitation not found', code: 'NOT_FOUND' });
         const appUrl = (process.env.NEXT_PUBLIC_APP_URL ?? 'https://sendinel.ai').replace(/\/$/, '');
@@ -509,7 +512,7 @@ export function registerOrgTools(server) {
             .eq('org_id', context.orgId)
             .maybeSingle();
         if (invitationErr)
-            return j({ error: invitationErr.message });
+            return j(dbToolError(invitationErr));
         if (!invitation || invitation.accepted_at)
             return j({ error: 'Invitation not found', code: 'NOT_FOUND' });
         const { error } = await db()
@@ -518,7 +521,7 @@ export function registerOrgTools(server) {
             .eq('id', invitation_id)
             .eq('org_id', context.orgId);
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         void logAudit({
             action: 'invitation.revoked',
             resourceType: 'org_invitation',
@@ -613,7 +616,7 @@ export function registerOrgTools(server) {
             query = query.lte('created_at', `${date_to}T23:59:59.999Z`);
         const { data, count, error } = await query;
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({ entries: data ?? [], total: count ?? 0, limit: effectiveLimit, offset: effectiveOffset });
     });
     server.registerTool('get_audit_stats', {
@@ -720,10 +723,10 @@ export function registerOrgTools(server) {
             ? await adminDb().from('model_registry').select(columns).eq('org_id', org_id)
             : { data: [], error: null };
         if (scopedRows.error)
-            return j({ error: scopedRows.error.message });
+            return j(dbToolError(scopedRows.error));
         const globalRows = await adminDb().from('model_registry').select(columns).is('org_id', null);
         if (globalRows.error)
-            return j({ error: globalRows.error.message });
+            return j(dbToolError(globalRows.error));
         return j({
             overrides: [
                 ...(scopedRows.data ?? []),
@@ -751,7 +754,7 @@ export function registerOrgTools(server) {
             .eq('org_id', context.project.org_id)
             .maybeSingle();
         if (error)
-            return j({ error: error.message });
+            return j(dbToolError(error));
         return j({
             org_id: context.project.org_id,
             plan: context.project.plan ?? 'free',

package/build/tools/segments.js

@@ -1,10 +1,9 @@
-import { dbErrorResult } from '../lib/db-errors.js';
 import { withApproval } from '../lib/action-approvals.js';
 import { z } from 'zod';
 import Anthropic from '@anthropic-ai/sdk';
 import { db } 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 { getAnthropicModelId } from '../anthropic-model.js';
 import { AI_MAX_TOKENS, outputConfig, anthropicCheckedText } from '@sendinel/domain';
 import { applySegmentRules, buildSegmentBaseQuery, evaluateSegmentRules, hydrateEmailSendsContacts, isSegmentRulesError, normalizeSegmentRulesToTree, prepareSegmentRulesForStorage, readAllRows, } from '@sendinel/domain';
@@ -132,7 +131,7 @@ export function registerSegmentTools(server) {
             .eq('project_id', getProjectId())
             .order('created_at', { ascending: false });
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         const segments = [];
         for (const seg of data ?? []) {
             let ids;
@@ -218,7 +217,7 @@ export function registerSegmentTools(server) {
             .eq('id', segment_id)
             .eq('project_id', getProjectId());
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j({ deleted: true, segment_id });
     }));
     server.registerTool('preview_segment', {
@@ -336,7 +335,7 @@ export function registerSegmentTools(server) {
             .select('id, name, description, rules, created_at')
             .single();
         if (error)
-            return txt(`Error: ${error.message}`);
+            return txt(`Error: ${dbToolError(error).error}`);
         return j({ ...data, estimated_contacts: ids.length });
     });
 }