bashkit 0.2.3 → 0.2.4

package/dist/index.js

@@ -991,6 +991,7 @@ function createGlobTool(sandbox, config) {
 // src/tools/grep.ts
 import { tool as tool7, zodSchema as zodSchema7 } from "ai";
 import { z as z7 } from "zod";
+import { rgPath } from "@vscode/ripgrep";
 var grepInputSchema = z7.object({
   pattern: z7.string().describe("The regular expression pattern to search for in file contents"),
   path: z7.string().optional().describe("File or directory to search in (defaults to cwd)"),
@@ -1004,13 +1005,13 @@ var grepInputSchema = z7.object({
   "-C": z7.number().optional().describe("Number of lines to show before and after each match. Requires output_mode: 'content'."),
   head_limit: z7.number().optional().describe("Limit output to first N lines/entries. Works across all output modes. Defaults to 0 (unlimited)."),
   offset: z7.number().optional().describe("Skip first N lines/entries before applying head_limit. Works across all output modes. Defaults to 0."),
-  multiline: z7.boolean().optional().describe("Enable multiline mode where patterns can span lines (requires ripgrep). Default: false.")
+  multiline: z7.boolean().optional().describe("Enable multiline mode where patterns can span lines. Default: false.")
 });
-var GREP_DESCRIPTION = `A powerful content search tool with regex support. Use this instead of running grep commands directly.
+var GREP_DESCRIPTION = `A powerful content search tool built on ripgrep with regex support.
 
 **Usage:**
 - ALWAYS use Grep for search tasks. NEVER invoke \`grep\` or \`rg\` as a Bash command.
-- Supports regex syntax (e.g., "log.*Error", "function\\s+\\w+")
+- Supports full regex syntax (e.g., "log.*Error", "function\\s+\\w+")
 - Filter files with glob parameter (e.g., "*.js", "**/*.tsx") or type parameter (e.g., "js", "py", "rust")
 
 **Output modes:**
@@ -1025,11 +1026,8 @@ var GREP_DESCRIPTION = `A powerful content search tool with regex support. Use t
 
 **Pagination:**
 - Use offset to skip results (useful for pagination)
-- Use head_limit to limit total results returned
-
-**Note:** Set useRipgrep: true in config for better performance and multiline support (requires ripgrep installed).`;
+- Use head_limit to limit total results returned`;
 function createGrepTool(sandbox, config) {
-  const useRipgrep = config?.useRipgrep ?? false;
   return tool7({
     description: GREP_DESCRIPTION,
     inputSchema: zodSchema7(grepInputSchema),
@@ -1044,7 +1042,6 @@ function createGrepTool(sandbox, config) {
         type,
         output_mode = "files_with_matches",
         "-i": caseInsensitive,
-        "-n": showLineNumbers = true,
         "-B": beforeContext,
         "-A": afterContext,
         "-C": context,
@@ -1059,98 +1056,26 @@ function createGrepTool(sandbox, config) {
           return { error: `Path not allowed: ${searchPath}` };
         }
       }
-      if (multiline && !useRipgrep) {
-        return {
-          error: "Multiline mode requires ripgrep. Set useRipgrep: true in config."
-        };
-      }
       try {
-        let paginationSuffix = "";
-        if (offset > 0) {
-          paginationSuffix += ` | tail -n +${offset + 1}`;
-        }
-        if (head_limit && head_limit > 0) {
-          paginationSuffix += ` | head -${head_limit}`;
-        }
-        let cmd;
-        if (useRipgrep) {
-          cmd = buildRipgrepCommand({
-            pattern,
-            searchPath,
-            output_mode,
-            caseInsensitive,
-            showLineNumbers,
-            beforeContext,
-            afterContext,
-            context,
-            glob,
-            type,
-            multiline,
-            paginationSuffix
-          });
-        } else {
-          cmd = buildGrepCommand({
-            pattern,
-            searchPath,
-            output_mode,
-            caseInsensitive,
-            showLineNumbers,
-            beforeContext,
-            afterContext,
-            context,
-            glob,
-            type,
-            paginationSuffix
-          });
-        }
+        const cmd = buildRipgrepCommand({
+          pattern,
+          searchPath,
+          output_mode,
+          caseInsensitive,
+          beforeContext,
+          afterContext,
+          context,
+          glob,
+          type,
+          multiline
+        });
         const result = await sandbox.exec(cmd, { timeout: config?.timeout });
         if (output_mode === "files_with_matches") {
-          const files = result.stdout.split(`
-`).filter(Boolean);
-          return {
-            files,
-            count: files.length
-          };
+          return parseFilesOutput(result.stdout);
         } else if (output_mode === "count") {
-          const lines = result.stdout.split(`
-`).filter(Boolean);
-          const counts = lines.map((line) => {
-            const lastColon = line.lastIndexOf(":");
-            return {
-              file: line.slice(0, lastColon),
-              count: parseInt(line.slice(lastColon + 1), 10)
-            };
-          });
-          const total = counts.reduce((sum, c) => sum + c.count, 0);
-          return {
-            counts,
-            total
-          };
+          return parseCountOutput(result.stdout);
         } else {
-          if (!result.stdout.trim()) {
-            return {
-              matches: [],
-              total_matches: 0
-            };
-          }
-          const lines = result.stdout.split(`
-`).filter(Boolean);
-          const matches = [];
-          for (const line of lines) {
-            const colonMatch = line.match(/^(.+?):(\d+)[:|-](.*)$/);
-            if (colonMatch) {
-              const [, file, lineNum, content] = colonMatch;
-              matches.push({
-                file,
-                line_number: parseInt(lineNum, 10),
-                line: content
-              });
-            }
-          }
-          return {
-            matches,
-            total_matches: matches.length
-          };
+          return parseContentOutput(result.stdout, head_limit, offset);
         }
       } catch (error) {
         return {
@@ -1161,14 +1086,12 @@ function createGrepTool(sandbox, config) {
   });
 }
 function buildRipgrepCommand(opts) {
-  const flags = [];
+  const flags = ["--json"];
   if (opts.caseInsensitive)
     flags.push("-i");
   if (opts.multiline)
     flags.push("-U", "--multiline-dotall");
   if (opts.output_mode === "content") {
-    if (opts.showLineNumbers)
-      flags.push("-n");
     if (opts.context) {
       flags.push(`-C ${opts.context}`);
     } else {
@@ -1183,42 +1106,137 @@ function buildRipgrepCommand(opts) {
   if (opts.type)
     flags.push(`-t ${opts.type}`);
   const flagStr = flags.join(" ");
-  if (opts.output_mode === "files_with_matches") {
-    return `rg -l ${flagStr} "${opts.pattern}" ${opts.searchPath} 2>/dev/null${opts.paginationSuffix}`;
-  } else if (opts.output_mode === "count") {
-    return `rg -c ${flagStr} "${opts.pattern}" ${opts.searchPath} 2>/dev/null${opts.paginationSuffix}`;
-  } else {
-    return `rg ${flagStr} "${opts.pattern}" ${opts.searchPath} 2>/dev/null${opts.paginationSuffix}`;
+  return `${rgPath} ${flagStr} "${opts.pattern}" ${opts.searchPath} 2>/dev/null`;
+}
+function parseFilesOutput(stdout) {
+  const files = new Set;
+  for (const line of stdout.split(`
+`).filter(Boolean)) {
+    try {
+      const msg = JSON.parse(line);
+      if (msg.type === "begin") {
+        const data = msg.data;
+        files.add(data.path.text);
+      }
+    } catch {}
   }
+  return {
+    files: Array.from(files),
+    count: files.size
+  };
 }
-function buildGrepCommand(opts) {
-  const flags = ["-r"];
-  if (opts.caseInsensitive)
-    flags.push("-i");
-  if (opts.output_mode === "content") {
-    if (opts.showLineNumbers)
-      flags.push("-n");
-    if (opts.context) {
-      flags.push(`-C ${opts.context}`);
-    } else {
-      if (opts.beforeContext)
-        flags.push(`-B ${opts.beforeContext}`);
-      if (opts.afterContext)
-        flags.push(`-A ${opts.afterContext}`);
+function parseCountOutput(stdout) {
+  const counts = new Map;
+  for (const line of stdout.split(`
+`).filter(Boolean)) {
+    try {
+      const msg = JSON.parse(line);
+      if (msg.type === "end") {
+        const data = msg.data;
+        counts.set(data.path.text, data.stats.matches);
+      }
+    } catch {}
+  }
+  const countsArray = Array.from(counts.entries()).map(([file, count]) => ({
+    file,
+    count
+  }));
+  const total = countsArray.reduce((sum, c) => sum + c.count, 0);
+  return {
+    counts: countsArray,
+    total
+  };
+}
+function parseContentOutput(stdout, head_limit, offset = 0) {
+  const fileData = new Map;
+  for (const line of stdout.split(`
+`).filter(Boolean)) {
+    try {
+      const msg = JSON.parse(line);
+      if (msg.type === "begin") {
+        const data = msg.data;
+        fileData.set(data.path.text, { matches: [], contexts: [] });
+      } else if (msg.type === "context") {
+        const data = msg.data;
+        const fd = fileData.get(data.path.text);
+        if (fd) {
+          fd.contexts.push({
+            line_number: data.line_number,
+            text: data.lines.text.replace(/\n$/, "")
+          });
+        }
+      } else if (msg.type === "match") {
+        const data = msg.data;
+        const fd = fileData.get(data.path.text);
+        if (fd) {
+          fd.matches.push({
+            line_number: data.line_number,
+            text: data.lines.text.replace(/\n$/, "")
+          });
+        }
+      }
+    } catch {}
+  }
+  const allMatches = [];
+  for (const [file, { matches, contexts }] of fileData) {
+    matches.sort((a, b) => a.line_number - b.line_number);
+    contexts.sort((a, b) => a.line_number - b.line_number);
+    const matchContexts = new Map;
+    for (const match of matches) {
+      matchContexts.set(match.line_number, { before: [], after: [] });
+    }
+    for (const ctx of contexts) {
+      let bestMatch = null;
+      let bestDistance = Infinity;
+      let isBefore = false;
+      for (const match of matches) {
+        const distance = Math.abs(ctx.line_number - match.line_number);
+        if (distance < bestDistance) {
+          bestDistance = distance;
+          bestMatch = match;
+          isBefore = ctx.line_number < match.line_number;
+        }
+      }
+      if (bestMatch) {
+        const mc = matchContexts.get(bestMatch.line_number);
+        if (mc) {
+          if (isBefore) {
+            mc.before.push(ctx.text);
+          } else {
+            mc.after.push(ctx.text);
+          }
+        }
+      }
+    }
+    for (const match of matches) {
+      const mc = matchContexts.get(match.line_number);
+      allMatches.push({
+        file,
+        line_number: match.line_number,
+        line: match.text,
+        before_context: mc?.before ?? [],
+        after_context: mc?.after ?? []
+      });
     }
   }
-  if (opts.glob)
-    flags.push(`--include="${opts.glob}"`);
-  if (opts.type)
-    flags.push(`--include="*.${opts.type}"`);
-  const flagStr = flags.join(" ");
-  if (opts.output_mode === "files_with_matches") {
-    return `grep -l ${flagStr} "${opts.pattern}" ${opts.searchPath} 2>/dev/null${opts.paginationSuffix}`;
-  } else if (opts.output_mode === "count") {
-    return `grep -c ${flagStr} "${opts.pattern}" ${opts.searchPath} 2>/dev/null | grep -v ':0$'${opts.paginationSuffix}`;
-  } else {
-    return `grep ${flagStr} "${opts.pattern}" ${opts.searchPath} 2>/dev/null${opts.paginationSuffix}`;
+  const grepMatches = allMatches.map((m) => ({
+    file: m.file,
+    line_number: m.line_number,
+    line: m.line,
+    before_context: m.before_context.length > 0 ? m.before_context : undefined,
+    after_context: m.after_context.length > 0 ? m.after_context : undefined
+  }));
+  let result = grepMatches;
+  if (offset > 0) {
+    result = result.slice(offset);
+  }
+  if (head_limit && head_limit > 0) {
+    result = result.slice(0, head_limit);
   }
+  return {
+    matches: result,
+    total_matches: result.length
+  };
 }
 
 // src/tools/read.ts

package/dist/types.d.ts

@@ -21,10 +21,7 @@ export type ToolConfig = {
     allowedPaths?: string[];
     blockedCommands?: string[];
 } & SDKToolOptions;
-export type GrepToolConfig = ToolConfig & {
-    /** Use ripgrep (rg) instead of grep. Requires ripgrep to be installed. Default: false */
-    useRipgrep?: boolean;
-};
+export type GrepToolConfig = ToolConfig;
 /**
  * Supported web search providers.
  * Currently only 'parallel' is implemented.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bashkit",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Agentic coding tools for the Vercel AI SDK",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,7 +22,7 @@
   "scripts": {
     "dev": "bun run src/index.ts",
     "build": "bun run build:js && bun run build:cli && bun run build:types",
-    "build:js": "bun build src/index.ts --outdir dist --target node --format esm --external ai --external zod --external @ai-sdk/* --external @vercel/sandbox --external @e2b/code-interpreter --external parallel-web",
+    "build:js": "bun build src/index.ts --outdir dist --target node --format esm --external ai --external zod --external @ai-sdk/* --external @vercel/sandbox --external @e2b/code-interpreter --external parallel-web --external @vscode/ripgrep",
     "build:cli": "bun build src/cli/init.ts --outdir dist/cli --target node --format esm --external @clack/prompts && chmod +x dist/cli/init.js",
     "build:types": "tsc -p tsconfig.build.json",
     "typecheck": "tsc --noEmit",
@@ -51,7 +51,8 @@
     "url": "https://github.com/jbreite/bashkit"
   },
   "dependencies": {
-    "@clack/prompts": "^0.7.0"
+    "@clack/prompts": "^0.7.0",
+    "@vscode/ripgrep": "^1.17.0"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^3.0.1",