apple-mail-mcp 2.20.16 → 2.20.18

package/build/index.js

@@ -65193,16 +65193,112 @@ function getHeader(headers, name2) {
   if (!match) return null;
   return match[1].replace(/\r?\n[ \t]+/g, " ").trim();
 }
+function decodeBytes(bytes, charset) {
+  try {
+    return new TextDecoder(charset.trim().toLowerCase()).decode(bytes);
+  } catch {
+    return bytes.toString("utf8");
+  }
+}
+function parseParams(value) {
+  const pieces = [];
+  let current = "";
+  let quoted = false;
+  for (let i = 0; i < value.length; i++) {
+    const ch = value[i];
+    if (ch === "\\" && quoted && i + 1 < value.length) {
+      current += ch + value[++i];
+      continue;
+    }
+    if (ch === '"') quoted = !quoted;
+    if (ch === ";" && !quoted) {
+      pieces.push(current);
+      current = "";
+    } else {
+      current += ch;
+    }
+  }
+  pieces.push(current);
+  const params = /* @__PURE__ */ new Map();
+  for (const piece of pieces.slice(1)) {
+    const eq = piece.indexOf("=");
+    if (eq < 0) continue;
+    let val = piece.slice(eq + 1).trim();
+    if (val.length >= 2 && val.startsWith('"') && val.endsWith('"')) {
+      val = val.slice(1, -1).replace(/\\(.)/g, "$1");
+    }
+    params.set(piece.slice(0, eq).trim().toLowerCase(), val);
+  }
+  return params;
+}
+function decodeEncodedWords(text) {
+  return text.replace(/(\?=)\s+(?==\?)/g, "$1").replace(
+    /=\?([^?\s]+)\?([bq])\?([^?]*)\?=/gi,
+    (_all, charset, kind, body) => {
+      const bytes = kind.toLowerCase() === "b" ? Buffer.from(body, "base64") : Buffer.from(
+        body.replace(/_/g, " ").replace(
+          /=([0-9a-f]{2})/gi,
+          (_m, hex) => String.fromCharCode(parseInt(hex, 16))
+        ),
+        "latin1"
+      );
+      return decodeBytes(bytes, charset.split("*")[0]);
+    }
+  );
+}
+function decodeExtendedValue(segments) {
+  let charset = "utf-8";
+  const chunks = [];
+  segments.forEach((segment, index) => {
+    let value = segment.value;
+    if (!segment.encoded) {
+      chunks.push(Buffer.from(value, "utf8"));
+      return;
+    }
+    if (index === 0) {
+      const head = value.match(/^([^']*)'[^']*'([\s\S]*)$/);
+      if (head) {
+        charset = head[1] || charset;
+        value = head[2];
+      }
+    }
+    chunks.push(
+      Buffer.from(
+        value.replace(
+          /%([0-9a-f]{2})/gi,
+          (_m, hex) => String.fromCharCode(parseInt(hex, 16))
+        ),
+        "latin1"
+      )
+    );
+  });
+  return decodeBytes(Buffer.concat(chunks), charset);
+}
+function paramValue(params, name2) {
+  const extended = params.get(`${name2}*`);
+  if (extended !== void 0) return decodeExtendedValue([{ value: extended, encoded: true }]);
+  const segments = [];
+  for (let i = 0; ; i++) {
+    const encoded = params.get(`${name2}*${i}*`);
+    const plain = params.get(`${name2}*${i}`);
+    if (encoded !== void 0) segments.push({ value: encoded, encoded: true });
+    else if (plain !== void 0) segments.push({ value: plain, encoded: false });
+    else break;
+  }
+  if (segments.length > 0) return decodeExtendedValue(segments);
+  const value = params.get(name2);
+  return value === void 0 ? null : decodeEncodedWords(value);
+}
 function extractFilename(headers) {
   const dispHeader = getHeader(headers, "Content-Disposition");
   if (dispHeader) {
-    const fnMatch = dispHeader.match(/filename="?([^";\r\n]+)"?/i);
-    if (fnMatch) return fnMatch[1].trim();
+    const filename = paramValue(parseParams(dispHeader), "filename")?.trim();
+    if (filename) return filename;
   }
   const ctHeader = getHeader(headers, "Content-Type");
   if (ctHeader) {
-    const nameMatch = ctHeader.match(/name="?([^";\r\n]+)"?/i);
-    if (nameMatch) return nameMatch[1].trim();
+    const name2 = paramValue(parseParams(ctHeader), "name")?.trim();
+    if (name2) return name2;
   }
   return null;
 }
@@ -65217,23 +65313,33 @@ function extractContentId(headers) {
   const id = raw.replace(/^<+/, "").replace(/>+$/, "").trim().toLowerCase();
   return id || null;
 }
-function isEmbeddedResource(headers, htmlBodies) {
+function isEmbeddedResource(headers, referenced) {
   if (!isInlineDisposition(headers)) return false;
   const cid = extractContentId(headers);
   if (!cid) return false;
-  const needle = `cid:${cid}`;
-  return htmlBodies.some((html) => html.includes(needle));
+  return referenced().has(cid);
 }
-function collectHtmlBodies(parts) {
-  const bodies = [];
+function cidReferences(html) {
+  const refs = /* @__PURE__ */ new Set();
+  for (const match of html.matchAll(/cid:([^\s"'<>()]+)/gi)) {
+    let ref = match[1];
+    try {
+      ref = decodeURIComponent(ref);
+    } catch {
+    }
+    refs.add(ref.trim().toLowerCase());
+  }
+  return refs;
+}
+function collectCidReferences(parts) {
+  const refs = /* @__PURE__ */ new Set();
   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()
-    );
+    const html = decodePartText(decodeBody(part.body, encoding), extractCharset(part.headers));
+    for (const ref of cidReferences(html)) refs.add(ref);
   }
-  return bodies;
+  return refs;
 }
 function extractSize(headers) {
   const dispHeader = getHeader(headers, "Content-Disposition");
@@ -65340,12 +65446,13 @@ function parseMimeAttachments(source) {
   const boundary = extractBoundary(source);
   if (!boundary) return [];
   const parts = walkLeafParts(source, boundary);
-  const htmlBodies = collectHtmlBodies(parts);
+  let refs;
+  const referenced = () => refs ??= collectCidReferences(parts);
   const attachments = [];
   for (const part of parts) {
     const filename = extractFilename(part.headers);
     if (!filename) continue;
-    if (isEmbeddedResource(part.headers, htmlBodies)) continue;
+    if (isEmbeddedResource(part.headers, referenced)) continue;
     const encoding = getHeader(part.headers, "Content-Transfer-Encoding");
     attachments.push({
       name: filename,
@@ -65432,7 +65539,7 @@ var init_mimeParse = __esm({
 });
 
 // src/utils/headers.ts
-function decodeEncodedWords(value) {
+function decodeEncodedWords2(value) {
   if (!value.includes("=?")) return value;
   const joined = value.replace(/(\?=)\s+(=\?)/g, "$1$2");
   return joined.replace(
@@ -65522,7 +65629,7 @@ function parseHeaderBlock(input) {
   const all = (name2) => headers.filter((h) => h.name.toLowerCase() === name2.toLowerCase()).map((h) => h.value);
   const decoded = (name2) => {
     const v = first(name2);
-    return v === void 0 ? void 0 : decodeEncodedWords(v);
+    return v === void 0 ? void 0 : decodeEncodedWords2(v);
   };
   const dateHeader = first("Date") || void 0;
   let date3;
@@ -83437,16 +83544,10 @@ function buildMessageRowLoop(opts) {
               -- outside date range; skip
             else` : "";
   const dateClose = dateFilter ? `end if` : "";
-  const attBulk = withAttachments ? `
-        set _atts to mail attachments of _msgs` : "";
   const attRow = withAttachments ? `
           set msgHasAtt to "false"
           try
-            if _bulkOK then
-              if (count of (item _i of _atts)) > 0 then set msgHasAtt to "true"
-            else
-              if (count of mail attachments of (item _i of _msgs)) > 0 then set msgHasAtt to "true"
-            end if
+            if (count of mail attachments of (item _i of _msgs)) > 0 then set msgHasAtt to "true"
           end try` : "";
   const attField = withAttachments ? ` & "${FIELD_SEP}" & msgHasAtt` : "";
   return `
@@ -83459,7 +83560,7 @@ function buildMessageRowLoop(opts) {
         set _dates to date received of _msgs
         set _reads to read status of _msgs
         set _flags to flagged status of _msgs
-        set _flagColors to flag index of _msgs${attBulk}
+        set _flagColors to flag index of _msgs
       on error
         set _bulkOK to false
       end try
@@ -84821,7 +84922,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         ignoring case
           if _wantNames contains (name of mb) then
             try
-              ${buildMessageRowLoop({ collection: `messages of mb ${searchCondition}`, limit, dedup: true, dateFilter, trailing: ` & "${FIELD_SEP}" & mbName` })}
+              ${buildMessageRowLoop({ collection: `messages of mb ${searchCondition}`, limit, dedup: true, dateFilter, withAttachments: true, trailing: ` & "${FIELD_SEP}" & mbName` })}
             on error _errMsg number _errNum
               set _timedOut to true
               set _notSearched to _notSearched & mbName & "${DIAG_ITEM_SEP}"
@@ -84843,7 +84944,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         set _notSearched to "${escapeForAppleScript(targetMailbox)}${DIAG_ITEM_SEP}"
       else
         try
-          ${buildMessageRowLoop({ collection: `messages of theMailbox ${searchCondition}`, limit, dateFilter })}
+          ${buildMessageRowLoop({ collection: `messages of theMailbox ${searchCondition}`, limit, dateFilter, withAttachments: true })}
         on error _errMsg number _errNum
           set _timedOut to true
           set _notSearched to "${escapeForAppleScript(targetMailbox)}${DIAG_ITEM_SEP}"
@@ -84881,7 +84982,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
             set _skipped to _skipped & mbName & " (" & (mbCount as string) & ")${DIAG_ITEM_SEP}"
           else
             try
-              ${buildMessageRowLoop({ collection: `messages of mb ${searchCondition}`, limit, dedup: true, dateFilter, trailing: ` & "${FIELD_SEP}" & mbName` })}
+              ${buildMessageRowLoop({ collection: `messages of mb ${searchCondition}`, limit, dedup: true, dateFilter, withAttachments: true, trailing: ` & "${FIELD_SEP}" & mbName` })}
             on error _errMsg number _errNum
               set _timedOut to true
               set _notSearched to _notSearched & mbName & "${DIAG_ITEM_SEP}"

package/package.json

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