apple-mail-mcp 2.11.0 → 2.11.2

package/build/index.js

@@ -78071,11 +78071,17 @@ function sleep(ms) {
     }
   }
 }
+var PERMISSION_DENIED_PATTERN = /not authorized|not permitted|access.*denied/i;
+var PERMISSION_DENIED_MESSAGE = "Permission denied. Grant automation access in System Settings > Privacy & Security > Automation.";
+function isPermissionDenied(error2) {
+  if (!error2) return false;
+  return PERMISSION_DENIED_PATTERN.test(error2) || error2.includes(PERMISSION_DENIED_MESSAGE);
+}
 var ERROR_MAPPINGS = [
   // Permission errors
   {
-    pattern: /not authorized|not permitted|access.*denied/i,
-    message: "Permission denied. Grant automation access in System Settings > Privacy & Security > Automation."
+    pattern: PERMISSION_DENIED_PATTERN,
+    message: PERMISSION_DENIED_MESSAGE
   },
   // Application not running
   {
@@ -80949,20 +80955,15 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
   replyToMessage(id, body, replyAll = false, send = true) {
     const safeBody = escapeForAppleScriptBody(body);
     const replyAllClause = replyAll ? " with reply to all" : "";
-    const sendAction = send ? "send theReply" : "";
+    const finalAction = send ? "send theReply" : "save theReply";
     const script = this.findMessageScript(
       id,
       `
           set theReply to reply msg without opening window${replyAllClause}
           set content of theReply to "${safeBody}"
-          ${sendAction}`
+          ${finalAction}`
     );
-    const result = executeAppleScript(script, { timeoutMs: 6e4 });
-    if (!result.success || result.output.startsWith("error:")) {
-      console.error(`Failed to reply to message: ${result.error || result.output}`);
-      return false;
-    }
-    return true;
+    return this.runComposeScript(script, "reply to");
   }
   /**
    * Forward a message.
@@ -80975,7 +80976,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
    */
   forwardMessage(id, to, body, send = true) {
     const safeBody = body ? escapeForAppleScriptBody(body) : "";
-    const sendAction = send ? "send theForward" : "";
+    const finalAction = send ? "send theForward" : "save theForward";
     let recipientCommands = "";
     for (const addr of to) {
       recipientCommands += `make new to recipient at end of to recipients of theForward with properties {address:"${escapeForAppleScript(addr)}"}
@@ -80987,14 +80988,9 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
           set theForward to forward msg without opening window
           ${recipientCommands}
           ${safeBody ? `set content of theForward to "${safeBody}"` : ""}
-          ${sendAction}`
+          ${finalAction}`
     );
-    const result = executeAppleScript(script, { timeoutMs: 6e4 });
-    if (!result.success || result.output.startsWith("error:")) {
-      console.error(`Failed to forward message: ${result.error || result.output}`);
-      return false;
-    }
-    return true;
+    return this.runComposeScript(script, "forward");
   }
   /**
    * Helper to find and operate on a message by ID, scoped to the mailbox the id
@@ -81019,6 +81015,25 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
    * it immediately, so this is also where the previous operation's forensic
    * report is invalidated — see `beginMutation()`.
    */
+  /**
+   * Run a reply/forward compose script and surface Mail's OWN error text.
+   *
+   * These used to return a bare boolean and log the reason to stderr, so the
+   * tool layer could only say "Failed to reply to message X". That hid the two
+   * failures a caller can actually act on — an id present in several mailboxes
+   * (which names the candidates and tells you to re-list) and a missing id —
+   * behind one indistinguishable message.
+   */
+  runComposeScript(script, verb) {
+    const result = executeAppleScript(script, { timeoutMs: 6e4 });
+    if (!result.success || result.output.startsWith("error:")) {
+      const raw = result.error || result.output;
+      const error2 = raw.startsWith("error:") ? raw.slice("error:".length) : raw;
+      console.error(`Failed to ${verb} message: ${error2}`);
+      return { success: false, error: error2 };
+    }
+    return { success: true };
+  }
   findMessageScript(id, operation, instrument = false) {
     this.beginMutation();
     const loc = this.locationFor(id);
@@ -82841,7 +82856,7 @@ ${actionStmts.join("\n")}
         message: "Mail.app is accessible"
       });
     } else {
-      const errorHint = mailCheck.error?.includes("not authorized") ? " (check System Settings > Privacy & Security > Automation)" : "";
+      const errorHint = isPermissionDenied(mailCheck.error) ? " (check System Settings > Privacy & Security > Automation)" : "";
       checks.push({
         name: "mail_app",
         passed: false,
@@ -82857,7 +82872,7 @@ ${actionStmts.join("\n")}
         message: "AppleScript automation permissions granted"
       });
     } else {
-      const isPermError = permCheck.error?.includes("not authorized") || permCheck.error?.includes("not permitted");
+      const isPermError = isPermissionDenied(permCheck.error);
       checks.push({
         name: "permissions",
         passed: !isPermError,
@@ -83681,7 +83696,12 @@ function structuredRow(m, account, path) {
     flagColorIndex: mailFlagColorIndex(m.flags),
     mailbox: path,
     account,
-    hasAttachments: false,
+    // Derived from BODYSTRUCTURE, which the list/search fetch now requests.
+    // This was hardcoded `false` from 2.2.0 until 2.11.1 — indistinguishable to
+    // a caller from "no attachments", so every IMAP-sourced message claimed to
+    // have none. Falls back to false only when the fetch carried no
+    // BODYSTRUCTURE at all.
+    hasAttachments: bodyStructureHasAttachments(m.bodyStructure),
     // Message-ID (when the envelope carries it) is the strongest cross-/intra-
     // backend dedup key for the multi-account merge (imapMultiAccount.ts). The
     // AppleScript path does not expose it, so cross-backend dedup falls back to
@@ -83712,7 +83732,10 @@ async function run(args, listMode, deps) {
         const byUid = /* @__PURE__ */ new Map();
         for await (const msg of client.fetch(
           newest.join(","),
-          { envelope: true, flags: true },
+          // BODYSTRUCTURE rides along so `hasAttachments` is computed rather
+          // than assumed. Measured on 50 real messages: ~390ms -> ~465ms for
+          // the fetch (~17%), same single round trip, no extra request.
+          { envelope: true, flags: true, bodyStructure: true },
           { uid: true }
         )) {
           byUid.set(msg.uid, msg);
@@ -84206,7 +84229,8 @@ function collectAttachments(node, out = []) {
   if (!node) return out;
   const filename = node.dispositionParameters?.filename || node.parameters?.name;
   const disposition = node.disposition?.toLowerCase();
-  const isAttachment = !!node.part && (disposition === "attachment" || !!filename && disposition !== "inline");
+  const isEmbeddedByReference = disposition === "inline" && !!node.id;
+  const isAttachment = !!node.part && (disposition === "attachment" || !!filename && !isEmbeddedByReference);
   if (isAttachment) {
     out.push({
       part: node.part,
@@ -84218,6 +84242,9 @@ function collectAttachments(node, out = []) {
   for (const child of node.childNodes ?? []) collectAttachments(child, out);
   return out;
 }
+function bodyStructureHasAttachments(node) {
+  return !!node && collectAttachments(node).length > 0;
+}
 async function streamToBuffer(content, maxBytes) {
   const chunks = [];
   let total = 0;
@@ -84389,7 +84416,10 @@ async function imapThread(id, deps = {}, limit = 50) {
         const msgs = [];
         for await (const msg of client.fetch(
           uids.join(","),
-          { envelope: true, flags: true },
+          // Same reason as the list/search fetch: get-thread emits structured
+          // rows too, so it needs BODYSTRUCTURE or its hasAttachments would
+          // silently disagree with the same message seen via search.
+          { envelope: true, flags: true, bodyStructure: true },
           { uid: true }
         )) {
           msgs.push(msg);
@@ -85919,6 +85949,23 @@ function resolveSmtpOrFallback() {
     return null;
   }
 }
+async function toNumericMailId(id) {
+  const ref = decodeImapId(id);
+  if (!ref) return { numericId: id };
+  const messageId = await imapFetchMessageId(id);
+  if (!messageId) {
+    return {
+      error: `could not read the RFC Message-ID for "${id}" over IMAP, which is what maps it to a Mail.app id. Pass the numeric id instead (see the resolve-message-id tool).`
+    };
+  }
+  const numericId = mailManager.findNumericIdByMessageId(messageId, ref.account);
+  if (!numericId) {
+    return {
+      error: `Mail.app has no message with Message-ID <${messageId}> in account "${ref.account}", so this IMAP message has no numeric id to reply to or forward. It may not have synced to Mail.app yet.`
+    };
+  }
+  return { numericId };
+}
 async function sendReplyViaSmtp(id, body, replyAll) {
   const cfg = resolveSmtpOrFallback();
   if (!cfg) return { sent: false, fallback: true };
@@ -85977,17 +86024,23 @@ registerTool(
   },
   withErrorHandling(async ({ id, body, replyAll, send }) => {
     if (send && isSmtpConfigured()) {
-      const outcome = await sendReplyViaSmtp(id, body, replyAll);
-      if (outcome.sent) {
+      const outcome2 = await sendReplyViaSmtp(id, body, replyAll);
+      if (outcome2.sent) {
         return successResponse("Reply sent", { ok: true, sent: true, id });
       }
-      if (!outcome.fallback) {
-        return errorResponse(`Failed to reply to message "${id}" via SMTP: ${outcome.error}`);
+      if (!outcome2.fallback) {
+        return errorResponse(`Failed to reply to message "${id}" via SMTP: ${outcome2.error}`);
       }
     }
-    const success = mailManager.replyToMessage(id, body, replyAll, send);
-    if (!success) {
-      return errorResponse(`Failed to reply to message "${id}"`);
+    const resolvedReply = await toNumericMailId(id);
+    if (!resolvedReply.numericId) {
+      return errorResponse(`Failed to reply to message "${id}": ${resolvedReply.error}`);
+    }
+    const outcome = mailManager.replyToMessage(resolvedReply.numericId, body, replyAll, send);
+    if (!outcome.success) {
+      return errorResponse(
+        outcome.error ? `Failed to reply to message "${id}": ${outcome.error}` : `Failed to reply to message "${id}"`
+      );
     }
     return successResponse(send ? "Reply sent" : "Reply saved as draft", {
       ok: true,
@@ -86015,8 +86068,8 @@ registerTool(
   },
   withErrorHandling(async ({ id, to, body, send }) => {
     if (send && isSmtpConfigured()) {
-      const outcome = await sendForwardViaSmtp(id, to, body);
-      if (outcome.sent) {
+      const outcome2 = await sendForwardViaSmtp(id, to, body);
+      if (outcome2.sent) {
         return successResponse(`Message forwarded to ${to.join(", ")}`, {
           ok: true,
           sent: true,
@@ -86024,13 +86077,19 @@ registerTool(
           id
         });
       }
-      if (!outcome.fallback) {
-        return errorResponse(`Failed to forward message "${id}" via SMTP: ${outcome.error}`);
+      if (!outcome2.fallback) {
+        return errorResponse(`Failed to forward message "${id}" via SMTP: ${outcome2.error}`);
       }
     }
-    const success = mailManager.forwardMessage(id, to, body, send);
-    if (!success) {
-      return errorResponse(`Failed to forward message "${id}"`);
+    const resolvedFwd = await toNumericMailId(id);
+    if (!resolvedFwd.numericId) {
+      return errorResponse(`Failed to forward message "${id}": ${resolvedFwd.error}`);
+    }
+    const outcome = mailManager.forwardMessage(resolvedFwd.numericId, to, body, send);
+    if (!outcome.success) {
+      return errorResponse(
+        outcome.error ? `Failed to forward message "${id}": ${outcome.error}` : `Failed to forward message "${id}"`
+      );
     }
     return successResponse(
       send ? `Message forwarded to ${to.join(", ")}` : "Forward saved as draft",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-mail-mcp",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "description": "MCP server for Apple Mail - read, search, send, and manage emails via Claude and other AI assistants",
   "type": "module",
   "main": "build/index.js",