apple-mail-mcp 2.19.10 → 2.19.12

package/README.md

@@ -826,7 +826,7 @@ Reply to an existing message.
 | Parameter   | Type    | Required | Description                                                                                    |
 | ----------- | ------- | -------- | ---------------------------------------------------------------------------------------------- |
 | `id`        | string  | Yes      | Message ID to reply to                                                                         |
-| `body`      | string  | Yes      | Reply body                                                                                     |
+| `body`      | string  | Yes      | Reply body (plain text; HTML tags such as `<br>` are not rendered)                              |
 | `replyAll`  | boolean | No       | Reply to all recipients (default: false)                                                       |
 | `send`      | boolean | No       | Send immediately (default: true, false = save as draft)                                        |
 | `transport` | string  | No       | `smtp` or `applescript`; omitted prefers configured SMTP when sending. Drafts use AppleScript. |
@@ -853,6 +853,8 @@ Reply to an existing message.
 
 **Delivery:** `imap:` IDs are read directly from their encoded account, mailbox, and UID. Numeric IDs are read through Mail.app. With SMTP configured, replies use clean MIME with the original `Message-ID` in `In-Reply-To` and the full `References` chain. Only the original plain-text body is quoted; the new text is not. Pass `transport: "smtp"` to require this path, or `transport: "applescript"` to use Mail.app explicitly.
 
+**AppleScript transport quoting (v2.19.12):** every draft (`send: false`) and any send that falls back to AppleScript (SMTP not configured) also gets the original quoted — an "On \<date\>, \<sender\> wrote:" attribution line followed by the `> `-prefixed original body, built the same way as the SMTP path. Mail's own `reply`/`forward` AppleScript commands generate this quote internally but expose no way to read it back, so it's built here instead of relying on Mail's (unreadable) copy. Unlike SMTP, this path has no sending-identity restriction — it's read-only source lookup, not sending.
+
 **Failure behavior:** once SMTP is selected, a missing password, unreadable source, missing reply address or `Message-ID`, or SMTP failure returns an error. It does not silently switch to AppleScript or create an unthreaded new message. With SMTP unconfigured and transport omitted, AppleScript remains available. `send: false` saves a Mail.app draft; combining it with `transport: "smtp"` is rejected before composing.
 
 The direct IMAP source read is bounded to 25 MiB, including MIME attachments. Its account login must match the SMTP login, configured From, or an explicitly configured `APPLE_MAIL_MCP_SMTP_ALLOWED_FROM` identity; otherwise the call fails rather than sending from an unrelated account. The SMTP configuration still represents a single sending identity, not a per-account SMTP registry.
@@ -871,11 +873,11 @@ Forward a message to new recipients.
 | ----------- | -------- | -------- | ---------------------------------------------------------------------------------------------- |
 | `id`        | string   | Yes      | Message ID to forward                                                                          |
 | `to`        | string[] | Yes      | Recipients to forward to                                                                       |
-| `body`      | string   | No       | Message to prepend                                                                             |
+| `body`      | string   | No       | Message to prepend (plain text)                                                                |
 | `send`      | boolean  | No       | Send immediately (default: true, false = save as draft)                                        |
 | `transport` | string   | No       | `smtp` or `applescript`; omitted prefers configured SMTP when sending. Drafts use AppleScript. |
 
-**Delivery:** uses the same source lookup, transport selection, 25 MiB source limit, account-identity check, and failure behavior as `reply-to-message`. A forward deliberately starts a new conversation, so it has no `In-Reply-To` or `References` headers. The existing plain-text forwarding behavior is unchanged: original attachments are not reattached. See [SMTP transport](#smtp-transport).
+**Delivery:** uses the same source lookup, transport selection, 25 MiB source limit, account-identity check, and failure behavior as `reply-to-message`. A forward deliberately starts a new conversation, so it has no `In-Reply-To` or `References` headers. The existing plain-text forwarding behavior is unchanged: original attachments are not reattached. See [SMTP transport](#smtp-transport). On the AppleScript transport, a `body` is merged with the forwarded-message header block and original text the same way the SMTP path builds it (see `reply-to-message`'s AppleScript transport quoting note); with no `body`, Mail's own forward content is left untouched.
 
 SMTP forwarding requires a readable plain-text original. HTML-only IMAP messages and failed Mail.app body reads return an error before sending instead of silently omitting the original content. Explicitly select `transport: "applescript"` to forward these with Mail.app; no automatic fallback occurs. An intentionally empty plain-text message is still valid.
 

package/build/cli.js

@@ -58409,6 +58409,12 @@ async function fetchMailboxMatches(client, path, criteria, newestCount) {
     const found = await client.search(criteria, { uid: true });
     const uids = Array.isArray(found) ? found : [];
     if (uids.length === 0 || newestCount === 0) return { messages: [], total: uids.length };
+    const status = await client.status(path, { messages: true });
+    if (typeof status.messages === "number" && uids.length > status.messages) {
+      throw new Error(
+        `IMAP SEARCH on "${path}" reported ${uids.length} matches, more than the mailbox's own ${status.messages} messages \u2014 discarding as corrupted rather than trusting it (see #246).`
+      );
+    }
     const newest = uids.slice().reverse().slice(0, newestCount);
     const byUid = /* @__PURE__ */ new Map();
     for await (const msg of client.fetch(

package/build/index.js

@@ -65738,6 +65738,12 @@ async function fetchMailboxMatches(client, path, criteria, newestCount) {
     const found = await client.search(criteria, { uid: true });
     const uids = Array.isArray(found) ? found : [];
     if (uids.length === 0 || newestCount === 0) return { messages: [], total: uids.length };
+    const status = await client.status(path, { messages: true });
+    if (typeof status.messages === "number" && uids.length > status.messages) {
+      throw new Error(
+        `IMAP SEARCH on "${path}" reported ${uids.length} matches, more than the mailbox's own ${status.messages} messages \u2014 discarding as corrupted rather than trusting it (see #246).`
+      );
+    }
     const newest = uids.slice().reverse().slice(0, newestCount);
     const byUid = /* @__PURE__ */ new Map();
     for await (const msg of client.fetch(
@@ -86841,10 +86847,6 @@ function buildReplyOptions(args) {
     );
     cc = extra.length ? extra : void 0;
   }
-  const attribution = buildAttribution(original);
-  const quoted = originalPlainText.trim() ? `
-
-${attribution}${quoteBody(originalPlainText)}` : "";
   const references = dedupe(
     original.messageId ? [...original.references, original.messageId] : original.references
   );
@@ -86852,12 +86854,19 @@ ${attribution}${quoteBody(originalPlainText)}` : "";
     to,
     cc,
     subject: withSubjectPrefix(original.subject, "Re:"),
-    body: `${body}${quoted}`,
+    body: buildReplyBody(body, original, originalPlainText),
     inReplyTo: original.messageId,
     references: references.length ? references : void 0,
     from
   };
 }
+function buildReplyBody(body, original, originalPlainText) {
+  const attribution = buildAttribution(original);
+  const quoted = originalPlainText.trim() ? `
+
+${attribution}${quoteBody(originalPlainText)}` : "";
+  return `${body}${quoted}`;
+}
 function buildAttribution(original) {
   const who = original.from[0] ?? original.replyTo[0] ?? "the sender";
   return original.date ? `On ${original.date}, ${who} wrote:
@@ -86866,6 +86875,14 @@ function buildAttribution(original) {
 }
 function buildForwardOptions(args) {
   const { original, originalPlainText, to, body, from } = args;
+  return {
+    to: dedupe(to),
+    subject: withSubjectPrefix(original.subject, "Fwd:"),
+    body: buildForwardBody(original, originalPlainText, body),
+    from
+  };
+}
+function buildForwardBody(original, originalPlainText, body) {
   const headerBlock = [
     "---------- Forwarded message ----------",
     original.from.length ? `From: ${original.from.join(", ")}` : "",
@@ -86877,14 +86894,9 @@ function buildForwardOptions(args) {
   const prefix = body?.trim() ? `${body}
 
 ` : "";
-  return {
-    to: dedupe(to),
-    subject: withSubjectPrefix(original.subject, "Fwd:"),
-    body: `${prefix}${headerBlock}
+  return `${prefix}${headerBlock}
 
-${originalPlainText}`,
-    from
-  };
+${originalPlainText}`;
 }
 
 // src/tools/compose.ts
@@ -87022,6 +87034,31 @@ async function readOriginal(deps, id, cfg) {
   const content = deps.mail.getMessageContent(id);
   return { original: parseOriginalHeaders(raw), plainText: content?.plainText ?? null };
 }
+async function readOriginalForQuote(deps, id) {
+  if (decodeImapId(id)) {
+    try {
+      const source = await deps.imapSource(id);
+      const original = parseOriginalHeaders(source.raw);
+      if (source.subject !== void 0) original.subject = source.subject;
+      return { original, plainText: extractTextBody(source.raw) ?? "" };
+    } catch {
+      return null;
+    }
+  }
+  const raw = deps.mail.getRawSource(id);
+  if (!raw) return null;
+  const content = deps.mail.getMessageContent(id);
+  return { original: parseOriginalHeaders(raw), plainText: content?.plainText ?? "" };
+}
+async function replyComposeBody(deps, id, body) {
+  const source = await readOriginalForQuote(deps, id);
+  return source ? buildReplyBody(body, source.original, source.plainText) : body;
+}
+async function forwardComposeBody(deps, id, body) {
+  if (!body) return body;
+  const source = await readOriginalForQuote(deps, id);
+  return source ? buildForwardBody(source.original, source.plainText, body) : body;
+}
 async function runCompose(deps, args) {
   const { id, send, transport: transport2 } = args;
   const verb = args.kind === "reply" ? "reply to" : "forward";
@@ -87092,7 +87129,17 @@ async function runCompose(deps, args) {
     return errorResponse(
       `Failed to ${verb} message "${id}": ${resolved.error ?? "message not found"}`
     );
-  const outcome = args.kind === "reply" ? deps.mail.replyToMessage(resolved.numericId, args.body, args.replyAll, send) : deps.mail.forwardMessage(resolved.numericId, args.to, args.body, send);
+  const outcome = args.kind === "reply" ? deps.mail.replyToMessage(
+    resolved.numericId,
+    await replyComposeBody(deps, id, args.body),
+    args.replyAll,
+    send
+  ) : deps.mail.forwardMessage(
+    resolved.numericId,
+    args.to,
+    await forwardComposeBody(deps, id, args.body),
+    send
+  );
   if (!outcome.success)
     return errorResponse(
       `Failed to ${verb} message "${id}": ${outcome.error ?? "Mail.app compose failed"}`
@@ -88852,7 +88899,7 @@ registerTool(
     inputSchema: {
       id: MESSAGE_ID_SCHEMA,
       transport: COMPOSE_TRANSPORT_SCHEMA,
-      body: external_exports.string().min(1, "Reply body is required"),
+      body: external_exports.string().min(1, "Reply body is required").describe("Reply body (plain text; HTML tags such as <br> are not rendered)"),
       replyAll: external_exports.boolean().optional().default(false).describe("Reply to all recipients"),
       send: external_exports.boolean().optional().default(true).describe("Send immediately (false = save as draft)")
     },
@@ -88876,7 +88923,7 @@ registerTool(
       id: MESSAGE_ID_SCHEMA,
       transport: COMPOSE_TRANSPORT_SCHEMA,
       to: external_exports.array(external_exports.string()).min(1, "At least one recipient is required"),
-      body: external_exports.string().optional().describe("Optional message to prepend"),
+      body: external_exports.string().optional().describe("Optional message to prepend (plain text)"),
       send: external_exports.boolean().optional().default(true).describe("Send immediately (false = save as draft)")
     },
     outputSchema: {

package/package.json

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