obsidian-mcp-server 3.7.0 → 3.7.2

package/dist/services/obsidian/jsonlogic-evaluator.js

@@ -0,0 +1,192 @@
+/**
+ * @fileoverview Server-side JSONLogic evaluation for searches scoped by
+ * OBSIDIAN_READ_PATHS. The caller's tree runs here, on a worker thread, over
+ * the readable notes alone, instead of upstream over the whole vault: no hit,
+ * result, or error reads a note outside the read scope. The notes' link
+ * fields arrive cut to readable entries, but which note a link resolves to is
+ * still Obsidian's vault-wide resolution (#165).
+ *
+ * Every evaluation is bounded — tree depth, work budgets the worker enforces
+ * (per note for what each note's evaluation builds, per search for what kept
+ * results hold past a 1,024-character allowance each), and a wall-clock
+ * deadline — and an evaluation past a bound fails with `logic_too_costly`
+ * rather than holding the process. A note nested too deep to hand to the
+ * worker fails with `note_too_deep`.
+ *
+ * @module services/obsidian/jsonlogic-evaluator
+ */
+import { Worker } from 'node:worker_threads';
+import { serializationError, validationError } from '@cyanheads/mcp-ts-core/errors';
+/**
+ * Deepest object/array nesting a tree may have. The plugin evaluates every
+ * shape to at least 5,000 levels; this stays well under the depth at which
+ * Node's structured clone overflows the stack handing a tree to the worker
+ * (about 3,500 levels).
+ */
+export const MAX_TREE_DEPTH = 1_000;
+/**
+ * Work units kept results may hold across one search, every batch included
+ * (see the worker's `chargeKept`). A result whose JSON is at most 1,024
+ * characters is kept free, whatever its note; a larger one pays for what its
+ * JSON holds beyond its own note's JSON. Kept results live until the search
+ * answers, so this bounds what an evaluation retains, since Bun ignores the
+ * worker's `resourceLimits`. What a note's evaluation builds and drops is
+ * bounded per note by {@link NOTE_BUILD_UNITS}; evaluation steps that build
+ * nothing are bounded by {@link EVALUATION_DEADLINE_MS}, so a tree that only
+ * tests note fields spends nothing however many notes it reads.
+ */
+export const KEPT_RESULT_UNITS = 10_000_000;
+/**
+ * Work units one note's evaluation may build beyond the note's own size (see
+ * the worker's `charge`): the size of every value `merge`, `cat`, or `map`
+ * builds and of every value an operator places in an array literal. The
+ * allowance resets for each note, since what an evaluation builds is dropped
+ * when it ends, so a tree that builds from every note of a broad scope is
+ * bounded by its largest note rather than by the scope's total. Adding the
+ * note's own size means one copy of a note always fits, at any size a batch
+ * carries; the fixed part leaves room for dozens of copies of a 200 KB note
+ * while holding what one evaluation can allocate to the note plus
+ * 10,000,000 units.
+ */
+export const NOTE_BUILD_UNITS = 10_000_000;
+/** Wall-clock ceiling on one search's evaluation, across its batches, worker startup included. */
+export const EVALUATION_DEADLINE_MS = 10_000;
+/**
+ * The worker's module, next to this one: `.js` in the build, `.ts` when the
+ * test suite runs the source, which both Bun and Node load directly.
+ */
+const WORKER_URL = new URL(`./jsonlogic-worker.${import.meta.url.endsWith('.ts') ? 'ts' : 'js'}`, import.meta.url);
+/**
+ * Whether the plugin would read note bodies for `logic`: its own rule, a
+ * substring test for `"content"` on the tree's JSON. A tree without it sees
+ * `content` as `""` upstream, so a scoped fetch mirrors the same rule to keep
+ * results identical — and it is conservative, firing on the word anywhere.
+ */
+export function readsContent(logic) {
+    return JSON.stringify(logic).includes('"content"');
+}
+/**
+ * Reject a tree nested deeper than {@link MAX_TREE_DEPTH} before it reaches
+ * anything recursive (serialization, the worker hand-off, evaluation).
+ */
+export function assertTreeDepth(logic) {
+    if (nestingDepth(logic, MAX_TREE_DEPTH) > MAX_TREE_DEPTH) {
+        throw tooCostly(`The JSONLogic tree nests deeper than ${MAX_TREE_DEPTH.toLocaleString('en-US')} levels.`);
+    }
+}
+/**
+ * Deepest object/array nesting in `value`, which is level 1, measured until
+ * it passes `limit`. Iterative, so it measures data too deep for any
+ * recursive walk.
+ */
+function nestingDepth(value, limit = Number.POSITIVE_INFINITY) {
+    let deepest = 0;
+    const pending = [[value, 1]];
+    while (pending.length > 0 && deepest <= limit) {
+        const [node, depth] = pending.pop();
+        if (node === null || typeof node !== 'object')
+            continue;
+        deepest = Math.max(deepest, depth);
+        for (const child of Object.values(node))
+            pending.push([child, depth + 1]);
+    }
+    return deepest;
+}
+/**
+ * One search's evaluation of `logic`. `evaluate` takes the readable notes in
+ * vault order, all at once or in successive batches; the budget for kept
+ * results and the deadline span every batch, and each note's build allowance
+ * is its own, so batching changes memory use, not results.
+ * Each call returns the batch's hits as the plugin's search would: a hit for
+ * every truthy result, results shaped by a JSON round trip. It throws
+ * `logic_invalid` when the tree fails on a note, `logic_too_costly` past
+ * either budget or the deadline, `note_too_deep` for a note the worker
+ * hand-off cannot carry, and the abort reason when `signal` aborts first.
+ */
+export function createJsonLogicEvaluation(logic, opts = {}) {
+    const { signal, deadlineMs = EVALUATION_DEADLINE_MS } = opts;
+    let keptUnitsLeft = KEPT_RESULT_UNITS;
+    let msLeft = deadlineMs;
+    const pastDeadline = () => tooCostly(`Evaluating the JSONLogic tree over the readable notes ran past ${deadlineMs / 1000} s.`);
+    return {
+        async evaluate(notes) {
+            if (notes.length === 0)
+                return [];
+            signal?.throwIfAborted();
+            if (msLeft <= 0)
+                throw pastDeadline();
+            const started = performance.now();
+            const response = await runWorker({ logic, notes, keptUnits: keptUnitsLeft, noteUnits: NOTE_BUILD_UNITS }, msLeft, pastDeadline, signal);
+            msLeft -= performance.now() - started;
+            if (response.ok) {
+                keptUnitsLeft = response.keptUnitsLeft;
+                return response.hits.map((hit) => ({
+                    filename: hit.filename,
+                    result: JSON.parse(hit.json),
+                }));
+            }
+            throw failureError(response);
+        },
+    };
+}
+function failureError(response) {
+    const cause = new Error(response.detail);
+    switch (response.failure) {
+        case 'invalid_regexp':
+            return validationError('A `regexp` operand in the JSONLogic tree did not compile. `regexp` takes `[PATTERN, VALUE]` — with the operands reversed, the note field is compiled as the pattern.', { reason: 'logic_invalid' }, { cause });
+        case 'invalid':
+            return validationError('The JSONLogic tree could not be evaluated.', { reason: 'logic_invalid' }, { cause });
+        case 'over_note_budget':
+            return tooCostly(`Evaluating the JSONLogic tree on one readable note built more than the per-note work budget of ${NOTE_BUILD_UNITS.toLocaleString('en-US')} units beyond that note's own size.`);
+        case 'over_kept_budget':
+            return tooCostly(`The JSONLogic tree's results over the readable notes held more than the search's work budget of ${KEPT_RESULT_UNITS.toLocaleString('en-US')} units: each result over 1,024 characters pays for what it holds beyond its own note's size.`);
+    }
+}
+/** One worker per batch, terminated however it ends. */
+async function runWorker(request, deadlineMs, pastDeadline, signal) {
+    const worker = new Worker(WORKER_URL);
+    const { promise, resolve, reject } = Promise.withResolvers();
+    const timer = setTimeout(() => reject(pastDeadline()), deadlineMs);
+    const onAbort = () => reject(signal?.reason);
+    signal?.addEventListener('abort', onAbort, { once: true });
+    worker.once('message', resolve);
+    worker.once('error', reject);
+    worker.once('exit', (code) => reject(new Error(`JSONLogic worker exited with code ${code} before answering`)));
+    try {
+        worker.postMessage(request);
+    }
+    catch (err) {
+        // Rejected before the await below takes the promise, so the exit `terminate` raises settles nothing.
+        reject(handOffError(err, request.notes));
+    }
+    try {
+        return await promise;
+    }
+    finally {
+        clearTimeout(timer);
+        signal?.removeEventListener('abort', onAbort);
+        await worker.terminate();
+    }
+}
+/**
+ * Why `postMessage` refused a batch. Structured clone recurses, so data
+ * nested deep enough overflows the stack: about 3,500 levels under Node,
+ * tens of thousands under Bun. The tree is held to {@link MAX_TREE_DEPTH},
+ * so the deepest note is the one that did not fit. Any other refusal is
+ * returned as it came.
+ */
+function handOffError(err, notes) {
+    if (!(err instanceof RangeError))
+        return err;
+    let deepest = { path: '', levels: 0 };
+    for (const note of notes) {
+        const levels = nestingDepth(note);
+        if (levels > deepest.levels)
+            deepest = { path: note.path, levels };
+    }
+    return serializationError(`The readable note "${deepest.path}" holds data nested ${deepest.levels.toLocaleString('en-US')} levels deep, too deep for the server to hand to its evaluator.`, { reason: 'note_too_deep', path: deepest.path }, { cause: err });
+}
+function tooCostly(message) {
+    return validationError(message, { reason: 'logic_too_costly' });
+}
+//# sourceMappingURL=jsonlogic-evaluator.js.map

package/dist/services/obsidian/jsonlogic-evaluator.js.map

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

package/dist/services/obsidian/jsonlogic-worker.d.ts

@@ -0,0 +1,53 @@
+/**
+ * @fileoverview Worker-thread entry that evaluates a caller's JSONLogic tree
+ * against note contexts, for searches scoped by OBSIDIAN_READ_PATHS. Runs the
+ * operator set the Local REST API plugin runs (json-logic-js 2.0.5 plus its
+ * `glob` and `regexp`), with the plugin's hit test and JSON-shaped results, so
+ * a scoped search answers as the plugin would over the same notes.
+ *
+ * Off the main thread so a slow tree cannot hold the event loop: the evaluator
+ * terminates this worker at its deadline, which also stops a native regex
+ * mid-backtrack. Memory is bounded here by work budgets, since Bun ignores
+ * `resourceLimits`: one per note for what its evaluation builds and drops,
+ * and one across the search for what kept results hold past a
+ * 1,024-character allowance each.
+ *
+ * Imports only packages and builtins, never sibling modules: under Node the
+ * test suite loads this file from source, where `./x.js` specifiers do not
+ * resolve to `.ts`.
+ *
+ * @module services/obsidian/jsonlogic-worker
+ */
+/** A note as the plugin's JSONLogic search evaluates it, link fields already scoped. */
+export interface NoteContext {
+    path: string;
+    [field: string]: unknown;
+}
+export interface EvaluationRequest {
+    /** Work units left for kept results, across every batch of the search; see {@link chargeKept}. */
+    keptUnits: number;
+    logic: unknown;
+    notes: NoteContext[];
+    /** Work units each note's evaluation may build beyond the note's own size; see {@link charge}. */
+    noteUnits: number;
+}
+/**
+ * How an evaluation ended. `json` is the hit's result serialized as the
+ * plugin's response would carry it; `keptUnitsLeft` carries into the next
+ * batch.
+ */
+export type EvaluationResponse = {
+    ok: true;
+    hits: Array<{
+        filename: string;
+        json: string;
+    }>;
+    keptUnitsLeft: number;
+} | {
+    ok: false;
+    failure: 'invalid' | 'invalid_regexp' | BudgetFailure;
+    detail: string;
+};
+type BudgetFailure = 'over_note_budget' | 'over_kept_budget';
+export {};
+//# sourceMappingURL=jsonlogic-worker.d.ts.map

package/dist/services/obsidian/jsonlogic-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonlogic-worker.d.ts","sourceRoot":"","sources":["../../../src/services/obsidian/jsonlogic-worker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,wFAAwF;AACxF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,kGAAkG;IAClG,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,kGAAkG;IAClG,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACpF;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,SAAS,GAAG,gBAAgB,GAAG,aAAa,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzF,KAAK,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,CAAC"}

package/dist/services/obsidian/jsonlogic-worker.js

@@ -0,0 +1,237 @@
+/**
+ * @fileoverview Worker-thread entry that evaluates a caller's JSONLogic tree
+ * against note contexts, for searches scoped by OBSIDIAN_READ_PATHS. Runs the
+ * operator set the Local REST API plugin runs (json-logic-js 2.0.5 plus its
+ * `glob` and `regexp`), with the plugin's hit test and JSON-shaped results, so
+ * a scoped search answers as the plugin would over the same notes.
+ *
+ * Off the main thread so a slow tree cannot hold the event loop: the evaluator
+ * terminates this worker at its deadline, which also stops a native regex
+ * mid-backtrack. Memory is bounded here by work budgets, since Bun ignores
+ * `resourceLimits`: one per note for what its evaluation builds and drops,
+ * and one across the search for what kept results hold past a
+ * 1,024-character allowance each.
+ *
+ * Imports only packages and builtins, never sibling modules: under Node the
+ * test suite loads this file from source, where `./x.js` specifiers do not
+ * resolve to `.ts`.
+ *
+ * @module services/obsidian/jsonlogic-worker
+ */
+import { parentPort } from 'node:worker_threads';
+import globToRegExp from 'glob-to-regexp';
+import jsonLogic from 'json-logic-js';
+/** Thrown when a work budget runs out; never caught by json-logic-js, which has no try. */
+class BudgetExhausted extends Error {
+    failure;
+    constructor(failure) {
+        super(failure);
+        this.failure = failure;
+    }
+}
+/** Units the current note's evaluation may still build; reset for every note. */
+let noteUnitsLeft = 0;
+/** Units kept results may still hold, across the whole search. */
+let keptUnitsLeft = 0;
+/**
+ * Spend `units` of the current note's budget, which bounds the memory one
+ * note's evaluation allocates; the deadline bounds time. The budget is the
+ * note's own {@link weight} plus `noteUnits`, so a tree can always build a
+ * copy of what the note holds, and it resets for the next note: what one
+ * note's evaluation builds is dropped when it ends, unless it is kept, which
+ * {@link chargeKept} bounds across the search. Only what a tree builds is
+ * charged, at its {@link weight}: `merge` and `cat` before they build, a `map`
+ * result, and the elements operators placed in an array literal
+ * ({@link literalWeight}). Every other step allocates no more than its
+ * operands already hold — comparisons, `var`, `in`, `missing`, `some` / `all`
+ * / `none`, arithmetic, `substr`, `glob`, and `regexp` return a primitive, a
+ * reference, or a string conversion of a value that was charged, is the
+ * note's, or is written in the tree; `filter` returns part of its input, and
+ * `if`, `and`, `or`, and `reduce` return a value another step produced — so
+ * evaluation steps cost nothing. Charging what is built bounds what a tree
+ * can allocate, including by multiplying references to one large string, and
+ * so bounds every later string conversion of what it built.
+ */
+function charge(units) {
+    noteUnitsLeft -= units;
+    if (noteUnitsLeft < 0)
+        throw new BudgetExhausted('over_note_budget');
+}
+/** Spend `units` of the search's budget for kept results, which outlive their note's evaluation. */
+function chargeKept(units) {
+    keptUnitsLeft -= units;
+    if (keptUnitsLeft < 0)
+        throw new BudgetExhausted('over_kept_budget');
+}
+/** Length of a plain object's string conversion, `[object Object]`. */
+const OBJECT_STRING_CHARS = 15;
+/**
+ * Size of a value in work units, counted until it passes `limit`: one per
+ * node plus the length of the node's own string conversion — a string's
+ * length, `String(value).length` for a number, boolean, `null`, or
+ * `undefined`, and {@link OBJECT_STRING_CHARS} plus its keys' lengths for an
+ * object. An array converts to its elements joined by commas, which the
+ * per-node unit covers, so no value converts to a string longer than its
+ * weight. Iterative, because a `reduce` can nest values deeper than the call
+ * stack.
+ */
+function weight(value, limit) {
+    let total = 0;
+    const pending = [value];
+    while (pending.length > 0 && total <= limit) {
+        const next = pending.pop();
+        total += 1;
+        if (typeof next === 'string')
+            total += next.length;
+        // Pushed one by one: spreading a long array overruns the argument limit.
+        else if (Array.isArray(next))
+            for (const item of next)
+                pending.push(item);
+        else if (next !== null && typeof next === 'object') {
+            total += OBJECT_STRING_CHARS;
+            for (const [key, field] of Object.entries(next)) {
+                total += key.length;
+                pending.push(field);
+            }
+        }
+        else
+            total += String(next).length;
+    }
+    return total;
+}
+/**
+ * Size of the array an array literal just built, in work units. An element
+ * written in the tree — a primitive, or an array literal charged at its own
+ * application — adds nothing: its slot and a literal string's length are
+ * bounded by the request, and the string is shared rather than copied. An
+ * element an operator produced pays its full {@link weight}.
+ */
+function literalWeight(logic, built) {
+    let total = 0;
+    for (let i = 0; i < logic.length && total <= noteUnitsLeft; i++) {
+        const element = logic[i];
+        if (element !== null && typeof element === 'object' && !Array.isArray(element)) {
+            total += weight(built[i], noteUnitsLeft - total);
+        }
+    }
+    return total;
+}
+const baseApply = jsonLogic.apply;
+/**
+ * json-logic-js recurses through `jsonLogic.apply`, so this wrapper sees every
+ * application. A `map` result is charged its size: mapping over a long array
+ * to a constant multiplies references to it without building anything the
+ * other charges see.
+ */
+jsonLogic.apply = (logic, data) => {
+    const result = baseApply(logic, data);
+    if (Array.isArray(logic))
+        charge(literalWeight(logic, result));
+    else if (isMap(logic))
+        charge(weight(result, noteUnitsLeft));
+    return result;
+};
+/** A `map` application, by json-logic-js's own test: an object with one key. */
+function isMap(logic) {
+    return (logic !== null &&
+        typeof logic === 'object' &&
+        Object.hasOwn(logic, 'map') &&
+        Object.keys(logic).length === 1);
+}
+/** The plugin's two operators, as Local REST API 5.x registers them: pattern first, `false` for a non-string operand. */
+jsonLogic.add_operation('glob', (pattern, field) => typeof field === 'string' && typeof pattern === 'string'
+    ? globToRegExp(pattern).test(field)
+    : false);
+jsonLogic.add_operation('regexp', (pattern, field) => typeof field === 'string' && typeof pattern === 'string'
+    ? new RegExp(pattern).test(field)
+    : false);
+/** json-logic-js's `log` writes to stdout, which is the JSON-RPC stream under stdio. Same value, no write. */
+jsonLogic.add_operation('log', (value) => value);
+/**
+ * json-logic-js's `var`, reading own properties only: inherited properties are
+ * out of reach, and own properties still cover every note field, array index,
+ * and `length`.
+ */
+jsonLogic.add_operation('var', function (key, fallback) {
+    const notFound = fallback === undefined ? null : fallback;
+    if (key === undefined || key === '' || key === null)
+        return this;
+    let data = this;
+    for (const segment of String(key).split('.')) {
+        if (data === null || data === undefined || !Object.hasOwn(Object(data), segment)) {
+            return notFound;
+        }
+        data = data[segment];
+        if (data === undefined)
+            return notFound;
+    }
+    return data;
+});
+/** Stock `merge` and `cat`, charged before they build, so an oversized value is never allocated. */
+jsonLogic.add_operation('merge', (...args) => {
+    for (const arg of args)
+        charge(weight(arg, noteUnitsLeft));
+    return args.reduce((all, next) => all.concat(next), []);
+});
+jsonLogic.add_operation('cat', (...args) => {
+    for (const arg of args)
+        charge(weight(arg, noteUnitsLeft));
+    return args.join('');
+});
+/** The plugin's hit test: `null`/`undefined`, `[]`, and `{}` drop a note. */
+function isTruthy(value) {
+    if (value === undefined || value === null)
+        return false;
+    if (Array.isArray(value))
+        return value.length > 0;
+    if (typeof value === 'object')
+        return Object.keys(value).length > 0;
+    return Boolean(value);
+}
+/**
+ * Serialized characters a kept result may hold with no charge, whatever its
+ * note's size, so ordinary results skip the comparison below.
+ */
+const FREE_RESULT_CHARS = 1_024;
+/**
+ * Evaluate `request.logic` against each note in order, as the plugin's search
+ * loop does, each note with a fresh budget for what it builds. A kept result
+ * is held until the search answers. One whose JSON is at most
+ * {@link FREE_RESULT_CHARS} is free; a larger one pays the search's budget for
+ * whatever it holds beyond its own note's serialized size: a result drawn
+ * from the note stays free, while one repeating the tree's large constants on
+ * every note is bounded across the search.
+ */
+function evaluate(request) {
+    keptUnitsLeft = request.keptUnits;
+    const hits = [];
+    for (const note of request.notes) {
+        noteUnitsLeft = request.noteUnits + weight(note, Number.POSITIVE_INFINITY);
+        try {
+            const result = jsonLogic.apply(request.logic, note);
+            if (!isTruthy(result))
+                continue;
+            const json = JSON.stringify(result);
+            if (json.length > FREE_RESULT_CHARS) {
+                chargeKept(Math.max(0, json.length - JSON.stringify(note).length));
+            }
+            hits.push({ filename: note.path, json });
+        }
+        catch (err) {
+            if (err instanceof BudgetExhausted) {
+                return { ok: false, failure: err.failure, detail: 'work budget exhausted' };
+            }
+            const detail = err instanceof Error ? err.message : String(err);
+            return {
+                ok: false,
+                failure: /invalid regular expression/i.test(detail) ? 'invalid_regexp' : 'invalid',
+                detail,
+            };
+        }
+    }
+    return { ok: true, hits, keptUnitsLeft };
+}
+parentPort?.once('message', (request) => {
+    parentPort?.postMessage(evaluate(request));
+});
+//# sourceMappingURL=jsonlogic-worker.js.map

package/dist/services/obsidian/jsonlogic-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonlogic-worker.js","sourceRoot":"","sources":["../../../src/services/obsidian/jsonlogic-worker.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, PatchInstruction, StructuredSearchHit, TextSearchHit, VaultStatus } from './types.js';
+import type { DocumentMap, FileListing, NoteJson, NoteTarget, ObsidianCommand, ObsidianTag, OmnisearchHit, PatchInstruction, PathTarget, StructuredSearchHit, TextSearchHit, VaultStatus } from './types.js';
 type UndiciResponse = Awaited<ReturnType<typeof undiciFetch>>;
 /**
  * The HTTP fetch contract this service depends on. Defaults to undici's
@@ -35,7 +35,7 @@ export declare class ObsidianService {
      *   `fetch`, which honors the constructed TLS dispatcher in production.
      */
     constructor(config: ServerConfig, fetchImpl?: ObsidianFetch);
-    /** Path-policy accessor — used by `obsidian_search_notes` to filter hits. */
+    /** Path-policy accessor for tools that filter results or check scope themselves. */
     get policy(): PathPolicy;
     /** Resolved Omnisearch URL (derived from baseUrl or OBSIDIAN_OMNISEARCH_URL override). */
     get omnisearchUrl(): string;
@@ -64,11 +64,27 @@ export declare class ObsidianService {
     getNoteContent(ctx: Context, target: NoteTarget): Promise<string>;
     getNoteJson(ctx: Context, target: NoteTarget): Promise<NoteJson>;
     /**
-     * Resolve `target` to a vault-relative path. For path targets this is a
-     * no-op; for `active` and `periodic` targets we have to ask upstream which
-     * concrete file is currently in play.
+     * Pin `target` to the note it names right now. A path target comes back as
+     * sent; an `active` or `periodic` target is resolved upstream (read-gated)
+     * and comes back as a path target for that note, so every later call acts on
+     * the same file however the target moves in between.
+     */
+    resolveTarget(ctx: Context, target: NoteTarget): Promise<PathTarget>;
+    /**
+     * `target` as a path target for `path`, the note a read of `target` returned.
+     * A path target already names its note and comes back as sent. A pinned
+     * `active` / `periodic` target carries the target's label as `resolvedFrom`,
+     * the identifier `no_active_file` and `periodic_not_found` use, so a
+     * `path_forbidden` denial on it names the target rather than the note.
+     */
+    pinTarget(target: NoteTarget, path: string): PathTarget;
+    /**
+     * The note's headings, block ids, and frontmatter field names. An `active` /
+     * `periodic` target is resolved once (read-gated, a denial named by the
+     * target's label) and the map read from the resolved `/vault/` path, which
+     * the plugin's `/active/` and `/periodic/…` routes delegate to anyway, so the
+     * map describes the note the resolution returned even if the target moves.
      */
-    resolvePath(ctx: Context, target: NoteTarget): Promise<string>;
     getDocumentMap(ctx: Context, target: NoteTarget): Promise<DocumentMap>;
     writeNote(ctx: Context, target: NoteTarget, content: string, contentType?: 'markdown' | 'json'): Promise<void>;
     appendToNote(ctx: Context, target: NoteTarget, content: string, contentType?: 'markdown' | 'json'): Promise<void>;
@@ -109,8 +125,8 @@ export declare class ObsidianService {
     /**
      * Vault tags with usage counts, hierarchical parents included. Unscoped, the
      * plugin's `/tags/` with its occurrence counts. That payload carries no
-     * per-note attribution, so under OBSIDIAN_READ_PATHS the tags are collected
-     * per note with one JsonLogic search instead, kept to readable notes, and
+     * per-note attribution, so under OBSIDIAN_READ_PATHS the tags are read from
+     * the readable notes' contexts instead (one upstream search, no bodies), and
      * each one counts the readable notes carrying it or a tag nested under it.
      */
     listTags(ctx: Context): Promise<ObsidianTag[]>;
@@ -127,7 +143,39 @@ export declare class ObsidianService {
      * failure.
      */
     searchText(ctx: Context, query: string, contextLength?: number): Promise<TextSearchHit[]>;
+    /**
+     * JSONLogic search. Unscoped, the tree goes to the plugin unchanged. Under
+     * OBSIDIAN_READ_PATHS the plugin would evaluate it against every note in
+     * the vault, so the tree stays here instead: the readable notes' contexts
+     * are fetched and the tree is evaluated over those alone
+     * (`createJsonLogicEvaluation`), the way the plugin evaluates it. No hit,
+     * result, or error then reads a note outside the read scope; which note a
+     * link resolves to is still Obsidian's vault-wide resolution, so `links`,
+     * `backlinks`, and `unresolvedLinks` can change when a note outside the
+     * scope is created or removed.
+     *
+     * The plugin hands a tree note bodies only when its JSON holds the string
+     * `"content"` (`readsContent`); such a tree gets them here too, fetched
+     * and evaluated in batches of at most `CONTENT_BATCH_BYTES` so a broad
+     * scope never holds every readable body at once.
+     */
     searchJsonLogic(ctx: Context, logic: Record<string, unknown>): Promise<StructuredSearchHit[]>;
+    /**
+     * A JSONLogic search for a caller paging through its hits `pageSize` at a
+     * time. Unscoped, it is `searchJsonLogic`. Under OBSIDIAN_READ_PATHS a call
+     * without `walk` evaluates fresh and, when the hits run past one page,
+     * stores the full ordered hit list under a new walk id, returned as `walk`;
+     * a call naming that id with the same tree is served from the stored list
+     * without evaluating. The store belongs to this service, whose read scope
+     * is fixed at construction, so a list is only read under the scope that
+     * produced it. Anything else — an expired, evicted, or unknown id, or a
+     * different tree — evaluates fresh, and a call cancelled before it answers
+     * stores nothing.
+     */
+    pageJsonLogic(ctx: Context, logic: Record<string, unknown>, walk: string | undefined, pageSize: number): Promise<{
+        hits: StructuredSearchHit[];
+        walk?: string;
+    }>;
     /**
      * One-shot startup probe for the Omnisearch plugin's HTTP endpoint. Returns
      * `true` only when the response is `HTTP 200`, declares `application/json`,

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

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