Adding the grep search tool and file search tool.

    1. Implemented the grep search tool using https://github.com/microsoft/vscode-ripgrep.
    2. The grepped result show as clickable file path.
    3. Implemented the file search tool.
    3. The tool currently is disable in current pr, once grepSearch tool tested,
       will update the tool_index.json to enable this tool.

Author: grl-wang

.github/workflows/node.js.yml

@@ -132,6 +132,7 @@ jobs:
             NODE_OPTIONS: '--max-old-space-size=8192'
             AWS_TOOLKIT_TEST_CACHE_DIR: '/tmp/.vscode-test/'
             AWS_TOOLKIT_TEST_USER_DIR: '/tmp/.vscode-test/user-data/'
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         steps:
             - uses: actions/checkout@v4
             - name: Use Node.js ${{ matrix.node-version }}
@@ -169,6 +170,7 @@ jobs:
             NODE_OPTIONS: '--max-old-space-size=8192'
             AWS_TOOLKIT_TEST_CACHE_DIR: '/tmp/.vscode-test/'
             AWS_TOOLKIT_TEST_USER_DIR: '/tmp/.vscode-test/user-data/'
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         steps:
             - uses: actions/checkout@v4
             - name: Use Node.js ${{ matrix.node-version }}

buildspec/linuxTests.yml

@@ -25,6 +25,8 @@ phases:
     pre_build:
         commands:
             - export HOME=/home/codebuild-user
+            # produce an API key, set the GITHUB_TOKEN environment var, and vscode-ripgrep will pick it up
+            - export GITHUB_TOKEN=${GITHUB_READONLY_TOKEN}
             - bash buildspec/shared/linux-pre_build.sh
 
     build:

buildspec/packageTestVsix.yml

@@ -20,6 +20,7 @@ phases:
     pre_build:
         commands:
             - export HOME=/home/codebuild-user
+            - export GITHUB_TOKEN=${GITHUB_READONLY_TOKEN}
             - bash buildspec/shared/linux-pre_build.sh
 
     build:

buildspec/shared/linux-pre_build.sh

@@ -11,6 +11,13 @@ _SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # Include common functions.
 . "${_SCRIPT_DIR}/common.sh"
 
+# Set up GitHub token for vscode-ripgrep to avoid rate limiting
+if [ -n "$GITHUB_TOKEN" ]; then
+    echo "GITHUB_TOKEN is set. vscode-ripgrep will use this for GitHub API authentication."
+else
+    echo "WARNING: GITHUB_TOKEN is not set. GitHub API requests may be rate-limited."
+fi
+
 # If present, log into CodeArtifact. Provides a fallback in case NPM is down.
 # Should only affect tests run through Toolkits-hosted CodeBuild.
 if [ "$TOOLKITS_CODEARTIFACT_DOMAIN" ] && [ "$TOOLKITS_CODEARTIFACT_REPO" ] && [ "$TOOLKITS_ACCOUNT_ID" ]; then

package-lock.json

@@ -75,6 +75,7 @@
     "dependencies": {
         "@types/node": "^22.7.5",
         "vscode-nls": "^5.2.0",
-        "vscode-nls-dev": "^4.0.4"
+        "vscode-nls-dev": "^4.0.4",
+        "@vscode/ripgrep": "1.15.11"
     }
 }

package.json

@@ -60,6 +60,11 @@ const tasks: CopyTask[] = [
         target: path.join('../../node_modules', 'web-tree-sitter', 'tree-sitter.wasm'),
         destination: path.join('src', 'tree-sitter.wasm'),
     },
+    // ripgrep binary
+    {
+        target: path.join('../../node_modules', '@vscode/ripgrep', 'bin'),
+        destination: 'bin/',
+    },
 ]
 
 function copy(task: CopyTask): void {

packages/amazonq/scripts/build/copyFiles.ts

@@ -0,0 +1,111 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { readDirectoryRecursively } from '../../shared/utilities/workspaceUtils'
+import fs from '../../shared/fs/fs'
+import { Writable } from 'stream'
+import path from 'path'
+import { InvokeOutput, OutputKind, sanitizePath, CommandValidation } from './toolShared'
+import { isInDirectory } from '../../shared/filesystemUtilities'
+
+export interface FileSearchParams {
+    path: string
+    pattern: string
+    maxDepth?: number
+    caseSensitive?: boolean
+}
+
+export class FileSearch {
+    private fsPath: string
+    private pattern: RegExp
+    private maxDepth?: number
+    private readonly logger = getLogger('fileSearch')
+
+    constructor(params: FileSearchParams) {
+        this.fsPath = params.path
+        // Create RegExp with case sensitivity option
+        this.pattern = new RegExp(params.pattern, params.caseSensitive ? '' : 'i')
+        this.maxDepth = params.maxDepth
+    }
+
+    public async validate(): Promise<void> {
+        if (!this.fsPath || this.fsPath.trim().length === 0) {
+            throw new Error('Path cannot be empty.')
+        }
+        if (this.maxDepth !== undefined && this.maxDepth < 0) {
+            throw new Error('MaxDepth cannot be negative.')
+        }
+
+        const sanitized = sanitizePath(this.fsPath)
+        this.fsPath = sanitized
+
+        const pathUri = vscode.Uri.file(this.fsPath)
+        let pathExists: boolean
+        try {
+            pathExists = await fs.existsDir(pathUri)
+            if (!pathExists) {
+                throw new Error(`Path: "${this.fsPath}" does not exist or cannot be accessed.`)
+            }
+        } catch (err) {
+            throw new Error(`Path: "${this.fsPath}" does not exist or cannot be accessed. (${err})`)
+        }
+    }
+
+    public queueDescription(updates: Writable): void {
+        const fileName = path.basename(this.fsPath)
+        if (this.maxDepth === undefined) {
+            updates.write(`Searching for files matching pattern: ${this.pattern} in ${fileName} recursively`)
+        } else if (this.maxDepth === 0) {
+            updates.write(`Searching for files matching pattern: ${this.pattern} in ${fileName}`)
+        } else {
+            const level = this.maxDepth > 1 ? 'levels' : 'level'
+            updates.write(
+                `Searching for files matching pattern: ${this.pattern} in ${fileName} limited to ${this.maxDepth} subfolder ${level}`
+            )
+        }
+        updates.end()
+    }
+
+    public requiresAcceptance(): CommandValidation {
+        const workspaceFolders = vscode.workspace.workspaceFolders
+        if (!workspaceFolders || workspaceFolders.length === 0) {
+            return { requiresAcceptance: true }
+        }
+        const isInWorkspace = workspaceFolders.some((folder) => isInDirectory(folder.uri.fsPath, this.fsPath))
+        if (!isInWorkspace) {
+            return { requiresAcceptance: true }
+        }
+        return { requiresAcceptance: false }
+    }
+
+    public async invoke(updates?: Writable): Promise<InvokeOutput> {
+        try {
+            const fileUri = vscode.Uri.file(this.fsPath)
+            const allFiles = await readDirectoryRecursively(fileUri, this.maxDepth)
+
+            // Filter files by regex pattern
+            const matchedFiles = allFiles.filter((filePath) => {
+                // Extract just the filename from the path
+                const fileName = path.basename(filePath.split(' ').slice(1).join(' '))
+                return this.pattern.test(fileName)
+            })
+
+            return this.createOutput(matchedFiles.join('\n'))
+        } catch (error: any) {
+            this.logger.error(`Failed to search files in "${this.fsPath}": ${error.message || error}`)
+            throw new Error(`Failed to search files in "${this.fsPath}": ${error.message || error}`)
+        }
+    }
+
+    private createOutput(content: string): InvokeOutput {
+        return {
+            output: {
+                kind: OutputKind.Text,
+                content: content,
+            },
+        }
+    }
+}