obsidian-mcp-server 3.5.5 → 3.6.0

package/dist/services/obsidian/markdown-blocks.js

@@ -0,0 +1,611 @@
+/**
+ * @fileoverview Block structure of a note body, reduced to what inline tag
+ * detection needs: the lines where Obsidian reads no tag — fenced and indented
+ * code, HTML blocks, display math — and the ranges that hold inline content —
+ * paragraphs, headings, table rows. Blockquotes and list items are tracked so
+ * indentation is measured from where a line's content starts. The rules follow
+ * CommonMark except where Obsidian 1.13.7's metadata-cache readback differs;
+ * each difference is noted where it is implemented. Issues #139 and #140.
+ * @module services/obsidian/markdown-blocks
+ */
+function ruleSuffix({ text, last }) {
+    const char = text[last] ?? '';
+    let from = last + 1;
+    if (char === '*' || char === '-' || char === '_') {
+        while (from > 0 &&
+            (text[from - 1] === char || text[from - 1] === ' ' || text[from - 1] === '\t')) {
+            from--;
+        }
+    }
+    const counts = new Uint32Array(last + 2 - from);
+    for (let i = last; i >= from; i--) {
+        counts[i - from] = (counts[i - from + 1] ?? 0) + (text[i] === char ? 1 : 0);
+    }
+    return { char, counts, from };
+}
+/**
+ * A position in one line. Columns count from the content start of the
+ * innermost blockquote, and a tab advances to the next multiple of four. A list
+ * item's indent can end partway through a tab; the columns of that tab it did
+ * not take are `spare`, read as spaces by whatever comes next.
+ */
+class LineCursor {
+    line;
+    pos = 0;
+    col = 0;
+    spare = 0;
+    constructor(line) {
+        this.line = line;
+    }
+    static start(text) {
+        let last = text.length - 1;
+        while (last >= 0 && (text[last] === ' ' || text[last] === '\t' || text[last] === '\r'))
+            last--;
+        return new LineCursor({ text, last });
+    }
+    get text() {
+        return this.line.text;
+    }
+    clone() {
+        const c = new LineCursor(this.line);
+        c.pos = this.pos;
+        c.col = this.col;
+        c.spare = this.spare;
+        return c;
+    }
+    /** Whether only whitespace is left on the line. */
+    get atEnd() {
+        return this.pos > this.line.last;
+    }
+    /**
+     * Whether the rest of the line from `pos` is a thematic break: three or more
+     * of one of `*`, `-`, `_`, with only spaces and tabs between. A line of
+     * nested list markers asks this once per marker, so the answer comes from
+     * one backward pass per line rather than a regex run to the end each time.
+     */
+    thematicBreakAt(pos) {
+        this.line.rule ??= ruleSuffix(this.line);
+        const { from, char, counts } = this.line.rule;
+        return pos >= from && this.text[pos] === char && (counts[pos - from] ?? 0) >= 3;
+    }
+    /** Width of the whitespace ahead, counted no further than `limit` columns. */
+    columns(limit = Number.POSITIVE_INFINITY) {
+        let n = this.spare;
+        let col = this.col + this.spare;
+        for (let i = this.pos; n < limit; i++) {
+            const ch = this.text[i];
+            if (ch === ' ') {
+                n++;
+                col++;
+            }
+            else if (ch === '\t') {
+                const w = 4 - (col % 4);
+                n += w;
+                col += w;
+            }
+            else
+                break;
+        }
+        return n;
+    }
+    /** Consume exactly `cols` columns of whitespace. When fewer are there, consumes nothing and returns false. */
+    take(cols) {
+        const { pos, col, spare } = this;
+        let left = cols;
+        while (left > 0) {
+            if (this.spare > 0) {
+                const t = Math.min(this.spare, left);
+                this.spare -= t;
+                this.col += t;
+                left -= t;
+                continue;
+            }
+            const ch = this.text[this.pos];
+            if (ch === ' ') {
+                this.pos++;
+                this.col++;
+                left--;
+            }
+            else if (ch === '\t') {
+                const t = Math.min(4 - (this.col % 4), left);
+                this.spare = 4 - (this.col % 4) - t;
+                this.pos++;
+                this.col += t;
+                left -= t;
+            }
+            else {
+                this.pos = pos;
+                this.col = col;
+                this.spare = spare;
+                return false;
+            }
+        }
+        return true;
+    }
+    skipWhitespace() {
+        this.take(this.columns());
+    }
+}
+const ATX_HEADING = /#{1,6}(?:[ \t]|\r?$)/y;
+const LIST_MARKER = /(?:[-+*]|(?<start>\d{1,9})[.)])(?=[ \t]|\r?$)/y;
+/** A backtick fence's info string cannot hold a backtick — ```` ``` a`b ```` is inline code. */
+const FENCE_OPEN = /`{3,}(?=[^`]*$)|~{3,}/y;
+const FENCE_CLOSE = /(`{3,}|~{3,})[ \t]*\r?$/y;
+const MATH_CLOSE = /[ \t]*\$\$[ \t]*\r?$/y;
+const SETEXT_UNDERLINE = /(?:=+|-+)[ \t]*\r?$/y;
+const LINK_DEFINITION = /\[[^[\]]+\]:/y;
+/** Obsidian's blank line: empty or spaces only. A line holding a tab continues an open paragraph or HTML block. */
+const BLANK = / *\r?$/y;
+/** A table delimiter row after its optional leading pipe: `-|-`, `:--|--:|`. */
+const DELIMITER_ROW = /[ \t]*:?-+:?(?:[ \t]*\|[ \t]*:?-+:?)*(?:[ \t]*\|)?[ \t]*\r?$/y;
+/**
+ * CommonMark's open tag and closing tag (raw HTML): a tag name, attributes —
+ * each a name and an optional `=` value, unquoted, single-quoted, or
+ * double-quoted — and an optional `/` before `>`; a closing tag takes no
+ * attributes. Whitespace between the parts may hold one line ending and a
+ * quoted value any number, which only an inline tag can use: a block start is
+ * matched one line at a time. Obsidian 1.13.7 reads both uses by this grammar
+ * — `x <a b #t> y` and `x </a #t> y` are plain text around a tag, while
+ * `<a\nb="c">#t` is an element followed by one. Issue #144.
+ */
+export const HTML_TAG_SOURCE = (() => {
+    const ws = String.raw `[ \t]*(?:\r?\n[ \t]*)?`;
+    const value = String.raw `[^ \t\r\n"'=<>\x60]+|'[^']*'|"[^"]*"`;
+    const attribute = String.raw `(?=[ \t]|\r?\n)${ws}[A-Za-z_:][\w.:-]*(?:${ws}=${ws}(?:${value}))?`;
+    const name = '[A-Za-z][A-Za-z0-9-]*';
+    return String.raw `<${name}(?:${attribute})*${ws}\/?>|<\/${name}${ws}>`;
+})();
+/**
+ * CommonMark's seven HTML block starts, in order: the start pattern, the
+ * pattern whose line ends the block (none: a blank line ends it), and whether
+ * the block can interrupt a paragraph. Read back from Obsidian: `<div>`,
+ * `<p>`, `<pre>`, a lone `<span>`, `<?…?>`, `<!DOCTYPE`, and `<![CDATA[`
+ * blocks all hide their tags, while `<span>x #t</span>` is a paragraph.
+ */
+const HTML_BLOCKS = [
+    [/<(?:pre|script|style|textarea)(?=[ \t>]|\r?$)/iy, /<\/(?:pre|script|style|textarea)>/gi, true],
+    [/<!--/y, /-->/g, true],
+    [/<\?/y, /\?>/g, true],
+    [/<![A-Za-z]/y, />/g, true],
+    [/<!\[CDATA\[/y, /\]\]>/g, true],
+    [
+        /<\/?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|nav|noframes|ol|optgroup|option|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?=[ \t]|\/?>|\r?$)/iy,
+        undefined,
+        true,
+    ],
+    [new RegExp(String.raw `(?:${HTML_TAG_SOURCE})[ \t]*\r?$`, 'y'), undefined, false],
+];
+function sticky(re, text, pos) {
+    re.lastIndex = pos;
+    return re.exec(text);
+}
+/** Whether `close` occurs in `text` at or after `from`. */
+function closes(close, text, from) {
+    close.lastIndex = from;
+    return close.test(text);
+}
+/** The HTML block opening at `pos`, if any: the pattern that ends it, or `undefined` when a blank line does. */
+function htmlBlockAt(text, pos, paragraphOpen) {
+    if (text[pos] !== '<')
+        return;
+    for (const [open, close, interruptsParagraph] of HTML_BLOCKS) {
+        if (paragraphOpen && !interruptsParagraph)
+            continue;
+        if (sticky(open, text, pos))
+            return { close };
+    }
+    return;
+}
+/** A display math block opens with `$$` on a line that holds no second `$$`. */
+function mathOpensAt(text, pos) {
+    return text.startsWith('$$', pos) && !text.includes('$$', pos + 2);
+}
+/** The unescaped `$$` delimiters in `text` from `from` on. */
+function doubleDollars(text, from) {
+    let n = 0;
+    for (let i = text.indexOf('$$', from); i !== -1;) {
+        let slashes = 0;
+        while (text[i - 1 - slashes] === '\\')
+            slashes++;
+        if (slashes % 2 === 0) {
+            n++;
+            i = text.indexOf('$$', i + 2);
+        }
+        else {
+            i = text.indexOf('$$', i + 1);
+        }
+    }
+    return n;
+}
+/**
+ * The list item whose marker sits at `c`: a cursor at its content and the
+ * columns the marker and the spaces after it take. `null` when there is none,
+ * or when it may not interrupt an open paragraph — an empty item, or an
+ * ordered one not starting at 1.
+ *
+ * One Obsidian difference is left unmodelled: under a `1.`-style item (not
+ * `1)`), a line after an empty line indented exactly seven columns is text to
+ * Obsidian unless some line of the item is indented three, so `1. a`, empty,
+ * then seven spaces and `#t` is tagged `t` there and read as code here.
+ * Matching it would take the item's later lines into account.
+ */
+function listItemAt(c, paragraphOpen) {
+    if (c.thematicBreakAt(c.pos))
+        return null;
+    const m = sticky(LIST_MARKER, c.text, c.pos);
+    if (!m)
+        return null;
+    const marker = m[0].length;
+    const cursor = c.clone();
+    cursor.pos += marker;
+    cursor.col += marker;
+    const empty = cursor.atEnd;
+    if (paragraphOpen) {
+        const start = m.groups?.start;
+        if (empty || (start !== undefined && Number(start) !== 1))
+            return null;
+    }
+    if (empty)
+        return { cursor, width: marker + 1 };
+    /** Five or more spaces after the marker: the item's text is indented code, and the marker takes one. */
+    const spaces = cursor.columns(5);
+    const taken = spaces >= 5 ? 1 : spaces;
+    cursor.take(taken);
+    return { cursor, width: marker + taken };
+}
+/** Whether `text[from, to)` holds a `|` that is not escaped. */
+function hasPipe(text, from, to) {
+    let escaped = false;
+    for (let i = from; i < to; i++) {
+        const ch = text[i];
+        if (ch === '|' && !escaped)
+            return true;
+        escaped = ch === '\\' && !escaped;
+    }
+    return false;
+}
+/**
+ * Whether the text at `c` opens a block that ends a paragraph. Such a line
+ * cannot continue a paragraph lazily, nor a fence, math, or HTML block.
+ * `mathOpen` is whether a `$$` line may open display math here — see
+ * `BlockScanner.startLeaf`.
+ */
+function interrupts(c, mathOpen) {
+    if (c.columns(4) >= 4)
+        return false;
+    const t = c.clone();
+    t.skipWhitespace();
+    const { text, pos } = t;
+    return (text[pos] === '>' ||
+        t.thematicBreakAt(pos) ||
+        listItemAt(t, true) !== null ||
+        sticky(ATX_HEADING, text, pos) !== null ||
+        sticky(FENCE_OPEN, text, pos) !== null ||
+        htmlBlockAt(text, pos, true) !== undefined ||
+        (mathOpen && mathOpensAt(text, pos)));
+}
+class BlockScanner {
+    body;
+    spans = [];
+    stack = [];
+    /** Indices into `stack` of its blockquotes, outermost first. A blank line continues every list item and no blockquote. */
+    quotes = [];
+    leaf;
+    prevBlank = false;
+    constructor(body) {
+        this.body = body;
+    }
+    run() {
+        for (let start = 0;;) {
+            const nl = this.body.indexOf('\n', start);
+            this.line(start, this.body.slice(start, nl === -1 ? this.body.length : nl));
+            if (nl === -1)
+                break;
+            start = nl + 1;
+        }
+        this.closeContainers(0);
+        this.closeLeaf();
+        return this.spans;
+    }
+    inline(start, end, tableRow = false) {
+        this.spans.push({ kind: 'inline', start, end, tableRow });
+    }
+    closeLeaf() {
+        const leaf = this.leaf;
+        this.leaf = undefined;
+        if (!leaf || leaf.kind === 'table')
+            return;
+        if (leaf.kind === 'paragraph')
+            this.inline(leaf.start, leaf.end);
+        else
+            this.spans.push({ kind: 'hidden', start: leaf.start, end: leaf.end });
+    }
+    closeContainers(depth) {
+        if (depth < this.stack.length)
+            this.closeLeaf();
+        this.stack.length = depth;
+        while ((this.quotes.at(-1) ?? -1) >= depth)
+            this.quotes.pop();
+    }
+    line(start, text) {
+        const end = start + text.length;
+        const c = LineCursor.start(text);
+        const whitespaceLine = c.atEnd;
+        let matched = 0;
+        if (whitespaceLine) {
+            matched = this.quotes[0] ?? this.stack.length;
+        }
+        else {
+            for (; matched < this.stack.length; matched++) {
+                const k = this.stack[matched];
+                if (k.quote ? !this.quoteMarker(c) : !c.atEnd && !c.take(k.indent))
+                    break;
+            }
+        }
+        const blank = sticky(BLANK, text, c.pos) !== null;
+        const afterBlank = this.prevBlank;
+        this.prevBlank = whitespaceLine;
+        if (matched === this.stack.length) {
+            if (this.leaf && this.continueLeaf(this.leaf, c, start, end, blank))
+                return;
+        }
+        else {
+            if (this.lazy(c, matched, end, afterBlank))
+                return;
+            this.closeContainers(matched);
+        }
+        if (c.atEnd) {
+            /** A line of tabs continues an open paragraph; only an empty or spaces-only line ends one. */
+            if (this.leaf?.kind === 'paragraph' && !blank)
+                return;
+            this.closeLeaf();
+            return;
+        }
+        let cur = c;
+        while (cur.columns(4) < 4) {
+            const t = cur.clone();
+            t.skipWhitespace();
+            if (text[t.pos] === '>') {
+                this.closeLeaf();
+                this.quoteMarker(cur);
+                this.quotes.push(this.stack.length);
+                this.stack.push({ quote: true, indent: 0 });
+                continue;
+            }
+            const item = listItemAt(t, this.leaf?.kind === 'paragraph');
+            if (!item)
+                break;
+            this.closeLeaf();
+            this.stack.push({ quote: false, indent: cur.columns(4) + item.width });
+            cur = item.cursor;
+        }
+        if (!cur.atEnd)
+            this.startLeaf(cur, start, end);
+    }
+    /**
+     * A lazy line: CommonMark lets a paragraph run on over a line that drops its
+     * container's markers, and Obsidian lets a fence, math, or HTML block run on
+     * the same way — `- ```` then an unindented line is still code, and an
+     * unindented fence cannot close it. That stops at a blank line or a line
+     * that opens a block. One more Obsidian rule: a line indented four columns
+     * never continues a blockquote lazily (`> para` then `    #t` is code).
+     */
+    lazy(c, matched, end, afterBlank) {
+        const leaf = this.leaf;
+        if (!leaf || leaf.kind === 'code' || leaf.kind === 'table')
+            return false;
+        if (c.atEnd || (afterBlank && leaf.kind !== 'paragraph'))
+            return false;
+        if (interrupts(c, leaf.kind !== 'paragraph' || leaf.dollars % 2 === 0))
+            return false;
+        if ((this.quotes.at(-1) ?? -1) >= matched && c.columns(4) >= 4)
+            return false;
+        if (leaf.kind === 'paragraph')
+            this.grow(leaf, c, end);
+        else
+            leaf.end = end;
+        if (leaf.kind === 'html' && leaf.close && closes(leaf.close, c.text, 0))
+            this.closeLeaf();
+        return true;
+    }
+    /** Add the rest of the line at `c` to the open paragraph. */
+    grow(paragraph, c, end) {
+        paragraph.end = end;
+        paragraph.lines++;
+        paragraph.dollars += doubleDollars(c.text, c.pos);
+    }
+    /**
+     * Consume a blockquote marker: up to three columns of indentation, `>`, and
+     * one following space. Obsidian then measures the rest of the line from
+     * column zero, so a tab after `>` is four columns wide (`>\t#t` is indented
+     * code), where CommonMark would have the marker take one of its columns.
+     */
+    quoteMarker(c) {
+        if (c.columns(4) >= 4)
+            return false;
+        const t = c.clone();
+        t.skipWhitespace();
+        if (t.text[t.pos] !== '>')
+            return false;
+        c.pos = t.pos + 1;
+        if (c.text[c.pos] === ' ')
+            c.pos++;
+        c.col = 0;
+        c.spare = 0;
+        return true;
+    }
+    /** Continue the open leaf with this line. False when the line ends it and is read as a new block. */
+    continueLeaf(leaf, c, start, end, blank) {
+        const { text } = c;
+        switch (leaf.kind) {
+            case 'fence': {
+                leaf.end = end;
+                if (c.columns(4) < 4) {
+                    const t = c.clone();
+                    t.skipWhitespace();
+                    const run = sticky(FENCE_CLOSE, text, t.pos)?.[1];
+                    if (run && run[0] === leaf.marker[0] && run.length >= leaf.marker.length)
+                        this.closeLeaf();
+                }
+                return true;
+            }
+            case 'math':
+                leaf.end = end;
+                if (sticky(MATH_CLOSE, text, c.pos))
+                    this.closeLeaf();
+                return true;
+            case 'html':
+                if (!leaf.close && blank) {
+                    this.closeLeaf();
+                    return false;
+                }
+                leaf.end = end;
+                if (leaf.close && closes(leaf.close, text, 0))
+                    this.closeLeaf();
+                return true;
+            case 'code':
+                /** Blank lines stay inside indented code without extending its span. */
+                if (c.atEnd)
+                    return true;
+                if (c.columns(4) >= 4) {
+                    leaf.end = end;
+                    return true;
+                }
+                this.closeLeaf();
+                return false;
+            case 'table':
+                if (this.tableRow(c, leaf.lead)) {
+                    this.inline(start, end, true);
+                    return true;
+                }
+                this.closeLeaf();
+                return false;
+            case 'paragraph':
+                return false;
+        }
+    }
+    /**
+     * Obsidian reads a table row only at the container's content start — one
+     * leading space and the table is gone — and only in the header's style: a
+     * table whose header opens with `|` takes rows that open with `|`, and one
+     * whose header does not takes rows that hold a `|` without opening with one.
+     */
+    tableRow(c, lead) {
+        if (c.atEnd || c.columns(1) > 0)
+            return false;
+        const { text, pos } = c;
+        if (lead)
+            return text[pos] === '|';
+        return text[pos] !== '|' && hasPipe(text, pos, text.length);
+    }
+    startLeaf(c, start, end) {
+        const { text } = c;
+        const leaf = this.leaf;
+        const cols = c.columns(4);
+        if (cols >= 4) {
+            /** Indented code cannot interrupt a paragraph; the line continues it. */
+            if (leaf?.kind === 'paragraph') {
+                this.grow(leaf, c, end);
+            }
+            else {
+                this.closeLeaf();
+                this.leaf = { kind: 'code', start, end };
+            }
+            return;
+        }
+        c.skipWhitespace();
+        const { pos } = c;
+        const at = start + pos;
+        if (leaf?.kind === 'paragraph') {
+            if (sticky(SETEXT_UNDERLINE, text, pos)) {
+                this.closeLeaf();
+                return;
+            }
+            if (leaf.lines === 1 &&
+                leaf.header >= 0 &&
+                cols === 0 &&
+                this.delimiterRow(text, pos, leaf)) {
+                return;
+            }
+        }
+        if (c.thematicBreakAt(pos)) {
+            this.closeLeaf();
+            return;
+        }
+        if (sticky(ATX_HEADING, text, pos)) {
+            this.closeLeaf();
+            this.inline(start, end);
+            return;
+        }
+        const fence = sticky(FENCE_OPEN, text, pos);
+        if (fence) {
+            this.closeLeaf();
+            this.leaf = { kind: 'fence', start, end, marker: fence[0] };
+            return;
+        }
+        const html = htmlBlockAt(text, pos, leaf?.kind === 'paragraph');
+        if (html) {
+            this.closeLeaf();
+            this.leaf = { kind: 'html', start: at, end, close: html.close };
+            if (html.close && closes(html.close, text, pos))
+                this.closeLeaf();
+            return;
+        }
+        /**
+         * A `$$` line opens display math, interrupting a paragraph — unless the
+         * paragraph already holds an unpaired inline `$$`, which Obsidian closes on
+         * this line instead: `a $$` then `#t` then `$$ b` hides `#t` as inline math.
+         */
+        if (mathOpensAt(text, pos) && !(leaf?.kind === 'paragraph' && leaf.dollars % 2 === 1)) {
+            this.closeLeaf();
+            this.leaf = { kind: 'math', start: at, end };
+            return;
+        }
+        if (leaf?.kind === 'paragraph') {
+            this.grow(leaf, c, end);
+            return;
+        }
+        this.closeLeaf();
+        /** Obsidian does not read a link reference definition as a paragraph: an indented line after `[a]: u` is code. */
+        if (sticky(LINK_DEFINITION, text, pos)) {
+            this.inline(start, end);
+            return;
+        }
+        this.leaf = {
+            kind: 'paragraph',
+            start,
+            end,
+            lines: 1,
+            header: cols === 0 ? at : -1,
+            dollars: doubleDollars(text, pos),
+        };
+    }
+    /**
+     * Turn a one-line paragraph into a table when this line is a delimiter row
+     * in the header's style. Obsidian does not require the column counts to
+     * agree, and does not let a table interrupt a paragraph.
+     */
+    delimiterRow(text, pos, paragraph) {
+        const lead = this.body[paragraph.header] === '|';
+        if ((text[pos] === '|') !== lead)
+            return false;
+        const from = lead ? pos + 1 : pos;
+        if (!sticky(DELIMITER_ROW, text, from) || !text.includes('|', from))
+            return false;
+        if (!hasPipe(this.body, lead ? paragraph.header + 1 : paragraph.header, paragraph.end)) {
+            return false;
+        }
+        this.leaf = { kind: 'table', lead };
+        this.inline(paragraph.start, paragraph.end, true);
+        return true;
+    }
+}
+/**
+ * The hidden and inline ranges of `body`, in order and non-overlapping.
+ * Linear in the length of the body: each line is read a bounded number of
+ * times, and a blank line matches its containers without walking them.
+ */
+export function scanBlocks(body) {
+    return new BlockScanner(body).run();
+}
+//# sourceMappingURL=markdown-blocks.js.map

package/dist/services/obsidian/markdown-blocks.js.map

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

package/dist/services/obsidian/obsidian-service.d.ts

@@ -8,7 +8,7 @@ import type { Context } from '@cyanheads/mcp-ts-core';
 import { type Dispatcher, type RequestInit, fetch as undiciFetch } from 'undici';
 import { type ServerConfig } from '../../config/server-config.js';
 import { PathPolicy } from './path-policy.js';
-import type { DocumentMap, FileListing, NoteJson, NoteTarget, ObsidianCommand, ObsidianTag, OmnisearchHit, PatchHeaders, StructuredSearchHit, TextSearchHit, VaultStatus } from './types.js';
+import type { DocumentMap, FileListing, NoteJson, NoteTarget, ObsidianCommand, ObsidianTag, OmnisearchHit, PatchInstruction, StructuredSearchHit, TextSearchHit, VaultStatus } from './types.js';
 type UndiciResponse = Awaited<ReturnType<typeof undiciFetch>>;
 /**
  * The HTTP fetch contract this service depends on. Defaults to undici's
@@ -73,13 +73,15 @@ export declare class ObsidianService {
     writeNote(ctx: Context, target: NoteTarget, content: string, contentType?: 'markdown' | 'json'): Promise<void>;
     appendToNote(ctx: Context, target: NoteTarget, content: string, contentType?: 'markdown' | 'json'): Promise<void>;
     /**
-     * Apply a header-targeted PATCH. Returns the section locator the edit was
-     * actually applied to — identical to `headers.target` unless a bare heading
-     * leaf was expanded to its full `Parent::Child` path (see
-     * `#resolveHeadingTarget`), which callers echo back so an agent can see where
-     * the write landed.
+     * Apply a section-targeted PATCH in the markdown-patch format the plugin
+     * speaks: a 2.0 JSON instruction on Local REST API 5.x and later, 1.x
+     * request headers on 4.x and for the table-row writes 2.0 cannot express
+     * (`#wireFormat`). Returns the section locator the edit was actually
+     * applied to — identical to `instruction.target` unless a bare heading leaf
+     * was expanded to its full `Parent::Child` path (see `#resolveHeadingTarget`),
+     * which callers echo back so an agent can see where the write landed.
      */
-    patchNote(ctx: Context, target: NoteTarget, content: string, headers: PatchHeaders): Promise<string>;
+    patchNote(ctx: Context, target: NoteTarget, content: string, instruction: PatchInstruction): Promise<string>;
     deleteNote(ctx: Context, target: NoteTarget): Promise<void>;
     /**
      * Byte size of a note at `target`, derived from the HEAD `Content-Length`