Fix code_search formatting bug

Author: jahooma

common/src/util/format-code-search.ts

@@ -27,15 +27,41 @@ export function formatCodeSearchOutput(stdout: string): string {
       continue
     }
 
-    // Find the first colon to separate file path from content
-    const colonIndex = line.indexOf(':')
-    if (colonIndex === -1) {
-      formatted.push(line)
+    // Skip separator lines between result groups
+    if (line === '--') {
       continue
     }
 
-    const filePath = line.substring(0, colonIndex)
-    const content = line.substring(colonIndex)
+    // Ripgrep output format:
+    // - Match lines: filename:line_number:content
+    // - Context lines (with -A/-B/-C flags): filename-line_number-content
+    
+    // Use regex to find the pattern: separator + digits + separator
+    // This handles filenames with hyphens/colons by matching the line number pattern
+    let separatorIndex = -1
+    let filePath = ''
+    
+    // Try match line pattern: filename:digits:content
+    const matchLinePattern = /(.*?):(\d+):(.*)$/
+    const matchLineMatch = line.match(matchLinePattern)
+    if (matchLineMatch) {
+      filePath = matchLineMatch[1]
+      separatorIndex = matchLineMatch[1].length
+    } else {
+      // Try context line pattern: filename-digits-content
+      const contextLinePattern = /(.*?)-(\d+)-(.*)$/
+      const contextLineMatch = line.match(contextLinePattern)
+      if (contextLineMatch) {
+        filePath = contextLineMatch[1]
+        separatorIndex = contextLineMatch[1].length
+      }
+    }
+    
+    if (separatorIndex === -1) {
+      formatted.push(line)
+      continue
+    }
+    const content = line.substring(separatorIndex)
 
     // Check if this is a new file (file paths don't start with whitespace)
     if (filePath && !filePath.startsWith(' ') && !filePath.startsWith('\t')) {
@@ -47,10 +73,10 @@ export function formatCodeSearchOutput(stdout: string): string {
         currentFile = filePath
         // Show file path with colon on its own line
         formatted.push(filePath + ':')
-        // Show content without leading colon on next line
+        // Show content without leading separator on next line
         formatted.push(content.substring(1))
       } else {
-        // Same file - just show content without leading colon
+        // Same file - just show content without leading separator
         formatted.push(content.substring(1))
       }
     } else {

evals/buffbench/main-single-eval.ts

@@ -5,8 +5,8 @@ import { runBuffBench } from './run-buffbench'
 async function main() {
   await runBuffBench({
     evalDataPath: path.join(__dirname, 'eval-codebuff.json'),
-    agents: ['base2-max'],
-    taskIds: ['filter-system-history'],
+    agents: ['base2-fast'],
+    taskIds: ['add-spawn-perms-tests'],
   })
 
   process.exit(0)

npm-app/src/tool-handlers.ts

@@ -311,27 +311,50 @@ export const handleCodeSearch: ToolHandler<'code_search'> = async (
       let currentFile: string | null = null
 
       for (const line of lines) {
-        // Ripgrep output format: filename:line_number:content or filename:content
-        const colonIndex = line.indexOf(':')
-        if (colonIndex === -1) {
-          // This shouldn't happen with standard ripgrep output
-          if (currentFile) {
-            fileGroups.get(currentFile)!.push(line)
-          }
+        // Skip separator lines between result groups
+        if (line === '--') {
           continue
         }
 
-        const filename = line.substring(0, colonIndex)
+        // Ripgrep output format:
+        // - Match lines: filename:line_number:content
+        // - Context lines (with -A/-B/-C flags): filename-line_number-content
+        
+        // Use regex to find the pattern: separator + digits + separator
+        // This handles filenames with hyphens/colons by matching the line number pattern
+        let separatorIndex = -1
+        let filename = ''
+        
+        // Try match line pattern: filename:digits:content
+        const matchLinePattern = /(.*?):(\d+):(.*)$/
+        const matchLineMatch = line.match(matchLinePattern)
+        if (matchLineMatch) {
+          filename = matchLineMatch[1]
+          separatorIndex = matchLineMatch[1].length
+        } else {
+          // Try context line pattern: filename-digits-content
+          const contextLinePattern = /(.*?)-(\d+)-(.*)$/
+          const contextLineMatch = line.match(contextLinePattern)
+          if (contextLineMatch) {
+            filename = contextLineMatch[1]
+            separatorIndex = contextLineMatch[1].length
+          }
+        }
+        
+        if (separatorIndex === -1) {
+          // Malformed line, skip it
+          continue
+        }
 
-        // Check if this is a new file
+        // Check if this is a valid filename (not indented, not containing tabs)
         if (filename && !filename.includes('\t') && !filename.startsWith(' ')) {
           currentFile = filename
           if (!fileGroups.has(currentFile)) {
             fileGroups.set(currentFile, [])
           }
           fileGroups.get(currentFile)!.push(line)
         } else if (currentFile) {
-          // Continuation of previous result
+          // This shouldn't happen with proper ripgrep output
           fileGroups.get(currentFile)!.push(line)
         }
       }