obsidian-mcp-server 3.1.10 → 3.2.0

package/dist/mcp-server/tools/definitions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAiBH,gFAAgF;AAChF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAM/B,CAAC;AAEF,kFAAkF;AAClF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAQhC,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAoD,CAAC;AAErF,mHAAmH;AACnH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;+CAAiD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAgBH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAK/B,CAAC;AAEF,kFAAkF;AAClF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAQhC,CAAC;AAEF,mHAAmH;AACnH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAiD,CAAC"}

package/dist/mcp-server/tools/definitions/index.js

@@ -4,7 +4,9 @@
  * when `OBSIDIAN_READ_ONLY=true`. The command-palette pair is exported
  * separately so the entry point wraps it with `disabledTool()` when either
  * `OBSIDIAN_ENABLE_COMMANDS=false` or `OBSIDIAN_READ_ONLY=true` — keeping this
- * module free of eager config reads.
+ * module free of eager config reads. `obsidian_search_notes` is exposed as a
+ * factory (`buildSearchNotesTool`) because its mode enum is conditional on
+ * Omnisearch reachability, which is only known after the startup probe runs.
  * @module mcp-server/tools/definitions/index
  */
 import { obsidianAppendToNote } from './obsidian-append-to-note.tool.js';
@@ -19,14 +21,18 @@ import { obsidianManageTags } from './obsidian-manage-tags.tool.js';
 import { obsidianOpenInUi } from './obsidian-open-in-ui.tool.js';
 import { obsidianPatchNote } from './obsidian-patch-note.tool.js';
 import { obsidianReplaceInNote } from './obsidian-replace-in-note.tool.js';
-import { obsidianSearchNotes } from './obsidian-search-notes.tool.js';
 import { obsidianWriteNote } from './obsidian-write-note.tool.js';
-/** Read-only tools — always registered, even with `OBSIDIAN_READ_ONLY=true`. */
+export { buildSearchNotesTool } from './obsidian-search-notes.tool.js';
+/**
+ * Read-only tools that don't depend on runtime probes — always registered,
+ * even with `OBSIDIAN_READ_ONLY=true`. `obsidian_search_notes` is constructed
+ * separately in the entry point via `buildSearchNotesTool` so its mode enum
+ * can reflect Omnisearch reachability.
+ */
 export const readToolDefinitions = [
     obsidianGetNote,
     obsidianListNotes,
     obsidianListTags,
-    obsidianSearchNotes,
     obsidianOpenInUi,
 ];
 /** Write tools — wrapped with `disabledTool()` when `OBSIDIAN_READ_ONLY=true`. */
@@ -39,8 +45,6 @@ export const writeToolDefinitions = [
     obsidianManageTags,
     obsidianDeleteNote,
 ];
-/** Combined base set — preserves the previous registration order. */
-export const baseToolDefinitions = [...readToolDefinitions, ...writeToolDefinitions];
 /** Command-palette tools — opt-in via `OBSIDIAN_ENABLE_COMMANDS=true`; suppressed by `OBSIDIAN_READ_ONLY=true`. */
 export const commandToolDefinitions = [obsidianListCommands, obsidianExecuteCommand];
 //# sourceMappingURL=index.js.map

package/dist/mcp-server/tools/definitions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,gFAAgF;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,eAAe;IACf,iBAAiB;IACjB,gBAAgB;IAChB,mBAAmB;IACnB,gBAAgB;CACjB,CAAC;AAEF,kFAAkF;AAClF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,iBAAiB;IACjB,oBAAoB;IACpB,iBAAiB;IACjB,qBAAqB;IACrB,yBAAyB;IACzB,kBAAkB;IAClB,kBAAkB;CACnB,CAAC;AAEF,qEAAqE;AACrE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAG,mBAAmB,EAAE,GAAG,oBAAoB,CAAC,CAAC;AAErF,mHAAmH;AACnH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,eAAe;IACf,iBAAiB;IACjB,gBAAgB;IAChB,gBAAgB;CACjB,CAAC;AAEF,kFAAkF;AAClF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,iBAAiB;IACjB,oBAAoB;IACpB,iBAAiB;IACjB,qBAAqB;IACrB,yBAAyB;IACzB,kBAAkB;IAClB,kBAAkB;CACnB,CAAC;AAEF,mHAAmH;AACnH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,CAAC"}

package/dist/mcp-server/tools/definitions/obsidian-list-commands.tool.d.ts

@@ -1,13 +1,32 @@
 /**
  * @fileoverview obsidian_list_commands — list Obsidian command-palette commands.
  * Gated behind `OBSIDIAN_ENABLE_COMMANDS=true` alongside `obsidian_execute_command`.
+ * Optional `nameRegex` post-filters the upstream payload before returning, since
+ * vaults with Templater/Dataview/QuickAdd/Excalidraw routinely register 300+
+ * commands and the LLM-bound listing is otherwise mostly noise.
  * @module mcp-server/tools/definitions/obsidian-list-commands.tool
  */
 import { z } from '@cyanheads/mcp-ts-core';
-export declare const obsidianListCommands: import("@cyanheads/mcp-ts-core").ToolDefinition<z.ZodObject<{}, z.core.$strip>, z.ZodObject<{
+import { JsonRpcErrorCode } from '@cyanheads/mcp-ts-core/errors';
+export declare const obsidianListCommands: import("@cyanheads/mcp-ts-core").ToolDefinition<z.ZodObject<{
+    nameRegex: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
     commands: z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         name: z.ZodString;
     }, z.core.$strip>>;
-}, z.core.$strip>, undefined>;
+    appliedFilters: z.ZodOptional<z.ZodObject<{
+        nameRegex: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+}, z.core.$strip>, readonly [{
+    readonly reason: "regex_invalid";
+    readonly code: JsonRpcErrorCode.ValidationError;
+    readonly when: "The supplied `nameRegex` is not a valid ECMAScript regex.";
+    readonly recovery: "Use a valid ECMAScript regex (e.g. `^Templater`), or omit nameRegex to disable filtering.";
+}, {
+    readonly reason: "regex_unsafe";
+    readonly code: JsonRpcErrorCode.ValidationError;
+    readonly when: "The supplied `nameRegex` is well-formed but exceeds the 256-character limit or contains nested quantifiers known to cause catastrophic backtracking.";
+    readonly recovery: "Avoid nested quantifiers like `(a+)+` or `(.*)*`. Use a simpler pattern (e.g. `^Templater`), or omit nameRegex to disable filtering.";
+}]>;
 //# sourceMappingURL=obsidian-list-commands.tool.d.ts.map

package/dist/mcp-server/tools/definitions/obsidian-list-commands.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"obsidian-list-commands.tool.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-list-commands.tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAQ,CAAC,EAAE,MAAM,wBAAwB,CAAC;AAGjD,eAAO,MAAM,oBAAoB;;;;;6BAiC/B,CAAC"}
+{"version":3,"file":"obsidian-list-commands.tool.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-list-commands.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAQ,CAAC,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;GA2F/B,CAAC"}

package/dist/mcp-server/tools/definitions/obsidian-list-commands.tool.js

@@ -1,14 +1,24 @@
 /**
  * @fileoverview obsidian_list_commands — list Obsidian command-palette commands.
  * Gated behind `OBSIDIAN_ENABLE_COMMANDS=true` alongside `obsidian_execute_command`.
+ * Optional `nameRegex` post-filters the upstream payload before returning, since
+ * vaults with Templater/Dataview/QuickAdd/Excalidraw routinely register 300+
+ * commands and the LLM-bound listing is otherwise mostly noise.
  * @module mcp-server/tools/definitions/obsidian-list-commands.tool
  */
 import { tool, z } from '@cyanheads/mcp-ts-core';
+import { JsonRpcErrorCode } from '@cyanheads/mcp-ts-core/errors';
 import { getObsidianService } from '../../../services/obsidian/obsidian-service.js';
+import { nameRegexSafetyIssue } from './_shared/regex-safety.js';
 export const obsidianListCommands = tool('obsidian_list_commands', {
-    description: 'List the Obsidian command-palette commands available in the active vault, with their IDs and display names.',
+    description: 'List the Obsidian command-palette commands available in the active vault, with their IDs and display names. Filter to a subset with the optional `nameRegex` matched against the display name.',
     annotations: { readOnlyHint: true, idempotentHint: true },
-    input: z.object({}),
+    input: z.object({
+        nameRegex: z
+            .string()
+            .optional()
+            .describe('Optional ECMAScript regex (no flags, ≤256 chars, no nested quantifiers like `(a+)+`) matched against the command display name (the field agents search by, not the slug-shaped `id`). Use character classes (`[Tt]emplater`) for case-insensitivity.'),
+    }),
     output: z.object({
         commands: z
             .array(z
@@ -18,18 +28,61 @@ export const obsidianListCommands = tool('obsidian_list_commands', {
         })
             .describe('An Obsidian command-palette entry.'))
             .describe('All commands registered in the active Obsidian instance.'),
+        appliedFilters: z
+            .object({
+            nameRegex: z.string().optional().describe('nameRegex filter applied to this listing.'),
+        })
+            .optional()
+            .describe('Active filters that produced this listing. Absent when no filter was applied.'),
     }),
     auth: ['tool:obsidian_list_commands:read'],
-    async handler(_input, ctx) {
+    errors: [
+        {
+            reason: 'regex_invalid',
+            code: JsonRpcErrorCode.ValidationError,
+            when: 'The supplied `nameRegex` is not a valid ECMAScript regex.',
+            recovery: 'Use a valid ECMAScript regex (e.g. `^Templater`), or omit nameRegex to disable filtering.',
+        },
+        {
+            reason: 'regex_unsafe',
+            code: JsonRpcErrorCode.ValidationError,
+            when: 'The supplied `nameRegex` is well-formed but exceeds the 256-character limit or contains nested quantifiers known to cause catastrophic backtracking.',
+            recovery: 'Avoid nested quantifiers like `(a+)+` or `(.*)*`. Use a simpler pattern (e.g. `^Templater`), or omit nameRegex to disable filtering.',
+        },
+    ],
+    async handler(input, ctx) {
+        let regex;
+        if (input.nameRegex) {
+            const safetyIssue = nameRegexSafetyIssue(input.nameRegex);
+            if (safetyIssue) {
+                throw ctx.fail('regex_unsafe', `Unsafe nameRegex: ${safetyIssue}`, {
+                    nameRegex: input.nameRegex,
+                    ...ctx.recoveryFor('regex_unsafe'),
+                });
+            }
+            try {
+                regex = new RegExp(input.nameRegex);
+            }
+            catch (err) {
+                throw ctx.fail('regex_invalid', `Invalid nameRegex: ${err.message}`, { nameRegex: input.nameRegex, ...ctx.recoveryFor('regex_invalid') }, { cause: err });
+            }
+        }
         const svc = getObsidianService();
         const commands = await svc.listCommands(ctx);
-        return { commands };
+        const filtered = regex ? commands.filter((c) => regex.test(c.name)) : commands;
+        return {
+            commands: filtered,
+            ...(input.nameRegex ? { appliedFilters: { nameRegex: input.nameRegex } } : {}),
+        };
     },
     format: (result) => {
+        const activeRegex = result.appliedFilters?.nameRegex;
         if (result.commands.length === 0) {
-            return [{ type: 'text', text: '_No commands available._' }];
+            const filterNote = activeRegex ? ` matching \`${activeRegex}\`` : '';
+            return [{ type: 'text', text: `_No commands available${filterNote}._` }];
         }
-        const lines = [`**${result.commands.length} commands**`, ''];
+        const filterSuffix = activeRegex ? ` · nameRegex=\`${activeRegex}\`` : '';
+        const lines = [`**${result.commands.length} commands**${filterSuffix}`, ''];
         for (const c of result.commands)
             lines.push(`- \`${c.id}\` — ${c.name}`);
         return [{ type: 'text', text: lines.join('\n') }];

package/dist/mcp-server/tools/definitions/obsidian-list-commands.tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"obsidian-list-commands.tool.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-list-commands.tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAE7E,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC,wBAAwB,EAAE;IACjE,WAAW,EACT,6GAA6G;IAC/G,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE;IACzD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IACnB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,QAAQ,EAAE,CAAC;aACR,KAAK,CACJ,CAAC;aACE,MAAM,CAAC;YACN,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mDAAmD,CAAC;YAC5E,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,8BAA8B,CAAC;SAC1D,CAAC;aACD,QAAQ,CAAC,oCAAoC,CAAC,CAClD;aACA,QAAQ,CAAC,0DAA0D,CAAC;KACxE,CAAC;IACF,IAAI,EAAE,CAAC,kCAAkC,CAAC;IAE1C,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG;QACvB,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC7C,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC;IAED,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;QACjB,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,MAAM,aAAa,EAAE,EAAE,CAAC,CAAC;QAC7D,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ;YAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACzE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"obsidian-list-commands.tool.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-list-commands.tool.ts"],"names":[],"mappings":"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"}

package/dist/mcp-server/tools/definitions/obsidian-list-tags.tool.d.ts

@@ -1,13 +1,31 @@
 /**
  * @fileoverview obsidian_list_tags — all tags found in the vault, with usage counts.
- * Mirrors the plugin's `/tags/` endpoint; counts are upstream-provided.
+ * Mirrors the plugin's `/tags/` endpoint; counts are upstream-provided. Optional
+ * `nameRegex` post-filters the upstream payload before returning to keep the
+ * LLM-bound response small on vaults with long-tail tag noise.
  * @module mcp-server/tools/definitions/obsidian-list-tags.tool
  */
 import { z } from '@cyanheads/mcp-ts-core';
-export declare const obsidianListTags: import("@cyanheads/mcp-ts-core").ToolDefinition<z.ZodObject<{}, z.core.$strip>, z.ZodObject<{
+import { JsonRpcErrorCode } from '@cyanheads/mcp-ts-core/errors';
+export declare const obsidianListTags: import("@cyanheads/mcp-ts-core").ToolDefinition<z.ZodObject<{
+    nameRegex: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
     tags: z.ZodArray<z.ZodObject<{
         name: z.ZodString;
         count: z.ZodNumber;
     }, z.core.$strip>>;
-}, z.core.$strip>, undefined>;
+    appliedFilters: z.ZodOptional<z.ZodObject<{
+        nameRegex: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+}, z.core.$strip>, readonly [{
+    readonly reason: "regex_invalid";
+    readonly code: JsonRpcErrorCode.ValidationError;
+    readonly when: "The supplied `nameRegex` is not a valid ECMAScript regex.";
+    readonly recovery: "Use a valid ECMAScript regex (e.g. `^mcp/.*`), or omit nameRegex to disable filtering.";
+}, {
+    readonly reason: "regex_unsafe";
+    readonly code: JsonRpcErrorCode.ValidationError;
+    readonly when: "The supplied `nameRegex` is well-formed but exceeds the 256-character limit or contains nested quantifiers known to cause catastrophic backtracking.";
+    readonly recovery: "Avoid nested quantifiers like `(a+)+` or `(.*)*`. Use a simpler pattern (e.g. `^mcp/.*`), or omit nameRegex to disable filtering.";
+}]>;
 //# sourceMappingURL=obsidian-list-tags.tool.d.ts.map

package/dist/mcp-server/tools/definitions/obsidian-list-tags.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"obsidian-list-tags.tool.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-list-tags.tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAQ,CAAC,EAAE,MAAM,wBAAwB,CAAC;AAGjD,eAAO,MAAM,gBAAgB;;;;;6BAiC3B,CAAC"}
+{"version":3,"file":"obsidian-list-tags.tool.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-list-tags.tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAQ,CAAC,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;GA2F3B,CAAC"}

package/dist/mcp-server/tools/definitions/obsidian-list-tags.tool.js

@@ -1,14 +1,23 @@
 /**
  * @fileoverview obsidian_list_tags — all tags found in the vault, with usage counts.
- * Mirrors the plugin's `/tags/` endpoint; counts are upstream-provided.
+ * Mirrors the plugin's `/tags/` endpoint; counts are upstream-provided. Optional
+ * `nameRegex` post-filters the upstream payload before returning to keep the
+ * LLM-bound response small on vaults with long-tail tag noise.
  * @module mcp-server/tools/definitions/obsidian-list-tags.tool
  */
 import { tool, z } from '@cyanheads/mcp-ts-core';
+import { JsonRpcErrorCode } from '@cyanheads/mcp-ts-core/errors';
 import { getObsidianService } from '../../../services/obsidian/obsidian-service.js';
+import { nameRegexSafetyIssue } from './_shared/regex-safety.js';
 export const obsidianListTags = tool('obsidian_list_tags', {
-    description: 'List every tag found across the vault, with usage counts. Includes hierarchical parents — `work/tasks` contributes to both `work` and `work/tasks`. To find notes by tag, use `obsidian_search_notes` in dataview mode (e.g. `TABLE FROM #work`).',
+    description: 'List every tag found across the vault, with usage counts. Includes hierarchical parents — `work/tasks` contributes to both `work` and `work/tasks`. Filter to a subset with the optional `nameRegex`. To find notes by tag, use `obsidian_search_notes` in jsonlogic mode (e.g. `{"in": ["work", {"var": "tags"}]}`).',
     annotations: { readOnlyHint: true, idempotentHint: true },
-    input: z.object({}),
+    input: z.object({
+        nameRegex: z
+            .string()
+            .optional()
+            .describe('Optional ECMAScript regex (no flags, ≤256 chars, no nested quantifiers like `(a+)+`) matched against the bare tag name (no leading `#`). Hierarchical tags like `work/tasks` are matched as the full string. Use character classes (`[Mm]cp`) for case-insensitivity.'),
+    }),
     output: z.object({
         tags: z
             .array(z
@@ -18,18 +27,61 @@ export const obsidianListTags = tool('obsidian_list_tags', {
         })
             .describe('A tag with its usage count.'))
             .describe('All tags in the vault, in upstream-provided order.'),
+        appliedFilters: z
+            .object({
+            nameRegex: z.string().optional().describe('nameRegex filter applied to this listing.'),
+        })
+            .optional()
+            .describe('Active filters that produced this listing. Absent when no filter was applied.'),
     }),
     auth: ['tool:obsidian_list_tags:read'],
-    async handler(_input, ctx) {
+    errors: [
+        {
+            reason: 'regex_invalid',
+            code: JsonRpcErrorCode.ValidationError,
+            when: 'The supplied `nameRegex` is not a valid ECMAScript regex.',
+            recovery: 'Use a valid ECMAScript regex (e.g. `^mcp/.*`), or omit nameRegex to disable filtering.',
+        },
+        {
+            reason: 'regex_unsafe',
+            code: JsonRpcErrorCode.ValidationError,
+            when: 'The supplied `nameRegex` is well-formed but exceeds the 256-character limit or contains nested quantifiers known to cause catastrophic backtracking.',
+            recovery: 'Avoid nested quantifiers like `(a+)+` or `(.*)*`. Use a simpler pattern (e.g. `^mcp/.*`), or omit nameRegex to disable filtering.',
+        },
+    ],
+    async handler(input, ctx) {
+        let regex;
+        if (input.nameRegex) {
+            const safetyIssue = nameRegexSafetyIssue(input.nameRegex);
+            if (safetyIssue) {
+                throw ctx.fail('regex_unsafe', `Unsafe nameRegex: ${safetyIssue}`, {
+                    nameRegex: input.nameRegex,
+                    ...ctx.recoveryFor('regex_unsafe'),
+                });
+            }
+            try {
+                regex = new RegExp(input.nameRegex);
+            }
+            catch (err) {
+                throw ctx.fail('regex_invalid', `Invalid nameRegex: ${err.message}`, { nameRegex: input.nameRegex, ...ctx.recoveryFor('regex_invalid') }, { cause: err });
+            }
+        }
         const svc = getObsidianService();
         const tags = await svc.listTags(ctx);
-        return { tags: tags.map((t) => ({ name: t.name, count: t.count })) };
+        const filtered = regex ? tags.filter((t) => regex.test(t.name)) : tags;
+        return {
+            tags: filtered.map((t) => ({ name: t.name, count: t.count })),
+            ...(input.nameRegex ? { appliedFilters: { nameRegex: input.nameRegex } } : {}),
+        };
     },
     format: (result) => {
+        const activeRegex = result.appliedFilters?.nameRegex;
         if (result.tags.length === 0) {
-            return [{ type: 'text', text: '_No tags found in the vault._' }];
+            const filterNote = activeRegex ? ` matching \`${activeRegex}\`` : '';
+            return [{ type: 'text', text: `_No tags found${filterNote}._` }];
         }
-        const lines = [`**${result.tags.length} tags**`, ''];
+        const filterSuffix = activeRegex ? ` · nameRegex=\`${activeRegex}\`` : '';
+        const lines = [`**${result.tags.length} tags**${filterSuffix}`, ''];
         for (const t of result.tags)
             lines.push(`- \`#${t.name}\` (${t.count})`);
         return [{ type: 'text', text: lines.join('\n') }];

package/dist/mcp-server/tools/definitions/obsidian-list-tags.tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"obsidian-list-tags.tool.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-list-tags.tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAE7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,EAAE;IACzD,WAAW,EACT,mPAAmP;IACrP,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE;IACzD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IACnB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC;aACJ,KAAK,CACJ,CAAC;aACE,MAAM,CAAC;YACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;YAC9D,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,+BAA+B,CAAC;SAC5D,CAAC;aACD,QAAQ,CAAC,6BAA6B,CAAC,CAC3C;aACA,QAAQ,CAAC,oDAAoD,CAAC;KAClE,CAAC;IACF,IAAI,EAAE,CAAC,8BAA8B,CAAC;IAEtC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG;QACvB,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;QACjB,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,+BAA+B,EAAE,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,SAAS,EAAE,EAAE,CAAC,CAAC;QACrD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACzE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"obsidian-list-tags.tool.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-list-tags.tool.ts"],"names":[],"mappings":"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"}

package/dist/mcp-server/tools/definitions/obsidian-search-notes.tool.d.ts

@@ -1,24 +1,34 @@
 /**
- * @fileoverview obsidian_search_notes — text/dataview/jsonlogic search.
- * Caps results at 100 hits and surfaces an `excluded` indicator when more
- * were returned upstream. Text-mode hits are additionally capped per file
- * via `maxMatchesPerHit` so a single match-heavy note can't blow the
- * response budget — clipped hits carry `truncated: true` and `totalMatches`.
+ * @fileoverview obsidian_search_notes — text/jsonlogic/omnisearch search with
+ * MCP-spec cursor pagination. The `omnisearch` mode is added conditionally by
+ * the entry point only when the Omnisearch plugin's HTTP server is reachable
+ * at startup. Text-mode hits additionally clip per file via `maxMatchesPerHit`
+ * so a single match-heavy note can't blow the response budget — clipped hits
+ * carry `truncated: true` and `totalMatches`.
  * @module mcp-server/tools/definitions/obsidian-search-notes.tool
  */
 import { z } from '@cyanheads/mcp-ts-core';
 import { JsonRpcErrorCode } from '@cyanheads/mcp-ts-core/errors';
-export declare const obsidianSearchNotes: import("@cyanheads/mcp-ts-core").ToolDefinition<z.ZodObject<{
+/**
+ * Build the `obsidian_search_notes` tool. The `omnisearch` mode is included
+ * in the input/output schemas only when `omnisearchReachable` is true so the
+ * LLM never sees it as an option on a deployment where it can't run. Re-probe
+ * requires a server restart.
+ */
+export declare function buildSearchNotesTool({ omnisearchReachable }: {
+    omnisearchReachable: boolean;
+}): import("@cyanheads/mcp-ts-core").ToolDefinition<z.ZodObject<{
     mode: z.ZodEnum<{
         text: "text";
-        dataview: "dataview";
         jsonlogic: "jsonlogic";
+        omnisearch: "omnisearch";
     }>;
     query: z.ZodOptional<z.ZodString>;
     logic: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
     contextLength: z.ZodDefault<z.ZodNumber>;
     pathPrefix: z.ZodOptional<z.ZodString>;
     maxMatchesPerHit: z.ZodDefault<z.ZodNumber>;
+    cursor: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>, z.ZodObject<{
     result: z.ZodDiscriminatedUnion<[z.ZodObject<{
         mode: z.ZodLiteral<"text">;
@@ -35,30 +45,170 @@ export declare const obsidianSearchNotes: import("@cyanheads/mcp-ts-core").ToolD
             totalMatches: z.ZodOptional<z.ZodNumber>;
             truncated: z.ZodOptional<z.ZodBoolean>;
         }, z.core.$strip>>;
-        excluded: z.ZodOptional<z.ZodObject<{
-            count: z.ZodNumber;
-            hint: z.ZodString;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>, z.ZodObject<{
+        mode: z.ZodLiteral<"jsonlogic">;
+        hits: z.ZodArray<z.ZodObject<{
+            filename: z.ZodString;
+            result: z.ZodUnknown;
         }, z.core.$strip>>;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
-        mode: z.ZodLiteral<"dataview">;
+        mode: z.ZodLiteral<"omnisearch">;
+        hits: z.ZodArray<z.ZodObject<{
+            filename: z.ZodString;
+            basename: z.ZodString;
+            score: z.ZodNumber;
+            foundWords: z.ZodArray<z.ZodString>;
+            matches: z.ZodArray<z.ZodObject<{
+                match: z.ZodString;
+                offset: z.ZodNumber;
+            }, z.core.$strip>>;
+            excerpt: z.ZodString;
+        }, z.core.$strip>>;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
+        truncated: z.ZodBoolean;
+    }, z.core.$strip>] | [z.ZodObject<{
+        mode: z.ZodLiteral<"text">;
+        hits: z.ZodArray<z.ZodObject<{
+            filename: z.ZodString;
+            score: z.ZodOptional<z.ZodNumber>;
+            matches: z.ZodArray<z.ZodObject<{
+                context: z.ZodString;
+                match: z.ZodObject<{
+                    start: z.ZodNumber;
+                    end: z.ZodNumber;
+                }, z.core.$strip>;
+            }, z.core.$strip>>;
+            totalMatches: z.ZodOptional<z.ZodNumber>;
+            truncated: z.ZodOptional<z.ZodBoolean>;
+        }, z.core.$strip>>;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>, z.ZodObject<{
+        mode: z.ZodLiteral<"jsonlogic">;
         hits: z.ZodArray<z.ZodObject<{
             filename: z.ZodString;
             result: z.ZodUnknown;
         }, z.core.$strip>>;
-        excluded: z.ZodOptional<z.ZodObject<{
-            count: z.ZodNumber;
-            hint: z.ZodString;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>], "mode">;
+}, z.core.$strip>, readonly [{
+    readonly reason: "path_prefix_invalid_mode";
+    readonly code: JsonRpcErrorCode.ValidationError;
+    readonly when: "`pathPrefix` was provided in a non-text mode (only `text` supports prefix filtering).";
+    readonly recovery: "Drop pathPrefix or switch mode to text for prefix filtering.";
+}, {
+    readonly reason: "query_required";
+    readonly code: JsonRpcErrorCode.ValidationError;
+    readonly when: "`query` is missing for `text` or `omnisearch` mode (required for both).";
+    readonly recovery: "Pass `query` — substring for text mode, or BM25 query syntax (quoted phrases, `-exclusion`, `path:` / `ext:` filters) for omnisearch.";
+}, {
+    readonly reason: "logic_required";
+    readonly code: JsonRpcErrorCode.ValidationError;
+    readonly when: "`logic` is missing for `jsonlogic` mode.";
+    readonly recovery: "Pass a JSONLogic tree as `logic`, e.g. `{\"glob\": [{\"var\": \"path\"}, \"Projects/*.md\"]}`.";
+}, {
+    readonly reason: "omnisearch_unreachable";
+    readonly code: JsonRpcErrorCode.ServiceUnavailable;
+    readonly when: "Omnisearch was reachable at startup but is now unreachable (Obsidian quit, plugin disabled, or mobile session).";
+    readonly retryable: true;
+    readonly recovery: "Restart Obsidian with the Omnisearch plugin enabled, then restart this MCP server so it re-probes the plugin URL.";
+}]>;
+/**
+ * Static specimen for the MCP definition linter (which duck-types tool
+ * exports out of each `.tool.ts` file) and for existing tests that import
+ * the tool directly. Defaults to `omnisearchReachable: false` — the safe
+ * baseline that doesn't assume the optional plugin is installed. The entry
+ * point (`src/index.ts`) builds the live tool via `buildSearchNotesTool`
+ * with the actual probe result; this export is not the registered tool.
+ * The omnisearch-enabled variant is exercised by tests rather than the
+ * linter (two exports under the same tool name would collide on
+ * `name-unique`).
+ */
+export declare const obsidianSearchNotes: import("@cyanheads/mcp-ts-core").ToolDefinition<z.ZodObject<{
+    mode: z.ZodEnum<{
+        text: "text";
+        jsonlogic: "jsonlogic";
+        omnisearch: "omnisearch";
+    }>;
+    query: z.ZodOptional<z.ZodString>;
+    logic: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    contextLength: z.ZodDefault<z.ZodNumber>;
+    pathPrefix: z.ZodOptional<z.ZodString>;
+    maxMatchesPerHit: z.ZodDefault<z.ZodNumber>;
+    cursor: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
+    result: z.ZodDiscriminatedUnion<[z.ZodObject<{
+        mode: z.ZodLiteral<"text">;
+        hits: z.ZodArray<z.ZodObject<{
+            filename: z.ZodString;
+            score: z.ZodOptional<z.ZodNumber>;
+            matches: z.ZodArray<z.ZodObject<{
+                context: z.ZodString;
+                match: z.ZodObject<{
+                    start: z.ZodNumber;
+                    end: z.ZodNumber;
+                }, z.core.$strip>;
+            }, z.core.$strip>>;
+            totalMatches: z.ZodOptional<z.ZodNumber>;
+            truncated: z.ZodOptional<z.ZodBoolean>;
         }, z.core.$strip>>;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>, z.ZodObject<{
         mode: z.ZodLiteral<"jsonlogic">;
         hits: z.ZodArray<z.ZodObject<{
             filename: z.ZodString;
             result: z.ZodUnknown;
         }, z.core.$strip>>;
-        excluded: z.ZodOptional<z.ZodObject<{
-            count: z.ZodNumber;
-            hint: z.ZodString;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>, z.ZodObject<{
+        mode: z.ZodLiteral<"omnisearch">;
+        hits: z.ZodArray<z.ZodObject<{
+            filename: z.ZodString;
+            basename: z.ZodString;
+            score: z.ZodNumber;
+            foundWords: z.ZodArray<z.ZodString>;
+            matches: z.ZodArray<z.ZodObject<{
+                match: z.ZodString;
+                offset: z.ZodNumber;
+            }, z.core.$strip>>;
+            excerpt: z.ZodString;
+        }, z.core.$strip>>;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
+        truncated: z.ZodBoolean;
+    }, z.core.$strip>] | [z.ZodObject<{
+        mode: z.ZodLiteral<"text">;
+        hits: z.ZodArray<z.ZodObject<{
+            filename: z.ZodString;
+            score: z.ZodOptional<z.ZodNumber>;
+            matches: z.ZodArray<z.ZodObject<{
+                context: z.ZodString;
+                match: z.ZodObject<{
+                    start: z.ZodNumber;
+                    end: z.ZodNumber;
+                }, z.core.$strip>;
+            }, z.core.$strip>>;
+            totalMatches: z.ZodOptional<z.ZodNumber>;
+            truncated: z.ZodOptional<z.ZodBoolean>;
+        }, z.core.$strip>>;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>, z.ZodObject<{
+        mode: z.ZodLiteral<"jsonlogic">;
+        hits: z.ZodArray<z.ZodObject<{
+            filename: z.ZodString;
+            result: z.ZodUnknown;
         }, z.core.$strip>>;
+        totalCount: z.ZodNumber;
+        nextCursor: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>], "mode">;
 }, z.core.$strip>, readonly [{
     readonly reason: "path_prefix_invalid_mode";
@@ -68,12 +218,18 @@ export declare const obsidianSearchNotes: import("@cyanheads/mcp-ts-core").ToolD
 }, {
     readonly reason: "query_required";
     readonly code: JsonRpcErrorCode.ValidationError;
-    readonly when: "`query` is missing for `text` or `dataview` mode (required for both).";
-    readonly recovery: "Pass `query` — search terms for text mode (e.g. \"TODO\"), or DQL like \"TABLE WHERE file.mtime > date(today)\" for dataview mode.";
+    readonly when: "`query` is missing for `text` or `omnisearch` mode (required for both).";
+    readonly recovery: "Pass `query` — substring for text mode, or BM25 query syntax (quoted phrases, `-exclusion`, `path:` / `ext:` filters) for omnisearch.";
 }, {
     readonly reason: "logic_required";
     readonly code: JsonRpcErrorCode.ValidationError;
     readonly when: "`logic` is missing for `jsonlogic` mode.";
     readonly recovery: "Pass a JSONLogic tree as `logic`, e.g. `{\"glob\": [{\"var\": \"path\"}, \"Projects/*.md\"]}`.";
+}, {
+    readonly reason: "omnisearch_unreachable";
+    readonly code: JsonRpcErrorCode.ServiceUnavailable;
+    readonly when: "Omnisearch was reachable at startup but is now unreachable (Obsidian quit, plugin disabled, or mobile session).";
+    readonly retryable: true;
+    readonly recovery: "Restart Obsidian with the Omnisearch plugin enabled, then restart this MCP server so it re-probes the plugin URL.";
 }]>;
 //# sourceMappingURL=obsidian-search-notes.tool.d.ts.map

package/dist/mcp-server/tools/definitions/obsidian-search-notes.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"obsidian-search-notes.tool.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-search-notes.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAQ,CAAC,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAwDjE,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2L9B,CAAC"}
+{"version":3,"file":"obsidian-search-notes.tool.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/definitions/obsidian-search-notes.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAsB,CAAC,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAuFjE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,EAAE;IAAE,mBAAmB,EAAE,OAAO,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkR7F;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAuD,CAAC"}