apple-mail-mcp 1.3.0 → 1.5.0

package/README.md

@@ -724,6 +724,16 @@ If installed from source, use this configuration:
 | Attachment save path restrictions | `save-attachment` only allows saving to home directory, `/tmp`, `/private/tmp`, and `/Volumes`; path traversal is blocked |
 | Attachment count limit | `send-email` and `create-draft` accept a maximum of 20 file attachments |
 
+### Reply / Forward from Background Processes (Fixed in v1.4.0)
+
+Prior to v1.4.0, `reply-to-message` and `forward-message` would send messages with **empty body text** when the MCP server ran as a background process (e.g., spawned via `execSync` from Node.js, which is how Claude Code invokes it).
+
+**Root cause:** The AppleScript `reply msg with opening window` command creates a GUI compose window asynchronously. When `set content` runs immediately after, the window may not be ready, and the content assignment is silently ignored. Delays (`delay 1`, `delay 2`) were unreliable — the compose window's readiness depends on system load, Mail.app state, and whether the process has GUI access.
+
+**Fix:** Replaced `with opening window` with `without opening window` for both `reply` and `forward` commands. With this approach, `set content` works immediately and reliably from background processes. `In-Reply-To` and `References` headers are still set correctly by Mail.app, and no GUI compose window is opened.
+
+See [#7](https://github.com/sweetrb/apple-mail-mcp/issues/7) for full details and the list of approaches that were tested.
+
 ### Backslash Escaping (Important for AI Agents)
 
 When sending content containing backslashes (`\`) to this MCP server, **you must escape them as `\\`** in the JSON parameters.

package/build/services/appleMailManager.d.ts

@@ -100,6 +100,16 @@ export declare class AppleMailManager {
      * Get the content of a message.
      */
     getMessageContent(id: string): MessageContent | null;
+    /**
+     * Get the raw MIME source of a message.
+     * Used as fallback for attachment extraction when AppleScript
+     * mail attachments returns empty.
+     *
+     * Timeout is 2x the default (120s) because `source of msg` returns
+     * the entire raw message including base64-encoded attachments —
+     * a 20MB attachment can take several seconds over Exchange/IMAP.
+     */
+    getRawSource(id: string): string | null;
     /**
      * List messages in a mailbox.
      *
@@ -111,6 +121,14 @@ export declare class AppleMailManager {
     listMessages(mailbox?: string, account?: string, limit?: number, from?: string, offset?: number): Message[];
     /**
      * Parse message list output from AppleScript.
+     *
+     * Two emission schemas, disambiguated by length:
+     *   7 fields: single-mailbox — ...|hasAtt (mailbox from caller)
+     *   8 fields: all-mailboxes — ...|mailbox|hasAtt
+     *
+     * `hasAttachments` here is the fast-path AppleScript count only; it will
+     * false-negative for MIME-embedded attachments (a known AppleScript
+     * limitation). Use getMessage or list-attachments for authoritative info.
      */
     private parseMessageList;
     /**
@@ -233,10 +251,14 @@ export declare class AppleMailManager {
     batchUnflagMessages(ids: string[]): BatchOperationResult[];
     /**
      * List attachments for a message.
+     * Tries AppleScript first, falls back to MIME source parsing
+     * when AppleScript returns empty (known issue across all account types).
      */
     listAttachments(id: string): Attachment[];
     /**
      * Save an attachment from a message to disk.
+     * Tries AppleScript first, falls back to MIME source extraction
+     * when AppleScript can't find the attachment.
      */
     saveAttachment(id: string, attachmentName: string, savePath: string): boolean;
     /**

package/build/services/appleMailManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appleMailManager.d.ts","sourceRoot":"","sources":["../../src/services/appleMailManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"appleMailManager.d.ts","sourceRoot":"","sources":["../../src/services/appleMailManager.ts"],"names":[],"mappings":"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"}

package/build/services/appleMailManager.js

@@ -13,10 +13,11 @@
  * @module services/appleMailManager
  */
 import { spawnSync } from "child_process";
-import { existsSync } from "fs";
+import { existsSync, writeFileSync } from "fs";
 import { isAbsolute, resolve } from "path";
 import { homedir } from "os";
 import { executeAppleScript } from "../utils/applescript.js";
+import { parseMimeAttachments, extractMimeAttachment } from "../utils/mimeParse.js";
 // =============================================================================
 // Text Processing Utilities
 // =============================================================================
@@ -423,7 +424,24 @@ export class AppleMailManager {
                 set msgDeleted to deleted status of msg as string
                 set msgMailbox to name of mb
                 set msgAccount to name of acct
-                return msgSubject & "|||" & msgSender & "|||" & msgDate & "|||" & msgRead & "|||" & msgFlagged & "|||" & msgJunk & "|||" & msgDeleted & "|||" & msgMailbox & "|||" & msgAccount
+                set hasAtt to "false"
+                try
+                  set attCount to count of mail attachments of msg
+                  if attCount > 0 then set hasAtt to "true"
+                end try
+                -- MIME-embedded attachments are invisible to AppleScript's
+                -- attachment object. Fall back to scanning the raw source.
+                -- This reads the full message source (can be MB-sized for
+                -- messages with large bodies), so it's the slowest part of
+                -- get-message for attachmentless messages. Accepted as the
+                -- cost of correct hasAttachments in the detail view.
+                if hasAtt is "false" then
+                  try
+                    set rawSrc to source of msg
+                    if rawSrc contains "Content-Disposition: attachment" then set hasAtt to "true"
+                  end try
+                end if
+                return msgSubject & "|||" & msgSender & "|||" & msgDate & "|||" & msgRead & "|||" & msgFlagged & "|||" & msgJunk & "|||" & msgDeleted & "|||" & msgMailbox & "|||" & msgAccount & "|||" & hasAtt
               end if
             end try
           end repeat
@@ -453,7 +471,7 @@ export class AppleMailManager {
             isDeleted: parts[6] === "true",
             mailbox: parts[7],
             account: parts[8],
-            hasAttachments: false,
+            hasAttachments: parts.length > 9 ? parts[9] === "true" : false,
         };
     }
     /**
@@ -502,6 +520,40 @@ export class AppleMailManager {
             htmlContent: htmlContent || undefined,
         };
     }
+    /**
+     * Get the raw MIME source of a message.
+     * Used as fallback for attachment extraction when AppleScript
+     * mail attachments returns empty.
+     *
+     * Timeout is 2x the default (120s) because `source of msg` returns
+     * the entire raw message including base64-encoded attachments —
+     * a 20MB attachment can take several seconds over Exchange/IMAP.
+     */
+    getRawSource(id) {
+        const script = buildAppLevelScript(`
+      try
+        repeat with acct in accounts
+          repeat with mb in mailboxes of acct
+            try
+              set matchingMsgs to (messages of mb whose id is ${Number(id)})
+              if (count of matchingMsgs) > 0 then
+                set msg to item 1 of matchingMsgs
+                return source of msg
+              end if
+            end try
+          end repeat
+        end repeat
+        return ""
+      on error errMsg
+        return ""
+      end try
+    `);
+        const result = executeAppleScript(script, { timeoutMs: 120000 });
+        if (!result.success || !result.output.trim()) {
+            return null;
+        }
+        return result.output;
+    }
     /**
      * List messages in a mailbox.
      *
@@ -549,8 +601,12 @@ export class AppleMailManager {
             set msgDate to ${AS_DATE_TO_STRING}
             set msgRead to read status of msg as string
             set msgFlagged to flagged status of msg as string
+            set msgHasAtt to "false"
+            try
+              if (count of mail attachments of msg) > 0 then set msgHasAtt to "true"
+            end try
             if msgCount > 0 then set outputText to outputText & "|||ITEM|||"
-            set outputText to outputText & msgId & "|||" & msgSubject & "|||" & msgSender & "|||" & msgDate & "|||" & msgRead & "|||" & msgFlagged
+            set outputText to outputText & msgId & "|||" & msgSubject & "|||" & msgSender & "|||" & msgDate & "|||" & msgRead & "|||" & msgFlagged & "|||" & msgHasAtt
             set msgCount to msgCount + 1
           end if
         end try
@@ -583,8 +639,12 @@ export class AppleMailManager {
                   set msgDate to ${AS_DATE_TO_STRING}
                   set msgRead to read status of msg as string
                   set msgFlagged to flagged status of msg as string
+                  set msgHasAtt to "false"
+                  try
+                    if (count of mail attachments of msg) > 0 then set msgHasAtt to "true"
+                  end try
                   if msgCount > 0 then set outputText to outputText & "|||ITEM|||"
-                  set outputText to outputText & msgId & "|||" & msgSubject & "|||" & msgSender & "|||" & msgDate & "|||" & msgRead & "|||" & msgFlagged & "|||" & name of mb
+                  set outputText to outputText & msgId & "|||" & msgSubject & "|||" & msgSender & "|||" & msgDate & "|||" & msgRead & "|||" & msgFlagged & "|||" & name of mb & "|||" & msgHasAtt
                   set msgCount to msgCount + 1
                 end if
               end if
@@ -607,6 +667,14 @@ export class AppleMailManager {
     }
     /**
      * Parse message list output from AppleScript.
+     *
+     * Two emission schemas, disambiguated by length:
+     *   7 fields: single-mailbox — ...|hasAtt (mailbox from caller)
+     *   8 fields: all-mailboxes — ...|mailbox|hasAtt
+     *
+     * `hasAttachments` here is the fast-path AppleScript count only; it will
+     * false-negative for MIME-embedded attachments (a known AppleScript
+     * limitation). Use getMessage or list-attachments for authoritative info.
      */
     parseMessageList(output, mailbox, account) {
         const items = output.split("|||ITEM|||");
@@ -615,6 +683,15 @@ export class AppleMailManager {
             const parts = item.split("|||");
             if (parts.length < 6)
                 continue;
+            let msgMailbox = mailbox;
+            let hasAttachments = false;
+            if (parts.length >= 8) {
+                msgMailbox = parts[6];
+                hasAttachments = parts[7] === "true";
+            }
+            else if (parts.length === 7) {
+                hasAttachments = parts[6] === "true";
+            }
             messages.push({
                 id: parts[0].trim(),
                 subject: parts[1],
@@ -625,9 +702,9 @@ export class AppleMailManager {
                 isFlagged: parts[5] === "true",
                 isJunk: false,
                 isDeleted: false,
-                mailbox: parts.length >= 7 ? parts[6] : mailbox,
+                mailbox: msgMailbox,
                 account,
-                hasAttachments: false,
+                hasAttachments,
             });
         }
         return messages;
@@ -826,8 +903,8 @@ export class AppleMailManager {
               set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
-                set theReply to reply msg with opening window${replyAllClause}
-                set content of theReply to "${safeBody}" & return & return & content of theReply
+                set theReply to reply msg without opening window${replyAllClause}
+                set content of theReply to "${safeBody}"
                 ${sendAction}
                 return "ok"
               end if
@@ -871,9 +948,9 @@ export class AppleMailManager {
               set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
-                set theForward to forward msg with opening window
+                set theForward to forward msg without opening window
                 ${recipientCommands}
-                ${safeBody ? `set content of theForward to "${safeBody}" & return & return & content of theForward` : ""}
+                ${safeBody ? `set content of theForward to "${safeBody}"` : ""}
                 ${sendAction}
                 return "ok"
               end if
@@ -1102,8 +1179,11 @@ export class AppleMailManager {
     }
     /**
      * List attachments for a message.
+     * Tries AppleScript first, falls back to MIME source parsing
+     * when AppleScript returns empty (known issue across all account types).
      */
     listAttachments(id) {
+        // Attempt 1: AppleScript mail attachments
         const script = buildAppLevelScript(`
       try
         repeat with acct in accounts
@@ -1133,26 +1213,39 @@ export class AppleMailManager {
       end try
     `);
         const result = executeAppleScript(script, { timeoutMs: 60000 });
-        if (!result.success || !result.output.trim()) {
-            return [];
-        }
-        const items = result.output.split("|||ITEM|||");
-        const attachments = [];
-        for (const item of items) {
-            const parts = item.split("|||");
-            if (parts.length < 3)
-                continue;
-            attachments.push({
-                id: `${id}-${parts[0]}`,
-                name: parts[0],
-                mimeType: parts[1],
-                size: parseInt(parts[2]) || 0,
-            });
+        if (result.success && result.output.trim()) {
+            const items = result.output.split("|||ITEM|||");
+            const attachments = [];
+            for (const item of items) {
+                const parts = item.split("|||");
+                if (parts.length < 3)
+                    continue;
+                attachments.push({
+                    id: `${id}-${parts[0]}`,
+                    name: parts[0],
+                    mimeType: parts[1],
+                    size: parseInt(parts[2]) || 0,
+                });
+            }
+            if (attachments.length > 0)
+                return attachments;
         }
-        return attachments;
+        // Attempt 2: MIME source fallback
+        const rawSource = this.getRawSource(id);
+        if (!rawSource)
+            return [];
+        const mimeAttachments = parseMimeAttachments(rawSource);
+        return mimeAttachments.map((att) => ({
+            id: `${id}-${att.name}`,
+            name: att.name,
+            mimeType: att.mimeType,
+            size: att.size,
+        }));
     }
     /**
      * Save an attachment from a message to disk.
+     * Tries AppleScript first, falls back to MIME source extraction
+     * when AppleScript can't find the attachment.
      */
     saveAttachment(id, attachmentName, savePath) {
         // Validate attachment name: block path separators, traversal, null bytes, and backslashes
@@ -1170,9 +1263,8 @@ export class AppleMailManager {
         }
         const safeName = escapeForAppleScript(attachmentName);
         const safePath = escapeForAppleScript(resolvedPath);
-        // Use Number(id) as defense-in-depth — the Zod schema already enforces numeric IDs,
-        // but this ensures raw interpolation into AppleScript is safe even if validation changes.
         const numericId = Number(id);
+        // Attempt 1: AppleScript save
         const script = buildAppLevelScript(`
       try
         repeat with acct in accounts
@@ -1199,11 +1291,35 @@ export class AppleMailManager {
       end try
     `);
         const result = executeAppleScript(script, { timeoutMs: 60000 });
-        if (!result.success || result.output.startsWith("error:")) {
-            console.error(`Failed to save attachment: ${result.error || result.output}`);
+        if (result.success && result.output === "ok") {
+            return true;
+        }
+        // Attempt 2: MIME source fallback
+        const rawSource = this.getRawSource(id);
+        if (!rawSource) {
+            console.error(`Failed to save attachment: could not retrieve message source`);
+            return false;
+        }
+        const attachment = extractMimeAttachment(rawSource, attachmentName);
+        if (!attachment) {
+            console.error(`Failed to save attachment: "${attachmentName}" not found in MIME source`);
+            return false;
+        }
+        try {
+            const outPath = resolve(resolvedPath, attachmentName);
+            // Verify the resolved output path is still within allowed directories
+            const isOutAllowed = allowedPrefixes.some((prefix) => outPath.startsWith(prefix));
+            if (!isOutAllowed) {
+                console.error(`Output path "${outPath}" is outside allowed directories`);
+                return false;
+            }
+            writeFileSync(outPath, attachment.data);
+            return true;
+        }
+        catch (err) {
+            console.error(`Failed to write attachment to disk: ${err}`);
             return false;
         }
-        return true;
     }
     // ===========================================================================
     // Mailbox Operations

package/build/utils/mimeParse.d.ts

@@ -0,0 +1,41 @@
+/**
+ * MIME Source Parser for Attachment Extraction
+ *
+ * Parses raw email MIME source to extract attachment metadata and content.
+ * Used as a fallback when AppleScript's `mail attachments` returns empty
+ * (which happens across all account types: iCloud, Google, Exchange).
+ *
+ * @module utils/mimeParse
+ */
+export interface MimeAttachmentInfo {
+    /** Filename from Content-Disposition or Content-Type name parameter */
+    name: string;
+    /** MIME type from Content-Type header */
+    mimeType: string;
+    /** Size in bytes from Content-Disposition size parameter, or estimated from body */
+    size: number;
+}
+export interface MimeAttachmentData extends MimeAttachmentInfo {
+    /** Decoded binary content */
+    data: Buffer;
+}
+/**
+ * Parse MIME source and return metadata for all file attachments.
+ * Skips inline dispositions (signature images, etc.). Descends into
+ * nested multipart/* containers.
+ *
+ * @param source - Raw MIME source of the email
+ * @returns Array of attachment metadata (name, mimeType, size)
+ */
+export declare function parseMimeAttachments(source: string): MimeAttachmentInfo[];
+/**
+ * Extract and decode a specific attachment from MIME source by filename.
+ * Supports base64, quoted-printable, and 7bit/8bit/binary transfer encodings.
+ * Descends into nested multipart/* containers.
+ *
+ * @param source - Raw MIME source of the email
+ * @param attachmentName - Filename to extract
+ * @returns Decoded attachment data, or null if not found
+ */
+export declare function extractMimeAttachment(source: string, attachmentName: string): MimeAttachmentData | null;
+//# sourceMappingURL=mimeParse.d.ts.map

package/build/utils/mimeParse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mimeParse.d.ts","sourceRoot":"","sources":["../../src/utils/mimeParse.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,WAAW,kBAAkB;IACjC,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAC;IACb,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;CACd;AAyLD;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAyBzE;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GACrB,kBAAkB,GAAG,IAAI,CAwB3B"}

package/build/utils/mimeParse.js

@@ -0,0 +1,238 @@
+/**
+ * MIME Source Parser for Attachment Extraction
+ *
+ * Parses raw email MIME source to extract attachment metadata and content.
+ * Used as a fallback when AppleScript's `mail attachments` returns empty
+ * (which happens across all account types: iCloud, Google, Exchange).
+ *
+ * @module utils/mimeParse
+ */
+/**
+ * Extract the boundary string from a Content-Type header value
+ * (or from any string containing a boundary= parameter).
+ */
+function extractBoundary(source) {
+    const match = source.match(/boundary="?([^";\s\r\n]+)"?/i);
+    return match ? match[1] : null;
+}
+/**
+ * Extract a header value from a MIME part header block.
+ * Handles folded headers (continuation lines starting with whitespace).
+ */
+function getHeader(headers, name) {
+    const regex = new RegExp(`^${name}:\\s*(.+(?:\\r?\\n[ \\t]+.+)*)`, "im");
+    const match = headers.match(regex);
+    if (!match)
+        return null;
+    // Unfold: replace newline+whitespace with single space
+    return match[1].replace(/\r?\n[ \t]+/g, " ").trim();
+}
+/**
+ * Extract filename from Content-Disposition or Content-Type headers.
+ */
+function extractFilename(headers) {
+    // Try Content-Disposition filename first
+    const dispHeader = getHeader(headers, "Content-Disposition");
+    if (dispHeader) {
+        const fnMatch = dispHeader.match(/filename="?([^";\r\n]+)"?/i);
+        if (fnMatch)
+            return fnMatch[1].trim();
+    }
+    // Fall back to Content-Type name parameter
+    const ctHeader = getHeader(headers, "Content-Type");
+    if (ctHeader) {
+        const nameMatch = ctHeader.match(/name="?([^";\r\n]+)"?/i);
+        if (nameMatch)
+            return nameMatch[1].trim();
+    }
+    return null;
+}
+/**
+ * Check if a MIME part has inline disposition (not a real attachment).
+ */
+function isInlineDisposition(headers) {
+    const dispHeader = getHeader(headers, "Content-Disposition");
+    if (!dispHeader)
+        return false;
+    return dispHeader.toLowerCase().startsWith("inline");
+}
+/**
+ * Extract size from Content-Disposition size parameter.
+ */
+function extractSize(headers) {
+    const dispHeader = getHeader(headers, "Content-Disposition");
+    if (dispHeader) {
+        const sizeMatch = dispHeader.match(/size=(\d+)/i);
+        if (sizeMatch)
+            return parseInt(sizeMatch[1], 10);
+    }
+    return 0;
+}
+/**
+ * Extract MIME type from Content-Type header.
+ */
+function extractMimeType(headers) {
+    const ctHeader = getHeader(headers, "Content-Type");
+    if (!ctHeader)
+        return "application/octet-stream";
+    const typeMatch = ctHeader.match(/^([^;\s]+)/);
+    return typeMatch ? typeMatch[1].toLowerCase() : "application/octet-stream";
+}
+/**
+ * Estimate decoded size from base64 content length.
+ */
+function estimateBase64Size(base64Body) {
+    const cleaned = base64Body.replace(/[\s\r\n]/g, "");
+    return Math.floor((cleaned.length * 3) / 4);
+}
+/**
+ * Split a MIME block into parts using the given boundary.
+ * Does not recurse — call walkLeafParts for recursive traversal.
+ */
+function splitMimeParts(source, boundary) {
+    const parts = [];
+    const boundaryDelim = `--${boundary}`;
+    const sections = source.split(boundaryDelim);
+    for (const section of sections) {
+        const trimmed = section.trim();
+        if (!trimmed || trimmed.startsWith("--"))
+            continue;
+        // Split headers from body at first blank line
+        const blankLineIdx = trimmed.search(/\r?\n\r?\n/);
+        if (blankLineIdx === -1)
+            continue;
+        const headers = trimmed.substring(0, blankLineIdx);
+        const body = trimmed.substring(blankLineIdx).replace(/^\r?\n\r?\n/, "");
+        parts.push({ headers, body });
+    }
+    return parts;
+}
+/**
+ * Walk a multipart MIME block and return all non-multipart leaf parts,
+ * descending into nested multipart/* containers (alternative, related, mixed).
+ */
+function walkLeafParts(source, boundary) {
+    const result = [];
+    const parts = splitMimeParts(source, boundary);
+    for (const part of parts) {
+        const ct = getHeader(part.headers, "Content-Type");
+        if (ct && /^multipart\//i.test(ct)) {
+            const nestedBoundary = extractBoundary(ct);
+            if (nestedBoundary) {
+                result.push(...walkLeafParts(part.body, nestedBoundary));
+                continue;
+            }
+        }
+        result.push(part);
+    }
+    return result;
+}
+/**
+ * Decode a MIME part body to bytes based on its transfer encoding.
+ * Supports base64, quoted-printable, and 7bit/8bit/binary (raw).
+ */
+function decodeBody(body, encoding) {
+    const enc = (encoding || "").toLowerCase().trim();
+    if (enc === "base64") {
+        return Buffer.from(body.replace(/[\s\r\n]/g, ""), "base64");
+    }
+    if (enc === "quoted-printable") {
+        return decodeQuotedPrintable(body);
+    }
+    // 7bit, 8bit, binary, or unspecified — treat as raw bytes
+    return Buffer.from(body, "binary");
+}
+/**
+ * Decode quoted-printable-encoded body to bytes.
+ * Handles soft line breaks (=<CRLF>) and =XX hex escapes per RFC 2045 §6.7.
+ */
+function decodeQuotedPrintable(body) {
+    // Remove soft line breaks: `=` immediately followed by CRLF or LF
+    const noSoft = body.replace(/=\r?\n/g, "");
+    const bytes = [];
+    for (let i = 0; i < noSoft.length; i++) {
+        const c = noSoft[i];
+        if (c === "=" && i + 2 < noSoft.length) {
+            const hex = noSoft.substring(i + 1, i + 3);
+            if (/^[0-9A-Fa-f]{2}$/.test(hex)) {
+                bytes.push(parseInt(hex, 16));
+                i += 2;
+                continue;
+            }
+        }
+        bytes.push(c.charCodeAt(0) & 0xff);
+    }
+    return Buffer.from(bytes);
+}
+/**
+ * Estimate body size for metadata when Content-Disposition size is absent.
+ */
+function estimateSize(body, encoding) {
+    const enc = (encoding || "").toLowerCase().trim();
+    if (enc === "base64")
+        return estimateBase64Size(body);
+    // For other encodings the body length is a reasonable proxy
+    return body.length;
+}
+/**
+ * Parse MIME source and return metadata for all file attachments.
+ * Skips inline dispositions (signature images, etc.). Descends into
+ * nested multipart/* containers.
+ *
+ * @param source - Raw MIME source of the email
+ * @returns Array of attachment metadata (name, mimeType, size)
+ */
+export function parseMimeAttachments(source) {
+    if (!source || !source.trim())
+        return [];
+    const boundary = extractBoundary(source);
+    if (!boundary)
+        return [];
+    const parts = walkLeafParts(source, boundary);
+    const attachments = [];
+    for (const part of parts) {
+        const filename = extractFilename(part.headers);
+        if (!filename)
+            continue;
+        if (isInlineDisposition(part.headers))
+            continue;
+        const encoding = getHeader(part.headers, "Content-Transfer-Encoding");
+        attachments.push({
+            name: filename,
+            mimeType: extractMimeType(part.headers),
+            size: extractSize(part.headers) || estimateSize(part.body, encoding),
+        });
+    }
+    return attachments;
+}
+/**
+ * Extract and decode a specific attachment from MIME source by filename.
+ * Supports base64, quoted-printable, and 7bit/8bit/binary transfer encodings.
+ * Descends into nested multipart/* containers.
+ *
+ * @param source - Raw MIME source of the email
+ * @param attachmentName - Filename to extract
+ * @returns Decoded attachment data, or null if not found
+ */
+export function extractMimeAttachment(source, attachmentName) {
+    if (!source || !source.trim())
+        return null;
+    const boundary = extractBoundary(source);
+    if (!boundary)
+        return null;
+    const parts = walkLeafParts(source, boundary);
+    for (const part of parts) {
+        const filename = extractFilename(part.headers);
+        if (filename !== attachmentName)
+            continue;
+        const encoding = getHeader(part.headers, "Content-Transfer-Encoding");
+        const data = decodeBody(part.body, encoding);
+        return {
+            name: filename,
+            mimeType: extractMimeType(part.headers),
+            size: extractSize(part.headers) || data.length,
+            data,
+        };
+    }
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-mail-mcp",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "MCP server for Apple Mail - read, search, send, and manage emails via Claude",
   "type": "module",
   "main": "build/index.js",
@@ -27,6 +27,7 @@
     "format": "prettier --write src",
     "format:check": "prettier --check src",
     "typecheck": "tsc --noEmit",
+    "version": "node -e \"const p=require('./package.json'); const f='.claude-plugin/plugin.json'; const c=JSON.parse(require('fs').readFileSync(f,'utf8')); c.version=p.version; require('fs').writeFileSync(f,JSON.stringify(c,null,2)+'\\n')\" && git add .claude-plugin/plugin.json",
     "prepublishOnly": "npm run lint && npm run test && npm run build",
     "prepare": "husky && npm run build"
   },