apple-tools-mcp 3.0.6 → 3.0.8

package/lib/appleScript.js

@@ -340,7 +340,7 @@ export const MAIL_TCC_GUIDANCE =
  */
 export const MAIL_ACCESSIBILITY_GUIDANCE =
   "macOS denied Accessibility (System Events could not drive Mail's compose window). " +
-  "mail_send / mail_draft fill the body via AX hit-test so Mail does not cite-wrap it (FB11734014); Mail's mailto command does not return an outgoing message on current Mini/MacBook Mail (-2753). " +
+  "mail_send / mail_draft / mail_reply / mail_forward fill the body via System Events 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).";
 
@@ -355,7 +355,7 @@ export const SYSTEM_EVENTS_STICKY_DENY_GUIDANCE =
 /** System Events GUI scripting missing — not a Mail send hang. */
 export const MAIL_GUI_SCRIPTING_GUIDANCE =
   "System Events GUI scripting is unavailable for this process, so the body cannot be typed into Mail. " +
-  "mail_send / mail_draft locate the compose body via System Events (title-marker + AX hit-test) so Mail does not cite-wrap the Sent body (FB11734014). " +
+  "mail_send / mail_draft / mail_reply / mail_forward locate the compose body via System Events (title-marker + AX hit-test) so Mail does not cite-wrap the Sent body (FB11734014). " +
   "Allow node → System Events in System Settings → Privacy & Security → Automation (run apple-tools-mcp permissions after install/upgrade) in addition to node → Mail, and keep Accessibility allowed. " +
   SYSTEM_EVENTS_STICKY_DENY_GUIDANCE + " " +
   "This is not a Mail send timeout and not a Mail Automation deny (-1743 / -10004).";

package/lib/mailWrite.js

@@ -22,6 +22,7 @@ import {
   runAppleScript,
   asString,
   asInteger,
+  asBoolean,
   MAIL_TCC_GUIDANCE,
   MAIL_SEND_TIMEOUT_GUIDANCE,
   MAIL_ACCESSIBILITY_GUIDANCE,
@@ -197,6 +198,8 @@ export const SYSTEM_EVENTS_AUTOMATION_PROBE_MARKER = "ATM_SYSTEM_EVENTS_AUTOMATI
 export const MAIL_BODY_MIN_AX_HEIGHT = 50;
 /** Historical Mini Tab count. 2.1.3 finds the body via title-marker + AX hit-test, not Tab. */
 export const MAIL_BODY_TAB_MAX = 6;
+/** Command-Up in the compose body (start of document). Reply/forward prepend uses this instead of Cmd-A. */
+export const MAIL_BODY_START_KEY_CODE = 126;
 /** Mail window titles may truncate; match this many leading subject characters. */
 export const MAIL_COMPOSE_TITLE_MARKER_MAX = 60;
 /** Top-level `UI elements` of process Mail only — never a deep tree walk. */
@@ -507,7 +510,9 @@ function systemEventsGrantKind(result) {
  * — 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
+ * Deliver with clipboard paste. Compose passes replaceBody=true (Cmd-A then
+ * paste). Reply/forward pass false: Command-Up to the top of the body, then
+ * paste, so the quoted original stays. 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).
  */
@@ -515,6 +520,7 @@ export function buildMailBodyPasteHandler() {
   const seSecs = asInteger(MAIL_SE_APPLEEVENT_TIMEOUT_SEC, { min: 1, max: 30, field: "seTimeout" });
   const topMax = asInteger(MAIL_COMPOSE_TOP_UI_MAX, { min: 1, max: 64, field: "topUiMax" });
   const tokenId = asInteger(MAIL_RECIPIENT_TOKEN_CHAR_ID, { min: 1, max: 1114111, field: "tokenCharId" });
+  const startKey = asInteger(MAIL_BODY_START_KEY_CODE, { min: 1, max: 127, field: "bodyStartKey" });
   return `property atmProvenBx : -1
 property atmProvenBy : -1
 property atmProvenBw : -1
@@ -561,6 +567,13 @@ on atmTitleMatches(atmTitle, atmMarker)
   return false
 end atmTitleMatches
 
+on atmComposeTitleMarker(atmSubject)
+  set atmText to atmSubject as string
+  if atmText is "" then return "New Message"
+  if (length of atmText) > ${MAIL_COMPOSE_TITLE_MARKER_MAX} then return text 1 thru ${MAIL_COMPOSE_TITLE_MARKER_MAX} of atmText
+  return atmText
+end atmComposeTitleMarker
+
 on atmTopElemExactTitle(atmEl, atmMarker)
   try
     if my atmTitleMatches(name of atmEl as string, atmMarker) then return true
@@ -655,7 +668,7 @@ on atmStopScreenSaver()
   end try
 end atmStopScreenSaver
 
-on atmFillMailBody(bodyText, needle, titleMarker, msg)
+on atmFillMailBody(bodyText, needle, titleMarker, msg, replaceBody)
   try
     tell application "Mail" to activate
     delay 0.25
@@ -767,8 +780,13 @@ on atmFillMailBody(bodyText, needle, titleMarker, msg)
             set hadClip to true
           end try
           try
-            keystroke "a" using command down
-            delay 0.2
+            if replaceBody then
+              keystroke "a" using command down
+              delay 0.2
+            else
+              key code ${startKey} using command down
+              delay 0.2
+            end if
             set the clipboard to bodyText
             delay 0.2
             keystroke "v" using command down
@@ -845,8 +863,9 @@ ${bodyCheck}`;
  * 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
+ * (`replaceBody` true) 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
@@ -865,7 +884,7 @@ export function buildComposeScript({ to, cc, bcc, subject, body, send, html = fa
   const needle = composeBodyNeedle(plainBody);
   const titleMarker = composeTitleMarker(subject);
   const pasteAndVerify = plainBody
-    ? `  atmFillMailBody(${asString(plainBody)}, ${asString(needle)}, ${asString(titleMarker)}, newMessage)
+    ? `  atmFillMailBody(${asString(plainBody)}, ${asString(needle)}, ${asString(titleMarker)}, newMessage, ${asBoolean(true)})
   tell application "Mail"
 ${composeMisdirectChecks({ to, cc, bcc, subject, body: plainBody })}
   end tell`
@@ -992,7 +1011,7 @@ function mailBoxesPreamble() {
   return `  set cutoff to (current date) - (10 * minutes)
   set boxes to {}
   try
-    set end of boxes to outgoing mailbox
+    set end of boxes to outbox
   end try
   try
     set end of boxes to sent mailbox
@@ -1012,7 +1031,7 @@ function loadMailboxMessagesSnippet() {
   return `      set recentMsgs to {}
       set scanAll to false
       try
-        if boxRef is outgoing mailbox then set scanAll to true
+        if boxRef is outbox then set scanAll to true
       end try
       try
         set nm to name of boxRef as string
@@ -1028,7 +1047,7 @@ function loadMailboxMessagesSnippet() {
 
 function verifyHitReturn() {
   return `              try
-                if boxRef is outgoing mailbox then return "${SENT_VERIFY_OUTBOX}"
+                if boxRef is outbox then return "${SENT_VERIFY_OUTBOX}"
               end try
               try
                 set nm to name of boxRef as string
@@ -1438,7 +1457,7 @@ function finalizeMailWrite({
     }
     const verified = verifyQueuedMessage(match, { deadlineMs: deadline });
     if (!verified) {
-      return { ok: false, delivered: false, mailbox: null, message: verifyMissMessage(action, summary) };
+      return { ok: false, delivered: false, mailbox: null, unconfirmed: true, message: verifyMissMessage(action, summary) };
     }
     return sendVerifiedSuccess({ action, successSummary, details, verified, recovered: false });
   }
@@ -1558,35 +1577,110 @@ export function mailCompose(args = {}, { draft = false, indexerMode = isIndexerM
   });
 }
 
+/**
+ * Intro text pasted above a reply/forward quote. Trailing newline keeps the
+ * note from gluing to "On … wrote:". Needle still comes from composeBodyNeedle.
+ */
+export function quoteIntroPasteText(body) {
+  const text = composeNativeBody(body);
+  if (!text) return "";
+  return text.endsWith("\n") ? text : `${text}\n`;
+}
+
+function quoteBodyNeedleCheck(body) {
+  const needle = composeBodyNeedle(body);
+  if (!needle) return "";
+  return `    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`;
+}
+
+/**
+ * Probe 3 prepend: visible window title from the live subject, no Cmd-A, no
+ * AppleScript `content`. Mail 16 / macOS 26 leaves `set content` empty, which
+ * is why reply/forward used to send a blank intro.
+ */
+function quoteBodyPasteAndVerify(outgoingVar, body) {
+  const intro = quoteIntroPasteText(body);
+  if (!intro) return "";
+  const bodyCheck = quoteBodyNeedleCheck(intro);
+  return `  tell application "Mail"
+    set atmTitleMarker to my atmComposeTitleMarker(subject of ${outgoingVar} as string)
+  end tell
+  atmFillMailBody(${asString(intro)}, ${asString(composeBodyNeedle(intro))}, atmTitleMarker, ${outgoingVar}, ${asBoolean(false)})
+  tell application "Mail"
+${bodyCheck}
+  end tell`;
+}
+
+function quotePasteGuard(outgoingVar, fillBlock) {
+  if (!fillBlock) return "";
+  return `try
+${fillBlock}
+on error errMsg number errNum
+  try
+    tell application "Mail" to delete ${outgoingVar}
+  end try
+  error errMsg number errNum
+end try
+`;
+}
+
+function finishMailGuiWrite({ action, summary, result, indexerMode, finalize }) {
+  if (
+    !result.ok &&
+    indexerMode &&
+    (isMailGuiScriptingUnavailable(result) || isMailAccessibilityDenial(result))
+  ) {
+    return guiScriptingUnavailableResult(action, summary, result, { indexerMode });
+  }
+  return finalize();
+}
+
 export function buildReplyScript({ messageId, body, replyAll, sendNow }) {
-  return `${findMessageHandler()}
+  const mailSecs = asInteger(MAIL_APPLEEVENT_TIMEOUT_SEC, { min: 1, max: 60, field: "mailTimeout" });
+  const fillBlock = quoteBodyPasteAndVerify("theReply", body);
+  const pasteAndVerify = quotePasteGuard("theReply", fillBlock);
+  const replyAllClause = replyAll ? "with reply to all" : "without reply to all";
+
+  return `${buildMailBodyPasteHandler()}
+${findMessageHandler()}
 
 set theMessage to atmFindMessage(${asString(messageId)})
 tell application "Mail"
-  set theReply to missing value
-  try
-    set theReply to reply theMessage without opening window ${replyAll ? "with reply to all" : "without reply to all"}
-  end try
-  if theReply is missing value then
-    -- Some Mail versions do not return the outgoing message from a reply.
-    -- Fall back to a new message addressed to the original sender.
-    set origSubject to subject of theMessage
-    set origSender to extract address from (sender of theMessage)
-    set theReply to make new outgoing message with properties {subject:("Re: " & origSubject), content:${asString(body)}, visible:false}
-    tell theReply
-      make new to recipient at end of to recipients with properties {address:origSender}
-    end tell
-  else
-    tell theReply
-      set content to ${asString(body)} & return & content
-    end tell
-  end if
-  ${sendNow ? "send theReply" : "save theReply"}
+  with timeout of ${mailSecs} seconds
+    set theReply to missing value
+    try
+      set theReply to reply theMessage with opening window ${replyAllClause}
+    end try
+    if theReply is missing value then
+      -- Some Mail versions do not return the outgoing message from a reply.
+      -- Fall back to a new visible message addressed to the original sender.
+      -- Never set AppleScript content (Mail 16 / macOS 26 stays empty).
+      set origSubject to subject of theMessage
+      set origSender to extract address from (sender of theMessage)
+      set theReply to make new outgoing message with properties {subject:("Re: " & origSubject), visible:true}
+      tell theReply
+        make new to recipient at end of to recipients with properties {address:origSender}
+      end tell
+    end if
+    activate
+  end timeout
+end tell
+${pasteAndVerify}tell application "Mail"
+  with timeout of ${mailSecs} seconds
+    ${sendNow ? "send theReply" : "save theReply"}
+  end timeout
 end tell
 return "OK"`;
 }
 
-export function mailReply(args = {}) {
+export function mailReply(args = {}, { indexerMode = isIndexerMode() } = {}) {
   const action = "mail_reply";
   const resolved = resolveMailMessageId({ messageId: args.message_id, filePath: args.file_path });
   if (resolved.error) return { ok: false, message: `${action} refused: ${resolved.error}` };
@@ -1609,47 +1703,72 @@ export function mailReply(args = {}) {
   });
   if (!plan.proceed) return plannedWriteResult(plan);
 
+  if (quoteIntroPasteText(body.text)) {
+    const se = probeSystemEventsGui();
+    if (!se.ok) {
+      return guiScriptingUnavailableResult(action, summary, se, { indexerMode });
+    }
+  }
+
   const deadlineMs = sentVerifyClock.now() + MCP_CALL_DEADLINE_MS;
+  wakeDisplay();
   const result = runAppleScript(
     buildReplyScript({ messageId: resolved.messageId, body: body.text, replyAll, sendNow }),
     { timeout: MAIL_FIND_AND_SEND_TIMEOUT_MS, appName: "Mail" }
   );
-  return finalizeMailWrite({
+  return finishMailGuiWrite({
     action,
     summary,
     result,
-    secrets: [body.text],
-    sendNow,
-    inReplyTo: sendNow ? resolved.messageId : null,
-    successSummary: sendNow ? "reply sent" : "reply saved to Drafts",
-    details: {
-      message_id: resolved.messageId,
-      reply_all: String(replyAll)
-    },
-    deadlineMs
+    indexerMode,
+    finalize: () => finalizeMailWrite({
+      action,
+      summary,
+      result,
+      secrets: [body.text],
+      sendNow,
+      inReplyTo: sendNow ? resolved.messageId : null,
+      successSummary: sendNow ? "reply sent" : "reply saved to Drafts",
+      details: {
+        message_id: resolved.messageId,
+        reply_all: String(replyAll)
+      },
+      deadlineMs
+    })
   });
 }
 
 export function buildForwardScript({ messageId, to, body, sendNow }) {
-  return `${findMessageHandler()}
+  const mailSecs = asInteger(MAIL_APPLEEVENT_TIMEOUT_SEC, { min: 1, max: 60, field: "mailTimeout" });
+  const fillBlock = quoteBodyPasteAndVerify("theForward", body);
+  const pasteAndVerify = quotePasteGuard("theForward", fillBlock);
+  const handlers = fillBlock ? `${buildMailBodyPasteHandler()}\n` : "";
+
+  return `${handlers}${findMessageHandler()}
 
 set theMessage to atmFindMessage(${asString(messageId)})
 tell application "Mail"
-  set theForward to missing value
-  try
-    set theForward to forward theMessage without opening window
-  end try
-  if theForward is missing value then error "FORWARD_UNSUPPORTED"
-  tell theForward
-    set content to ${asString(body)} & return & content
+  with timeout of ${mailSecs} seconds
+    set theForward to missing value
+    try
+      set theForward to forward theMessage with opening window
+    end try
+    if theForward is missing value then error "FORWARD_UNSUPPORTED"
+    tell theForward
 ${to.map((address) => `    make new to recipient at end of to recipients with properties {address:${asString(address)}}`).join("\n")}
-  end tell
-  ${sendNow ? "send theForward" : "save theForward"}
+    end tell
+    activate
+  end timeout
+end tell
+${pasteAndVerify}tell application "Mail"
+  with timeout of ${mailSecs} seconds
+    ${sendNow ? "send theForward" : "save theForward"}
+  end timeout
 end tell
 return "OK"`;
 }
 
-export function mailForward(args = {}) {
+export function mailForward(args = {}, { indexerMode = isIndexerMode() } = {}) {
   const action = "mail_forward";
   const resolved = resolveMailMessageId({ messageId: args.message_id, filePath: args.file_path });
   if (resolved.error) return { ok: false, message: `${action} refused: ${resolved.error}` };
@@ -1674,25 +1793,39 @@ export function mailForward(args = {}) {
   });
   if (!plan.proceed) return plannedWriteResult(plan);
 
+  if (quoteIntroPasteText(body.text)) {
+    const se = probeSystemEventsGui();
+    if (!se.ok) {
+      return guiScriptingUnavailableResult(action, summary, se, { indexerMode });
+    }
+  }
+
   const deadlineMs = sentVerifyClock.now() + MCP_CALL_DEADLINE_MS;
+  wakeDisplay();
   const result = runAppleScript(
     buildForwardScript({ messageId: resolved.messageId, to: to.addresses, body: body.text, sendNow }),
     { timeout: MAIL_FIND_AND_SEND_TIMEOUT_MS, appName: "Mail" }
   );
-  return finalizeMailWrite({
+  return finishMailGuiWrite({
     action,
     summary,
     result,
-    secrets: [body.text],
-    sendNow,
-    inReplyTo: sendNow ? resolved.messageId : null,
-    forwardTo: sendNow ? to.addresses : null,
-    successSummary: sendNow ? "forwarded" : "forward saved to Drafts",
-    details: {
-      message_id: resolved.messageId,
-      to: to.addresses.join(", ")
-    },
-    deadlineMs
+    indexerMode,
+    finalize: () => finalizeMailWrite({
+      action,
+      summary,
+      result,
+      secrets: [body.text],
+      sendNow,
+      inReplyTo: sendNow ? resolved.messageId : null,
+      forwardTo: sendNow ? to.addresses : null,
+      successSummary: sendNow ? "forwarded" : "forward saved to Drafts",
+      details: {
+        message_id: resolved.messageId,
+        to: to.addresses.join(", ")
+      },
+      deadlineMs
+    })
   });
 }
 

package/lib/writeTools.js

@@ -82,12 +82,12 @@ export const WRITE_TOOL_DEFINITIONS = [
   },
   {
     name: "mail_reply",
-    description: "Reply to an existing email. reply_all=true fans out to every original recipient and requires confirm=true. A real send is verified in Sent/Outbox before success. A send hang is a timeout, not TCC, unless Mail reports -1743/-10004; hang recover uses In-Reply-To. Clients must Sent-check before retrying a timed-out send.",
+    description: "Reply to an existing email. The reply text is pasted above the quoted original in a visible Mail window (System Events focus on the message body, then Command-Up and clipboard paste — not Cmd-A, which would replace the quote; AppleScript content is not set because Mail 16 leaves it empty). reply_all=true fans out to every original recipient and requires confirm=true. A real send is verified in Sent/Outbox before success. A send hang is a timeout, not TCC, unless Mail reports -1743/-10004; hang recover uses In-Reply-To. Clients must Sent-check before retrying a timed-out send.",
     inputSchema: {
       type: "object",
       properties: {
         ...MESSAGE_TARGET_PROPS,
-        body: { type: "string", description: "Reply text, prepended above the quoted original (required)" },
+        body: { type: "string", description: "Reply text, prepended above the quoted original via System Events paste (required). AppleScript content is not set." },
         reply_all: { type: "boolean", description: "Reply to all original recipients (default false)" },
         save_as_draft: { type: "boolean", description: "Save the reply to Drafts instead of sending (default false)" },
         ...CONFIRM_PROPS
@@ -97,13 +97,13 @@ export const WRITE_TOOL_DEFINITIONS = [
   },
   {
     name: "mail_forward",
-    description: "Forward an existing email to new recipients. More than one recipient requires confirm=true. A real send is verified in Sent/Outbox before success. A send hang is a timeout, not TCC, unless Mail reports -1743/-10004; hang recover matches intended To plus Fwd: subject or original Message-ID. Clients must Sent-check before retrying a timed-out send.",
+    description: "Forward an existing email to new recipients. An optional note is pasted above the forwarded original in a visible Mail window (same System Events prepend as mail_reply; AppleScript content is not set). More than one recipient requires confirm=true. A real send is verified in Sent/Outbox before success. A send hang is a timeout, not TCC, unless Mail reports -1743/-10004; hang recover matches intended To plus Fwd: subject or original Message-ID. Clients must Sent-check before retrying a timed-out send.",
     inputSchema: {
       type: "object",
       properties: {
         ...MESSAGE_TARGET_PROPS,
         to: { type: "array", items: { type: "string" }, description: "Forward recipients (required, at least one)" },
-        body: { type: "string", description: "Optional note added above the forwarded message" },
+        body: { type: "string", description: "Optional note pasted above the forwarded message (System Events prepend; omitted note skips paste)" },
         save_as_draft: { type: "boolean", description: "Save the forward to Drafts instead of sending (default false)" },
         ...CONFIRM_PROPS
       },
@@ -420,8 +420,11 @@ export function loggedBridgeHandler(run, log, now = () => Date.now()) {
     const ok = Boolean(result && result.ok);
     // Dry runs and confirm-gated previews come back ok:false with planned:true — nothing failed.
     const planned = !ok && Boolean(result && result.planned);
-    const why = ok || planned ? "" : ` (${classifyWriteFailure(result && result.message)}${result && result.unsupported ? ", unsupported" : ""})`;
-    log(`${new Date(started).toISOString()} write bridge: ${tool} ${ok ? "ok" : planned ? "planned (dry run / needs confirm)" : "failed"} in ${now() - started}ms${why}`);
+    // Mail accepted the send but Sent/Outbox didn't show it within budget — not a failure.
+    const unconfirmed = !ok && !planned && Boolean(result && result.unconfirmed);
+    const outcome = ok ? "ok" : planned ? "planned (dry run / needs confirm)" : unconfirmed ? "unconfirmed (sent; not yet seen in Sent/Outbox)" : "failed";
+    const why = ok || planned || unconfirmed ? "" : ` (${classifyWriteFailure(result && result.message)}${result && result.unsupported ? ", unsupported" : ""})`;
+    log(`${new Date(started).toISOString()} write bridge: ${tool} ${outcome} in ${now() - started}ms${why}`);
     return result;
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-tools-mcp",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "description": "MCP server for semantic search and write actions across Apple Mail, Messages, Calendar, and Contacts. Speaks stdio (local) or bearer-token-authenticated Streamable HTTP (LAN / Tailscale).",
   "type": "module",
   "main": "index.js",