Support custom file content retrieval in file search functions

- current behavior: user can search in selected results of 'unstaged files' quick pick, but when using 'intelligent', diff patches are not included. Expected behavior: diff patches are included.

└── apps
    └── editor
        └── src
            ├── commands
            │   ├── generate-commit-message-commands
            │   │   ├── actions
            │   │   │   ├── get-prompt-data.ts
            │   │   │   └── run-generate-action.ts
            │   │   ├── generate-commit-message-commands.ts
            │   │   └── utils
            │   │       └── build-commit-message-prompt.ts
            │   ├── search-files-commands
            │   │   ├── search-files-commands.ts
            │   │   └── utils
            │   │       └── prompt-for-provided-results.ts
            │   ├── select-clipboard-paths-command.ts
            │   ├── select-files-of-commit-command.ts
            │   ├── select-imported-files-commands
            │   │   └── utils
            │   │       └── prompt-for-imported-files.ts
            │   ├── select-modified-files-command.ts
            │   └── select-referencing-files-commands
            │       └── utils
            │           └── prompt-for-referencing-files.ts
            ├── constants
            │   ├── edit-format-instructions.ts
            │   └── values.ts
            ├── features
            │   ├── agentic-search
            │   │   └── agentic-search.ts
            │   └── search-files
            │       ├── index.ts
            │       ├── search-files.ts
            │       ├── search-modes
            │       │   ├── perform-intelligent-search-mode.ts
            │       │   ├── perform-keywords-search-mode.ts
            │       │   └── perform-phrase-search-mode.ts
            │       └── utils
            │           ├── analyze-files.ts
            │           ├── check-matches-condition.ts
            │           ├── create-search-regex.ts
            │           ├── prompt-for-config.ts
            │           ├── prompt-for-intelligent-search-results.ts
            │           ├── prompt-for-keywords-match-mode.ts
            │           ├── prompt-for-keywords-target.ts
            │           ├── prompt-for-search-mode.ts
            │           ├── prompt-for-search-results.ts
            │           ├── prompt-for-search-term.ts
            │           ├── prompt-for-shrink-mode.ts
            │           ├── search-files-by-intelligent.ts
            │           ├── search-files-by-keywords.ts
            │           ├── search-files-by-phrase.ts
            │           └── show-search-results-quick-pick.ts
            ├── i18n
            │   └── translations
            │       ├── commands
            │       │   └── generate-commit-message-command.ts
            │       └── common.ts
            ├── utils
            │   ├── files-collector.ts
            │   ├── git-repository-utils.ts
            │   └── prompt-builder.ts
            └── views
                └── prompt
                    ├── backend
                    │   ├── message-handlers
                    │   │   ├── handle-autofill.ts
                    │   │   ├── handle-copy-prompt.ts
                    │   │   ├── handle-make-api-call.ts
                    │   │   ├── handle-preview-prompt.ts
                    │   │   ├── handle-preview-web-configuration.ts
                    │   │   ├── handle-select-edit-format-instructions.ts
                    │   │   └── utils
                    │   │       ├── build-cli-prompt.ts
                    │   │       └── build-prompt-payload.ts
                    │   └── utils
                    │       └── symbols
                    │           └── replace-symbols.ts
                    └── frontend
                        └── Main
                            └── MainView
                                └── MainView.tsx

Author: robertpiosik

apps/editor/src/features/search-files/search-files.ts

@@ -22,6 +22,7 @@ export const search_files = async (params: {
   is_search_in_selected?: boolean
   folder_path?: string
   is_workspace_action?: boolean
+  get_file_content?: (file_path: string) => Promise<string | undefined>
 }): Promise<
   | { selected_paths: string[]; matched_paths: string[]; title: string }
   | undefined
@@ -53,7 +54,8 @@ export const search_files = async (params: {
       show_back_button: true,
       is_sub_search: true,
       is_search_in_selected: params.is_search_in_selected,
-      folder_path: params.folder_path
+      folder_path: params.folder_path,
+      get_file_content: params.get_file_content
     })
   }
 
@@ -87,7 +89,8 @@ export const search_files = async (params: {
         show_back_button: params.show_back_button,
         search_in_results,
         is_search_in_selected: params.is_search_in_selected,
-        is_sub_search: params.is_sub_search
+        is_sub_search: params.is_sub_search,
+        get_file_content: params.get_file_content
       }
 
       if (search_mode == 'phrase') {
@@ -105,7 +108,8 @@ export const search_files = async (params: {
           search_in_results,
           is_search_in_selected: params.is_search_in_selected,
           is_sub_search: params.is_sub_search,
-          folder_path: params.folder_path
+          folder_path: params.folder_path,
+          get_file_content: params.get_file_content
         })
       }
 

apps/editor/src/features/search-files/search-modes/perform-intelligent-search-mode.ts

@@ -38,6 +38,7 @@ export const perform_intelligent_search_mode = async (params: {
   is_search_in_selected?: boolean
   is_sub_search?: boolean
   folder_path?: string
+  get_file_content?: (file_path: string) => Promise<string | undefined>
 }): Promise<
   | { selected_paths: string[]; matched_paths: string[]; title: string }
   | undefined
@@ -85,7 +86,8 @@ export const perform_intelligent_search_mode = async (params: {
 
     const analysis = await analyze_files({
       workspace_provider: params.workspace_provider,
-      files: params.files
+      files: params.files,
+      get_file_content: params.get_file_content
     })
 
     let go_back_to_term = false

apps/editor/src/features/search-files/search-modes/perform-keywords-search-mode.ts

@@ -27,6 +27,7 @@ export const perform_keywords_search_mode = async (params: {
   >
   is_search_in_selected?: boolean
   is_sub_search?: boolean
+  get_file_content?: (file_path: string) => Promise<string | undefined>
 }): Promise<
   | { selected_paths: string[]; matched_paths: string[]; title: string }
   | undefined
@@ -146,7 +147,8 @@ export const perform_keywords_search_mode = async (params: {
             files,
             search_term,
             keywords_target,
-            keywords_match_mode
+            keywords_match_mode,
+            get_file_content: params.get_file_content
           })
         } else {
           matched_files = await vscode.window.withProgress(
@@ -165,7 +167,8 @@ export const perform_keywords_search_mode = async (params: {
                 keywords_target,
                 keywords_match_mode,
                 progress,
-                token
+                token,
+                get_file_content: params.get_file_content
               })
             }
           )

apps/editor/src/features/search-files/search-modes/perform-phrase-search-mode.ts

@@ -20,6 +20,7 @@ export const perform_phrase_search_mode = async (params: {
   >
   is_search_in_selected?: boolean
   is_sub_search?: boolean
+  get_file_content?: (file_path: string) => Promise<string | undefined>
 }): Promise<
   | { selected_paths: string[]; matched_paths: string[]; title: string }
   | undefined
@@ -78,7 +79,8 @@ export const perform_phrase_search_mode = async (params: {
     if (is_fast_search) {
       matched_files = await search_files_by_phrase({
         files,
-        search_term
+        search_term,
+        get_file_content: params.get_file_content
       })
     } else {
       matched_files = await vscode.window.withProgress(
@@ -95,7 +97,8 @@ export const perform_phrase_search_mode = async (params: {
             files,
             search_term,
             progress,
-            token
+            token,
+            get_file_content: params.get_file_content
           })
         }
       )

apps/editor/src/features/search-files/utils/analyze-files.ts

@@ -21,6 +21,7 @@ export interface FileAnalysisResult {
 export const analyze_files = async (params: {
   workspace_provider: WorkspaceProvider
   files: string[]
+  get_file_content?: (file_path: string) => Promise<string | undefined>
 }): Promise<FileAnalysisResult> => {
   let full_tokens = 0
   let shrink_tokens = 0
@@ -37,13 +38,21 @@ export const analyze_files = async (params: {
     async () => {
       for (const file_path of params.files) {
         try {
-          const stats = await fs.promises.stat(file_path)
-          if (stats.size > 1024 * 1024) continue
+          let content: string | undefined
+          if (params.get_file_content) {
+            content = await params.get_file_content(file_path)
+          }
+
+          if (content === undefined) {
+            const stats = await fs.promises.stat(file_path)
+            if (stats.size > 1024 * 1024) continue
 
-          const buffer = await fs.promises.readFile(file_path)
-          if (buffer.includes(0)) continue
+            const buffer = await fs.promises.readFile(file_path)
+            if (buffer.includes(0)) continue
+
+            content = buffer.toString('utf8')
+          }
 
-          const content = buffer.toString('utf8')
           const shrunk_content = shrink_file(content, path.extname(file_path))
 
           const workspace_root =

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

@@ -13,6 +13,7 @@ export const search_files_by_keywords = async (params: {
   keywords_match_mode?: 'all' | 'some'
   progress?: vscode.Progress<{ message?: string; increment?: number }>
   token?: vscode.CancellationToken
+  get_file_content?: (file_path: string) => Promise<string | undefined>
 }): Promise<string[]> => {
   const matched_files: string[] = []
 
@@ -62,31 +63,44 @@ export const search_files_by_keywords = async (params: {
         continue
       }
 
-      const stats = await fs.promises.stat(file_path)
       let text_to_check = ''
+      let content: string | undefined
+      if (params.get_file_content) {
+        content = await params.get_file_content(file_path)
+      }
 
-      if (stats.size > 1024 * 1024) {
+      if (content !== undefined) {
         if (params.keywords_target == 'both') {
-          text_to_check = file_name
+          text_to_check = file_name + '\n' + content
         } else {
-          continue
+          text_to_check = content
         }
       } else {
-        const buffer = await fs.promises.readFile(file_path)
-        const is_binary = buffer.includes(0)
+        const stats = await fs.promises.stat(file_path)
 
-        if (is_binary) {
+        if (stats.size > 1024 * 1024) {
           if (params.keywords_target == 'both') {
             text_to_check = file_name
           } else {
             continue
           }
         } else {
-          const content = buffer.toString('utf-8')
-          if (params.keywords_target == 'both') {
-            text_to_check = file_name + '\n' + content
+          const buffer = await fs.promises.readFile(file_path)
+          const is_binary = buffer.includes(0)
+
+          if (is_binary) {
+            if (params.keywords_target == 'both') {
+              text_to_check = file_name
+            } else {
+              continue
+            }
           } else {
-            text_to_check = content
+            content = buffer.toString('utf-8')
+            if (params.keywords_target == 'both') {
+              text_to_check = file_name + '\n' + content
+            } else {
+              text_to_check = content
+            }
           }
         }
       }

apps/editor/src/features/search-files/utils/search-files-by-phrase.ts

@@ -10,6 +10,7 @@ export const search_files_by_phrase = async (params: {
   search_term: string
   progress?: vscode.Progress<{ message?: string; increment?: number }>
   token?: vscode.CancellationToken
+  get_file_content?: (file_path: string) => Promise<string | undefined>
 }): Promise<string[]> => {
   const matched_files: string[] = []
   const positive_regex = create_search_regex(params.search_term)
@@ -32,14 +33,21 @@ export const search_files_by_phrase = async (params: {
         continue
       }
 
-      const stats = await fs.promises.stat(file_path)
-      if (stats.size > 1024 * 1024) continue
+      let content: string | undefined
+      if (params.get_file_content) {
+        content = await params.get_file_content(file_path)
+      }
+
+      if (content === undefined) {
+        const stats = await fs.promises.stat(file_path)
+        if (stats.size > 1024 * 1024) continue
 
-      const buffer = await fs.promises.readFile(file_path)
-      const is_binary = buffer.includes(0)
-      if (is_binary) continue
+        const buffer = await fs.promises.readFile(file_path)
+        const is_binary = buffer.includes(0)
+        if (is_binary) continue
 
-      const content = buffer.toString('utf-8')
+        content = buffer.toString('utf-8')
+      }
 
       if (positive_regex.test(content)) {
         matched_files.push(file_path)

apps/editor/src/utils/git-repository-utils.ts

@@ -324,6 +324,13 @@ export const prepare_staged_changes = async (params: {
                 : undefined
           })
 
+          const file_content = [
+            final_diff_content ? final_diff_content : '',
+            !is_deleted && full_content && !is_too_large ? full_content : ''
+          ]
+            .filter(Boolean)
+            .join('\n\n')
+
           const token_count = Math.ceil(file_md.length / 4)
           const description_parts = []
 
@@ -339,6 +346,7 @@ export const prepare_staged_changes = async (params: {
             picked: true,
             fsPath: change.uri.fsPath,
             token_count,
+            file_content,
             buttons: [
               {
                 iconPath: new vscode.ThemeIcon(
@@ -453,6 +461,10 @@ export const prepare_staged_changes = async (params: {
 
           const search_result = await search_files({
             get_files: async () => current_selected_fs_paths,
+            get_file_content: async (file_path: string) => {
+              const item = items.find((i) => i.fsPath === file_path)
+              return item?.file_content
+            },
             workspace_provider: params.workspace_provider,
             extension_context: params.extension_context,
             websocket_manager: params.websocket_manager,