apple-tools-mcp 2.0.2 → 2.0.4

package/README.md

@@ -317,7 +317,7 @@ The indexer does **not** post product Notification Center / `display notificatio
 The bridge is created before the daemon touches the vector index, so writes stay available even when the index is missing, locked, or mid-rebuild. Confirm it after an upgrade with `ls -l ~/.apple-tools-mcp/writer.sock` (it should be a `srw-------` socket); the daemon removes it on shutdown.
 
 **Entrypoint:** `node index.js --mode=indexer`  
-**Convenience bin:** `apple-tools-indexer` (same file; npm global install provides it)  
+**Convenience bin:** `apple-tools-indexer` (`bin/apple-tools-indexer.js`; npm global install provides it)  
 **npm script (clone only):** `npm run indexer`  
 **One-shot rebuild:** `npm run build-index` (stop the indexer daemon first)
 
@@ -461,7 +461,11 @@ 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"` sets Mail's `html content` and keeps a tag-stripped plain-text alternative in `content`; the default is plain text. HTML support is whatever Mail.app offers — if a Mail version rejects the property, the message still goes out as plain text.
+`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.
+
+**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.
+
+**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">`.
 
 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/bin/apple-tools-indexer.js

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+/**
+ * npm bin for the indexer daemon.
+ * Dedicated wrapper so npm 12 pack/publish keeps the CLI — `index.js` as a
+ * bin target is rewritten with "script name index.js was invalid and removed".
+ * Injects `--mode=indexer` so a realpath to this file still starts the daemon.
+ * `permissions` still wins (same contract as the apple-tools-indexer bin name).
+ */
+if (!process.argv.includes('--mode=indexer')) {
+  const modeIdx = process.argv.indexOf('--mode');
+  if (modeIdx === -1 || process.argv[modeIdx + 1] !== 'indexer') {
+    process.argv.splice(2, 0, '--mode=indexer');
+  }
+}
+await import('../index.js');

package/bin/apple-tools-mcp.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+/**
+ * npm bin for the MCP stdio server (and `permissions` subcommand).
+ * Dedicated wrapper so npm 12 pack/publish keeps the CLI — `index.js` as a
+ * bin target is rewritten with "script name index.js was invalid and removed".
+ */
+import '../index.js';

package/lib/mailWrite.js

@@ -148,11 +148,62 @@ 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")}`;
+  });
+}
+
+/**
+ * Body text for Mail's mailto compose.
+ *
+ * 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).
+ */
+export function composeMailtoBody(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).
+ */
+export function buildMailtoComposeUrl({ subject = "", body = "" } = {}) {
+  return `mailto:?subject=${encodeMailtoQueryValue(subject)}&body=${encodeMailtoQueryValue(body)}`;
+}
+
 /**
  * Build the outgoing-message script shared by send and draft.
  *
- * Mail renders `html content` when it is set; `content` stays populated as
- * the plain-text alternative for clients that do not display HTML.
+ * `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">`.
  */
 export function buildComposeScript({ to, cc, bcc, subject, body, send, html = false }) {
   const recipients = [
@@ -161,15 +212,17 @@ export function buildComposeScript({ to, cc, bcc, subject, body, send, html = fa
     recipientLines(bcc, "bcc recipient")
   ].filter((block) => block.length > 0).join("\n");
 
-  const htmlLine = html
-    ? `  try
-    set html content of newMessage to ${asString(body)}
-  end try\n`
-    : "";
+  const mailtoUrl = buildMailtoComposeUrl({
+    subject,
+    body: composeMailtoBody(body, { html })
+  });
 
   return `tell application "Mail"
-  set newMessage to make new outgoing message with properties {subject:${asString(subject)}, content:${asString(html ? stripHtmlTags(body) : body)}, visible:false}
-${htmlLine}  tell newMessage
+  set newMessage to mailto ${asString(mailtoUrl)}
+  try
+    set visible of newMessage to false
+  end try
+  tell newMessage
 ${recipients}
   end tell
   ${send ? "send newMessage" : "save newMessage"}

package/lib/processMode.js

@@ -2,7 +2,8 @@
  * Process mode detection for apple-tools-mcp.
  *
  * Canonical indexer entrypoint: `node index.js --mode=indexer`
- * Convenience bin: `apple-tools-indexer` (same file; detected via argv[1]).
+ * Convenience bin: `apple-tools-indexer` (`bin/apple-tools-indexer.js`;
+ * detected via argv[1] or `--mode=indexer`).
  * Permissions CLI: `apple-tools-mcp permissions` / `--mode=permissions`.
  * MCP stdio remains the default when neither is present.
  */
@@ -71,5 +72,5 @@ export function isIndexerMode(argv = process.argv) {
     return true;
   }
   const entry = argv[1] ? path.basename(argv[1]) : "";
-  return entry === "apple-tools-indexer";
+  return entry === "apple-tools-indexer" || entry === "apple-tools-indexer.js";
 }

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: "Send body as plain text (default) or HTML, where Mail supports it" },
+        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" },
         ...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: "Save body as plain text (default) or HTML, where Mail supports it" },
+        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" },
         ...CONFIRM_PROPS
       },
       required: ["to"]

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "apple-tools-mcp",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "MCP server for semantic search and write actions across Apple Mail, Messages, Calendar, and Contacts",
   "type": "module",
   "main": "index.js",
   "bin": {
-    "apple-tools-mcp": "./index.js",
-    "apple-tools-indexer": "./index.js"
+    "apple-tools-mcp": "bin/apple-tools-mcp.js",
+    "apple-tools-indexer": "bin/apple-tools-indexer.js"
   },
   "author": "Peter Coates",
   "license": "MIT",
@@ -45,6 +45,7 @@
     "search.js",
     "contacts.js",
     "lib/",
+    "bin/",
     "scripts/audit-index.js",
     "scripts/smoke-writes.js",
     "scripts/postinstall.js",