obsidian-mcp-pro 1.5.3 → 1.7.0

package/README.md

@@ -462,3 +462,11 @@ MIT
 Contributions welcome! Please open an issue first to discuss what you'd like to change. Pull requests without a corresponding issue may be closed.
 
 If you're adding or editing a tool, read [docs/TOOL_AUTHORING.md](./docs/TOOL_AUTHORING.md) first — it documents the description, schema, and annotation conventions that keep every tool at A-grade quality.
+
+---
+
+## Acknowledgments
+
+- Vault-wide link rewriting on `move_note` ([#3](https://github.com/rps321321/obsidian-mcp-pro/issues/3), [#4](https://github.com/rps321321/obsidian-mcp-pro/pull/4)) and the `sanitizeError` defense-in-depth hardening contributed by [@brentkearney](https://github.com/brentkearney).
+
+For the full list of everyone who's contributed, see the [contributors page](https://github.com/rps321321/obsidian-mcp-pro/graphs/contributors).

package/build/lib/errors.d.ts

@@ -1,8 +1,28 @@
 /**
  * Convert an unknown thrown value into a message safe to return to an MCP
- * client. Strips absolute paths, stack traces, and collapses known errno
- * codes to generic human-readable text.
+ * client. Strips absolute paths, stack traces, collapses known errno
+ * codes to generic human-readable text, and escapes control characters so
+ * an attacker-controlled value (e.g. a filename with `\n` in it embedded
+ * in an error message) can't break out of its line and inject text into
+ * the LLM context.
  */
 export declare function sanitizeError(err: unknown): string;
+/**
+ * Escape ASCII control characters (newlines, carriage returns, tabs, NULs,
+ * etc.) so an attacker-controlled string interpolated into a multi-line tool
+ * response can't break out of its line. `\n` becomes the two literal
+ * characters `\` and `n`; other control bytes use `\xHH`. Printable input
+ * passes through unchanged.
+ *
+ * Exists as a separate export from `sanitizeError` because that function's
+ * path-stripping step would rewrite a path-shaped value to literal `<path>`
+ * — fine inside an error message that mentions a host path, but it would
+ * erase the value when the value itself is the path you want to display
+ * (e.g. `f.path` from `failedReferrers`). Both functions apply the same
+ * control-char escape, so passing `f.path` here and `f.error` to
+ * `sanitizeError` gives equivalent injection protection through different
+ * doors.
+ */
+export declare function escapeControlChars(s: string): string;
 export declare function stripPaths(s: string): string;
 //# sourceMappingURL=errors.d.ts.map

package/build/lib/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AA0BA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAUlD;AAUD,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK5C"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AA0BA;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAUlD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAOpD;AAUD,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK5C"}

package/build/lib/errors.js

@@ -19,12 +19,15 @@ const FS_ERROR_MESSAGES = {
 };
 /**
  * Convert an unknown thrown value into a message safe to return to an MCP
- * client. Strips absolute paths, stack traces, and collapses known errno
- * codes to generic human-readable text.
+ * client. Strips absolute paths, stack traces, collapses known errno
+ * codes to generic human-readable text, and escapes control characters so
+ * an attacker-controlled value (e.g. a filename with `\n` in it embedded
+ * in an error message) can't break out of its line and inject text into
+ * the LLM context.
  */
 export function sanitizeError(err) {
     if (typeof err === "string")
-        return stripPaths(err);
+        return escapeControlChars(stripPaths(err));
     if (!err || typeof err !== "object")
         return "Unknown error";
     const e = err;
@@ -32,7 +35,34 @@ export function sanitizeError(err) {
     if (code && FS_ERROR_MESSAGES[code])
         return FS_ERROR_MESSAGES[code];
     const msg = typeof e.message === "string" ? e.message : String(err);
-    return stripPaths(msg);
+    return escapeControlChars(stripPaths(msg));
+}
+/**
+ * Escape ASCII control characters (newlines, carriage returns, tabs, NULs,
+ * etc.) so an attacker-controlled string interpolated into a multi-line tool
+ * response can't break out of its line. `\n` becomes the two literal
+ * characters `\` and `n`; other control bytes use `\xHH`. Printable input
+ * passes through unchanged.
+ *
+ * Exists as a separate export from `sanitizeError` because that function's
+ * path-stripping step would rewrite a path-shaped value to literal `<path>`
+ * — fine inside an error message that mentions a host path, but it would
+ * erase the value when the value itself is the path you want to display
+ * (e.g. `f.path` from `failedReferrers`). Both functions apply the same
+ * control-char escape, so passing `f.path` here and `f.error` to
+ * `sanitizeError` gives equivalent injection protection through different
+ * doors.
+ */
+export function escapeControlChars(s) {
+    return s.replace(/[\x00-\x1f\x7f]/g, (c) => {
+        if (c === "\n")
+            return "\\n";
+        if (c === "\r")
+            return "\\r";
+        if (c === "\t")
+            return "\\t";
+        return `\\x${c.charCodeAt(0).toString(16).padStart(2, "0")}`;
+    });
 }
 // Replace anything that looks like an absolute path with `<path>`. Covers:
 //   - POSIX: starts with `/` followed by a non-space char

package/build/lib/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,EAAE;AACF,8EAA8E;AAC9E,+EAA+E;AAC/E,8EAA8E;AAC9E,yEAAyE;AACzE,uEAAuE;AAEvE,MAAM,iBAAiB,GAA2B;IAChD,MAAM,EAAE,6BAA6B;IACrC,MAAM,EAAE,mBAAmB;IAC3B,KAAK,EAAE,yBAAyB;IAChC,MAAM,EAAE,qBAAqB;IAC7B,MAAM,EAAE,qBAAqB;IAC7B,OAAO,EAAE,yBAAyB;IAClC,SAAS,EAAE,wBAAwB;IACnC,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,qBAAqB;IAC7B,YAAY,EAAE,kBAAkB;CACjC,CAAC;AAOF;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;IACpD,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,eAAe,CAAC;IAE5D,MAAM,CAAC,GAAG,GAAgB,CAAC;IAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,IAAI,IAAI,IAAI,iBAAiB,CAAC,IAAI,CAAC;QAAE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEpE,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,2EAA2E;AAC3E,0DAA0D;AAC1D,gCAAgC;AAChC,+CAA+C;AAC/C,EAAE;AACF,wEAAwE;AACxE,qEAAqE;AACrE,uCAAuC;AACvC,MAAM,UAAU,UAAU,CAAC,CAAS;IAClC,OAAO,CAAC;SACL,OAAO,CAAC,oBAAoB,EAAE,QAAQ,CAAC;SACvC,OAAO,CAAC,2BAA2B,EAAE,QAAQ,CAAC;SAC9C,OAAO,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,EAAE;AACF,8EAA8E;AAC9E,+EAA+E;AAC/E,8EAA8E;AAC9E,yEAAyE;AACzE,uEAAuE;AAEvE,MAAM,iBAAiB,GAA2B;IAChD,MAAM,EAAE,6BAA6B;IACrC,MAAM,EAAE,mBAAmB;IAC3B,KAAK,EAAE,yBAAyB;IAChC,MAAM,EAAE,qBAAqB;IAC7B,MAAM,EAAE,qBAAqB;IAC7B,OAAO,EAAE,yBAAyB;IAClC,SAAS,EAAE,wBAAwB;IACnC,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,qBAAqB;IAC7B,YAAY,EAAE,kBAAkB;CACjC,CAAC;AAOF;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,eAAe,CAAC;IAE5D,MAAM,CAAC,GAAG,GAAgB,CAAC;IAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,IAAI,IAAI,IAAI,iBAAiB,CAAC,IAAI,CAAC;QAAE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEpE,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpE,OAAO,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,kBAAkB,CAAC,CAAS;IAC1C,OAAO,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE;QACzC,IAAI,CAAC,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QAC7B,IAAI,CAAC,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QAC7B,IAAI,CAAC,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QAC7B,OAAO,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,2EAA2E;AAC3E,0DAA0D;AAC1D,gCAAgC;AAChC,+CAA+C;AAC/C,EAAE;AACF,wEAAwE;AACxE,qEAAqE;AACrE,uCAAuC;AACvC,MAAM,UAAU,UAAU,CAAC,CAAS;IAClC,OAAO,CAAC;SACL,OAAO,CAAC,oBAAoB,EAAE,QAAQ,CAAC;SACvC,OAAO,CAAC,2BAA2B,EAAE,QAAQ,CAAC;SAC9C,OAAO,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;AAC9C,CAAC"}

package/build/lib/link-rewriter.d.ts

@@ -0,0 +1,85 @@
+/** A single in-place edit on a referrer file, expressed as a byte-offset slice
+ *  to replace. Edits within a file are listed in increasing-offset order.
+ *
+ *  `expected` captures the exact bytes at `[start, end)` at plan time. The
+ *  apply step compares against current contents so a parallel `write_note`
+ *  that mutated the referrer between plan and apply (offsets shift but
+ *  bounds still pass) doesn't silently splice the wrong bytes. */
+interface SpanEdit {
+    start: number;
+    end: number;
+    expected: string;
+    replacement: string;
+}
+/** A complete plan of edits across all referrer files. Canvas edits are
+ *  represented separately because they're applied via JSON re-serialization
+ *  rather than offset substitution. */
+export interface RewritePlan {
+    /** Markdown file edits keyed by vault-relative path. Empty map = no work. */
+    notes: Map<string, SpanEdit[]>;
+    /** Canvas files that need their `nodes[].file` field updated. */
+    canvases: string[];
+    /** Old vault-relative path being moved (with `.md` extension). */
+    oldPath: string;
+    /** New vault-relative path being moved to (with `.md` extension). */
+    newPath: string;
+}
+export interface ApplyResult {
+    /** Vault-relative paths whose contents were rewritten. */
+    updated: string[];
+    /** Per-file failures encountered during apply; rename has already committed
+     *  by the time this runs, so partial failures are surfaced rather than
+     *  rolled back. */
+    failed: Array<{
+        path: string;
+        error: string;
+    }>;
+}
+/**
+ * Build an edit plan describing how to update every reference to `oldPath`
+ * across the vault so it points at `newPath` instead. Pure planning — does
+ * not write to disk. Caller is expected to invoke `applyRewrites` after the
+ * rename has committed.
+ *
+ * `preMoveNotes` is the list returned by `listNotes(vaultPath)` *before* the
+ * rename. Resolution is computed against this list so a wikilink that pointed
+ * at the moved file is correctly identified, even if a different note
+ * elsewhere happens to share its basename.
+ */
+export declare function planMoveRewrites(vaultPath: string, oldPath: string, newPath: string, preMoveNotes: string[]): Promise<RewritePlan>;
+/**
+ * Build an edit plan describing how to strip every reference to `deletedPath`
+ * across the vault. Pure planning — does not write to disk. Caller is
+ * expected to invoke `applyRewrites` after the deletion has committed.
+ *
+ * Replacement rules:
+ *
+ * - Wikilinks: `[[file]]` becomes the deleted file's basename (or alias if
+ *   present). `![[file]]` (embed) is removed entirely since an embed has
+ *   no fallback text. Fragments (`#heading`, `#^block`) are dropped — the
+ *   target is gone, so the fragment is meaningless.
+ * - Markdown links: `[text](file.md)` becomes the visible text. `![alt](...)`
+ *   embed pointing at the deleted file is removed entirely.
+ * - Canvas: not handled here. Cleaning canvas refs after delete is a
+ *   separate decision (remove node? leave dangling? convert to text node?)
+ *   tracked separately. The returned plan has `canvases: []`.
+ *
+ * `preDeleteNotes` is the list returned by `listNotes(vaultPath)` *before*
+ * the delete. Resolution is computed against it so a wikilink that pointed
+ * at the deleted file is correctly identified, even if a different note
+ * elsewhere happens to share its basename.
+ */
+export declare function planDeleteRewrites(vaultPath: string, deletedPath: string, preDeleteNotes: string[]): Promise<RewritePlan>;
+/**
+ * Apply a previously-built `RewritePlan` to the vault. Each file is
+ * serialized through the existing per-file lock so concurrent MCP writes
+ * don't lose updates. Markdown edits are applied back-to-front to keep
+ * earlier offsets valid.
+ *
+ * Failures are accumulated, not thrown — the rename has already committed
+ * by the time we get here, so callers need to know which referrers landed
+ * and which need a manual retry.
+ */
+export declare function applyRewrites(vaultPath: string, plan: RewritePlan): Promise<ApplyResult>;
+export {};
+//# sourceMappingURL=link-rewriter.d.ts.map

package/build/lib/link-rewriter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"link-rewriter.d.ts","sourceRoot":"","sources":["../../src/lib/link-rewriter.ts"],"names":[],"mappings":"AAwBA;;;;;;kEAMkE;AAClE,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;uCAEuC;AACvC,MAAM,WAAW,WAAW;IAC1B,6EAA6E;IAC7E,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/B,iEAAiE;IACjE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB;;uBAEmB;IACnB,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,WAAW,CAAC,CAiItB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,WAAW,CAAC,CAwFtB;AAED;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,WAAW,CAAC,CA6EtB"}

package/build/lib/link-rewriter.js

@@ -0,0 +1,381 @@
+import fs from "fs/promises";
+import { listCanvasFiles, readNote, readCanvasFile, resolveVaultPathSafe, withFileLock, atomicWriteFile, } from "./vault.js";
+import { extractAliases, extractWikilinkSpans, extractMarkdownLinkSpans, formatWikilinkTarget, resolveWikilink, } from "./markdown.js";
+import { mapConcurrent } from "./concurrency.js";
+import { log } from "./logger.js";
+const SCAN_CONCURRENCY = 8;
+/**
+ * Build an edit plan describing how to update every reference to `oldPath`
+ * across the vault so it points at `newPath` instead. Pure planning — does
+ * not write to disk. Caller is expected to invoke `applyRewrites` after the
+ * rename has committed.
+ *
+ * `preMoveNotes` is the list returned by `listNotes(vaultPath)` *before* the
+ * rename. Resolution is computed against this list so a wikilink that pointed
+ * at the moved file is correctly identified, even if a different note
+ * elsewhere happens to share its basename.
+ */
+export async function planMoveRewrites(vaultPath, oldPath, newPath, preMoveNotes) {
+    // Build the post-move note set by substituting old → new. Used for picking
+    // the output form (basename vs path) that matches Obsidian's behavior.
+    const postMoveNotes = preMoveNotes.map((n) => (n === oldPath ? newPath : n));
+    // Build an alias map from the pre-move state. Mirrors the logic in
+    // tools/links.ts so resolution behavior is identical.
+    const aliasMap = new Map();
+    await mapConcurrent(preMoveNotes, SCAN_CONCURRENCY, async (notePath) => {
+        let content;
+        try {
+            content = await readNote(vaultPath, notePath);
+        }
+        catch {
+            return undefined;
+        }
+        for (const alias of extractAliases(content)) {
+            const key = alias.toLowerCase();
+            if (key)
+                aliasMap.set(key, notePath);
+        }
+        return undefined;
+    });
+    const notesPlan = new Map();
+    // Markdown file pass.
+    await mapConcurrent(preMoveNotes, SCAN_CONCURRENCY, async (notePath) => {
+        let content;
+        try {
+            content = await readNote(vaultPath, notePath);
+        }
+        catch (err) {
+            log.warn("link-rewriter: read failed during plan", {
+                note: notePath,
+                err: err,
+            });
+            return undefined;
+        }
+        const edits = [];
+        // Wikilinks.
+        for (const span of extractWikilinkSpans(content)) {
+            if (!span.target)
+                continue;
+            const resolved = resolveWikilink(span.target, notePath, preMoveNotes, { aliasMap });
+            if (resolved !== oldPath)
+                continue;
+            // Don't rewrite a self-reference inside the moved file itself — the
+            // file's path is changing too, so the link's resolution travels with
+            // the new file. Leaving it untouched is the simpler invariant.
+            if (notePath === oldPath)
+                continue;
+            const newTarget = formatWikilinkTarget(newPath, span.target, postMoveNotes);
+            const aliasPart = span.alias !== undefined ? `|${span.alias}` : "";
+            const replacement = `${span.isEmbed ? "!" : ""}[[${newTarget}${span.fragment}${aliasPart}]]`;
+            // Skip no-op rewrites: a bare `[[idea]]` that resolves to the moved
+            // note may already be in the right form when the basename stays
+            // unambiguous post-move. Reporting these as "updated" would be
+            // misleading and would touch mtimes for nothing.
+            const expected = content.slice(span.start, span.end);
+            if (replacement === expected)
+                continue;
+            edits.push({ start: span.start, end: span.end, expected, replacement });
+        }
+        // Markdown `[text](url)` links. Resolve URL paths the same way wikilinks
+        // resolve, so `[x](inbox/idea.md)` and `[x](inbox/idea)` both rewrite.
+        for (const span of extractMarkdownLinkSpans(content)) {
+            if (notePath === oldPath)
+                continue;
+            const url = span.urlPath;
+            // Skip absolute / external URLs — only intra-vault references rewrite.
+            if (/^[a-z][a-z0-9+.-]*:\/\//i.test(url) || url.startsWith("/"))
+                continue;
+            const decoded = safeDecode(url);
+            const resolved = resolveWikilink(decoded, notePath, preMoveNotes, { aliasMap });
+            if (resolved !== oldPath)
+                continue;
+            // Preserve the user's choice of with/without `.md` extension and their
+            // basename-vs-path style. `formatWikilinkTarget` handles the
+            // basename-collision check so a post-move ambiguous basename falls back
+            // to the full path automatically.
+            const hadExt = /\.md$/i.test(decoded);
+            const decodedBare = decoded.replace(/\.md$/i, "");
+            const newBare = formatWikilinkTarget(newPath, decodedBare, postMoveNotes);
+            const newUrl = encodeUrlPath(hadExt ? `${newBare}.md` : newBare);
+            const replacement = `${span.isEmbed ? "!" : ""}[${span.text}](${newUrl}${span.fragment}${span.title})`;
+            const expected = content.slice(span.start, span.end);
+            if (replacement === expected)
+                continue;
+            edits.push({ start: span.start, end: span.end, expected, replacement });
+        }
+        if (edits.length > 0) {
+            // Edits within a file may have been produced in interleaved order
+            // (wikilinks then markdown links). Sort ascending so the apply step can
+            // walk back-to-front cleanly.
+            edits.sort((a, b) => a.start - b.start);
+            notesPlan.set(notePath, edits);
+        }
+        return undefined;
+    });
+    // Canvas pass — `nodes[].file` is the structured equivalent of a wikilink,
+    // and Obsidian stores the vault-relative path verbatim. Match by exact
+    // (case-insensitive) path equality on the old path.
+    const canvasPaths = await listCanvasFiles(vaultPath);
+    const oldLower = oldPath.toLowerCase();
+    const canvasesToRewrite = [];
+    await mapConcurrent(canvasPaths, SCAN_CONCURRENCY, async (cp) => {
+        let data;
+        try {
+            data = await readCanvasFile(vaultPath, cp);
+        }
+        catch (err) {
+            log.warn("link-rewriter: canvas read failed during plan", {
+                note: cp,
+                err: err,
+            });
+            return undefined;
+        }
+        for (const node of data.nodes) {
+            if (typeof node.file === "string" && node.file.toLowerCase() === oldLower) {
+                canvasesToRewrite.push(cp);
+                return undefined;
+            }
+        }
+        return undefined;
+    });
+    return {
+        notes: notesPlan,
+        canvases: canvasesToRewrite,
+        oldPath,
+        newPath,
+    };
+}
+/**
+ * Build an edit plan describing how to strip every reference to `deletedPath`
+ * across the vault. Pure planning — does not write to disk. Caller is
+ * expected to invoke `applyRewrites` after the deletion has committed.
+ *
+ * Replacement rules:
+ *
+ * - Wikilinks: `[[file]]` becomes the deleted file's basename (or alias if
+ *   present). `![[file]]` (embed) is removed entirely since an embed has
+ *   no fallback text. Fragments (`#heading`, `#^block`) are dropped — the
+ *   target is gone, so the fragment is meaningless.
+ * - Markdown links: `[text](file.md)` becomes the visible text. `![alt](...)`
+ *   embed pointing at the deleted file is removed entirely.
+ * - Canvas: not handled here. Cleaning canvas refs after delete is a
+ *   separate decision (remove node? leave dangling? convert to text node?)
+ *   tracked separately. The returned plan has `canvases: []`.
+ *
+ * `preDeleteNotes` is the list returned by `listNotes(vaultPath)` *before*
+ * the delete. Resolution is computed against it so a wikilink that pointed
+ * at the deleted file is correctly identified, even if a different note
+ * elsewhere happens to share its basename.
+ */
+export async function planDeleteRewrites(vaultPath, deletedPath, preDeleteNotes) {
+    // Build alias map from the pre-delete state. Same logic as planMoveRewrites.
+    const aliasMap = new Map();
+    await mapConcurrent(preDeleteNotes, SCAN_CONCURRENCY, async (notePath) => {
+        let content;
+        try {
+            content = await readNote(vaultPath, notePath);
+        }
+        catch {
+            return undefined;
+        }
+        for (const alias of extractAliases(content)) {
+            const key = alias.toLowerCase();
+            if (key)
+                aliasMap.set(key, notePath);
+        }
+        return undefined;
+    });
+    const notesPlan = new Map();
+    // Fallback display text for wikilinks without an alias: the basename of
+    // the deleted file, without extension or path. Matches what Obsidian would
+    // render for a now-broken bare wikilink.
+    const deletedBasename = deletedPath.replace(/\.md$/i, "").split("/").pop() ??
+        deletedPath.replace(/\.md$/i, "");
+    await mapConcurrent(preDeleteNotes, SCAN_CONCURRENCY, async (notePath) => {
+        // Skip the file being deleted itself — it's about to disappear, so
+        // editing its body is wasted work (and the FS write would race the
+        // unlink). The `removeReferences` path only edits *other* notes.
+        if (notePath === deletedPath)
+            return undefined;
+        let content;
+        try {
+            content = await readNote(vaultPath, notePath);
+        }
+        catch (err) {
+            log.warn("link-rewriter: read failed during delete plan", {
+                note: notePath,
+                err: err,
+            });
+            return undefined;
+        }
+        const edits = [];
+        // Wikilinks.
+        for (const span of extractWikilinkSpans(content)) {
+            if (!span.target)
+                continue;
+            const resolved = resolveWikilink(span.target, notePath, preDeleteNotes, { aliasMap });
+            if (resolved !== deletedPath)
+                continue;
+            // Embeds disappear entirely; plain wikilinks fall back to alias-or-basename.
+            const replacement = span.isEmbed
+                ? ""
+                : (span.alias !== undefined ? span.alias : deletedBasename);
+            const expected = content.slice(span.start, span.end);
+            if (replacement === expected)
+                continue;
+            edits.push({ start: span.start, end: span.end, expected, replacement });
+        }
+        // Markdown `[text](url)` links.
+        for (const span of extractMarkdownLinkSpans(content)) {
+            const url = span.urlPath;
+            // Skip absolute / external URLs — only intra-vault refs strip.
+            if (/^[a-z][a-z0-9+.-]*:\/\//i.test(url) || url.startsWith("/"))
+                continue;
+            const decoded = safeDecode(url);
+            const resolved = resolveWikilink(decoded, notePath, preDeleteNotes, { aliasMap });
+            if (resolved !== deletedPath)
+                continue;
+            const replacement = span.isEmbed ? "" : span.text;
+            const expected = content.slice(span.start, span.end);
+            if (replacement === expected)
+                continue;
+            edits.push({ start: span.start, end: span.end, expected, replacement });
+        }
+        if (edits.length > 0) {
+            edits.sort((a, b) => a.start - b.start);
+            notesPlan.set(notePath, edits);
+        }
+        return undefined;
+    });
+    return {
+        notes: notesPlan,
+        canvases: [],
+        oldPath: deletedPath,
+        newPath: "", // unused by applyRewrites when canvases is empty
+    };
+}
+/**
+ * Apply a previously-built `RewritePlan` to the vault. Each file is
+ * serialized through the existing per-file lock so concurrent MCP writes
+ * don't lose updates. Markdown edits are applied back-to-front to keep
+ * earlier offsets valid.
+ *
+ * Failures are accumulated, not thrown — the rename has already committed
+ * by the time we get here, so callers need to know which referrers landed
+ * and which need a manual retry.
+ */
+export async function applyRewrites(vaultPath, plan) {
+    const updated = [];
+    const failed = [];
+    // Markdown pass.
+    await mapConcurrent(Array.from(plan.notes.keys()), SCAN_CONCURRENCY, async (notePath) => {
+        const edits = plan.notes.get(notePath);
+        if (!edits || edits.length === 0)
+            return undefined;
+        try {
+            const fullPath = await resolveVaultPathSafe(vaultPath, notePath);
+            let didWrite = false;
+            await withFileLock(fullPath, async () => {
+                // Re-read inside the lock so we apply edits to current content.
+                // applyEditsBackToFront verifies each edit's `expected` slice
+                // matches before splicing — a parallel `write_note` that landed
+                // between plan and apply will fail the comparison and we report
+                // the file rather than corrupting it.
+                const current = await fs.readFile(fullPath, "utf-8");
+                const next = applyEditsBackToFront(current, edits);
+                if (next === null) {
+                    failed.push({
+                        path: notePath,
+                        error: "content changed during move; references not updated",
+                    });
+                    return;
+                }
+                if (next !== current) {
+                    await atomicWriteFile(fullPath, next);
+                    didWrite = true;
+                }
+            });
+            if (didWrite)
+                updated.push(notePath);
+        }
+        catch (err) {
+            failed.push({ path: notePath, error: err.message });
+        }
+        return undefined;
+    });
+    // Canvas pass.
+    for (const cp of plan.canvases) {
+        try {
+            const fullPath = await resolveVaultPathSafe(vaultPath, cp);
+            let didWrite = false;
+            await withFileLock(fullPath, async () => {
+                const raw = await fs.readFile(fullPath, "utf-8");
+                let parsed;
+                try {
+                    parsed = JSON.parse(raw);
+                }
+                catch {
+                    throw new Error(`Invalid canvas file (malformed JSON): ${cp}`);
+                }
+                const obj = (parsed && typeof parsed === "object" ? parsed : {});
+                const nodes = Array.isArray(obj.nodes) ? obj.nodes : [];
+                let mutated = false;
+                const oldLower = plan.oldPath.toLowerCase();
+                for (const node of nodes) {
+                    if (typeof node.file === "string" && node.file.toLowerCase() === oldLower) {
+                        node.file = plan.newPath;
+                        mutated = true;
+                    }
+                }
+                if (mutated) {
+                    await atomicWriteFile(fullPath, JSON.stringify({ ...obj, nodes }, null, 2));
+                    didWrite = true;
+                }
+            });
+            if (didWrite)
+                updated.push(cp);
+        }
+        catch (err) {
+            failed.push({ path: cp, error: err.message });
+        }
+    }
+    return { updated, failed };
+}
+/** Apply pre-sorted edits back-to-front. Returns `null` if any edit's span
+ *  is out of bounds or if the bytes at `[start, end)` don't match the edit's
+ *  `expected` slice — which means the file was modified between plan and
+ *  apply (offsets shifted, or the link itself was rewritten). Caller treats
+ *  `null` as a failed referrer rather than corrupting the file. */
+function applyEditsBackToFront(content, edits) {
+    // Walk from the back so earlier offsets stay valid as we splice.
+    let out = content;
+    for (let i = edits.length - 1; i >= 0; i--) {
+        const e = edits[i];
+        if (e.start < 0 || e.end > out.length || e.start > e.end) {
+            return null;
+        }
+        if (out.slice(e.start, e.end) !== e.expected) {
+            return null;
+        }
+        out = out.slice(0, e.start) + e.replacement + out.slice(e.end);
+    }
+    return out;
+}
+/** Tolerant `decodeURIComponent`: returns the input unchanged on malformed
+ *  percent-escapes rather than throwing. Vault paths sometimes contain raw
+ *  spaces or characters that aren't valid URI components. */
+function safeDecode(s) {
+    try {
+        return decodeURIComponent(s);
+    }
+    catch {
+        return s;
+    }
+}
+/** Encode a vault-relative path for use inside a markdown link URL. Keeps
+ *  forward slashes literal (they're path separators) while escaping spaces
+ *  and other characters that would break the `(...)` parser. */
+function encodeUrlPath(p) {
+    return p.split("/").map(encodeURIComponent).join("/");
+}
+//# sourceMappingURL=link-rewriter.js.map

package/build/lib/link-rewriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"link-rewriter.js","sourceRoot":"","sources":["../../src/lib/link-rewriter.ts"],"names":[],"mappings":"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"}