ofw-mcp 2.0.5 → 2.0.6

package/.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "OurFamilyWizard tools for Claude Code",
-    "version": "2.0.5"
+    "version": "2.0.6"
   },
   "plugins": [
     {
@@ -14,7 +14,7 @@
       "displayName": "OurFamilyWizard",
       "source": "./",
       "description": "OurFamilyWizard co-parenting tools for Claude — messages, calendar, expenses, and journal via MCP",
-      "version": "2.0.5",
+      "version": "2.0.6",
       "author": {
         "name": "Chris Chall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "ofw",
   "displayName": "OurFamilyWizard",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "OurFamilyWizard co-parenting tools for Claude — messages, calendar, expenses, and journal via MCP",
   "author": {
     "name": "Chris Chall"

package/dist/bundle.js

@@ -31129,13 +31129,59 @@ function getMessage(id) {
 function listMessages(opts) {
   const { db } = openCache();
   const offset = (opts.page - 1) * opts.size;
+  const wheres = [];
+  const params = [];
+  if (opts.folder !== void 0) {
+    wheres.push("folder = ?");
+    params.push(opts.folder);
+  }
+  if (opts.since !== void 0) {
+    wheres.push("sent_at >= ?");
+    params.push(opts.since);
+  }
+  if (opts.until !== void 0) {
+    wheres.push("sent_at < ?");
+    params.push(opts.until);
+  }
+  if (opts.q !== void 0 && opts.q.length > 0) {
+    const pattern = `%${opts.q}%`;
+    wheres.push("(subject LIKE ? OR body LIKE ?)");
+    params.push(pattern, pattern);
+  }
+  const where = wheres.length > 0 ? `WHERE ${wheres.join(" AND ")}` : "";
+  params.push(opts.size, offset);
   const rows = db.prepare(
-    `SELECT * FROM messages WHERE folder = ?
+    `SELECT * FROM messages ${where}
      ORDER BY sent_at DESC, id DESC
      LIMIT ? OFFSET ?`
-  ).all(opts.folder, opts.size, offset);
+  ).all(...params);
   return rows.map(rowFromDb);
 }
+function countMessages(opts) {
+  const { db } = openCache();
+  const wheres = [];
+  const params = [];
+  if (opts.folder !== void 0) {
+    wheres.push("folder = ?");
+    params.push(opts.folder);
+  }
+  if (opts.since !== void 0) {
+    wheres.push("sent_at >= ?");
+    params.push(opts.since);
+  }
+  if (opts.until !== void 0) {
+    wheres.push("sent_at < ?");
+    params.push(opts.until);
+  }
+  if (opts.q !== void 0 && opts.q.length > 0) {
+    const pattern = `%${opts.q}%`;
+    wheres.push("(subject LIKE ? OR body LIKE ?)");
+    params.push(pattern, pattern);
+  }
+  const where = wheres.length > 0 ? `WHERE ${wheres.join(" AND ")}` : "";
+  const r = db.prepare(`SELECT COUNT(*) as n FROM messages ${where}`).get(...params);
+  return r?.n ?? 0;
+}
 function draftFromDb(r) {
   return {
     id: r.id,
@@ -31258,14 +31304,12 @@ async function syncMessageFolder(client2, folder, folderId, opts) {
     const list = await client2.request("GET", path);
     const items = list.data ?? [];
     if (items.length === 0) break;
-    let pageSawKnownItem = false;
+    let pageHadNewItem = false;
     for (const item of items) {
       if (newestId === null || item.id > newestId) newestId = item.id;
       const existing = getMessage(item.id);
-      if (existing) {
-        pageSawKnownItem = true;
-        continue;
-      }
+      if (existing) continue;
+      pageHadNewItem = true;
       const isInboxUnread = folder === "inbox" && item.showNeverViewed === true;
       const shouldFetchBody = !isInboxUnread || opts.fetchUnreadBodies;
       let body = null;
@@ -31298,7 +31342,7 @@ async function syncMessageFolder(client2, folder, folderId, opts) {
       upsertMessage(row);
       synced++;
     }
-    if (pageSawKnownItem) break;
+    if (!opts.deep && !pageHadNewItem) break;
     page++;
   }
   setSyncState(folder, {
@@ -31349,12 +31393,16 @@ async function syncAll(client2, opts) {
   for (const folder of folders) {
     if (folder === "inbox") {
       const r = await syncMessageFolder(client2, "inbox", ids.inbox, {
-        fetchUnreadBodies: opts.fetchUnreadBodies ?? false
+        fetchUnreadBodies: opts.fetchUnreadBodies ?? false,
+        deep: opts.deep ?? false
       });
       synced.inbox = r.synced;
       unreadInbox = r.unread;
     } else if (folder === "sent") {
-      const r = await syncMessageFolder(client2, "sent", ids.sent, { fetchUnreadBodies: false });
+      const r = await syncMessageFolder(client2, "sent", ids.sent, {
+        fetchUnreadBodies: false,
+        deep: opts.deep ?? false
+      });
       synced.sent = r.synced;
     } else if (folder === "drafts") {
       const r = await syncDrafts(client2, ids.drafts);
@@ -31375,32 +31423,44 @@ function registerMessageTools(server2, client2) {
     return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
   });
   server2.registerTool("ofw_list_messages", {
-    description: 'List messages from the local OurFamilyWizard cache. folderId accepts "inbox" or "sent". Call ofw_sync_messages first if the cache is empty or stale.',
+    description: "List messages from the local OurFamilyWizard cache. Supports filtering by folder, date range, and a substring query on subject+body. Pagination is offset-based but if you know what you want (a date range, a topic), prefer the filters over walking pages \u2014 the cache may have 1000+ messages. Call ofw_sync_messages first if the cache is empty or stale.",
     annotations: { readOnlyHint: true },
     inputSchema: {
-      folderId: external_exports.string().describe('Folder name: "inbox" or "sent"'),
+      folderId: external_exports.string().describe('Folder name: "inbox", "sent", or "both" (default "both")').optional(),
       page: external_exports.number().describe("Page number (default 1)").optional(),
-      size: external_exports.number().describe("Messages per page (default 50)").optional()
+      size: external_exports.number().describe("Messages per page (default 50)").optional(),
+      since: external_exports.string().describe("ISO date or datetime \u2014 only messages with sent_at >= since (inclusive)").optional(),
+      until: external_exports.string().describe("ISO date or datetime \u2014 only messages with sent_at < until (exclusive)").optional(),
+      q: external_exports.string().describe("Substring match on subject AND body (case-insensitive). Use to find messages on a specific topic.").optional()
     }
   }, async (args) => {
     const page = args.page ?? 1;
     const size = args.size ?? 50;
-    let folder = null;
-    if (args.folderId === "inbox") folder = "inbox";
-    else if (args.folderId === "sent") folder = "sent";
+    const folderArg = args.folderId ?? "both";
+    let folder;
+    if (folderArg === "inbox") folder = "inbox";
+    else if (folderArg === "sent") folder = "sent";
+    else if (folderArg === "both") folder = void 0;
     else {
       return {
         content: [{
           type: "text",
           text: JSON.stringify({
             messages: [],
-            note: 'Cache is keyed by folder name. Pass folderId: "inbox" or "sent" (numeric folder IDs are not yet supported by the cache layer).'
+            note: 'folderId must be "inbox", "sent", or "both". Numeric OFW folder IDs are not supported by the cache.'
           }, null, 2)
         }]
       };
     }
-    const messages = listMessages({ folder, page, size });
-    const payload = messages.length === 0 ? { messages: [], note: "Cache empty for this folder. Call ofw_sync_messages to populate." } : { messages };
+    const filter = { folder, since: args.since, until: args.until, q: args.q };
+    const total = countMessages(filter);
+    const messages = listMessages({ ...filter, page, size });
+    const payload = { messages, total, page, size };
+    if (total === 0) {
+      payload.note = "No messages match these filters. If you expected results, check ofw_sync_messages was run, or relax the filters.";
+    } else if (page * size < total) {
+      payload.note = `Showing ${(page - 1) * size + 1}\u2013${(page - 1) * size + messages.length} of ${total}. Increase 'page' to see more, or narrow with since/until/q.`;
+    }
     return { content: [{ type: "text", text: JSON.stringify(payload, null, 2) }] };
   });
   server2.registerTool("ofw_get_message", {
@@ -31614,16 +31674,18 @@ ${text}` : text;
     return { content: [{ type: "text", text: JSON.stringify(unread, null, 2) }] };
   });
   server2.registerTool("ofw_sync_messages", {
-    description: "Sync messages from OurFamilyWizard into the local cache. Returns counts per folder and a list of unread inbox messages whose bodies were NOT fetched (to avoid mark-as-read on OFW). Call ofw_get_message(id) on those to read them.",
+    description: "Sync messages from OurFamilyWizard into the local cache. Returns counts per folder and a list of unread inbox messages whose bodies were NOT fetched (to avoid mark-as-read on OFW). Call ofw_get_message(id) on those to read them. Pass deep:true to walk all OFW pages instead of stopping at the first all-cached page (use to backfill suspected gaps).",
     annotations: { readOnlyHint: false },
     inputSchema: {
       folders: external_exports.array(external_exports.enum(["inbox", "sent", "drafts"])).describe("Folders to sync (default: all three)").optional(),
-      fetchUnreadBodies: external_exports.boolean().describe("If true, also fetch bodies for unread inbox messages (will mark them as read on OFW). Default false.").optional()
+      fetchUnreadBodies: external_exports.boolean().describe("If true, also fetch bodies for unread inbox messages (will mark them as read on OFW). Default false.").optional(),
+      deep: external_exports.boolean().describe("If true, walk every OFW page until empty regardless of cache state. Use to backfill gaps. Default false.").optional()
     }
   }, async (args) => {
     const result = await syncAll(client2, {
       folders: args.folders,
-      fetchUnreadBodies: args.fetchUnreadBodies
+      fetchUnreadBodies: args.fetchUnreadBodies,
+      deep: args.deep
     });
     return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
   });
@@ -31771,7 +31833,7 @@ process.emit = function(event, ...args) {
   }
   return originalEmit(event, ...args);
 };
-var server = new McpServer({ name: "ofw", version: "2.0.5" });
+var server = new McpServer({ name: "ofw", version: "2.0.6" });
 registerUserTools(server, client);
 registerMessageTools(server, client);
 registerCalendarTools(server, client);

package/dist/cache.js

@@ -106,11 +106,58 @@ export function getMessage(id) {
 export function listMessages(opts) {
     const { db } = openCache();
     const offset = (opts.page - 1) * opts.size;
-    const rows = db.prepare(`SELECT * FROM messages WHERE folder = ?
+    const wheres = [];
+    const params = [];
+    if (opts.folder !== undefined) {
+        wheres.push('folder = ?');
+        params.push(opts.folder);
+    }
+    if (opts.since !== undefined) {
+        wheres.push('sent_at >= ?');
+        params.push(opts.since);
+    }
+    if (opts.until !== undefined) {
+        wheres.push('sent_at < ?');
+        params.push(opts.until);
+    }
+    if (opts.q !== undefined && opts.q.length > 0) {
+        const pattern = `%${opts.q}%`;
+        wheres.push('(subject LIKE ? OR body LIKE ?)');
+        params.push(pattern, pattern);
+    }
+    const where = wheres.length > 0 ? `WHERE ${wheres.join(' AND ')}` : '';
+    params.push(opts.size, offset);
+    const rows = db.prepare(`SELECT * FROM messages ${where}
      ORDER BY sent_at DESC, id DESC
-     LIMIT ? OFFSET ?`).all(opts.folder, opts.size, offset);
+     LIMIT ? OFFSET ?`).all(...params);
     return rows.map(rowFromDb);
 }
+export function countMessages(opts) {
+    const { db } = openCache();
+    const wheres = [];
+    const params = [];
+    if (opts.folder !== undefined) {
+        wheres.push('folder = ?');
+        params.push(opts.folder);
+    }
+    if (opts.since !== undefined) {
+        wheres.push('sent_at >= ?');
+        params.push(opts.since);
+    }
+    if (opts.until !== undefined) {
+        wheres.push('sent_at < ?');
+        params.push(opts.until);
+    }
+    if (opts.q !== undefined && opts.q.length > 0) {
+        const pattern = `%${opts.q}%`;
+        wheres.push('(subject LIKE ? OR body LIKE ?)');
+        params.push(pattern, pattern);
+    }
+    const where = wheres.length > 0 ? `WHERE ${wheres.join(' AND ')}` : '';
+    const r = db.prepare(`SELECT COUNT(*) as n FROM messages ${where}`)
+        .get(...params);
+    return r?.n ?? 0;
+}
 function draftFromDb(r) {
     return {
         id: r.id,

package/dist/index.js

@@ -17,7 +17,7 @@ import { registerMessageTools } from './tools/messages.js';
 import { registerCalendarTools } from './tools/calendar.js';
 import { registerExpenseTools } from './tools/expenses.js';
 import { registerJournalTools } from './tools/journal.js';
-const server = new McpServer({ name: 'ofw', version: '2.0.5' });
+const server = new McpServer({ name: 'ofw', version: '2.0.6' });
 registerUserTools(server, client);
 registerMessageTools(server, client);
 registerCalendarTools(server, client);

package/dist/sync.js

@@ -34,15 +34,14 @@ export async function syncMessageFolder(client, folder, folderId, opts) {
         const items = list.data ?? [];
         if (items.length === 0)
             break;
-        let pageSawKnownItem = false;
+        let pageHadNewItem = false;
         for (const item of items) {
             if (newestId === null || item.id > newestId)
                 newestId = item.id;
             const existing = getMessage(item.id);
-            if (existing) {
-                pageSawKnownItem = true;
+            if (existing)
                 continue;
-            }
+            pageHadNewItem = true;
             const isInboxUnread = folder === 'inbox' && item.showNeverViewed === true;
             const shouldFetchBody = !isInboxUnread || opts.fetchUnreadBodies;
             let body = null;
@@ -76,8 +75,12 @@ export async function syncMessageFolder(client, folder, folderId, opts) {
             upsertMessage(row);
             synced++;
         }
-        // OFW returns date-desc, so a known item means we've reached cached history.
-        if (pageSawKnownItem)
+        // Stop heuristic: a page with no new items means we've reached cached
+        // history (OFW returns date-desc). A page with even ONE new item could
+        // mean there are more new items on the next page that we haven't seen
+        // yet — keep walking. With `deep: true`, walk every page until OFW
+        // returns an empty page (used to backfill suspected gaps).
+        if (!opts.deep && !pageHadNewItem)
             break;
         page++;
     }
@@ -129,12 +132,16 @@ export async function syncAll(client, opts) {
         if (folder === 'inbox') {
             const r = await syncMessageFolder(client, 'inbox', ids.inbox, {
                 fetchUnreadBodies: opts.fetchUnreadBodies ?? false,
+                deep: opts.deep ?? false,
             });
             synced.inbox = r.synced;
             unreadInbox = r.unread;
         }
         else if (folder === 'sent') {
-            const r = await syncMessageFolder(client, 'sent', ids.sent, { fetchUnreadBodies: false });
+            const r = await syncMessageFolder(client, 'sent', ids.sent, {
+                fetchUnreadBodies: false,
+                deep: opts.deep ?? false,
+            });
             synced.sent = r.synced;
         }
         else if (folder === 'drafts') {

package/dist/tools/messages.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { syncAll } from '../sync.js';
-import { listMessages, listDrafts, getMessage, upsertMessage, upsertDraft, deleteDraft, findLatestReplyTip, } from '../cache.js';
+import { listMessages, countMessages, listDrafts, getMessage, upsertMessage, upsertDraft, deleteDraft, findLatestReplyTip, } from '../cache.js';
 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.',
@@ -10,36 +10,48 @@ export function registerMessageTools(server, client) {
         return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     });
     server.registerTool('ofw_list_messages', {
-        description: 'List messages from the local OurFamilyWizard cache. folderId accepts "inbox" or "sent". Call ofw_sync_messages first if the cache is empty or stale.',
+        description: 'List messages from the local OurFamilyWizard cache. Supports filtering by folder, date range, and a substring query on subject+body. Pagination is offset-based but if you know what you want (a date range, a topic), prefer the filters over walking pages — the cache may have 1000+ messages. Call ofw_sync_messages first if the cache is empty or stale.',
         annotations: { readOnlyHint: true },
         inputSchema: {
-            folderId: z.string().describe('Folder name: "inbox" or "sent"'),
+            folderId: z.string().describe('Folder name: "inbox", "sent", or "both" (default "both")').optional(),
             page: z.number().describe('Page number (default 1)').optional(),
             size: z.number().describe('Messages per page (default 50)').optional(),
+            since: z.string().describe('ISO date or datetime — only messages with sent_at >= since (inclusive)').optional(),
+            until: z.string().describe('ISO date or datetime — only messages with sent_at < until (exclusive)').optional(),
+            q: z.string().describe('Substring match on subject AND body (case-insensitive). Use to find messages on a specific topic.').optional(),
         },
     }, async (args) => {
         const page = args.page ?? 1;
         const size = args.size ?? 50;
-        let folder = null;
-        if (args.folderId === 'inbox')
+        const folderArg = args.folderId ?? 'both';
+        let folder;
+        if (folderArg === 'inbox')
             folder = 'inbox';
-        else if (args.folderId === 'sent')
+        else if (folderArg === 'sent')
             folder = 'sent';
+        else if (folderArg === 'both')
+            folder = undefined;
         else {
             return {
                 content: [{
                         type: 'text',
                         text: JSON.stringify({
                             messages: [],
-                            note: 'Cache is keyed by folder name. Pass folderId: "inbox" or "sent" (numeric folder IDs are not yet supported by the cache layer).',
+                            note: 'folderId must be "inbox", "sent", or "both". Numeric OFW folder IDs are not supported by the cache.',
                         }, null, 2),
                     }],
             };
         }
-        const messages = listMessages({ folder, page, size });
-        const payload = messages.length === 0
-            ? { messages: [], note: 'Cache empty for this folder. Call ofw_sync_messages to populate.' }
-            : { messages };
+        const filter = { folder, since: args.since, until: args.until, q: args.q };
+        const total = countMessages(filter);
+        const messages = listMessages({ ...filter, page, size });
+        const payload = { messages, total, page, size };
+        if (total === 0) {
+            payload.note = 'No messages match these filters. If you expected results, check ofw_sync_messages was run, or relax the filters.';
+        }
+        else if (page * size < total) {
+            payload.note = `Showing ${(page - 1) * size + 1}–${(page - 1) * size + messages.length} of ${total}. Increase 'page' to see more, or narrow with since/until/q.`;
+        }
         return { content: [{ type: 'text', text: JSON.stringify(payload, null, 2) }] };
     });
     server.registerTool('ofw_get_message', {
@@ -246,16 +258,18 @@ export function registerMessageTools(server, client) {
         return { content: [{ type: 'text', text: JSON.stringify(unread, null, 2) }] };
     });
     server.registerTool('ofw_sync_messages', {
-        description: 'Sync messages from OurFamilyWizard into the local cache. Returns counts per folder and a list of unread inbox messages whose bodies were NOT fetched (to avoid mark-as-read on OFW). Call ofw_get_message(id) on those to read them.',
+        description: 'Sync messages from OurFamilyWizard into the local cache. Returns counts per folder and a list of unread inbox messages whose bodies were NOT fetched (to avoid mark-as-read on OFW). Call ofw_get_message(id) on those to read them. Pass deep:true to walk all OFW pages instead of stopping at the first all-cached page (use to backfill suspected gaps).',
         annotations: { readOnlyHint: false },
         inputSchema: {
             folders: z.array(z.enum(['inbox', 'sent', 'drafts'])).describe('Folders to sync (default: all three)').optional(),
             fetchUnreadBodies: z.boolean().describe('If true, also fetch bodies for unread inbox messages (will mark them as read on OFW). Default false.').optional(),
+            deep: z.boolean().describe('If true, walk every OFW page until empty regardless of cache state. Use to backfill gaps. Default false.').optional(),
         },
     }, async (args) => {
         const result = await syncAll(client, {
             folders: args.folders,
             fetchUnreadBodies: args.fetchUnreadBodies,
+            deep: args.deep,
         });
         return { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofw-mcp",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "mcpName": "io.github.chrischall/ofw-mcp",
   "description": "OurFamilyWizard MCP server for Claude — developed and maintained by AI (Claude Code)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",

package/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/chrischall/ofw-mcp",
     "source": "github"
   },
-  "version": "2.0.5",
+  "version": "2.0.6",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "ofw-mcp",
-      "version": "2.0.5",
+      "version": "2.0.6",
       "transport": {
         "type": "stdio"
       },