apple-mail-mcp 2.20.15 → 2.20.17

package/README.md

@@ -954,7 +954,10 @@ nodemailer path `send-email` uses, so the Sent-folder copy (`sentCopy`) carries
 On the AppleScript transport they are added with `make new attachment` **after** the
 reply content is set and before `save`/`send` (inline items are written to `0600` temp
 files and removed afterwards), so a `send: false` draft contains both the attachments and
-the quoted original. Results report `attachmentCount`.
+the quoted original. `make new attachment` returns before Mail has loaded the file, so the
+script waits until Mail counts every file (bounded at 15 s) before saving or sending
+(2.20.16, #293; the same wait applies to `send-email` and `create-draft`). Results report
+`attachmentCount`.
 
 **Delivery:** `imap:` IDs are read directly from their encoded account, mailbox, and UID. Numeric IDs are read through Mail.app. With SMTP configured, replies use clean MIME with the original `Message-ID` in `In-Reply-To` and the full `References` chain. Only the original plain-text body is quoted; the new text is not. Pass `transport: "smtp"` to require this path, or `transport: "applescript"` to use Mail.app explicitly.
 

package/build/index.js

@@ -83374,10 +83374,30 @@ function buildAttachmentCommands(attachments) {
   }
   return commands;
 }
+var ATTACHMENT_SETTLE_TIMEOUT_S = 15;
+var ATTACHMENT_SETTLE_GRACE_S = 1;
+function attachmentSettleBlock(msgVar, expected) {
+  if (expected <= 0) return "";
+  return `
+        set attachDeadline to (current date) + ${ATTACHMENT_SETTLE_TIMEOUT_S}
+        repeat
+          set attachCount to 0
+          try
+            set attachCount to count of attachments of content of ${msgVar}
+          end try
+          if attachCount >= ${expected} then exit repeat
+          if (current date) > attachDeadline then exit repeat
+          delay 0.25
+        end repeat
+        delay ${ATTACHMENT_SETTLE_GRACE_S}`;
+}
+function countAttachmentCommands(commands) {
+  return (commands.match(/make new attachment/g) || []).length;
+}
 function composeAttachmentBlock(msgVar, paths) {
   const commands = buildAttachmentCommands(paths);
   return commands ? `tell ${msgVar}
-${commands}end tell` : "";
+${commands}end tell${attachmentSettleBlock(msgVar, paths.length)}` : "";
 }
 function asDateToString(varName) {
   return `((year of ${varName}) as string) & "-" & ((month of ${varName} as integer) as string) & "-" & ((day of ${varName}) as string) & "-" & ((hours of ${varName}) as string) & "-" & ((minutes of ${varName}) as string) & "-" & ((seconds of ${varName}) as string)`;
@@ -83417,16 +83437,10 @@ function buildMessageRowLoop(opts) {
               -- outside date range; skip
             else` : "";
   const dateClose = dateFilter ? `end if` : "";
-  const attBulk = withAttachments ? `
-        set _atts to mail attachments of _msgs` : "";
   const attRow = withAttachments ? `
           set msgHasAtt to "false"
           try
-            if _bulkOK then
-              if (count of (item _i of _atts)) > 0 then set msgHasAtt to "true"
-            else
-              if (count of mail attachments of (item _i of _msgs)) > 0 then set msgHasAtt to "true"
-            end if
+            if (count of mail attachments of (item _i of _msgs)) > 0 then set msgHasAtt to "true"
           end try` : "";
   const attField = withAttachments ? ` & "${FIELD_SEP}" & msgHasAtt` : "";
   return `
@@ -83439,7 +83453,7 @@ function buildMessageRowLoop(opts) {
         set _dates to date received of _msgs
         set _reads to read status of _msgs
         set _flags to flagged status of _msgs
-        set _flagColors to flag index of _msgs${attBulk}
+        set _flagColors to flag index of _msgs
       on error
         set _bulkOK to false
       end try
@@ -84801,7 +84815,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         ignoring case
           if _wantNames contains (name of mb) then
             try
-              ${buildMessageRowLoop({ collection: `messages of mb ${searchCondition}`, limit, dedup: true, dateFilter, trailing: ` & "${FIELD_SEP}" & mbName` })}
+              ${buildMessageRowLoop({ collection: `messages of mb ${searchCondition}`, limit, dedup: true, dateFilter, withAttachments: true, trailing: ` & "${FIELD_SEP}" & mbName` })}
             on error _errMsg number _errNum
               set _timedOut to true
               set _notSearched to _notSearched & mbName & "${DIAG_ITEM_SEP}"
@@ -84823,7 +84837,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         set _notSearched to "${escapeForAppleScript(targetMailbox)}${DIAG_ITEM_SEP}"
       else
         try
-          ${buildMessageRowLoop({ collection: `messages of theMailbox ${searchCondition}`, limit, dateFilter })}
+          ${buildMessageRowLoop({ collection: `messages of theMailbox ${searchCondition}`, limit, dateFilter, withAttachments: true })}
         on error _errMsg number _errNum
           set _timedOut to true
           set _notSearched to "${escapeForAppleScript(targetMailbox)}${DIAG_ITEM_SEP}"
@@ -84861,7 +84875,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
             set _skipped to _skipped & mbName & " (" & (mbCount as string) & ")${DIAG_ITEM_SEP}"
           else
             try
-              ${buildMessageRowLoop({ collection: `messages of mb ${searchCondition}`, limit, dedup: true, dateFilter, trailing: ` & "${FIELD_SEP}" & mbName` })}
+              ${buildMessageRowLoop({ collection: `messages of mb ${searchCondition}`, limit, dedup: true, dateFilter, withAttachments: true, trailing: ` & "${FIELD_SEP}" & mbName` })}
             on error _errMsg number _errNum
               set _timedOut to true
               set _notSearched to _notSearched & mbName & "${DIAG_ITEM_SEP}"
@@ -85730,12 +85744,15 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
   }
   /**
    * Build and run the AppleScript compose for send-email (`send`) and
-   * create-draft (`draft`): pin the sender when `account` is given, verify it
-   * before the message leaves, and report the sender Mail actually used.
+   * create-draft (`draft`): pin the sender when `account` is given, wait for
+   * any attachments to load (attachmentSettleBlock), verify the sender before
+   * the message leaves, and report the sender Mail actually used. A draft is
+   * saved and closed explicitly rather than left to Mail's autosave (#293).
    */
   composeWithCommands(mode, recipientCommands, safeSubject, safeBody, account, attachmentCommands) {
     const sender = this.resolveSender(account);
     if ("error" in sender) return { success: false, error: sender.error };
+    const settle2 = attachmentSettleBlock("newMessage", countAttachmentCommands(attachmentCommands));
     const prefix = mode === "send" ? SENT_PREFIX : DRAFT_PREFIX;
     const script = buildAppLevelScript(`
         set newMessage to make new outgoing message with properties {subject:"${safeSubject}", content:"${safeBody}", visible:${mode === "send"}}
@@ -85743,9 +85760,9 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
           ${recipientCommands}
           ${sender.setSender}
           ${attachmentCommands}
-        end tell
+        end tell${settle2}
         ${sender.guard}
-        ${mode === "send" ? "send newMessage" : ""}
+        ${mode === "send" ? "send newMessage" : "save newMessage\n        close newMessage saving yes"}
         return "${prefix}" & actualSender
       `);
     const result = executeAppleScript(script, { timeoutMs: 6e4, maxRetries: 1 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-mail-mcp",
-  "version": "2.20.15",
+  "version": "2.20.17",
   "description": "MCP server for Apple Mail - read, search, send, and manage emails via Claude and other AI assistants",
   "type": "module",
   "main": "build/index.js",