@travisennis/acai 0.0.9 → 0.0.11

package/dist/tools/glob.js

@@ -2,17 +2,89 @@ import * as fs from "node:fs";
 import * as nodePath from "node:path";
 import { z } from "zod";
 import style from "../terminal/style.js";
+import { toDisplayPath } from "../utils/filesystem/path-display.js";
 import { glob } from "../utils/glob.js";
 import { convertNullString } from "../utils/zod.js";
 const DEFAULT_MAX_RESULTS = 100;
+const MAX_STAT_FILES = 1000;
+async function getFileWithStats(filePath, effectivePath) {
+    const fullPath = nodePath.join(effectivePath, filePath);
+    try {
+        const stats = await fs.promises.stat(fullPath);
+        return {
+            path: filePath,
+            mtime: stats.mtime.getTime(),
+        };
+    }
+    catch {
+        return {
+            path: filePath,
+            mtime: 0,
+        };
+    }
+}
+function sortFilesByMtime(files) {
+    return files
+        .sort((a, b) => {
+        if (b.mtime !== a.mtime) {
+            return b.mtime - a.mtime;
+        }
+        return a.path.localeCompare(b.path);
+    })
+        .map((file) => file.path);
+}
+function formatResult(sortedFiles) {
+    return sortedFiles.length > 0
+        ? sortedFiles.join("\n")
+        : "No files found matching the specified patterns.";
+}
+function normalizePatternArray(patterns) {
+    return Array.isArray(patterns) ? patterns : [patterns];
+}
+function buildGlobOptions(effectivePath, gitignore, recursive, expandDirectories, ignoreFiles, cwd) {
+    return {
+        cwd: cwd || effectivePath,
+        ...(gitignore !== null && { gitignore }),
+        ...(recursive !== null && { recursive }),
+        ...(expandDirectories !== null && { expandDirectories }),
+        ...(ignoreFiles !== null && { ignoreFiles }),
+    };
+}
+function limitResults(sortedFiles, effectiveMaxResults) {
+    if (effectiveMaxResults > 0 && sortedFiles.length > effectiveMaxResults) {
+        return sortedFiles.slice(0, effectiveMaxResults);
+    }
+    return sortedFiles;
+}
 export const GlobTool = {
     name: "Glob",
 };
 export const inputSchema = z.object({
     patterns: z
-        .union([z.string(), z.array(z.string())])
+        .preprocess((val) => {
+        if (val === null || val === undefined) {
+            return "**/*";
+        }
+        if (typeof val === "string") {
+            const trimmed = val.trim();
+            if (trimmed.startsWith("[")) {
+                try {
+                    const parsed = JSON.parse(trimmed);
+                    if (Array.isArray(parsed)) {
+                        return parsed;
+                    }
+                }
+                catch {
+                    // Not valid JSON, treat as a plain glob string
+                }
+            }
+        }
+        return val;
+    }, z.union([z.string(), z.array(z.string())]))
         .describe("Glob patterns to search for (e.g., '*.ts', '**/*.test.ts', 'src/**/*.js')"),
-    path: z.string().describe("Base directory to search in"),
+    path: z
+        .preprocess((val) => (val === null || val === undefined ? process.cwd() : val), z.string())
+        .describe("Base directory to search in"),
     gitignore: z
         .preprocess((val) => convertNullString(val), z.coerce.boolean().nullable())
         .describe("Respect ignore patterns in .gitignore files. (default: true)"),
@@ -23,9 +95,28 @@ export const inputSchema = z.object({
         .preprocess((val) => convertNullString(val), z.coerce.boolean().nullable())
         .describe("Automatically expand directories to files. (default: true)"),
     ignoreFiles: z
-        .union([z.string(), z.array(z.string())])
-        .nullable()
-        .describe("Glob patterns to look for ignore files. (default: undefined)"),
+        .preprocess((val) => {
+        const converted = convertNullString(val);
+        if (converted === null) {
+            return null;
+        }
+        if (typeof converted === "string") {
+            const trimmed = converted.trim();
+            if (trimmed.startsWith("[")) {
+                try {
+                    const parsed = JSON.parse(trimmed);
+                    if (Array.isArray(parsed)) {
+                        return parsed;
+                    }
+                }
+                catch {
+                    // Not valid JSON, treat as a plain string
+                }
+            }
+        }
+        return converted;
+    }, z.union([z.string(), z.array(z.string())]).nullable())
+        .describe("Glob patterns to look for ignore files (e.g., '.gitignore'). Pass null to use default behavior."),
     cwd: z
         .preprocess((val) => convertNullString(val), z.coerce.string().nullable())
         .describe("Current working directory override. (default: process.cwd())"),
@@ -36,7 +127,7 @@ export const inputSchema = z.object({
 export const createGlobTool = () => {
     return {
         toolDef: {
-            description: `Search for files using glob patterns (e.g., *.ts, **/*.test.ts, src/**/*.js). Uses the fast-glob library with support for .gitignore, recursive searching, directory expansion, and automatic result limiting to prevent overwhelming output. Default limit is ${DEFAULT_MAX_RESULTS} files. Use maxResults parameter to override this limit.`,
+            description: "Find files by name pattern (e.g., *.ts).",
             inputSchema,
         },
         display({ patterns, path }) {
@@ -44,69 +135,25 @@ export const createGlobTool = () => {
             const patternStr = patternArray.length === 1
                 ? patternArray[0]
                 : JSON.stringify(patternArray);
-            return `\n> ${style.cyan(patternStr)} in ${style.cyan(path)}`;
+            const displayPath = toDisplayPath(path);
+            return `${style.cyan(patternStr)} in ${style.cyan(displayPath)}`;
         },
         async execute({ patterns, path, gitignore, recursive, expandDirectories, ignoreFiles, cwd, maxResults, }, { abortSignal }) {
             if (abortSignal?.aborted) {
                 throw new Error("Glob search aborted");
             }
-            const patternArray = Array.isArray(patterns) ? patterns : [patterns];
-            const globOptions = {
-                cwd: cwd || process.cwd(),
-            };
-            if (gitignore !== null) {
-                globOptions["gitignore"] = gitignore;
-            }
-            if (recursive !== null) {
-                globOptions["recursive"] = recursive;
-            }
-            if (expandDirectories !== null) {
-                globOptions["expandDirectories"] = expandDirectories;
-            }
-            if (ignoreFiles !== null) {
-                globOptions["ignoreFiles"] = ignoreFiles;
-            }
-            const matchingFiles = await glob(patternArray, {
-                ...globOptions,
-                cwd: path,
-            });
-            const filesWithStats = await Promise.all(matchingFiles.map(async (filePath) => {
-                const fullPath = nodePath.join(path, filePath);
-                try {
-                    const stats = await fs.promises.stat(fullPath);
-                    return {
-                        path: filePath,
-                        mtime: stats.mtime,
-                        isRecent: Date.now() - stats.mtime.getTime() < 7 * 24 * 60 * 60 * 1000,
-                    };
-                }
-                catch {
-                    return {
-                        path: filePath,
-                        mtime: new Date(0),
-                        isRecent: false,
-                    };
-                }
-            }));
-            const sortedFiles = filesWithStats
-                .sort((a, b) => {
-                if (a.isRecent && !b.isRecent)
-                    return -1;
-                if (!a.isRecent && b.isRecent)
-                    return 1;
-                if (a.isRecent && b.isRecent) {
-                    return b.mtime.getTime() - a.mtime.getTime();
-                }
-                return a.path.localeCompare(b.path);
-            })
-                .map((file) => file.path);
+            const effectivePath = typeof path === "string" && path.trim() !== "" ? path : process.cwd();
+            const patternArray = normalizePatternArray(patterns);
             const effectiveMaxResults = maxResults ?? DEFAULT_MAX_RESULTS;
-            const limitedFiles = effectiveMaxResults && effectiveMaxResults > 0
-                ? sortedFiles.slice(0, effectiveMaxResults)
-                : sortedFiles;
-            return limitedFiles.length > 0
-                ? limitedFiles.join("\n")
-                : "No files found matching the specified patterns.";
+            const globOptions = buildGlobOptions(effectivePath, gitignore, recursive, expandDirectories, ignoreFiles, cwd);
+            const matchingFiles = await glob(patternArray, globOptions);
+            const filesToStat = matchingFiles.length > MAX_STAT_FILES
+                ? matchingFiles.slice(0, MAX_STAT_FILES)
+                : matchingFiles;
+            const filesWithStats = await Promise.all(filesToStat.map((filePath) => getFileWithStats(filePath, effectivePath)));
+            const sortedFiles = sortFilesByMtime(filesWithStats);
+            const result = limitResults(sortedFiles, effectiveMaxResults);
+            return formatResult(result);
         },
     };
 };

package/dist/tools/grep.d.ts

@@ -41,23 +41,31 @@ interface GrepOptions {
     searchIgnored?: boolean | null;
     literal?: boolean | null;
     maxResults?: number | null;
+    likelyUnbalanced?: boolean;
 }
 export declare function likelyUnbalancedRegex(pattern: string): boolean;
 /**
- * Search files for patterns using ripgrep
+ * Build grep command args array directly
  *
  * @param pattern - The regex pattern to search for
  * @param path - The path to search in
  * @param options - Additional options for the grep command
- * @returns The result of the grep command
+ * @returns The args array for the grep command
  */
-export declare function buildGrepCommand(pattern: string, path: string, options?: GrepOptions): string;
+export declare function buildGrepArgs(pattern: string, path: string, options?: GrepOptions): string[];
 export interface ParsedMatch {
     file?: string;
     line: number;
     content: string;
     isMatch: boolean;
     isContext?: boolean;
+    lineNumber?: number;
+    absolutePath?: string;
+    submatches?: Array<{
+        start: number;
+        end: number;
+        text: string;
+    }>;
 }
 interface GrepResult {
     rawOutput: string;
@@ -69,9 +77,9 @@ interface GrepResult {
     isTruncated?: boolean;
 }
 /**
- * Parse ripgrep output and extract structured match information
+ * Parse ripgrep JSON output and extract structured match information
  */
-export declare function parseRipgrepOutput(content: string): ParsedMatch[];
+export declare function parseRipgrepJsonOutput(content: string): ParsedMatch[];
 /**
  * Count actual matches (excluding context lines)
  */
@@ -81,17 +89,12 @@ export declare function countActualMatches(parsed: ParsedMatch[]): number;
  */
 export declare function countContextLines(parsed: ParsedMatch[]): number;
 /**
- * Truncate matches to a maximum number of results
+ * Truncate matches to a maximum number of results, preserving context lines for kept matches
  */
 export declare function truncateMatches(matches: ParsedMatch[], maxResults: number | null | undefined): {
     truncated: ParsedMatch[];
     isTruncated: boolean;
 };
-/**
- * Extract matches from content (backwards compatibility wrapper)
- */
-export declare function extractMatches(content: string): string[];
-export declare function grepFiles(pattern: string, path: string, options?: GrepOptions): string;
-export declare function grepFilesStructured(pattern: string, path: string, options?: GrepOptions): GrepResult;
+export declare function grepFilesStructured(pattern: string, path: string, options?: GrepOptions, abortSignal?: AbortSignal | null): Promise<GrepResult>;
 export {};
 //# sourceMappingURL=grep.d.ts.map

package/dist/tools/grep.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../source/tools/grep.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAKvD,eAAO,MAAM,QAAQ;;CAEpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;iBAoCf,CAAC;AAEH,KAAK,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEnD,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;kFAapB,eAAe;sHAmCb,eAAe,mBACD,oBAAoB,GACpC,OAAO,CAAC,MAAM,CAAC;CA6DrB,CAAC;AAEF,UAAU,WAAW;IACnB,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAQD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAiI9D;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,WAAgB,GACxB,MAAM,CA+DR;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,UAAU;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,EAAE,CA4EjE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAEhE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAE/D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACpC;IAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CA6BpD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAWxD;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,WAAgB,GACxB,MAAM,CAGR;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,WAAgB,GACxB,UAAU,CAwDZ"}
+{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../source/tools/grep.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAKvD,eAAO,MAAM,QAAQ;;CAEpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;iBAoCf,CAAC;AAEH,KAAK,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEnD,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;kFAapB,eAAe;sHAoCb,eAAe,mBACD,oBAAoB,GACpC,OAAO,CAAC,MAAM,CAAC;CAkErB,CAAC;AAEF,UAAU,WAAW;IACnB,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAuMD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CA8B9D;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,WAAgB,GACxB,MAAM,EAAE,CAgEV;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;CACJ;AAED,UAAU,UAAU;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,EAAE,CAqDrE;AA8BD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAEhE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAE/D;AAyBD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACpC;IAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAoDpD;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,WAAgB,EACzB,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,GAC/B,OAAO,CAAC,UAAU,CAAC,CAgGrB"}