@bitbonsai/mcpvault 0.12.0 → 0.12.2

package/dist/src/filesystem.d.ts

@@ -16,6 +16,12 @@ export declare class FileSystemService {
     private frontmatterHandler;
     private pathFilter;
     constructor(vaultPath: string, pathFilter?: PathFilter, frontmatterHandler?: FrontmatterHandler);
+    /**
+     * Normalize an incoming path to be vault-relative. Strips leading slashes
+     * and the vault path prefix when a caller accidentally passes an absolute path
+     * (e.g. "/Users/me/vault/wiki/note.md" instead of "wiki/note.md").
+     */
+    private normalizePath;
     private resolvePath;
     readNote(path: string): Promise<ParsedNote>;
     writeNote(params: NoteWriteParams): Promise<void>;

package/dist/src/filesystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../src/filesystem.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,uBAAuB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzT;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAiBtE;AAED,qBAAa,iBAAiB;IAK1B,OAAO,CAAC,SAAS;IAJnB,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,UAAU,CAAa;gBAGrB,SAAS,EAAE,MAAM,EACzB,UAAU,CAAC,EAAE,UAAU,EACvB,kBAAkB,CAAC,EAAE,kBAAkB;IAazC,OAAO,CAAC,WAAW;IA6Db,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAgC3C,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA2EjD,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IA2F5D,aAAa,CAAC,IAAI,GAAE,MAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8D3D,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAetC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAe3C,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;IAyG3D,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;IAoFrD,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;IA6HrD,iBAAiB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAgDpE,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCjE,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IA2ClD,UAAU,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAsG3E,YAAY,IAAI,MAAM;IAIhB,aAAa,CAAC,WAAW,GAAE,MAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAyD3D,WAAW,IAAI,OAAO,CAAC,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAkDpE"}
+{"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../src/filesystem.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,uBAAuB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzT;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAiBtE;AAED,qBAAa,iBAAiB;IAK1B,OAAO,CAAC,SAAS;IAJnB,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,UAAU,CAAa;gBAGrB,SAAS,EAAE,MAAM,EACzB,UAAU,CAAC,EAAE,UAAU,EACvB,kBAAkB,CAAC,EAAE,kBAAkB;IAazC;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAsBrB,OAAO,CAAC,WAAW;IAkDb,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAiC3C,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA4EjD,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IA8F5D,aAAa,CAAC,IAAI,GAAE,MAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8D3D,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBtC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB3C,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;IA2G3D,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;IAsFrD,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;IAiIrD,iBAAiB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAiDpE,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCjE,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IA4ClD,UAAU,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAuG3E,YAAY,IAAI,MAAM;IAIhB,aAAa,CAAC,WAAW,GAAE,MAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAyD3D,WAAW,IAAI,OAAO,CAAC,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAkDpE"}

package/dist/src/filesystem.js

@@ -1,4 +1,5 @@
 import { join, resolve, relative, dirname } from 'path';
+import { homedir } from 'os';
 import { readdir, stat, readFile, writeFile, unlink, mkdir, access, rename, copyFile } from 'node:fs/promises';
 import { constants, realpathSync } from 'node:fs';
 import trash from 'trash';
@@ -49,17 +50,37 @@ export class FileSystemService {
         this.pathFilter = pathFilter || new PathFilter();
         this.frontmatterHandler = frontmatterHandler || new FrontmatterHandler();
     }
+    /**
+     * Normalize an incoming path to be vault-relative. Strips leading slashes
+     * and the vault path prefix when a caller accidentally passes an absolute path
+     * (e.g. "/Users/me/vault/wiki/note.md" instead of "wiki/note.md").
+     */
+    normalizePath(inputPath) {
+        if (!inputPath)
+            return '';
+        let p = inputPath.trim();
+        // Expand ~ to home directory so "~/vault/note.md" can be matched
+        if (p.startsWith('~/') || p === '~') {
+            p = p.replace('~', homedir());
+        }
+        // Normalize path separators for cross-platform comparison (Windows backslashes)
+        const normalized = p.replace(/\\/g, '/');
+        const vaultPrefix = this.vaultPath.replace(/\\/g, '/');
+        // Strip vault path prefix before stripping leading slash, so absolute paths
+        // like "/Users/me/vault/wiki/note.md" are handled correctly.
+        if (normalized.startsWith(vaultPrefix + '/')) {
+            p = normalized.slice(vaultPrefix.length + 1);
+        }
+        else if (normalized === vaultPrefix) {
+            p = '';
+        }
+        else if (p.startsWith('/')) {
+            p = p.slice(1);
+        }
+        return p;
+    }
     resolvePath(relativePath) {
-        // Handle undefined or null path
-        if (!relativePath) {
-            relativePath = '';
-        }
-        // Trim whitespace from path
-        relativePath = relativePath.trim();
-        // Normalize and resolve the path within the vault
-        const normalizedPath = relativePath.startsWith('/')
-            ? relativePath.slice(1)
-            : relativePath;
+        const normalizedPath = this.normalizePath(relativePath);
         const fullPath = resolve(join(this.vaultPath, normalizedPath));
         // Security check: ensure path is within vault (lexical)
         const relativeToVault = relative(this.vaultPath, fullPath);
@@ -110,6 +131,7 @@ export class FileSystemService {
         return fullPath;
     }
     async readNote(path) {
+        path = this.normalizePath(path);
         const fullPath = this.resolvePath(path);
         if (!this.pathFilter.isAllowed(path)) {
             throw new Error(`Access denied: ${path}. This path is restricted (system files like .obsidian, .git, and dotfiles are not accessible).`);
@@ -139,7 +161,8 @@ export class FileSystemService {
         }
     }
     async writeNote(params) {
-        const { path, content, frontmatter, mode = 'overwrite' } = params;
+        const { content, frontmatter, mode = 'overwrite' } = params;
+        const path = this.normalizePath(params.path);
         const fullPath = this.resolvePath(path);
         if (!this.pathFilter.isAllowed(path)) {
             throw new Error(`Access denied: ${path}. This path is restricted (system files like .obsidian, .git, and dotfiles are not accessible).`);
@@ -201,7 +224,8 @@ export class FileSystemService {
         }
     }
     async patchNote(params) {
-        const { path, oldString, newString, replaceAll = false } = params;
+        const { oldString, newString, replaceAll = false } = params;
+        const path = this.normalizePath(params.path);
         if (!this.pathFilter.isAllowed(path)) {
             return {
                 success: false,
@@ -257,9 +281,11 @@ export class FileSystemService {
                 };
             }
             // Perform the replacement
+            // Use a replacer function so newString is inserted literally,
+            // without $ replacement pattern expansion ($$, $&, $`, $')
             const updatedContent = replaceAll
                 ? fullContent.split(oldString).join(newString)
-                : fullContent.replace(oldString, newString);
+                : fullContent.replace(oldString, () => newString);
             // Write the updated content
             const fullPath = this.resolvePath(path);
             await writeFile(fullPath, updatedContent, 'utf-8');
@@ -279,8 +305,8 @@ export class FileSystemService {
         }
     }
     async listDirectory(path = '') {
-        // Normalize path: treat '.' as root directory
-        const normalizedPath = path === '.' ? '' : path;
+        // Normalize path: treat '.' as root directory, strip vault prefix
+        const normalizedPath = path === '.' ? '' : this.normalizePath(path);
         const fullPath = this.resolvePath(normalizedPath);
         try {
             const entries = await readdir(fullPath, { withFileTypes: true });
@@ -340,6 +366,7 @@ export class FileSystemService {
         }
     }
     async exists(path) {
+        path = this.normalizePath(path);
         const fullPath = this.resolvePath(path);
         if (!this.pathFilter.isAllowed(path)) {
             return false;
@@ -353,6 +380,7 @@ export class FileSystemService {
         }
     }
     async isDirectory(path) {
+        path = this.normalizePath(path);
         const fullPath = this.resolvePath(path);
         if (!this.pathFilter.isAllowed(path)) {
             return false;
@@ -366,7 +394,9 @@ export class FileSystemService {
         }
     }
     async deleteNote(params) {
-        const { path, confirmPath, trashMode = 'none' } = params;
+        const { trashMode = 'none' } = params;
+        const path = this.normalizePath(params.path);
+        const confirmPath = this.normalizePath(params.confirmPath);
         // Confirmation check - paths must match exactly
         if (path !== confirmPath) {
             return {
@@ -459,7 +489,9 @@ export class FileSystemService {
         }
     }
     async moveNote(params) {
-        const { oldPath, newPath, overwrite = false } = params;
+        const { overwrite = false } = params;
+        const oldPath = this.normalizePath(params.oldPath);
+        const newPath = this.normalizePath(params.newPath);
         if (!this.pathFilter.isAllowed(oldPath)) {
             return {
                 success: false,
@@ -537,7 +569,11 @@ export class FileSystemService {
         }
     }
     async moveFile(params) {
-        const { oldPath, newPath, confirmOldPath, confirmNewPath, overwrite = false } = params;
+        const { overwrite = false } = params;
+        const oldPath = this.normalizePath(params.oldPath);
+        const newPath = this.normalizePath(params.newPath);
+        const confirmOldPath = this.normalizePath(params.confirmOldPath);
+        const confirmNewPath = this.normalizePath(params.confirmNewPath);
         if (oldPath !== confirmOldPath || newPath !== confirmNewPath) {
             return {
                 success: false,
@@ -661,7 +697,8 @@ export class FileSystemService {
         if (paths.length > 10) {
             throw new Error('Maximum 10 files per batch read request');
         }
-        const results = await Promise.allSettled(paths.map(async (path) => {
+        const results = await Promise.allSettled(paths.map(async (rawPath) => {
+            const path = this.normalizePath(rawPath);
             if (!this.pathFilter.isAllowed(path)) {
                 throw new Error(`Access denied: ${path}. This path is restricted (system files like .obsidian, .git, and dotfiles are not accessible).`);
             }
@@ -694,7 +731,8 @@ export class FileSystemService {
         return { successful, failed };
     }
     async updateFrontmatter(params) {
-        const { path, frontmatter, merge = true } = params;
+        const { frontmatter, merge = true } = params;
+        const path = this.normalizePath(params.path);
         if (!this.pathFilter.isAllowed(path)) {
             throw new Error(`Access denied: ${path}. This path is restricted (system files like .obsidian, .git, and dotfiles are not accessible).`);
         }
@@ -725,7 +763,8 @@ export class FileSystemService {
         }
     }
     async getNotesInfo(paths) {
-        const results = await Promise.allSettled(paths.map(async (path) => {
+        const results = await Promise.allSettled(paths.map(async (rawPath) => {
+            const path = this.normalizePath(rawPath);
             if (!this.pathFilter.isAllowed(path)) {
                 throw new Error(`Access denied: ${path}. This path is restricted (system files like .obsidian, .git, and dotfiles are not accessible).`);
             }
@@ -760,7 +799,8 @@ export class FileSystemService {
             .map(result => result.value);
     }
     async manageTags(params) {
-        const { path, operation, tags = [] } = params;
+        const { operation, tags = [] } = params;
+        const path = this.normalizePath(params.path);
         if (!this.pathFilter.isAllowed(path)) {
             return {
                 path,

package/dist/src/frontmatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frontmatter.d.ts","sourceRoot":"","sources":["../../src/frontmatter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAE1E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAmB5E;AAED,qBAAa,kBAAkB;IAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;IAoBlC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAaxE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,2BAA2B;IAqB3E,OAAO,CAAC,yBAAyB;IAmDjC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAyB3F,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAKxD,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;CAWzE"}
+{"version":3,"file":"frontmatter.d.ts","sourceRoot":"","sources":["../../src/frontmatter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAkB1E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAmB5E;AAED,qBAAa,kBAAkB;IAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;IAoBlC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAaxE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,2BAA2B;IAqB3E,OAAO,CAAC,yBAAyB;IAmDjC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAyB3F,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAKxD,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;CAWzE"}

package/dist/src/frontmatter.js

@@ -1,5 +1,19 @@
 import matter from 'gray-matter';
-import { parseDocument } from 'yaml';
+import { parse, stringify, parseDocument } from 'yaml';
+// Use the 'yaml' package as gray-matter's engine instead of js-yaml.
+// js-yaml@3.x (pinned by gray-matter@4) has known quadratic-DoS via
+// crafted YAML merge-key aliases (CVE-2023-44270). The 'yaml' package
+// is already a dependency (used in preserveStringify) and is not affected.
+const yamlEngine = {
+    // YAML 1.2 schema (default). Dates stay as strings, but this avoids the
+    // yaml-1.1 bug where single-letter keys like 'y'/'n' become booleans.
+    // Merge keys (<<) are not resolved, which is fine for Obsidian frontmatter.
+    parse: (str) => parse(str),
+    stringify: (data) => stringify(data),
+};
+function withYamlEngine(options = {}) {
+    return { ...options, engines: { yaml: yamlEngine } };
+}
 /**
  * Parse a frontmatter value that may be a JSON string (LLM clients sometimes
  * pass frontmatter as a serialized JSON string instead of an object).
@@ -29,7 +43,7 @@ export function parseFrontmatter(value) {
 export class FrontmatterHandler {
     parse(content) {
         try {
-            const parsed = matter(content);
+            const parsed = matter(content, withYamlEngine());
             return {
                 frontmatter: parsed.data,
                 content: parsed.content,
@@ -53,7 +67,7 @@ export class FrontmatterHandler {
             if (!frontmatterData || Object.keys(frontmatterData).length === 0) {
                 return content;
             }
-            return matter.stringify(content, frontmatterData);
+            return matter.stringify(content, frontmatterData, withYamlEngine());
         }
         catch (error) {
             throw new Error(`Failed to stringify frontmatter: ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -67,7 +81,7 @@ export class FrontmatterHandler {
         };
         try {
             // Test if the frontmatter can be serialized to valid YAML using gray-matter
-            matter.stringify('', frontmatterData);
+            matter.stringify('', frontmatterData, withYamlEngine());
         }
         catch (error) {
             result.isValid = false;
@@ -123,7 +137,7 @@ export class FrontmatterHandler {
                 if (!updates || Object.keys(updates).length === 0) {
                     return content;
                 }
-                return matter.stringify(content, updates);
+                return matter.stringify(content, updates, withYamlEngine());
             }
             const doc = parseDocument(rawMatter.trimStart());
             for (const [key, value] of Object.entries(updates)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitbonsai/mcpvault",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Universal AI bridge for Obsidian vaults - connect any MCP-compatible assistant",
   "homepage": "https://mcpvault.org",
   "author": "bitbonsai",
@@ -42,7 +42,7 @@
     "yaml": "^2.8.3"
   },
   "devDependencies": {
-    "@types/node": "^25.3.3",
+    "@types/node": "^26.0.0",
     "tsx": "^4.20.6",
     "typescript": "^6.0.2",
     "vitest": "^4.0.15"