Enhance agentic search with query persistence per instruction and customizable agent flags

- remember in state a pair: instructions and query. expected behavior: when agentic search open ups, and instructions are the same, restore query. Otherwise use instructions.
- flags seem to be broken
- highlight last edited agent

└── apps
    └── editor
        ├── package.json
        └── src
            ├── constants
            │   └── state-keys.ts
            └── views
                └── prompt
                    └── backend
                        ├── message-handlers
                        │   └── handle-agentic-search
                        │       ├── agentic-search.ts
                        │       ├── agents
                        │       │   ├── antigravity.ts
                        │       │   ├── claude.ts
                        │       │   ├── codex.ts
                        │       │   ├── cursor.ts
                        │       │   ├── grok.ts
                        │       │   ├── muse.ts
                        │       │   └── opencode.ts
                        │       ├── handle-agentic-search.ts
                        │       ├── index.ts
                        │       ├── types.ts
                        │       └── utils
                        │           ├── build-agent-prompt.ts
                        │           ├── check-command-exists.ts
                        │           ├── format-duration.ts
                        │           ├── get-progress-dots.ts
                        │           ├── index.ts
                        │           └── prompt-for-search-term.ts
                        └── prompt-view-provider.ts

Author: robertpiosik

apps/editor/package.json

@@ -989,6 +989,59 @@
           "type": "string",
           "scope": "resource"
         },
+        "codeWebChat.agenticSearchInstructions": {
+          "type": "string",
+          "scope": "resource"
+        },
+        "codeWebChat.agenticSearchAntigravityFlags": {
+          "type": "array",
+          "scope": "resource",
+          "items": {
+            "type": "string"
+          }
+        },
+        "codeWebChat.agenticSearchClaudeFlags": {
+          "type": "array",
+          "scope": "resource",
+          "items": {
+            "type": "string"
+          }
+        },
+        "codeWebChat.agenticSearchCodexFlags": {
+          "type": "array",
+          "scope": "resource",
+          "items": {
+            "type": "string"
+          }
+        },
+        "codeWebChat.agenticSearchCursorFlags": {
+          "type": "array",
+          "scope": "resource",
+          "items": {
+            "type": "string"
+          }
+        },
+        "codeWebChat.agenticSearchGrokFlags": {
+          "type": "array",
+          "scope": "resource",
+          "items": {
+            "type": "string"
+          }
+        },
+        "codeWebChat.agenticSearchMuseFlags": {
+          "type": "array",
+          "scope": "resource",
+          "items": {
+            "type": "string"
+          }
+        },
+        "codeWebChat.agenticSearchOpencodeFlags": {
+          "type": "array",
+          "scope": "resource",
+          "items": {
+            "type": "string"
+          }
+        },
         "codeWebChat.editFilesSystemInstructions": {
           "type": "string",
           "scope": "resource"

apps/editor/src/views/prompt/backend/message-handlers/handle-agentic-search/agentic-search.ts

@@ -6,7 +6,8 @@ import * as path from 'path'
 import * as fs from 'fs'
 import {
   LAST_SELECTED_WORKSPACE_IN_AGENTIC_SEARCH_STATE_KEY,
-  LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY
+  LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY,
+  LAST_AGENTIC_SEARCH_QUERY_STATE_KEY
 } from '@/constants/state-keys'
 import { extract_paths_from_bullet_list } from '@/utils/extract-paths-from-bullet-list'
 import { get_all_workspace_files } from '@/context/helpers/get-all-workspace-files'
@@ -50,6 +51,7 @@ export const agentic_search = async (params: {
   extension_context: vscode.ExtensionContext
   websocket_manager: WebSocketManager
   query: string
+  current_instructions: string
 }): Promise<
   | { selected_paths: string[]; matched_paths: string[]; title: string }
   | undefined
@@ -81,8 +83,19 @@ export const agentic_search = async (params: {
       continue
     }
 
+    await params.extension_context.workspaceState.update(
+      LAST_AGENTIC_SEARCH_QUERY_STATE_KEY,
+      {
+        instructions: params.current_instructions,
+        query
+      }
+    )
+
     let go_back_to_query = false
 
+    let active_config_key: string | undefined
+    let active_flag_index: number | undefined
+
     while (true) {
       const available_agents = AGENTS.filter((a) => a.is_installed())
 
@@ -175,17 +188,28 @@ export const agentic_search = async (params: {
       const agent_quick_pick = vscode.window.createQuickPick<AgentPickItem>()
       agent_quick_pick.items = build_agent_picks()
 
-      const last_used_agent =
-        params.extension_context.workspaceState.get<string>(
-          LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY
-        )
-      if (last_used_agent) {
+      if (active_config_key !== undefined && active_flag_index !== undefined) {
         const active_item = agent_quick_pick.items.find(
-          (i) => i.cmd == last_used_agent
+          (i) =>
+            i.configKey === active_config_key &&
+            i.flag_index === active_flag_index
         )
         if (active_item) {
           agent_quick_pick.activeItems = [active_item]
         }
+      } else {
+        const last_used_agent =
+          params.extension_context.workspaceState.get<string>(
+            LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY
+          )
+        if (last_used_agent) {
+          const active_item = agent_quick_pick.items.find(
+            (i) => i.cmd == last_used_agent
+          )
+          if (active_item) {
+            agent_quick_pick.activeItems = [active_item]
+          }
+        }
       }
 
       agent_quick_pick.title = t(
@@ -199,7 +223,31 @@ export const agentic_search = async (params: {
 
       const config_listener = vscode.workspace.onDidChangeConfiguration((e) => {
         if (e.affectsConfiguration('codeWebChat')) {
+          const prev_active = agent_quick_pick.activeItems[0]
           agent_quick_pick.items = build_agent_picks()
+
+          if (
+            active_config_key !== undefined &&
+            active_flag_index !== undefined
+          ) {
+            const item = agent_quick_pick.items.find(
+              (i) =>
+                i.configKey === active_config_key &&
+                i.flag_index === active_flag_index
+            )
+            if (item) {
+              agent_quick_pick.activeItems = [item]
+            }
+          } else if (prev_active) {
+            const item = agent_quick_pick.items.find(
+              (i) =>
+                i.configKey === prev_active.configKey &&
+                i.flag_index === prev_active.flag_index
+            )
+            if (item) {
+              agent_quick_pick.activeItems = [item]
+            }
+          }
         }
       })
 
@@ -248,6 +296,9 @@ export const agentic_search = async (params: {
               resolve({ action: 'add', configKey: e.item.configKey })
               agent_quick_pick.hide()
             } else if (e.button === delete_button) {
+              active_config_key = e.item.configKey
+              active_flag_index = -1
+
               const config = vscode.workspace.getConfiguration('codeWebChat')
               const flags = config
                 .get<string[]>(e.item.configKey, [])
@@ -274,6 +325,9 @@ export const agentic_search = async (params: {
                     )
                     .then((choice) => {
                       if (choice === undo_action) {
+                        active_config_key = e.item.configKey
+                        active_flag_index = e.item.flag_index
+
                         const current_config =
                           vscode.workspace.getConfiguration('codeWebChat')
                         const current_flags = current_config
@@ -327,6 +381,9 @@ export const agentic_search = async (params: {
 
       if (agent_selection_result.action === 'add') {
         const { configKey } = agent_selection_result
+        active_config_key = configKey
+        active_flag_index = -1
+
         const new_flags = await vscode.window.showInputBox({
           title: t(
             'views.prompt.handlers.handle-agentic-search.agent.add-flags'
@@ -345,6 +402,9 @@ export const agentic_search = async (params: {
           const flags = config
             .get<string[]>(configKey, [])
             .filter((f) => f.trim() !== '')
+          
+          active_flag_index = flags.length
+
           await config.update(
             configKey,
             [...flags, new_flags],
@@ -356,6 +416,9 @@ export const agentic_search = async (params: {
 
       if (agent_selection_result.action === 'edit') {
         const { configKey, index, value } = agent_selection_result
+        active_config_key = configKey
+        active_flag_index = index
+
         const new_flags = await vscode.window.showInputBox({
           title: t(
             'views.prompt.handlers.handle-agentic-search.agent.edit-flags'
@@ -379,6 +442,7 @@ export const agentic_search = async (params: {
             new_flags_array[index] = new_flags
           } else {
             new_flags_array.splice(index, 1)
+            active_flag_index = -1
           }
           await config.update(
             configKey,
@@ -495,10 +559,27 @@ export const agentic_search = async (params: {
 
         const custom_args: string[] = []
         if (flags_string.trim()) {
-          const regex = /([^\s'"]+)|"([^"]*)"|'([^']*)'/g
-          let match
-          while ((match = regex.exec(flags_string)) !== null) {
-            custom_args.push(match[1] || match[2] || match[3])
+          let current_arg = ''
+          let in_single_quote = false
+          let in_double_quote = false
+
+          for (let i = 0; i < flags_string.length; i++) {
+            const char = flags_string[i]
+            if (char === "'" && !in_double_quote) {
+              in_single_quote = !in_single_quote
+            } else if (char === '"' && !in_single_quote) {
+              in_double_quote = !in_double_quote
+            } else if (char === ' ' && !in_single_quote && !in_double_quote) {
+              if (current_arg.length > 0) {
+                custom_args.push(current_arg)
+                current_arg = ''
+              }
+            } else {
+              current_arg += char
+            }
+          }
+          if (current_arg.length > 0) {
+            custom_args.push(current_arg)
           }
         }
 

apps/editor/src/views/prompt/backend/message-handlers/handle-agentic-search/handle-agentic-search.ts

@@ -3,6 +3,7 @@ import { PromptViewProvider } from '../../prompt-view-provider'
 import { Logger } from '@shared/utils/logger'
 import { t } from '@/i18n'
 import { agentic_search } from './agentic-search'
+import { LAST_AGENTIC_SEARCH_QUERY_STATE_KEY } from '@/constants/state-keys'
 
 let agentic_search_in_progress = false
 
@@ -16,15 +17,31 @@ export const handle_agentic_search = async (
     return
   }
 
-  const query = prompt_view_provider.current_instructions
+  const current_instructions = prompt_view_provider.current_instructions
+
+  const last_query_state =
+    prompt_view_provider.extension_context.workspaceState.get<{
+      instructions: string
+      query: string
+    }>(LAST_AGENTIC_SEARCH_QUERY_STATE_KEY)
+
+  let initial_query = current_instructions
+  if (
+    last_query_state &&
+    typeof last_query_state === 'object' &&
+    last_query_state.instructions === current_instructions
+  ) {
+    initial_query = last_query_state.query
+  }
 
   agentic_search_in_progress = true
   try {
     const result = await agentic_search({
       workspace_provider: prompt_view_provider.workspace_provider,
       extension_context: prompt_view_provider.extension_context,
       websocket_manager: prompt_view_provider.websocket_server_instance,
-      query
+      query: initial_query,
+      current_instructions
     })
 
     if (!result || result === 'back') return