apple-notes-mcp 2.5.8 → 2.5.10

package/README.md

@@ -943,6 +943,7 @@ All configuration is optional — the server works out of the box. Override beha
 |----------|---------|-------------|
 | `APPLE_NOTES_MCP_MAX_BUFFER` | `67108864` (64 MB) | Max bytes captured from a single AppleScript invocation. Raise it if a very large export/list is truncated; lower it to cap memory. |
 | `APPLE_NOTES_MCP_MAX_ATTACHMENT_BYTES` | `26214400` (25 MB) | Max size of an attachment that [`fetch-attachment`](#fetch-attachment) will base64-encode inline. Larger attachments are rejected with an error pointing at [`save-attachment`](#save-attachment) (which streams to disk and has no such limit). Raise it to fetch bigger attachments inline; lower it to cap memory. |
+| `APPLE_NOTES_MCP_MAX_INLINE_IMAGE_BYTES` | `262144` (256 KB) | Per-image cap on the base64 payload kept inline in a [`get-note-content`](#get-note-content) response. Inline images over the cap are replaced with placeholders (with a warning appended) so an image-heavy note cannot exceed the MCP client's message limit and drop the connection; export the real files with [`save-attachment`](#save-attachment) or [`fetch-attachment`](#fetch-attachment). Raise it to keep bigger images inline. |
 | `APPLE_NOTES_MCP_CONFIG_FILE` | `~/Library/Application Support/apple-notes-mcp/config.json` | Path to the JSON config file (see below). |
 | `APPLE_NOTES_MCP_TIMEOUT_MS` | `30000` (30 s) | Per-call AppleScript timeout. Raise it if full-library operations (large searches, exports) time out on a big Notes library. Per-call `timeoutMs` options still win. |
 | `APPLE_NOTES_MCP_MAX_RETRIES` | `2` | Total attempts for an AppleScript call that fails with a **transient** error (Notes.app busy / not responding / lost connection / timeout). `2` means one retry; set `1` to fail fast with no retries. Non-transient errors (e.g. "note not found") never retry. |

package/build/index.js

@@ -38656,7 +38656,7 @@ var StdioServerTransport = class {
 };
 
 // src/utils/applescript.ts
-import { execSync, spawnSync } from "child_process";
+import { execFileSync } from "child_process";
 var DEFAULT_TIMEOUT_MS = 3e4;
 var DEFAULT_MAX_BUFFER_BYTES = 64 * 1024 * 1024;
 function envPositiveNumber(name) {
@@ -38693,13 +38693,10 @@ function debugLog(message, data) {
     console.error(`[DEBUG ${timestamp}] ${message}`);
   }
 }
-function escapeForShell(script) {
-  return script.replace(/'/g, "'\\''");
-}
 function isTimeoutError(error2) {
   if (error2 instanceof Error) {
     const execError = error2;
-    return execError.killed === true || execError.signal === "SIGTERM";
+    return execError.code === "ETIMEDOUT" || execError.killed === true || execError.signal === "SIGKILL" || execError.signal === "SIGTERM";
   }
   return false;
 }
@@ -38714,13 +38711,7 @@ function isRetryableError(errorMessage) {
   return RETRYABLE_ERROR_PATTERNS.some((pattern) => pattern.test(errorMessage));
 }
 function sleep(ms) {
-  const seconds = ms / 1e3;
-  const result = spawnSync("sleep", [seconds.toString()], { stdio: "ignore" });
-  if (result.error) {
-    const end = Date.now() + ms;
-    while (Date.now() < end) {
-    }
-  }
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
 }
 var ERROR_MAPPINGS = [
   // Permission errors
@@ -38812,8 +38803,7 @@ function executeAppleScript(script, options = {}) {
       error: "Cannot execute empty AppleScript"
     };
   }
-  const preparedScript = escapeForShell(wrapWithTimeout(script.trim(), timeoutMs));
-  const command = `osascript -e '${preparedScript}'`;
+  const preparedScript = wrapWithTimeout(script.trim(), timeoutMs);
   debugLog("Executing AppleScript", {
     scriptPreview: script.trim().substring(0, 200) + (script.length > 200 ? "..." : ""),
     timeout: timeoutMs,
@@ -38824,7 +38814,8 @@ function executeAppleScript(script, options = {}) {
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     const attemptStart = Date.now();
     try {
-      const output = execSync(command, {
+      const output = execFileSync("osascript", ["-"], {
+        input: preparedScript,
         encoding: "utf8",
         timeout: timeoutMs,
         // SIGKILL (not the default SIGTERM): a wedged osascript blocked on an
@@ -38833,9 +38824,7 @@ function executeAppleScript(script, options = {}) {
         killSignal: "SIGKILL",
         // Raise the output cap above Node's 1 MB default so large exports /
         // long notes aren't truncated into an ENOBUFS failure. (#16)
-        maxBuffer: getMaxBuffer(),
-        // Capture stderr separately to get error details
-        stdio: ["pipe", "pipe", "pipe"]
+        maxBuffer: getMaxBuffer()
       });
       const duration3 = Date.now() - attemptStart;
       debugLog("AppleScript succeeded", {
@@ -38901,7 +38890,7 @@ function executeAppleScript(script, options = {}) {
 }
 
 // src/utils/checklistParser.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
 import * as zlib from "zlib";
 import * as fs from "fs";
 import * as path from "path";
@@ -38995,7 +38984,7 @@ var NOTES_DB_PATH = path.join(
 function hasFullDiskAccess() {
   try {
     if (!fs.existsSync(NOTES_DB_PATH)) return false;
-    execFileSync("sqlite3", ["-readonly", NOTES_DB_PATH, "SELECT 1;"], {
+    execFileSync2("sqlite3", ["-readonly", NOTES_DB_PATH, "SELECT 1;"], {
       encoding: "utf8",
       timeout: 3e3,
       stdio: ["pipe", "pipe", "pipe"]
@@ -39014,7 +39003,7 @@ function queryNoteData(noteId) {
   const pk = pkMatch[1];
   const query = `SELECT hex(nd.ZDATA) FROM ZICNOTEDATA nd JOIN ZICCLOUDSYNCINGOBJECT n ON nd.ZNOTE = n.Z_PK WHERE n.Z_PK = ${pk};`;
   try {
-    const result = execFileSync("sqlite3", ["-readonly", NOTES_DB_PATH, query], {
+    const result = execFileSync2("sqlite3", ["-readonly", NOTES_DB_PATH, query], {
       encoding: "utf8",
       timeout: 5e3,
       stdio: ["pipe", "pipe", "pipe"]
@@ -39140,11 +39129,21 @@ function getChecklistItems(noteId) {
 }
 
 // src/utils/attachmentFs.ts
-import { existsSync as existsSync2, mkdtempSync, readFileSync, rmSync, statSync } from "fs";
-import { isAbsolute, resolve, sep } from "path";
+import { existsSync as existsSync2, mkdirSync, mkdtempSync, readFileSync, rmSync, statSync } from "fs";
+import { dirname, isAbsolute, resolve, sep } from "path";
 import { homedir as homedir2, tmpdir } from "os";
 function allowedSaveRoots() {
-  return [resolve(homedir2()), resolve(tmpdir()), "/Volumes", "/private/var/folders", "/tmp"];
+  return [
+    resolve(homedir2()),
+    resolve(tmpdir()),
+    "/Volumes",
+    "/private/var/folders",
+    "/tmp",
+    "/private/tmp"
+  ];
+}
+function ensureParentDir(abs) {
+  mkdirSync(dirname(abs), { recursive: true });
 }
 function assertSafeSavePath(p, roots = allowedSaveRoots()) {
   if (!p || !p.trim()) throw new Error("A destination path is required.");
@@ -39282,6 +39281,10 @@ function buildAppleScriptDateVar(date3, varName = "thresholdDate") {
 function asDatePartsExpr(v) {
   return `((year of ${v}) as text) & "-" & ((month of ${v}) as integer as text) & "-" & ((day of ${v}) as text) & "-" & ((hours of ${v}) as text) & "-" & ((minutes of ${v}) as text) & "-" & ((seconds of ${v}) as text)`;
 }
+function normalizeAppleScriptText(field) {
+  const trimmed = field?.trim();
+  return trimmed && trimmed !== "missing value" ? trimmed : void 0;
+}
 function parseNotePropertiesOutput(output) {
   const parts = output.split(FIELD_SEP);
   if (parts.length < 6) {
@@ -40471,7 +40474,7 @@ var AppleNotesManager = class {
           end if
         end repeat
         if theAttachment is missing value then
-          return "ERR${AS_FIELD_SEP}attachment not found"
+          return "ERR" & ${AS_FIELD_SEP} & "attachment not found"
         end if
         show theAttachment${separatelyClause}
         return "OK"
@@ -40737,8 +40740,8 @@ var AppleNotesManager = class {
           set end of attachmentList to attachId & ${AS_FIELD_SEP} & attachName & ${AS_FIELD_SEP} & attachContentId & ${AS_FIELD_SEP} & attachUrl & ${AS_FIELD_SEP} & createdParts & ${AS_FIELD_SEP} & modifiedParts & ${AS_FIELD_SEP} & sharedFlag
         end repeat
         set output to ""
-        repeat with item in attachmentList
-          set output to output & item & ${AS_RECORD_SEP}
+        repeat with recordItem in attachmentList
+          set output to output & recordItem & ${AS_RECORD_SEP}
         end repeat
         return output
       end tell
@@ -40760,7 +40763,7 @@ var AppleNotesManager = class {
           name: parts[1].trim(),
           contentType: parts[2].trim(),
           contentId: parts[2].trim() || void 0,
-          url: parts[3]?.trim() || void 0,
+          url: normalizeAppleScriptText(parts[3]),
           created: parts[4] ? parseAppleScriptDate(parts[4].trim()) : void 0,
           modified: parts[5] ? parseAppleScriptDate(parts[5].trim()) : void 0,
           shared: parts[6] ? parts[6].trim().toLowerCase() === "true" : void 0
@@ -40801,8 +40804,8 @@ var AppleNotesManager = class {
           set end of attachmentList to attachId & ${AS_FIELD_SEP} & attachName & ${AS_FIELD_SEP} & attachContentId & ${AS_FIELD_SEP} & attachUrl & ${AS_FIELD_SEP} & createdParts & ${AS_FIELD_SEP} & modifiedParts & ${AS_FIELD_SEP} & sharedFlag
         end repeat
           set output to ""
-          repeat with item in attachmentList
-            set output to output & item & ${AS_RECORD_SEP}
+          repeat with recordItem in attachmentList
+            set output to output & recordItem & ${AS_RECORD_SEP}
           end repeat
           return output
         end tell
@@ -40825,7 +40828,7 @@ var AppleNotesManager = class {
           name: parts[1].trim(),
           contentType: parts[2].trim(),
           contentId: parts[2].trim() || void 0,
-          url: parts[3]?.trim() || void 0,
+          url: normalizeAppleScriptText(parts[3]),
           created: parts[4] ? parseAppleScriptDate(parts[4].trim()) : void 0,
           modified: parts[5] ? parseAppleScriptDate(parts[5].trim()) : void 0,
           shared: parts[6] ? parts[6].trim().toLowerCase() === "true" : void 0
@@ -40847,6 +40850,7 @@ var AppleNotesManager = class {
     let abs;
     try {
       abs = assertSafeSavePath(savePath);
+      ensureParentDir(abs);
     } catch (e) {
       return { success: false, error: e instanceof Error ? e.message : String(e) };
     }
@@ -40864,10 +40868,18 @@ var AppleNotesManager = class {
           end if
         end repeat
         if theAttachment is missing value then
-          return "ERR${AS_FIELD_SEP}attachment not found"
+          return "ERR" & ${AS_FIELD_SEP} & "attachment not found"
         end if
-        save theAttachment in (POSIX file "${safePath}")
-        return "OK${AS_FIELD_SEP}" & (name of theAttachment) & "${AS_FIELD_SEP}" & (content identifier of theAttachment)
+        set attachUrl to ""
+        try
+          set attachUrl to URL of theAttachment as text
+        end try
+        try
+          save theAttachment in (POSIX file "${safePath}")
+        on error errMsg
+          return "ERRSAVE" & ${AS_FIELD_SEP} & errMsg & ${AS_FIELD_SEP} & attachUrl
+        end try
+        return "OK" & ${AS_FIELD_SEP} & (name of theAttachment) & ${AS_FIELD_SEP} & (content identifier of theAttachment)
       end tell
     `;
     const result = executeAppleScript(script);
@@ -40875,6 +40887,16 @@ var AppleNotesManager = class {
       return { success: false, error: result.error ?? "unknown error" };
     }
     const parts = (result.output ?? "").trim().split(FIELD_SEP);
+    if (parts[0] === "ERRSAVE") {
+      const saveErr = (parts[1]?.trim() || "unknown error").replace(/\.$/, "");
+      const rawUrl = parts[2]?.trim();
+      const attachUrl = rawUrl && rawUrl !== "missing value" ? rawUrl : void 0;
+      const linkHint = attachUrl ? ` This attachment appears to be a link preview (URL: ${attachUrl}) rather than a file, and link previews have no file payload to save.` : "";
+      return {
+        success: false,
+        error: `Notes could not save this attachment: ${saveErr}.${linkHint}`
+      };
+    }
     if (parts[0] !== "OK") {
       return { success: false, error: parts[1]?.trim() || "attachment not found" };
     }
@@ -41333,7 +41355,7 @@ var AppleNotesManager = class {
 };
 
 // src/utils/syncDetection.ts
-import { execFileSync as execFileSync2 } from "child_process";
+import { execFileSync as execFileSync3 } from "child_process";
 import * as fs2 from "fs";
 import * as path2 from "path";
 import * as os2 from "os";
@@ -41374,7 +41396,7 @@ function getSyncStatus(useCache = true) {
       WHERE ZCURRENTLOCALVERSION > ZLATESTVERSIONSYNCEDTOCLOUD
       AND ZLATESTVERSIONSYNCEDTOCLOUD IS NOT NULL;
     `;
-    const result = execFileSync2(
+    const result = execFileSync3(
       "sqlite3",
       ["-readonly", NOTES_DB_PATH2, query.replace(/\n/g, " ")],
       {
@@ -41433,7 +41455,7 @@ function withSyncAwarenessSync(operation, fn) {
 }
 
 // src/utils/noteMetadata.ts
-import { execFileSync as execFileSync3 } from "child_process";
+import { execFileSync as execFileSync4 } from "child_process";
 import * as fs3 from "fs";
 import * as path3 from "path";
 import * as os3 from "os";
@@ -41454,7 +41476,7 @@ var COLUMN_MAP = [
   { key: "smartFolderQuery", column: "ZSMARTFOLDERQUERYJSON", type: "text" }
 ];
 function runSqlite(query) {
-  return execFileSync3("sqlite3", ["-readonly", NOTES_DB_PATH3, query], {
+  return execFileSync4("sqlite3", ["-readonly", NOTES_DB_PATH3, query], {
     encoding: "utf8",
     timeout: 5e3,
     stdio: ["pipe", "pipe", "pipe"]
@@ -41552,8 +41574,48 @@ function parseHashtags(body) {
   return result;
 }
 
+// src/utils/inlineImages.ts
+var DEFAULT_MAX_INLINE_IMAGE_BYTES = 256 * 1024;
+function maxInlineImageBytes(env = process.env) {
+  const raw = env.APPLE_NOTES_MCP_MAX_INLINE_IMAGE_BYTES;
+  if (raw !== void 0) {
+    const n = Number(raw);
+    if (Number.isFinite(n) && n > 0) return n;
+  }
+  return DEFAULT_MAX_INLINE_IMAGE_BYTES;
+}
+function formatBytes(bytes) {
+  if (bytes >= 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+  if (bytes >= 1024) return `${Math.round(bytes / 1024)} KB`;
+  return `${bytes} B`;
+}
+var INLINE_IMG_RE = /<img\b[^>]*\bsrc\s*=\s*(["'])data:([^;'"]+);base64,([^"']*)\1[^>]*\/?>/gi;
+function stripLargeInlineImages(html, maxBytes = maxInlineImageBytes()) {
+  let strippedCount = 0;
+  let strippedBytes = 0;
+  const result = html.replace(INLINE_IMG_RE, (tag, _quote, mediaType, b64) => {
+    if (b64.length <= maxBytes) return tag;
+    const decodedBytes = Math.floor(b64.length * 3 / 4);
+    strippedCount += 1;
+    strippedBytes += decodedBytes;
+    return `<div>[inline image omitted: ${mediaType}, ~${formatBytes(
+      decodedBytes
+    )}; use list-attachments and save-attachment or fetch-attachment to export it]</div>`;
+  });
+  return { html: result, strippedCount, strippedBytes };
+}
+function strippedImagesWarning(stripped) {
+  if (stripped.strippedCount === 0) return null;
+  const plural = stripped.strippedCount === 1 ? "image" : "images";
+  return `
+
+\u26A0\uFE0F ${stripped.strippedCount} inline ${plural} (~${formatBytes(
+    stripped.strippedBytes
+  )} decoded) exceeded the per-image inline cap and ${stripped.strippedCount === 1 ? "was" : "were"} replaced with placeholders so the response stays within MCP message limits. The images are still in the note: use list-attachments with save-attachment or fetch-attachment to export them, or raise APPLE_NOTES_MCP_MAX_INLINE_IMAGE_BYTES.`;
+}
+
 // src/tools/doctor.ts
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync } from "child_process";
 function runDoctor(manager) {
   const checks = [];
   const hc = manager.healthCheck();
@@ -41591,7 +41653,7 @@ function runDoctor(manager) {
 function checkNodeRuntimeSignature() {
   const name = "Node runtime signature";
   try {
-    const r = spawnSync2("codesign", ["-dvvv", process.execPath], { encoding: "utf8" });
+    const r = spawnSync("codesign", ["-dvvv", process.execPath], { encoding: "utf8" });
     const out = `${r.stdout ?? ""}${r.stderr ?? ""}`;
     if (r.error || !out.trim()) {
       return {
@@ -41911,12 +41973,19 @@ server.registerTool(
           `Note "${note2.title}" is password-protected and cannot be read. Unlock it in Notes.app first.`
         );
       }
-      const content2 = notesManager.getNoteContentById(id);
-      if (!content2) {
+      const rawContent2 = notesManager.getNoteContentById(id);
+      if (!rawContent2) {
         return errorResponse(`Failed to read content of note "${note2.title}"`);
       }
+      const stripped2 = stripLargeInlineImages(rawContent2);
+      const content2 = stripped2.html;
       const hashtags2 = parseHashtags(content2);
-      return successResponse(content2, { title: note2.title, content: content2, hashtags: hashtags2 });
+      const warning2 = strippedImagesWarning(stripped2);
+      return successResponse(warning2 ? content2 + warning2 : content2, {
+        title: note2.title,
+        content: content2,
+        hashtags: hashtags2
+      });
     }
     if (!title) {
       return errorResponse("Either 'id' or 'title' is required");
@@ -41930,12 +41999,15 @@ server.registerTool(
         `Note "${title}" is password-protected and cannot be read. Unlock it in Notes.app first.`
       );
     }
-    const content = notesManager.getNoteContent(title, account);
-    if (!content) {
+    const rawContent = notesManager.getNoteContent(title, account);
+    if (!rawContent) {
       return errorResponse(`Failed to read content of note "${title}"`);
     }
+    const stripped = stripLargeInlineImages(rawContent);
+    const content = stripped.html;
     const hashtags = parseHashtags(content);
-    return successResponse(content, { title, content, hashtags });
+    const warning = strippedImagesWarning(stripped);
+    return successResponse(warning ? content + warning : content, { title, content, hashtags });
   }, "Error retrieving note content")
 );
 server.registerTool(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-notes-mcp",
-  "version": "2.5.8",
+  "version": "2.5.10",
   "description": "MCP server for Apple Notes - create, search, update, and manage notes via Claude and other AI assistants",
   "type": "module",
   "main": "build/index.js",