@myspec/mcp-server 0.1.2-next.30 → 0.1.2-next.31

package/dist/index.js

@@ -2896,9 +2896,11 @@ var readFileInput = z7.object({
   includeIgnored: z7.boolean().optional()
 });
 var grepInput = z7.object({
-  pattern: z7.string(),
-  path: z7.string().optional(),
-  isRegex: z7.boolean().optional(),
+  pattern: z7.string().describe(
+    "Search pattern. Interpreted as a regular expression by default (ripgrep syntax), e.g. `foo|bar` or `[Rr]ole`. Set `isRegex: false` to match the pattern as an exact literal string instead."
+  ),
+  path: z7.string().optional().describe("File or directory under --root to search. Defaults to the whole root."),
+  isRegex: z7.boolean().optional().describe("Treat `pattern` as a regex (default true). Set false for literal-string search."),
   caseSensitive: z7.boolean().optional(),
   maxMatches: z7.number().int().positive().optional(),
   contextLines: z7.number().int().nonnegative().optional(),
@@ -3081,6 +3083,12 @@ function paginateLines(lines, offsetArg, limitArg) {
     ...truncated ? { nextOffset: endIdx + 1 } : {}
   };
 }
+var InvalidRegexError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "InvalidRegexError";
+  }
+};
 async function handleGrep(args, opts) {
   const subpath = args.path ?? ".";
   let realPath;
@@ -3089,9 +3097,15 @@ async function handleGrep(args, opts) {
   } catch (err) {
     return mapPathError(err);
   }
+  if (!args.includeIgnored) {
+    const check = isIgnored(subpath);
+    if (check.ignored) {
+      return structuredError("path_ignored", `Path matches ignore rule ${check.rule ?? ""}`);
+    }
+  }
   const maxMatches = args.maxMatches ?? GREP_MAX_MATCHES_DEFAULT;
   const contextLines = args.contextLines ?? 0;
-  const isRegex = args.isRegex ?? false;
+  const isRegex = args.isRegex ?? true;
   const caseSensitive = args.caseSensitive ?? false;
   const ripgrep = await tryRipgrep(realPath, opts.realRoot, args.pattern, {
     isRegex,
@@ -3106,14 +3120,21 @@ async function handleGrep(args, opts) {
   if (ripgrep.fatal) {
     return structuredError("grep_failed", ripgrep.error);
   }
-  return structuredOk(
-    await nodeGrep(realPath, opts.realRoot, args.pattern, {
-      isRegex,
-      caseSensitive,
-      maxMatches,
-      includeIgnored: args.includeIgnored ?? false
-    })
-  );
+  try {
+    return structuredOk(
+      await nodeGrep(realPath, opts.realRoot, args.pattern, {
+        isRegex,
+        caseSensitive,
+        maxMatches,
+        includeIgnored: args.includeIgnored ?? false
+      })
+    );
+  } catch (err) {
+    if (err instanceof InvalidRegexError) {
+      return structuredError("grep_failed", err.message);
+    }
+    throw err;
+  }
 }
 async function tryRipgrep(searchRoot, realRoot, pattern, opts) {
   return new Promise((resolveP) => {
@@ -3202,9 +3223,38 @@ function parseRipgrepLine(rawLine, realRoot) {
 }
 var NODE_GREP_FILE_SIZE_CAP = 10 * 1024 * 1024;
 async function nodeGrep(searchRoot, realRoot, pattern, opts) {
-  const regex = opts.isRegex ? new RegExp(pattern, opts.caseSensitive ? "" : "i") : new RegExp(escapeRegExp(pattern), opts.caseSensitive ? "" : "i");
+  let regex;
+  try {
+    regex = opts.isRegex ? new RegExp(pattern, opts.caseSensitive ? "" : "i") : new RegExp(escapeRegExp(pattern), opts.caseSensitive ? "" : "i");
+  } catch (err) {
+    throw new InvalidRegexError(errorMessage(err));
+  }
   const matches = [];
   let truncated = false;
+  async function grepOneFile(full) {
+    try {
+      const st = await fs4.stat(full);
+      if (st.size > NODE_GREP_FILE_SIZE_CAP) return;
+      const content = await fs4.readFile(full, "utf-8");
+      const lines = content.split("\n");
+      for (let i = 0; i < lines.length; i += 1) {
+        if (matches.length >= opts.maxMatches) {
+          truncated = true;
+          return;
+        }
+        const line = lines[i];
+        if (line === void 0) continue;
+        if (regex.test(line)) {
+          matches.push({
+            file: relative(realRoot, full) || full,
+            line: i + 1,
+            text: line
+          });
+        }
+      }
+    } catch {
+    }
+  }
   async function walk(dir, prefix) {
     if (matches.length >= opts.maxMatches) {
       truncated = true;
@@ -3229,31 +3279,23 @@ async function nodeGrep(searchRoot, realRoot, pattern, opts) {
         continue;
       }
       if (!item.isFile()) continue;
-      try {
-        const st = await fs4.stat(full);
-        if (st.size > NODE_GREP_FILE_SIZE_CAP) continue;
-        const content = await fs4.readFile(full, "utf-8");
-        const lines = content.split("\n");
-        for (let i = 0; i < lines.length; i += 1) {
-          if (matches.length >= opts.maxMatches) {
-            truncated = true;
-            return;
-          }
-          const line = lines[i];
-          if (line === void 0) continue;
-          if (regex.test(line)) {
-            matches.push({
-              file: relative(realRoot, full) || full,
-              line: i + 1,
-              text: line
-            });
-          }
-        }
-      } catch {
-      }
+      await grepOneFile(full);
+    }
+  }
+  let rootIsDir;
+  try {
+    rootIsDir = (await fs4.stat(searchRoot)).isDirectory();
+  } catch {
+    return { matches, truncated };
+  }
+  if (rootIsDir) {
+    await walk(searchRoot, relative(realRoot, searchRoot));
+  } else {
+    const rel = relative(realRoot, searchRoot);
+    if (opts.includeIgnored || !isIgnored(rel).ignored) {
+      await grepOneFile(searchRoot);
     }
   }
-  await walk(searchRoot, relative(realRoot, searchRoot));
   return { matches, truncated };
 }
 function escapeRegExp(s) {
@@ -3306,7 +3348,7 @@ function registerLocalFsTools(server, opts) {
     },
     {
       name: "local_fs_grep",
-      description: "Search for a pattern under the granted --root (ripgrep with Node fallback).",
+      description: "Search for a regex pattern under the granted --root (ripgrep with Node fallback). Like the standard Grep tool, `pattern` is a regular expression by default; pass `isRegex: false` for a literal-string search. Regex syntax follows ripgrep (Rust regex) when installed, falling back to JavaScript RegExp otherwise, so avoid engine-specific constructs (lookbehind, backreferences).",
       inputSchema: jsonSchemaFromZod(grepInput),
       handler: (args) => handleGrep(args, opts)
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myspec/mcp-server",
-  "version": "0.1.2-next.30",
+  "version": "0.1.2-next.31",
   "description": "MySpec MCP server — exposes MySpec platform projects, files and attachments to MCP-aware clients via OAuth-authenticated access tokens.",
   "type": "module",
   "repository": {