apple-mail-mcp 2.12.0 → 2.13.1

package/README.md

@@ -1430,9 +1430,35 @@ Three more honesty rules:
   than list positions — and `expected` stays comparable with the mailbox instead
   of double-counting a duplicate into a false `over`.
 
-`imap:` ids are not reconciled. An IMAP UID names exactly one message in exactly
-one mailbox, so the mis-targeting class this exists for cannot occur there; a
-batch of only `imap:` ids returns no `countDelta` rather than a fabricated one.
+`imap:` ids are not reconciled by `countDelta`. An IMAP UID names exactly one
+message in exactly one mailbox, so the mis-targeting class this exists for cannot
+occur there; a batch of only `imap:` ids returns no `countDelta` rather than a
+fabricated one.
+
+They carry their own post-condition check instead. `delete-message` and
+`move-message` on an `imap:` id return a **`verification`** object in
+`structuredContent`:
+
+```json
+{
+  "verification": {
+    "verdict": "verified",
+    "how": "COPYUID: UID 5 arrived in \"Archive\" as UID 91"
+  }
+}
+```
+
+| `verdict` | Meaning |
+|---|---|
+| `verified` | The effect was **observed** — either the server's UIDPLUS `COPYUID` named the message's new UID in the destination, or the UID is no longer in the source mailbox. |
+| `unverified` | The server **accepted** the command and nothing could confirm the effect. Populates `why`. |
+
+`unverified` is **not a failure** and must not be rendered as one — it means
+"accepted, no observation either way". It is reported rather than hidden because
+an absent verification must never read as a successful one, the same rule the
+collateral diff follows. A message that is still in the source mailbox after an
+accepted move is reported `unverified` rather than failed, because a Gmail label
+store can legitimately keep a message visible in an all-mail view after a move.
 
 ### `APPLE_MAIL_MCP_AUDIT_LOG` — opt-in forensic log
 

package/build/index.js

@@ -79503,6 +79503,35 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
             end if
             set _sLo to _sHi + 1
           end repeat
+          -- #179: the loop above is bounded by the count Mail JUST reported,
+          -- and that count can lag the mailbox (#155). Positions past the bound
+          -- are never requested, so \u2014 unlike a slice that failed \u2014 they leave
+          -- no trace in _sMiss, and the record would claim a complete
+          -- observation while every message past the bound looks like it
+          -- disappeared. That is a FABRICATED finding with names attached,
+          -- which is worse than the gap it papers over.
+          --
+          -- Probe exactly ONE position past the bound. One, not a slice: an
+          -- out-of-range RANGE raises as a whole, so an over-requested slice
+          -- could not distinguish "nothing there" from "count was low by more
+          -- than a chunk". If a message is there, the count was low and the
+          -- unread tail is recorded as a hole, which makes this snapshot
+          -- PARTIAL under the existing rules and withholds the halves a
+          -- truncation would poison.
+          try
+            set _sOverId to ((id of message (${countVar} + 1) of ${mbVar}) as string)
+            -- A specifier that CLAMPS rather than raising hands back the LAST
+            -- message instead of failing. That is not evidence of a truncation,
+            -- so only an id this enumeration did not already record counts.
+            set _sSeen to false
+            repeat with _sP in _sPairs
+              if (contents of _sP) starts with (_sOverId & "${SNAP_PAIR}") then set _sSeen to true
+            end repeat
+            if not _sSeen then
+              if _sMiss is not "" then set _sMiss to _sMiss & ","
+              set _sMiss to _sMiss & ((${countVar} + 1) as string) & "-end"
+            end if
+          end try
           if _sMiss is not "" then
             if (count of _sPairs) is 0 then
               set _sStatus to "unavailable"
@@ -83842,6 +83871,27 @@ function assertMutated(result, what) {
   if (!result) throw new Error(`${what}: server rejected the command (IMAP NO/BAD)`);
   return result;
 }
+async function verifyMoved(client, moved, uid, srcPath, destPath) {
+  const newUid = moved.uidMap?.get(uid);
+  if (newUid !== void 0) {
+    return {
+      verdict: "verified",
+      how: `COPYUID: UID ${uid} arrived in "${destPath}" as UID ${newUid}`
+    };
+  }
+  try {
+    const stillThere = await client.fetchOne(String(uid), { uid: true }, { uid: true });
+    if (!stillThere) {
+      return { verdict: "verified", how: `UID ${uid} is no longer present in "${srcPath}"` };
+    }
+    return {
+      verdict: "unverified",
+      why: `the server accepted the MOVE, but UID ${uid} is still present in "${srcPath}" and this server does not advertise UIDPLUS, so arrival in "${destPath}" could not be confirmed. A Gmail label store can legitimately keep a message in an all-mail view after a move, so this is not reported as a failure`
+    };
+  } catch (e) {
+    return { verdict: "unverified", why: `the post-move check could not run: ${errText(e)}` };
+  }
+}
 var poolConnect = defaultConnect;
 var pools = /* @__PURE__ */ new Map();
 function poolKey(cfg) {
@@ -84180,11 +84230,16 @@ async function imapMoveMessageById(id, destMailbox, deps = {}) {
     const destPath = dest.kind === "found" ? dest.path : resolveMailboxPath(destMailbox, "list");
     const lock = await client.getMailboxLock(ref.path);
     try {
-      assertMutated(
+      const moved = 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.` };
+      const verification = await verifyMoved(client, moved, ref.uid, ref.path, destPath);
+      return {
+        success: true,
+        info: verification.verdict === "verified" ? `Moved UID ${ref.uid} to "${destPath}" via IMAP (verified: ${verification.how}).` : `Moved UID ${ref.uid} to "${destPath}" via IMAP \u2014 UNVERIFIED: ${verification.why}.`,
+        verification
+      };
     } catch (e) {
       return {
         success: false,
@@ -84226,21 +84281,38 @@ async function trashUids(client, uids, srcPath) {
     );
     return { dest, expunged: true };
   }
-  assertMutated(
+  const moved = assertMutated(
     await client.messageMove(uids, dest, { uid: true }),
     `IMAP move of ${uids.length} message(s) from "${srcPath}" to "${dest}"`
   );
-  return { dest, expunged: false };
+  return { dest, expunged: false, moved };
+}
+async function verifyExpunged(client, uid, path) {
+  try {
+    const stillThere = await client.fetchOne(String(uid), { uid: true }, { uid: true });
+    if (!stillThere) {
+      return { verdict: "verified", how: `UID ${uid} is no longer present in "${path}"` };
+    }
+    return {
+      verdict: "unverified",
+      why: `the server accepted the EXPUNGE but UID ${uid} is still present in "${path}"`
+    };
+  } catch (e) {
+    return { verdict: "unverified", why: `the post-delete check could not run: ${errText(e)}` };
+  }
 }
 async function imapDeleteMessageById(id, deps = {}) {
   const ref = decodeImapId(id);
   if (!ref) return { success: false, error: `Not an IMAP message id: "${id}".` };
   return withMailbox(ref.path, depsForMessageRef(ref, deps), async (client) => {
     try {
-      const { dest, expunged } = await trashUids(client, [ref.uid], ref.path);
+      const { dest, expunged, moved } = await trashUids(client, [ref.uid], ref.path);
+      const verification = expunged || !moved ? await verifyExpunged(client, ref.uid, ref.path) : await verifyMoved(client, moved, ref.uid, ref.path, dest);
+      const what = expunged ? `Permanently deleted UID ${ref.uid} from Trash ("${ref.path}") via IMAP` : `Moved UID ${ref.uid} to Trash ("${dest}") via IMAP`;
       return {
         success: true,
-        info: expunged ? `Permanently deleted UID ${ref.uid} from Trash ("${ref.path}") via IMAP.` : `Moved UID ${ref.uid} to Trash ("${dest}") via IMAP.`
+        info: verification.verdict === "verified" ? `${what} (verified: ${verification.how}).` : `${what} \u2014 UNVERIFIED: ${verification.why}.`,
+        verification
       };
     } catch (e) {
       return { success: false, error: `IMAP delete failed for UID ${ref.uid}: ${errText(e)}` };
@@ -84820,10 +84892,12 @@ function formatMergedRows(rows, showReadState = true) {
 async function routeMessage(id, opts) {
   if (decodeImapId(id)) {
     const r = await opts.imap();
-    return r.success ? successResponse(
+    if (!r.success) return errorResponse(r.error ?? opts.fail);
+    const structured = opts.structuredFromResult ? opts.structuredFromResult(r) : opts.structured;
+    return successResponse(
       r.info ?? opts.ok,
-      opts.structuredFromResult ? opts.structuredFromResult(r) : opts.structured
-    ) : errorResponse(r.error ?? opts.fail);
+      r.verification && structured ? { ...structured, verification: r.verification } : structured
+    );
   }
   return opts.apple();
 }
@@ -85387,6 +85461,13 @@ var COUNT_DELTA_OUTPUT_SCHEMA = external_exports.array(
     note: external_exports.string().optional()
   })
 ).optional();
+var VERIFICATION_OUTPUT_SCHEMA = external_exports.object({
+  verdict: external_exports.enum(["verified", "unverified"]),
+  /** Present on `verified`: what was observed. */
+  how: external_exports.string().optional(),
+  /** Present on `unverified`: why no observation was possible. */
+  why: external_exports.string().optional()
+}).optional();
 var CHECK_ITEM_SCHEMA = external_exports.object({}).passthrough();
 var require2 = createRequire(import.meta.url);
 var { version: version2 } = require2("../package.json");
@@ -86239,7 +86320,8 @@ registerTool(
     outputSchema: {
       ok: external_exports.boolean().optional(),
       id: external_exports.string().optional(),
-      countDelta: COUNT_DELTA_OUTPUT_SCHEMA
+      countDelta: COUNT_DELTA_OUTPUT_SCHEMA,
+      verification: VERIFICATION_OUTPUT_SCHEMA
     }
   },
   withErrorHandling(
@@ -86279,7 +86361,8 @@ registerTool(
       ok: external_exports.boolean().optional(),
       id: external_exports.string().optional(),
       mailbox: external_exports.string().optional(),
-      countDelta: COUNT_DELTA_OUTPUT_SCHEMA
+      countDelta: COUNT_DELTA_OUTPUT_SCHEMA,
+      verification: VERIFICATION_OUTPUT_SCHEMA
     }
   },
   withErrorHandling(

package/package.json

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