feat: add the grepSearch tool

chat-client/src/client/mynahUi.ts

@@ -496,7 +496,9 @@ export const createMynahUi = (
                                             ? ''
                                             : `line ${range.first} - ${range.second}`
                                     )
-                                    .join(', ') || '',
+                                    .join(', ') || fileDetails.description
+                                    ? fileDetails.description
+                                    : '',
                             description: filePath,
                             clickable: true,
                         },

server/aws-lsp-codewhisperer/package.json

@@ -52,7 +52,8 @@
         "shlex": "2.1.2",
         "uuid": "^11.0.5",
         "vscode-uri": "^3.1.0",
-        "@modelcontextprotocol/sdk": "^1.9.0"
+        "@modelcontextprotocol/sdk": "^1.9.0",
+        "@vscode/ripgrep": "^1.15.11"
     },
     "devDependencies": {
         "@types/adm-zip": "^0.5.5",

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -3,7 +3,7 @@
  * Will be deleted or merged.
  */
 
 import * as path from 'path'
 import {
     ChatTriggerType,
     GenerateAssistantResponseCommandInput,
@@ -101,6 +101,7 @@
 import { FsWrite, FsWriteParams, getDiffChanges } from './tools/fsWrite'
 import { ExecuteBash, ExecuteBashOutput, ExecuteBashParams } from './tools/executeBash'
 import { ExplanatoryParams, InvokeOutput, ToolApprovalException } from './tools/toolShared'
+import { GrepSearch, SanitizedRipgrepOutput } from './tools/grepSearch'
 
 type ChatHandlers = Omit<
     LspHandlers<Chat>,
@@ -559,13 +560,15 @@
                 switch (toolUse.name) {
                     case 'fsRead':
                     case 'listDirectory':
+                    case 'grepSearch':
                     case 'fsWrite':
                     case 'executeBash': {
                         const toolMap = {
                             fsRead: { Tool: FsRead },
                             listDirectory: { Tool: ListDirectory },
                             fsWrite: { Tool: FsWrite },
                             executeBash: { Tool: ExecuteBash },
+                            grepSearch: { Tool: GrepSearch },
                         }
 
                         const { Tool } = toolMap[toolUse.name as keyof typeof toolMap]
@@ -642,6 +645,12 @@
                         // no need to write tool result for listDir and fsRead into chat stream
                         // executeBash will stream the output instead of waiting until the end
                         break
+                    case 'grepSearch':
+                        const grepSearchResult = this.#processGrepSearchResult(toolUse, result, chatResultStream)
+                        if (grepSearchResult) {
+                            await chatResultStream.writeResultBlock(grepSearchResult)
+                        }
+                        break
                     case 'fsWrite':
                         const chatResult = await this.#getFsWriteChatResult(toolUse)
                         const toolUseLookup = this.#triggerContext.getToolUseLookup()
@@ -914,6 +923,73 @@
         }
     }
 
+    /**
+     * Process grep search results and format them for display in the chat UI
+     */
+    #processGrepSearchResult(
+        toolUse: ToolUse,
+        result: InvokeOutput,
+        chatResultStream: AgenticChatResultStream
+    ): ChatMessage | undefined {
+        if (toolUse.name !== 'grepSearch') {
+            return undefined
+        }
+
+        let messageIdToUpdate = toolUse.toolUseId!
+        const currentId = chatResultStream.getMessageIdToUpdateForTool(toolUse.name!)
+
+        if (currentId) {
+            messageIdToUpdate = currentId
+        } else {
+            chatResultStream.setMessageIdToUpdateForTool(toolUse.name!, messageIdToUpdate)
+        }
+
+        // Extract search results from the tool output
+        const output = result.output.content as SanitizedRipgrepOutput
+        if (!output || !output.fileMatches || !Array.isArray(output.fileMatches)) {
+            return {
+                type: 'tool',
+                messageId: messageIdToUpdate,
+                body: 'No search results found.',
+            }
+        }
+
+        // Process the matches into a structured format
+        const matches = output.fileMatches
+        const fileDetails: Record<string, FileDetails> = {}
+
+        // Create file details directly from matches
+        for (const match of matches) {
+            const filePath = match.filePath
+            if (!filePath) continue
+
+            fileDetails[filePath] = {
+                description: `(${match.matchCount} results)`,
+                lineRanges: [{ first: -1, second: -1 }],
+            }
+        }
+
+        // Create sorted array of file paths
+        const sortedFilePaths = Object.keys(fileDetails)
+
+        // Create the context list for display
+        const query = (toolUse.input as any)?.query || 'search term'
+        const matchCount = matches.length
+
+        const contextList: FileList = {
+            rootFolderTitle: `Searched for "${query}", ${output.totalMatchCount} found`,
+            filePaths: sortedFilePaths,
+            details: fileDetails,
+        }
+
+        return {
+            type: 'tool',
+            contextList,
+            messageId: messageIdToUpdate,
+            body: '',
+        }
+    }
+
     /**
      * Updates the request input with tool results for the next iteration
      */