apple-tools-mcp 2.0.4 → 2.0.5

package/README.md

@@ -461,11 +461,13 @@ Two arguments are available on **every** write tool:
 | `mail_archive` | `message_id` or `file_path` | none |
 | `mail_trash` | `message_id` or `file_path` | **`confirm` required** |
 
-`body_format: "html"` uses the same mailto compose path with a tag-stripped body. It does **not** set Mail's `html content` — that setter cite-wraps 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.
+`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) create the outgoing message with Mail's `mailto` command (native compose) instead of setting AppleScript `content` or `html content` on `make new outgoing message`. On current Mail (Ventura+, FB11734014) those setters 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.
+**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.
 
-**Manual prove (after 2.0.4 is installed on the Mac host — post-publish, does not block this PR):** `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">`.
+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`).
+
+**Manual prove (2.0.5 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`).
 
 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/appleScript.js

@@ -179,6 +179,7 @@ export function needsHostTccAdvice(message) {
     text.includes(CALENDAR_TCC_GUIDANCE) ||
     text.includes(MESSAGES_TCC_GUIDANCE) ||
     text.includes(MAIL_TCC_GUIDANCE) ||
+    text.includes(MAIL_ACCESSIBILITY_GUIDANCE) ||
     text.includes(ATTRIBUTION_GUIDANCE) ||
     text.includes(TCC_GUIDANCE)
   ) {
@@ -332,6 +333,16 @@ export const MAIL_TCC_GUIDANCE =
   "Allow node in System Settings → Privacy & Security → Automation for Mail (same Allow-via-prompt as Contacts and Calendar — do not add node via + in a privacy list). " +
   "A Contacts or Calendar grant does not include Mail.";
 
+/**
+ * Body paste for mail_send / mail_draft uses System Events. That is
+ * Accessibility, not Mail Automation (-1743).
+ */
+export const MAIL_ACCESSIBILITY_GUIDANCE =
+  "macOS denied Accessibility (System Events could not drive Mail's compose window). " +
+  "mail_send / mail_draft paste the body so Mail does not cite-wrap it (FB11734014); Mail's mailto command does not return an outgoing message on current Mini/MacBook Mail (-2753). " +
+  "Allow node in System Settings → Privacy & Security → Accessibility, and keep Automation → Mail allowed. " +
+  "This is not a Mail Automation deny (-1743 / -10004).";
+
 /**
  * AppleScript hung (ETIMEDOUT / -1712) while finding, opening, replying,
  * or sending. That is not -1743 / -10004, including before send.

package/lib/mailWrite.js

@@ -19,8 +19,10 @@ import { validateEmailPath, unfoldRfc822Headers, safeMatch, stripHtmlTags } from
 import {
   runAppleScript,
   asString,
+  asInteger,
   MAIL_TCC_GUIDANCE,
   MAIL_SEND_TIMEOUT_GUIDANCE,
+  MAIL_ACCESSIBILITY_GUIDANCE,
   MAIL_APP_NOT_RUNNING_GUIDANCE,
   ATTRIBUTION_GUIDANCE,
   isHardTccDenial
@@ -148,62 +150,118 @@ export function probeMailAutomation() {
   };
 }
 
-/**
- * Percent-encode a mailto query value (RFC 6068).
- *
- * Newlines become %0D%0A so Mail keeps paragraphs. Characters that
- * encodeURIComponent leaves unescaped (`!'()*`) are encoded too, because
- * they can break the URL or the AppleScript string around it.
- *
- * Does not prefix lines with `>` — Mail's native mailto compose path
- * already treats the decoded body as original text, not a citation.
- */
-export function encodeMailtoQueryValue(value) {
-  const text = value === undefined || value === null ? "" : String(value);
-  const normalized = text.replace(/\r\n|\r|\n/g, "\r\n");
-  return encodeURIComponent(normalized).replace(/[!'()*]/g, (ch) => {
-    return `%${ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, "0")}`;
-  });
-}
+export const ACCESSIBILITY_DENIED_SENTINEL = "ACCESSIBILITY_DENIED";
+export const BODY_PASTE_MISDIRECTED_SENTINEL = "BODY_PASTE_MISDIRECTED";
 
 /**
- * Body text for Mail's mailto compose.
+ * Body text for native Mail compose (clipboard paste, not AppleScript content).
  *
  * HTML is tag-stripped so a plain-looking HTML body (`<p>…</p>`) becomes
- * native compose text. Never prefixes lines with `>` and never emits
- * `<blockquote>` — AppleScript `html content` is unused because Mail
- * cite-wraps it (FB11734014).
+ * typed/pasted text. Never prefixes lines with `>` and never emits
+ * `<blockquote>` — AppleScript `content` / `html content` cite-wrap
+ * (FB11734014). Mail's `mailto` command is not used: on current Mini/MacBook
+ * Mail it does not return an outgoing message (`newMessage` stays undefined,
+ * AppleScript -2753).
  */
-export function composeMailtoBody(body, { html = false } = {}) {
+export function composeNativeBody(body, { html = false } = {}) {
   if (html) return stripHtmlTags(body);
   return body === undefined || body === null ? "" : String(body);
 }
 
 /**
- * Build a mailto: URL for Mail's `mailto` command.
- *
- * Recipients stay off this URL and are added with `make new … recipient`
- * so cc/bcc keep the proven AppleScript path and a To is not duplicated.
- * Subject and body go here so Mail uses its native compose pipeline
- * (FB11734014: setting AppleScript `content` wraps the whole body in a
- * cite-blockquote — `>` prefixes on text/plain, `<blockquote type="cite">`
- * on text/html — which iOS Mail paints as purple text with a left bar).
+ * AppleScript handlers: focus the compose body (not To) and paste.
+ * System Events needs Accessibility; Mail make/send still needs Automation.
  */
-export function buildMailtoComposeUrl({ subject = "", body = "" } = {}) {
-  return `mailto:?subject=${encodeMailtoQueryValue(subject)}&body=${encodeMailtoQueryValue(body)}`;
+export function buildMailBodyPasteHandler() {
+  return `on atmFocusMailBody()
+  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
+        click (first web area of w)
+        return
+      end try
+      try
+        click (first web area of scroll area 1 of w)
+        return
+      end try
+      try
+        click (first web area of scroll area 1 of splitter group 1 of w)
+        return
+      end try
+      try
+        click (first web area of scroll area 1 of group 1 of splitter group 1 of w)
+        return
+      end try
+      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}
+    end tell
+  end tell
+end atmFocusMailBody
+
+on atmPasteMailBody(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
+  tell application "Mail" to activate
+  delay 0.25
+  try
+    atmFocusMailBody()
+    tell application "System Events"
+      tell process "Mail"
+        keystroke "v" using command down
+      end tell
+    end tell
+    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 atmPasteMailBody`;
+}
+
+function recipientStillPresentChecks(to) {
+  const toCount = asInteger(to.length, { min: 1, max: 99, field: "toCount" });
+  const stillThere = to
+    .map((address, i) => {
+      const n = asInteger(i, { min: 0, max: 99, field: "recipientIndex" });
+      return `    set atmWanted${n} to ${asString(address)}
+    set atmFound${n} to false
+    repeat with r in to recipients of newMessage
+      if (address of r as string) is atmWanted${n} then set atmFound${n} to true
+    end repeat
+    if atmFound${n} is false then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"`;
+    })
+    .join("\n");
+  return `    if (count of to recipients of newMessage) is not ${toCount} then error "${BODY_PASTE_MISDIRECTED_SENTINEL}"
+${stillThere}`;
 }
 
 /**
  * Build the outgoing-message script shared by send and draft.
  *
- * `mail_send` / `mail_draft` (plain and html) must not set AppleScript
- * `content` or `html content`. Those properties route through Mail's
- * share-insert path and serialize as a citation. Mail's `mailto` command
- * returns the outgoing message so we can still add recipients, hide the
- * window, and send or save — without Accessibility / System Events, and
- * without a quote-wrapped body. HTML format uses the same path with a
- * tag-stripped mailto body; Mail may generate its own HTML alternative
- * without wrapping the whole message in `<blockquote type="cite">`.
+ * Always `make new outgoing message` (no `content:`) so `newMessage` is a
+ * real Mail object — Mail's `mailto` command is a no-op / non-returning
+ * on Mini+MacBook and left `newMessage` undefined (-2753).
+ *
+ * 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).
  */
 export function buildComposeScript({ to, cc, bcc, subject, body, send, html = false }) {
   const recipients = [
@@ -212,19 +270,32 @@ export function buildComposeScript({ to, cc, bcc, subject, body, send, html = fa
     recipientLines(bcc, "bcc recipient")
   ].filter((block) => block.length > 0).join("\n");
 
-  const mailtoUrl = buildMailtoComposeUrl({
-    subject,
-    body: composeMailtoBody(body, { html })
-  });
+  const plainBody = composeNativeBody(body, { html });
+  const pasteAndVerify = plainBody
+    ? `  atmPasteMailBody(${asString(plainBody)})
+  tell application "Mail"
+${recipientStillPresentChecks(to)}
+  end tell`
+    : "";
 
-  return `tell application "Mail"
-  set newMessage to mailto ${asString(mailtoUrl)}
-  try
-    set visible of newMessage to false
-  end try
+  return `${buildMailBodyPasteHandler()}
+
+tell application "Mail"
+  set newMessage to make new outgoing message with properties {subject:${asString(subject)}, visible:true}
   tell newMessage
 ${recipients}
   end tell
+  activate
+end tell
+try
+${pasteAndVerify}
+on error errMsg number errNum
+  try
+    tell application "Mail" to delete newMessage
+  end try
+  error errMsg number errNum
+end try
+tell application "Mail"
   ${send ? "send newMessage" : "save newMessage"}
 end tell
 return "OK"`;
@@ -437,7 +508,20 @@ export function recoverIfInSent({ inReplyTo = null, subject = null, forwardTo =
   return null;
 }
 
+export function isMailAccessibilityDenial(result) {
+  if (!result) return false;
+  const text = String(result.error || "").toLowerCase();
+  return text.includes("accessibility_denied") || text.includes("assistive access");
+}
+
 function failure(action, summary, result, secrets) {
+  const err = String((result && result.error) || "").toLowerCase();
+  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.`;
+  }
+  if (isMailAccessibilityDenial(result)) {
+    return `${action} failed — attempted to ${summary}. ${MAIL_ACCESSIBILITY_GUIDANCE}`;
+  }
   if (result.kind === "tcc" || isHardTccDenial(result && result.error)) {
     return `${action} failed — attempted to ${summary}. ${MAIL_TCC_GUIDANCE}`;
   }

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 onto Mail's mailto compose; AppleScript 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 and pasted into Mail's compose window; 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 onto Mail's mailto compose; AppleScript 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 and pasted into Mail's compose window; 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.0.4",
+  "version": "2.0.5",
   "description": "MCP server for semantic search and write actions across Apple Mail, Messages, Calendar, and Contacts",
   "type": "module",
   "main": "index.js",