apple-tools-mcp 2.1.4 → 2.1.5

package/README.md

@@ -464,7 +464,7 @@ Two arguments are available on **every** write tool:
 
 `body_format: "html"` uses the same compose path with a tag-stripped body pasted into Mail's native editor. It does **not** set Mail's `content` or `html content` — those setters cite-wrap the whole message (`>` prefixes and `<blockquote type="cite">`, same iOS purple bar). Mail may still generate its own HTML alternative from the native compose. The default is plain text.
 
-**Compose is not quoted.** `mail_send` / `mail_draft` (plain and html) call `make new outgoing message` **without** AppleScript `content:` so `newMessage` is a real Mail object, then fill the body into the compose window (subject title-marker + coordinate AX hit-test, then AXValue). Mail's `mailto` command was shipped in 2.0.4 and **fails on Mini/MacBook Mail**: it does not return an outgoing message (`newMessage` undefined, AppleScript **-2753**). On current Mail (Ventura+, FB11734014) `content` / `html content` store the body as a citation: every plain-text line prefixed with `>`, plus a `multipart/alternative` HTML part wrapped in `<blockquote type="cite">`. Desktop Mail often hides the bar with inline styles; iOS Mail paints the whole body purple with a left quote bar — even when the subject is not `Re:`/`Fwd:` and there is no `In-Reply-To`. Reply and forward still quote the original, which is expected (those paths still prepend via `content`; fixing reply/forward cite-wrap is out of scope for 2.1.0).
+**Compose is not quoted.** `mail_send` / `mail_draft` (plain and html) call `make new outgoing message` **without** AppleScript `content:` so `newMessage` is a real Mail object, then paste the body into the compose window (exact subject title, role `AXWebArea`, proven focus, Cmd-A + clipboard). Mail's `mailto` command was shipped in 2.0.4 and **fails on Mini/MacBook Mail**: it does not return an outgoing message (`newMessage` undefined, AppleScript **-2753**). On current Mail (Ventura+, FB11734014) `content` / `html content` store the body as a citation: every plain-text line prefixed with `>`, plus a `multipart/alternative` HTML part wrapped in `<blockquote type="cite">`. Desktop Mail often hides the bar with inline styles; iOS Mail paints the whole body purple with a left quote bar — even when the subject is not `Re:`/`Fwd:` and there is no `In-Reply-To`. Reply and forward still quote the original, which is expected (those paths still prepend via `content`; fixing reply/forward cite-wrap is out of scope for 2.1.0).
 
 Keystrokes use System Events, so **node needs Accessibility** (Privacy & Security → Accessibility) **and** Automation → Mail **and** Automation → System Events. Run `apple-tools-mcp permissions` after first install or upgrade so **node → System Events** pops **Allow** in the same sitting as Mail / Messages / Contacts / Calendar. An Accessibility / System Events deny is not a Mail Automation deny (`-1743` / `-10004`).
 
@@ -486,6 +486,8 @@ Keystrokes use System Events, so **node needs Accessibility** (Privacy & Securit
 
 **Compile prove (2.1.4 on the Mini host):** Unpatched `buildComposeScript` / `buildMailBodyPasteHandler` `osacompile` **-2741** on those bare AXTitle reads; patched AXTitle-inside-System-Events tell `osacompile` exit 0. Report: `results-214/SOLUTION-PROBE-REPORT.md`. Global install untouched. Live Sent is the 2.1.3 ship prove after npm.
 
+**Probe 3 body delivery (2.1.5).** Mini Probe 3 (`atm-p3-deliver.applescript`, classic AppleScript / System Events, not JXA) proved a click-free path: exact subject window title, first `AXWebArea` from `entire contents` of that window, `set focused of` that element to true, then an independent `AXFocusedUIElement` re-read that must match role `AXWebArea` and position/size before any keystroke. Delivery is Cmd-A + clipboard paste. No Mail `content` / `html content`. No `AXValue` write (`AXUIElementSetAttributeValue` on content is a silent no-op; 2.1.4 `atmAxHitFill` returned `OK` when that value was empty, so the keystroke recovery never ran). No coordinate `click at` (Probe 3: a click can land on another Space or app). Focus mismatch is `BODY_FOCUS_UNPROVEN`: the draft is deleted and nothing is sent. The post-paste body needle runs only when the focused element is still that proven body, so a To: recipient chip (`U+FFFC`) is not `BODY_PASTE_MISDIRECTED`. Sent/Outbox verify, `dry_run`, and confirm are unchanged.
+
 **Manual prove (2.1.3 on the Mini host):** After `apple-tools-mcp permissions` reports System Events granted, `mail_send` a short **multiline** plain message and a short `body_format: "html"` message whose body looks like ordinary paragraphs (for example `<p>Quick note</p>`), neither with a `Re:`/`Fwd:` subject. The body must land via title-marker + hit-test (not Tab / focused-role): no `BODY_FOCUS_FAILED` / `BODY_PASTE_MISDIRECTED`. Inspect each Sent `.emlx`: the text/plain part must contain the intended text (newlines preserved) and must not prefix every body line with `>`, and any HTML alternative must not wrap the whole body in `<blockquote type="cite">`. Compose must succeed (no `-2753` / undefined `newMessage`). Prove the production path (write-bridge with node → System Events allowed, **or** the documented in-process fallback). That quote-prefix Mini Sent prove is a separate bar from the 2.0.7 verify contract.
 
 Emails are addressed by their RFC822 **Message-ID**. Pass `message_id`, or pass the `file_path` from `mail_search` / `mail_recent` and the server reads the Message-ID out of the `.emlx` headers for you. `mail_archive` moves the message to its account's Archive (or All Mail) mailbox; `mail_trash` moves it to that account's Trash.

package/lib/mailWrite.js

@@ -158,6 +158,10 @@ export function probeMailAutomation() {
 export const ACCESSIBILITY_DENIED_SENTINEL = "ACCESSIBILITY_DENIED";
 export const BODY_PASTE_MISDIRECTED_SENTINEL = "BODY_PASTE_MISDIRECTED";
 export const BODY_FOCUS_FAILED_SENTINEL = "BODY_FOCUS_FAILED";
+/** Focus request ran, but the re-read AXFocusedUIElement was not the chosen body. */
+export const BODY_FOCUS_UNPROVEN_SENTINEL = "BODY_FOCUS_UNPROVEN";
+/** Mail To: recipient chips surface as U+FFFC (object replacement), not body text. */
+export const MAIL_RECIPIENT_TOKEN_CHAR_ID = 65532;
 export const GUI_SCRIPTING_UNAVAILABLE_SENTINEL = "GUI_SCRIPTING_UNAVAILABLE";
 export const SYSTEM_EVENTS_PROBE_MARKER = "ATM_SYSTEM_EVENTS_PROBE";
 /** Permissions-only marker: process / GUI scripting, not application `name`. */
@@ -268,10 +272,11 @@ export function composeTitleMarker(subject) {
 }
 
 /**
- * JXA AX hit-test: `AXUIElementCopyElementAtPosition` at compose-body
- * coordinates, then AXFocused + AXValue on the `AXWebArea` "message body".
- * Mini-proven (computer-use): deep UI-element walks truncate before the
- * WebArea; a coordinate hit-test does not. No mouse click.
+ * Optional coordinate finder kept off the compose delivery path.
+ * 2.1.3/2.1.4 called this and treated an empty AXValue as "OK", so the
+ * keystroke recovery never ran (Probe 2: AXValue writes are a silent no-op).
+ * Probe 3 delivery does not use it: no AXUIElementSetAttributeValue, no
+ * click, and an empty value is not success.
  */
 export function buildAtmAxHitTestJxa() {
   return `ObjC.import("ApplicationServices");
@@ -313,11 +318,9 @@ function isMailBodyHit(role, bits) {
 function run(argv) {
   // ${ATM_AX_HIT_TEST_MARKER}
   var pid = parseInt(argv[0], 10);
-  var body = String(argv[1] || "");
-  var needle = String(argv[2] || "");
-  var pointStr = String(argv[3] || "");
-  var minH = parseInt(argv[4], 10);
-  if (!minH) minH = 50;
+  var pointStr = String(argv[1] || "");
+  var minH = parseInt(argv[2], 10);
+  if (!minH) minH = ${MAIL_BODY_MIN_AX_HEIGHT};
   if (!pid) return "BODY_FOCUS_FAILED";
   var app = $.AXUIElementCreateApplication(pid);
   var points = pointStr.split(";");
@@ -341,11 +344,7 @@ function run(argv) {
     }
   }
   if (!chosen) return "BODY_FOCUS_FAILED";
-  try { $.AXUIElementSetAttributeValue(chosen, "AXFocused", true); } catch (e) {}
-  try { $.AXUIElementSetAttributeValue(chosen, "AXValue", body); } catch (e) {}
-  var val = axStr(chosen, "AXValue");
-  if (val !== "" && needle !== "" && val.indexOf(needle) === -1) return "VALUE_MISS";
-  return "OK";
+  return "FOUND";
 }`;
 }
 
@@ -451,33 +450,29 @@ function systemEventsGrantKind(result) {
 }
 
 /**
- * AppleScript handlers: find the compose window by subject title among
- * top-level System Events UI elements (macOS 26 `windows of process Mail`
- * is 0), then coordinate AX hit-test (`AXUIElementCopyElementAtPosition`)
- * to the `AXWebArea` "message body". Mini computer-use: deep UI-element
- * walks truncate after ~23 header/toolbar nodes and never reach the body;
- * AXFocusedUIElement role coerce fails (-1700). No mouse click. No
- * `entire contents`. Never live Mail `content of` (Mail 16 stays empty
- * after UI fill). Never `set content` / `html content` (FB11734014).
+ * AppleScript handlers: Probe 3 body delivery (Mini PASS, classic AppleScript).
  *
- * Hit must be AXWebArea "message body"; a short AXTextField is fail-closed
- * (BODY_FOCUS_FAILED). Focus + AXValue (Mini: plain Sent .emlx, cite=0).
- * Typed Returns / Cmd-V only if a readable AX value is still missing the
- * needle. Header checks stay. System Events Apple events are wrapped in
- * `with timeout`.
- *
- * Mini 2.1.3 compile: bare `value of attribute "AXTitle"` in
- * atmTopElemBits / atmTopElemExactTitle is osacompile **-2741** (those
- * handlers sit outside the System Events tell that walks top-level UI
- * elements). 2.1.4 wraps those AXTitle reads inside
- * `tell application "System Events"` (Mini solution-probe PASS).
+ * Find the compose window by exact subject title (`name of` windows, then
+ * the 2.1.4 top-level exact-title fallback when `windows` is empty). Find
+ * the body by walking `entire contents` of that window and taking the first
+ * `AXWebArea`. Focus with System Events `set focused of <AXWebArea> to true`
+ * — not `set value`, not `AXUIElementSetAttributeValue`. Re-read process
+ * `AXFocusedUIElement` and require role `AXWebArea` plus the same position
+ * and size. Mismatch is `BODY_FOCUS_UNPROVEN` (draft deleted, nothing sent).
+ * Deliver with Cmd-A and clipboard paste. No coordinate click. No Mail
+ * `content` / `html content`. AXTitle reads in the title helpers stay inside
+ * `tell application "System Events"` (2.1.4 osacompile -2741).
  */
 export function buildMailBodyPasteHandler() {
   const seSecs = asInteger(MAIL_SE_APPLEEVENT_TIMEOUT_SEC, { min: 1, max: 30, field: "seTimeout" });
-  const bodyMinH = asInteger(MAIL_BODY_MIN_AX_HEIGHT, { min: 1, max: 500, field: "bodyMinHeight" });
   const topMax = asInteger(MAIL_COMPOSE_TOP_UI_MAX, { min: 1, max: 64, field: "topUiMax" });
-  const jxaLit = asString(buildAtmAxHitTestJxa());
-  return `${buildAtmFocusedElementHandler()}
+  const tokenId = asInteger(MAIL_RECIPIENT_TOKEN_CHAR_ID, { min: 1, max: 1114111, field: "tokenCharId" });
+  return `property atmProvenBx : -1
+property atmProvenBy : -1
+property atmProvenBw : -1
+property atmProvenBh : -1
+
+${buildAtmFocusedElementHandler()}
 
 on atmAxFocusedValue()
   tell application "System Events"
@@ -524,200 +519,197 @@ on atmTopElemExactTitle(atmEl, atmMarker)
   return false
 end atmTopElemExactTitle
 
-on atmComposeFrameByTitle(atmMarker)
-  with timeout of ${seSecs} seconds
-    tell application "System Events"
-      tell process "Mail"
-        set atmElems to UI elements
-        set atmCount to count of atmElems
-        if atmCount > ${topMax} then set atmCount to ${topMax}
-        repeat with atmIdx from 1 to atmCount
-          set atmEl to item atmIdx of atmElems
-          set atmRole to ""
-          try
-            set atmRole to (role of atmEl as string)
-          end try
-          if atmRole is not "AXMenuBar" then
-            if my atmTopElemExactTitle(atmEl, atmMarker) then
-              set atmPos to position of atmEl
-              set atmSz to size of atmEl
-              return {item 1 of atmPos, item 2 of atmPos, item 1 of atmSz, item 2 of atmSz}
-            end if
-          end if
-        end repeat
-        repeat with atmIdx from 1 to atmCount
-          set atmEl to item atmIdx of atmElems
-          set atmRole to ""
-          try
-            set atmRole to (role of atmEl as string)
-          end try
-          if atmRole is not "AXMenuBar" then
-            set atmBits to my atmTopElemBits(atmEl)
-            ignoring case
-              if atmBits contains atmMarker then
-                set atmPos to position of atmEl
-                set atmSz to size of atmEl
-                return {item 1 of atmPos, item 2 of atmPos, item 1 of atmSz, item 2 of atmSz}
-              end if
-            end ignoring
-          end if
-        end repeat
-      end tell
-    end tell
-  end timeout
-  error "${BODY_FOCUS_FAILED_SENTINEL}"
-end atmComposeFrameByTitle
-
-on atmBodyHitPointList(atmFrameX, atmFrameY, atmFrameW, atmFrameH)
-  set atmMidX to (atmFrameX + (atmFrameW / 2)) as integer
-  set atmHitY1 to (atmFrameY + ((atmFrameH * 2) / 3)) as integer
-  set atmHitY2 to (atmFrameY + ((atmFrameH * 3) / 4)) as integer
-  set atmHitX2 to (atmFrameX + ((atmFrameW * 2) / 5)) as integer
-  set atmHitY3 to (atmFrameY + ((atmFrameH * 7) / 10)) as integer
-  return (atmMidX as string) & "," & (atmHitY1 as string) & ";" & (atmMidX as string) & "," & (atmHitY2 as string) & ";" & (atmHitX2 as string) & "," & (atmHitY3 as string)
-end atmBodyHitPointList
-
-on atmAxHitFill(atmPid, atmBody, atmNeedle, atmPoints)
-  set atmJxa to ${jxaLit}
-  set atmOut to ""
-  try
-    set atmOut to (run script atmJxa in "JavaScript" with parameters {atmPid, atmBody, atmNeedle, atmPoints, ${bodyMinH}}) as string
-  on error errMsg number errNum
-    if errMsg contains "assistive access" or errNum is -25211 then error "${ACCESSIBILITY_DENIED_SENTINEL}"
-    error errMsg number errNum
-  end try
-  return atmOut
-end atmAxHitFill
-
-on atmSplitParagraphs(bodyText)
-  set atmSavedDelim to AppleScript's text item delimiters
-  set AppleScript's text item delimiters to return
-  set atmCrParts to text items of bodyText
-  set AppleScript's text item delimiters to linefeed
-  set atmNorm to atmCrParts as string
-  set atmLines to text items of atmNorm
-  set AppleScript's text item delimiters to atmSavedDelim
-  return atmLines
-end atmSplitParagraphs
-
-on atmSpacesForTabs(atmLine)
-  set atmSavedDelim to AppleScript's text item delimiters
-  set AppleScript's text item delimiters to tab
-  set atmTabParts to text items of atmLine
-  set AppleScript's text item delimiters to " "
-  set atmOut to atmTabParts as string
-  set AppleScript's text item delimiters to atmSavedDelim
-  return atmOut
-end atmSpacesForTabs
-
-on atmKeystrokeText(atmText)
-  set atmSafe to my atmSpacesForTabs(atmText)
-  set atmLen to length of atmSafe
-  if atmLen is 0 then return
-  set atmPos to 1
+on atmFocusedIsProvenBody()
+  set atmWantBx to my atmProvenBx
+  set atmWantBy to my atmProvenBy
+  set atmWantBw to my atmProvenBw
+  set atmWantBh to my atmProvenBh
+  if atmWantBw is -1 or atmWantBh is -1 then return false
   tell application "System Events"
     tell process "Mail"
-      repeat while atmPos is less than or equal to atmLen
-        set atmEndPos to atmPos + 31
-        if atmEndPos > atmLen then set atmEndPos to atmLen
-        keystroke (text atmPos thru atmEndPos of atmSafe)
-        set atmPos to atmEndPos + 1
-      end repeat
+      set atmFocusedElem to missing value
+      try
+        set atmFocusedElem to value of attribute "AXFocusedUIElement"
+      end try
+      if atmFocusedElem is missing value then return false
+      set atmFocRole to ""
+      set atmFx to -1
+      set atmFy to -1
+      set atmFw to -1
+      set atmFh to -1
+      try
+        set atmFocRole to (role of atmFocusedElem as string)
+        set atmFocPos to position of atmFocusedElem
+        set atmFocSz to size of atmFocusedElem
+        set atmFx to item 1 of atmFocPos
+        set atmFy to item 2 of atmFocPos
+        set atmFw to item 1 of atmFocSz
+        set atmFh to item 2 of atmFocSz
+      end try
+      if atmFocRole is not "AXWebArea" then return false
+      if atmFx is not atmWantBx then return false
+      if atmFy is not atmWantBy then return false
+      if atmFw is not atmWantBw then return false
+      if atmFh is not atmWantBh then return false
+      return true
     end tell
   end tell
-end atmKeystrokeText
-
-on atmTypeMailBody(bodyText)
-  set atmLines to my atmSplitParagraphs(bodyText)
-  set atmLast to count of atmLines
-  if atmLast is 0 then return
-  with timeout of ${seSecs} seconds
-    repeat with atmI from 1 to atmLast
-      set atmLine to item atmI of atmLines as string
-      my atmKeystrokeText(atmLine)
-      if atmI < atmLast then
-        tell application "System Events"
-          tell process "Mail"
-            key code 36
-          end tell
-        end tell
-      end if
-    end repeat
-  end timeout
-end atmTypeMailBody
-
-on atmPasteMailBodyFallback(bodyText)
-  set savedClip to ""
-  set hadClip to false
-  try
-    set savedClip to the clipboard as text
-    set hadClip to true
-  end try
-  set the clipboard to bodyText
-  try
-    with timeout of ${seSecs} seconds
-      tell application "System Events"
-        tell process "Mail"
-          keystroke "v" using command down
-        end tell
-      end tell
-    end timeout
-    delay 0.15
-  on error errMsg number errNum
-    if hadClip then set the clipboard to savedClip
-    if errMsg contains "assistive access" or errNum is -25211 then error "${ACCESSIBILITY_DENIED_SENTINEL}"
-    error errMsg number errNum
-  end try
-  if hadClip then set the clipboard to savedClip
-end atmPasteMailBodyFallback
+  return false
+end atmFocusedIsProvenBody
+
+on atmAxValueIsRecipientToken(atmVal)
+  if atmVal is "" then return false
+  set atmTok to character id ${tokenId}
+  if atmVal does not contain atmTok then return false
+  set atmSaved to AppleScript's text item delimiters
+  set AppleScript's text item delimiters to atmTok
+  set atmParts to text items of atmVal
+  set AppleScript's text item delimiters to ""
+  set atmRest to atmParts as string
+  set AppleScript's text item delimiters to " "
+  set atmSpaceParts to text items of atmRest
+  set AppleScript's text item delimiters to ""
+  set atmRest to atmSpaceParts as string
+  set AppleScript's text item delimiters to return
+  set atmLineParts to text items of atmRest
+  set AppleScript's text item delimiters to ""
+  set atmRest to atmLineParts as string
+  set AppleScript's text item delimiters to linefeed
+  set atmLfParts to text items of atmRest
+  set AppleScript's text item delimiters to ""
+  set atmRest to atmLfParts as string
+  set AppleScript's text item delimiters to tab
+  set atmTabParts to text items of atmRest
+  set AppleScript's text item delimiters to ""
+  set atmRest to atmTabParts as string
+  set AppleScript's text item delimiters to atmSaved
+  if atmRest is "" then return true
+  return false
+end atmAxValueIsRecipientToken
 
 on atmFillMailBody(bodyText, needle, titleMarker, msg)
   try
     tell application "Mail" to activate
     delay 0.25
-    with timeout of ${seSecs} seconds
-      tell application "System Events"
-        tell process "Mail" to set frontmost to true
-      end tell
-    end timeout
-    delay 0.08
-    set atmPid to 0
+    set atmSaveBx to -1
+    set atmSaveBy to -1
+    set atmSaveBw to -1
+    set atmSaveBh to -1
     with timeout of ${seSecs} seconds
       tell application "System Events"
         tell process "Mail"
-          set atmPid to unix id
+          set frontmost to true
+          delay 0.3
+          set atmWin to missing value
+          repeat with atmCand in windows
+            try
+              if (name of atmCand as string) is titleMarker then
+                set atmWin to atmCand
+                exit repeat
+              end if
+            end try
+          end repeat
+          if atmWin is missing value then
+            set atmElems to UI elements
+            set atmCount to count of atmElems
+            if atmCount > ${topMax} then set atmCount to ${topMax}
+            repeat with atmIdx from 1 to atmCount
+              set atmEl to item atmIdx of atmElems
+              set atmRole to ""
+              try
+                set atmRole to (role of atmEl as string)
+              end try
+              if atmRole is not "AXMenuBar" then
+                if my atmTopElemExactTitle(atmEl, titleMarker) then
+                  set atmWin to atmEl
+                  exit repeat
+                end if
+              end if
+            end repeat
+          end if
+          if atmWin is missing value then error "${BODY_FOCUS_FAILED_SENTINEL}"
+          try
+            perform action "AXRaise" of atmWin
+          end try
+          delay 0.3
+          set atmBody to missing value
+          set atmAll to {}
+          try
+            set atmAll to entire contents of atmWin
+          end try
+          repeat with atmEl in atmAll
+            try
+              if (role of atmEl as string) is "AXWebArea" then
+                set atmBody to atmEl
+                exit repeat
+              end if
+            end try
+          end repeat
+          if atmBody is missing value then error "${BODY_FOCUS_FAILED_SENTINEL}"
+          set atmBodyPos to position of atmBody
+          set atmBodySz to size of atmBody
+          set atmBx to item 1 of atmBodyPos
+          set atmBy to item 2 of atmBodyPos
+          set atmBw to item 1 of atmBodySz
+          set atmBh to item 2 of atmBodySz
+          try
+            set focused of atmBody to true
+          end try
+          delay 0.3
+          set atmFocusedElem to missing value
+          try
+            set atmFocusedElem to value of attribute "AXFocusedUIElement"
+          end try
+          if atmFocusedElem is missing value then error "${BODY_FOCUS_UNPROVEN_SENTINEL}"
+          set atmFocRole to ""
+          set atmFx to -1
+          set atmFy to -1
+          set atmFw to -1
+          set atmFh to -1
+          try
+            set atmFocRole to (role of atmFocusedElem as string)
+            set atmFocPos to position of atmFocusedElem
+            set atmFocSz to size of atmFocusedElem
+            set atmFx to item 1 of atmFocPos
+            set atmFy to item 2 of atmFocPos
+            set atmFw to item 1 of atmFocSz
+            set atmFh to item 2 of atmFocSz
+          end try
+          if atmFocRole is not "AXWebArea" then error "${BODY_FOCUS_UNPROVEN_SENTINEL}"
+          if atmFx is not atmBx then error "${BODY_FOCUS_UNPROVEN_SENTINEL}"
+          if atmFy is not atmBy then error "${BODY_FOCUS_UNPROVEN_SENTINEL}"
+          if atmFw is not atmBw then error "${BODY_FOCUS_UNPROVEN_SENTINEL}"
+          if atmFh is not atmBh then error "${BODY_FOCUS_UNPROVEN_SENTINEL}"
+          set atmSaveBx to atmBx
+          set atmSaveBy to atmBy
+          set atmSaveBw to atmBw
+          set atmSaveBh to atmBh
+          set savedClip to ""
+          set hadClip to false
+          try
+            set savedClip to the clipboard as text
+            set hadClip to true
+          end try
+          try
+            keystroke "a" using command down
+            delay 0.2
+            set the clipboard to bodyText
+            delay 0.2
+            keystroke "v" using command down
+            delay 0.6
+          on error errMsg number errNum
+            if hadClip then set the clipboard to savedClip
+            if errMsg contains "assistive access" or errNum is -25211 then error "${ACCESSIBILITY_DENIED_SENTINEL}"
+            error errMsg number errNum
+          end try
+          if hadClip then set the clipboard to savedClip
         end tell
       end tell
     end timeout
-    if atmPid is 0 then error "${BODY_FOCUS_FAILED_SENTINEL}"
-    set atmFrame to my atmComposeFrameByTitle(titleMarker)
-    set atmFrameX to item 1 of atmFrame
-    set atmFrameY to item 2 of atmFrame
-    set atmFrameW to item 3 of atmFrame
-    set atmFrameH to item 4 of atmFrame
-    if atmFrameW < 40 or atmFrameH < ${bodyMinH} then error "${BODY_FOCUS_FAILED_SENTINEL}"
-    set atmPoints to my atmBodyHitPointList(atmFrameX, atmFrameY, atmFrameW, atmFrameH)
-    set atmHit to my atmAxHitFill(atmPid, bodyText, needle, atmPoints)
-    if atmHit is "${BODY_FOCUS_FAILED_SENTINEL}" then error "${BODY_FOCUS_FAILED_SENTINEL}"
-    if atmHit is "VALUE_MISS" then
-      with timeout of ${seSecs} seconds
-        tell application "System Events"
-          tell process "Mail"
-            keystroke "a" using command down
-          end tell
-        end tell
-      end timeout
-      atmTypeMailBody(bodyText)
-      delay 0.12
-      if needle is not "" then
-        set atmAxVal to my atmAxFocusedValue()
-        if atmAxVal is not "" then
-          if atmAxVal does not contain needle then
-            atmPasteMailBodyFallback(bodyText)
-          end if
-        end if
-      end if
-    end if
+    set my atmProvenBx to atmSaveBx
+    set my atmProvenBy to atmSaveBy
+    set my atmProvenBw to atmSaveBw
+    set my atmProvenBh to atmSaveBh
   on error errMsg number errNum
     if errMsg contains "assistive access" or errNum is -25211 then error "${ACCESSIBILITY_DENIED_SENTINEL}"
     if errMsg contains "${GUI_SCRIPTING_UNAVAILABLE_SENTINEL}" then error "${GUI_SCRIPTING_UNAVAILABLE_SENTINEL}"
@@ -726,6 +718,7 @@ on atmFillMailBody(bodyText, needle, titleMarker, msg)
 end atmFillMailBody`;
 }
 
+
 export const buildMailBodyFillHandler = buildMailBodyPasteHandler;
 
 function composeMisdirectChecks({ to, cc = [], bcc = [], subject, body }) {
@@ -745,9 +738,13 @@ function composeMisdirectChecks({ to, cc = [], bcc = [], subject, body }) {
     })
     .join("\n");
   const bodyCheck = needle
-    ? `    set atmAxVal to my atmAxFocusedValue()
-    if atmAxVal is not "" then
-      if atmAxVal does not contain ${asString(needle)} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"
+    ? `    if my atmFocusedIsProvenBody() then
+      set atmAxVal to my atmAxFocusedValue()
+      if atmAxVal is not "" then
+        if my atmAxValueIsRecipientToken(atmAxVal) is false then
+          if atmAxVal does not contain ${asString(needle)} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"
+        end if
+      end if
     end if`
     : "";
   return `    if (count of to recipients of newMessage) is not ${toCount} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"
@@ -768,13 +765,16 @@ ${bodyCheck}`;
  * Do not set AppleScript `content` or `html content`: Ventura+ FB11734014
  * cite-wraps those setters (`>` prefixes + `<blockquote type="cite">`).
  * Recipients and subject are AppleScript properties (never paste). The body
- * is filled via title-marker compose window + coordinate AX hit-test to the
- * AXWebArea "message body" (AXFocused + AXValue; Mini-proven plain Sent).
- * Do not walk `windows of process Mail`. Do not deep-walk UI elements.
- * Do not use Mail `content of` as the oracle that text landed (Mail 16 /
- * macOS 26: that property stays empty). If the body element is not found or
- * is a short AXTextField, or headers change, abort + delete (nothing sent).
- * Ship prove that the body landed is Sent `.emlx` after send.
+ * is filled by Probe 3: exact subject title, first AXWebArea under that
+ * window (`entire contents`), `set focused of` that element, prove focus
+ * (role + position + size) via a fresh AXFocusedUIElement read, then Cmd-A
+ * and clipboard paste. No coordinate click. No AXValue write. No Mail
+ * `content of` oracle (Mail 16 / macOS 26 stays empty). Missing window or
+ * body is BODY_FOCUS_FAILED; a focus-proof mismatch is BODY_FOCUS_UNPROVEN.
+ * Either deletes the draft and sends nothing. Header checks stay. The body
+ * needle runs only when the focused element is still that proven body, so a
+ * To: U+FFFC chip is not BODY_PASTE_MISDIRECTED. Ship prove that the body
+ * landed is Sent `.emlx` after send.
  */
 export function buildComposeScript({ to, cc, bcc, subject, body, send, html = false }) {
   const recipients = [
@@ -1199,6 +1199,11 @@ export function isMailBodyFocusFailed(result) {
   return String(result.error || "").toLowerCase().includes("body_focus_failed");
 }
 
+export function isMailBodyFocusUnproven(result) {
+  if (!result) return false;
+  return String(result.error || "").toLowerCase().includes("body_focus_unproven");
+}
+
 export function isMailBodyPasteMisdirected(result) {
   if (!result) return false;
   const text = String(result.error || "").toLowerCase();
@@ -1210,6 +1215,9 @@ function failure(action, summary, result, secrets) {
   if (err.includes("gui_scripting_unavailable")) {
     return `${action} failed — attempted to ${summary}. ${MAIL_GUI_SCRIPTING_GUIDANCE}`;
   }
+  if (err.includes("body_focus_unproven")) {
+    return `${action} failed — attempted to ${summary}. Keyboard focus was not on the message body (focus proof failed); the draft was discarded and nothing was sent.`;
+  }
   if (err.includes("body_focus_failed")) {
     return `${action} failed — attempted to ${summary}. The compose caret could not be moved into the message body; nothing was sent.`;
   }

package/lib/writeTools.js

@@ -57,7 +57,7 @@ export const WRITE_TOOL_DEFINITIONS = [
         bcc: { type: "array", items: { type: "string" }, description: "BCC email addresses" },
         subject: { type: "string", description: "Subject line (required)" },
         body: { type: "string", description: "Message body (required)" },
-        body_format: { type: "string", enum: ["plain", "html"], description: "Plain text (default) or HTML. HTML is tag-stripped; the body is typed into Mail's compose window (System Events keystrokes). AppleScript content/html content is not set because it quote-wraps the Sent body" },
+        body_format: { type: "string", enum: ["plain", "html"], description: "Plain text (default) or HTML. HTML is tag-stripped; the body is pasted into Mail's compose window (System Events focus on the message body, then Cmd-A and clipboard paste). AppleScript content/html content is not set because it quote-wraps the Sent body" },
         ...CONFIRM_PROPS
       },
       required: ["to", "subject", "body"]
@@ -74,7 +74,7 @@ export const WRITE_TOOL_DEFINITIONS = [
         bcc: { type: "array", items: { type: "string" }, description: "BCC email addresses" },
         subject: { type: "string", description: "Subject line" },
         body: { type: "string", description: "Message body" },
-        body_format: { type: "string", enum: ["plain", "html"], description: "Plain text (default) or HTML. HTML is tag-stripped; the body is typed into Mail's compose window (System Events keystrokes). AppleScript content/html content is not set because it quote-wraps the Sent body" },
+        body_format: { type: "string", enum: ["plain", "html"], description: "Plain text (default) or HTML. HTML is tag-stripped; the body is pasted into Mail's compose window (System Events focus on the message body, then Cmd-A and clipboard paste). AppleScript content/html content is not set because it quote-wraps the Sent body" },
         ...CONFIRM_PROPS
       },
       required: ["to"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-tools-mcp",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "MCP server for semantic search and write actions across Apple Mail, Messages, Calendar, and Contacts",
   "type": "module",
   "main": "index.js",