apple-tools-mcp 3.0.2 → 3.0.3

package/lib/mailWrite.js

@@ -31,6 +31,7 @@ import {
   isHardTccDenial
 } from "./appleScript.js";
 import { isIndexerMode } from "./processMode.js";
+import { safeSpawn } from "./shell.js";
 import {
   planWrite,
   plannedWriteResult,
@@ -160,6 +161,21 @@ export const BODY_PASTE_MISDIRECTED_SENTINEL = "BODY_PASTE_MISDIRECTED";
 export const BODY_FOCUS_FAILED_SENTINEL = "BODY_FOCUS_FAILED";
 /** Focus request ran, but the re-read AXFocusedUIElement was not the chosen body. */
 export const BODY_FOCUS_UNPROVEN_SENTINEL = "BODY_FOCUS_UNPROVEN";
+/** System Events sees 0 Mail windows (display asleep) while Mail AppleScript still lists the compose. */
+export const DISPLAY_ASLEEP_GUI_UNAVAILABLE_SENTINEL = "DISPLAY_ASLEEP_GUI_UNAVAILABLE";
+export const DISPLAY_WAKE_SECONDS = 15;
+export const DISPLAY_WAKE_POLL_ATTEMPTS = 20;
+
+/** Declare user activity so a sleeping display wakes before GUI scripting. Best-effort; never throws. */
+export function wakeDisplay() {
+  if (process.platform !== "darwin" || process.env.VITEST) return false;
+  try {
+    return safeSpawn("/usr/bin/caffeinate", ["-u", "-t", String(DISPLAY_WAKE_SECONDS)], { timeout: 5000 }).status === 0;
+  } catch {
+    return false;
+  }
+}
+
 /** Mail To: recipient chips surface as U+FFFC (object replacement), not body text. */
 export const MAIL_RECIPIENT_TOKEN_CHAR_ID = 65532;
 export const GUI_SCRIPTING_UNAVAILABLE_SENTINEL = "GUI_SCRIPTING_UNAVAILABLE";
@@ -630,6 +646,11 @@ on atmFillMailBody(bodyText, needle, titleMarker, msg)
       tell application "System Events"
         tell process "Mail"
           set frontmost to true
+          repeat ${DISPLAY_WAKE_POLL_ATTEMPTS} times
+            if (count of (every window)) > 0 then exit repeat
+            delay 0.5
+          end repeat
+          set atmSeWindowCount to count of (every window)
           delay 0.3
           set atmWin to missing value
           repeat with atmCand in windows
@@ -658,6 +679,7 @@ on atmFillMailBody(bodyText, needle, titleMarker, msg)
               end if
             end repeat
           end if
+          if atmWin is missing value and atmSeWindowCount is 0 then error "${DISPLAY_ASLEEP_GUI_UNAVAILABLE_SENTINEL}"
           if atmWin is missing value then error "${BODY_FOCUS_FAILED_SENTINEL}"
           try
             perform action "AXRaise" of atmWin
@@ -744,6 +766,7 @@ on atmFillMailBody(bodyText, needle, titleMarker, msg)
   on error errMsg number errNum
     if errMsg contains "assistive access" or errNum is -25211 then error "${ACCESSIBILITY_DENIED_SENTINEL}"
     if errMsg contains "${GUI_SCRIPTING_UNAVAILABLE_SENTINEL}" then error "${GUI_SCRIPTING_UNAVAILABLE_SENTINEL}"
+    if errMsg contains "${DISPLAY_ASLEEP_GUI_UNAVAILABLE_SENTINEL}" then error "${DISPLAY_ASLEEP_GUI_UNAVAILABLE_SENTINEL}"
     error errMsg number errNum
   end try
 end atmFillMailBody`;
@@ -1292,6 +1315,9 @@ function failure(action, summary, result, secrets) {
   if (err.includes("gui_scripting_unavailable")) {
     return `${action} failed — attempted to ${summary}. ${MAIL_GUI_SCRIPTING_GUIDANCE}`;
   }
+  if (err.includes("display_asleep_gui_unavailable")) {
+    return `${action} failed — attempted to ${summary}. The display is asleep, so System Events cannot see Mail's compose window (GUI unavailable even after a wake attempt); nothing was sent. Wake the display and retry.`;
+  }
   if (err.includes("body_focus_unproven")) {
     return `${action} failed — attempted to ${summary}. Keyboard focus was not on the message body (focus proof failed); the draft was discarded and nothing was sent.`;
   }
@@ -1480,6 +1506,7 @@ export function mailCompose(args = {}, { draft = false, indexerMode = isIndexerM
   });
 
   const deadlineMs = sentVerifyClock.now() + MCP_CALL_DEADLINE_MS;
+  wakeDisplay();
   const result = runAppleScript(script, { timeout: MAIL_COMPOSE_TIMEOUT_MS, appName: "Mail" });
   if (
     !result.ok &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-tools-mcp",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "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",