apple-notes-mcp 2.7.4 → 2.8.0

package/build/index.js

@@ -3660,49 +3660,49 @@ var require_fast_uri = __commonJS({
       schemelessOptions.skipEscape = true;
       return serialize(resolved, schemelessOptions);
     }
-    function resolveComponent(base, relative, options, skipNormalization) {
+    function resolveComponent(base, relative2, options, skipNormalization) {
       const target = {};
       if (!skipNormalization) {
         base = parse3(serialize(base, options), options);
-        relative = parse3(serialize(relative, options), options);
+        relative2 = parse3(serialize(relative2, options), options);
       }
       options = options || {};
-      if (!options.tolerant && relative.scheme) {
-        target.scheme = relative.scheme;
-        target.userinfo = relative.userinfo;
-        target.host = relative.host;
-        target.port = relative.port;
-        target.path = removeDotSegments(relative.path || "");
-        target.query = relative.query;
+      if (!options.tolerant && relative2.scheme) {
+        target.scheme = relative2.scheme;
+        target.userinfo = relative2.userinfo;
+        target.host = relative2.host;
+        target.port = relative2.port;
+        target.path = removeDotSegments(relative2.path || "");
+        target.query = relative2.query;
       } else {
-        if (relative.userinfo !== void 0 || relative.host !== void 0 || relative.port !== void 0) {
-          target.userinfo = relative.userinfo;
-          target.host = relative.host;
-          target.port = relative.port;
-          target.path = removeDotSegments(relative.path || "");
-          target.query = relative.query;
+        if (relative2.userinfo !== void 0 || relative2.host !== void 0 || relative2.port !== void 0) {
+          target.userinfo = relative2.userinfo;
+          target.host = relative2.host;
+          target.port = relative2.port;
+          target.path = removeDotSegments(relative2.path || "");
+          target.query = relative2.query;
         } else {
-          if (!relative.path) {
+          if (!relative2.path) {
             target.path = base.path;
-            if (relative.query !== void 0) {
-              target.query = relative.query;
+            if (relative2.query !== void 0) {
+              target.query = relative2.query;
             } else {
               target.query = base.query;
             }
           } else {
-            if (relative.path[0] === "/") {
-              target.path = removeDotSegments(relative.path);
+            if (relative2.path[0] === "/") {
+              target.path = removeDotSegments(relative2.path);
             } else {
               if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) {
-                target.path = "/" + relative.path;
+                target.path = "/" + relative2.path;
               } else if (!base.path) {
-                target.path = relative.path;
+                target.path = relative2.path;
               } else {
-                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative.path;
+                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative2.path;
               }
               target.path = removeDotSegments(target.path);
             }
-            target.query = relative.query;
+            target.query = relative2.query;
           }
           target.userinfo = base.userinfo;
           target.host = base.host;
@@ -3710,7 +3710,7 @@ var require_fast_uri = __commonJS({
         }
         target.scheme = base.scheme;
       }
-      target.fragment = relative.fragment;
+      target.fragment = relative2.fragment;
       return target;
     }
     function equal(uriA, uriB, options) {
@@ -11912,9 +11912,9 @@ var require_URL = __commonJS({
       },
       // See: http://tools.ietf.org/html/rfc3986#section-5.2
       // and https://url.spec.whatwg.org/#constructors
-      resolve: function(relative) {
+      resolve: function(relative2) {
         var base = this;
-        var r = new URL2(relative);
+        var r = new URL2(relative2);
         var t = new URL2();
         if (r.scheme !== void 0) {
           t.scheme = r.scheme;
@@ -24193,14 +24193,14 @@ var require_turndown_cjs = __commonJS({
         } else if (node.nodeType === 1) {
           replacement = replacementForNode.call(self, node);
         }
-        return join6(output, replacement);
+        return join7(output, replacement);
       }, "");
     }
     function postProcess(output) {
       var self = this;
       this.rules.forEach(function(rule) {
         if (typeof rule.append === "function") {
-          output = join6(output, rule.append(self.options));
+          output = join7(output, rule.append(self.options));
         }
       });
       return output.replace(/^[\t\r\n]+/, "").replace(/[\t\r\n\s]+$/, "");
@@ -24212,7 +24212,7 @@ var require_turndown_cjs = __commonJS({
       if (whitespace.leading || whitespace.trailing) content = content.trim();
       return whitespace.leading + rule.replacement(content, node, this.options) + whitespace.trailing;
     }
-    function join6(output, replacement) {
+    function join7(output, replacement) {
       var s1 = trimTrailingNewlines(output);
       var s2 = trimLeadingNewlines(replacement);
       var nls = Math.max(output.length - s1.length, replacement.length - s2.length);
@@ -39204,8 +39204,17 @@ function getChecklistItems(noteId) {
 }
 
 // src/utils/attachmentFs.ts
-import { existsSync as existsSync2, mkdirSync, mkdtempSync, readFileSync, rmSync, statSync } from "fs";
-import { dirname, isAbsolute, resolve, sep } from "path";
+import {
+  existsSync as existsSync2,
+  lstatSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  realpathSync,
+  rmSync,
+  statSync
+} from "fs";
+import { dirname, isAbsolute, join as join2, relative, resolve, sep } from "path";
 import { homedir as homedir2, tmpdir } from "os";
 function allowedSaveRoots() {
   return [
@@ -39217,17 +39226,79 @@ function allowedSaveRoots() {
     "/private/tmp"
   ];
 }
-function ensureParentDir(abs) {
+function canonicalize(path4) {
+  return realpathSync.native(path4);
+}
+function isWithinRoots(candidate, roots) {
+  return roots.some((root) => {
+    const base = root.endsWith(sep) ? root.slice(0, -1) : root;
+    return candidate === base || candidate.startsWith(base + sep);
+  });
+}
+function canonicalRoots(roots) {
+  const canonical = [];
+  for (const root of roots) {
+    const abs = resolve(root);
+    let resolved;
+    try {
+      resolved = canonicalize(abs);
+    } catch {
+      resolved = abs;
+    }
+    if (!canonical.includes(resolved)) canonical.push(resolved);
+  }
+  return canonical;
+}
+function entryExists(path4) {
+  try {
+    lstatSync(path4);
+    return true;
+  } catch (e) {
+    const code = e.code;
+    return !(code === "ENOENT" || code === "ENOTDIR");
+  }
+}
+function deepestExistingAncestor(abs) {
+  let current = abs;
+  for (; ; ) {
+    if (entryExists(current)) return current;
+    const parent = dirname(current);
+    if (parent === current) return current;
+    current = parent;
+  }
+}
+function ensureParentDir(abs, roots = allowedSaveRoots()) {
+  assertSafeSavePath(abs, roots);
   mkdirSync(dirname(abs), { recursive: true });
 }
 function assertSafeSavePath(p, roots = allowedSaveRoots()) {
   if (!p || !p.trim()) throw new Error("A destination path is required.");
   if (!isAbsolute(p)) throw new Error(`Destination path must be absolute: "${p}"`);
   const abs = resolve(p);
-  const ok = roots.some((r) => abs === r || abs.startsWith(r.endsWith(sep) ? r : r + sep));
-  if (!ok) {
+  if (!isWithinRoots(abs, roots)) {
     throw new Error(`Refusing to write outside allowed locations (home, temp, /Volumes): "${abs}"`);
   }
+  const ancestor = deepestExistingAncestor(abs);
+  if (ancestor === abs && lstatSync(abs).isSymbolicLink()) {
+    throw new Error(`Refusing to write to the symbolic link "${abs}".`);
+  }
+  let canonicalAncestor;
+  try {
+    canonicalAncestor = canonicalize(ancestor);
+  } catch {
+    throw new Error(`Destination path cannot be resolved: "${abs}"`);
+  }
+  const suffix = relative(ancestor, abs);
+  if (suffix.split(sep).includes("..")) {
+    throw new Error(`Refusing to write outside allowed locations (home, temp, /Volumes): "${abs}"`);
+  }
+  const canonicalDest = suffix ? join2(canonicalAncestor, suffix) : canonicalAncestor;
+  const allowed = canonicalRoots(roots);
+  if (!isWithinRoots(canonicalAncestor, allowed) || !isWithinRoots(canonicalDest, allowed)) {
+    throw new Error(
+      `Refusing to write outside allowed locations (home, temp, /Volumes): "${abs}" resolves to "${canonicalDest}" through a symbolic link.`
+    );
+  }
   return abs;
 }
 var DEFAULT_MAX_ATTACHMENT_BYTES = 25 * 1024 * 1024;
@@ -39272,7 +39343,7 @@ function cleanupTempDir(dir) {
 var import_turndown = __toESM(require_turndown_cjs(), 1);
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 var FIELD_SEP = "";
 var RECORD_SEP = "";
 var AS_FIELD_SEP = "(ASCII character 31)";
@@ -39324,6 +39395,15 @@ function sanitizeId(id) {
   }
   return escapeForAppleScript(id);
 }
+function sanitizeNoteId(id) {
+  const noteIdPattern = /^x-coredata:\/\/[0-9A-Fa-f-]+\/ICNote\/p\d+$/;
+  if (!noteIdPattern.test(id)) {
+    throw new Error(
+      `Invalid note ID format: "${id.substring(0, 80)}". Expected canonical Apple Note ID (x-coredata://.../ICNote/p...).`
+    );
+  }
+  return escapeForAppleScript(id);
+}
 function sanitizeAccountName(account) {
   validateLength(account, MAX_ACCOUNT_LENGTH, "Account name");
   return escapePlainStringForAppleScript(account);
@@ -39464,7 +39544,7 @@ function getNoteLinkFromDB(coreDataId) {
   const match = coreDataId.match(/\/p(\d+)$/);
   if (!match) return null;
   const pk = parseInt(match[1], 10);
-  const dbPath = join2(homedir3(), "Library/Group Containers/group.com.apple.notes/NoteStore.sqlite");
+  const dbPath = join3(homedir3(), "Library/Group Containers/group.com.apple.notes/NoteStore.sqlite");
   if (!existsSync3(dbPath)) return null;
   try {
     const { DatabaseSync } = __require("node:sqlite");
@@ -39616,10 +39696,19 @@ var AppleNotesManager = class {
     }
     const rawOutput = result.output.trim();
     const noteId = extractCoreDataId(rawOutput, "note") || rawOutput;
+    if (!noteId) {
+      console.error(`Created note "${title}" but Notes.app returned no canonical note ID`);
+      return null;
+    }
+    try {
+      sanitizeNoteId(noteId);
+    } catch {
+      console.error(`Created note "${title}" but Notes.app returned an invalid note ID`);
+      return null;
+    }
     const now = /* @__PURE__ */ new Date();
     return {
-      id: noteId || generateFallbackId(),
-      // Use real ID, fallback to unique temp ID
+      id: noteId,
       title,
       content,
       tags,
@@ -39943,141 +40032,75 @@ var AppleNotesManager = class {
     };
   }
   /**
-   * Deletes a note by its title.
-   *
-   * Note: This permanently deletes the note. It may be recoverable
-   * from the "Recently Deleted" folder in Notes.app.
+   * Replaces one exact note body only if the body is still the snapshot the
+   * caller reviewed and the note has no attachments.
    *
-   * @param title - Exact title of the note to delete
-   * @param account - Account containing the note (defaults to Notes.app's default account)
-   * @returns true if deletion succeeded, false otherwise
+   * Both guards and the write execute inside one AppleScript. This closes the
+   * race that would exist if JavaScript checked the note and then issued a
+   * separate unconditional `set body` command.
    */
-  deleteNote(title, account) {
-    const targetAccount = this.resolveAccount(account);
-    const safeTitle = escapePlainStringForAppleScript(title);
-    const deleteCommand = `delete note "${safeTitle}"`;
-    const script = buildAccountScopedScript({ account: targetAccount }, deleteCommand);
-    const result = executeMutationAppleScript(script);
-    if (!result.success) {
-      throwIfAccountResolutionFailed(result.error);
-      console.error(`Failed to delete note "${title}":`, result.error);
-      return false;
-    }
-    return true;
-  }
-  /**
-   * Deletes a note by its CoreData ID.
-   *
-   * This is more reliable than deleteNote() because IDs are unique
-   * across all accounts, while titles can be duplicated.
-   *
-   * @param id - CoreData URL identifier for the note
-   * @returns true if deletion succeeded, false otherwise
-   */
-  deleteNoteById(id) {
-    const safeId = sanitizeId(id);
-    const deleteCommand = `delete note id "${safeId}"`;
-    const script = buildAppLevelScript(deleteCommand);
-    const result = executeMutationAppleScript(script);
-    if (!result.success) {
-      console.error(`Failed to delete note with ID "${id}":`, result.error);
-      return false;
-    }
-    return true;
-  }
-  /**
-   * Updates an existing note's content and optionally its title.
-   *
-   * Apple Notes derives the title from the first line of the body,
-   * so updating content also allows title changes. If newTitle is
-   * not provided, the original title is preserved.
-   *
-   * When format is 'html', newTitle is ignored — the caller must include
-   * the title in the HTML content.
-   *
-   * Note: Password-protected notes will fail with an AppleScript error.
-   * Callers should check for password protection beforehand using
-   * getNoteDetails() or isNotePasswordProtected().
-   *
-   * @param title - Current title of the note to update
-   * @param newTitle - New title (optional, keeps existing if not provided; ignored in html format)
-   * @param newContent - New content for the note body
-   * @param account - Account containing the note (defaults to Notes.app's default account)
-   * @param format - Content format: "plaintext" wraps in div tags (default), "html" uses content as-is
-   * @returns true if update succeeded, false otherwise
-   */
-  updateNote(title, newTitle, newContent, account, format = "plaintext") {
+  updateNoteByIdIfUnchanged(id, currentTitle, expectedBody, newTitle, newContent, format = "plaintext") {
+    const safeId = sanitizeNoteId(id);
     if (newTitle) validateLength(newTitle, MAX_TITLE_LENGTH, "Note title");
     validateLength(newContent, MAX_CONTENT_LENGTH, "Note content");
-    const targetAccount = this.resolveAccount(account);
-    const safeCurrentTitle = escapePlainStringForAppleScript(title);
-    let fullBody;
+    validateLength(expectedBody, MAX_CONTENT_LENGTH, "Expected note content");
+    let writtenBody;
     if (format === "html") {
-      fullBody = escapeHtmlForAppleScript(newContent);
+      writtenBody = newContent;
     } else {
-      const effectiveTitle = newTitle || title;
-      const safeEffectiveTitle = escapeForAppleScript(effectiveTitle);
-      const safeContent = escapeForAppleScript(newContent);
-      fullBody = `<div>${safeEffectiveTitle}</div><div>${safeContent}</div>`;
+      const effectiveTitle = newTitle || currentTitle;
+      const encodePlaintext = (value) => escapeForAppleScript(value).replace(/\\"/g, '"');
+      writtenBody = `<div>${encodePlaintext(effectiveTitle)}</div><div>${encodePlaintext(newContent)}</div>`;
     }
-    const updateCommand = `set body of note "${safeCurrentTitle}" to "${fullBody}"`;
-    const script = buildAccountScopedScript({ account: targetAccount }, updateCommand);
+    const safeExpectedBody = escapeHtmlForAppleScript(expectedBody);
+    const safeWrittenBody = escapeHtmlForAppleScript(writtenBody);
+    const script = buildAppLevelScript(`
+      set noteRef to note id "${safeId}"
+      if (count of attachments of noteRef) is greater than 0 then return "SAFETY_ATTACHMENTS"
+      set currentBody to body of noteRef
+      considering case
+        if currentBody is not "${safeExpectedBody}" and currentBody is not "${safeExpectedBody}" & linefeed then return "SAFETY_CONFLICT"
+        set body of noteRef to "${safeWrittenBody}"
+      end considering
+      return "SAFETY_UPDATED"
+    `);
     const result = executeMutationAppleScript(script);
     if (!result.success) {
-      throwIfAccountResolutionFailed(result.error);
-      console.error(`Failed to update note "${title}":`, result.error);
-      return false;
+      console.error(`Failed guarded update for note ID "${id}":`, result.error);
+      return { status: "failed" };
     }
-    return true;
+    const status = result.output.trim();
+    if (status === "SAFETY_CONFLICT") return { status: "conflict" };
+    if (status === "SAFETY_ATTACHMENTS") return { status: "attachments" };
+    if (status !== "SAFETY_UPDATED") return { status: "failed" };
+    return { status: "updated", writtenBody };
   }
   /**
-   * Updates an existing note by its CoreData ID.
-   *
-   * This is more reliable than updateNote() because IDs are unique,
-   * while titles can be duplicated.
-   *
-   * When format is 'html', newTitle is ignored — the caller must include
-   * the title in the HTML content.
-   *
-   * Note: Password-protected notes will fail with an AppleScript error.
-   * Callers should check for password protection beforehand using
-   * getNoteById() or isNotePasswordProtectedById().
-   *
-   * @param id - CoreData URL identifier for the note
-   * @param newTitle - New title (optional, keeps existing if not provided; ignored in html format)
-   * @param newContent - New content for the note body
-   * @param format - Content format: "plaintext" wraps in div tags (default), "html" uses content as-is
-   * @returns true if update succeeded, false otherwise
+   * Deletes one exact note only when its complete body still matches the body
+   * the caller reviewed. The comparison and delete are one AppleScript action,
+   * so a concurrent edit cannot slip between the guard and deletion.
    */
-  updateNoteById(id, newTitle, newContent, format = "plaintext") {
-    if (newTitle) validateLength(newTitle, MAX_TITLE_LENGTH, "Note title");
-    validateLength(newContent, MAX_CONTENT_LENGTH, "Note content");
-    let fullBody;
-    if (format === "html") {
-      fullBody = escapeHtmlForAppleScript(newContent);
-    } else {
-      let effectiveTitle = newTitle;
-      if (!effectiveTitle) {
-        const note = this.getNoteById(id);
-        if (!note) {
-          console.error(`Cannot update note: note with ID "${id}" not found`);
-          return false;
-        }
-        effectiveTitle = note.title;
-      }
-      const safeEffectiveTitle = escapeForAppleScript(effectiveTitle);
-      const safeContent = escapeForAppleScript(newContent);
-      fullBody = `<div>${safeEffectiveTitle}</div><div>${safeContent}</div>`;
-    }
-    const safeId = sanitizeId(id);
-    const updateCommand = `set body of note id "${safeId}" to "${fullBody}"`;
-    const script = buildAppLevelScript(updateCommand);
+  deleteNoteByIdIfUnchanged(id, expectedBody) {
+    const safeId = sanitizeNoteId(id);
+    validateLength(expectedBody, MAX_CONTENT_LENGTH, "Expected note content");
+    const safeExpectedBody = escapeHtmlForAppleScript(expectedBody);
+    const script = buildAppLevelScript(`
+      set noteRef to note id "${safeId}"
+      set currentBody to body of noteRef
+      considering case
+        if currentBody is not "${safeExpectedBody}" and currentBody is not "${safeExpectedBody}" & linefeed then return "SAFETY_CONFLICT"
+        delete noteRef
+      end considering
+      return "SAFETY_DELETED"
+    `);
     const result = executeMutationAppleScript(script);
     if (!result.success) {
-      console.error(`Failed to update note with ID "${id}":`, result.error);
-      return false;
+      console.error(`Failed guarded delete for note ID "${id}":`, result.error);
+      return { status: "failed" };
     }
-    return true;
+    const status = result.output.trim();
+    if (status === "SAFETY_CONFLICT") return { status: "conflict" };
+    return status === "SAFETY_DELETED" ? { status: "deleted" } : { status: "failed" };
   }
   /**
    * Builds the AppleScript body for a bulk note listing.
@@ -40461,32 +40484,6 @@ var AppleNotesManager = class {
     }
     return true;
   }
-  /**
-   * Moves a note to a different folder, looked up by title.
-   *
-   * Uses Notes.app's native `move` command (the same one `batchMoveNotes`
-   * uses), which relocates the note in place — preserving its identity, id,
-   * creation date, AND all embedded attachments (files/images/PDFs/scans/audio).
-   * The previous copy-then-delete implementation rebuilt the note from its body
-   * HTML, which silently dropped attachments and reset the note's identity.
-   *
-   * The note is resolved to its id first (titles can be duplicated), then moved
-   * by id so the title-based and id-based paths share the same native move.
-   *
-   * @param title - Title of the note to move
-   * @param destinationFolder - Name of the folder to move to (must already exist)
-   * @param account - Account containing the note (defaults to Notes.app's default account)
-   * @returns true if the move succeeded, false otherwise
-   */
-  moveNote(title, destinationFolder, account) {
-    const targetAccount = this.resolveAccount(account);
-    const originalNote = this.getNoteDetails(title, targetAccount);
-    if (!originalNote) {
-      console.error(`Cannot move note "${title}": note not found`);
-      return false;
-    }
-    return this.moveNoteById(originalNote.id, destinationFolder, targetAccount);
-  }
   /**
    * Moves a note to a different folder by its CoreData ID.
    *
@@ -40502,13 +40499,17 @@ var AppleNotesManager = class {
    */
   moveNoteById(id, destinationFolder, account) {
     const targetAccount = this.resolveAccount(account);
-    const safeId = sanitizeId(id);
+    const safeId = sanitizeNoteId(id);
     const destFolderRef = `${buildFolderReference(destinationFolder)} of ${AS_ACCOUNT_REF}`;
     const moveCommand = `
       ${buildAccountResolution(targetAccount)}
       set destFolder to ${destFolderRef}
       set noteRef to note id "${safeId}"
       move noteRef to destFolder
+      set movedNoteRef to note id "${safeId}"
+      set actualFolder to container of movedNoteRef
+      if (id of actualFolder) is not (id of destFolder) then return "SAFETY_WRONG_FOLDER"
+      return "SAFETY_MOVED"
     `;
     const script = buildAppLevelScript(moveCommand);
     const result = executeMutationAppleScript(script);
@@ -40520,6 +40521,12 @@ var AppleNotesManager = class {
       );
       return false;
     }
+    if (result.output.trim() !== "SAFETY_MOVED") {
+      console.error(
+        `Move result for note ID "${id}" did not verify destination "${destinationFolder}"`
+      );
+      return false;
+    }
     return true;
   }
   // ===========================================================================
@@ -41304,95 +41311,10 @@ var AppleNotesManager = class {
   createBatchResult(id, success, error2) {
     return error2 ? { id, success, error: error2 } : { id, success };
   }
-  /**
-   * Deletes multiple notes by their IDs.
-   *
-   * Each deletion is attempted independently; failures don't stop other deletions.
-   * Returns results for each note indicating success or failure.
-   *
-   * @param ids - Array of CoreData URL identifiers for notes to delete
-   * @returns Array of results with id, success status, and optional error message
-   *
-   * @example
-   * ```typescript
-   * const results = manager.batchDeleteNotes([
-   *   "x-coredata://ABC/ICNote/p1",
-   *   "x-coredata://ABC/ICNote/p2"
-   * ]);
-   * results.forEach(r => {
-   *   if (r.success) console.log(`Deleted ${r.id}`);
-   *   else console.log(`Failed to delete ${r.id}: ${r.error}`);
-   * });
-   * ```
-   */
-  batchDeleteNotes(ids) {
-    if (ids.length === 0) return [];
-    const results = new Array(ids.length);
-    const runnable = [];
-    ids.forEach((id, i) => {
-      try {
-        runnable.push({ index: i, safe: sanitizeId(id) });
-      } catch (e) {
-        results[i] = this.createBatchResult(
-          id,
-          false,
-          e instanceof Error ? e.message : "Invalid note ID"
-        );
-      }
-    });
-    if (runnable.length > 0) {
-      const idList = runnable.map((r) => `"${r.safe}"`).join(", ");
-      const script = buildAppLevelScript(`
-        set out to ""
-        repeat with rawId in {${idList}}
-          set theId to (rawId as text)
-          set noteRef to missing value
-          try
-            set noteRef to note id theId
-          end try
-          if noteRef is missing value then
-            set out to out & "missing" & ${AS_RECORD_SEP}
-          else
-            set isPw to false
-            try
-              set isPw to (password protected of noteRef)
-            end try
-            if isPw then
-              set out to out & "pw" & ${AS_RECORD_SEP}
-            else
-              try
-                delete noteRef
-                set out to out & "ok" & ${AS_RECORD_SEP}
-              on error
-                set out to out & "fail" & ${AS_RECORD_SEP}
-              end try
-            end if
-          end if
-        end repeat
-        return out
-      `);
-      const res = executeMutationAppleScript(script);
-      if (!res.success) {
-        for (const r of runnable) {
-          results[r.index] = this.createBatchResult(
-            ids[r.index],
-            false,
-            res.error ?? "Batch delete failed"
-          );
-        }
-      } else {
-        const statuses = res.output.split(RECORD_SEP).map((s) => s.trim()).filter((s) => s.length > 0);
-        runnable.forEach((r, k) => {
-          results[r.index] = this.mapBatchStatus(ids[r.index], statuses[k], "delete");
-        });
-      }
-    }
-    return results;
-  }
   /**
    * Maps a per-item status token emitted by a batch AppleScript loop to a
    * BatchResult, preserving the human-readable error messages of the original
-   * per-note implementation. See {@link batchDeleteNotes} / {@link batchMoveNotes}.
+   * per-note implementation. See {@link batchMoveNotes}.
    */
   mapBatchStatus(id, status, op) {
     switch (status) {
@@ -41408,6 +41330,8 @@ var AppleNotesManager = class {
           false,
           op === "delete" ? "Deletion failed" : "Move failed"
         );
+      case "wrongfolder":
+        return this.createBatchResult(id, false, "Destination folder verification failed");
       default:
         return this.createBatchResult(id, false, "Unknown error");
     }
@@ -41472,7 +41396,13 @@ var AppleNotesManager = class {
             else
               try
                 move noteRef to destFolder
-                set out to out & "ok" & ${AS_RECORD_SEP}
+                set movedNoteRef to note id theId
+                set actualFolder to container of movedNoteRef
+                if (id of actualFolder) is (id of destFolder) then
+                  set out to out & "ok" & ${AS_RECORD_SEP}
+                else
+                  set out to out & "wrongfolder" & ${AS_RECORD_SEP}
+                end if
               on error
                 set out to out & "fail" & ${AS_RECORD_SEP}
               end try
@@ -42108,12 +42038,12 @@ function formatDoctorReport(r) {
 
 // src/services/fileConfig.ts
 import { existsSync as existsSync6, readFileSync as readFileSync2 } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import { homedir as homedir6 } from "os";
 function fileConfigPath(env = process.env) {
   const override = env.APPLE_NOTES_MCP_CONFIG_FILE;
   if (override && override.trim()) return override.trim();
-  return join5(homedir6(), "Library", "Application Support", "apple-notes-mcp", "config.json");
+  return join6(homedir6(), "Library", "Application Support", "apple-notes-mcp", "config.json");
 }
 function loadFileConfig(env = process.env, path4 = fileConfigPath(env)) {
   const applied = [];
@@ -42320,6 +42250,18 @@ function withJsonSchema2020_12(transport2) {
   return transport2;
 }
 
+// src/utils/noteRevision.ts
+import { createHash } from "node:crypto";
+function hashNoteContent(content) {
+  return `sha256:${createHash("sha256").update(content, "utf8").digest("hex")}`;
+}
+function comparableVisibleText(html) {
+  return html.replace(/<br\s*\/?\s*>/gi, " ").replace(/<[^>]*>/g, " ").replace(/&nbsp;|&#160;/gi, " ").replace(/&quot;/gi, '"').replace(/&#39;|&apos;/gi, "'").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/&amp;/gi, "&").replace(/&#(\d+);/g, (_match, codePoint) => String.fromCodePoint(Number(codePoint))).replace(
+    /&#x([0-9a-f]+);/gi,
+    (_match, codePoint) => String.fromCodePoint(Number.parseInt(codePoint, 16))
+  ).replace(/\s+/g, " ").trim();
+}
+
 // src/index.ts
 loadFileConfig();
 var require2 = createRequire(import.meta.url);
@@ -42370,6 +42312,28 @@ var noteTitleSchema = {
     "Account name (defaults to Notes.app's default account; exact or unique-prefix match)"
   )
 };
+var noteIdInput = external_exports.string().min(1, "Note ID is required").max(MAX.ID).regex(
+  /^x-coredata:\/\/[0-9A-Fa-f-]+\/ICNote\/p\d+$/,
+  "A canonical Apple Note ID is required (x-coredata://.../ICNote/p...)"
+).describe("Exact CoreData note ID returned by search-notes, list-notes, or create-note");
+var expectedContentHashInput = external_exports.string().regex(/^sha256:[a-f0-9]{64}$/, "expectedContentHash must come from get-note-content").describe(
+  "Revision token returned by get-note-content for this exact ID. The mutation stops if the note changed since that read."
+);
+function readExactNoteSnapshot(id) {
+  const note = notesManager.getNoteById(id);
+  if (!note) return { error: `Note with ID "${id}" not found` };
+  if (note.passwordProtected) {
+    return {
+      error: `Note "${note.title}" is password-protected and cannot be changed. Unlock it in Notes.app first.`
+    };
+  }
+  const body = notesManager.getNoteContentById(id);
+  if (!body) return { error: `Failed to read content of note "${note.title}"` };
+  return { note, body, contentHash: hashNoteContent(body) };
+}
+function revisionConflictMessage(title) {
+  return `Note "${title}" changed after it was read. Read it again and review the newer version before retrying.`;
+}
 var folderNameSchema = {
   name: external_exports.string().min(1, "Folder name is required").max(MAX.FOLDER),
   account: external_exports.string().max(MAX.ACCOUNT).optional().describe(
@@ -42409,7 +42373,9 @@ registerTool(
       id: external_exports.string().optional(),
       title: external_exports.string().optional(),
       folder: external_exports.string().optional(),
-      account: external_exports.string().optional()
+      account: external_exports.string().optional(),
+      contentHash: external_exports.string().optional(),
+      verified: external_exports.boolean().optional()
     }
   },
   withErrorHandling(({ title, content, format = "plaintext", tags = [], folder, account }) => {
@@ -42420,13 +42386,23 @@ registerTool(
         `Failed to create note "${title}".${target} Otherwise check that Notes.app is running and this server has Automation access (run the doctor tool).`
       );
     }
+    const created = notesManager.getNoteById(note.id);
+    const createdBody = notesManager.getNoteContentById(note.id);
+    if (!created || !createdBody) {
+      return errorResponse(
+        `A note may have been created, but its exact ID could not be verified. Do not retry automatically. Returned ID: ${note.id}`
+      );
+    }
+    const contentHash = hashNoteContent(createdBody);
     const checklistWarning = detectChecklistAttempt(content) ?? "";
     return successResponse(`Note created: "${note.title}" [id: ${note.id}]${checklistWarning}`, {
       ok: true,
       id: note.id,
       title: note.title,
       folder,
-      account
+      account,
+      contentHash,
+      verified: true
     });
   }, "Error creating note")
 );
@@ -42506,7 +42482,7 @@ ${noteList}${truncationNote}${syncNote}`,
 registerTool(
   "get-note-content",
   {
-    description: "Use when: reading the full body text of one known note, by id (preferred) or title.\nReturns: the note's content plus parsed hashtags, and strippedImages/truncated when the body was capped.\nDo not use when: you only need metadata (get-note-details) or Markdown with checklist state (get-note-markdown).\nNote: password-protected notes must be unlocked in Notes.app first.\nSafety: inline images larger than APPLE_NOTES_MCP_MAX_INLINE_IMAGE_BYTES (default 256 KB) are replaced with '[inline image omitted: ...]' text placeholders, so the returned body is lossy whenever truncated is true \u2014 do NOT write it back with update-note or the real images are replaced by that text. Use append-to-note to add content, or export the images with save-attachment / fetch-attachment first.",
+    description: "Use when: reading the full body text of one known note, by id (preferred) or title.\nReturns: the exact note id, content, contentHash revision token, parsed hashtags, and strippedImages/truncated when the body was capped.\nDo not use when: you only need metadata (get-note-details) or Markdown with checklist state (get-note-markdown).\nNote: password-protected notes must be unlocked in Notes.app first.\nSafety: inline images larger than APPLE_NOTES_MCP_MAX_INLINE_IMAGE_BYTES (default 256 KB) are replaced with '[inline image omitted: ...]' text placeholders, so the returned body is lossy whenever truncated is true. Mutations refuse attachment-bearing notes; edit those in Notes.app.",
     inputSchema: {
       id: external_exports.string().max(MAX.ID).optional().describe("Note ID (preferred - more reliable than title)"),
       title: external_exports.string().max(MAX.TITLE).optional().describe("Note title (use id instead when available)"),
@@ -42515,8 +42491,10 @@ registerTool(
       )
     },
     outputSchema: {
+      id: external_exports.string().optional(),
       title: external_exports.string().optional(),
       content: external_exports.string().optional(),
+      contentHash: external_exports.string().optional(),
       hashtags: external_exports.array(external_exports.string()).optional(),
       /** Number of oversized inline images replaced with text placeholders. */
       strippedImages: external_exports.number().optional(),
@@ -42544,8 +42522,10 @@ registerTool(
       const hashtags2 = parseHashtags(content2);
       const warning2 = strippedImagesWarning(stripped2);
       return successResponse(warning2 ? content2 + warning2 : content2, {
+        id,
         title: note2.title,
         content: content2,
+        contentHash: hashNoteContent(rawContent2),
         hashtags: hashtags2,
         strippedImages: stripped2.strippedCount,
         truncated: stripped2.strippedCount > 0
@@ -42572,8 +42552,10 @@ registerTool(
     const hashtags = parseHashtags(content);
     const warning = strippedImagesWarning(stripped);
     return successResponse(warning ? content + warning : content, {
+      id: note.id,
       title,
       content,
+      contentHash: hashNoteContent(rawContent),
       hashtags,
       strippedImages: stripped.strippedCount,
       truncated: stripped.strippedCount > 0
@@ -42817,110 +42799,122 @@ registerTool(
 registerTool(
   "update-note",
   {
-    description: "Use when: changing the title and/or replacing the body of an existing note, by id (preferred) or title.\nReturns: confirmation; warns when the note is shared.\nDo not use when: creating a new note (create-note).\nSafety: newContent REPLACES the entire body \u2014 it does not append. Read the note first if you need to preserve existing text, and run list-attachments first when the note may hold files, images, scans, PDFs, or audio, since a full-body replace can drop embedded attachments. Edits to shared notes are immediately visible to all collaborators.",
+    description: "Use when: replacing the body of one exact Apple Note after reading it by id.\nReturns: exact id, new content hash, and visible-text readback verification.\nDo not use when: you only have a title, the note changed since the read, or the note has attachments.\nSafety: requires the exact note id and expectedContentHash from get-note-content. The server atomically rejects stale content and attachment-bearing notes, then reads the same id back after saving. Notes.app normalizes HTML, so rich formatting is not claimed as byte-identical.",
     inputSchema: {
-      id: external_exports.string().max(MAX.ID).optional().describe("Note ID (preferred - more reliable than title)"),
-      title: external_exports.string().max(MAX.TITLE).optional().describe("Current note title (use id instead when available)"),
+      id: noteIdInput,
+      expectedContentHash: expectedContentHashInput,
       newTitle: external_exports.string().max(MAX.TITLE).optional().describe(
         "New title for plaintext updates. Ignored when format is 'html'; include the visible title as the first line of newContent instead."
       ),
       newContent: external_exports.string().min(1, "New content is required").max(MAX.CONTENT).describe(
         "New note body. AppleScript cannot produce true Apple Notes checklists; checkbox inputs and `- [ ]` markdown do not render as checkable items. Use a plain list and convert in Notes.app with \u21E7\u2318L."
       ),
-      format: external_exports.enum(["plaintext", "html"]).optional().default("plaintext").describe("Content format: 'plaintext' (default) or 'html' for rich formatting"),
-      account: external_exports.string().max(MAX.ACCOUNT).optional().describe("Account containing the note (ignored if id is provided)")
+      format: external_exports.enum(["plaintext", "html"]).optional().default("plaintext").describe("Content format: 'plaintext' (default) or 'html' for rich formatting")
     },
     outputSchema: {
       ok: external_exports.boolean().optional(),
       id: external_exports.string().optional(),
       title: external_exports.string().optional(),
-      shared: external_exports.boolean().optional()
+      shared: external_exports.boolean().optional(),
+      previousContentHash: external_exports.string().optional(),
+      contentHash: external_exports.string().optional(),
+      verifiedVisibleText: external_exports.boolean().optional()
     }
   },
-  withErrorHandling(({ id, title, newTitle, newContent, format = "plaintext", account }) => {
-    if (id) {
-      const note2 = notesManager.getNoteById(id);
-      if (!note2) {
-        return errorResponse(`Note with ID "${id}" not found`);
-      }
-      if (note2.passwordProtected) {
-        return errorResponse(
-          `Note "${note2.title}" is password-protected and cannot be updated. Unlock it in Notes.app first.`
-        );
-      }
-      const success2 = notesManager.updateNoteById(id, newTitle, newContent, format);
-      if (!success2) {
-        return errorResponse(`Failed to update note "${note2.title}"`);
-      }
-      const displayTitle = resolveUpdateResponseTitle(note2.title, newTitle, format, newContent);
-      const sharedWarning2 = note2.shared ? "\n\n\u26A0\uFE0F This note is shared with collaborators. Your changes will be visible to them." : "";
-      const checklistWarning2 = detectChecklistAttempt(newContent) ?? "";
-      return successResponse(`Note updated: "${displayTitle}"${sharedWarning2}${checklistWarning2}`, {
-        ok: true,
-        id,
-        title: displayTitle,
-        shared: note2.shared ?? false
-      });
+  withErrorHandling(({ id, expectedContentHash, newTitle, newContent, format = "plaintext" }) => {
+    const snapshot = readExactNoteSnapshot(id);
+    if ("error" in snapshot) return errorResponse(snapshot.error);
+    if (snapshot.contentHash !== expectedContentHash) {
+      return errorResponse(revisionConflictMessage(snapshot.note.title));
+    }
+    const attachments = notesManager.listAttachmentsById(id);
+    if (attachments.length > 0) {
+      return errorResponse(
+        `Note "${snapshot.note.title}" has ${attachments.length} attachment(s). Full-body replacement is blocked; edit it in Notes.app.`
+      );
     }
-    if (!title) {
-      return errorResponse("Either 'id' or 'title' is required");
+    const result = notesManager.updateNoteByIdIfUnchanged(
+      id,
+      snapshot.note.title,
+      snapshot.body,
+      newTitle,
+      newContent,
+      format
+    );
+    if (result.status === "conflict") {
+      return errorResponse(revisionConflictMessage(snapshot.note.title));
     }
-    const note = notesManager.getNoteDetails(title, account);
-    if (!note) {
+    if (result.status === "attachments") {
       return errorResponse(
-        `Note "${title}" not found. Use search-notes to find notes, then use the note's ID for reliable operations.`
+        `Note "${snapshot.note.title}" gained an attachment before saving. No content was replaced.`
       );
     }
-    if (note.passwordProtected) {
+    if (result.status !== "updated") {
       return errorResponse(
-        `Note "${title}" is password-protected and cannot be updated. Unlock it in Notes.app first.`
+        `The update result for note "${snapshot.note.title}" is uncertain. Read the exact ID before retrying.`
       );
     }
-    const success = notesManager.updateNote(title, newTitle, newContent, account, format);
-    if (!success) {
-      return errorResponse(`Failed to update note "${title}"`);
+    const readback = notesManager.getNoteContentById(id);
+    const contentHash = readback ? hashNoteContent(readback) : "";
+    if (!readback || comparableVisibleText(readback) !== comparableVisibleText(result.writtenBody)) {
+      return errorResponse(
+        `The note accepted an update, but exact-ID readback visible text did not match. Do not retry automatically; inspect note ID ${id} in Notes.app.`
+      );
     }
-    const finalTitle = resolveUpdateResponseTitle(note.title, newTitle, format, newContent);
-    const sharedWarning = note.shared ? "\n\n\u26A0\uFE0F This note is shared with collaborators. Your changes will be visible to them." : "";
+    const displayTitle = resolveUpdateResponseTitle(
+      snapshot.note.title,
+      newTitle,
+      format,
+      newContent
+    );
+    const sharedWarning = snapshot.note.shared ? "\n\n\u26A0\uFE0F This note is shared with collaborators. Your changes are visible to them." : "";
     const checklistWarning = detectChecklistAttempt(newContent) ?? "";
-    return successResponse(`Note updated: "${finalTitle}"${sharedWarning}${checklistWarning}`, {
-      ok: true,
-      title: finalTitle,
-      shared: note.shared ?? false
-    });
+    return successResponse(
+      `Note updated; visible text verified: "${displayTitle}" [id: ${id}]${sharedWarning}${checklistWarning}`,
+      {
+        ok: true,
+        id,
+        title: displayTitle,
+        shared: snapshot.note.shared ?? false,
+        previousContentHash: expectedContentHash,
+        contentHash,
+        verifiedVisibleText: true
+      }
+    );
   }, "Error updating note")
 );
 registerTool(
   "append-to-note",
   {
-    description: "Use when: adding content to an existing note without replacing it, by id (preferred) or title.\nReturns: confirmation with the note id and title.\nDo not use when: creating a new note (create-note) or replacing the entire body (update-note).\nSafety: reads the existing body first, concatenates, then writes back. Run list-attachments first if the note may hold embedded files \u2014 a full-body rewrite can drop attachments.",
+    description: "Use when: adding content to one exact note after reading it by id.\nReturns: exact id, new content hash, and visible-text readback verification.\nDo not use when: you only have a title, the note changed since the read, or it has attachments.\nSafety: append still rewrites the full HTML body, so it uses the same exact-ID, revision, attachment, and readback guards as update-note. Notes.app normalizes HTML, so rich formatting is not claimed as byte-identical.",
     inputSchema: {
-      id: external_exports.string().max(MAX.ID).optional().describe("Note ID (preferred - more reliable than title)"),
-      title: external_exports.string().max(MAX.TITLE).optional().describe("Note title (use id instead when available)"),
+      id: noteIdInput,
+      expectedContentHash: expectedContentHashInput,
       content: external_exports.string().min(1, "Content to append is required").max(MAX.CONTENT).describe("Text to append to the note body"),
       position: external_exports.enum(["after", "before"]).optional().default("after").describe(
         "Where to insert: 'after' appends to the end (default), 'before' prepends to the start"
       ),
       separator: external_exports.string().max(20).optional().default("\n\n").describe("String placed between existing content and new content (default: two newlines)"),
-      format: external_exports.enum(["plaintext", "html"]).optional().default("plaintext").describe("Format of the content being appended: 'plaintext' (default) or 'html'"),
-      account: external_exports.string().max(MAX.ACCOUNT).optional().describe("Account containing the note (ignored if id is provided)")
+      format: external_exports.enum(["plaintext", "html"]).optional().default("plaintext").describe("Format of the content being appended: 'plaintext' (default) or 'html'")
     },
     outputSchema: {
       ok: external_exports.boolean().optional(),
       id: external_exports.string().optional(),
       title: external_exports.string().optional(),
-      shared: external_exports.boolean().optional()
+      shared: external_exports.boolean().optional(),
+      previousContentHash: external_exports.string().optional(),
+      contentHash: external_exports.string().optional(),
+      verifiedVisibleText: external_exports.boolean().optional()
     }
   },
   withErrorHandling(
     ({
       id,
-      title,
+      expectedContentHash,
       content,
       position = "after",
       separator = "\n\n",
-      format = "plaintext",
-      account
+      format = "plaintext"
     }) => {
       const contentToHtml = (text) => {
         if (format === "html") return text;
@@ -42935,72 +42929,64 @@ registerTool(
         const escaped = sep2.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
         return `<div>${escaped}</div>`;
       };
-      if (id) {
-        const note2 = notesManager.getNoteById(id);
-        if (!note2) {
-          return errorResponse(`Note with ID "${id}" not found`);
-        }
-        if (note2.passwordProtected) {
-          return errorResponse(
-            `Note "${note2.title}" is password-protected and cannot be updated. Unlock it in Notes.app first.`
-          );
-        }
-        const existingHtml2 = notesManager.getNoteContentById(id);
-        if (existingHtml2 === null || existingHtml2 === void 0) {
-          return errorResponse(`Failed to read content of note "${note2.title}"`);
-        }
-        const firstDivEnd2 = existingHtml2.indexOf("</div>");
-        const titleDiv2 = firstDivEnd2 !== -1 ? existingHtml2.slice(0, firstDivEnd2 + 6) : "";
-        const bodyHtml2 = firstDivEnd2 !== -1 ? existingHtml2.slice(firstDivEnd2 + 6) : existingHtml2;
-        const newBlock2 = contentToHtml(content);
-        const sepHtml2 = separatorToHtml(separator);
-        const combinedBody2 = position === "before" ? titleDiv2 + newBlock2 + sepHtml2 + bodyHtml2 : titleDiv2 + bodyHtml2 + sepHtml2 + newBlock2;
-        const success2 = notesManager.updateNoteById(id, void 0, combinedBody2, "html");
-        if (!success2) {
-          return errorResponse(`Failed to append to note "${note2.title}"`);
-        }
-        const sharedWarning2 = note2.shared ? "\n\n\u26A0\uFE0F This note is shared with collaborators. Your changes will be visible to them." : "";
-        return successResponse(`Note appended: "${note2.title}"${sharedWarning2}`, {
-          ok: true,
-          id,
-          title: note2.title,
-          shared: note2.shared ?? false
-        });
+      const snapshot = readExactNoteSnapshot(id);
+      if ("error" in snapshot) return errorResponse(snapshot.error);
+      if (snapshot.contentHash !== expectedContentHash) {
+        return errorResponse(revisionConflictMessage(snapshot.note.title));
       }
-      if (!title) {
-        return errorResponse("Either 'id' or 'title' is required");
-      }
-      const note = notesManager.getNoteDetails(title, account);
-      if (!note) {
+      const attachments = notesManager.listAttachmentsById(id);
+      if (attachments.length > 0) {
         return errorResponse(
-          `Note "${title}" not found. Use search-notes to find notes, then use the note's ID for reliable operations.`
+          `Note "${snapshot.note.title}" has ${attachments.length} attachment(s). Append is blocked because it rewrites the full body; edit it in Notes.app.`
         );
       }
-      if (note.passwordProtected) {
+      const firstDivEnd = snapshot.body.indexOf("</div>");
+      const titleDiv = firstDivEnd !== -1 ? snapshot.body.slice(0, firstDivEnd + 6) : "";
+      const bodyHtml = firstDivEnd !== -1 ? snapshot.body.slice(firstDivEnd + 6) : snapshot.body;
+      const newBlock = contentToHtml(content);
+      const sepHtml = separatorToHtml(separator);
+      const combinedBody = position === "before" ? titleDiv + newBlock + sepHtml + bodyHtml : titleDiv + bodyHtml + sepHtml + newBlock;
+      const result = notesManager.updateNoteByIdIfUnchanged(
+        id,
+        snapshot.note.title,
+        snapshot.body,
+        void 0,
+        combinedBody,
+        "html"
+      );
+      if (result.status === "conflict") {
+        return errorResponse(revisionConflictMessage(snapshot.note.title));
+      }
+      if (result.status === "attachments") {
         return errorResponse(
-          `Note "${title}" is password-protected and cannot be updated. Unlock it in Notes.app first.`
+          `Note "${snapshot.note.title}" gained an attachment before saving. No content was appended.`
         );
       }
-      const existingHtml = notesManager.getNoteContent(title, account);
-      if (existingHtml === null || existingHtml === void 0) {
-        return errorResponse(`Failed to read content of note "${title}"`);
+      if (result.status !== "updated") {
+        return errorResponse(
+          `The append result for note "${snapshot.note.title}" is uncertain. Read the exact ID before retrying.`
+        );
       }
-      const firstDivEnd = existingHtml.indexOf("</div>");
-      const titleDiv = firstDivEnd !== -1 ? existingHtml.slice(0, firstDivEnd + 6) : "";
-      const bodyHtml = firstDivEnd !== -1 ? existingHtml.slice(firstDivEnd + 6) : existingHtml;
-      const newBlock = contentToHtml(content);
-      const sepHtml = separatorToHtml(separator);
-      const combinedBody = position === "before" ? titleDiv + newBlock + sepHtml + bodyHtml : titleDiv + bodyHtml + sepHtml + newBlock;
-      const success = notesManager.updateNote(title, void 0, combinedBody, account, "html");
-      if (!success) {
-        return errorResponse(`Failed to append to note "${title}"`);
+      const readback = notesManager.getNoteContentById(id);
+      const contentHash = readback ? hashNoteContent(readback) : "";
+      if (!readback || comparableVisibleText(readback) !== comparableVisibleText(result.writtenBody)) {
+        return errorResponse(
+          `The note accepted an append, but exact-ID readback visible text did not match. Do not retry automatically; inspect note ID ${id} in Notes.app.`
+        );
       }
-      const sharedWarning = note.shared ? "\n\n\u26A0\uFE0F This note is shared with collaborators. Your changes will be visible to them." : "";
-      return successResponse(`Note appended: "${title}"${sharedWarning}`, {
-        ok: true,
-        title,
-        shared: note.shared ?? false
-      });
+      const sharedWarning = snapshot.note.shared ? "\n\n\u26A0\uFE0F This note is shared with collaborators. Your changes are visible to them." : "";
+      return successResponse(
+        `Note appended; visible text verified: "${snapshot.note.title}"${sharedWarning}`,
+        {
+          ok: true,
+          id,
+          title: snapshot.note.title,
+          shared: snapshot.note.shared ?? false,
+          previousContentHash: expectedContentHash,
+          contentHash,
+          verifiedVisibleText: true
+        }
+      );
     },
     "Error appending to note"
   )
@@ -43008,67 +42994,53 @@ registerTool(
 registerTool(
   "delete-note",
   {
-    description: "Use when: permanently deleting a single note, by id (preferred) or title.\nReturns: confirmation; warns when the note was shared.\nDo not use when: deleting many notes (batch-delete-notes) or just relocating one (move-note).\nSafety: requires explicit user confirmation before deleting. Prefer search-notes/list-notes first to show the affected note id and title. Deleting a shared note removes collaborator access.",
+    description: "Use when: moving one exact note to Recently Deleted after reading and reviewing it.\nReturns: confirmation with the exact id.\nDo not use when: you only have a title or the note changed since review.\nSafety: requires id and expectedContentHash from get-note-content. The body comparison and delete happen in one AppleScript, so a newer edit is preserved.",
     inputSchema: {
-      id: external_exports.string().max(MAX.ID).optional().describe("Note ID (preferred - more reliable than title)"),
-      title: external_exports.string().max(MAX.TITLE).optional().describe("Note title (use id instead when available)"),
-      account: external_exports.string().max(MAX.ACCOUNT).optional().describe(
-        "Account name (defaults to Notes.app's default account; exact or unique-prefix match, ignored if id is provided)"
-      )
+      id: noteIdInput,
+      expectedContentHash: expectedContentHashInput
     },
     outputSchema: {
       ok: external_exports.boolean().optional(),
       id: external_exports.string().optional(),
       title: external_exports.string().optional(),
-      wasShared: external_exports.boolean().optional()
+      wasShared: external_exports.boolean().optional(),
+      previousContentHash: external_exports.string().optional()
     }
   },
-  withErrorHandling(({ id, title, account }) => {
-    if (id) {
-      const note2 = notesManager.getNoteById(id);
-      if (!note2) {
-        return errorResponse(`Note with ID "${id}" not found`);
-      }
-      const success2 = notesManager.deleteNoteById(id);
-      if (!success2) {
-        return errorResponse(`Failed to delete note "${note2.title}"`);
-      }
-      const sharedWarning2 = note2.shared ? "\n\n\u26A0\uFE0F This note was shared with collaborators. They will no longer have access." : "";
-      return successResponse(`Note deleted: "${note2.title}"${sharedWarning2}`, {
-        ok: true,
-        id,
-        title: note2.title,
-        wasShared: note2.shared ?? false
-      });
+  withErrorHandling(({ id, expectedContentHash }) => {
+    const snapshot = readExactNoteSnapshot(id);
+    if ("error" in snapshot) return errorResponse(snapshot.error);
+    if (snapshot.contentHash !== expectedContentHash) {
+      return errorResponse(revisionConflictMessage(snapshot.note.title));
     }
-    if (!title) {
-      return errorResponse("Either 'id' or 'title' is required");
+    const result = notesManager.deleteNoteByIdIfUnchanged(id, snapshot.body);
+    if (result.status === "conflict") {
+      return errorResponse(revisionConflictMessage(snapshot.note.title));
     }
-    const note = notesManager.getNoteDetails(title, account);
-    if (!note) {
+    if (result.status !== "deleted") {
       return errorResponse(
-        `Note "${title}" not found. Use search-notes to find notes, then use the note's ID for reliable operations.`
+        `The delete result for note "${snapshot.note.title}" is uncertain. Inspect exact ID ${id} before retrying.`
       );
     }
-    const success = notesManager.deleteNote(title, account);
-    if (!success) {
-      return errorResponse(`Failed to delete note "${title}"`);
-    }
-    const sharedWarning = note.shared ? "\n\n\u26A0\uFE0F This note was shared with collaborators. They will no longer have access." : "";
-    return successResponse(`Note deleted: "${title}"${sharedWarning}`, {
-      ok: true,
-      title,
-      wasShared: note.shared ?? false
-    });
+    const sharedWarning = snapshot.note.shared ? "\n\n\u26A0\uFE0F This note was shared with collaborators. They will no longer have access." : "";
+    return successResponse(
+      `Note moved to Recently Deleted: "${snapshot.note.title}"${sharedWarning}`,
+      {
+        ok: true,
+        id,
+        title: snapshot.note.title,
+        wasShared: snapshot.note.shared ?? false,
+        previousContentHash: expectedContentHash
+      }
+    );
   }, "Error deleting note")
 );
 registerTool(
   "move-note",
   {
-    description: "Use when: moving one note to a different folder, by id (preferred) or title.\nReturns: confirmation of the note and destination folder.\nDo not use when: moving many notes (batch-move-notes).\nNote: the note is relocated in place via Notes.app's native move, preserving its id, creation date, and all attachments. The destination folder must already exist (create-folder).",
+    description: "Use when: moving one exact note to a different folder by id.\nReturns: confirmation and exact-ID readback.\nDo not use when: you only have a title or want to move many notes (batch-move-notes).\nNote: Notes.app's native move preserves the note id, creation date, body, and attachments. The destination folder must already exist.",
     inputSchema: {
-      id: external_exports.string().max(MAX.ID).optional().describe("Note ID (preferred - more reliable than title)"),
-      title: external_exports.string().max(MAX.TITLE).optional().describe("Note title (use id instead when available)"),
+      id: noteIdInput,
       folder: external_exports.string().min(1, "Destination folder is required").max(MAX.FOLDER),
       account: external_exports.string().max(MAX.ACCOUNT).optional().describe("Account containing the note/folder")
     },
@@ -43076,47 +43048,33 @@ registerTool(
       ok: external_exports.boolean().optional(),
       id: external_exports.string().optional(),
       title: external_exports.string().optional(),
-      folder: external_exports.string().optional()
+      folder: external_exports.string().optional(),
+      verified: external_exports.boolean().optional()
     }
   },
-  withErrorHandling(({ id, title, folder, account }) => {
-    if (id) {
-      const note2 = notesManager.getNoteById(id);
-      if (!note2) {
-        return errorResponse(`Note with ID "${id}" not found`);
-      }
-      const success2 = notesManager.moveNoteById(id, folder, account);
-      if (!success2) {
-        return errorResponse(
-          `Failed to move note "${note2.title}" to folder "${folder}". Folder may not exist.`
-        );
-      }
-      return successResponse(`Note moved: "${note2.title}" -> "${folder}"`, {
-        ok: true,
-        id,
-        title: note2.title,
-        folder
-      });
-    }
-    if (!title) {
-      return errorResponse("Either 'id' or 'title' is required");
-    }
-    const note = notesManager.getNoteDetails(title, account);
+  withErrorHandling(({ id, folder, account }) => {
+    const note = notesManager.getNoteById(id);
     if (!note) {
+      return errorResponse(`Note with ID "${id}" not found`);
+    }
+    const success = notesManager.moveNoteById(id, folder, account);
+    if (!success) {
       return errorResponse(
-        `Note "${title}" not found. Use search-notes to find notes, then use the note's ID for reliable operations.`
+        `Failed to move note "${note.title}" to folder "${folder}". Folder may not exist.`
       );
     }
-    const success = notesManager.moveNote(title, folder, account);
-    if (!success) {
+    const readback = notesManager.getNoteById(id);
+    if (!readback || readback.id !== id) {
       return errorResponse(
-        `Failed to move note "${title}" to folder "${folder}". Folder may not exist.`
+        `The move may have succeeded, but exact-ID readback failed. Inspect note ID ${id} before retrying.`
       );
     }
-    return successResponse(`Note moved: "${title}" -> "${folder}"`, {
+    return successResponse(`Note moved and verified: "${readback.title}" -> "${folder}"`, {
       ok: true,
-      title,
-      folder
+      id,
+      title: readback.title,
+      folder,
+      verified: true
     });
   }, "Error moving note")
 );
@@ -43552,9 +43510,14 @@ ${attachmentList}`,
 registerTool(
   "batch-delete-notes",
   {
-    description: "Use when: permanently deleting multiple notes by id in one call.\nReturns: per-id success/failure counts.\nDo not use when: deleting a single note (delete-note).\nSafety: requires explicit user confirmation; this is destructive and not undoable. Prefer search-notes/list-notes first to confirm the exact ids being deleted.",
+    description: "Use when: moving several reviewed notes to Recently Deleted.\nReturns: per-note success or conflict.\nDo not use when: deleting a single note.\nSafety: every entry requires an exact id and the content hash from get-note-content. Any note changed since review is preserved and reported as a conflict.",
     inputSchema: {
-      ids: external_exports.array(external_exports.string().max(MAX.ID)).max(MAX.BATCH_IDS).describe(`Array of note IDs to delete (max ${MAX.BATCH_IDS} per request)`)
+      notes: external_exports.array(
+        external_exports.object({
+          id: noteIdInput,
+          expectedContentHash: expectedContentHashInput
+        })
+      ).max(MAX.BATCH_IDS).describe(`Reviewed note IDs and revision tokens to delete (max ${MAX.BATCH_IDS})`)
     },
     outputSchema: {
       ok: external_exports.boolean().optional(),
@@ -43563,11 +43526,23 @@ registerTool(
       results: external_exports.array(external_exports.object({}).passthrough()).optional()
     }
   },
-  withErrorHandling(({ ids }) => {
-    if (ids.length === 0) {
-      return errorResponse("No note IDs provided");
+  withErrorHandling(({ notes }) => {
+    if (notes.length === 0) {
+      return errorResponse("No reviewed notes provided");
     }
-    const results = notesManager.batchDeleteNotes(ids);
+    const results = notes.map(({ id, expectedContentHash }) => {
+      const snapshot = readExactNoteSnapshot(id);
+      if ("error" in snapshot) return { id, success: false, error: snapshot.error };
+      if (snapshot.contentHash !== expectedContentHash) {
+        return { id, success: false, error: revisionConflictMessage(snapshot.note.title) };
+      }
+      const result = notesManager.deleteNoteByIdIfUnchanged(id, snapshot.body);
+      if (result.status === "deleted") return { id, success: true };
+      if (result.status === "conflict") {
+        return { id, success: false, error: revisionConflictMessage(snapshot.note.title) };
+      }
+      return { id, success: false, error: "Delete result uncertain; inspect this exact ID" };
+    });
     const succeeded = results.filter((r) => r.success).length;
     const failed = results.filter((r) => !r.success).length;
     const lines = [`Batch delete: ${succeeded} succeeded, ${failed} failed`];
@@ -43588,9 +43563,9 @@ registerTool(
 registerTool(
   "batch-move-notes",
   {
-    description: "Use when: moving multiple notes by id into one destination folder.\nReturns: per-id success/failure counts.\nDo not use when: moving a single note (move-note).\nNote: the destination folder must already exist (create-folder).",
+    description: "Use when: moving multiple notes by id into one destination folder.\nReturns: per-id success/failure counts after destination-folder verification.\nDo not use when: moving a single note (move-note).\nSafety: each moved note's actual container ID is compared with the destination folder ID before success is reported. The destination folder must already exist (create-folder).",
     inputSchema: {
-      ids: external_exports.array(external_exports.string().max(MAX.ID)).max(MAX.BATCH_IDS).describe(`Array of note IDs to move (max ${MAX.BATCH_IDS} per request)`),
+      ids: external_exports.array(noteIdInput).max(MAX.BATCH_IDS).describe(`Array of note IDs to move (max ${MAX.BATCH_IDS} per request)`),
       folder: external_exports.string().max(MAX.FOLDER).describe(
         'Destination folder name or nested path (e.g. "Work/Clients"). Must already exist \u2014 create-folder first.'
       ),