apple-tools-mcp 2.0.7 → 2.0.8

package/README.md

@@ -466,11 +466,13 @@ Two arguments are available on **every** write tool:
 
 **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 (System Events). 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.
 
-Paste uses System Events, so **node needs Accessibility** (Privacy & Security → Accessibility) in addition to Automation → Mail. That Accessibility deny is not a Mail Automation deny (`-1743` / `-10004`). Body focus uses `text area` / `scroll area` and `UI element whose role is "AXWebArea"` — never the System Events class `web area`, which does not compile on macOS 26.x (**-2741**, “Expected class name but found identifier”).
+Paste uses System Events, so **node needs Accessibility** (Privacy & Security → Accessibility) in addition to Automation → Mail. That Accessibility deny is not a Mail Automation deny (`-1743` / `-10004`). Body focus uses `text area` / `scroll area` / `text field` and `UI element whose role is "AXWebArea"` — never the System Events class `web area`, which does not compile on macOS 26.x (**-2741**, “Expected class name but found identifier”).
+
+**Compose body focus (2.0.8).** After `make new outgoing message`, To and Subject are AppleScript properties (never paste). Cmd-V runs only after the caret leaves the header: a tall `AXWebArea` (HTML compose body), a tall `text area` (plain compose; short To/Subject fields are skipped), Subject then Tab, or a click in the lower two-thirds of the compose window. If focus is still a header field, the tool raises `BODY_FOCUS_FAILED` and does **not** paste. After paste it checks To/Cc/Bcc counts, the exact subject, and that the native body contains the intended text. A mismatch is `BODY_PASTE_MISDIRECTED`: the outgoing message is deleted and nothing is sent. Quote-prefix Sent prove and Sent/Outbox verify stay gated on this paste-focus contract — a MacBook 2.0.7 live `mail_send` with Accessibility allowed still hit `BODY_PASTE_MISDIRECTED` when Cmd-V landed in To/Subject (`ATP-207-SENT-PROVE-20260921-084048`).
 
 **mail_send success is Sent/Outbox verify (2.0.7).** AppleScript `send` returning without throw is not enough. After a real send the tool looks in **Sent** and **Outbox** and reports success only if the message is there. The success text names the delivery state (`mailbox: sent` + `delivery: sent`, or `mailbox: outbox` + `delivery: outbox` while still sending). If verify misses, the tool returns a failure (`isError`) — not success. Hang/timeout recover matches **To + subject** (and Message-ID when compose captured one). It never matches subject alone (short subjects like `test` are unsafe). `from` / account selection is out of scope; Mail's default From is used.
 
-**Manual prove (2.0.6 on the Mac host):** `mail_send` a short 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. Inspect each Sent `.emlx`: the text/plain part 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`, no **-2741** on body focus). That quote-prefix dual-host Sent prove is a separate bar from the 2.0.7 verify contract.
+**Manual prove (2.0.8 on the Mac host):** `mail_send` a short 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 caret must land in the **body** (not To/Subject): no `BODY_FOCUS_FAILED` / `BODY_PASTE_MISDIRECTED`, and the intended text must be in the native body before send. Inspect each Sent `.emlx`: the text/plain part 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`, no **-2741** on body focus). That quote-prefix dual-host 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

@@ -155,6 +155,9 @@ 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";
+/** Compose body AX height vs To/Subject/Cc fields (those are ~22px). */
+export const MAIL_BODY_MIN_AX_HEIGHT = 50;
 
 /**
  * Body text for native Mail compose (clipboard paste, not AppleScript content).
@@ -172,51 +175,117 @@ export function composeNativeBody(body, { html = false } = {}) {
 }
 
 /**
- * AppleScript handlers: focus the compose body (not To) and paste.
+ * Distinctive first line used to prove the native editor received the body.
+ * Full multiline `contains` can miss when Mail stores an HTML alternative.
+ */
+export function composeBodyNeedle(body) {
+  const text = body === undefined || body === null ? "" : String(body);
+  const line = text.split(/\r?\n/).find((candidate) => candidate.trim()) || text;
+  const needle = line.trim();
+  return needle.length > 120 ? needle.slice(0, 120) : needle;
+}
+
+const BODY_MIN_H = asInteger(MAIL_BODY_MIN_AX_HEIGHT, { min: 1, max: 500, field: "bodyMinHeight" });
+
+/**
+ * AppleScript handlers: focus the compose body (not To/Subject) and paste.
  * System Events needs Accessibility; Mail make/send still needs Automation.
  *
  * macOS 26.x System Events has no `web area` class (compile -2741,
  * "Expected class name but found identifier"). Hosts compile
- * `text area` / `scroll area` and `UI element whose role is "AXWebArea"`.
+ * `text area` / `scroll area` / `text field` and `UI element whose role is
+ * "AXWebArea"`. Never focus the first AXTextArea blindly — on MacBook Mail
+ * that is a header field, and Cmd-V becomes BODY_PASTE_MISDIRECTED.
+ *
+ * Strategies, each fail-closed unless the caret left the header:
+ *   1. Click a tall AXWebArea (HTML compose body)
+ *   2. Focus a tall `text area` (plain compose body), never a short header
+ *   3. Click Subject then Tab into the body (stable Mini/MacBook order)
+ *   4. Click the lower two-thirds of the compose window
  */
 export function buildMailBodyPasteHandler() {
-  return `on atmFocusMailBody()
+  return `on atmSafeToPaste()
   tell application "System Events"
     tell process "Mail"
-      set frontmost to true
-      if (count of windows) < 1 then error "MAIL_COMPOSE_WINDOW_MISSING"
-      set w to first window
       try
-        set focused of text area 1 of scroll area 1 of w to true
-        return
-      end try
-      try
-        set focused of text area 1 of w to true
-        return
+        set fe to focused UI element
+        set r to (role of fe) as string
+        if r is "AXTextField" then return false
+        if r is "AXComboBox" then return false
+        if r is "AXButton" then return false
+        if r is "AXMenuButton" then return false
+        if r is "AXPopUpButton" then return false
+        set eh to 0
+        try
+          set {ew, eh} to size of fe
+        end try
+        if r is "AXTextArea" and eh < ${BODY_MIN_H} then return false
+        ignoring case
+          set bits to ""
+          try
+            set bits to bits & (description of fe as string) & " "
+          end try
+          try
+            set bits to bits & (name of fe as string) & " "
+          end try
+          if bits contains "To:" then return false
+          if bits contains "Cc:" then return false
+          if bits contains "Bcc:" then return false
+          if bits contains "Subject" then return false
+        end ignoring
+        if r is "AXWebArea" then return true
+        if r is "AXTextArea" then return true
+        if eh >= ${BODY_MIN_H} then return true
       end try
+      return false
+    end tell
+  end tell
+end atmSafeToPaste
+
+on atmFocusMailBody(expectedSubject)
+  tell application "System Events"
+    tell process "Mail"
+      set frontmost to true
+      if (count of windows) < 1 then error "MAIL_COMPOSE_WINDOW_MISSING"
+      set w to window 1
+      if expectedSubject is not "" then
+        repeat with i from 1 to (count of windows)
+          try
+            if (name of window i as string) is expectedSubject then
+              set w to window i
+              exit repeat
+            end if
+          end try
+        end repeat
+      end if
       try
-        set focused of (first UI element of w whose role is "AXTextArea") to true
-        return
+        perform action "AXRaise" of w
       end try
       try
         click (first UI element of w whose role is "AXWebArea")
-        return
+        delay 0.08
+        if my atmSafeToPaste() then return
       end try
       try
         click (first UI element of scroll area 1 of w whose role is "AXWebArea")
-        return
+        delay 0.08
+        if my atmSafeToPaste() then return
       end try
       try
         click (first UI element of scroll area 1 of splitter group 1 of w whose role is "AXWebArea")
-        return
+        delay 0.08
+        if my atmSafeToPaste() then return
       end try
       try
         click (first UI element of scroll area 1 of group 1 of splitter group 1 of w whose role is "AXWebArea")
-        return
+        delay 0.08
+        if my atmSafeToPaste() then return
       end try
+      set atmTallText to missing value
+      set atmSubjectElem to missing value
       set atmQueue to UI elements of w
       set atmWalked to 0
-      repeat while (count of atmQueue) > 0 and atmWalked < 80
+      repeat while (count of atmQueue) > 0 and atmWalked < 120
         set atmWalked to atmWalked + 1
         set atmElem to item 1 of atmQueue
         if (count of atmQueue) is 1 then
@@ -226,14 +295,33 @@ export function buildMailBodyPasteHandler() {
         end if
         try
           if (role of atmElem as string) is "AXWebArea" then
-            click atmElem
-            return
+            set {ew, eh} to size of atmElem
+            if eh >= ${BODY_MIN_H} then
+              click atmElem
+              delay 0.08
+              if my atmSafeToPaste() then return
+            end if
           end if
         end try
         try
           if (role of atmElem as string) is "AXTextArea" then
-            set focused of atmElem to true
-            return
+            set {tw, th} to size of atmElem
+            if th >= ${BODY_MIN_H} and atmTallText is missing value then set atmTallText to atmElem
+          end if
+        end try
+        try
+          set r to (role of atmElem as string)
+          if r is "AXTextField" or r is "AXTextArea" then
+            set bits to ""
+            try
+              set bits to bits & (description of atmElem as string)
+            end try
+            try
+              set bits to bits & (name of atmElem as string)
+            end try
+            ignoring case
+              if bits contains "Subject" and atmSubjectElem is missing value then set atmSubjectElem to atmElem
+            end ignoring
           end if
         end try
         try
@@ -243,14 +331,52 @@ export function buildMailBodyPasteHandler() {
           end repeat
         end try
       end repeat
+      try
+        set ta to text area 1 of scroll area 1 of w
+        set {tw, th} to size of ta
+        if th >= ${BODY_MIN_H} then
+          set focused of ta to true
+          delay 0.08
+          if my atmSafeToPaste() then return
+        end if
+      end try
+      if atmTallText is not missing value then
+        try
+          set focused of atmTallText to true
+        end try
+        try
+          click atmTallText
+        end try
+        delay 0.08
+        if my atmSafeToPaste() then return
+      end if
+      try
+        click (first text field of w whose description contains "Subject")
+        delay 0.08
+        key code 48
+        delay 0.08
+        if my atmSafeToPaste() then return
+      end try
+      if atmSubjectElem is not missing value then
+        try
+          click atmSubjectElem
+          delay 0.08
+          key code 48
+          delay 0.08
+          if my atmSafeToPaste() then return
+        end try
+      end if
       set {wx, wy} to position of w
       set {ww, wh} to size of w
       click at {(wx + (ww div 2)) as integer, (wy + ((wh * 2) div 3)) as integer}
+      delay 0.08
+      if my atmSafeToPaste() then return
+      error "${BODY_FOCUS_FAILED_SENTINEL}"
     end tell
   end tell
 end atmFocusMailBody
 
-on atmPasteMailBody(bodyText)
+on atmPasteMailBody(bodyText, expectedSubject)
   set savedClip to ""
   set hadClip to false
   try
@@ -259,15 +385,16 @@ on atmPasteMailBody(bodyText)
   end try
   set the clipboard to bodyText
   tell application "Mail" to activate
-  delay 0.25
+  delay 0.4
   try
-    atmFocusMailBody()
+    atmFocusMailBody(expectedSubject)
+    if atmSafeToPaste() is false then error "${BODY_FOCUS_FAILED_SENTINEL}"
     tell application "System Events"
       tell process "Mail"
         keystroke "v" using command down
       end tell
     end tell
-    delay 0.15
+    delay 0.2
   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}"
@@ -277,8 +404,11 @@ on atmPasteMailBody(bodyText)
 end atmPasteMailBody`;
 }
 
-function recipientStillPresentChecks(to) {
+function composeMisdirectChecks({ to, cc = [], bcc = [], subject, body }) {
   const toCount = asInteger(to.length, { min: 1, max: 99, field: "toCount" });
+  const ccCount = asInteger(cc.length, { min: 0, max: 99, field: "ccCount" });
+  const bccCount = asInteger(bcc.length, { min: 0, max: 99, field: "bccCount" });
+  const needle = composeBodyNeedle(body);
   const stillThere = to
     .map((address, i) => {
       const n = asInteger(i, { min: 0, max: 99, field: "recipientIndex" });
@@ -290,8 +420,38 @@ function recipientStillPresentChecks(to) {
     if atmFound${n} is false then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"`;
     })
     .join("\n");
+  const bodyCheck = needle
+    ? `    set atmGotBody to ""
+    try
+      set atmGotBody to content of newMessage as string
+    end try
+    if atmGotBody is "" then
+      try
+        save newMessage
+      end try
+      delay 0.2
+      try
+        set atmGotBody to content of newMessage as string
+      end try
+    end if
+    if atmGotBody does not contain ${asString(needle)} then
+      try
+        tell application "System Events"
+          tell process "Mail"
+            set atmAxVal to value of focused UI element as string
+            if atmAxVal contains ${asString(needle)} then set atmGotBody to atmAxVal
+          end tell
+        end tell
+      end try
+    end if
+    if atmGotBody does not contain ${asString(needle)} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"`
+    : "";
   return `    if (count of to recipients of newMessage) is not ${toCount} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"
-${stillThere}`;
+    if (count of cc recipients of newMessage) is not ${ccCount} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"
+    if (count of bcc recipients of newMessage) is not ${bccCount} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"
+${stillThere}
+    if (subject of newMessage as string) is not ${asString(subject)} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"
+${bodyCheck}`;
 }
 
 /**
@@ -303,9 +463,10 @@ ${stillThere}`;
  *
  * Do not set AppleScript `content` or `html content`: Ventura+ FB11734014
  * cite-wraps those setters (`>` prefixes + `<blockquote type="cite">`).
- * Recipients are AppleScript `make new … recipient`. The body is pasted
- * into the compose window (native editor) via System Events. If paste
- * lands in To, recipient count changes and we abort + delete (nothing sent).
+ * Recipients and subject are AppleScript properties (never paste). The body
+ * is pasted into the compose window (native editor) via System Events only
+ * after caret focus leaves the header. If paste lands in To/Subject, or the
+ * body never receives the intended text, abort + delete (nothing sent).
  */
 export function buildComposeScript({ to, cc, bcc, subject, body, send, html = false }) {
   const recipients = [
@@ -316,9 +477,9 @@ export function buildComposeScript({ to, cc, bcc, subject, body, send, html = fa
 
   const plainBody = composeNativeBody(body, { html });
   const pasteAndVerify = plainBody
-    ? `  atmPasteMailBody(${asString(plainBody)})
+    ? `  atmPasteMailBody(${asString(plainBody)}, ${asString(subject)})
   tell application "Mail"
-${recipientStillPresentChecks(to)}
+${composeMisdirectChecks({ to, cc, bcc, subject, body: plainBody })}
   end tell`
     : "";
 
@@ -710,8 +871,22 @@ export function isMailAccessibilityDenial(result) {
   return text.includes("accessibility_denied") || text.includes("assistive access");
 }
 
+export function isMailBodyFocusFailed(result) {
+  if (!result) return false;
+  return String(result.error || "").toLowerCase().includes("body_focus_failed");
+}
+
+export function isMailBodyPasteMisdirected(result) {
+  if (!result) return false;
+  const text = String(result.error || "").toLowerCase();
+  return text.includes("body_paste_misdirected") || text.includes("body_focus_failed");
+}
+
 function failure(action, summary, result, secrets) {
   const err = String((result && result.error) || "").toLowerCase();
+  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.`;
+  }
   if (err.includes("body_paste_misdirected")) {
     return `${action} failed — attempted to ${summary}. The body was pasted into a header field instead of the message body; nothing was sent.`;
   }

package/package.json

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