apple-mail-mcp 2.15.0 → 2.16.0

package/README.md

@@ -953,6 +953,11 @@ accounts only: the local store is a store, not an account. Nothing selects it
 implicitly — omitting `account` still resolves to a real account for every other
 tool.
 
+The mail inside them is reachable too: `list-messages` and `search-messages`
+accept `account="On My Mac"`, and `get-message` resolves an id that lives only in
+a local mailbox. An id present **both** in an account mailbox and locally is
+reported as ambiguous rather than silently resolving to the account copy.
+
 ---
 
 #### `get-unread-count`

package/build/index.js

@@ -78980,7 +78980,7 @@ function describeMailboxOpError(op, raw) {
   const trimmed = (raw || "").trim();
   if (UNSUPPORTED_APPLESCRIPT_OP.test(trimmed)) {
     const verb = op.charAt(0).toUpperCase() + op.slice(1);
-    return `Mail.app cannot ${op} server-side (IMAP / Gmail / Workspace / iCloud / Exchange) mailboxes via AppleScript \u2014 only local "On My Mac" mailboxes support this. ${verb} it in Mail.app directly. (Mail.app error: ${trimmed})`;
+    return `Mail.app's scripting bridge will not ${op} this mailbox. That covers server-side (IMAP / Gmail / Workspace / iCloud / Exchange) mailboxes, and on current macOS it covers local "On My Mac" mailboxes too \u2014 measured 2026-08-16, see #193. ${verb} it in Mail.app directly; for an IMAP-configured account the IMAP path can do it instead. (Mail.app error: ${trimmed})`;
   }
   return trimmed || `Failed to ${op} mailbox`;
 }
@@ -79170,6 +79170,26 @@ var COUNT_PARTIAL_NOTE = `Mail's count moved by less than this operation account
 function snapshotKey(entry) {
   return `${entry.id}\0${entry.messageId}`;
 }
+function crossCheckRenumbered(disappeared, appeared) {
+  const index = (entries) => {
+    const m = /* @__PURE__ */ new Map();
+    for (const e of entries) {
+      if (!e.messageId) continue;
+      m.set(e.messageId, m.has(e.messageId) ? null : e);
+    }
+    return m;
+  };
+  const gone = index(disappeared);
+  const came = index(appeared);
+  const out = [];
+  for (const [mid, before] of gone) {
+    const after = came.get(mid);
+    if (!before || !after) continue;
+    if (before.id === after.id) continue;
+    out.push({ messageId: mid, before: before.id, after: after.id });
+  }
+  return out;
+}
 function buildAppLevelScript(command) {
   return `
     tell application "Mail"
@@ -79845,8 +79865,12 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       const afterEntries = this.parseSnapshot(a.payload);
       const afterKeys = new Set(afterEntries.map((e) => snapshotKey(e)));
       const beforeKeys = new Set(beforeEntries.map((e) => snapshotKey(e)));
-      const disappeared = beforeEntries.filter((e) => !afterKeys.has(snapshotKey(e)));
-      const appeared = afterEntries.filter((e) => !beforeKeys.has(snapshotKey(e)));
+      const rawDisappeared = beforeEntries.filter((e) => !afterKeys.has(snapshotKey(e)));
+      const rawAppeared = afterEntries.filter((e) => !beforeKeys.has(snapshotKey(e)));
+      const renumbered = crossCheckRenumbered(rawDisappeared, rawAppeared);
+      const renumberedMids = new Set(renumbered.map((r) => r.messageId));
+      const disappeared = rawDisappeared.filter((e) => !renumberedMids.has(e.messageId));
+      const appeared = rawAppeared.filter((e) => !renumberedMids.has(e.messageId));
       const unrequested = disappeared.filter(
         (e) => !requestedNumericIds.has(canonicalNumericId(e.id))
       );
@@ -79860,7 +79884,8 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
           disappeared,
           unrequested,
           appeared,
-          ...countStale.length ? { countStale } : {}
+          ...countStale.length ? { countStale } : {},
+          ...renumbered.length ? { renumbered } : {}
         });
         continue;
       }
@@ -79873,6 +79898,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         mailbox: g.mailbox,
         snapshot: "partial",
         ...countStale.length ? { countStale } : {},
+        ...renumbered.length ? { renumbered } : {},
         skipReason: `Mail would not read ${holes.map((h) => `${h.ranges} (${h.phase})`).join(", ")} of this mailbox, so the snapshot has a hole in it. ` + (derivable.length > 0 ? `Still derivable and reported: ${derivable.join(" and ")}. ` : `Neither half of the diff is derivable from it. `) + `Anything the unread range could refute is omitted rather than guessed \u2014 an absent field here means "not computable", not "empty".`,
         unobserved: holes,
         ...a.miss === "" ? { disappeared, unrequested } : {},
@@ -80201,7 +80227,9 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       }
       return { messages: allMessages.slice(0, limit), diagnostics };
     }
-    const targetAccount = this.resolveAccount(account);
+    const local = isLocalStoreLabel(account);
+    const targetAccount = local ? LOCAL_STORE_LABEL : this.resolveAccount(account);
+    const mbIter = local ? "_mbs" : "mailboxes";
     const searchCondition = buildSearchCondition({ query, from, subject, isRead, isFlagged });
     let dateSetup = "";
     let dateFilter = "";
@@ -80233,7 +80261,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       set _wantNames to ${nameList}
       set msgCount to 0
       set seenIds to {}
-      repeat with mb in mailboxes
+      repeat with mb in ${mbIter}
         if msgCount >= ${limit} then exit repeat
         set mbName to ""
         try
@@ -80278,7 +80306,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       set _skipped to ""
       set _notSearched to ""
       set _startedAt to current date
-      repeat with mb in mailboxes
+      repeat with mb in ${mbIter}
         if msgCount >= ${limit} then exit repeat
         set mbName to ""
         try
@@ -80308,7 +80336,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       return outputText & "${DIAG_MARKER}timedOut=" & (_timedOut as string) & "${DIAG_FIELD_SEP}skipped=" & _skipped & "${DIAG_FIELD_SEP}notSearched=" & _notSearched
     `;
     }
-    const script = buildAccountScopedScript(targetAccount, searchCommand);
+    const script = local ? buildAppLevelScript(`${localMailboxBindingFragment()}${searchCommand}`) : buildAccountScopedScript(targetAccount, searchCommand);
     const result = executeAppleScript(script, { timeoutMs: SEARCH_ACCOUNT_TIMEOUT_MS });
     if (!result.success) {
       console.error(`Failed to search messages in "${targetAccount}": ${result.error}`);
@@ -80419,9 +80447,16 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
    */
   scopedByIdScript(account, mailbox, id, innerAction) {
     const resolved = this.resolveMailbox(mailbox, account);
-    return buildAppLevelScript(`
-      try
-        set acct to (first account whose name is "${escapeForAppleScript(account)}")
+    const bind = isLocalStoreLabel(account) ? `${localMailboxBindingFragment()}
+        set targetMb to missing value
+        ignoring case
+          repeat with mb in _mbs
+            if (name of mb) is "${escapeForAppleScript(resolved)}" then
+              set targetMb to mb
+              exit repeat
+            end if
+          end repeat
+        end ignoring` : `set acct to (first account whose name is "${escapeForAppleScript(account)}")
         set targetMb to missing value
         ignoring case
           repeat with mb in mailboxes of acct
@@ -80430,7 +80465,10 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
               exit repeat
             end if
           end repeat
-        end ignoring
+        end ignoring`;
+    return buildAppLevelScript(`
+      try
+        ${bind}
         if targetMb is not missing value then
           set matchingMsgs to (messages of targetMb whose id is ${Number(id)})
           if (count of matchingMsgs) > 0 then
@@ -80494,6 +80532,19 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
             end try
           end repeat
         end repeat
+        -- #183: local mailboxes belong to no account, so the walk above cannot
+        -- 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.${localMailboxBindingFragment()}
+        repeat with mb in _mbs
+          try
+            set matchingMsgs to (messages of mb whose id is ${Number(id)})
+            if (count of matchingMsgs) > 0 then
+              set end of _hits to item 1 of matchingMsgs
+              set _names to _names & "${LOCAL_STORE_LABEL}/" & (name of mb) & ", "
+            end if
+          end try
+        end repeat
         if (count of _hits) is 0 then return "${LOOKUP_ERROR_MARKER}Message not found"
         if (count of _hits) > 1 then return "${LOOKUP_ERROR_MARKER}${AMBIGUOUS_ID_PREFIX}${Number(id)} is present in more than one mailbox (" & _names & "); list or search that mailbox first so the read targets the right copy"
         if (count of _hits) is 1 then
@@ -80584,6 +80635,19 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
             end try
           end repeat
         end repeat
+        -- #183: local mailboxes belong to no account, so the walk above cannot
+        -- 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.${localMailboxBindingFragment()}
+        repeat with mb in _mbs
+          try
+            set matchingMsgs to (messages of mb whose id is ${Number(id)})
+            if (count of matchingMsgs) > 0 then
+              set end of _hits to item 1 of matchingMsgs
+              set _names to _names & "${LOCAL_STORE_LABEL}/" & (name of mb) & ", "
+            end if
+          end try
+        end repeat
         if (count of _hits) is 0 then return "${LOOKUP_ERROR_MARKER}Message not found"
         if (count of _hits) > 1 then return "${LOOKUP_ERROR_MARKER}${AMBIGUOUS_ID_PREFIX}${Number(id)} is present in more than one mailbox (" & _names & "); list or search that mailbox first so the read targets the right copy"
         if (count of _hits) is 1 then
@@ -80647,10 +80711,12 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       }
       return { messages: allMessages.slice(0, limit), diagnostics };
     }
-    const targetAccount = this.resolveAccount(account);
+    const local = isLocalStoreLabel(account);
+    const targetAccount = local ? LOCAL_STORE_LABEL : this.resolveAccount(account);
     const safeFrom = from ? escapeForAppleScript(from) : "";
     const fromFilter = from ? `whose sender contains "${safeFrom}"` : "";
     const scanThreshold = getMailboxScanThreshold();
+    const mbIter = local ? "_mbs" : "mailboxes";
     let listCommand;
     if (mailbox) {
       const targetMailbox = this.resolveMailbox(mailbox, targetAccount);
@@ -80665,7 +80731,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       set msgCount to 0
       set skipped to 0
       set seenIds to {}
-      repeat with mb in mailboxes
+      repeat with mb in ${mbIter}
         if msgCount >= ${limit} then exit repeat
         set mbName to ""
         try
@@ -80712,7 +80778,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       set _skipped to ""
       set _notSearched to ""
       set _startedAt to current date
-      repeat with mb in mailboxes
+      repeat with mb in ${mbIter}
         if msgCount >= ${limit} then exit repeat
         set mbName to ""
         try
@@ -80742,7 +80808,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       return outputText & "${DIAG_MARKER}timedOut=" & (_timedOut as string) & "${DIAG_FIELD_SEP}skipped=" & _skipped & "${DIAG_FIELD_SEP}notSearched=" & _notSearched
     `;
     }
-    const script = buildAccountScopedScript(targetAccount, listCommand);
+    const script = local ? buildAppLevelScript(`${localMailboxBindingFragment()}${listCommand}`) : buildAccountScopedScript(targetAccount, listCommand);
     const result = executeAppleScript(script, { timeoutMs: SEARCH_ACCOUNT_TIMEOUT_MS });
     if (!result.success) {
       console.error(`Failed to list messages in "${targetAccount}": ${result.error}`);
@@ -82710,16 +82776,14 @@ end tell`;
    * Used internally by the cache; prefer getCachedMailboxNames().
    */
   fetchMailboxNames(account) {
-    const script = buildAccountScopedScript(
-      account,
-      `
+    const body = `
       set mbNames to {}
-      repeat with mb in mailboxes
+      repeat with mb in ${isLocalStoreLabel(account) ? "_mbs" : "mailboxes"}
         set end of mbNames to name of mb
       end repeat
       return mbNames
-    `
-    );
+    `;
+    const script = isLocalStoreLabel(account) ? buildAppLevelScript(`${localMailboxBindingFragment()}${body}`) : buildAccountScopedScript(account, body);
     const result = executeAppleScript(script);
     if (!result.success || !result.output) {
       return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-mail-mcp",
-  "version": "2.15.0",
+  "version": "2.16.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",