apple-mail-mcp 2.5.0 → 2.6.0

package/README.md

@@ -373,7 +373,7 @@ What routes to IMAP when an account is IMAP-configured:
 - **Folder ops:** `create-mailbox`, `rename-mailbox`, `delete-mailbox` — IMAP's `CREATE`/`RENAME`/`DELETE` succeed on the iCloud/Gmail/Workspace/Exchange mailboxes Mail.app's AppleScript bridge can't touch (#42).
 - **Message mutations:** `mark-as-read`/`unread`, `flag-message`/`unflag-message`, `move-message`, `delete-message`.
 - **Batch mutations (2.1):** `batch-mark-as-read`/`unread`, `batch-flag`/`unflag-messages`, `batch-move-messages`, `batch-delete-messages` — `imap:` ids are grouped by mailbox and applied as a single `UID STORE`/`UID MOVE`; numeric ids in the same batch still use AppleScript.
-- **Counts & stats (2.1):** `get-unread-count` and `list-mailboxes` use `STATUS`; `get-mail-stats` (with an `account`) uses `STATUS` + `SEARCH SINCE` — authoritative and fast even on huge mailboxes.
+- **Counts & stats (2.1):** `get-unread-count` and `list-mailboxes` use `STATUS`; `get-mail-stats` uses `STATUS` + `SEARCH SINCE` — authoritative and fast even on huge mailboxes. As of v2.6.0 these prefer IMAP whenever it's configured (see *Read routing* below), merging across accounts when no `account` is given.
 - **Attachments (2.1):** `list-attachments`, `save-attachment`, `fetch-attachment` use `BODYSTRUCTURE` + `FETCH BODY[part]` for `imap:` ids — faster and able to see MIME-embedded attachments AppleScript misses.
 - **Threading (2.1):** `get-thread` links a conversation via `References`/`Message-ID` (`HEADER SEARCH`) for an `imap:` seed, falling back to subject grouping otherwise.
 
@@ -384,9 +384,34 @@ attachment/thread tools and it routes to IMAP automatically; bare numeric ids
 continue to use AppleScript. So an agent never has to know which backend a
 message came from — the id carries it.
 
-Routing is conservative: only a call whose explicit `account` matches the
-configured IMAP account goes to IMAP; everything else falls through to
-AppleScript.
+**Read routing (v2.6.0): reads PREFER direct IMAP whenever IMAP is configured.**
+The read tools — `search-messages`, `get-thread`, `list-messages`,
+`list-mailboxes`, `get-unread-count`, `get-mail-stats` — now go to IMAP whenever
+any `APPLE_MAIL_MCP_IMAP_*` account is configured, not just when an explicit
+matching `account` is passed. There are three cases:
+
+- **Explicit IMAP account** — single-account IMAP (fast server-side path).
+- **Explicit non-IMAP account** — AppleScript (that account isn't on IMAP).
+- **No `account` given** — **merge across all accounts**: the query fans out over
+  *every* configured IMAP account, **and** AppleScript runs **only for the
+  accounts no IMAP config covers** (the account list is partitioned — accounts
+  already served by IMAP are *not* re-scanned via AppleScript). If every Mail
+  account is IMAP-configured, AppleScript is skipped entirely. The results are
+  merged so no account is dropped. Message lists still de-duplicate as a safety
+  net (preferring the IMAP copy, which carries the round-trippable `imap:` id) and
+  sort newest-first; count tools (`get-unread-count`, `get-mail-stats`) count each
+  account via exactly one backend so a coverage mismatch can never double- (or
+  under-) count.
+  - **Default mailbox is resolved per account.** When you don't pin a `mailbox`, a
+    fan-out search scopes each account to its own default — Gmail/Workspace to
+    `[Gmail]/All Mail`, every other IMAP host (iCloud, etc.) to `INBOX` (since
+    `[Gmail]/All Mail` is Gmail-only and selecting it elsewhere would silently drop
+    that account). Pin a `mailbox` to search a wider scope on non-Gmail accounts.
+
+If IMAP is **not** configured at all, every read behaves exactly as before
+(pure AppleScript). The three mailbox-**write** ops (`create-mailbox`,
+`delete-mailbox`, `rename-mailbox`) remain conservative — they route to IMAP only
+for an explicitly-named IMAP account, never on an omitted account.
 
 | Variable | Required | Default | Description |
 |----------|----------|---------|-------------|
@@ -596,6 +621,8 @@ Reply to an existing message.
 }
 ```
 
+> **Transport (v2.5.0):** when SMTP is configured, `reply-to-message` sends via **clean SMTP**, threading the reply with proper RFC 5322 `In-Reply-To`/`References` headers (built from the original message) so it lands in the same conversation. When SMTP is not configured (or the original lacks the headers needed to thread), it falls back to Mail.app's AppleScript `reply … without opening window` — same reliable-from-background-process path as before. See [SMTP transport](#smtp-transport).
+
 **⚠️ Safety:** With the default `send: true`, sends real mail immediately and cannot be unsent. Confirm the recipients, subject, and body with the user before calling (or pass `send: false` to save a draft for review).
 
 ---
@@ -611,6 +638,8 @@ Forward a message to new recipients.
 | `body` | string | No | Message to prepend |
 | `send` | boolean | No | Send immediately (default: true, false = save as draft) |
 
+> **Transport (v2.5.0):** when SMTP is configured, `forward-message` sends via **clean SMTP** (a fresh message with the original quoted, no threading headers — a forward starts a new conversation). When SMTP is not configured it falls back to Mail.app's AppleScript `forward … without opening window`. See [SMTP transport](#smtp-transport).
+
 **⚠️ Safety:** With the default `send: true`, sends real mail immediately and cannot be unsent. Confirm the recipients, subject, and body with the user before calling (or pass `send: false` to save a draft for review).
 
 ---
@@ -1128,6 +1157,8 @@ Prior to v1.4.0, `reply-to-message` and `forward-message` would send messages wi
 
 **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.
 
+**Update (v2.5.0):** when SMTP is configured, `reply-to-message` and `forward-message` now prefer **clean direct SMTP** instead of AppleScript — the same prefer-direct model as `send-email`. Replies are threaded with RFC 5322 `In-Reply-To`/`References` headers built from the original message; forwards start a new conversation. The AppleScript `without opening window` path above remains the fallback when SMTP is not configured (or, for replies, when the original message lacks the headers needed to thread).
+
 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)

package/build/index.js

@@ -28,8 +28,9 @@ import { writeFileSync } from "fs";
 import { resolve as resolvePath, join as joinPath } from "path";
 import { sendViaSmtp, sendSerialViaSmtp, shouldUseSmtp, isSmtpConfigured, resolveSmtpConfig, } from "./services/smtpMailer.js";
 import { buildReplyOptions, buildForwardOptions, parseOriginalHeaders, } from "./services/replyForward.js";
-import { isImapAccount, resolveImapConfigs, dropAllPools, imapSearchMessages, imapListMessages, imapUnreadCount, imapListMailboxes, imapMailStats, imapListAttachments, imapFetchAttachment, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete, imapBatchMove, imapThread, imapCreateMailbox, imapDeleteMailbox, imapRenameMailbox, imapGetMessage, imapMarkRead, imapMarkUnread, imapFlagMessage, imapUnflagMessage, imapMoveMessageById, imapDeleteMessageById, } from "./services/imapClient.js";
+import { isImapAccount, shouldUseImap, resolveImapConfigs, dropAllPools, imapSearchMessages, imapListMessages, imapUnreadCount, imapListMailboxes, imapMailStats, imapListAttachments, imapFetchAttachment, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete, imapBatchMove, imapThread, imapCreateMailbox, imapDeleteMailbox, imapRenameMailbox, imapGetMessage, imapMarkRead, imapMarkUnread, imapFlagMessage, imapUnflagMessage, imapMoveMessageById, imapDeleteMessageById, } from "./services/imapClient.js";
 import { successResponse, errorResponse, partialCoverageBlock, withErrorHandling, messageSummary, } from "./tools/respond.js";
+import { fanOutImapMessages, mergeMessages, formatMergedRows, partitionAccountsForCounts, planCountSources, } from "./services/imapMultiAccount.js";
 import { routeMessage } from "./services/messageRouter.js";
 import { runDoctor, formatDoctorReport } from "./tools/doctor.js";
 import { registerResourcesAndPrompts } from "./tools/resourcesAndPrompts.js";
@@ -116,6 +117,83 @@ const CHECK_ITEM_SCHEMA = z.object({}).passthrough();
 // Read version from package.json to keep it in sync
 const require = createRequire(import.meta.url);
 const { version } = require("../package.json");
+/** An empty SearchDiagnostics (complete coverage). */
+function emptyDiagnostics() {
+    return {
+        partial: false,
+        timedOutAccounts: [],
+        skippedLargeMailboxes: [],
+        notSearchedMailboxes: [],
+    };
+}
+/** Merge two diagnostics objects (union the lists, OR the partial flag). */
+function mergeDiagnostics(a, b) {
+    return {
+        partial: a.partial || b.partial,
+        timedOutAccounts: [...a.timedOutAccounts, ...b.timedOutAccounts],
+        skippedLargeMailboxes: [...a.skippedLargeMailboxes, ...b.skippedLargeMailboxes],
+        notSearchedMailboxes: [...a.notSearchedMailboxes, ...b.notSearchedMailboxes],
+    };
+}
+/**
+ * Run a per-account AppleScript scan over ONLY the given accounts (the ones no
+ * IMAP config covers), concatenating their rows and merging diagnostics. The IMAP
+ * fan-out already covers the IMAP accounts, so this avoids scanning them on the
+ * AppleScript side — which, for an all-IMAP user, means ZERO AppleScript work and
+ * therefore no reliance on the fragile composite dedup. `scan` runs one account.
+ */
+function appleScanForAccounts(accounts, scan) {
+    const rows = [];
+    let diagnostics = emptyDiagnostics();
+    for (const acct of accounts) {
+        const res = scan(acct.name);
+        rows.push(...res.messages.map(messageSummary));
+        diagnostics = mergeDiagnostics(diagnostics, res.diagnostics);
+    }
+    return { rows, diagnostics };
+}
+/**
+ * Build the success response for a no-account, prefer-IMAP MERGED message list
+ * (search-messages / list-messages — v2.6.0). Concatenates the IMAP fan-out rows
+ * with the (already partitioned) AppleScript rows, de-dups (IMAP copy wins — a
+ * safety net for heuristic misses + IMAP-vs-IMAP dupes, no longer load-bearing
+ * for matched accounts), sorts newest-first, applies `limit`, and preserves the
+ * partial-coverage diagnostics (AppleScript scan + any failed IMAP fan-out).
+ *
+ * @param verb "matched" (search) or "listed" (list) — only affects empty-state text.
+ */
+function mergedMessageResponse(fan, apple, limit, verb) {
+    const merged = mergeMessages(fan.rows, apple.rows, limit);
+    // Surface IMAP fan-out failures alongside the AppleScript diagnostics so a
+    // partial merge is never mistaken for a confirmed "no such mail".
+    const diagnostics = {
+        ...apple.diagnostics,
+        partial: apple.diagnostics.partial || fan.accountsFailed.length > 0,
+        timedOutAccounts: [...apple.diagnostics.timedOutAccounts, ...fan.accountsFailed],
+    };
+    const structured = {
+        messages: merged,
+        count: merged.length,
+        partial: diagnostics.partial,
+        skippedLargeMailboxes: diagnostics.skippedLargeMailboxes,
+        notSearchedMailboxes: diagnostics.notSearchedMailboxes,
+        timedOutAccounts: diagnostics.timedOutAccounts,
+    };
+    const coverageBlock = partialCoverageBlock(diagnostics);
+    if (merged.length === 0) {
+        const base = diagnostics.partial
+            ? `No messages found in the portions that were ${verb === "matched" ? "searched" : "listed"}.`
+            : "No messages found";
+        return successResponse(`${base}${coverageBlock}`, structured);
+    }
+    const parts = [];
+    if (fan.accountsQueried.length > 0)
+        parts.push(`IMAP account(s): ${fan.accountsQueried.join(", ")}`);
+    if (apple.rows.length > 0)
+        parts.push("AppleScript");
+    const accountsNote = parts.length > 0 ? ` (merged across ${parts.join(" + ")})` : "";
+    return successResponse(`Found ${merged.length} message(s)${accountsNote}:\n${formatMergedRows(merged)}${coverageBlock}`, structured);
+}
 // =============================================================================
 // Server Initialization
 // =============================================================================
@@ -190,13 +268,17 @@ server.registerTool("search-messages", {
     },
     outputSchema: LIST_OUTPUT_SCHEMA,
 }, withErrorHandling(async ({ query, mailbox, account, limit = 50, dateFrom, dateTo, from, subject, isRead, isFlagged, }) => {
-    // IMAP backend (issue #43): server-side search when this account is
-    // explicitly configured for IMAP; otherwise fall through to AppleScript.
-    if (isImapAccount(account)) {
-        const r = await imapSearchMessages({
+    // IMAP backend: prefer direct IMAP whenever IMAP is configured (v2.6.0).
+    //   - explicit IMAP account → single-account IMAP (fast path);
+    //   - no account + IMAP configured → MERGE: IMAP fans out over every
+    //     configured account; AppleScript scans ONLY the accounts no IMAP
+    //     config covers (partitioned — so an all-IMAP user runs ZERO
+    //     AppleScript and never relies on the composite dedup);
+    //   - explicit non-IMAP account (or IMAP unconfigured) → AppleScript below.
+    if (shouldUseImap(account)) {
+        const imapArgs = {
             query,
             mailbox,
-            account,
             limit,
             dateFrom,
             dateTo,
@@ -204,12 +286,19 @@ server.registerTool("search-messages", {
             subject,
             isRead,
             isFlagged,
-        });
-        return successResponse(r.text, {
-            messages: r.messages,
-            count: r.count,
-            partial: r.partial,
-        });
+        };
+        if (account !== undefined) {
+            const r = await imapSearchMessages({ ...imapArgs, account });
+            return successResponse(r.text, {
+                messages: r.messages,
+                count: r.count,
+                partial: r.partial,
+            });
+        }
+        const fan = await fanOutImapMessages(imapArgs, "search");
+        const { appleScriptOnly } = partitionAccountsForCounts(mailManager.listAccounts(), resolveImapConfigs());
+        const apple = appleScanForAccounts(appleScriptOnly, (acctName) => mailManager.searchMessagesWithDiagnostics(query, mailbox, acctName, limit, dateFrom, dateTo, from, subject, isRead, isFlagged));
+        return mergedMessageResponse(fan, apple, limit, "matched");
     }
     const { messages, diagnostics } = mailManager.searchMessagesWithDiagnostics(query, mailbox, account, limit, dateFrom, dateTo, from, subject, isRead, isFlagged);
     const coverageBlock = partialCoverageBlock(diagnostics);
@@ -323,15 +412,48 @@ server.registerTool("get-thread", {
     if (!seedSubject)
         return errorResponse(`Could not determine the subject of message "${id}"`);
     const base = normalizeSubject(seedSubject);
-    // IMAP backend: server-side subject search.
-    if (isImapAccount(account)) {
-        const r = await imapSearchMessages({ subject: base, mailbox, account, limit });
-        return successResponse(`Thread "${base}":\n${r.text}`, {
-            subject: base,
-            messages: r.messages,
-            count: r.count,
-            partial: r.partial,
+    // IMAP backend: server-side subject search (prefer-IMAP, v2.6.0).
+    //   - explicit IMAP account → single-account IMAP subject search;
+    //   - no account + IMAP configured → MERGE: IMAP fan-out subject search over
+    //     every configured account + AppleScript subject search over ONLY the
+    //     accounts no IMAP config covers (partitioned), then re-order oldest-
+    //     first for natural thread reading.
+    if (shouldUseImap(account)) {
+        if (account !== undefined) {
+            const r = await imapSearchMessages({ subject: base, mailbox, account, limit });
+            return successResponse(`Thread "${base}":\n${r.text}`, {
+                subject: base,
+                messages: r.messages,
+                count: r.count,
+                partial: r.partial,
+            });
+        }
+        const fan = await fanOutImapMessages({ subject: base, mailbox, limit }, "search");
+        const { appleScriptOnly } = partitionAccountsForCounts(mailManager.listAccounts(), resolveImapConfigs());
+        const apple = appleScanForAccounts(appleScriptOnly, (acctName) => mailManager.searchMessagesWithDiagnostics(undefined, mailbox, acctName, limit, undefined, undefined, undefined, base));
+        // Merge + de-dup (IMAP wins), then sort OLDEST-first for thread order.
+        const mergedNewestFirst = mergeMessages(fan.rows, apple.rows, limit);
+        const orderedRows = mergedNewestFirst
+            .slice()
+            .reverse() // mergeMessages returns newest-first; threads read oldest-first
+            .sort((a, b) => (a.dateReceived ? new Date(a.dateReceived).getTime() : 0) -
+            (b.dateReceived ? new Date(b.dateReceived).getTime() : 0));
+        const partial = apple.diagnostics.partial || fan.accountsFailed.length > 0;
+        const coverage = partialCoverageBlock({
+            ...apple.diagnostics,
+            partial,
+            timedOutAccounts: [...apple.diagnostics.timedOutAccounts, ...fan.accountsFailed],
         });
+        const structured = {
+            subject: base,
+            messages: orderedRows,
+            count: orderedRows.length,
+            partial,
+        };
+        if (orderedRows.length === 0) {
+            return successResponse(`No messages found in thread "${base}".${coverage}`, structured);
+        }
+        return successResponse(`Thread "${base}" — ${orderedRows.length} message(s), oldest first:\n${formatMergedRows(orderedRows)}${coverage}`, structured);
     }
     const { messages, diagnostics } = mailManager.searchMessagesWithDiagnostics(undefined, mailbox, account, limit, undefined, undefined, undefined, base);
     // Oldest-first is the natural reading order for a conversation.
@@ -369,15 +491,27 @@ server.registerTool("list-messages", {
     },
     outputSchema: LIST_OUTPUT_SCHEMA,
 }, withErrorHandling(async ({ mailbox, account, limit = 50, offset = 0, from, unreadOnly }) => {
-    // IMAP backend (issue #43): server-side listing when this account is
-    // explicitly configured for IMAP; otherwise fall through to AppleScript.
-    if (isImapAccount(account)) {
-        const r = await imapListMessages({ mailbox, account, limit, offset, from, unreadOnly });
-        return successResponse(r.text, {
-            messages: r.messages,
-            count: r.count,
-            partial: r.partial,
-        });
+    // IMAP backend: prefer direct IMAP whenever IMAP is configured (v2.6.0).
+    //   - explicit IMAP account → single-account IMAP listing (fast path);
+    //   - no account + IMAP configured → MERGE: IMAP fans out over every
+    //     configured account; AppleScript lists ONLY the accounts no IMAP config
+    //     covers (partitioned — all-IMAP user runs ZERO AppleScript). NOTE:
+    //     pagination via `offset` is applied PER-BACKEND before the merge, so
+    //     deep offsets in a merged multi-account list are approximate — recommend
+    //     scoping with an `account` for exact pagination.
+    if (shouldUseImap(account)) {
+        if (account !== undefined) {
+            const r = await imapListMessages({ mailbox, account, limit, offset, from, unreadOnly });
+            return successResponse(r.text, {
+                messages: r.messages,
+                count: r.count,
+                partial: r.partial,
+            });
+        }
+        const fan = await fanOutImapMessages({ mailbox, limit, offset, from, unreadOnly }, "list");
+        const { appleScriptOnly } = partitionAccountsForCounts(mailManager.listAccounts(), resolveImapConfigs());
+        const apple = appleScanForAccounts(appleScriptOnly, (acctName) => mailManager.listMessagesWithDiagnostics(mailbox, acctName, limit, from, offset));
+        return mergedMessageResponse(fan, apple, limit, "listed");
     }
     const { messages, diagnostics } = mailManager.listMessagesWithDiagnostics(mailbox, account, limit, from, offset);
     const coverageBlock = partialCoverageBlock(diagnostics);
@@ -1058,21 +1192,65 @@ server.registerTool("list-mailboxes", {
     },
 }, withErrorHandling(async ({ account }) => {
     // IMAP (I6): LIST + per-mailbox STATUS — sees the true server hierarchy and
-    // authoritative counts; falls back to AppleScript for non-IMAP accounts.
-    if (isImapAccount(account)) {
-        const boxes = await imapListMailboxes({ account });
-        const structured = {
-            mailboxes: boxes.map((b) => ({
-                name: b.path,
-                unreadCount: b.unseen,
-                messageCount: b.messages,
-            })),
-            count: boxes.length,
-        };
-        if (boxes.length === 0)
+    // authoritative counts. Prefer-IMAP (v2.6.0):
+    //   - explicit IMAP account → that account's IMAP mailboxes;
+    //   - no account + IMAP configured → concatenate every configured IMAP
+    //     account's mailboxes (each name prefixed with its account label to
+    //     disambiguate identical mailbox names across accounts) PLUS the
+    //     AppleScript mailboxes of every account NOT covered by IMAP.
+    if (shouldUseImap(account)) {
+        if (account !== undefined) {
+            const boxes = await imapListMailboxes({ account });
+            const structured = {
+                mailboxes: boxes.map((b) => ({
+                    name: b.path,
+                    unreadCount: b.unseen,
+                    messageCount: b.messages,
+                })),
+                count: boxes.length,
+            };
+            if (boxes.length === 0)
+                return successResponse("No mailboxes found", structured);
+            const list = boxes.map((b) => `  - ${b.path} (${b.unseen} unread)`).join("\n");
+            return successResponse(`Found ${boxes.length} mailbox(es):\n${list}`, structured);
+        }
+        const configs = resolveImapConfigs();
+        const rows = [];
+        for (const config of configs) {
+            try {
+                const boxes = await imapListMailboxes({ config });
+                for (const b of boxes) {
+                    // Prefix with the account label so "INBOX" from two accounts is
+                    // distinguishable; keep the raw path available via the structured row.
+                    rows.push({
+                        name: `${config.accountLabel}/${b.path}`,
+                        account: config.accountLabel,
+                        unreadCount: b.unseen,
+                        messageCount: b.messages,
+                    });
+                }
+            }
+            catch (e) {
+                console.error(`IMAP list-mailboxes failed for "${config.accountLabel}": ${String(e)}`);
+            }
+        }
+        // AppleScript for the accounts IMAP doesn't cover (no double-listing).
+        const { appleScriptOnly } = partitionAccountsForCounts(mailManager.listAccounts(), configs);
+        for (const acct of appleScriptOnly) {
+            for (const mb of mailManager.listMailboxes(acct.name)) {
+                rows.push({
+                    name: `${acct.name}/${mb.name}`,
+                    account: acct.name,
+                    unreadCount: mb.unreadCount,
+                    messageCount: mb.messageCount,
+                });
+            }
+        }
+        const structured = { mailboxes: rows, count: rows.length };
+        if (rows.length === 0)
             return successResponse("No mailboxes found", structured);
-        const list = boxes.map((b) => `  - ${b.path} (${b.unseen} unread)`).join("\n");
-        return successResponse(`Found ${boxes.length} mailbox(es):\n${list}`, structured);
+        const list = rows.map((b) => `  - ${b.name} (${b.unreadCount} unread)`).join("\n");
+        return successResponse(`Found ${rows.length} mailbox(es):\n${list}`, structured);
     }
     const mailboxes = mailManager.listMailboxes(account);
     const structured = { mailboxes, count: mailboxes.length };
@@ -1096,10 +1274,40 @@ server.registerTool("get-unread-count", {
     },
 }, withErrorHandling(async ({ mailbox, account }) => {
     // IMAP (I4): STATUS (UNSEEN) is authoritative and fast even on huge
-    // mailboxes; falls back to AppleScript for non-IMAP accounts.
-    const count = isImapAccount(account)
-        ? await imapUnreadCount(mailbox, { account })
-        : mailManager.getUnreadCount(mailbox, account);
+    // mailboxes. Prefer-IMAP (v2.6.0). Counts are ACCOUNT-CENTRIC so each account
+    // is counted exactly once even if the coverage heuristic mis-matches:
+    //   - explicit IMAP account → IMAP UNSEEN for that account;
+    //   - no account + IMAP configured → planCountSources assigns each account
+    //     ONE source (its matching IMAP config, else AppleScript) and counts any
+    //     config that matched no account once via IMAP — no double-counting;
+    //   - explicit non-IMAP account (or IMAP unconfigured) → AppleScript.
+    let count;
+    if (shouldUseImap(account)) {
+        if (account !== undefined) {
+            count = await imapUnreadCount(mailbox, { account });
+        }
+        else {
+            const sources = planCountSources(mailManager.listAccounts(), resolveImapConfigs());
+            let total = 0;
+            for (const src of sources) {
+                if (src.kind === "imap") {
+                    try {
+                        total += await imapUnreadCount(mailbox, { config: src.config });
+                    }
+                    catch (e) {
+                        console.error(`IMAP unread-count failed for "${src.label}": ${String(e)}`);
+                    }
+                }
+                else {
+                    total += mailManager.getUnreadCount(mailbox, src.account.name);
+                }
+            }
+            count = total;
+        }
+    }
+    else {
+        count = mailManager.getUnreadCount(mailbox, account);
+    }
     const location = mailbox ? ` in "${mailbox}"` : "";
     return successResponse(`${count} unread message(s)${location}`, {
         unread: count,
@@ -1538,7 +1746,12 @@ server.registerTool("get-mail-stats", {
 }, withErrorHandling(async ({ account }) => {
     // IMAP (I3): for a named IMAP account, STATUS gives authoritative counts and
     // SEARCH SINCE gives recent activity — fast even on huge mailboxes.
-    if (account && isImapAccount(account)) {
+    //   - explicit IMAP account → IMAP STATUS for that account (today's path);
+    //   - explicit non-IMAP account → AppleScript all-accounts stats below;
+    //   - no account + IMAP configured → MERGE: sum IMAP STATUS over every
+    //     configured account + AppleScript per-account stats for the accounts
+    //     IMAP does NOT cover (partitioned so no account is double-counted).
+    if (account !== undefined && isImapAccount(account)) {
         const s = await imapMailStats({ account });
         const lines = [
             `📊 Mail Statistics — ${account} (IMAP)`,
@@ -1553,6 +1766,77 @@ server.registerTool("get-mail-stats", {
         ];
         return successResponse(lines.join("\n"), { account, ...s });
     }
+    if (account === undefined && shouldUseImap(account)) {
+        let totalMessages = 0;
+        let totalUnread = 0;
+        const recent = { last24h: 0, last7d: 0, last30d: 0 };
+        const perAccount = [];
+        // ACCOUNT-CENTRIC: each account counted via exactly ONE source so a
+        // heuristic mis-match can't double-count. IMAP sources use STATUS; the
+        // AppleScript sources are built from listMailboxes (same source
+        // getMailStats uses) — never getMailStats(), which is all-accounts and
+        // would re-count the IMAP-covered ones. Recently-received from AppleScript
+        // is INBOX-wide (not per-account), so it's omitted for AppleScript sources;
+        // IMAP's per-account recent IS included.
+        const sources = planCountSources(mailManager.listAccounts(), resolveImapConfigs());
+        for (const src of sources) {
+            if (src.kind === "imap") {
+                try {
+                    const s = await imapMailStats({ config: src.config });
+                    totalMessages += s.totalMessages;
+                    totalUnread += s.totalUnread;
+                    recent.last24h += s.recent.last24h;
+                    recent.last7d += s.recent.last7d;
+                    recent.last30d += s.recent.last30d;
+                    perAccount.push({
+                        name: src.label,
+                        totalMessages: s.totalMessages,
+                        unreadMessages: s.totalUnread,
+                        backend: "imap",
+                    });
+                }
+                catch (e) {
+                    console.error(`IMAP mail-stats failed for "${src.label}": ${String(e)}`);
+                }
+            }
+            else {
+                let m = 0;
+                let u = 0;
+                for (const mb of mailManager.listMailboxes(src.account.name)) {
+                    m += mb.messageCount;
+                    u += mb.unreadCount;
+                }
+                totalMessages += m;
+                totalUnread += u;
+                perAccount.push({
+                    name: src.label,
+                    totalMessages: m,
+                    unreadMessages: u,
+                    backend: "applescript",
+                });
+            }
+        }
+        const lines = [
+            `📊 Mail Statistics (merged: IMAP + AppleScript)`,
+            `══════════════════`,
+            `Total messages: ${totalMessages}`,
+            `Unread messages: ${totalUnread}`,
+            ``,
+            `📥 Recently Received (IMAP INBOXes):`,
+            `  Last 24 hours: ${recent.last24h}`,
+            `  Last 7 days: ${recent.last7d}`,
+            `  Last 30 days: ${recent.last30d}`,
+            ``,
+            `📁 By Account:`,
+            ...perAccount.map((a) => `  ${a.name}: ${a.totalMessages} messages (${a.unreadMessages} unread) [${a.backend}]`),
+        ];
+        return successResponse(lines.join("\n"), {
+            totalMessages,
+            totalUnread,
+            accounts: perAccount,
+            recent,
+        });
+    }
     const stats = mailManager.getMailStats();
     const lines = [];
     lines.push(`📊 Mail Statistics`);

package/build/services/imapClient.d.ts

@@ -139,6 +139,20 @@ export interface ImapDeps {
 }
 /** True when `account` matches any configured IMAP account (label or user). */
 export declare function isImapAccount(account: string | undefined, env?: NodeJS.ProcessEnv): boolean;
+/**
+ * Read-side routing gate (v2.6.0 — prefer-IMAP reads). Returns true when a read
+ * tool should go to IMAP rather than AppleScript:
+ *   - IMAP is configured at all, AND
+ *   - either the caller named no account (→ merge across all accounts), or the
+ *     named account is itself a configured IMAP account.
+ * An explicitly-named NON-IMAP account returns false → AppleScript. When IMAP is
+ * not configured at all this is always false, so behavior is unchanged.
+ *
+ * NOTE: the 3 mailbox-WRITE ops (create/delete/rename-mailbox) deliberately keep
+ * using `isImapAccount` — they only route to IMAP for an explicitly-named IMAP
+ * account, never on an omitted account.
+ */
+export declare function shouldUseImap(account: string | undefined, env?: NodeJS.ProcessEnv): boolean;
 /** Account labels of every configured IMAP account (C2), for diagnostics. */
 export declare function listImapAccountLabels(env?: NodeJS.ProcessEnv): string[];
 /**

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

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

package/build/services/imapClient.js

@@ -142,6 +142,22 @@ export function isImapAccount(account, env = process.env) {
         return false;
     return listImapAccountSpecs(env).some((s) => s.accountLabel === account || s.user === account);
 }
+/**
+ * Read-side routing gate (v2.6.0 — prefer-IMAP reads). Returns true when a read
+ * tool should go to IMAP rather than AppleScript:
+ *   - IMAP is configured at all, AND
+ *   - either the caller named no account (→ merge across all accounts), or the
+ *     named account is itself a configured IMAP account.
+ * An explicitly-named NON-IMAP account returns false → AppleScript. When IMAP is
+ * not configured at all this is always false, so behavior is unchanged.
+ *
+ * NOTE: the 3 mailbox-WRITE ops (create/delete/rename-mailbox) deliberately keep
+ * using `isImapAccount` — they only route to IMAP for an explicitly-named IMAP
+ * account, never on an omitted account.
+ */
+export function shouldUseImap(account, env = process.env) {
+    return (listImapAccountSpecs(env).length > 0 && (account === undefined || isImapAccount(account, env)));
+}
 /** Account labels of every configured IMAP account (C2), for diagnostics. */
 export function listImapAccountLabels(env = process.env) {
     return listImapAccountSpecs(env).map((s) => s.accountLabel);
@@ -278,6 +294,11 @@ function structuredRow(m, account, path) {
         mailbox: path,
         account,
         hasAttachments: false,
+        // Message-ID (when the envelope carries it) is the strongest cross-/intra-
+        // backend dedup key for the multi-account merge (imapMultiAccount.ts). The
+        // AppleScript path does not expose it, so cross-backend dedup falls back to
+        // the subject|sender|date composite key.
+        ...(env.messageId ? { messageId: env.messageId } : {}),
     };
 }
 async function run(args, listMode, deps) {

package/build/services/imapMultiAccount.d.ts

@@ -0,0 +1,124 @@
+/**
+ * Multi-account read merge (v2.6.0 — prefer-IMAP reads).
+ *
+ * v2.6.0 flips the read tools to PREFER direct IMAP whenever IMAP is configured
+ * (see `shouldUseImap` in imapClient.ts). When a read is issued with NO explicit
+ * account, results must still cover EVERY account the user has — so we:
+ *
+ *   1. fan the IMAP query out over every configured IMAP account
+ *      (`resolveImapConfigs()`), and
+ *   2. ALSO run the existing AppleScript all-accounts path,
+ *
+ * then merge the two, de-duplicating any message that appears in both backends
+ * (e.g. a Gmail account that is both IMAP-configured AND visible to Mail.app's
+ * AppleScript scan) and preferring the IMAP copy (it carries the round-trippable
+ * `imap:` id that the mutation tools need).
+ *
+ * This module holds the backend-agnostic merge/dedup/sort + the per-account IMAP
+ * fan-out so the three message-list sites (search-messages, get-thread,
+ * list-messages) don't each re-implement it.
+ *
+ * @module services/imapMultiAccount
+ */
+import { type ImapSearchArgs, type ImapConfig, type ImapDeps } from "../services/imapClient.js";
+import type { Account } from "../types.js";
+/** A structured message row as emitted by either backend (permissive on keys). */
+export type MessageRow = Record<string, unknown>;
+/**
+ * Cross-backend dedup key for a message row.
+ *
+ *   - PREFER the normalized Message-ID when present (`mid:<id>`). It's the only
+ *     globally-unique identity, so two IMAP accounts that both hold the very
+ *     same message (rare, but possible with multi-delivery) collapse to one.
+ *   - FALL BACK to `normalizedSubject|sender|dateReceivedEpoch` when no
+ *     Message-ID is available. The AppleScript backend never exposes a
+ *     Message-ID, so this composite is what actually dedups the common case: a
+ *     Gmail account surfaced by BOTH the IMAP fan-out and the AppleScript
+ *     all-accounts scan. The IMAP and AppleScript copies of one message share
+ *     the same subject, sender, and received timestamp, so they collide here.
+ *
+ * Limitation (note for live testing): the composite key assumes the two backends
+ * report the SAME received timestamp to the second. If Mail.app and the IMAP
+ * server disagree on `dateReceived` (timezone/rounding), a message could escape
+ * dedup and appear twice. Message-ID dedup (IMAP-vs-IMAP) is exact; the
+ * composite is best-effort.
+ */
+export declare function dedupKey(row: MessageRow): string;
+/**
+ * Merge IMAP rows with AppleScript rows: concatenate, de-dup by {@link dedupKey}
+ * preferring the IMAP copy (IMAP rows are passed first and win on collision),
+ * sort newest-first by dateReceived, then apply `limit`.
+ */
+export declare function mergeMessages(imapRows: MessageRow[], appleRows: MessageRow[], limit: number): MessageRow[];
+/** Gmail/Workspace IMAP host? Its `[Gmail]/All Mail` virtual mailbox is Gmail-only. */
+export declare function isGmailHost(host: string): boolean;
+/**
+ * Fan an IMAP message query out over EVERY configured IMAP account and return
+ * the concatenated structured rows (not yet merged with AppleScript, not yet
+ * limited — the caller merges + limits). `kind` picks the underlying query so
+ * the mailbox-default and unreadOnly semantics match the single-account path.
+ *
+ * Per-account failures are swallowed (logged) so one unreachable account doesn't
+ * sink the whole read; the returned `accountsQueried`/`accountsFailed` let the
+ * caller surface partial-coverage diagnostics.
+ */
+export declare function fanOutImapMessages(args: ImapSearchArgs, kind: "search" | "list", deps?: Omit<ImapDeps, "config" | "account">, configs?: ImapConfig[]): Promise<{
+    rows: MessageRow[];
+    accountsQueried: string[];
+    accountsFailed: string[];
+}>;
+/**
+ * Per-pair matcher: does this IMAP config correspond to this Mail.app account?
+ * Compared case-insensitively, the config's `accountLabel` AND `user` against the
+ * Mail account's `name` AND `email`. An empty email can't match (avoids
+ * `"" === ""` false positives). This is the single source of truth for coverage;
+ * everything else delegates here.
+ */
+export declare function configMatchesAccount(config: ImapConfig, account: Account): boolean;
+/** True when ANY config matches this Mail account (delegates to the per-pair matcher). */
+export declare function isAccountCoveredByImap(account: Account, configs: ImapConfig[]): boolean;
+/**
+ * Split Mail.app accounts into those covered by IMAP (counted via IMAP) and the
+ * rest (counted via AppleScript), so reads/counts skip the AppleScript scan for
+ * IMAP-covered accounts.
+ */
+export declare function partitionAccountsForCounts(accounts: Account[], configs: ImapConfig[]): {
+    imapCovered: Account[];
+    appleScriptOnly: Account[];
+};
+/**
+ * One unit to count for the count tools (get-unread-count / get-mail-stats),
+ * carrying exactly ONE source so every account is counted once and only once:
+ *   - `{ kind: "imap", config }`        — count this account via IMAP STATUS;
+ *   - `{ kind: "applescript", account }`— count this Mail account via AppleScript.
+ */
+export type CountSource = {
+    kind: "imap";
+    config: ImapConfig;
+    label: string;
+} | {
+    kind: "applescript";
+    account: Account;
+    label: string;
+};
+/**
+ * Plan the count sources so NO account is double-counted even when the coverage
+ * heuristic mis-matches (the failure mode the naive `Σimap(all configs) +
+ * Σapple(uncovered)` had: a config that fails to match its Mail account lands in
+ * BOTH sums).
+ *
+ * Account-centric: walk the Mail.app accounts; each is counted via its FIRST
+ * matching config (IMAP) or, if none matches, via AppleScript. Then any IMAP
+ * config that matched NO Mail account (configured-but-not-present-in-Mail.app) is
+ * added once as an IMAP source. A config is consumed by at most one Mail account,
+ * so two Mail accounts can't both claim the same config and inflate the total.
+ */
+export declare function planCountSources(accounts: Account[], configs: ImapConfig[]): CountSource[];
+/**
+ * Render the structured message rows into the human text block the read tools
+ * emit (`  - ID: … | date | subject (from: sender) [read|unread]`). Shared so the
+ * merged path matches the single-backend formatting. `showReadState` mirrors
+ * search/list (which show [read]) vs. plain list rows.
+ */
+export declare function formatMergedRows(rows: MessageRow[], showReadState?: boolean): string;
+//# sourceMappingURL=imapMultiAccount.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"imapMultiAccount.d.ts","sourceRoot":"","sources":["../../src/services/imapMultiAccount.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,EAIL,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,kFAAkF;AAClF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAuCjD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAMhD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,UAAU,EAAE,EACvB,KAAK,EAAE,MAAM,GACZ,UAAU,EAAE,CAcd;AAED,uFAAuF;AACvF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,QAAQ,GAAG,MAAM,EACvB,IAAI,GAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAM,EAC/C,OAAO,GAAE,UAAU,EAAyB,GAC3C,OAAO,CAAC;IAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAAC,eAAe,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA2BtF;AAmBD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAQlF;AAED,0FAA0F;AAC1F,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAEvF;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,UAAU,EAAE,GACpB;IAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAAC,eAAe,EAAE,OAAO,EAAE,CAAA;CAAE,CAQxD;AAED;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAmB1F;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,aAAa,UAAO,GAAG,MAAM,CAajF"}

package/build/services/imapMultiAccount.js

@@ -0,0 +1,253 @@
+/**
+ * Multi-account read merge (v2.6.0 — prefer-IMAP reads).
+ *
+ * v2.6.0 flips the read tools to PREFER direct IMAP whenever IMAP is configured
+ * (see `shouldUseImap` in imapClient.ts). When a read is issued with NO explicit
+ * account, results must still cover EVERY account the user has — so we:
+ *
+ *   1. fan the IMAP query out over every configured IMAP account
+ *      (`resolveImapConfigs()`), and
+ *   2. ALSO run the existing AppleScript all-accounts path,
+ *
+ * then merge the two, de-duplicating any message that appears in both backends
+ * (e.g. a Gmail account that is both IMAP-configured AND visible to Mail.app's
+ * AppleScript scan) and preferring the IMAP copy (it carries the round-trippable
+ * `imap:` id that the mutation tools need).
+ *
+ * This module holds the backend-agnostic merge/dedup/sort + the per-account IMAP
+ * fan-out so the three message-list sites (search-messages, get-thread,
+ * list-messages) don't each re-implement it.
+ *
+ * @module services/imapMultiAccount
+ */
+import { imapSearchMessages, imapListMessages, resolveImapConfigs, } from "../services/imapClient.js";
+/**
+ * Normalize a Message-ID for comparison: strip surrounding angle brackets and
+ * whitespace, lowercase. Returns undefined when the row has no usable id.
+ */
+function normalizeMessageId(row) {
+    const raw = typeof row.messageId === "string" ? row.messageId.trim() : "";
+    if (!raw)
+        return undefined;
+    const inner = raw.replace(/^<+|>+$/g, "").trim();
+    return inner ? inner.toLowerCase() : undefined;
+}
+/**
+ * Normalize a subject the same way the thread tool does for grouping: drop
+ * leading Re:/Fwd: prefixes, collapse whitespace, lowercase. Kept local (and
+ * deliberately simple) so the merge has no dependency cycle with the thread
+ * module; exactness isn't required — this only feeds the fallback dedup key.
+ */
+function normalizeSubjectForKey(subject) {
+    const s = typeof subject === "string" ? subject : "";
+    return s
+        .replace(/^(\s*(re|fwd|fw|aw|sv|antw)\s*:\s*)+/i, "")
+        .replace(/\s+/g, " ")
+        .trim()
+        .toLowerCase();
+}
+/** Epoch ms of the row's dateReceived (ISO string or Date), or 0 when absent. */
+function dateEpoch(row) {
+    const d = row.dateReceived;
+    if (d instanceof Date)
+        return d.getTime();
+    if (typeof d === "string" && d) {
+        const t = new Date(d).getTime();
+        return Number.isNaN(t) ? 0 : t;
+    }
+    return 0;
+}
+/**
+ * Cross-backend dedup key for a message row.
+ *
+ *   - PREFER the normalized Message-ID when present (`mid:<id>`). It's the only
+ *     globally-unique identity, so two IMAP accounts that both hold the very
+ *     same message (rare, but possible with multi-delivery) collapse to one.
+ *   - FALL BACK to `normalizedSubject|sender|dateReceivedEpoch` when no
+ *     Message-ID is available. The AppleScript backend never exposes a
+ *     Message-ID, so this composite is what actually dedups the common case: a
+ *     Gmail account surfaced by BOTH the IMAP fan-out and the AppleScript
+ *     all-accounts scan. The IMAP and AppleScript copies of one message share
+ *     the same subject, sender, and received timestamp, so they collide here.
+ *
+ * Limitation (note for live testing): the composite key assumes the two backends
+ * report the SAME received timestamp to the second. If Mail.app and the IMAP
+ * server disagree on `dateReceived` (timezone/rounding), a message could escape
+ * dedup and appear twice. Message-ID dedup (IMAP-vs-IMAP) is exact; the
+ * composite is best-effort.
+ */
+export function dedupKey(row) {
+    const mid = normalizeMessageId(row);
+    if (mid)
+        return `mid:${mid}`;
+    const subject = normalizeSubjectForKey(row.subject);
+    const sender = (typeof row.sender === "string" ? row.sender : "").trim().toLowerCase();
+    return `k:${subject}|${sender}|${dateEpoch(row)}`;
+}
+/**
+ * Merge IMAP rows with AppleScript rows: concatenate, de-dup by {@link dedupKey}
+ * preferring the IMAP copy (IMAP rows are passed first and win on collision),
+ * sort newest-first by dateReceived, then apply `limit`.
+ */
+export function mergeMessages(imapRows, appleRows, limit) {
+    const byKey = new Map();
+    // IMAP first so its copy wins; AppleScript only fills keys IMAP didn't supply.
+    for (const r of imapRows) {
+        const k = dedupKey(r);
+        if (!byKey.has(k))
+            byKey.set(k, r);
+    }
+    for (const r of appleRows) {
+        const k = dedupKey(r);
+        if (!byKey.has(k))
+            byKey.set(k, r);
+    }
+    const merged = [...byKey.values()];
+    merged.sort((a, b) => dateEpoch(b) - dateEpoch(a)); // newest first
+    return limit >= 0 ? merged.slice(0, limit) : merged;
+}
+/** Gmail/Workspace IMAP host? Its `[Gmail]/All Mail` virtual mailbox is Gmail-only. */
+export function isGmailHost(host) {
+    return /(^|\.)gmail\.com$/i.test(host.trim());
+}
+/**
+ * Fan an IMAP message query out over EVERY configured IMAP account and return
+ * the concatenated structured rows (not yet merged with AppleScript, not yet
+ * limited — the caller merges + limits). `kind` picks the underlying query so
+ * the mailbox-default and unreadOnly semantics match the single-account path.
+ *
+ * Per-account failures are swallowed (logged) so one unreachable account doesn't
+ * sink the whole read; the returned `accountsQueried`/`accountsFailed` let the
+ * caller surface partial-coverage diagnostics.
+ */
+export async function fanOutImapMessages(args, kind, deps = {}, configs = resolveImapConfigs()) {
+    const rows = [];
+    const accountsQueried = [];
+    const accountsFailed = [];
+    for (const config of configs) {
+        // Default-mailbox resolution is PER-ACCOUNT: the single-account search default
+        // ("[Gmail]/All Mail") is Gmail-only, so fanning it out to a non-Gmail account
+        // (e.g. iCloud) makes that SELECT fail and the account silently drops from the
+        // merged results. When the caller pinned no mailbox, give Gmail hosts their
+        // All-Mail default (undefined → resolved downstream) and every other host a
+        // universal "INBOX". (limit is applied AFTER the cross-account merge so the
+        // global newest-N is correct even when one account dominates.)
+        const mailbox = args.mailbox ?? (isGmailHost(config.host) ? undefined : "INBOX");
+        const perAccountArgs = { ...args, account: undefined, mailbox };
+        try {
+            const res = kind === "search"
+                ? await imapSearchMessages(perAccountArgs, { ...deps, config })
+                : await imapListMessages(perAccountArgs, { ...deps, config });
+            rows.push(...res.messages);
+            accountsQueried.push(config.accountLabel);
+        }
+        catch (e) {
+            accountsFailed.push(config.accountLabel);
+            console.error(`IMAP fan-out failed for account "${config.accountLabel}": ${String(e)}`);
+        }
+    }
+    return { rows, accountsQueried, accountsFailed };
+}
+// ---------------------------------------------------------------------------
+// Account coverage + count partitioning (reads, get-unread-count, get-mail-stats)
+//
+// Coverage is decided per (config, Mail-account) PAIR by configMatchesAccount.
+// - Message-list reads use partitionAccountsForCounts to run AppleScript ONLY
+//   for accounts no IMAP config covers (IMAP fans out over the configs), so an
+//   all-IMAP user runs zero AppleScript and never depends on composite dedup.
+// - Count tools use planCountSources, which assigns each account EXACTLY ONE
+//   source (its matching config, else AppleScript) and adds any config that
+//   matched no account once — so even a heuristic MISS can't double-count.
+//
+// Matching is case-insensitive on the config's accountLabel/user vs. the Mail
+// account's name/email. accountLabel defaults to the login address and users
+// typically set it to the Mail.app account NAME, so checking both against both
+// catches the common setups (label=accountName, label=email, login=email).
+// ---------------------------------------------------------------------------
+/**
+ * Per-pair matcher: does this IMAP config correspond to this Mail.app account?
+ * Compared case-insensitively, the config's `accountLabel` AND `user` against the
+ * Mail account's `name` AND `email`. An empty email can't match (avoids
+ * `"" === ""` false positives). This is the single source of truth for coverage;
+ * everything else delegates here.
+ */
+export function configMatchesAccount(config, account) {
+    const name = account.name.trim().toLowerCase();
+    const email = (account.email ?? "").trim().toLowerCase();
+    const label = config.accountLabel.trim().toLowerCase();
+    const user = config.user.trim().toLowerCase();
+    return (label === name || (!!email && label === email) || user === name || (!!email && user === email));
+}
+/** True when ANY config matches this Mail account (delegates to the per-pair matcher). */
+export function isAccountCoveredByImap(account, configs) {
+    return configs.some((c) => configMatchesAccount(c, account));
+}
+/**
+ * Split Mail.app accounts into those covered by IMAP (counted via IMAP) and the
+ * rest (counted via AppleScript), so reads/counts skip the AppleScript scan for
+ * IMAP-covered accounts.
+ */
+export function partitionAccountsForCounts(accounts, configs) {
+    const imapCovered = [];
+    const appleScriptOnly = [];
+    for (const a of accounts) {
+        if (isAccountCoveredByImap(a, configs))
+            imapCovered.push(a);
+        else
+            appleScriptOnly.push(a);
+    }
+    return { imapCovered, appleScriptOnly };
+}
+/**
+ * Plan the count sources so NO account is double-counted even when the coverage
+ * heuristic mis-matches (the failure mode the naive `Σimap(all configs) +
+ * Σapple(uncovered)` had: a config that fails to match its Mail account lands in
+ * BOTH sums).
+ *
+ * Account-centric: walk the Mail.app accounts; each is counted via its FIRST
+ * matching config (IMAP) or, if none matches, via AppleScript. Then any IMAP
+ * config that matched NO Mail account (configured-but-not-present-in-Mail.app) is
+ * added once as an IMAP source. A config is consumed by at most one Mail account,
+ * so two Mail accounts can't both claim the same config and inflate the total.
+ */
+export function planCountSources(accounts, configs) {
+    const sources = [];
+    const usedConfigs = new Set();
+    for (const account of accounts) {
+        const match = configs.find((c) => !usedConfigs.has(c) && configMatchesAccount(c, account));
+        if (match) {
+            usedConfigs.add(match);
+            sources.push({ kind: "imap", config: match, label: account.name });
+        }
+        else {
+            sources.push({ kind: "applescript", account, label: account.name });
+        }
+    }
+    // IMAP accounts that exist in config but not in Mail.app — count them once.
+    for (const config of configs) {
+        if (!usedConfigs.has(config)) {
+            sources.push({ kind: "imap", config, label: config.accountLabel });
+        }
+    }
+    return sources;
+}
+/**
+ * Render the structured message rows into the human text block the read tools
+ * emit (`  - ID: … | date | subject (from: sender) [read|unread]`). Shared so the
+ * merged path matches the single-backend formatting. `showReadState` mirrors
+ * search/list (which show [read]) vs. plain list rows.
+ */
+export function formatMergedRows(rows, showReadState = true) {
+    return rows
+        .map((m) => {
+        const date = (() => {
+            const e = dateEpoch(m);
+            return e ? new Date(e).toLocaleDateString() : "";
+        })();
+        const subject = typeof m.subject === "string" ? m.subject : "(no subject)";
+        const sender = typeof m.sender === "string" ? m.sender : "(unknown)";
+        const state = showReadState ? ` [${m.isRead ? "read" : "unread"}]` : "";
+        return `  - ID: ${String(m.id)} | ${date} | ${subject} (from: ${sender})${state}`;
+    })
+        .join("\n");
+}

package/package.json

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