apple-notes-mcp 1.4.3 → 2.0.0

package/build/services/appleNotesManager.test.js

@@ -25,6 +25,11 @@ import { executeAppleScript } from "../utils/applescript.js";
 const mockExecuteAppleScript = vi.mocked(executeAppleScript);
 import { getChecklistItems } from "../utils/checklistParser.js";
 const mockGetChecklistItems = vi.mocked(getChecklistItems);
+// Result delimiters (#18) — must match appleNotesManager.ts.
+// FIELD_SEP (US, \x1f) separates fields within a record;
+// RECORD_SEP (RS, \x1e) separates records within a list.
+const F = "\x1f";
+const R = "\x1e";
 // =============================================================================
 // Text Escaping Tests
 // =============================================================================
@@ -191,6 +196,23 @@ describe("parseAppleScriptDate", () => {
             expect(evening.getHours()).toBe(21);
         });
     });
+    describe("locale-independent numeric format (#25)", () => {
+        it("parses the Y-M-D-H-m-s form emitted by our producers", () => {
+            const result = parseAppleScriptDate("2025-12-27-15-44-2");
+            expect(result.getFullYear()).toBe(2025);
+            expect(result.getMonth()).toBe(11);
+            expect(result.getDate()).toBe(27);
+            expect(result.getHours()).toBe(15);
+            expect(result.getMinutes()).toBe(44);
+            expect(result.getSeconds()).toBe(2);
+        });
+        it("handles single-digit components and midnight", () => {
+            const result = parseAppleScriptDate("2025-1-5-0-0-0");
+            expect(result.getMonth()).toBe(0);
+            expect(result.getDate()).toBe(5);
+            expect(result.getHours()).toBe(0);
+        });
+    });
     describe("fallback behavior", () => {
         it("returns current date for invalid input", () => {
             const before = new Date();
@@ -242,7 +264,7 @@ describe("buildFolderReference", () => {
     it("handles special characters in folder names", () => {
         const result = buildFolderReference("Food & Drink/🥘 Recipes");
         expect(result).toContain('folder "🥘 Recipes"');
-        expect(result).toContain('folder "Food & Drink"');
+        expect(result).toContain('folder "Food & Drink"');
     });
     it("handles escaped slashes in folder names", () => {
         const result = buildFolderReference("Travel/Spain\\/Portugal 2023");
@@ -437,7 +459,11 @@ describe("AppleNotesManager", () => {
         it("returns array of matching notes with folder info", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Meeting Notes|||x-coredata://ABC/ICNote/p1|||Work|||ITEM|||Project Plan|||x-coredata://ABC/ICNote/p2|||Notes|||ITEM|||Weekly Review|||x-coredata://ABC/ICNote/p3|||Archive",
+                output: [
+                    ["Meeting Notes", "x-coredata://ABC/ICNote/p1", "Work"].join(F),
+                    ["Project Plan", "x-coredata://ABC/ICNote/p2", "Notes"].join(F),
+                    ["Weekly Review", "x-coredata://ABC/ICNote/p3", "Archive"].join(F),
+                ].join(R),
             });
             const results = manager.searchNotes("notes");
             expect(results).toHaveLength(3);
@@ -459,19 +485,18 @@ describe("AppleNotesManager", () => {
             const results = manager.searchNotes("nonexistent");
             expect(results).toHaveLength(0);
         });
-        it("returns empty array on AppleScript error", () => {
+        it("throws on AppleScript error rather than returning empty (#19)", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: false,
                 output: "",
                 error: "Search failed",
             });
-            const results = manager.searchNotes("test");
-            expect(results).toHaveLength(0);
+            expect(() => manager.searchNotes("test")).toThrow(/Search failed/);
         });
         it("searches content when searchContent is true", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note with keyword|||x-coredata://ABC/ICNote/p1|||Notes",
+                output: ["Note with keyword", "x-coredata://ABC/ICNote/p1", "Notes"].join(F),
             });
             manager.searchNotes("project alpha", true);
             expect(mockExecuteAppleScript).toHaveBeenCalledWith(expect.stringContaining('body contains "project alpha"'));
@@ -479,7 +504,7 @@ describe("AppleNotesManager", () => {
         it("searches titles when searchContent is false", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Project Alpha Notes|||x-coredata://ABC/ICNote/p1|||Notes",
+                output: ["Project Alpha Notes", "x-coredata://ABC/ICNote/p1", "Notes"].join(F),
             });
             manager.searchNotes("Project Alpha", false);
             expect(mockExecuteAppleScript).toHaveBeenCalledWith(expect.stringContaining('name contains "Project Alpha"'));
@@ -487,7 +512,10 @@ describe("AppleNotesManager", () => {
         it("identifies notes in Recently Deleted folder", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Old Note|||x-coredata://ABC/ICNote/p1|||Recently Deleted|||ITEM|||Active Note|||x-coredata://ABC/ICNote/p2|||Notes",
+                output: [
+                    ["Old Note", "x-coredata://ABC/ICNote/p1", "Recently Deleted"].join(F),
+                    ["Active Note", "x-coredata://ABC/ICNote/p2", "Notes"].join(F),
+                ].join(R),
             });
             const results = manager.searchNotes("note");
             expect(results).toHaveLength(2);
@@ -509,7 +537,7 @@ describe("AppleNotesManager", () => {
         it("limits search to specified folder", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Work Note|||x-coredata://ABC/ICNote/p1|||Work",
+                output: ["Work Note", "x-coredata://ABC/ICNote/p1", "Work"].join(F),
             });
             manager.searchNotes("note", false, undefined, "Work");
             expect(mockExecuteAppleScript).toHaveBeenCalledWith(expect.stringContaining('notes of folder "Work"'));
@@ -527,7 +555,7 @@ describe("AppleNotesManager", () => {
         it("adds date filter when modifiedSince is provided", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Recent Note|||x-coredata://ABC/ICNote/p1|||Notes",
+                output: ["Recent Note", "x-coredata://ABC/ICNote/p1", "Notes"].join(F),
             });
             manager.searchNotes("note", false, undefined, undefined, "2025-06-15T00:00:00");
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -542,7 +570,7 @@ describe("AppleNotesManager", () => {
         it("combines date filter with content search", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note|||x-coredata://ABC/ICNote/p1|||Notes",
+                output: ["Note", "x-coredata://ABC/ICNote/p1", "Notes"].join(F),
             });
             manager.searchNotes("keyword", true, undefined, undefined, "2025-01-01");
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -553,7 +581,7 @@ describe("AppleNotesManager", () => {
         it("ignores invalid modifiedSince date", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note|||x-coredata://ABC/ICNote/p1|||Notes",
+                output: ["Note", "x-coredata://ABC/ICNote/p1", "Notes"].join(F),
             });
             manager.searchNotes("note", false, undefined, undefined, "not-a-date");
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -562,7 +590,7 @@ describe("AppleNotesManager", () => {
         it("applies limit to search results", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note 1|||x-coredata://ABC/ICNote/p1|||Notes",
+                output: ["Note 1", "x-coredata://ABC/ICNote/p1", "Notes"].join(F),
             });
             manager.searchNotes("note", false, undefined, undefined, undefined, 5);
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -572,7 +600,7 @@ describe("AppleNotesManager", () => {
         it("combines modifiedSince, limit, folder, and content search", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note|||x-coredata://ABC/ICNote/p1|||Work",
+                output: ["Note", "x-coredata://ABC/ICNote/p1", "Work"].join(F),
             });
             manager.searchNotes("project", true, "iCloud", "Work", "2025-03-01", 10);
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -621,7 +649,14 @@ describe("AppleNotesManager", () => {
         it("returns true when note is password-protected", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Locked Note, x-coredata://ABC/ICNote/p1, date Monday, January 1, 2024 at 12:00:00 PM, date Monday, January 1, 2024 at 12:00:00 PM, false, true",
+                output: [
+                    "Locked Note",
+                    "x-coredata://ABC/ICNote/p1",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "false",
+                    "true",
+                ].join(F),
             });
             const result = manager.isNotePasswordProtected("Locked Note");
             expect(result).toBe(true);
@@ -629,7 +664,14 @@ describe("AppleNotesManager", () => {
         it("returns false when note is not password-protected", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Open Note, x-coredata://ABC/ICNote/p2, date Monday, January 1, 2024 at 12:00:00 PM, date Monday, January 1, 2024 at 12:00:00 PM, false, false",
+                output: [
+                    "Open Note",
+                    "x-coredata://ABC/ICNote/p2",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "false",
+                    "false",
+                ].join(F),
             });
             const result = manager.isNotePasswordProtected("Open Note");
             expect(result).toBe(false);
@@ -648,7 +690,14 @@ describe("AppleNotesManager", () => {
         it("returns true when note is password-protected", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Locked Note, x-coredata://ABC/ICNote/p1, date Monday, January 1, 2024 at 12:00:00 PM, date Monday, January 1, 2024 at 12:00:00 PM, false, true",
+                output: [
+                    "Locked Note",
+                    "x-coredata://ABC/ICNote/p1",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "false",
+                    "true",
+                ].join(F),
             });
             const result = manager.isNotePasswordProtectedById("x-coredata://ABC/ICNote/p1");
             expect(result).toBe(true);
@@ -656,7 +705,14 @@ describe("AppleNotesManager", () => {
         it("returns false when note is not password-protected", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Open Note, x-coredata://ABC/ICNote/p2, date Monday, January 1, 2024 at 12:00:00 PM, date Monday, January 1, 2024 at 12:00:00 PM, false, false",
+                output: [
+                    "Open Note",
+                    "x-coredata://ABC/ICNote/p2",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "false",
+                    "false",
+                ].join(F),
             });
             const result = manager.isNotePasswordProtectedById("x-coredata://ABC/ICNote/p2");
             expect(result).toBe(false);
@@ -678,7 +734,14 @@ describe("AppleNotesManager", () => {
         it("returns Note object with metadata for valid ID", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "My Note, x-coredata://ABC123/ICNote/p100, date Saturday, December 27, 2025 at 3:00:00 PM, date Saturday, December 27, 2025 at 4:00:00 PM, false, false",
+                output: [
+                    "My Note",
+                    "x-coredata://ABC123/ICNote/p100",
+                    "Saturday, December 27, 2025 at 3:00:00 PM",
+                    "Saturday, December 27, 2025 at 4:00:00 PM",
+                    "false",
+                    "false",
+                ].join(F),
             });
             const result = manager.getNoteById("x-coredata://ABC123/ICNote/p100");
             expect(result).not.toBeNull();
@@ -716,7 +779,14 @@ describe("AppleNotesManager", () => {
         it("correctly parses shared and passwordProtected as true", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Shared Note, x-coredata://ABC/ICNote/p1, date Monday, January 1, 2025 at 12:00:00 PM, date Monday, January 1, 2025 at 12:00:00 PM, true, true",
+                output: [
+                    "Shared Note",
+                    "x-coredata://ABC/ICNote/p1",
+                    "Monday, January 1, 2025 at 12:00:00 PM",
+                    "Monday, January 1, 2025 at 12:00:00 PM",
+                    "true",
+                    "true",
+                ].join(F),
             });
             const result = manager.getNoteById("x-coredata://ABC/ICNote/p1");
             expect(result?.shared).toBe(true);
@@ -730,7 +800,14 @@ describe("AppleNotesManager", () => {
         it("returns Note object with full metadata", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Project Notes, x-coredata://ABC123/ICNote/p200, date Friday, December 20, 2025 at 10:00:00 AM, date Saturday, December 27, 2025 at 2:30:00 PM, false, false",
+                output: [
+                    "Project Notes",
+                    "x-coredata://ABC123/ICNote/p200",
+                    "Friday, December 20, 2025 at 10:00:00 AM",
+                    "Saturday, December 27, 2025 at 2:30:00 PM",
+                    "false",
+                    "false",
+                ].join(F),
             });
             const result = manager.getNoteDetails("Project Notes");
             expect(result).not.toBeNull();
@@ -750,7 +827,14 @@ describe("AppleNotesManager", () => {
         it("uses specified account", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note, id123, date Monday, January 1, 2025 at 12:00:00 PM, date Monday, January 1, 2025 at 12:00:00 PM, false, false",
+                output: [
+                    "Note",
+                    "id123",
+                    "Monday, January 1, 2025 at 12:00:00 PM",
+                    "Monday, January 1, 2025 at 12:00:00 PM",
+                    "false",
+                    "false",
+                ].join(F),
             });
             const result = manager.getNoteDetails("My Note", "Exchange");
             expect(result?.account).toBe("Exchange");
@@ -759,7 +843,14 @@ describe("AppleNotesManager", () => {
         it("handles shared notes correctly", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Shared Doc, id456, date Monday, January 1, 2025 at 12:00:00 PM, date Monday, January 1, 2025 at 12:00:00 PM, true, false",
+                output: [
+                    "Shared Doc",
+                    "id456",
+                    "Monday, January 1, 2025 at 12:00:00 PM",
+                    "Monday, January 1, 2025 at 12:00:00 PM",
+                    "true",
+                    "false",
+                ].join(F),
             });
             const result = manager.getNoteDetails("Shared Doc");
             expect(result?.shared).toBe(true);
@@ -902,7 +993,7 @@ describe("AppleNotesManager", () => {
         it("returns array of note titles", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note A, Note B, Note C",
+                output: ["Note A", "Note B", "Note C"].join(R),
             });
             const titles = manager.listNotes();
             expect(titles).toEqual(["Note A", "Note B", "Note C"]);
@@ -910,24 +1001,23 @@ describe("AppleNotesManager", () => {
         it("filters out empty entries", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note A, , Note B, , ",
+                output: ["Note A", "", "Note B", "", ""].join(R),
             });
             const titles = manager.listNotes();
             expect(titles).toEqual(["Note A", "Note B"]);
         });
-        it("returns empty array on failure", () => {
+        it("throws on failure rather than returning empty (#19)", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: false,
                 output: "",
                 error: "Account not found",
             });
-            const titles = manager.listNotes();
-            expect(titles).toEqual([]);
+            expect(() => manager.listNotes()).toThrow(/Account not found/);
         });
         it("filters by folder when specified", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Work Note 1, Work Note 2",
+                output: ["Work Note 1", "Work Note 2"].join(R),
             });
             manager.listNotes("iCloud", "Work");
             expect(mockExecuteAppleScript).toHaveBeenCalledWith(expect.stringContaining('notes of folder "Work"'));
@@ -935,7 +1025,7 @@ describe("AppleNotesManager", () => {
         it("uses whose clause when modifiedSince is provided", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Recent Note 1|||Recent Note 2",
+                output: ["Recent Note 1", "Recent Note 2"].join(R),
             });
             const results = manager.listNotes(undefined, undefined, "2025-06-15T00:00:00");
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -950,7 +1040,7 @@ describe("AppleNotesManager", () => {
         it("uses repeat loop when limit is provided", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note 1|||Note 2|||Note 3",
+                output: ["Note 1", "Note 2", "Note 3"].join(R),
             });
             const results = manager.listNotes(undefined, undefined, undefined, 3);
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -960,7 +1050,7 @@ describe("AppleNotesManager", () => {
         it("combines folder, modifiedSince, and limit", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Work Note|||Another Work Note",
+                output: ["Work Note", "Another Work Note"].join(R),
             });
             manager.listNotes("iCloud", "Work", "2025-01-01", 10);
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -979,7 +1069,7 @@ describe("AppleNotesManager", () => {
         it("ignores invalid modifiedSince date and falls back to limit-only", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "Note 1|||Note 2",
+                output: ["Note 1", "Note 2"].join(R),
             });
             const results = manager.listNotes(undefined, undefined, "not-a-date", 5);
             const script = mockExecuteAppleScript.mock.calls[0][0];
@@ -1170,7 +1260,14 @@ describe("AppleNotesManager", () => {
             mockExecuteAppleScript
                 .mockReturnValueOnce({
                 success: true,
-                output: "My Note, x-coredata://ABC/ICNote/p123, date Monday January 1 2024, date Monday January 1 2024, false, false",
+                output: [
+                    "My Note",
+                    "x-coredata://ABC/ICNote/p123",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "false",
+                    "false",
+                ].join(F),
             })
                 .mockReturnValueOnce({
                 success: true,
@@ -1202,7 +1299,14 @@ describe("AppleNotesManager", () => {
             mockExecuteAppleScript
                 .mockReturnValueOnce({
                 success: true,
-                output: "My Note, x-coredata://ABC/ICNote/p123, date Monday January 1 2024, date Monday January 1 2024, false, false",
+                output: [
+                    "My Note",
+                    "x-coredata://ABC/ICNote/p123",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "false",
+                    "false",
+                ].join(F),
             })
                 .mockReturnValueOnce({
                 success: true,
@@ -1222,7 +1326,14 @@ describe("AppleNotesManager", () => {
             mockExecuteAppleScript
                 .mockReturnValueOnce({
                 success: true,
-                output: "My Note, x-coredata://ABC/ICNote/p123, date Monday January 1 2024, date Monday January 1 2024, false, false",
+                output: [
+                    "My Note",
+                    "x-coredata://ABC/ICNote/p123",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "Monday, January 1, 2024 at 12:00:00 PM",
+                    "false",
+                    "false",
+                ].join(F),
             })
                 .mockReturnValueOnce({
                 success: true,
@@ -1249,7 +1360,7 @@ describe("AppleNotesManager", () => {
         it("returns array of Account objects", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: true,
-                output: "iCloud, Gmail, Exchange",
+                output: ["iCloud", "Gmail", "Exchange"].join(R),
             });
             const accounts = manager.listAccounts();
             expect(accounts).toHaveLength(3);
@@ -1257,14 +1368,13 @@ describe("AppleNotesManager", () => {
             expect(accounts[1].name).toBe("Gmail");
             expect(accounts[2].name).toBe("Exchange");
         });
-        it("returns empty array on failure", () => {
+        it("throws on failure rather than returning empty (#19)", () => {
             mockExecuteAppleScript.mockReturnValue({
                 success: false,
                 output: "",
                 error: "Notes.app not available",
             });
-            const accounts = manager.listAccounts();
-            expect(accounts).toEqual([]);
+            expect(() => manager.listAccounts()).toThrow(/Notes.app not available/);
         });
     });
     // ---------------------------------------------------------------------------
@@ -1280,7 +1390,7 @@ describe("AppleNotesManager", () => {
                 // Check 3: listAccounts
                 .mockReturnValueOnce({ success: true, output: "iCloud" })
                 // Check 4: listNotes
-                .mockReturnValueOnce({ success: true, output: "Note 1, Note 2" });
+                .mockReturnValueOnce({ success: true, output: ["Note 1", "Note 2"].join(R) });
             const result = manager.healthCheck();
             expect(result.healthy).toBe(true);
             expect(result.checks).toHaveLength(4);
@@ -1321,7 +1431,7 @@ describe("AppleNotesManager", () => {
             mockExecuteAppleScript
                 .mockReturnValueOnce({ success: true, output: "ok" })
                 .mockReturnValueOnce({ success: true, output: "iCloud" })
-                .mockReturnValueOnce({ success: true, output: "iCloud, Gmail" })
+                .mockReturnValueOnce({ success: true, output: ["iCloud", "Gmail"].join(R) })
                 .mockReturnValueOnce({ success: true, output: "" });
             const result = manager.healthCheck();
             const accountCheck = result.checks.find((c) => c.name === "accounts");
@@ -1337,14 +1447,13 @@ describe("AppleNotesManager", () => {
             mockExecuteAppleScript
                 // listAccounts
                 .mockReturnValueOnce({ success: true, output: "iCloud" })
-                // listFolders for iCloud
-                .mockReturnValueOnce({ success: true, output: "id1\tNotes\nid2\tWork" })
-                // listNotes for Notes folder
-                .mockReturnValueOnce({ success: true, output: "Note 1, Note 2, Note 3" })
-                // listNotes for Work folder
-                .mockReturnValueOnce({ success: true, output: "Task 1, Task 2" })
-                // getRecentlyModifiedCounts
-                .mockReturnValueOnce({ success: true, output: "" });
+                // per-account folder counts: name<F>count, records joined by R
+                .mockReturnValueOnce({
+                success: true,
+                output: ["Notes", "3"].join(F) + R + ["Work", "2"].join(F) + R,
+            })
+                // getRecentlyModifiedCounts: c1<F>c7<F>c30
+                .mockReturnValueOnce({ success: true, output: ["0", "0", "0"].join(F) });
             const stats = manager.getNotesStats();
             expect(stats.totalNotes).toBe(5);
             expect(stats.accounts).toHaveLength(1);
@@ -1356,9 +1465,8 @@ describe("AppleNotesManager", () => {
         it("returns zero counts when no notes exist", () => {
             mockExecuteAppleScript
                 .mockReturnValueOnce({ success: true, output: "iCloud" })
-                .mockReturnValueOnce({ success: true, output: "id1\tNotes" })
-                .mockReturnValueOnce({ success: true, output: "" })
-                .mockReturnValueOnce({ success: true, output: "" });
+                .mockReturnValueOnce({ success: true, output: ["Notes", "0"].join(F) + R })
+                .mockReturnValueOnce({ success: true, output: ["0", "0", "0"].join(F) });
             const stats = manager.getNotesStats();
             expect(stats.totalNotes).toBe(0);
             expect(stats.recentlyModified.last24h).toBe(0);
@@ -1368,17 +1476,13 @@ describe("AppleNotesManager", () => {
         it("handles multiple accounts", () => {
             mockExecuteAppleScript
                 // listAccounts
-                .mockReturnValueOnce({ success: true, output: "iCloud, Gmail" })
-                // listFolders for iCloud
-                .mockReturnValueOnce({ success: true, output: "id1\tNotes" })
-                // listNotes for iCloud/Notes
-                .mockReturnValueOnce({ success: true, output: "Note 1" })
-                // listFolders for Gmail
-                .mockReturnValueOnce({ success: true, output: "id2\tNotes" })
-                // listNotes for Gmail/Notes
-                .mockReturnValueOnce({ success: true, output: "Email Note" })
+                .mockReturnValueOnce({ success: true, output: ["iCloud", "Gmail"].join(R) })
+                // iCloud folder counts
+                .mockReturnValueOnce({ success: true, output: ["Notes", "1"].join(F) + R })
+                // Gmail folder counts
+                .mockReturnValueOnce({ success: true, output: ["Notes", "1"].join(F) + R })
                 // getRecentlyModifiedCounts
-                .mockReturnValueOnce({ success: true, output: "" });
+                .mockReturnValueOnce({ success: true, output: ["0", "0", "0"].join(F) });
             const stats = manager.getNotesStats();
             expect(stats.totalNotes).toBe(2);
             expect(stats.accounts).toHaveLength(2);
@@ -1393,7 +1497,10 @@ describe("AppleNotesManager", () => {
         it("returns attachments for a note", () => {
             mockExecuteAppleScript.mockReturnValueOnce({
                 success: true,
-                output: "x-coredata://ABC/ICAttachment/p1|||photo.jpg|||public.jpegITEMx-coredata://ABC/ICAttachment/p2|||document.pdf|||com.adobe.pdfITEM",
+                output: [
+                    ["x-coredata://ABC/ICAttachment/p1", "photo.jpg", "public.jpeg"].join(F),
+                    ["x-coredata://ABC/ICAttachment/p2", "document.pdf", "com.adobe.pdf"].join(F),
+                ].join(R),
             });
             const attachments = manager.listAttachmentsById("x-coredata://ABC/ICNote/p123");
             expect(attachments).toHaveLength(2);
@@ -1432,7 +1539,7 @@ describe("AppleNotesManager", () => {
         it("returns attachments for a note by title", () => {
             mockExecuteAppleScript.mockReturnValueOnce({
                 success: true,
-                output: "attach-id|||image.png|||public.pngITEM",
+                output: ["attach-id", "image.png", "public.png"].join(F),
             });
             const attachments = manager.listAttachments("My Note");
             expect(attachments).toHaveLength(1);
@@ -1463,7 +1570,14 @@ describe("AppleNotesManager", () => {
     // ---------------------------------------------------------------------------
     describe("batchDeleteNotes", () => {
         // Helper to create getNoteById mock output (matches AppleScript format)
-        const noteByIdOutput = (title, passwordProtected = false) => `${title}, x-coredata://ABC/ICNote/p1, date Sunday, January 1, 2025 at 1:00:00 PM, date Sunday, January 1, 2025 at 1:00:00 PM, false, ${passwordProtected}`;
+        const noteByIdOutput = (title, passwordProtected = false) => [
+            title,
+            "x-coredata://ABC/ICNote/p1",
+            "Sunday, January 1, 2025 at 1:00:00 PM",
+            "Sunday, January 1, 2025 at 1:00:00 PM",
+            "false",
+            String(passwordProtected),
+        ].join(F);
         it("deletes multiple notes successfully", () => {
             // For each note: getNoteById (which isNotePasswordProtectedById also calls), deleteNoteById
             mockExecuteAppleScript
@@ -1548,7 +1662,14 @@ describe("AppleNotesManager", () => {
     });
     describe("batchMoveNotes", () => {
         // Helper to create getNoteById mock output (matches AppleScript format)
-        const noteByIdOutput = (title, passwordProtected = false) => `${title}, x-coredata://ABC/ICNote/p1, date Sunday, January 1, 2025 at 1:00:00 PM, date Sunday, January 1, 2025 at 1:00:00 PM, false, ${passwordProtected}`;
+        const noteByIdOutput = (title, passwordProtected = false) => [
+            title,
+            "x-coredata://ABC/ICNote/p1",
+            "Sunday, January 1, 2025 at 1:00:00 PM",
+            "Sunday, January 1, 2025 at 1:00:00 PM",
+            "false",
+            String(passwordProtected),
+        ].join(F);
         it("moves multiple notes successfully", () => {
             // For each note: getNoteById, getNoteById (password check), getNoteContentById, create, delete
             mockExecuteAppleScript
@@ -1619,7 +1740,14 @@ describe("AppleNotesManager", () => {
     // ---------------------------------------------------------------------------
     describe("exportNotesAsJson", () => {
         // Note details output helper - format: title, id, date, date, shared, passwordProtected
-        const noteDetailsOutput = (title, passwordProtected = false) => `${title}, x-coredata://ABC/ICNote/p1, date Sunday, January 1, 2025 at 1:00:00 PM, date Sunday, January 1, 2025 at 1:00:00 PM, false, ${passwordProtected}`;
+        const noteDetailsOutput = (title, passwordProtected = false) => [
+            title,
+            "x-coredata://ABC/ICNote/p1",
+            "Sunday, January 1, 2025 at 1:00:00 PM",
+            "Sunday, January 1, 2025 at 1:00:00 PM",
+            "false",
+            String(passwordProtected),
+        ].join(F);
         it("exports notes with metadata and content", () => {
             mockExecuteAppleScript
                 // listAccounts