apple-mail-mcp 2.11.1 → 2.12.0

package/build/index.js

@@ -80955,20 +80955,15 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
   replyToMessage(id, body, replyAll = false, send = true) {
     const safeBody = escapeForAppleScriptBody(body);
     const replyAllClause = replyAll ? " with reply to all" : "";
-    const sendAction = send ? "send theReply" : "";
+    const finalAction = send ? "send theReply" : "save theReply";
     const script = this.findMessageScript(
       id,
       `
           set theReply to reply msg without opening window${replyAllClause}
           set content of theReply to "${safeBody}"
-          ${sendAction}`
+          ${finalAction}`
     );
-    const result = executeAppleScript(script, { timeoutMs: 6e4 });
-    if (!result.success || result.output.startsWith("error:")) {
-      console.error(`Failed to reply to message: ${result.error || result.output}`);
-      return false;
-    }
-    return true;
+    return this.runComposeScript(script, "reply to");
   }
   /**
    * Forward a message.
@@ -80981,7 +80976,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
    */
   forwardMessage(id, to, body, send = true) {
     const safeBody = body ? escapeForAppleScriptBody(body) : "";
-    const sendAction = send ? "send theForward" : "";
+    const finalAction = send ? "send theForward" : "save theForward";
     let recipientCommands = "";
     for (const addr of to) {
       recipientCommands += `make new to recipient at end of to recipients of theForward with properties {address:"${escapeForAppleScript(addr)}"}
@@ -80993,14 +80988,9 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
           set theForward to forward msg without opening window
           ${recipientCommands}
           ${safeBody ? `set content of theForward to "${safeBody}"` : ""}
-          ${sendAction}`
+          ${finalAction}`
     );
-    const result = executeAppleScript(script, { timeoutMs: 6e4 });
-    if (!result.success || result.output.startsWith("error:")) {
-      console.error(`Failed to forward message: ${result.error || result.output}`);
-      return false;
-    }
-    return true;
+    return this.runComposeScript(script, "forward");
   }
   /**
    * Helper to find and operate on a message by ID, scoped to the mailbox the id
@@ -81025,6 +81015,25 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
    * it immediately, so this is also where the previous operation's forensic
    * report is invalidated — see `beginMutation()`.
    */
+  /**
+   * Run a reply/forward compose script and surface Mail's OWN error text.
+   *
+   * These used to return a bare boolean and log the reason to stderr, so the
+   * tool layer could only say "Failed to reply to message X". That hid the two
+   * failures a caller can actually act on — an id present in several mailboxes
+   * (which names the candidates and tells you to re-list) and a missing id —
+   * behind one indistinguishable message.
+   */
+  runComposeScript(script, verb) {
+    const result = executeAppleScript(script, { timeoutMs: 6e4 });
+    if (!result.success || result.output.startsWith("error:")) {
+      const raw = result.error || result.output;
+      const error2 = raw.startsWith("error:") ? raw.slice("error:".length) : raw;
+      console.error(`Failed to ${verb} message: ${error2}`);
+      return { success: false, error: error2 };
+    }
+    return { success: true };
+  }
   findMessageScript(id, operation, instrument = false) {
     this.beginMutation();
     const loc = this.locationFor(id);
@@ -83829,6 +83838,10 @@ function imapMailStats(deps = {}) {
 function errText(e) {
   return e instanceof Error ? e.message : String(e);
 }
+function assertMutated(result, what) {
+  if (!result) throw new Error(`${what}: server rejected the command (IMAP NO/BAD)`);
+  return result;
+}
 var poolConnect = defaultConnect;
 var pools = /* @__PURE__ */ new Map();
 function poolKey(cfg) {
@@ -84167,7 +84180,10 @@ async function imapMoveMessageById(id, destMailbox, deps = {}) {
     const destPath = dest.kind === "found" ? dest.path : resolveMailboxPath(destMailbox, "list");
     const lock = await client.getMailboxLock(ref.path);
     try {
-      await client.messageMove([ref.uid], destPath, { uid: true });
+      assertMutated(
+        await client.messageMove([ref.uid], destPath, { uid: true }),
+        `IMAP move of UID ${ref.uid} to "${destPath}"`
+      );
       return { success: true, info: `Moved UID ${ref.uid} to "${destPath}" via IMAP.` };
     } catch (e) {
       return {
@@ -84179,9 +84195,12 @@ async function imapMoveMessageById(id, destMailbox, deps = {}) {
     }
   });
 }
+var FALLBACK_TRASH_PATH = "Trash";
 async function resolveTrashPath(client) {
+  let listed = false;
   try {
     const boxes = await client.list();
+    listed = true;
     const special = boxes.find((b) => b.specialUse === "\\Trash");
     if (special) return special.path;
     const named = boxes.find(
@@ -84190,15 +84209,27 @@ async function resolveTrashPath(client) {
     if (named) return named.path;
   } catch {
   }
-  return resolveMailboxPath("trash", "list");
+  if (!listed) return resolveMailboxPath("trash", "list");
+  try {
+    const created = await client.mailboxCreate(FALLBACK_TRASH_PATH);
+    return created?.path || FALLBACK_TRASH_PATH;
+  } catch {
+    return FALLBACK_TRASH_PATH;
+  }
 }
 async function trashUids(client, uids, srcPath) {
   const dest = await resolveTrashPath(client);
   if (srcPath.trim().toLowerCase() === dest.trim().toLowerCase()) {
-    await client.messageDelete(uids, { uid: true });
+    assertMutated(
+      await client.messageDelete(uids, { uid: true }),
+      `IMAP expunge of ${uids.length} message(s) from "${srcPath}"`
+    );
     return { dest, expunged: true };
   }
-  await client.messageMove(uids, dest, { uid: true });
+  assertMutated(
+    await client.messageMove(uids, dest, { uid: true }),
+    `IMAP move of ${uids.length} message(s) from "${srcPath}" to "${dest}"`
+  );
   return { dest, expunged: false };
 }
 async function imapDeleteMessageById(id, deps = {}) {
@@ -84338,22 +84369,37 @@ async function imapBatch(ids, deps, op) {
   return { success, failed, errors };
 }
 var imapBatchMarkRead = (ids, deps = {}) => imapBatch(ids, deps, async (c, uids) => {
-  await c.messageFlagsAdd(uids, ["\\Seen"], { uid: true });
+  assertMutated(
+    await c.messageFlagsAdd(uids, ["\\Seen"], { uid: true }),
+    `IMAP mark-read of ${uids.length} message(s)`
+  );
 });
 var imapBatchMarkUnread = (ids, deps = {}) => imapBatch(ids, deps, async (c, uids) => {
-  await c.messageFlagsRemove(uids, ["\\Seen"], { uid: true });
+  assertMutated(
+    await c.messageFlagsRemove(uids, ["\\Seen"], { uid: true }),
+    `IMAP mark-unread of ${uids.length} message(s)`
+  );
 });
 var imapBatchFlag = (ids, colorIndex, deps = {}) => imapBatch(ids, deps, async (c, uids) => {
   if (colorIndex === void 0) {
-    await c.messageFlagsAdd(uids, ["\\Flagged"], { uid: true });
+    assertMutated(
+      await c.messageFlagsAdd(uids, ["\\Flagged"], { uid: true }),
+      `IMAP flag of ${uids.length} message(s)`
+    );
     return;
   }
   const { set, clear } = mailFlagBitsFor(colorIndex);
-  await c.messageFlagsAdd(uids, ["\\Flagged", ...set], { uid: true });
+  assertMutated(
+    await c.messageFlagsAdd(uids, ["\\Flagged", ...set], { uid: true }),
+    `IMAP flag of ${uids.length} message(s)`
+  );
   if (clear.length) await c.messageFlagsRemove(uids, clear, { uid: true });
 });
 var imapBatchUnflag = (ids, deps = {}) => imapBatch(ids, deps, async (c, uids) => {
-  await c.messageFlagsRemove(uids, ["\\Flagged", ...MAIL_FLAG_BITS], { uid: true });
+  assertMutated(
+    await c.messageFlagsRemove(uids, ["\\Flagged", ...MAIL_FLAG_BITS], { uid: true }),
+    `IMAP unflag of ${uids.length} message(s)`
+  );
 });
 var imapBatchDelete = (ids, deps = {}) => imapBatch(ids, deps, async (c, uids, path) => {
   await trashUids(c, uids, path);
@@ -84361,7 +84407,10 @@ var imapBatchDelete = (ids, deps = {}) => imapBatch(ids, deps, async (c, uids, p
 function imapBatchMove(ids, destMailbox, deps = {}) {
   return imapBatch(ids, deps, async (c, uids) => {
     const dest = await findMailboxPathOrThrow(c, destMailbox) ?? resolveMailboxPath(destMailbox, "list");
-    await c.messageMove(uids, dest, { uid: true });
+    assertMutated(
+      await c.messageMove(uids, dest, { uid: true }),
+      `IMAP move of ${uids.length} message(s) to "${dest}"`
+    );
   });
 }
 function senderName(from) {
@@ -85940,6 +85989,23 @@ function resolveSmtpOrFallback() {
     return null;
   }
 }
+async function toNumericMailId(id) {
+  const ref = decodeImapId(id);
+  if (!ref) return { numericId: id };
+  const messageId = await imapFetchMessageId(id);
+  if (!messageId) {
+    return {
+      error: `could not read the RFC Message-ID for "${id}" over IMAP, which is what maps it to a Mail.app id. Pass the numeric id instead (see the resolve-message-id tool).`
+    };
+  }
+  const numericId = mailManager.findNumericIdByMessageId(messageId, ref.account);
+  if (!numericId) {
+    return {
+      error: `Mail.app has no message with Message-ID <${messageId}> in account "${ref.account}", so this IMAP message has no numeric id to reply to or forward. It may not have synced to Mail.app yet.`
+    };
+  }
+  return { numericId };
+}
 async function sendReplyViaSmtp(id, body, replyAll) {
   const cfg = resolveSmtpOrFallback();
   if (!cfg) return { sent: false, fallback: true };
@@ -85998,17 +86064,23 @@ registerTool(
   },
   withErrorHandling(async ({ id, body, replyAll, send }) => {
     if (send && isSmtpConfigured()) {
-      const outcome = await sendReplyViaSmtp(id, body, replyAll);
-      if (outcome.sent) {
+      const outcome2 = await sendReplyViaSmtp(id, body, replyAll);
+      if (outcome2.sent) {
         return successResponse("Reply sent", { ok: true, sent: true, id });
       }
-      if (!outcome.fallback) {
-        return errorResponse(`Failed to reply to message "${id}" via SMTP: ${outcome.error}`);
+      if (!outcome2.fallback) {
+        return errorResponse(`Failed to reply to message "${id}" via SMTP: ${outcome2.error}`);
       }
     }
-    const success = mailManager.replyToMessage(id, body, replyAll, send);
-    if (!success) {
-      return errorResponse(`Failed to reply to message "${id}"`);
+    const resolvedReply = await toNumericMailId(id);
+    if (!resolvedReply.numericId) {
+      return errorResponse(`Failed to reply to message "${id}": ${resolvedReply.error}`);
+    }
+    const outcome = mailManager.replyToMessage(resolvedReply.numericId, body, replyAll, send);
+    if (!outcome.success) {
+      return errorResponse(
+        outcome.error ? `Failed to reply to message "${id}": ${outcome.error}` : `Failed to reply to message "${id}"`
+      );
     }
     return successResponse(send ? "Reply sent" : "Reply saved as draft", {
       ok: true,
@@ -86036,8 +86108,8 @@ registerTool(
   },
   withErrorHandling(async ({ id, to, body, send }) => {
     if (send && isSmtpConfigured()) {
-      const outcome = await sendForwardViaSmtp(id, to, body);
-      if (outcome.sent) {
+      const outcome2 = await sendForwardViaSmtp(id, to, body);
+      if (outcome2.sent) {
         return successResponse(`Message forwarded to ${to.join(", ")}`, {
           ok: true,
           sent: true,
@@ -86045,13 +86117,19 @@ registerTool(
           id
         });
       }
-      if (!outcome.fallback) {
-        return errorResponse(`Failed to forward message "${id}" via SMTP: ${outcome.error}`);
+      if (!outcome2.fallback) {
+        return errorResponse(`Failed to forward message "${id}" via SMTP: ${outcome2.error}`);
       }
     }
-    const success = mailManager.forwardMessage(id, to, body, send);
-    if (!success) {
-      return errorResponse(`Failed to forward message "${id}"`);
+    const resolvedFwd = await toNumericMailId(id);
+    if (!resolvedFwd.numericId) {
+      return errorResponse(`Failed to forward message "${id}": ${resolvedFwd.error}`);
+    }
+    const outcome = mailManager.forwardMessage(resolvedFwd.numericId, to, body, send);
+    if (!outcome.success) {
+      return errorResponse(
+        outcome.error ? `Failed to forward message "${id}": ${outcome.error}` : `Failed to forward message "${id}"`
+      );
     }
     return successResponse(
       send ? `Message forwarded to ${to.join(", ")}` : "Forward saved as draft",

package/package.json

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