apple-tools-mcp 2.0.8 → 2.0.10

package/README.md

@@ -466,13 +466,17 @@ 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` / `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”).
+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”). The pre-paste focus read uses `first UI element whose focused is true` and `value of attribute "AXFocusedUIElement"` — never the compound `focused UI element`, which does not compile on System Events 26.x (**-2741** on MacBook 26.1, **-2740** on Mini 26.6.2).
 
 **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`).
 
+**macOS 26 focus compile (2.0.9).** Dual-host Sent prove on `@2.0.8` never reached paste: `atmSafeToPaste` used bare `focused UI element`, which System Events 26.x rejects at compile. The 2.0.8 fail-closed gates stay; only the focus *query* changed to the forms hosts compiled.
+
+**AppleScript reserved identifiers (2.0.10).** Dual-host Sent prove on `@2.0.9` compiled past the focused-UI fix, then failed in `atmFocusMailBody`: `set {tw, th} to size of atmElem` → **-2741** Expected expression but found `th` (AppleScript reserved ordinal). Size/position lists now use `atmW`/`atmH` (hosts confirmed) and other `atm*` names — never `th`/`tw`/`st`/`nd`/`rd`/`to`/`by`/`id` in destructuring. 2.0.8/2.0.9 fail-closed paste-focus and 2.0.9 AXFocusedUIElement / `whose focused is true` are unchanged.
+
 **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.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.
+**Manual prove (2.0.10 on the Mac host):** AppleScript for paste-focus **compiles** (no `-2741` on `th`; no `-2741`/`-2740` on `focused UI element`). Then `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** / **-2740** 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

@@ -159,6 +159,52 @@ 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;
 
+/**
+ * AppleScript ordinal/keyword tokens that fail compile in `set {a, b}`
+ * lists on macOS 26.x (MacBook 26.1 + Mini 26.6.2: `th` → -2741).
+ * Paste-focus handlers must not destructure into these names.
+ */
+export const ATM_APPLESCRIPT_RESERVED_SHORTS = Object.freeze([
+  "th",
+  "st",
+  "nd",
+  "rd",
+  "to",
+  "by",
+  "id"
+]);
+
+/**
+ * macOS 26.x System Events rejects the compound `focused UI element`
+ * (MacBook 26.1 compile -2741; Mini 26.6.2 compile -2740). Hosts compile
+ * these instead — same class of dictionary break as bare `web area`.
+ */
+export const ATM_FOCUSED_WHOSE_QUERY = "first UI element whose focused is true";
+export const ATM_FOCUSED_AX_QUERY = 'value of attribute "AXFocusedUIElement"';
+
+/**
+ * Resolve the focused System Events element without `focused UI element`.
+ * AXFocusedUIElement is tried first (nested caret); `whose focused is true`
+ * is the compile-proven fallback. A process-level whose match can be the
+ * key window — callers must still reject header roles / AXWindow.
+ */
+export function buildAtmFocusedElementHandler() {
+  return `on atmFocusedElement()
+  tell application "System Events"
+    tell process "Mail"
+      try
+        set fe to ${ATM_FOCUSED_AX_QUERY}
+        if fe is not missing value then return fe
+      end try
+      try
+        return ${ATM_FOCUSED_WHOSE_QUERY}
+      end try
+    end tell
+  end tell
+  return missing value
+end atmFocusedElement`;
+}
+
 /**
  * Body text for native Mail compose (clipboard paste, not AppleScript content).
  *
@@ -192,10 +238,21 @@ const BODY_MIN_H = asInteger(MAIL_BODY_MIN_AX_HEIGHT, { min: 1, max: 500, field:
  * 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` / `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.
+ * "Expected class name but found identifier") and no compound
+ * `focused UI element` (compile -2741 / -2740). Hosts compile
+ * `text area` / `scroll area` / `text field`, `UI element whose role is
+ * "AXWebArea"`, `first UI element whose focused is true`, and
+ * `value of attribute "AXFocusedUIElement"`. Never focus the first
+ * AXTextArea blindly — on MacBook Mail that is a header field, and
+ * Cmd-V becomes BODY_PASTE_MISDIRECTED.
+ *
+ * AppleScript treats ordinal suffixes as reserved tokens (`th` as in 4th,
+ * also `st`/`nd`/`rd`). Dual-host Sent prove on 2.0.9 compiled past the
+ * focused-UI fix, then failed in `atmFocusMailBody`:
+ * `set {tw, th} to size of atmElem` → -2741 Expected expression but found
+ * `th`. Size/position lists use `atmW`/`atmH` (hosts confirmed) and other
+ * `atm*` names — never `th`/`tw`/`st`/`nd`/`rd`/`to`/`by`/`id` in
+ * destructuring.
  *
  * Strategies, each fail-closed unless the caret left the header:
  *   1. Click a tall AXWebArea (HTML compose body)
@@ -204,22 +261,26 @@ const BODY_MIN_H = asInteger(MAIL_BODY_MIN_AX_HEIGHT, { min: 1, max: 500, field:
  *   4. Click the lower two-thirds of the compose window
  */
 export function buildMailBodyPasteHandler() {
-  return `on atmSafeToPaste()
+  return `${buildAtmFocusedElementHandler()}
+
+on atmSafeToPaste()
   tell application "System Events"
     tell process "Mail"
       try
-        set fe to focused UI element
+        set fe to my atmFocusedElement()
+        if fe is missing value then return false
         set r to (role of fe) as string
+        if r is "AXWindow" then return false
         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
+        set atmH to 0
         try
-          set {ew, eh} to size of fe
+          set {atmW, atmH} to size of fe
         end try
-        if r is "AXTextArea" and eh < ${BODY_MIN_H} then return false
+        if r is "AXTextArea" and atmH < ${BODY_MIN_H} then return false
         ignoring case
           set bits to ""
           try
@@ -235,7 +296,7 @@ export function buildMailBodyPasteHandler() {
         end ignoring
         if r is "AXWebArea" then return true
         if r is "AXTextArea" then return true
-        if eh >= ${BODY_MIN_H} then return true
+        if atmH >= ${BODY_MIN_H} then return true
       end try
       return false
     end tell
@@ -295,8 +356,8 @@ on atmFocusMailBody(expectedSubject)
         end if
         try
           if (role of atmElem as string) is "AXWebArea" then
-            set {ew, eh} to size of atmElem
-            if eh >= ${BODY_MIN_H} then
+            set {atmW, atmH} to size of atmElem
+            if atmH >= ${BODY_MIN_H} then
               click atmElem
               delay 0.08
               if my atmSafeToPaste() then return
@@ -305,8 +366,8 @@ on atmFocusMailBody(expectedSubject)
         end try
         try
           if (role of atmElem as string) is "AXTextArea" then
-            set {tw, th} to size of atmElem
-            if th >= ${BODY_MIN_H} and atmTallText is missing value then set atmTallText to atmElem
+            set {atmW, atmH} to size of atmElem
+            if atmH >= ${BODY_MIN_H} and atmTallText is missing value then set atmTallText to atmElem
           end if
         end try
         try
@@ -333,8 +394,8 @@ on atmFocusMailBody(expectedSubject)
       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 {atmW, atmH} to size of ta
+        if atmH >= ${BODY_MIN_H} then
           set focused of ta to true
           delay 0.08
           if my atmSafeToPaste() then return
@@ -366,9 +427,9 @@ on atmFocusMailBody(expectedSubject)
           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}
+      set {atmX, atmY} to position of w
+      set {atmWinW, atmWinH} to size of w
+      click at {(atmX + (atmWinW div 2)) as integer, (atmY + ((atmWinH * 2) div 3)) as integer}
       delay 0.08
       if my atmSafeToPaste() then return
       error "${BODY_FOCUS_FAILED_SENTINEL}"
@@ -436,12 +497,13 @@ function composeMisdirectChecks({ to, cc = [], bcc = [], subject, body }) {
     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
+        set atmFe to my atmFocusedElement()
+        if atmFe is not missing value then
+          tell application "System Events"
+            set atmAxVal to value of atmFe as string
             if atmAxVal contains ${asString(needle)} then set atmGotBody to atmAxVal
           end tell
-        end tell
+        end if
       end try
     end if
     if atmGotBody does not contain ${asString(needle)} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"`

package/package.json

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