imsg-mcp 1.2.0 → 1.3.0

package/dist/index.js

@@ -6,17 +6,16 @@ import { promisify } from "node:util";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ReadResourceRequestSchema } from "@modelcontextprotocol/sdk/types.js";
-import { c as checkLocalAccess, f as formatAccessReport, s as shutdown, g as getImsgDbPath, a as getContactsDbPaths, b as getSlugsDbPath, d as appendLog, e as getFileLogLines, h as getLogDirectory, p as perf, i as checkMessagesAvailable, j as sendToChat, k as sendToChatId, l as sendMessageReliable, m as sendMessageAlt, n as sendAttachment, o as checkImessageAvailability, q as installShutdownHandlers, r as registerCleanup, t as enableStdinEofDetection, u as enableOrphanWatchdog, v as logStartup, w as info, x as startHeapMonitor, y as getLogs, z as setLastSendError, A as logShutdown, B as stopHeapMonitor, C as getLogFilePath, D as getLastSendError } from "./shutdown-BJifUGdo.js";
-import { r as resolveRecipient, d as defaultCountryFromEnv, a as rankFuzzy, b as dispatchAnalytic, i as installWatchdog, n as noteActivity, c as readWatchdogState } from "./watchdog-0RGOHpj4.js";
+import { c as checkLocalAccess, f as formatAccessReport, s as shutdown, g as getImsgDbPath, a as getContactsDbPaths, b as getSlugsDbPath, d as appendLog, e as getFileLogLines, h as getLogDirectory, p as perf, i as checkMessagesAvailable, j as sendToChat, k as sendToChatId, l as sendMessageReliable, m as sendMessageAlt, n as sendAttachment, o as checkImessageAvailability, q as installShutdownHandlers, r as registerCleanup, t as enableStdinEofDetection, u as enableOrphanWatchdog, v as logStartup, w as info, x as startHeapMonitor, y as getLogs, z as setLastSendError, A as logShutdown, B as stopHeapMonitor, C as getLogFilePath, D as getLastSendError } from "./shutdown-CikCSZru.js";
+import { m as minMessageId, r as resolveRecipient, d as defaultCountryFromEnv, a as rankFuzzy, b as dispatchAnalytic, i as installWatchdog, n as noteActivity, c as readWatchdogState } from "./watchdog-CnbBZnfg.js";
 import { homedir } from "node:os";
 import Database from "better-sqlite3";
-import { streamExport } from "./exportStream-Bu5recJ4.js";
-import { I as IMessageDB, h as hasNativeModule } from "./imessage-db-BYU5mxM-.js";
+import { I as IMessageDB, n as normalizedPhoneVariants, h as hasNativeModule } from "./imessage-db-C7w6mu1Q.js";
+import { streamExport } from "./exportStream-B86sO7Mg.js";
 import { z } from "zod";
 import { A as APP_VERSION, a as APP_NAME } from "./meta-D3NoTAjA.js";
 import { randomUUID } from "node:crypto";
 import { parseUserDate } from "./dateParse-DJXMfq3a.js";
-import { m as minMessageId } from "./types-Bbi1xtl-.js";
 const DEFAULT_TTL_MS = 24 * 60 * 60 * 1e3;
 let dbPath = join(homedir(), ".imsg-mcp", "analytics-cache.db");
 let db = null;
@@ -1453,7 +1452,9 @@ const WaitForReplyOutputSchema = z.object({
   elapsedSeconds: z.number().optional()
 });
 const ListConversationsSchema = z.object({
-  limit: z.number().int().min(0).default(20)
+  // Coerce: some MCP hosts serialise numeric tool args as strings.
+  limit: z.coerce.number().int().min(0).default(20),
+  offset: z.coerce.number().int().min(0).default(0)
 });
 const ListConversationsOutputSchema = z.object({
   conversations: z.array(ConversationSchema),
@@ -1562,7 +1563,14 @@ const GetContactSchema = z.object({
   message: "Provide either `handle` or `id`."
 });
 const GetContactOutputSchema = z.object({
-  contact: ContactSchema.nullable()
+  contact: ContactSchema.nullable(),
+  /** Per-handle conversation mapping: which thread slug each handle chats under. */
+  threads: z.array(
+    z.object({
+      handle: z.string(),
+      threadSlug: z.string().nullable()
+    })
+  )
 });
 const ResolveHandleSchema = z.object({
   handle: nonEmptyString("Phone number or email to resolve to a contact name.")
@@ -1805,7 +1813,7 @@ const TOOLS = [
   },
   {
     name: "list_conversations",
-    description: "List recent conversations with thread slugs, snippets, unread counts, participants, and service metadata.",
+    description: "List recent conversations (newest first) with thread slugs, snippets, unread counts, participants, and service metadata. Paginate with `offset` + the returned `nextOffset` to page past the per-call cap.",
     annotations: annotations.read,
     inputSchema: {
       type: "object",
@@ -1813,7 +1821,12 @@ const TOOLS = [
         limit: {
           type: "number",
           default: 20,
-          description: "Number of conversations. 0 = unlimited."
+          description: "Conversations per page. 0 = as many as fit (capped at 500 per call)."
+        },
+        offset: {
+          type: "number",
+          default: 0,
+          description: "Skip this many conversations (for pagination; pass the prior nextOffset)."
         }
       }
     },
@@ -1925,7 +1938,7 @@ const TOOLS = [
   },
   {
     name: "get_contact",
-    description: "Fetch a single contact by handle (phone/email) or by numeric id. Returns null if not found.",
+    description: "Fetch a single contact by handle (phone/email) or by numeric id, including each handle's thread slug (for send_message/get_messages). Returns null if not found.",
     annotations: annotations.read,
     inputSchema: {
       type: "object",
@@ -2645,22 +2658,26 @@ ${formatted}${paginationLine}${perfLine}`,
       signal
     });
     const durMs = span.end({ format, count: result.count, sizeBytes: result.sizeBytes });
-    return toolText(
-      [
-        `Exported ${result.count} message(s) to ${result.savedTo}`,
-        `Format: ${format}`,
-        `Range: ${result.oldest?.toISOString() ?? "(none)"} → ${result.newest?.toISOString() ?? "(none)"}`,
-        `Size: ${(result.sizeBytes / 1024).toFixed(1)} KB`,
-        `_Took ${durMs.toFixed(0)}ms_`
-      ].join("\n"),
-      {
-        ...result,
-        format,
-        oldest: result.oldest?.toISOString() ?? null,
-        newest: result.newest?.toISOString() ?? null,
-        durationMs: durMs
-      }
-    );
+    const lines = [
+      `Exported ${result.count} message(s) to ${result.savedTo}`,
+      `Format: ${format}`,
+      `Range: ${result.oldest?.toISOString() ?? "(none)"} → ${result.newest?.toISOString() ?? "(none)"}`,
+      `Size: ${(result.sizeBytes / 1024).toFixed(1)} KB`
+    ];
+    if (result.unmergedSiblings.length > 0) {
+      const which = result.unmergedSiblings.map((s) => s.chatIdentifier).join(", ");
+      lines.push(
+        `⚠️ ${result.unmergedSiblings.length} other chat(s) (${which}) share this contact's identity but were not merged — history may be incomplete.`
+      );
+    }
+    lines.push(`_Took ${durMs.toFixed(0)}ms_`);
+    return toolText(lines.join("\n"), {
+      ...result,
+      format,
+      oldest: result.oldest?.toISOString() ?? null,
+      newest: result.newest?.toISOString() ?? null,
+      durationMs: durMs
+    });
   }
   async handleGetUnreadMessages(args) {
     const { limit } = GetUnreadMessagesSchema.parse(args ?? {});
@@ -2881,12 +2898,13 @@ ${formatted}`, {
     );
   }
   async handleListConversations(args) {
-    const { limit } = ListConversationsSchema.parse(args);
+    const { limit, offset } = ListConversationsSchema.parse(args);
     const HARD_CAP = 500;
     const resolvedLimit = Math.min(resolveLimit(limit), HARD_CAP);
-    const limited = await this.db.listConversations(resolvedLimit + 1);
-    const hasMore = limited.length > resolvedLimit;
-    const results = limited.slice(0, resolvedLimit);
+    const startAfter = offset + resolvedLimit;
+    const limited = await this.db.listConversations(startAfter + 1);
+    const hasMore = limited.length > startAfter;
+    const results = limited.slice(offset, startAfter);
     if (results.length === 0) {
       return toolText("No conversations found.", {
         conversations: [],
@@ -2927,7 +2945,7 @@ ${formatted}`, {
       })),
       count: results.length,
       hasMore,
-      nextOffset: null
+      nextOffset: hasMore ? startAfter : null
     });
   }
   async handleSearchMessages(args) {
@@ -3057,7 +3075,7 @@ ${formatted}${hint}`,
       contact = this.db.contacts.getContact(id);
     }
     if (!contact) {
-      return toolText("Contact not found.", { contact: null });
+      return toolText("Contact not found.", { contact: null, threads: [] });
     }
     const phones = contact.phoneNumbers.length > 0 ? `
 Phones: ${contact.phoneNumbers.join(", ")}` : "";
@@ -3065,9 +3083,27 @@ Phones: ${contact.phoneNumbers.join(", ")}` : "";
 Emails: ${contact.emails.join(", ")}` : "";
     const org = contact.organization ? `
 Organization: ${contact.organization}` : "";
+    const resolveThreadSlug = async (handle2) => {
+      const candidates = handle2.includes("@") ? [handle2] : normalizedPhoneVariants(handle2);
+      for (const candidate of candidates) {
+        const conv = await this.db.findChatByHandle(candidate);
+        if (conv?.threadSlug) return conv.threadSlug;
+      }
+      return null;
+    };
+    const threads = await Promise.all(
+      [...contact.phoneNumbers, ...contact.emails].map(async (h) => ({
+        handle: h,
+        threadSlug: await resolveThreadSlug(h)
+      }))
+    );
+    const withThreads = threads.filter((t) => t.threadSlug);
+    const threadLines = withThreads.length > 0 ? `
+Threads:
+${withThreads.map((t) => `  ${t.handle} → ${t.threadSlug}`).join("\n")}` : "";
     return toolText(
-      `${sanitizeUserText(contact.displayName)} (id ${contact.id})${phones}${emails}${org}`,
-      { contact }
+      `${sanitizeUserText(contact.displayName)} (id ${contact.id})${phones}${emails}${org}${threadLines}`,
+      { contact, threads }
     );
   }
   async handleResolveHandle(args) {