apple-mail-mcp 2.20.13 → 2.20.14

package/build/index.js

@@ -65211,6 +65211,30 @@ function isInlineDisposition(headers) {
   if (!dispHeader) return false;
   return dispHeader.toLowerCase().startsWith("inline");
 }
+function extractContentId(headers) {
+  const raw = getHeader(headers, "Content-ID");
+  if (!raw) return null;
+  const id = raw.replace(/^<+/, "").replace(/>+$/, "").trim().toLowerCase();
+  return id || null;
+}
+function isEmbeddedResource(headers, htmlBodies) {
+  if (!isInlineDisposition(headers)) return false;
+  const cid = extractContentId(headers);
+  if (!cid) return false;
+  const needle = `cid:${cid}`;
+  return htmlBodies.some((html) => html.includes(needle));
+}
+function collectHtmlBodies(parts) {
+  const bodies = [];
+  for (const part of parts) {
+    if (extractMimeType(part.headers) !== "text/html") continue;
+    const encoding = getHeader(part.headers, "Content-Transfer-Encoding");
+    bodies.push(
+      decodePartText(decodeBody(part.body, encoding), extractCharset(part.headers)).toLowerCase()
+    );
+  }
+  return bodies;
+}
 function extractSize(headers) {
   const dispHeader = getHeader(headers, "Content-Disposition");
   if (dispHeader) {
@@ -65316,11 +65340,12 @@ function parseMimeAttachments(source) {
   const boundary = extractBoundary(source);
   if (!boundary) return [];
   const parts = walkLeafParts(source, boundary);
+  const htmlBodies = collectHtmlBodies(parts);
   const attachments = [];
   for (const part of parts) {
     const filename = extractFilename(part.headers);
     if (!filename) continue;
-    if (isInlineDisposition(part.headers)) continue;
+    if (isEmbeddedResource(part.headers, htmlBodies)) continue;
     const encoding = getHeader(part.headers, "Content-Transfer-Encoding");
     attachments.push({
       name: filename,
@@ -86686,13 +86711,29 @@ ${this.errorEmit("              ")}
                 set msg to item 1 of matchingMsgs
                 set outputText to ""
                 set attCount to 0
+                -- Each property is read inside its own try: \`MIME type of att\` throws
+                -- "AppleEvent handler failed" for attachments Apple Mail itself composed,
+                -- and one unguarded throw discards the whole list, so the MIME fallback
+                -- answers "no attachments". An unreadable type or size degrades to a
+                -- default; only a missing name drops the entry (it cannot be addressed).
                 repeat with att in mail attachments of msg
-                  set attName to name of att
-                  set attType to MIME type of att
-                  set attSize to file size of att as string
-                  if attCount > 0 then set outputText to outputText & "${RECORD_SEP}"
-                  set outputText to outputText & attName & "${FIELD_SEP}" & attType & "${FIELD_SEP}" & attSize
-                  set attCount to attCount + 1
+                  set attName to ""
+                  set attType to "application/octet-stream"
+                  set attSize to "0"
+                  try
+                    set attName to name of att
+                  end try
+                  try
+                    set attType to MIME type of att
+                  end try
+                  try
+                    set attSize to file size of att as string
+                  end try
+                  if attName is not "" then
+                    if attCount > 0 then set outputText to outputText & "${RECORD_SEP}"
+                    set outputText to outputText & attName & "${FIELD_SEP}" & attType & "${FIELD_SEP}" & attSize
+                    set attCount to attCount + 1
+                  end if
                 end repeat
                 return outputText
               end if

package/package.json

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