Add search capability to unstaged file selection in commit message generation flow

- on a quick pick of unstaged files, should allow 'search in the selected results'

└── apps
    └── editor
        └── src
            ├── commands
            │   ├── generate-commit-message-commands
            │   │   ├── actions
            │   │   │   ├── get-prompt-data.ts
            │   │   │   └── run-generate-action.ts
            │   │   ├── generate-commit-message-commands.ts
            │   │   ├── index.ts
            │   │   └── utils
            │   │       ├── build-commit-message-prompt.ts
            │   │       ├── generate-commit-message-with-api.ts
            │   │       ├── get-commit-message-config.ts
            │   │       └── strip-wrapping-quotes.ts
            │   └── select-referencing-files-commands
            │       ├── index.ts
            │       ├── select-referencing-files-commands.ts
            │       └── utils
            │           ├── get-referencing-files-for-position.ts
            │           ├── get-referencing-files-for-uris.ts
            │           └── prompt-for-referencing-files.ts
            ├── extension.ts
            └── utils
                └── git-repository-utils.ts

Author: robertpiosik

apps/editor/src/commands/generate-commit-message-commands/actions/get-prompt-data.ts

@@ -9,13 +9,15 @@ import { CommitMessageDetails } from '../../../utils/commit-message-details'
 import { normalize_path } from '@/utils/normalize-path'
 import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'
 import { FilesCollector } from '@/utils/files-collector'
+import { WebSocketManager } from '@/services/websocket-manager'
 
 export const get_prompt_data = async (params: {
   repository: GitRepository
   stage_all_if_none_staged: boolean
   selection_state?: { files?: string[] }
   extension_context: vscode.ExtensionContext
   workspace_provider: WorkspaceProvider
+  websocket_manager: WebSocketManager
   files_staged_by_action?: boolean
   is_single_change_flow?: boolean
   skip_context_prompt?: boolean
@@ -33,7 +35,10 @@ export const get_prompt_data = async (params: {
   const diff = await prepare_staged_changes({
     repository: params.repository,
     stage_all_if_none_staged: params.stage_all_if_none_staged,
-    selection_state: params.selection_state
+    selection_state: params.selection_state,
+    workspace_provider: params.workspace_provider,
+    extension_context: params.extension_context,
+    websocket_manager: params.websocket_manager
   })
   if (!diff) return null
 

apps/editor/src/commands/generate-commit-message-commands/actions/run-generate-action.ts

@@ -64,6 +64,7 @@ export const run_generate_action = async (params: {
       selection_state,
       extension_context: params.extension_context,
       workspace_provider: params.workspace_provider,
+      websocket_manager: params.websocket_manager,
       files_staged_by_action,
       is_single_change_flow: files_staged_by_action
         ? is_single_change_flow

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

@@ -6,6 +6,9 @@ import { t } from '@/i18n'
 import { MAX_FILE_TOKENS_FOR_COMMIT_MESSAGE } from '@/constants/values'
 import { PromptBuilder } from './prompt-builder'
 import { display_token_count } from '@shared/utils/display-token-count'
+import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'
+import { WebSocketManager } from '@/services/websocket-manager'
+import { search_files } from '@/features/search-files'
 
 export type GitRepository = {
   rootUri: vscode.Uri
@@ -210,6 +213,9 @@ export const prepare_staged_changes = async (params: {
   repository: GitRepository
   stage_all_if_none_staged?: boolean
   selection_state?: { files?: string[] }
+  workspace_provider?: WorkspaceProvider
+  extension_context?: vscode.ExtensionContext
+  websocket_manager?: WebSocketManager
 }): Promise<string | null> => {
   await params.repository.status()
   const staged_changes = params.repository.state.indexChanges || []
@@ -349,76 +355,114 @@ export const prepare_staged_changes = async (params: {
         })
       )
 
-      const selected = await new Promise<any[] | undefined>((resolve) => {
-        const quick_pick = vscode.window.createQuickPick<any>()
-        quick_pick.items = items
+      let current_selected_fs_paths = params.selection_state?.files || items.map((i) => i.fsPath)
 
-        if (params.selection_state?.files) {
-          quick_pick.selectedItems = items.filter((i) =>
-            params.selection_state!.files!.includes(i.fsPath)
-          )
-        } else {
-          quick_pick.selectedItems = items
-        }
+      while (true) {
+        const selected = await new Promise<any[] | undefined | 'search'>((resolve) => {
+          const quick_pick = vscode.window.createQuickPick<any>()
+          quick_pick.items = items
+          quick_pick.selectedItems = items.filter((i) => current_selected_fs_paths.includes(i.fsPath))
 
-        quick_pick.canSelectMany = true
-        quick_pick.matchOnDescription = true
-        quick_pick.title = t('command.generate-commit-message.unstaged-files')
-        quick_pick.placeholder = t(
-          'command.generate-commit-message.select-files'
-        )
-        quick_pick.ignoreFocusOut = true
-        quick_pick.buttons = [
-          {
+          quick_pick.canSelectMany = true
+          quick_pick.matchOnDescription = true
+          quick_pick.title = t('command.generate-commit-message.unstaged-files')
+          quick_pick.placeholder = t('command.generate-commit-message.select-files')
+          quick_pick.ignoreFocusOut = true
+
+          const close_button = {
             iconPath: new vscode.ThemeIcon('close'),
             tooltip: t('common.close')
           }
-        ]
+          const search_button = {
+            iconPath: new vscode.ThemeIcon('search'),
+            tooltip: t('common.search-in-selected-results')
+          }
 
-        quick_pick.onDidTriggerButton((button) => {
-          if (button.tooltip == t('common.close')) {
-            resolve(undefined)
+          quick_pick.buttons = params.workspace_provider && params.extension_context && params.websocket_manager
+            ? [search_button, close_button]
+            : [close_button]
+
+          quick_pick.onDidTriggerButton((button) => {
+            if (button.tooltip == t('common.close')) {
+              resolve(undefined)
+              quick_pick.hide()
+            } else if (button.tooltip == t('common.search-in-selected-results')) {
+              current_selected_fs_paths = Array.from(quick_pick.selectedItems).map((i: any) => i.fsPath)
+              if (current_selected_fs_paths.length == 0) {
+                vscode.window.showInformationMessage(t('common.info.select-files-to-search'))
+                return
+              }
+              resolve('search')
+              quick_pick.hide()
+            }
+          })
+
+          quick_pick.onDidTriggerItemButton(async (event) => {
+            if (event.button.tooltip == t('common.go-to-file')) {
+              const uri = vscode.Uri.file(event.item.fsPath)
+              vscode.window.showTextDocument(uri, { preview: true })
+            } else if (event.button.tooltip == t('command.generate-commit-message.show-diff')) {
+              const uri = vscode.Uri.file(event.item.fsPath)
+              await vscode.commands.executeCommand('git.openChange', uri)
+            }
+          })
+
+          quick_pick.onDidAccept(() => {
+            const selected_items = Array.from(quick_pick.selectedItems)
+            current_selected_fs_paths = selected_items.map((i: any) => i.fsPath)
+            resolve(selected_items)
             quick_pick.hide()
-          }
-        })
+          })
 
-        quick_pick.onDidTriggerItemButton(async (event) => {
-          if (event.button.tooltip == t('common.go-to-file')) {
-            const uri = vscode.Uri.file(event.item.fsPath)
-            vscode.window.showTextDocument(uri, { preview: true })
-          } else if (
-            event.button.tooltip ==
-            t('command.generate-commit-message.show-diff')
-          ) {
-            const uri = vscode.Uri.file(event.item.fsPath)
-            await vscode.commands.executeCommand('git.openChange', uri)
-          }
+          quick_pick.onDidHide(() => {
+            resolve(undefined)
+            quick_pick.dispose()
+          })
+
+          quick_pick.show()
         })
 
-        quick_pick.onDidAccept(() => {
-          const selected_items = Array.from(quick_pick.selectedItems)
-          if (params.selection_state) {
-            params.selection_state.files = selected_items.map(
-              (i: any) => i.fsPath
-            )
+        if (!selected) {
+          return null
+        }
+
+        if (selected === 'search') {
+          if (!params.workspace_provider || !params.extension_context || !params.websocket_manager) {
+            continue
           }
-          resolve(selected_items)
-          quick_pick.hide()
-        })
 
-        quick_pick.onDidHide(() => {
-          resolve(undefined)
-          quick_pick.dispose()
-        })
+          const search_result = await search_files({
+            get_files: async () => current_selected_fs_paths,
+            workspace_provider: params.workspace_provider,
+            extension_context: params.extension_context,
+            websocket_manager: params.websocket_manager,
+            show_back_button: true
+          })
 
-        quick_pick.show()
-      })
+          if (search_result === 'back') {
+            continue
+          }
 
-      if (!selected || selected.length == 0) {
-        return null
-      }
+          if (!search_result || search_result.selected_paths.length === 0) {
+            return null
+          }
 
-      files_to_stage = selected.map((item) => item.fsPath)
+          files_to_stage = search_result.selected_paths
+          if (params.selection_state) {
+            params.selection_state.files = files_to_stage
+          }
+          break
+        } else {
+          if (selected.length === 0) {
+            return null
+          }
+          files_to_stage = selected.map((item) => item.fsPath)
+          if (params.selection_state) {
+            params.selection_state.files = files_to_stage
+          }
+          break
+        }
+      }
     }
 
     const file_args = files_to_stage