apple-mail-mcp 2.17.2 → 2.17.4

package/build/index.js

@@ -82817,11 +82817,36 @@ ${this.errorEmit("              ")}
     }
     const entry = this.buildSmartMailboxEntry(name, fromContains, subjectContains, bodyContains);
     const temp = this.prepareSmartPlistWrite(plistPath);
-    const ins = spawnSync2(
-      "plutil",
-      ["-insert", String(entries.length), "-json", JSON.stringify(entry), temp],
-      { encoding: "utf8" }
-    );
+    const entryJson = `${temp}.entry.json`;
+    const entryPlist = `${temp}.entry.plist`;
+    const cleanupEntryFiles = () => {
+      for (const f of [entryJson, entryPlist]) {
+        try {
+          unlinkSync(f);
+        } catch {
+        }
+      }
+    };
+    writeFileSync3(entryJson, JSON.stringify([entry]), "utf8");
+    const conv = spawnSync2("plutil", ["-convert", "xml1", "-o", entryPlist, entryJson], {
+      encoding: "utf8"
+    });
+    if (conv.status !== 0) {
+      cleanupEntryFiles();
+      try {
+        unlinkSync(temp);
+      } catch {
+      }
+      return {
+        created: false,
+        alreadyExisted: false,
+        error: (conv.stderr || "plutil could not encode the smart mailbox entry").trim()
+      };
+    }
+    const ins = spawnSync2("/usr/libexec/PlistBuddy", ["-c", `Merge ${entryPlist} :`, temp], {
+      encoding: "utf8"
+    });
+    cleanupEntryFiles();
     if (ins.status !== 0) {
       try {
         unlinkSync(temp);
@@ -82830,7 +82855,7 @@ ${this.errorEmit("              ")}
       return {
         created: false,
         alreadyExisted: false,
-        error: (ins.stderr || "plutil insert failed").trim()
+        error: (ins.stderr || "PlistBuddy merge failed").trim()
       };
     }
     if (!this.commitSmartPlist(temp, plistPath)) {
@@ -84129,8 +84154,18 @@ var defaultConnect = async (cfg) => {
   }
   return client;
 };
-function resolveMailboxPath(mailbox, _mode) {
-  if (!mailbox) return "INBOX";
+var SPECIAL_USE_ALIASES = {
+  "all mail": "\\all",
+  archive: "\\archive",
+  drafts: "\\drafts",
+  sent: "\\sent",
+  "sent mail": "\\sent",
+  trash: "\\trash",
+  spam: "\\junk",
+  junk: "\\junk",
+  starred: "\\flagged"
+};
+function staticMailboxAlias(mailbox) {
   const map = {
     "all mail": "[Gmail]/All Mail",
     "sent mail": "[Gmail]/Sent Mail",
@@ -84144,6 +84179,21 @@ function resolveMailboxPath(mailbox, _mode) {
   };
   return map[mailbox.trim().toLowerCase()] ?? mailbox;
 }
+async function resolveMailboxPath(client, mailbox, _mode) {
+  if (!mailbox) return "INBOX";
+  try {
+    const resolved = await resolveMailbox(client, mailbox);
+    if (resolved.kind === "found") return resolved.path;
+    const flag = SPECIAL_USE_ALIASES[mailbox.trim().toLowerCase()];
+    if (flag) {
+      const boxes = await client.list();
+      const special = boxes.find((b) => b.specialUse?.toLowerCase() === flag);
+      if (special) return special.path;
+    }
+  } catch {
+  }
+  return staticMailboxAlias(mailbox);
+}
 function buildCriteria(a, listMode) {
   const c = {};
   if (a.query) c.or = [{ subject: a.query }, { from: a.query }];
@@ -84252,7 +84302,7 @@ async function run(args, listMode, deps) {
           throw new Error(`No selectable IMAP mailboxes found for account ${cfg.accountLabel}.`);
         }
       } else {
-        paths = [resolveMailboxPath(args.mailbox, listMode ? "list" : "search")];
+        paths = [await resolveMailboxPath(client, args.mailbox, listMode ? "list" : "search")];
       }
       const limit = args.limit ?? 50;
       const offset = args.offset ?? 0;
@@ -84328,7 +84378,9 @@ function imapUnreadCount(mailbox, deps = {}) {
   return useClient(
     deps,
     async (client) => {
-      const s = await client.status(resolveMailboxPath(mailbox, "list"), { unseen: true });
+      const s = await client.status(await resolveMailboxPath(client, mailbox, "list"), {
+        unseen: true
+      });
       return s.unseen ?? 0;
     },
     true
@@ -84760,7 +84812,7 @@ async function imapMoveMessageById(id, destMailbox, deps = {}) {
         error: ambiguousMailboxError(destMailbox, dest.candidates, cfg.accountLabel)
       };
     }
-    const destPath = dest.kind === "found" ? dest.path : resolveMailboxPath(destMailbox, "list");
+    const destPath = dest.kind === "found" ? dest.path : await resolveMailboxPath(client, destMailbox, "list");
     const lock = await client.getMailboxLock(ref.path);
     try {
       const moved = assertMutated(
@@ -84797,7 +84849,7 @@ async function resolveTrashPath(client) {
     if (named) return named.path;
   } catch {
   }
-  if (!listed) return resolveMailboxPath("trash", "list");
+  if (!listed) return staticMailboxAlias("trash");
   try {
     const created = await client.mailboxCreate(FALLBACK_TRASH_PATH);
     return created?.path || FALLBACK_TRASH_PATH;
@@ -85051,7 +85103,7 @@ function imapBatchMove(ids, destMailbox, deps = {}) {
     ids,
     deps,
     async (c, uids) => {
-      const dest = await findMailboxPathOrThrow(c, destMailbox) ?? resolveMailboxPath(destMailbox, "list");
+      const dest = await findMailboxPathOrThrow(c, destMailbox) ?? await resolveMailboxPath(c, destMailbox, "list");
       assertMutated(
         await c.messageMove(uids, dest, { uid: true }),
         `IMAP move of ${uids.length} message(s) to "${dest}"`

package/package.json

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