Refactor grep tool output generation and fix ls directory traversal bug

🤖 Generated with opencode
Co-Authored-By: opencode <[email protected]>

2 files changed, 29 insertions, 30 deletions

diff --git a/js/src/tool/grep.ts b/js/src/tool/grep.ts
index b67a4790e..21f242244 100644
--- a/js/src/tool/grep.ts
+++ b/js/src/tool/grep.ts
@@ -81,7 +81,7 @@ function globToRegex(glob: string): string {
   regexPattern = regexPattern.replaceAll("?", ".");
 
   // Handle {a,b,c} patterns
-  regexPattern = regexPattern.replace(/\{([^}]+)\}/g, (match, inner) => {
+  regexPattern = regexPattern.replace(/\{([^}]+)\}/g, (_, inner) => {
     return "(" + inner.replace(/,/g, "|") + ")";
   });
 
@@ -301,36 +301,36 @@ export const grep = Tool.define({
       100,
     );
 
-    let output: string;
     if (matches.length === 0) {
-      output = "No files found";
-    } else {
-      const lines = [`Found ${matches.length} matches`];
-
-      let currentFile = "";
-      for (const match of matches) {
-        if (currentFile !== match.path) {
-          if (currentFile !== "") {
-            lines.push("");
-          }
-          currentFile = match.path;
-          lines.push(`${match.path}:`);
-        }
-        if (match.lineNum > 0) {
-          lines.push(`  Line ${match.lineNum}: ${match.lineText}`);
-        } else {
-          lines.push(`  ${match.path}`);
+      return {
+        metadata: { matches: 0, truncated },
+        output: "No files found"
+      };
+    }
+
+    const lines = [`Found ${matches.length} matches`];
+
+    let currentFile = "";
+    for (const match of matches) {
+      if (currentFile !== match.path) {
+        if (currentFile !== "") {
+          lines.push("");
         }
+        currentFile = match.path;
+        lines.push(`${match.path}:`);
       }
-
-      if (truncated) {
-        lines.push("");
-        lines.push(
-          "(Results are truncated. Consider using a more specific path or pattern.)",
-        );
+      if (match.lineNum > 0) {
+        lines.push(`  Line ${match.lineNum}: ${match.lineText}`);
+      } else {
+        lines.push(`  ${match.path}`);
       }
+    }
 
-      output = lines.join("\n");
+    if (truncated) {
+      lines.push("");
+      lines.push(
+        "(Results are truncated. Consider using a more specific path or pattern.)",
+      );
     }
 
     return {
@@ -338,7 +338,7 @@ export const grep = Tool.define({
         matches: matches.length,
         truncated,
       },
-      output,
+      output: lines.join("\n"),
     };
   },
 });
diff --git a/js/src/tool/ls.ts b/js/src/tool/ls.ts
index 286ac30a2..c481b4d8d 100644
--- a/js/src/tool/ls.ts
+++ b/js/src/tool/ls.ts
@@ -125,12 +125,11 @@ async function listDirectory(
           results.push(fullPath + path.sep);
         }
 
-        if (results.length < limit) {
-          await walk(fullPath);
-        } else {
+        if (results.length >= limit) {
           truncated = true;
           return;
         }
+        await walk(fullPath);
       } else if (entry.isFile()) {
         if (fullPath !== initialPath) {
           results.push(fullPath);