@peerasak-u/apple-notes 1.0.1 → 1.1.0

package/dist/index.js

@@ -4,8 +4,129 @@
 import { execSync } from "child_process";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
+
+// src/converter.ts
+function htmlToMarkdown(html) {
+  if (!html)
+    return "";
+  let md = html;
+  md = md.replace(/<div[^>]*>/gi, `
+`);
+  md = md.replace(/<\/div>/gi, "");
+  md = md.replace(/<h1[^>]*>(.*?)<\/h1>/gi, `# $1
+`);
+  md = md.replace(/<h2[^>]*>(.*?)<\/h2>/gi, `## $1
+`);
+  md = md.replace(/<h3[^>]*>(.*?)<\/h3>/gi, `### $1
+`);
+  md = md.replace(/<h4[^>]*>(.*?)<\/h4>/gi, `#### $1
+`);
+  md = md.replace(/<h5[^>]*>(.*?)<\/h5>/gi, `##### $1
+`);
+  md = md.replace(/<h6[^>]*>(.*?)<\/h6>/gi, `###### $1
+`);
+  md = md.replace(/<(b|strong)[^>]*>(.*?)<\/(b|strong)>/gi, "**$2**");
+  md = md.replace(/<(i|em)[^>]*>(.*?)<\/(i|em)>/gi, "*$2*");
+  md = md.replace(/<u[^>]*>(.*?)<\/u>/gi, "_$1_");
+  md = md.replace(/<s[^>]*>(.*?)<\/s>/gi, "~~$1~~");
+  md = md.replace(/<strike[^>]*>(.*?)<\/strike>/gi, "~~$1~~");
+  md = md.replace(/<a[^>]*href="([^"]*)"[^>]*>(.*?)<\/a>/gi, "[$2]($1)");
+  md = md.replace(/<img[^>]*src="([^"]*)"[^>]*alt="([^"]*)"[^>]*\/?>/gi, "![$2]($1)");
+  md = md.replace(/<img[^>]*src="([^"]*)"[^>]*\/?>/gi, "![]($1)");
+  md = md.replace(/<ul[^>]*>/gi, `
+`);
+  md = md.replace(/<\/ul>/gi, `
+`);
+  md = md.replace(/<ol[^>]*>/gi, `
+`);
+  md = md.replace(/<\/ol>/gi, `
+`);
+  md = md.replace(/<li[^>]*>(.*?)<\/li>/gi, `- $1
+`);
+  md = md.replace(/<br\s*\/?>/gi, `
+`);
+  md = md.replace(/<p[^>]*>/gi, `
+`);
+  md = md.replace(/<\/p>/gi, `
+`);
+  md = md.replace(/<code[^>]*>(.*?)<\/code>/gi, "`$1`");
+  md = md.replace(/<pre[^>]*>(.*?)<\/pre>/gis, "```\n$1\n```\n");
+  md = md.replace(/<blockquote[^>]*>(.*?)<\/blockquote>/gis, `> $1
+`);
+  md = md.replace(/<hr\s*\/?>/gi, `
+---
+`);
+  md = md.replace(/<[^>]+>/g, "");
+  md = md.replace(/&nbsp;/g, " ");
+  md = md.replace(/&amp;/g, "&");
+  md = md.replace(/&lt;/g, "<");
+  md = md.replace(/&gt;/g, ">");
+  md = md.replace(/&quot;/g, '"');
+  md = md.replace(/&#39;/g, "'");
+  md = md.replace(/&apos;/g, "'");
+  md = md.replace(/\n{3,}/g, `
+
+`);
+  md = md.trim();
+  if (/<[a-z][\s\S]*>/i.test(md)) {
+    return `[RAW_HTML]
+` + html;
+  }
+  return md;
+}
+function markdownToHtml(markdown) {
+  if (!markdown)
+    return "";
+  let html = markdown;
+  html = html.replace(/\\n/g, `
+`);
+  html = html.replace(/\\t/g, "\t");
+  html = html.replace(/^###### (.+)$/gm, "<h6>$1</h6>");
+  html = html.replace(/^##### (.+)$/gm, "<h5>$1</h5>");
+  html = html.replace(/^#### (.+)$/gm, "<h4>$1</h4>");
+  html = html.replace(/^### (.+)$/gm, "<h3>$1</h3>");
+  html = html.replace(/^## (.+)$/gm, "<h2>$1</h2>");
+  html = html.replace(/^# (.+)$/gm, "<h1>$1</h1>");
+  html = html.replace(/\*\*\*(.+?)\*\*\*/g, "<b><i>$1</i></b>");
+  html = html.replace(/\*\*(.+?)\*\*/g, "<b>$1</b>");
+  html = html.replace(/\*(.+?)\*/g, "<i>$1</i>");
+  html = html.replace(/_(.+?)_/g, "<i>$1</i>");
+  html = html.replace(/~~(.+?)~~/g, "<s>$1</s>");
+  html = html.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, '<img src="$2" alt="$1">');
+  html = html.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2">$1</a>');
+  html = html.replace(/```([\s\S]*?)```/g, "<pre>$1</pre>");
+  html = html.replace(/`([^`]+)`/g, "<code>$1</code>");
+  html = html.replace(/^> (.+)$/gm, "<blockquote>$1</blockquote>");
+  html = html.replace(/^---$/gm, "<hr>");
+  html = html.replace(/^\*\*\*$/gm, "<hr>");
+  html = html.replace(/^- (.+)$/gm, "<li>$1</li>");
+  html = html.replace(/^\* (.+)$/gm, "<li>$1</li>");
+  html = html.replace(/^\d+\. (.+)$/gm, "<li>$1</li>");
+  html = html.replace(/(<li>.*<\/li>\n?)+/g, (match) => {
+    return "<ul>" + match + "</ul>";
+  });
+  const lines = html.split(`
+`);
+  const result = [];
+  for (let i = 0;i < lines.length; i++) {
+    const line = lines[i].trim();
+    if (line === "") {
+      result.push("<br>");
+    } else if (!/^</.test(line)) {
+      result.push("<div>" + line + "</div>");
+    } else {
+      result.push(line);
+    }
+  }
+  html = result.join(`
+`);
+  return html;
+}
+
+// src/executor.ts
 var __filename2 = fileURLToPath(import.meta.url);
 var __dirname2 = dirname(__filename2);
+var HTML_OUTPUT_COMMANDS = new Set(["search", "list", "read", "read-index", "recent"]);
 function getNotesScriptPath() {
   return join(__dirname2, "..", "src", "jxa", "notes.js");
 }
@@ -13,16 +134,29 @@ function escapeShellArg(arg) {
   return `'${arg.replace(/'/g, "'\\''")}'`;
 }
 function executeNotesCommand(args) {
+  const command = args[0];
+  let processedArgs = [...args];
+  if (command === "create" && args.length >= 3) {
+    const htmlBody = markdownToHtml(args[2]);
+    processedArgs = [args[0], args[1], htmlBody];
+    if (args[3]) {
+      processedArgs.push(args[3]);
+    }
+  }
   const scriptPath = getNotesScriptPath();
-  const escapedArgs = args.map(escapeShellArg).join(" ");
-  const command = `osascript -l JavaScript "${scriptPath}" ${escapedArgs}`;
+  const escapedArgs = processedArgs.map(escapeShellArg).join(" ");
+  const shellCommand = `osascript -l JavaScript "${scriptPath}" ${escapedArgs}`;
   const options = {
     encoding: "utf-8",
     maxBuffer: 10 * 1024 * 1024
   };
   try {
-    const result = execSync(command, options);
-    return result.trim();
+    const result = execSync(shellCommand, options);
+    const output = result.trim();
+    if (HTML_OUTPUT_COMMANDS.has(command)) {
+      return htmlToMarkdown(output);
+    }
+    return output;
   } catch (error) {
     if (error instanceof Error && "stderr" in error) {
       const stderr = error.stderr;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerasak-u/apple-notes",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "CLI tool for interacting with Apple Notes on macOS",
   "type": "module",
   "bin": {
@@ -12,9 +12,8 @@
   ],
   "scripts": {
     "build": "bun build src/index.ts --outdir dist --target node",
-    "sync-utils": "bun scripts/sync-test-utils.js",
-    "test": "bun run sync-utils && bun test tests/*.test.js",
-    "test:coverage": "bun run sync-utils && bun test --coverage tests/*.test.js",
+    "test": "bun test tests/*.test.js",
+    "test:coverage": "bun test --coverage tests/*.test.js",
     "lint": "eslint tests/*.js",
     "lint:fix": "eslint --fix tests/*.js",
     "typecheck": "tsc --noEmit"

package/src/jxa/notes.js

@@ -11,204 +11,70 @@ function run(argv) {
   const command = argv[0];
 
   switch (command) {
-    case "search":
+    case 'search':
       if (argv.length < 2) {
-        return "Error: search requires a query string\n" + getUsage();
+        return 'Error: search requires a query string\n' + getUsage();
       }
       return searchNotes(argv[1]);
 
-    case "list":
+    case 'list':
       if (argv.length < 2) {
-        return "Error: list requires a search term\n" + getUsage();
+        return 'Error: list requires a search term\n' + getUsage();
       }
       return listNotes(argv[1]);
 
-    case "read":
+    case 'read':
       if (argv.length < 2) {
-        return "Error: read requires a note identifier\n" + getUsage();
+        return 'Error: read requires a note identifier\n' + getUsage();
       }
-      return readNote(argv[1], argv[2] || "");
+      return readNote(argv[1], argv[2] || '');
 
-    case "read-index":
+    case 'read-index':
       if (argv.length < 3) {
-        return "Error: read-index requires search term and index\n" + getUsage();
+        return (
+          'Error: read-index requires search term and index\n' + getUsage()
+        );
       }
       return readNoteByIndex(argv[1], parseInt(argv[2], 10));
 
-    case "recent":
+    case 'recent':
       return parseRecentArgs(argv.slice(1));
 
-    case "create":
+    case 'create':
       if (argv.length < 3) {
-        return "Error: create requires title and body\n" + getUsage();
+        return 'Error: create requires title and body\n' + getUsage();
       }
-      return createNote(argv[1], argv[2], argv[3] || "Notes");
+      return createNote(argv[1], argv[2], argv[3] || 'Notes');
 
-    case "delete":
+    case 'delete':
       if (argv.length < 2) {
-        return "Error: delete requires a note title\n" + getUsage();
+        return 'Error: delete requires a note title\n' + getUsage();
       }
-      return deleteNote(argv[1], argv[2] || "");
+      return deleteNote(argv[1], argv[2] || '');
+
+    case 'move':
+      if (argv.length < 3) {
+        return (
+          'Error: move requires a note title and destination folder\n' +
+          getUsage()
+        );
+      }
+      return moveNote(argv[1], argv[2], argv[3] || '');
 
     default:
       return `Error: Unknown command '${command}'\n` + getUsage();
   }
 }
 
-// ============================================================================
-// HTML <-> Markdown Conversion
-// ============================================================================
-
-function htmlToMarkdown(html) {
-  if (!html) return "";
-
-  let md = html;
-
-  // Remove Apple Notes specific wrapper divs but keep content
-  md = md.replace(/<div[^>]*>/gi, "\n");
-  md = md.replace(/<\/div>/gi, "");
-
-  // Headings
-  md = md.replace(/<h1[^>]*>(.*?)<\/h1>/gi, "# $1\n");
-  md = md.replace(/<h2[^>]*>(.*?)<\/h2>/gi, "## $1\n");
-  md = md.replace(/<h3[^>]*>(.*?)<\/h3>/gi, "### $1\n");
-  md = md.replace(/<h4[^>]*>(.*?)<\/h4>/gi, "#### $1\n");
-  md = md.replace(/<h5[^>]*>(.*?)<\/h5>/gi, "##### $1\n");
-  md = md.replace(/<h6[^>]*>(.*?)<\/h6>/gi, "###### $1\n");
-
-  // Bold and italic
-  md = md.replace(/<(b|strong)[^>]*>(.*?)<\/(b|strong)>/gi, "**$2**");
-  md = md.replace(/<(i|em)[^>]*>(.*?)<\/(i|em)>/gi, "*$2*");
-  md = md.replace(/<u[^>]*>(.*?)<\/u>/gi, "_$1_");
-  md = md.replace(/<s[^>]*>(.*?)<\/s>/gi, "~~$1~~");
-  md = md.replace(/<strike[^>]*>(.*?)<\/strike>/gi, "~~$1~~");
-
-  // Links
-  md = md.replace(/<a[^>]*href="([^"]*)"[^>]*>(.*?)<\/a>/gi, "[$2]($1)");
-
-  // Images
-  md = md.replace(/<img[^>]*src="([^"]*)"[^>]*alt="([^"]*)"[^>]*\/?>/gi, "![$2]($1)");
-  md = md.replace(/<img[^>]*src="([^"]*)"[^>]*\/?>/gi, "![]($1)");
-
-  // Lists - handle nested lists
-  md = md.replace(/<ul[^>]*>/gi, "\n");
-  md = md.replace(/<\/ul>/gi, "\n");
-  md = md.replace(/<ol[^>]*>/gi, "\n");
-  md = md.replace(/<\/ol>/gi, "\n");
-  md = md.replace(/<li[^>]*>(.*?)<\/li>/gi, "- $1\n");
-
-  // Line breaks and paragraphs
-  md = md.replace(/<br\s*\/?>/gi, "\n");
-  md = md.replace(/<p[^>]*>/gi, "\n");
-  md = md.replace(/<\/p>/gi, "\n");
-
-  // Code
-  md = md.replace(/<code[^>]*>(.*?)<\/code>/gi, "`$1`");
-  md = md.replace(/<pre[^>]*>(.*?)<\/pre>/gis, "```\n$1\n```\n");
-
-  // Blockquote
-  md = md.replace(/<blockquote[^>]*>(.*?)<\/blockquote>/gis, "> $1\n");
-
-  // Horizontal rule
-  md = md.replace(/<hr\s*\/?>/gi, "\n---\n");
-
-  // Remove remaining HTML tags
-  md = md.replace(/<[^>]+>/g, "");
-
-  // Decode HTML entities
-  md = md.replace(/&nbsp;/g, " ");
-  md = md.replace(/&amp;/g, "&");
-  md = md.replace(/&lt;/g, "<");
-  md = md.replace(/&gt;/g, ">");
-  md = md.replace(/&quot;/g, '"');
-  md = md.replace(/&#39;/g, "'");
-  md = md.replace(/&apos;/g, "'");
-
-  // Clean up multiple newlines
-  md = md.replace(/\n{3,}/g, "\n\n");
-  md = md.trim();
-
-  // Check if conversion was successful (no remaining HTML-like content)
-  if (/<[a-z][\s\S]*>/i.test(md)) {
-    return "[RAW_HTML]\n" + html;
-  }
-
-  return md;
-}
-
-function markdownToHtml(markdown) {
-  if (!markdown) return "";
-
-  let html = markdown;
-
-  // Unescape common escape sequences from command line
-  html = html.replace(/\\n/g, "\n");
-  html = html.replace(/\\t/g, "\t");
-
-  // Headings (must be at start of line)
-  html = html.replace(/^###### (.+)$/gm, "<h6>$1</h6>");
-  html = html.replace(/^##### (.+)$/gm, "<h5>$1</h5>");
-  html = html.replace(/^#### (.+)$/gm, "<h4>$1</h4>");
-  html = html.replace(/^### (.+)$/gm, "<h3>$1</h3>");
-  html = html.replace(/^## (.+)$/gm, "<h2>$1</h2>");
-  html = html.replace(/^# (.+)$/gm, "<h1>$1</h1>");
-
-  // Bold and italic (order matters)
-  html = html.replace(/\*\*\*(.+?)\*\*\*/g, "<b><i>$1</i></b>");
-  html = html.replace(/\*\*(.+?)\*\*/g, "<b>$1</b>");
-  html = html.replace(/\*(.+?)\*/g, "<i>$1</i>");
-  html = html.replace(/_(.+?)_/g, "<i>$1</i>");
-  html = html.replace(/~~(.+?)~~/g, "<s>$1</s>");
-
-  // Links and images
-  html = html.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, '<img src="$2" alt="$1">');
-  html = html.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2">$1</a>');
-
-  // Code
-  html = html.replace(/```([\s\S]*?)```/g, "<pre>$1</pre>");
-  html = html.replace(/`([^`]+)`/g, "<code>$1</code>");
-
-  // Blockquote
-  html = html.replace(/^> (.+)$/gm, "<blockquote>$1</blockquote>");
-
-  // Horizontal rule
-  html = html.replace(/^---$/gm, "<hr>");
-  html = html.replace(/^\*\*\*$/gm, "<hr>");
-
-  // Lists (simple handling)
-  html = html.replace(/^- (.+)$/gm, "<li>$1</li>");
-  html = html.replace(/^\* (.+)$/gm, "<li>$1</li>");
-  html = html.replace(/^\d+\. (.+)$/gm, "<li>$1</li>");
-
-  // Wrap consecutive <li> in <ul>
-  html = html.replace(/(<li>.*<\/li>\n?)+/g, function (match) {
-    return "<ul>" + match + "</ul>";
-  });
-
-  // Paragraphs - wrap lines that aren't already HTML
-  const lines = html.split("\n");
-  const result = [];
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i].trim();
-    if (line === "") {
-      result.push("<br>");
-    } else if (!/^</.test(line)) {
-      result.push("<div>" + line + "</div>");
-    } else {
-      result.push(line);
-    }
-  }
-  html = result.join("\n");
-
-  return html;
-}
-
 // ============================================================================
 // Notes App Interaction
 // ============================================================================
 
+// HTML <-> Markdown conversion is now handled in TypeScript (converter.ts)
+// JXA now passes raw HTML to/from Apple Notes
+
 function getNotesApp() {
-  return Application("Notes");
+  return Application('Notes');
 }
 
 function searchNotes(query) {
@@ -226,7 +92,7 @@ function searchNotes(query) {
         title: note.name(),
         folder: folderName,
         modified: note.modificationDate().toString(),
-        preview: htmlToMarkdown(preview),
+        preview: preview,
       });
     }
   }
@@ -241,7 +107,7 @@ function searchNotes(query) {
     output += `Folder: ${r.folder}\n`;
     output += `Modified: ${r.modified}\n`;
     output += `Preview: ${r.preview}\n`;
-    output += "---\n\n";
+    output += '---\n\n';
   }
 
   return output;
@@ -257,14 +123,14 @@ function listNotes(query) {
     const name = note.name();
     if (name && name.toLowerCase().includes(query.toLowerCase())) {
       const folderName = getFolderName(note);
-      const body = note.body() || "";
+      const body = note.body() || '';
       const preview = getPreview(body, 80);
       results.push({
         index: results.length + 1,
         title: name,
         folder: folderName,
         modified: note.modificationDate().toString(),
-        preview: htmlToMarkdown(preview),
+        preview: preview,
       });
     }
   }
@@ -290,7 +156,7 @@ function readNote(identifier, folderName) {
   const app = getNotesApp();
   let matchingNotes = [];
 
-  if (folderName === "") {
+  if (folderName === '') {
     // Search all notes
     const allNotes = app.notes();
     for (let i = 0; i < allNotes.length; i++) {
@@ -337,7 +203,7 @@ function readNote(identifier, folderName) {
 
   if (matchingNotes.length === 0) {
     let errorMsg = `Error: No note found matching '${identifier}'`;
-    if (folderName !== "") {
+    if (folderName !== '') {
       errorMsg += ` in folder '${folderName}'`;
     }
     return errorMsg;
@@ -384,7 +250,7 @@ function readNoteByIndex(query, index) {
 
 function parseRecentArgs(args) {
   let limit = 5;
-  let folderName = "";
+  let folderName = '';
 
   if (args.length >= 1) {
     const arg1 = args[0];
@@ -412,7 +278,7 @@ function getRecentNotes(limit, folderName) {
   const app = getNotesApp();
   let notes = [];
 
-  if (folderName === "") {
+  if (folderName === '') {
     notes = app.notes();
   } else {
     const folder = findFolder(folderName);
@@ -423,8 +289,8 @@ function getRecentNotes(limit, folderName) {
   }
 
   if (notes.length === 0) {
-    let msg = "No notes found";
-    if (folderName !== "") {
+    let msg = 'No notes found';
+    if (folderName !== '') {
       msg += ` in '${folderName}' folder`;
     }
     return msg;
@@ -446,22 +312,22 @@ function getRecentNotes(limit, folderName) {
   // Get top N
   const count = Math.min(limit, notesWithDates.length);
   let output = `Last ${count} note(s)`;
-  if (folderName !== "") {
+  if (folderName !== '') {
     output += ` from '${folderName}' folder`;
   }
-  output += ":\n\n";
+  output += ':\n\n';
 
   for (let i = 0; i < count; i++) {
     const item = notesWithDates[i];
     const note = item.note;
-    const body = note.body() || "";
+    const body = note.body() || '';
     const preview = getPreview(body, 100);
     const folder = getFolderName(note) || folderName;
 
     output += `[${i + 1}] ${note.name()}\n`;
     output += `    Folder: ${folder}\n`;
     output += `    Modified: ${item.modDate.toString()}\n`;
-    output += `    Preview: ${htmlToMarkdown(preview)}\n\n`;
+    output += `    Preview: ${preview}\n\n`;
   }
 
   return output;
@@ -475,19 +341,19 @@ function createNote(title, body, folderName) {
     return `Error: Folder '${folderName}' not found`;
   }
 
-  const htmlBody = markdownToHtml(body);
+  // body is now pre-converted to HTML in TypeScript
   const uniqueTitle = generateUniqueTitle(title, folder);
 
-  const newNote = app.Note({ name: uniqueTitle, body: htmlBody });
+  const newNote = app.Note({ name: uniqueTitle, body: body });
   folder.notes.push(newNote);
 
   // Get the created note to return info
-  const createdNote = folder.notes().find((n) => n.name() === uniqueTitle);
+  const createdNote = folder.notes().find(n => n.name() === uniqueTitle);
   if (!createdNote) {
     return `Note created but could not retrieve details.\nTitle: ${uniqueTitle}\nFolder: ${folderName}`;
   }
 
-  let output = "Note created successfully!\n\n";
+  let output = 'Note created successfully!\n\n';
   output += `Title: ${createdNote.name()}\n`;
   output += `Folder: ${folderName}\n`;
   output += `Created: ${createdNote.creationDate().toString()}\n`;
@@ -500,7 +366,7 @@ function deleteNote(title, folderName) {
   let targetNote = null;
   let targetFolder = null;
 
-  if (folderName === "") {
+  if (folderName === '') {
     // Search all notes for exact match
     const allNotes = app.notes();
     for (let i = 0; i < allNotes.length; i++) {
@@ -527,7 +393,7 @@ function deleteNote(title, folderName) {
 
   if (!targetNote) {
     let errorMsg = `Error: No note found with exact title '${title}'`;
-    if (folderName !== "") {
+    if (folderName !== '') {
       errorMsg += ` in folder '${folderName}'`;
     }
     return errorMsg;
@@ -542,6 +408,78 @@ function deleteNote(title, folderName) {
   return `Note deleted successfully!\n\nTitle: ${deletedTitle}\nFolder: ${deletedFolder}`;
 }
 
+function moveNote(title, destFolderName, sourceFolderName) {
+  const app = getNotesApp();
+  const destFolder = findFolder(destFolderName);
+
+  if (!destFolder) {
+    return `Error: Destination folder '${destFolderName}' not found`;
+  }
+
+  let targetNote = null;
+  let sourceFolder = null;
+
+  if (sourceFolderName && sourceFolderName !== '') {
+    sourceFolder = findFolder(sourceFolderName);
+    if (!sourceFolder) {
+      return `Error: Source folder '${sourceFolderName}' not found`;
+    }
+    const folderNotes = sourceFolder.notes();
+    for (let i = 0; i < folderNotes.length; i++) {
+      const note = folderNotes[i];
+      if (note.name() === title) {
+        targetNote = note;
+        break;
+      }
+    }
+  } else {
+    // Global search
+    // We need to check for ambiguity
+    const allNotes = app.notes();
+    const matches = [];
+    for (let i = 0; i < allNotes.length; i++) {
+      const note = allNotes[i];
+      if (note.name() === title) {
+        matches.push(note);
+      }
+    }
+
+    if (matches.length === 0) {
+      return `Error: No note found with exact title '${title}'`;
+    } else if (matches.length > 1) {
+      let msg = `Error: Multiple notes found with title '${title}'. Please specify the source folder:\n\n`;
+      for (let i = 0; i < matches.length; i++) {
+        const note = matches[i];
+        const folder = getFolderName(note);
+        msg += `- ${title} (in '${folder}')\n`;
+      }
+      return msg;
+    } else {
+      targetNote = matches[0];
+    }
+  }
+
+  if (!targetNote) {
+    let errorMsg = `Error: No note found with exact title '${title}'`;
+    if (sourceFolderName) {
+      errorMsg += ` in folder '${sourceFolderName}'`;
+    }
+    return errorMsg;
+  }
+
+  const oldFolderName = getFolderName(targetNote);
+
+  // If already in destination, do nothing
+  if (oldFolderName === destFolder.name()) {
+    return `Note '${title}' is already in '${destFolderName}'`;
+  }
+
+  // Execute move
+  app.move(targetNote, { to: destFolder });
+
+  return `Note moved successfully!\n\nTitle: ${title}\nFrom: ${oldFolderName}\nTo: ${destFolder.name()}`;
+}
+
 // ============================================================================
 // Helper Functions
 // ============================================================================
@@ -550,21 +488,31 @@ function findFolder(folderPath) {
   const app = getNotesApp();
   const defaultAccount = app.defaultAccount();
 
-  if (folderPath.includes("/")) {
+  if (folderPath.includes('/')) {
     // Nested folder path
-    const parts = folderPath.split("/");
-    let currentFolder = defaultAccount.folders().find((f) => f.name() === "Notes");
+    const parts = folderPath.split('/');
+    let currentFolder = null;
+
+    // Find the first folder at the account level
+    const topLevelFolders = defaultAccount.folders();
+    for (let i = 0; i < topLevelFolders.length; i++) {
+      if (topLevelFolders[i].name() === parts[0]) {
+        currentFolder = topLevelFolders[i];
+        break;
+      }
+    }
 
     if (!currentFolder) {
       return null;
     }
 
-    for (const part of parts) {
+    // Traverse the rest of the path
+    for (let i = 1; i < parts.length; i++) {
       const subfolders = currentFolder.folders();
       let found = false;
-      for (let i = 0; i < subfolders.length; i++) {
-        if (subfolders[i].name() === part) {
-          currentFolder = subfolders[i];
+      for (let j = 0; j < subfolders.length; j++) {
+        if (subfolders[j].name() === parts[i]) {
+          currentFolder = subfolders[j];
           found = true;
           break;
         }
@@ -596,35 +544,33 @@ function getFolderName(note) {
   } catch (e) {
     // Container might not be accessible
   }
-  return "";
+  return '';
 }
 
 function getPreview(body, maxLength) {
-  if (!body) return "";
+  if (!body) return '';
   const length = Math.min(maxLength, body.length);
   let preview = body.substring(0, length);
   if (body.length > length) {
-    preview += "...";
+    preview += '...';
   }
   return preview;
 }
 
 function formatNoteContent(note) {
   const title = note.name();
-  const body = note.body() || "";
+  const body = note.body() || '';
   const folder = getFolderName(note);
   const created = note.creationDate().toString();
   const modified = note.modificationDate().toString();
 
-  const markdownBody = htmlToMarkdown(body);
-
-  let output = "========================================\n";
+  let output = '========================================\n';
   output += `Title: ${title}\n`;
   output += `Folder: ${folder}\n`;
   output += `Created: ${created}\n`;
   output += `Modified: ${modified}\n`;
-  output += "========================================\n\n";
-  output += markdownBody + "\n";
+  output += '========================================\n\n';
+  output += body + '\n';
 
   return output;
 }
@@ -660,6 +606,7 @@ function getUsage() {
   apple-notes recent [count] [folder]     - Get recent notes (default: 5)
   apple-notes create <title> <body> [folder] - Create note from markdown
   apple-notes delete <title> [folder]     - Delete note by title
+  apple-notes move <title> <destination> [source] - Move note to folder
 
 Examples:
   apple-notes list 'meeting'
@@ -668,5 +615,6 @@ Examples:
   apple-notes recent 10 'Blog'
   apple-notes create 'Meeting Notes' '# Agenda\\n- Item 1' 'Work'
   apple-notes delete 'Old Note' 'Archive'
+  apple-notes move 'Idea' 'Projects' 'Inbox'
 `;
 }