Enhance keyword search with AND logic, exact phrase matching, and workspace-wide search support

Author: robertpiosik

README.md

@@ -112,6 +112,7 @@ Meaningful summaries of changes adhering to your preffered style.
 - `Code Web Chat: Apply Context` - Apply a saved context or save the current file selection.
 - `Code Web Chat: Add File to Context` - Search and add file (or parent folder via file action) to the context.
 - `Code Web Chat: Remove File from Context` - Search and remove file (or parent folder via file action) from the context.
+- `Code Web Chat: Check All with Keywords` - Search and add files containing specific keywords to the context.
 - `Code Web Chat: Copy Context` - Copy XML-formatted checked files from the Workspace view to the clipboard.
 - `Code Web Chat: Copy Context of Open Editors` - Copy XML-formatted checked files from the Open Editors view to the clipboard.
 - `Code Web Chat: Undo Context Selection` - Undo the last context change.

apps/editor/package.json

@@ -422,10 +422,6 @@
           "command": "codeWebChat.findInFolder",
           "when": "false"
         },
-        {
-          "command": "codeWebChat.checkAllWithKeywords",
-          "when": "false"
-        },
         {
           "command": "codeWebChat.revealInExplorer",
           "when": "false"

apps/editor/src/commands/apply-context-command/sources/check-all-with-keywords-source.ts

@@ -15,8 +15,9 @@ export const handle_check_all_with_keywords_source = async (
     while (true) {
       const input_box = vscode.window.createInputBox()
       input_box.title = 'Keyword Search'
-      input_box.prompt = 'Enter keywords separated by comma'
-      input_box.placeholder = 'e.g. user, login, auth'
+      input_box.prompt =
+        'Enter keywords separated by comma (use & for AND, quotes for whole words)'
+      input_box.placeholder = 'e.g. user,login&auth,"ignoreFocus"'
       input_box.ignoreFocusOut = true
       input_box.buttons = [vscode.QuickInputButtons.Back]
 
@@ -69,8 +70,13 @@ export const handle_check_all_with_keywords_source = async (
 
       const keywords = keywords_input
         .split(',')
-        .map((k) => k.trim().toLowerCase())
-        .filter((k) => k.length > 0)
+        .map((group) =>
+          group
+            .split('&')
+            .map((k) => k.trim().toLowerCase())
+            .filter((k) => k.length > 0)
+        )
+        .filter((group) => group.length > 0)
 
       if (keywords.length == 0) continue
 

apps/editor/src/commands/check-all-with-keywords.ts

@@ -13,17 +13,14 @@ export const check_all_with_keywords_command = (
   return vscode.commands.registerCommand(
     'codeWebChat.checkAllWithKeywords',
     async (item: any) => {
-      if (!item || !item.resourceUri) {
-        return
-      }
-
-      const folder_path = item.resourceUri.fsPath
+      const folder_path = item?.resourceUri?.fsPath
 
       try {
         const input_box = vscode.window.createInputBox()
         input_box.title = 'Keyword Search'
-        input_box.prompt = 'Enter keywords separated by comma'
-        input_box.placeholder = 'e.g. user, login, auth'
+        input_box.prompt =
+          'Enter keywords separated by comma (use & for AND, quotes for whole words)'
+        input_box.placeholder = 'e.g. user,login&auth,"ignoreFocus"'
 
         const keywords_input = await new Promise<string | undefined>(
           (resolve) => {
@@ -63,12 +60,27 @@ export const check_all_with_keywords_command = (
 
         const keywords = keywords_input
           .split(',')
-          .map((k) => k.trim().toLowerCase())
-          .filter((k) => k.length > 0)
+          .map((group) =>
+            group
+              .split('&')
+              .map((k) => k.trim().toLowerCase())
+              .filter((k) => k.length > 0)
+          )
+          .filter((group) => group.length > 0)
 
         if (keywords.length == 0) return
 
-        const all_files = await workspace_provider.find_all_files(folder_path)
+        let all_files: string[] = []
+
+        if (folder_path) {
+          all_files = await workspace_provider.find_all_files(folder_path)
+        } else {
+          const roots = workspace_provider.get_workspace_roots()
+          for (const root of roots) {
+            const files = await workspace_provider.find_all_files(root)
+            all_files.push(...files)
+          }
+        }
 
         const matched_files = await search_files_by_keywords(
           all_files,
@@ -158,17 +170,23 @@ export const check_all_with_keywords_command = (
         const selected_paths = selected_items.map((item) => item.file_path)
         const currently_checked = workspace_provider.get_checked_files()
 
-        const files_outside_search_folder = currently_checked.filter((file) => {
-          const relative = path.relative(folder_path, file)
-          return relative.startsWith('..') || path.isAbsolute(relative)
-        })
+        let files_outside_search_folder: string[] = []
+        let files_inside_search_folder: string[] = []
 
-        let paths_to_apply = [...files_outside_search_folder, ...selected_paths]
+        if (folder_path) {
+          files_outside_search_folder = currently_checked.filter((file) => {
+            const relative = path.relative(folder_path, file)
+            return relative.startsWith('..') || path.isAbsolute(relative)
+          })
+          files_inside_search_folder = currently_checked.filter((file) => {
+            const relative = path.relative(folder_path, file)
+            return !relative.startsWith('..') && !path.isAbsolute(relative)
+          })
+        } else {
+          files_inside_search_folder = currently_checked
+        }
 
-        const files_inside_search_folder = currently_checked.filter((file) => {
-          const relative = path.relative(folder_path, file)
-          return !relative.startsWith('..') && !path.isAbsolute(relative)
-        })
+        let paths_to_apply = [...files_outside_search_folder, ...selected_paths]
 
         if (files_inside_search_folder.length > 0) {
           const selected_paths_set = new Set(selected_paths)

apps/editor/src/utils/search-files-by-keywords.ts

@@ -4,7 +4,7 @@ import * as fs from 'fs'
 
 export const search_files_by_keywords = async (
   files: string[],
-  keywords: string[],
+  keyword_groups: string[][],
   progress?: vscode.Progress<{ message?: string; increment?: number }>,
   token?: vscode.CancellationToken
 ): Promise<string[]> => {
@@ -13,12 +13,27 @@ export const search_files_by_keywords = async (
   let processed = 0
   const increment = total > 0 ? (1 / total) * 100 : 0
 
+  const matchers = keyword_groups.map((group) =>
+    group.map((k) => {
+      if (k.length >= 2 && k.startsWith('"') && k.endsWith('"')) {
+        const term = k.slice(1, -1)
+        if (!term) return () => false
+        const escaped = term.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+        const regex = new RegExp(`\\b${escaped}\\b`)
+        return (text: string) => regex.test(text)
+      }
+      return (text: string) => text.includes(k)
+    })
+  )
+
   for (const file_path of files) {
     if (token?.isCancellationRequested) break
 
     try {
       const file_name_lower = path.basename(file_path).toLowerCase()
-      if (keywords.some((k) => file_name_lower.includes(k))) {
+      if (
+        matchers.some((group) => group.every((match) => match(file_name_lower)))
+      ) {
         matched_files.push(file_path)
         processed++
         progress?.report({
@@ -42,7 +57,9 @@ export const search_files_by_keywords = async (
       const content = await fs.promises.readFile(file_path, 'utf-8')
       const content_lower = content.toLowerCase()
 
-      if (keywords.some((k) => content_lower.includes(k))) {
+      if (
+        matchers.some((group) => group.every((match) => match(content_lower)))
+      ) {
         matched_files.push(file_path)
       }
     } catch (error) {