chore: revert 6016264 (#1122)

Co-authored-by: Ege Ozcan <[email protected]>

Author: ege0zcan

chat-client/src/client/mynahUi.ts

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

package-lock.json

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

server/aws-lsp-codewhisperer/package.json

@@ -103,7 +103,6 @@ import { ExecuteBash, ExecuteBashOutput, ExecuteBashParams } from './tools/execu
 import { ExplanatoryParams, InvokeOutput, ToolApprovalException } from './tools/toolShared'
 import { ModelServiceException } from './errors'
 import { FileSearch, FileSearchParams } from './tools/fileSearch'
-import { GrepSearch, SanitizedRipgrepOutput } from './tools/grepSearch'
 
 type ChatHandlers = Omit<
     LspHandlers<Chat>,
@@ -589,7 +588,6 @@ export class AgenticChatController implements ChatHandlers {
                     case 'fsRead':
                     case 'listDirectory':
                     case 'fileSearch':
-                    case 'grepSearch':
                     case 'fsWrite':
                     case 'executeBash': {
                         const toolMap = {
@@ -598,7 +596,6 @@ export class AgenticChatController implements ChatHandlers {
                             fsWrite: { Tool: FsWrite },
                             executeBash: { Tool: ExecuteBash },
                             fileSearch: { Tool: FileSearch },
-                            grepSearch: { Tool: GrepSearch },
                         }
 
                         const { Tool } = toolMap[toolUse.name as keyof typeof toolMap]
@@ -681,12 +678,6 @@ export class AgenticChatController implements ChatHandlers {
                         // 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()
@@ -1000,73 +991,6 @@ export class AgenticChatController implements ChatHandlers {
         }
     }
 
-    /**
-     * 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
      */