imsg-mcp 1.3.1 → 1.3.2

package/dist/index.js

@@ -6,14 +6,14 @@ 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-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 { 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-pPAPSnk3.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-Cbgm050b.js";
 import { homedir } from "node:os";
 import Database from "better-sqlite3";
-import { I as IMessageDB, n as normalizedPhoneVariants, h as hasNativeModule } from "./imessage-db-vDZF7E8B.js";
+import { I as IMessageDB, n as normalizedPhoneVariants, h as hasNativeModule } from "./imessage-db-Cz8MIIpG.js";
 import { streamExport } from "./exportStream-BCoZYUUZ.js";
 import { z } from "zod";
-import { A as APP_VERSION, a as APP_NAME } from "./meta-DCZ9Xe9g.js";
+import { A as APP_VERSION, a as APP_NAME } from "./meta-DzE7CSrZ.js";
 import { randomUUID } from "node:crypto";
 import { parseUserDate } from "./dateParse-DJXMfq3a.js";
 const DEFAULT_TTL_MS = 24 * 60 * 60 * 1e3;
@@ -1966,7 +1966,7 @@ const TOOLS = [
   },
   {
     name: "check_imessage_availability",
-    description: "Preflight check: is this handle reachable via iMessage or SMS? Call BEFORE send_message to avoid wasted send attempts to unreachable recipients. Returns the best-guess service plus a human-readable hint when unreachable.",
+    description: "Preflight check: is this handle reachable via iMessage or SMS? Authoritative when a conversation with the handle already exists (service comes from chat.db history); best-effort otherwise (Messages.app cannot verify iMessage registration without sending). send_message routes on the same ground truth automatically, so this is mainly useful for never-messaged handles and format validation.",
     annotations: annotations.status,
     inputSchema: {
       type: "object",
@@ -2757,6 +2757,7 @@ Call again with one of the contact:N labels.`,
       normalizedRecipient = resolution.handle;
       resolvedTarget = resolution.handle;
     }
+    let preferredService;
     if (threadSlug) {
       const slugRecord = this.db.getSlugRecord(threadSlug);
       if (!slugRecord) {
@@ -2765,6 +2766,7 @@ Call again with one of the contact:N labels.`,
           {}
         );
       }
+      preferredService = slugRecord.service === "SMS" ? "SMS" : "iMessage";
       if (slugRecord.isGroup) {
         if (slugRecord.displayName && !slugRecord.displayName.startsWith("chat")) {
           result = await sendToChat(slugRecord.displayName, message);
@@ -2772,14 +2774,18 @@ Call again with one of the contact:N labels.`,
           result = await sendToChatId(slugRecord.chatGuid, message);
         }
       } else {
-        result = await sendMessageReliable(slugRecord.chatIdentifier, message);
+        result = await sendMessageReliable(slugRecord.chatIdentifier, message, preferredService);
         if (!result.success) {
           result = await sendMessageAlt(slugRecord.chatIdentifier, message);
         }
       }
       resolvedTarget = slugRecord.displayName || slugRecord.chatIdentifier;
     } else {
-      result = await sendMessageReliable(normalizedRecipient, message);
+      const existingChat = await this.db.findChatByHandle(normalizedRecipient);
+      if (existingChat && !existingChat.isGroupChat) {
+        preferredService = existingChat.serviceType === "SMS" ? "SMS" : "iMessage";
+      }
+      result = await sendMessageReliable(normalizedRecipient, message, preferredService);
       if (!result.success) {
         result = await sendMessageAlt(normalizedRecipient, message);
       }
@@ -2787,7 +2793,7 @@ Call again with one of the contact:N labels.`,
     if (result.success) {
       const attachmentResults = [];
       if (attachments?.length) {
-        const targetHandle = threadSlug ? this.db.getSlugRecord(threadSlug)?.chatIdentifier : recipient;
+        const targetHandle = threadSlug ? this.db.getSlugRecord(threadSlug)?.chatIdentifier : normalizedRecipient;
         const isGroupTarget = threadSlug ? Boolean(this.db.getSlugRecord(threadSlug)?.isGroup) : false;
         if (isGroupTarget) {
           for (const p of attachments) {
@@ -2799,7 +2805,7 @@ Call again with one of the contact:N labels.`,
           }
         } else if (targetHandle) {
           for (const p of attachments) {
-            const r = await sendAttachment(targetHandle, p);
+            const r = await sendAttachment(targetHandle, p, preferredService);
             attachmentResults.push({
               path: p,
               success: r.success,
@@ -3132,8 +3138,18 @@ ${withThreads.map((t) => `  ${t.handle} → ${t.threadSlug}`).join("\n")}` : "";
     const { handle } = CheckImessageAvailabilitySchema.parse(args);
     const selectorHit = resolveContactSelector(handle);
     const effectiveHandle = selectorHit?.handle ?? handle;
+    const existingChat = await this.db.findChatByHandle(effectiveHandle);
+    if (existingChat && !existingChat.isGroupChat) {
+      const service = existingChat.serviceType === "SMS" ? "SMS" : "iMessage";
+      return toolText(`${handle} reachable via ${service} (existing conversation).`, {
+        handle,
+        service,
+        reachable: true,
+        hint: "Derived from existing conversation history — authoritative. send_message will route on this service."
+      });
+    }
     const result = await checkImessageAvailability(effectiveHandle);
-    const text = result.reachable ? `${handle} reachable via ${result.service}.` : `${handle} not reachable. ${result.hint ?? ""}`.trim();
+    const text = result.reachable ? `${handle} reachable via ${result.service} (best-effort probe — no conversation history for this handle; Messages.app cannot verify iMessage registration without sending).` : `${handle} not reachable. ${result.hint ?? ""}`.trim();
     return toolText(text, {
       handle,
       service: result.service,