apple-mail-mcp 2.20.17 → 2.20.19

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 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 collectHtmlBodies(parts) {
-  const bodies = [];
+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;
@@ -84997,9 +85104,13 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       if (scoped.kind === "hit") return scoped.output;
       if (scoped.kind === "done") return null;
     }
-    const result = executeAppleScript(this.unscopedByIdScript(id, innerAction, opts), {
-      timeoutMs: READ_ONLY_BYID_TIMEOUT_MS
-    });
+    const account = hint?.account && !hint?.mailbox ? hint.account : void 0;
+    const result = executeAppleScript(
+      this.unscopedByIdScript(id, innerAction, { ...opts, account }),
+      {
+        timeoutMs: READ_ONLY_BYID_TIMEOUT_MS
+      }
+    );
     if (!result.success || !result.output.trim()) {
       if (!result.success) {
         if (result.timedOut) this.lastMessageLookupError = timedOutScanningForId(id);
@@ -85116,6 +85227,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
    */
   unscopedByIdScript(id, innerAction, opts = {}) {
     const threshold = getByIdScanThreshold();
+    const scopeAcct = escapeForAppleScript(opts.account ?? "");
     const stalledKeys = threshold > 0 ? this.stalledMailboxes.keys() : [];
     const stalledList = `{${stalledKeys.map((key) => {
       const i = key.indexOf(STALLED_KEY_SEP);
@@ -85175,6 +85287,8 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         set _probeStalled to false
         set _stopAt to 0
         set _stalledKeys to ${stalledList}
+        set _scopeAcct to "${scopeAcct}"
+        set _acctSeen to false
         set _startedAt to current date
         set _acctNames to {}
         try
@@ -85191,10 +85305,14 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
           set _acctName to ""
           if _ai <= (length of _acctNames) then set _acctName to item _ai of _acctNames
           if _acctName is "" then set _acctName to (name of acct)
-          if _budgetHit or _probeStalled then
+          if _scopeAcct is not "" and _acctName is not _scopeAcct then
+            -- Scoped to one account: leave the others alone.
+            set _ai to _ai + 0
+          else if _budgetHit or _probeStalled then
             -- Stopped early: name what is left without asking Mail.app.
             set _unreached to _unreached & _acctName & " (every mailbox)${DIAG_ITEM_SEP}"
           else
+            set _acctSeen to true
             set _mbNames to {}
             try
               set _mbNames to name of mailboxes of acct
@@ -85240,7 +85358,11 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         -- reach them. Collect into the SAME _hits/_names, which means an id
         -- present both in an account and locally is now correctly reported as
         -- ambiguous rather than silently resolving to the account copy.
-        if _budgetHit or _probeStalled then
+        if _scopeAcct is not "" and not _acctSeen then return "${LOOKUP_ERROR_MARKER}Account \\"" & _scopeAcct & "\\" not found \u2014 check the name with list-accounts."
+        if _scopeAcct is not "" then
+          -- Local mailboxes belong to no account.
+          set _ai to _ai + 0
+        else if _budgetHit or _probeStalled then
           set _unreached to _unreached & "${LOCAL_STORE_LABEL} (any local mailboxes)${DIAG_ITEM_SEP}"
         else if not (${hitFound}) then${localMailboxBindingFragment()}
           set _mi to 0

package/package.json

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