apple-notes-mcp 2.0.0 → 2.0.1

package/build/services/appleNotesManager.js

@@ -634,7 +634,7 @@ export class AppleNotesManager {
      */
     searchNotes(query, searchContent = false, account, folder, modifiedSince, limit) {
         const targetAccount = this.resolveAccount(account);
-        const safeQuery = escapeForAppleScript(query);
+        const safeQuery = escapePlainStringForAppleScript(query);
         const safeLimit = limit !== undefined && limit > 0 ? Math.floor(limit) : undefined;
         // Build the where clause based on search type
         // AppleScript uses 'name' for title and 'body' for content
@@ -738,7 +738,7 @@ export class AppleNotesManager {
      */
     getNoteContent(title, account) {
         const targetAccount = this.resolveAccount(account);
-        const safeTitle = escapeForAppleScript(title);
+        const safeTitle = escapePlainStringForAppleScript(title);
         // Retrieve the body property of the note
         const getCommand = `get body of note "${safeTitle}"`;
         const script = buildAccountScopedScript({ account: targetAccount }, getCommand);
@@ -830,7 +830,7 @@ export class AppleNotesManager {
      */
     getNoteDetails(title, account) {
         const targetAccount = this.resolveAccount(account);
-        const safeTitle = escapeForAppleScript(title);
+        const safeTitle = escapePlainStringForAppleScript(title);
         // Fetch multiple properties at once
         const getCommand = `
       set n to note "${safeTitle}"
@@ -875,7 +875,7 @@ export class AppleNotesManager {
      */
     deleteNote(title, account) {
         const targetAccount = this.resolveAccount(account);
-        const safeTitle = escapeForAppleScript(title);
+        const safeTitle = escapePlainStringForAppleScript(title);
         const deleteCommand = `delete note "${safeTitle}"`;
         const script = buildAccountScopedScript({ account: targetAccount }, deleteCommand);
         const result = executeAppleScript(script);
@@ -931,7 +931,7 @@ export class AppleNotesManager {
             validateLength(newTitle, MAX_TITLE_LENGTH, "Note title");
         validateLength(newContent, MAX_CONTENT_LENGTH, "Note content");
         const targetAccount = this.resolveAccount(account);
-        const safeCurrentTitle = escapeForAppleScript(title);
+        const safeCurrentTitle = escapePlainStringForAppleScript(title);
         let fullBody;
         if (format === "html") {
             // HTML mode: content is the complete body, escaped only for AppleScript string
@@ -1251,7 +1251,7 @@ export class AppleNotesManager {
                 continue;
             }
             // Folder doesn't exist — create it
-            const segmentName = escapeForAppleScript(parts[i]);
+            const segmentName = escapePlainStringForAppleScript(parts[i]);
             let createCommand;
             if (i === 0) {
                 createCommand = `make new folder with properties {name:"${segmentName}"}`;
@@ -1699,7 +1699,7 @@ export class AppleNotesManager {
      */
     listAttachments(title, account) {
         const targetAccount = this.resolveAccount(account);
-        const safeTitle = escapeForAppleScript(title);
+        const safeTitle = escapePlainStringForAppleScript(title);
         const script = `
       tell application "Notes"
         tell account "${targetAccount}"
@@ -1759,8 +1759,8 @@ export class AppleNotesManager {
             return { success: false, error: e instanceof Error ? e.message : String(e) };
         }
         const safeNoteId = sanitizeId(noteId);
-        const safeAttId = escapeForAppleScript(attachmentId);
-        const safePath = escapeForAppleScript(abs);
+        const safeAttId = escapePlainStringForAppleScript(attachmentId);
+        const safePath = escapePlainStringForAppleScript(abs);
         const script = `
       tell application "Notes"
         set theNote to note id "${safeNoteId}"

package/build/services/appleNotesManager.test.js

@@ -633,6 +633,15 @@ describe("AppleNotesManager", () => {
             const content = manager.getNoteContent("Missing Note");
             expect(content).toBe("");
         });
+        it("looks up titles containing & literally, not HTML-escaped (regression)", () => {
+            // Bug found in live testing: titles with "&" were HTML-escaped to "&"
+            // in the `note "..."` lookup, so the note could never be found.
+            mockExecuteAppleScript.mockReturnValue({ success: true, output: "<div>x</div>" });
+            manager.getNoteContent("Tom & Jerry", "iCloud");
+            const script = mockExecuteAppleScript.mock.calls[0][0];
+            expect(script).toContain("Tom & Jerry");
+            expect(script).not.toContain("Tom &amp; Jerry");
+        });
         it("uses specified account", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,

package/package.json

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