Allow navigating back from prompt input and support back navigation in agentic CLI prompt builders

- reorder quick picks. Current: [query] -> [list of agents] -> [root folder?]. Expected: [list of agents] -> [root folder?] -> [query]
- don't show back arrow on the first 'agents' quick pick, show back arrow on the input query

└── apps
    └── editor
        └── src
            ├── commands
            │   └── agentic-search-command
            │       ├── agentic-search-command.ts
            │       └── index.ts
            ├── constants
            │   └── state-keys.ts
            ├── features
            │   └── agentic-search
            │       ├── agentic-search-state.ts
            │       ├── agentic-search.ts
            │       ├── index.ts
            │       └── utils
            │           ├── build-agent-prompt.ts
            │           ├── index.ts
            │           └── prompt-for-search-term.ts
            ├── i18n
            │   └── translations
            │       ├── common.ts
            │       └── utils
            │           └── agentic-cli-invocation.ts
            ├── utils
            │   └── agentic-cli-invocation
            │       ├── agents
            │       │   ├── antigravity.ts
            │       │   ├── claude.ts
            │       │   ├── codex.ts
            │       │   ├── cursor.ts
            │       │   ├── grok.ts
            │       │   ├── index.ts
            │       │   └── opencode.ts
            │       ├── index.ts
            │       ├── invoke-agentic-cli.ts
            │       ├── types.ts
            │       └── utils
            │           ├── check-command-exists.ts
            │           ├── format-duration.ts
            │           ├── generate-diff-markdown.ts
            │           └── get-progress-dots.ts
            └── views
                └── prompt
                    └── backend
                        └── message-handlers
                            └── handle-agentic-search.ts

Author: robertpiosik

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

@@ -38,30 +38,6 @@ export const agentic_search = async (params: {
   let query = params.query
 
   while (true) {
-    const query_result = await prompt_for_search_term(query)
-
-    if (query_result.back) {
-      return 'back'
-    }
-
-    if (query_result.value === undefined) {
-      return undefined
-    }
-
-    query = query_result.value
-
-    if (query.trim() == '') {
-      continue
-    }
-
-    await params.extension_context.workspaceState.update(
-      LAST_AGENTIC_SEARCH_QUERY_STATE_KEY,
-      {
-        instructions: params.current_instructions,
-        query
-      }
-    )
-
     const result = await invoke_agentic_cli({
       workspace_provider: params.workspace_provider,
       extension_context: params.extension_context,
@@ -70,28 +46,56 @@ export const agentic_search = async (params: {
       last_selected_workspace_state_key:
         LAST_SELECTED_WORKSPACE_IN_AGENTIC_SEARCH_STATE_KEY,
       default_agent_key: 'isDefaultForAgenticSearch',
-      show_back_button: true,
+      show_back_button: false,
       build_prompt: async () => {
-        const { instructions: processed_queries, skill_definitions } =
-          await replace_symbols({
-            instructions: [query],
-            extension_context: params.extension_context,
-            workspace_provider: params.workspace_provider,
-            image_as_paths: true
+        while (true) {
+          const query_result = await prompt_for_search_term(query, {
+            show_back_button: true
           })
 
-        const processed_query = processed_queries[0]
+          if (query_result.back) {
+            return 'back'
+          }
+
+          if (query_result.value === undefined) {
+            return undefined
+          }
+
+          query = query_result.value
+
+          if (query.trim() == '') {
+            continue
+          }
+
+          await params.extension_context.workspaceState.update(
+            LAST_AGENTIC_SEARCH_QUERY_STATE_KEY,
+            {
+              instructions: params.current_instructions,
+              query
+            }
+          )
 
-        const final_query = skill_definitions
-          ? `${processed_query}\n\n${skill_definitions}`
-          : processed_query
+          const { instructions: processed_queries, skill_definitions } =
+            await replace_symbols({
+              instructions: [query],
+              extension_context: params.extension_context,
+              workspace_provider: params.workspace_provider,
+              image_as_paths: true
+            })
 
-        return build_agent_prompt(final_query)
+          const processed_query = processed_queries[0]
+
+          const final_query = skill_definitions
+            ? `${processed_query}\n\n${skill_definitions}`
+            : processed_query
+
+          return build_agent_prompt(final_query)
+        }
       }
     })
 
     if (result === 'back') {
-      continue
+      return 'back'
     }
 
     if (!result) {

apps/editor/src/features/agentic-search/utils/prompt-for-search-term.ts

@@ -3,7 +3,10 @@ import { t } from '@/i18n'
 
 export const prompt_for_search_term = async (
   initial_search_term: string,
-  on_change?: (value: string) => void
+  options?: {
+    on_change?: (value: string) => void
+    show_back_button?: boolean
+  }
 ): Promise<{ value: string | undefined; back?: boolean }> => {
   const close_button = {
     iconPath: new vscode.ThemeIcon('close'),
@@ -15,7 +18,14 @@ export const prompt_for_search_term = async (
   input_box.prompt = t('feature.search-files.prompt.intelligent')
   input_box.placeholder = t('common.action.search')
   input_box.value = initial_search_term
-  input_box.buttons = [close_button]
+
+  const buttons: vscode.QuickInputButton[] = []
+  if (options?.show_back_button) {
+    buttons.push(vscode.QuickInputButtons.Back)
+  }
+  buttons.push(close_button)
+
+  input_box.buttons = buttons
   input_box.ignoreFocusOut = true
 
   return new Promise<{ value: string | undefined; back?: boolean }>(
@@ -25,7 +35,11 @@ export const prompt_for_search_term = async (
 
       disposables.push(
         input_box.onDidTriggerButton((button) => {
-          if (button === close_button) {
+          if (button === vscode.QuickInputButtons.Back) {
+            is_resolved = true
+            resolve({ value: undefined, back: true })
+            input_box.hide()
+          } else if (button === close_button) {
             is_resolved = true
             resolve({ value: undefined })
             input_box.hide()
@@ -47,8 +61,8 @@ export const prompt_for_search_term = async (
           if (input_box.value.trim().length > 0) {
             input_box.validationMessage = undefined
           }
-          if (on_change) {
-            on_change(input_box.value)
+          if (options?.on_change) {
+            options.on_change(input_box.value)
           }
         }),
         input_box.onDidHide(() => {

apps/editor/src/utils/agentic-cli-invocation/invoke-agentic-cli.ts

@@ -24,7 +24,7 @@ const get_output_channel = () => {
 export const invoke_agentic_cli = async (params: {
   workspace_provider: WorkspaceProvider
   extension_context: vscode.ExtensionContext
-  build_prompt: (selected_root: string) => Promise<string>
+  build_prompt: (selected_root: string) => Promise<string | 'back' | undefined>
   notification_title: string
   last_selected_workspace_state_key: string
   agent_state_key?: string
@@ -519,6 +519,21 @@ export const invoke_agentic_cli = async (params: {
 
       const final_prompt = await params.build_prompt(selected_root!)
 
+      if (final_prompt === 'back') {
+        if (roots.length === 1 || params.isolate_in_temp_dir) {
+          go_back_to_agent = true
+          show_quick_pick = true
+          current_agent_config_name = undefined
+          break
+        } else {
+          continue
+        }
+      }
+
+      if (final_prompt === undefined) {
+        return undefined
+      }
+
       const temp_prompt_path = path.join(
         os.tmpdir(),
         `cwc-prompt-${Date.now()}-${Math.floor(Math.random() * 1000)}.md`