@velvetmonkey/flywheel-memory 2.0.64 → 2.0.65

package/dist/index.js

@@ -61,6 +61,7 @@ var init_constants = __esm({
 import fs18 from "fs/promises";
 import path20 from "path";
 import matter5 from "gray-matter";
+import { createHash as createHash2 } from "node:crypto";
 function isSensitivePath(filePath) {
   const normalizedPath = filePath.replace(/\\/g, "/");
   return SENSITIVE_PATH_PATTERNS.some((pattern) => pattern.test(normalizedPath));
@@ -471,6 +472,9 @@ async function validatePathSecure(vaultPath2, notePath) {
   }
   return { valid: true };
 }
+function computeContentHash(rawContent) {
+  return createHash2("sha256").update(rawContent).digest("hex").slice(0, 16);
+}
 async function readVaultFile(vaultPath2, notePath) {
   if (!validatePath(vaultPath2, notePath)) {
     throw new Error("Invalid path: path traversal not allowed");
@@ -480,6 +484,7 @@ async function readVaultFile(vaultPath2, notePath) {
     fs18.readFile(fullPath, "utf-8"),
     fs18.stat(fullPath)
   ]);
+  const contentHash2 = computeContentHash(rawContent);
   const lineEnding = detectLineEnding(rawContent);
   const normalizedContent = normalizeLineEndings(rawContent);
   const parsed = matter5(normalizedContent);
@@ -489,7 +494,8 @@ async function readVaultFile(vaultPath2, notePath) {
     frontmatter,
     rawContent,
     lineEnding,
-    mtimeMs: stat4.mtimeMs
+    mtimeMs: stat4.mtimeMs,
+    contentHash: contentHash2
   };
 }
 function deepCloneFrontmatter(obj) {
@@ -523,12 +529,19 @@ function deepCloneFrontmatter(obj) {
   }
   return cloned;
 }
-async function writeVaultFile(vaultPath2, notePath, content, frontmatter, lineEnding = "LF") {
+async function writeVaultFile(vaultPath2, notePath, content, frontmatter, lineEnding = "LF", expectedHash) {
   const validation = await validatePathSecure(vaultPath2, notePath);
   if (!validation.valid) {
     throw new Error(`Invalid path: ${validation.reason}`);
   }
   const fullPath = path20.join(vaultPath2, notePath);
+  if (expectedHash) {
+    const currentRaw = await fs18.readFile(fullPath, "utf-8");
+    const currentHash = computeContentHash(currentRaw);
+    if (currentHash !== expectedHash) {
+      throw new WriteConflictError(notePath);
+    }
+  }
   let output = matter5.stringify(content, frontmatter);
   output = normalizeTrailingNewline(output);
   output = convertLineEndings(output, lineEnding);
@@ -693,7 +706,7 @@ function injectMutationMetadata(frontmatter, scoping) {
   }
   return frontmatter;
 }
-var SENSITIVE_PATH_PATTERNS, REDOS_PATTERNS, MAX_REGEX_LENGTH, EMPTY_PLACEHOLDER_PATTERNS, DiagnosticError;
+var SENSITIVE_PATH_PATTERNS, REDOS_PATTERNS, MAX_REGEX_LENGTH, EMPTY_PLACEHOLDER_PATTERNS, WriteConflictError, DiagnosticError;
 var init_writer = __esm({
   "src/core/write/writer.ts"() {
     "use strict";
@@ -799,6 +812,13 @@ var init_writer = __esm({
       /^\*\s*$/
       // "* " (asterisk bullet placeholder)
     ];
+    WriteConflictError = class extends Error {
+      constructor(notePath) {
+        super(`Write conflict on ${notePath}: file was modified externally since it was read. Re-read and retry.`);
+        this.notePath = notePath;
+        this.name = "WriteConflictError";
+      }
+    };
     DiagnosticError = class extends Error {
       diagnostic;
       constructor(message, diagnostic) {
@@ -13228,7 +13248,7 @@ async function withVaultFile(options, operation) {
       return formatMcpResult(existsError);
     }
     const runMutation = async () => {
-      const { content, frontmatter: frontmatter2, lineEnding: lineEnding2, mtimeMs } = await readVaultFile(vaultPath2, notePath);
+      const { content, frontmatter: frontmatter2, lineEnding: lineEnding2, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
       const writeStateDb = getWriteStateDb();
       if (writeStateDb) {
         processImplicitFeedback(writeStateDb, notePath, content);
@@ -13250,7 +13270,7 @@ async function withVaultFile(options, operation) {
         notePath
       };
       const opResult2 = await operation(ctx);
-      return { opResult: opResult2, frontmatter: frontmatter2, lineEnding: lineEnding2, mtimeMs };
+      return { opResult: opResult2, frontmatter: frontmatter2, lineEnding: lineEnding2, contentHash: contentHash2 };
     };
     let result = await runMutation();
     if ("error" in result) {
@@ -13267,20 +13287,11 @@ async function withVaultFile(options, operation) {
       });
       return formatMcpResult(dryResult);
     }
-    const fullPath = path21.join(vaultPath2, notePath);
-    const statBefore = await fs19.stat(fullPath);
-    if (statBefore.mtimeMs !== result.mtimeMs) {
-      console.warn(`[withVaultFile] External modification detected on ${notePath}, re-reading and retrying`);
-      result = await runMutation();
-      if ("error" in result) {
-        return formatMcpResult(result.error);
-      }
-    }
     let finalFrontmatter = opResult.updatedFrontmatter ?? frontmatter;
     if (scoping && (scoping.agent_id || scoping.session_id)) {
       finalFrontmatter = injectMutationMetadata(finalFrontmatter, scoping);
     }
-    await writeVaultFile(vaultPath2, notePath, opResult.updatedContent, finalFrontmatter, lineEnding);
+    await writeVaultFile(vaultPath2, notePath, opResult.updatedContent, finalFrontmatter, lineEnding, result.contentHash);
     const gitInfo = await handleGitCommit(vaultPath2, notePath, commit, commitPrefix);
     const successRes = successResult(notePath, opResult.message, gitInfo, {
       preview: opResult.preview,
@@ -13291,6 +13302,13 @@ async function withVaultFile(options, operation) {
     return formatMcpResult(successRes);
   } catch (error) {
     const extras = {};
+    if (error instanceof WriteConflictError) {
+      extras.warnings = [{
+        type: "write_conflict",
+        message: error.message,
+        suggestion: "The file was modified while processing. Re-read and retry."
+      }];
+    }
     if (error instanceof DiagnosticError) {
       extras.diagnostic = error.diagnostic;
     }
@@ -13309,7 +13327,7 @@ async function withVaultFrontmatter(options, operation) {
     if (existsError) {
       return formatMcpResult(existsError);
     }
-    const { content, frontmatter, lineEnding } = await readVaultFile(vaultPath2, notePath);
+    const { content, frontmatter, lineEnding, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
     const ctx = { content, frontmatter, lineEnding, vaultPath: vaultPath2, notePath };
     const opResult = await operation(ctx);
     if (dryRun) {
@@ -13319,16 +13337,25 @@ async function withVaultFrontmatter(options, operation) {
       });
       return formatMcpResult(result2);
     }
-    await writeVaultFile(vaultPath2, notePath, content, opResult.updatedFrontmatter, lineEnding);
+    await writeVaultFile(vaultPath2, notePath, content, opResult.updatedFrontmatter, lineEnding, contentHash2);
     const gitInfo = await handleGitCommit(vaultPath2, notePath, commit, commitPrefix);
     const result = successResult(notePath, opResult.message, gitInfo, {
       preview: opResult.preview
     });
     return formatMcpResult(result);
   } catch (error) {
+    const extras = {};
+    if (error instanceof WriteConflictError) {
+      extras.warnings = [{
+        type: "write_conflict",
+        message: error.message,
+        suggestion: "The file was modified while processing. Re-read and retry."
+      }];
+    }
     const result = errorResult(
       notePath,
-      `Failed to ${actionDescription}: ${error instanceof Error ? error.message : String(error)}`
+      `Failed to ${actionDescription}: ${error instanceof Error ? error.message : String(error)}`,
+      extras
     );
     return formatMcpResult(result);
   }
@@ -13703,7 +13730,7 @@ function registerTaskTools(server2, vaultPath2) {
         if (existsError) {
           return formatMcpResult(existsError);
         }
-        const { content: fileContent, frontmatter } = await readVaultFile(vaultPath2, notePath);
+        const { content: fileContent, frontmatter, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
         let sectionBoundary;
         if (section) {
           const found = findSection(fileContent, section);
@@ -13740,7 +13767,7 @@ function registerTaskTools(server2, vaultPath2) {
         if (agent_id || session_id) {
           finalFrontmatter = injectMutationMetadata(frontmatter, { agent_id, session_id });
         }
-        await writeVaultFile(vaultPath2, notePath, toggleResult.content, finalFrontmatter);
+        await writeVaultFile(vaultPath2, notePath, toggleResult.content, finalFrontmatter, "LF", contentHash2);
         await updateTaskCacheForFile(vaultPath2, notePath).catch(() => {
         });
         const gitInfo = await handleGitCommit(vaultPath2, notePath, commit, "[Flywheel:Task]");
@@ -13750,8 +13777,16 @@ function registerTaskTools(server2, vaultPath2) {
           })
         );
       } catch (error) {
+        const extras = {};
+        if (error instanceof WriteConflictError) {
+          extras.warnings = [{
+            type: "write_conflict",
+            message: error.message,
+            suggestion: "The file was modified while processing. Re-read and retry."
+          }];
+        }
         return formatMcpResult(
-          errorResult(notePath, `Failed to toggle task: ${error instanceof Error ? error.message : String(error)}`)
+          errorResult(notePath, `Failed to toggle task: ${error instanceof Error ? error.message : String(error)}`, extras)
         );
       }
     }
@@ -14177,10 +14212,8 @@ async function findBacklinks(vaultPath2, targetTitle, targetAliases) {
   return results;
 }
 async function updateBacklinksInFile(vaultPath2, filePath, oldTitles, newTitle) {
-  const fullPath = path24.join(vaultPath2, filePath);
-  const raw = await fs22.readFile(fullPath, "utf-8");
-  const parsed = matter6(raw);
-  let content = parsed.content;
+  const { content: fileContent, frontmatter, lineEnding, contentHash: contentHash2 } = await readVaultFile(vaultPath2, filePath);
+  let content = fileContent;
   let totalUpdated = 0;
   for (const oldTitle of oldTitles) {
     const pattern = new RegExp(
@@ -14193,7 +14226,7 @@ async function updateBacklinksInFile(vaultPath2, filePath, oldTitles, newTitle)
     });
   }
   if (totalUpdated > 0) {
-    await writeVaultFile(vaultPath2, filePath, content, parsed.data);
+    await writeVaultFile(vaultPath2, filePath, content, frontmatter, lineEnding, contentHash2);
     return { updated: true, linksUpdated: totalUpdated };
   }
   return { updated: false, linksUpdated: 0 };
@@ -14579,10 +14612,12 @@ function registerMergeTools(server2, vaultPath2) {
         }
         let targetContent;
         let targetFrontmatter;
+        let targetContentHash;
         try {
           const target = await readVaultFile(vaultPath2, target_path);
           targetContent = target.content;
           targetFrontmatter = target.frontmatter;
+          targetContentHash = target.contentHash;
         } catch {
           const result2 = {
             success: false,
@@ -14657,7 +14692,7 @@ ${trimmedSource}`;
           };
           return { content: [{ type: "text", text: JSON.stringify(result2, null, 2) }] };
         }
-        await writeVaultFile(vaultPath2, target_path, targetContent, targetFrontmatter);
+        await writeVaultFile(vaultPath2, target_path, targetContent, targetFrontmatter, "LF", targetContentHash);
         const fullSourcePath = `${vaultPath2}/${source_path}`;
         await fs23.unlink(fullSourcePath);
         initializeEntityIndex(vaultPath2).catch((err) => {
@@ -14675,7 +14710,14 @@ ${trimmedSource}`;
         const result = {
           success: false,
           message: `Failed to merge entities: ${error instanceof Error ? error.message : String(error)}`,
-          path: source_path
+          path: source_path,
+          ...error instanceof WriteConflictError ? {
+            warnings: [{
+              type: "write_conflict",
+              message: error.message,
+              suggestion: "The file was modified while processing. Re-read and retry."
+            }]
+          } : {}
         };
         return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
@@ -14701,10 +14743,12 @@ ${trimmedSource}`;
         }
         let targetContent;
         let targetFrontmatter;
+        let absorbTargetHash;
         try {
           const target = await readVaultFile(vaultPath2, target_path);
           targetContent = target.content;
           targetFrontmatter = target.frontmatter;
+          absorbTargetHash = target.contentHash;
         } catch {
           const result2 = {
             success: false,
@@ -14730,7 +14774,7 @@ ${trimmedSource}`;
             modifiedFiles.push(backlink.path);
           }
         } else {
-          await writeVaultFile(vaultPath2, target_path, targetContent, targetFrontmatter);
+          await writeVaultFile(vaultPath2, target_path, targetContent, targetFrontmatter, "LF", absorbTargetHash);
           for (const backlink of backlinks) {
             if (backlink.path === target_path) continue;
             let fileData;
@@ -14756,7 +14800,7 @@ ${trimmedSource}`;
               return `[[${targetTitle}|${source_name}]]`;
             });
             if (linksUpdated > 0) {
-              await writeVaultFile(vaultPath2, backlink.path, content, fileData.frontmatter);
+              await writeVaultFile(vaultPath2, backlink.path, content, fileData.frontmatter, fileData.lineEnding, fileData.contentHash);
               totalBacklinksUpdated += linksUpdated;
               modifiedFiles.push(backlink.path);
             }
@@ -14787,7 +14831,14 @@ ${trimmedSource}`;
         const result = {
           success: false,
           message: `Failed to absorb as alias: ${error instanceof Error ? error.message : String(error)}`,
-          path: target_path
+          path: target_path,
+          ...error instanceof WriteConflictError ? {
+            warnings: [{
+              type: "write_conflict",
+              message: error.message,
+              suggestion: "The file was modified while processing. Re-read and retry."
+            }]
+          } : {}
         };
         return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
@@ -15189,7 +15240,7 @@ async function executeAddToSection(params, vaultPath2, context) {
   } catch {
     return { success: false, message: `File not found: ${notePath}`, path: notePath };
   }
-  const { content: fileContent, frontmatter, lineEnding } = await readVaultFile(vaultPath2, notePath);
+  const { content: fileContent, frontmatter, lineEnding, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
   const sectionBoundary = findSection(fileContent, section);
   if (!sectionBoundary) {
     return { success: false, message: `Section '${section}' not found`, path: notePath };
@@ -15209,7 +15260,7 @@ async function executeAddToSection(params, vaultPath2, context) {
     position,
     { preserveListNesting }
   );
-  await writeVaultFile(vaultPath2, notePath, updatedContent, frontmatter, lineEnding);
+  await writeVaultFile(vaultPath2, notePath, updatedContent, frontmatter, lineEnding, contentHash2);
   return {
     success: true,
     message: `Added content to section "${sectionBoundary.name}" in ${notePath}`,
@@ -15229,7 +15280,7 @@ async function executeRemoveFromSection(params, vaultPath2) {
   } catch {
     return { success: false, message: `File not found: ${notePath}`, path: notePath };
   }
-  const { content: fileContent, frontmatter, lineEnding } = await readVaultFile(vaultPath2, notePath);
+  const { content: fileContent, frontmatter, lineEnding, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
   const sectionBoundary = findSection(fileContent, section);
   if (!sectionBoundary) {
     return { success: false, message: `Section '${section}' not found`, path: notePath };
@@ -15238,7 +15289,7 @@ async function executeRemoveFromSection(params, vaultPath2) {
   if (removeResult.removedCount === 0) {
     return { success: false, message: `No content matching "${pattern}" found`, path: notePath };
   }
-  await writeVaultFile(vaultPath2, notePath, removeResult.content, frontmatter, lineEnding);
+  await writeVaultFile(vaultPath2, notePath, removeResult.content, frontmatter, lineEnding, contentHash2);
   return {
     success: true,
     message: `Removed ${removeResult.removedCount} line(s) from section "${sectionBoundary.name}"`,
@@ -15260,7 +15311,7 @@ async function executeReplaceInSection(params, vaultPath2, context) {
   } catch {
     return { success: false, message: `File not found: ${notePath}`, path: notePath };
   }
-  const { content: fileContent, frontmatter, lineEnding } = await readVaultFile(vaultPath2, notePath);
+  const { content: fileContent, frontmatter, lineEnding, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
   const sectionBoundary = findSection(fileContent, section);
   if (!sectionBoundary) {
     return { success: false, message: `Section '${section}' not found`, path: notePath };
@@ -15277,7 +15328,7 @@ async function executeReplaceInSection(params, vaultPath2, context) {
   if (replaceResult.replacedCount === 0) {
     return { success: false, message: `No content matching "${search}" found`, path: notePath };
   }
-  await writeVaultFile(vaultPath2, notePath, replaceResult.content, frontmatter, lineEnding);
+  await writeVaultFile(vaultPath2, notePath, replaceResult.content, frontmatter, lineEnding, contentHash2);
   return {
     success: true,
     message: `Replaced ${replaceResult.replacedCount} occurrence(s) in section "${sectionBoundary.name}"`,
@@ -15348,7 +15399,7 @@ async function executeToggleTask(params, vaultPath2) {
   } catch {
     return { success: false, message: `File not found: ${notePath}`, path: notePath };
   }
-  const { content: fileContent, frontmatter } = await readVaultFile(vaultPath2, notePath);
+  const { content: fileContent, frontmatter, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
   let sectionBoundary;
   if (section) {
     sectionBoundary = findSection(fileContent, section);
@@ -15367,7 +15418,7 @@ async function executeToggleTask(params, vaultPath2) {
   if (!toggleResult) {
     return { success: false, message: "Failed to toggle task", path: notePath };
   }
-  await writeVaultFile(vaultPath2, notePath, toggleResult.content, frontmatter);
+  await writeVaultFile(vaultPath2, notePath, toggleResult.content, frontmatter, "LF", contentHash2);
   const newStatus = toggleResult.newState ? "completed" : "incomplete";
   const checkbox = toggleResult.newState ? "[x]" : "[ ]";
   return {
@@ -15391,7 +15442,7 @@ async function executeAddTask(params, vaultPath2, context) {
   } catch {
     return { success: false, message: `File not found: ${notePath}`, path: notePath };
   }
-  const { content: fileContent, frontmatter } = await readVaultFile(vaultPath2, notePath);
+  const { content: fileContent, frontmatter, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
   const sectionBoundary = findSection(fileContent, section);
   if (!sectionBoundary) {
     return { success: false, message: `Section not found: ${section}`, path: notePath };
@@ -15411,7 +15462,7 @@ async function executeAddTask(params, vaultPath2, context) {
     position,
     { preserveListNesting }
   );
-  await writeVaultFile(vaultPath2, notePath, updatedContent, frontmatter);
+  await writeVaultFile(vaultPath2, notePath, updatedContent, frontmatter, "LF", contentHash2);
   return {
     success: true,
     message: `Added task to section "${sectionBoundary.name}"`,
@@ -15428,9 +15479,9 @@ async function executeUpdateFrontmatter(params, vaultPath2) {
   } catch {
     return { success: false, message: `File not found: ${notePath}`, path: notePath };
   }
-  const { content, frontmatter } = await readVaultFile(vaultPath2, notePath);
+  const { content, frontmatter, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
   const updatedFrontmatter = { ...frontmatter, ...updates };
-  await writeVaultFile(vaultPath2, notePath, content, updatedFrontmatter);
+  await writeVaultFile(vaultPath2, notePath, content, updatedFrontmatter, "LF", contentHash2);
   const updatedKeys = Object.keys(updates);
   const preview = updatedKeys.map((k) => `${k}: ${JSON.stringify(updates[k])}`).join("\n");
   return {
@@ -15450,12 +15501,12 @@ async function executeAddFrontmatterField(params, vaultPath2) {
   } catch {
     return { success: false, message: `File not found: ${notePath}`, path: notePath };
   }
-  const { content, frontmatter } = await readVaultFile(vaultPath2, notePath);
+  const { content, frontmatter, contentHash: contentHash2 } = await readVaultFile(vaultPath2, notePath);
   if (key in frontmatter) {
     return { success: false, message: `Field "${key}" already exists`, path: notePath };
   }
   const updatedFrontmatter = { ...frontmatter, [key]: value };
-  await writeVaultFile(vaultPath2, notePath, content, updatedFrontmatter);
+  await writeVaultFile(vaultPath2, notePath, content, updatedFrontmatter, "LF", contentHash2);
   return {
     success: true,
     message: `Added frontmatter field "${key}"`,
@@ -18922,7 +18973,7 @@ function registerMergeTools2(server2, getStateDb) {
 
 // src/index.ts
 import * as fs31 from "node:fs/promises";
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 
 // src/resources/vault.ts
 function registerVaultResources(server2, getIndex) {
@@ -19698,7 +19749,7 @@ async function runPostIndexWork(index) {
         }
         try {
           const content = await fs31.readFile(path32.join(vaultPath, event.path), "utf-8");
-          const hash = createHash2("sha256").update(content).digest("hex").slice(0, 16);
+          const hash = createHash3("sha256").update(content).digest("hex").slice(0, 16);
           if (lastContentHashes.get(event.path) === hash) {
             serverLog("watcher", `Hash unchanged, skipping: ${event.path}`);
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velvetmonkey/flywheel-memory",
-  "version": "2.0.64",
+  "version": "2.0.65",
   "description": "MCP server that gives Claude full read/write access to your Obsidian vault. Select from 42 tools for search, backlinks, graph queries, mutations, and hybrid semantic search.",
   "type": "module",
   "main": "dist/index.js",
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.25.1",
-    "@velvetmonkey/vault-core": "2.0.64",
+    "@velvetmonkey/vault-core": "2.0.65",
     "better-sqlite3": "^11.0.0",
     "chokidar": "^4.0.0",
     "gray-matter": "^4.0.3",