@velvetmonkey/flywheel-memory 2.0.28 → 2.0.29

package/dist/index.js

@@ -476,7 +476,10 @@ async function readVaultFile(vaultPath2, notePath) {
     throw new Error("Invalid path: path traversal not allowed");
   }
   const fullPath = path18.join(vaultPath2, notePath);
-  const rawContent = await fs18.readFile(fullPath, "utf-8");
+  const [rawContent, stat3] = await Promise.all([
+    fs18.readFile(fullPath, "utf-8"),
+    fs18.stat(fullPath)
+  ]);
   const lineEnding = detectLineEnding(rawContent);
   const normalizedContent = normalizeLineEndings(rawContent);
   const parsed = matter5(normalizedContent);
@@ -485,7 +488,8 @@ async function readVaultFile(vaultPath2, notePath) {
     content: parsed.content,
     frontmatter,
     rawContent,
-    lineEnding
+    lineEnding,
+    mtimeMs: stat3.mtimeMs
   };
 }
 function deepCloneFrontmatter(obj) {
@@ -7402,6 +7406,7 @@ function registerHealthTools(server2, getIndex, getVaultPath, getConfig = () =>
     note_count: z3.coerce.number().describe("Number of notes in the index"),
     entity_count: z3.coerce.number().describe("Number of linkable entities (titles + aliases)"),
     tag_count: z3.coerce.number().describe("Number of unique tags"),
+    link_count: z3.coerce.number().describe("Total number of outgoing wikilinks"),
     periodic_notes: z3.array(PeriodicNoteInfoSchema).optional().describe("Detected periodic note conventions"),
     config: z3.record(z3.unknown()).optional().describe("Current flywheel config (paths, templates, etc.)"),
     last_rebuild: z3.object({
@@ -7455,6 +7460,10 @@ function registerHealthTools(server2, getIndex, getVaultPath, getConfig = () =>
       const noteCount = indexBuilt ? index.notes.size : 0;
       const entityCount = indexBuilt ? index.entities.size : 0;
       const tagCount = indexBuilt ? index.tags.size : 0;
+      let linkCount = 0;
+      if (indexBuilt) {
+        for (const note of index.notes.values()) linkCount += note.outlinks.length;
+      }
       if (indexBuilt && noteCount === 0 && vaultAccessible) {
         recommendations.push("No notes found in vault. Is PROJECT_PATH pointing to a markdown vault?");
       }
@@ -7515,6 +7524,7 @@ function registerHealthTools(server2, getIndex, getVaultPath, getConfig = () =>
         note_count: noteCount,
         entity_count: entityCount,
         tag_count: tagCount,
+        link_count: linkCount,
         periodic_notes: periodicNotes && periodicNotes.length > 0 ? periodicNotes : void 0,
         config: configInfo,
         last_rebuild: lastRebuild,
@@ -7999,6 +8009,64 @@ import * as fs11 from "fs";
 import * as path12 from "path";
 import { z as z5 } from "zod";
 import { scanVaultEntities as scanVaultEntities2, getEntityIndexFromDb as getEntityIndexFromDb2 } from "@velvetmonkey/vault-core";
+
+// src/core/read/aliasSuggestions.ts
+function generateAliasCandidates(entityName, existingAliases) {
+  const existing = new Set(existingAliases.map((a) => a.toLowerCase()));
+  const candidates = [];
+  const words = entityName.split(/[\s-]+/).filter((w) => w.length > 0);
+  if (words.length >= 2) {
+    const acronym = words.map((w) => w[0]).join("").toUpperCase();
+    if (acronym.length >= 2 && acronym.length <= 6 && !existing.has(acronym.toLowerCase())) {
+      candidates.push({ candidate: acronym, type: "acronym" });
+    }
+    if (words.length >= 3) {
+      const short = words[0];
+      if (short.length >= 3 && !existing.has(short.toLowerCase())) {
+        candidates.push({ candidate: short, type: "short_form" });
+      }
+    }
+  }
+  return candidates;
+}
+function suggestEntityAliases(stateDb2, folder) {
+  const db4 = stateDb2.db;
+  const entities = folder ? db4.prepare(
+    "SELECT name, path, aliases_json FROM entities WHERE path LIKE ? || '/%'"
+  ).all(folder) : db4.prepare("SELECT name, path, aliases_json FROM entities").all();
+  const allEntityNames = new Set(
+    db4.prepare("SELECT name_lower FROM entities").all().map((r) => r.name_lower)
+  );
+  const suggestions = [];
+  const countStmt = db4.prepare(
+    "SELECT COUNT(*) as cnt FROM notes_fts WHERE content MATCH ?"
+  );
+  for (const row of entities) {
+    const aliases = row.aliases_json ? JSON.parse(row.aliases_json) : [];
+    const candidates = generateAliasCandidates(row.name, aliases);
+    for (const { candidate, type } of candidates) {
+      if (allEntityNames.has(candidate.toLowerCase())) continue;
+      let mentions = 0;
+      try {
+        const result = countStmt.get(`"${candidate}"`);
+        mentions = result?.cnt ?? 0;
+      } catch {
+      }
+      suggestions.push({
+        entity: row.name,
+        entity_path: row.path,
+        current_aliases: aliases,
+        candidate,
+        type,
+        mentions
+      });
+    }
+  }
+  suggestions.sort((a, b) => b.mentions - a.mentions || a.entity.localeCompare(b.entity));
+  return suggestions;
+}
+
+// src/tools/read/system.ts
 function registerSystemTools(server2, getIndex, setIndex, getVaultPath, setConfig, getStateDb) {
   const RefreshIndexOutputSchema = {
     success: z5.boolean().describe("Whether the refresh succeeded"),
@@ -8485,6 +8553,35 @@ function registerSystemTools(server2, getIndex, setIndex, getVaultPath, setConfi
       };
     }
   );
+  server2.registerTool(
+    "suggest_entity_aliases",
+    {
+      title: "Suggest Entity Aliases",
+      description: "Generate alias suggestions for entities in a folder based on acronyms and short forms, validated against vault content.",
+      inputSchema: {
+        folder: z5.string().optional().describe("Folder path to scope suggestions to"),
+        limit: z5.number().default(20).describe("Max suggestions to return")
+      }
+    },
+    async ({
+      folder,
+      limit: requestedLimit
+    }) => {
+      const stateDb2 = getStateDb?.();
+      if (!stateDb2) {
+        return {
+          content: [{ type: "text", text: JSON.stringify({ error: "StateDb not available" }) }]
+        };
+      }
+      const suggestions = suggestEntityAliases(stateDb2, folder || void 0);
+      const limit = Math.min(requestedLimit ?? 20, 50);
+      const limited = suggestions.slice(0, limit);
+      const output = { suggestion_count: limited.length, suggestions: limited };
+      return {
+        content: [{ type: "text", text: JSON.stringify(output, null, 2) }]
+      };
+    }
+  );
 }
 
 // src/tools/read/primitives.ts
@@ -8799,6 +8896,8 @@ function registerPrimitiveTools(server2, getIndex, getVaultPath, getConfig = ()
           content: [{ type: "text", text: JSON.stringify({
             total_count: result2.total,
             open_count: result2.open_count,
+            completed_count: result2.completed_count,
+            cancelled_count: result2.cancelled_count,
             returned_count: result2.tasks.length,
             tasks: result2.tasks
           }, null, 2) }]
@@ -8831,6 +8930,8 @@ function registerPrimitiveTools(server2, getIndex, getVaultPath, getConfig = ()
         content: [{ type: "text", text: JSON.stringify({
           total_count: result.total,
           open_count: result.open_count,
+          completed_count: result.completed_count,
+          cancelled_count: result.cancelled_count,
           returned_count: paged.length,
           tasks: paged
         }, null, 2) }]
@@ -11141,41 +11242,58 @@ async function withVaultFile(options, operation) {
     if (existsError) {
       return formatMcpResult(existsError);
     }
-    const { content, frontmatter, lineEnding } = await readVaultFile(vaultPath2, notePath);
-    const writeStateDb = getWriteStateDb();
-    if (writeStateDb) {
-      processImplicitFeedback(writeStateDb, notePath, content);
+    const runMutation = async () => {
+      const { content, frontmatter: frontmatter2, lineEnding: lineEnding2, mtimeMs } = await readVaultFile(vaultPath2, notePath);
+      const writeStateDb = getWriteStateDb();
+      if (writeStateDb) {
+        processImplicitFeedback(writeStateDb, notePath, content);
+      }
+      let sectionBoundary;
+      if (section) {
+        const sectionResult = ensureSectionExists(content, section, notePath);
+        if ("error" in sectionResult) {
+          return { error: sectionResult.error };
+        }
+        sectionBoundary = sectionResult.boundary;
+      }
+      const ctx = {
+        content,
+        frontmatter: frontmatter2,
+        lineEnding: lineEnding2,
+        sectionBoundary,
+        vaultPath: vaultPath2,
+        notePath
+      };
+      const opResult2 = await operation(ctx);
+      return { opResult: opResult2, frontmatter: frontmatter2, lineEnding: lineEnding2, mtimeMs };
+    };
+    let result = await runMutation();
+    if ("error" in result) {
+      return formatMcpResult(result.error);
     }
-    let sectionBoundary;
-    if (section) {
-      const sectionResult = ensureSectionExists(content, section, notePath);
-      if ("error" in sectionResult) {
-        return formatMcpResult(sectionResult.error);
+    const fullPath = path19.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);
       }
-      sectionBoundary = sectionResult.boundary;
     }
-    const ctx = {
-      content,
-      frontmatter,
-      lineEnding,
-      sectionBoundary,
-      vaultPath: vaultPath2,
-      notePath
-    };
-    const opResult = await operation(ctx);
+    const { opResult, frontmatter, lineEnding } = result;
     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);
     const gitInfo = await handleGitCommit(vaultPath2, notePath, commit, commitPrefix);
-    const result = successResult(notePath, opResult.message, gitInfo, {
+    const successRes = successResult(notePath, opResult.message, gitInfo, {
       preview: opResult.preview,
       warnings: opResult.warnings,
       outputIssues: opResult.outputIssues,
       normalizationChanges: opResult.normalizationChanges
     });
-    return formatMcpResult(result);
+    return formatMcpResult(successRes);
   } catch (error) {
     const extras = {};
     if (error instanceof DiagnosticError) {

package/package.json

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