ofw-mcp 2.0.1 → 2.0.3

package/dist/tools/messages.js

@@ -1,224 +1,159 @@
-export const toolDefinitions = [
-    {
-        name: 'ofw_list_message_folders',
+import { z } from 'zod';
+export function registerMessageTools(server, client) {
+    server.registerTool('ofw_list_message_folders', {
         description: 'List OurFamilyWizard message folders (inbox, sent, etc.) and their unread counts. Returns folder IDs needed to call ofw_list_messages. Does NOT return message content.',
         annotations: { readOnlyHint: true },
-        inputSchema: { type: 'object', properties: {}, required: [] },
-    },
-    {
-        name: 'ofw_list_messages',
+    }, async () => {
+        const data = await client.request('GET', '/pub/v1/messageFolders?includeFolderCounts=true');
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
+    });
+    server.registerTool('ofw_list_messages', {
         description: 'List messages in an OurFamilyWizard folder. Call ofw_list_message_folders first to get folder IDs. Returns actual message content.',
         annotations: { readOnlyHint: true },
         inputSchema: {
-            type: 'object',
-            properties: {
-                folderId: { type: 'string', description: 'Folder ID (get from ofw_list_message_folders)' },
-                page: { type: 'number', description: 'Page number (default 1)' },
-                size: { type: 'number', description: 'Messages per page (default 50)' },
-            },
-            required: ['folderId'],
+            folderId: z.string().describe('Folder ID (get from ofw_list_message_folders)'),
+            page: z.number().describe('Page number (default 1)').optional(),
+            size: z.number().describe('Messages per page (default 50)').optional(),
         },
-    },
-    {
-        name: 'ofw_get_message',
+    }, async (args) => {
+        const page = args.page ?? 1;
+        const size = args.size ?? 50;
+        const path = `/pub/v3/messages?folders=${encodeURIComponent(args.folderId)}&page=${page}&size=${size}&sort=date&sortDirection=desc`;
+        const data = await client.request('GET', path);
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
+    });
+    server.registerTool('ofw_get_message', {
         description: 'Get a single OurFamilyWizard message by ID. Note: reading an unread message marks it as read.',
         annotations: { readOnlyHint: false },
         inputSchema: {
-            type: 'object',
-            properties: {
-                messageId: { type: 'string', description: 'Message ID' },
-            },
-            required: ['messageId'],
+            messageId: z.string().describe('Message ID'),
         },
-    },
-    {
-        name: 'ofw_send_message',
+    }, async (args) => {
+        const data = await client.request('GET', `/pub/v3/messages/${encodeURIComponent(args.messageId)}`);
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
+    });
+    server.registerTool('ofw_send_message', {
         description: 'Send a message via OurFamilyWizard. If sending from a draft, pass draftId to automatically delete the draft after sending.',
         annotations: { destructiveHint: true },
         inputSchema: {
-            type: 'object',
-            properties: {
-                subject: { type: 'string', description: 'Message subject' },
-                body: { type: 'string', description: 'Message body text' },
-                recipientIds: {
-                    type: 'array',
-                    items: { type: 'number' },
-                    description: 'Array of recipient user IDs (get from ofw_get_profile)',
-                },
-                replyToId: {
-                    type: 'number',
-                    description: 'ID of the message being replied to. When provided, the original message thread is included (like a standard email reply).',
-                },
-                draftId: {
-                    type: 'number',
-                    description: 'ID of the draft to delete after sending (omit if not sending from a draft)',
-                },
-            },
-            required: ['subject', 'body', 'recipientIds'],
+            subject: z.string().describe('Message subject'),
+            body: z.string().describe('Message body text'),
+            recipientIds: z.array(z.number()).describe('Array of recipient user IDs (get from ofw_get_profile)'),
+            replyToId: z.number().describe('ID of the message being replied to. When provided, the original message thread is included (like a standard email reply).').optional(),
+            draftId: z.number().describe('ID of the draft to delete after sending (omit if not sending from a draft)').optional(),
         },
-    },
-    {
-        name: 'ofw_list_drafts',
+    }, async (args) => {
+        const replyToId = args.replyToId ?? null;
+        const data = await client.request('POST', '/pub/v3/messages', {
+            subject: args.subject,
+            body: args.body,
+            recipientIds: args.recipientIds,
+            attachments: { myFileIDs: [] },
+            draft: false,
+            includeOriginal: replyToId !== null,
+            replyToId,
+        });
+        if (args.draftId !== undefined) {
+            const form = new FormData();
+            form.append('messageIds', String(args.draftId));
+            await client.request('DELETE', '/pub/v1/messages', form);
+        }
+        return { content: [{ type: 'text', text: data ? JSON.stringify(data, null, 2) : 'Message sent successfully.' }] };
+    });
+    server.registerTool('ofw_list_drafts', {
         description: 'List all draft messages in OurFamilyWizard',
         annotations: { readOnlyHint: true },
         inputSchema: {
-            type: 'object',
-            properties: {
-                page: { type: 'number', description: 'Page number (default 1)' },
-                size: { type: 'number', description: 'Drafts per page (default 50)' },
-            },
-            required: [],
+            page: z.number().describe('Page number (default 1)').optional(),
+            size: z.number().describe('Drafts per page (default 50)').optional(),
         },
-    },
-    {
-        name: 'ofw_save_draft',
+    }, async (args) => {
+        const page = args.page ?? 1;
+        const size = args.size ?? 50;
+        // 13471259 is the system Drafts folder (folderType: DRAFTS)
+        const path = `/pub/v3/messages?folders=13471259&page=${page}&size=${size}&sort=date&sortDirection=desc`;
+        const data = await client.request('GET', path);
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
+    });
+    server.registerTool('ofw_save_draft', {
         description: 'Save a message as a draft in OurFamilyWizard. Recipients are optional — a draft can be saved without them. To update an existing draft, provide its messageId.',
         annotations: { readOnlyHint: false },
         inputSchema: {
-            type: 'object',
-            properties: {
-                subject: { type: 'string', description: 'Message subject' },
-                body: { type: 'string', description: 'Message body text' },
-                recipientIds: {
-                    type: 'array',
-                    items: { type: 'number' },
-                    description: 'Array of recipient user IDs (optional for drafts)',
-                },
-                messageId: {
-                    type: 'number',
-                    description: 'ID of an existing draft to update (omit to create a new draft)',
-                },
-                replyToId: {
-                    type: 'number',
-                    description: 'ID of the message this draft is replying to (omit for new messages)',
-                },
-            },
-            required: ['subject', 'body'],
+            subject: z.string().describe('Message subject'),
+            body: z.string().describe('Message body text'),
+            recipientIds: z.array(z.number()).describe('Array of recipient user IDs (optional for drafts)').optional(),
+            messageId: z.number().describe('ID of an existing draft to update (omit to create a new draft)').optional(),
+            replyToId: z.number().describe('ID of the message this draft is replying to (omit for new messages)').optional(),
         },
-    },
-    {
-        name: 'ofw_delete_draft',
+    }, async (args) => {
+        const replyToId = args.replyToId ?? null;
+        const payload = {
+            subject: args.subject,
+            body: args.body,
+            recipientIds: args.recipientIds ?? [],
+            attachments: { myFileIDs: [] },
+            draft: true,
+            includeOriginal: replyToId !== null,
+            replyToId,
+        };
+        if (args.messageId !== undefined)
+            payload.messageId = args.messageId;
+        const data = await client.request('POST', '/pub/v3/messages', payload);
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
+    });
+    server.registerTool('ofw_delete_draft', {
         description: 'Delete a draft message from OurFamilyWizard',
         annotations: { destructiveHint: true },
         inputSchema: {
-            type: 'object',
-            properties: {
-                messageId: { type: 'number', description: 'Draft message ID to delete' },
-            },
-            required: ['messageId'],
+            messageId: z.number().describe('Draft message ID to delete'),
         },
-    },
-    {
-        name: 'ofw_get_unread_sent',
+    }, async (args) => {
+        const form = new FormData();
+        form.append('messageIds', String(args.messageId));
+        const data = await client.request('DELETE', '/pub/v1/messages', form);
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
+    });
+    server.registerTool('ofw_get_unread_sent', {
         description: 'List sent messages that have not been read by one or more recipients. Fetches sent messages page by page and returns only those with unread recipients.',
         annotations: { readOnlyHint: true },
         inputSchema: {
-            type: 'object',
-            properties: {
-                page: { type: 'number', description: 'Page of sent messages to scan (default 1)' },
-                size: { type: 'number', description: 'Number of sent messages per page, max 50 (default 20)' },
-            },
-            required: [],
+            page: z.number().describe('Page of sent messages to scan (default 1)').optional(),
+            size: z.number().describe('Number of sent messages per page, max 50 (default 20)').optional(),
         },
-    },
-];
-export async function handleTool(name, args, client) {
-    switch (name) {
-        case 'ofw_list_message_folders': {
-            const data = await client.request('GET', '/pub/v1/messageFolders?includeFolderCounts=true');
-            return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
-        }
-        case 'ofw_list_messages': {
-            const { folderId, page = 1, size = 50 } = args;
-            const path = `/pub/v3/messages?folders=${encodeURIComponent(folderId)}&page=${page}&size=${size}&sort=date&sortDirection=desc`;
-            const data = await client.request('GET', path);
-            return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
-        }
-        case 'ofw_get_message': {
-            const { messageId } = args;
-            const data = await client.request('GET', `/pub/v3/messages/${encodeURIComponent(messageId)}`);
-            return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
-        }
-        case 'ofw_send_message': {
-            const { subject, body, recipientIds, replyToId = null, draftId } = args;
-            const data = await client.request('POST', '/pub/v3/messages', {
-                subject, body, recipientIds,
-                attachments: { myFileIDs: [] },
-                draft: false,
-                includeOriginal: replyToId !== null,
-                replyToId,
-            });
-            if (draftId !== undefined) {
-                const form = new FormData();
-                form.append('messageIds', String(draftId));
-                await client.request('DELETE', '/pub/v1/messages', form);
+    }, async (args) => {
+        const page = args.page ?? 1;
+        const size = args.size ?? 20;
+        // Step 1: find the sent folder
+        const foldersData = await client.request('GET', '/pub/v1/messageFolders?includeFolderCounts=true');
+        const sentFolder = (foldersData.systemFolders ?? []).find((f) => f.folderType === 'SENT_MESSAGES');
+        if (!sentFolder)
+            throw new Error('Sent folder not found');
+        // Step 2: list sent messages (the list endpoint already includes per-recipient viewed status)
+        const listPath = `/pub/v3/messages?folders=${encodeURIComponent(sentFolder.id)}&page=${page}&size=${size}&sort=date&sortDirection=desc`;
+        const listData = await client.request('GET', listPath);
+        const messages = listData.data ?? [];
+        // Step 3: filter to unread using showNeverViewed (avoids N+1 detail fetches
+        // and the detail endpoint's inconsistent viewed field which can return null
+        // for read messages instead of the epoch sentinel the list endpoint uses)
+        const unread = [];
+        for (const msg of messages) {
+            if (!msg.showNeverViewed)
+                continue;
+            const unreadRecipients = (msg.recipients ?? [])
+                .filter((r) => !r.viewed)
+                .map((r) => r.user.name);
+            if (unreadRecipients.length > 0) {
+                unread.push({
+                    id: msg.id,
+                    subject: msg.subject,
+                    sentAt: msg.date.dateTime,
+                    unreadBy: unreadRecipients,
+                });
             }
-            return { content: [{ type: 'text', text: data ? JSON.stringify(data, null, 2) : 'Message sent successfully.' }] };
-        }
-        case 'ofw_list_drafts': {
-            const { page = 1, size = 50 } = args;
-            // 13471259 is the system Drafts folder (folderType: DRAFTS)
-            const path = `/pub/v3/messages?folders=13471259&page=${page}&size=${size}&sort=date&sortDirection=desc`;
-            const data = await client.request('GET', path);
-            return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
         }
-        case 'ofw_save_draft': {
-            const { subject, body, recipientIds = [], messageId, replyToId = null } = args;
-            const payload = {
-                subject, body, recipientIds,
-                attachments: { myFileIDs: [] },
-                draft: true,
-                includeOriginal: replyToId !== null,
-                replyToId,
-            };
-            if (messageId !== undefined)
-                payload.messageId = messageId;
-            const data = await client.request('POST', '/pub/v3/messages', payload);
-            return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
-        }
-        case 'ofw_delete_draft': {
-            const { messageId } = args;
-            const form = new FormData();
-            form.append('messageIds', String(messageId));
-            const data = await client.request('DELETE', '/pub/v1/messages', form);
-            return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
-        }
-        case 'ofw_get_unread_sent': {
-            const { page = 1, size = 20 } = args;
-            // Step 1: find the sent folder
-            const foldersData = await client.request('GET', '/pub/v1/messageFolders?includeFolderCounts=true');
-            const sentFolder = (foldersData.systemFolders ?? []).find((f) => f.folderType === 'SENT_MESSAGES');
-            if (!sentFolder)
-                throw new Error('Sent folder not found');
-            // Step 2: list sent messages (the list endpoint already includes per-recipient viewed status)
-            const listPath = `/pub/v3/messages?folders=${encodeURIComponent(sentFolder.id)}&page=${page}&size=${size}&sort=date&sortDirection=desc`;
-            const listData = await client.request('GET', listPath);
-            const messages = listData.data ?? [];
-            // Step 3: filter to unread using showNeverViewed (avoids N+1 detail fetches
-            // and the detail endpoint's inconsistent viewed field which can return null
-            // for read messages instead of the epoch sentinel the list endpoint uses)
-            const unread = [];
-            for (const msg of messages) {
-                if (!msg.showNeverViewed)
-                    continue;
-                const unreadRecipients = (msg.recipients ?? [])
-                    .filter((r) => !r.viewed)
-                    .map((r) => r.user.name);
-                if (unreadRecipients.length > 0) {
-                    unread.push({
-                        id: msg.id,
-                        subject: msg.subject,
-                        sentAt: msg.date.dateTime,
-                        unreadBy: unreadRecipients,
-                    });
-                }
-            }
-            if (unread.length === 0) {
-                return { content: [{ type: 'text', text: JSON.stringify({ message: 'All scanned sent messages have been read.' }, null, 2) }] };
-            }
-            return { content: [{ type: 'text', text: JSON.stringify(unread, null, 2) }] };
+        if (unread.length === 0) {
+            return { content: [{ type: 'text', text: JSON.stringify({ message: 'All scanned sent messages have been read.' }, null, 2) }] };
         }
-        default:
-            throw new Error(`Unknown tool: ${name}`);
-    }
+        return { content: [{ type: 'text', text: JSON.stringify(unread, null, 2) }] };
+    });
 }

package/dist/tools/user.js

@@ -1,28 +1,16 @@
-export const toolDefinitions = [
-    {
-        name: 'ofw_get_profile',
+export function registerUserTools(server, client) {
+    server.registerTool('ofw_get_profile', {
         description: 'Get current user and co-parent profile information from OurFamilyWizard',
         annotations: { readOnlyHint: true },
-        inputSchema: { type: 'object', properties: {}, required: [] },
-    },
-    {
-        name: 'ofw_get_notifications',
+    }, async () => {
+        const data = await client.request('GET', '/pub/v2/profiles');
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
+    });
+    server.registerTool('ofw_get_notifications', {
         description: 'Get OurFamilyWizard dashboard summary: unread message count, upcoming events, outstanding expenses. Note: updates your last-seen status.',
         annotations: { readOnlyHint: false },
-        inputSchema: { type: 'object', properties: {}, required: [] },
-    },
-];
-export async function handleTool(name, _args, client) {
-    switch (name) {
-        case 'ofw_get_profile': {
-            const data = await client.request('GET', '/pub/v2/profiles');
-            return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
-        }
-        case 'ofw_get_notifications': {
-            const data = await client.request('GET', '/pub/v1/users/useraccountstatus');
-            return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
-        }
-        default:
-            throw new Error(`Unknown tool: ${name}`);
-    }
+    }, async () => {
+        const data = await client.request('GET', '/pub/v1/users/useraccountstatus');
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
+    });
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "ofw-mcp",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "OurFamilyWizard MCP server for Claude — developed and maintained by AI (Claude Sonnet 4.6)",
   "author": "Claude Sonnet 4.6 (AI) <https://www.anthropic.com/claude>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/chrischall/ofw-mcp"
+    "url": "git+https://github.com/chrischall/ofw-mcp.git"
   },
   "type": "module",
   "bin": {
@@ -26,12 +26,13 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "dotenv": "^17.4.0"
+    "dotenv": "^17.4.0",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/node": "^25.5.2",
     "@vitest/coverage-v8": "^4.1.2",
-    "esbuild": "^0.27.0",
+    "esbuild": "^0.28.0",
     "typescript": "^6.0.2",
     "vitest": "^4.1.2"
   }