@@ -30,7 +30,7 @@
 1. Type instructions
 2. Run [Agentic Search](#-agentic-search) for task-relevant file selection
 3. Select examples for model guidance
-4. Send prompt with a chatbot, an API call or a headless CLI invocation
+4. Send prompt with a chatbot, an API call or an agentic CLI invocation
 5. Apply response
 
 #### Efficiency and speed
@@ -178,7 +178,7 @@ Whenever showing a new, updated, renamed, or deleted file, provide a brief expla
 # Rules
 
 * This is a read-only session.
-* Read all the listed files using their project-relative paths in full, and nothing else.
+* Read all the listed files provided as project-relative paths in full, and nothing else.
 * Formulate response adhering to the output formatting, in plain text.
 
 # Task
@@ -219,7 +219,7 @@ _Multi-purpose: explanations, code reviews, you name it._
 # Rules
 
 - This is a read-only session.
-- Read all attached files using their project-relative paths in full, and nothing else.
+- Read all the listed files provided as project-relative paths in full, and nothing else.
 
 # Task
 
 
@@ -70,8 +70,8 @@ export const voice_input_instructions =
   'Respond with a transcription of the following audio recording or text "INAUDIBLE", and nothing else.'
 
 export const cli_edit_requirements = `- This is a read-only session.
-- Read all the listed files using their project-relative paths in full, and nothing else.
+- Read all the listed files provided as project-relative paths in full, and nothing else.
 - Formulate response adhering to the output formatting, in plain text.`
 
 export const cli_ask_requirements = `- This is a read-only session.
-- Read all attached files using their project-relative paths in full, and nothing else.`
+- Read all the listed files provided as project-relative paths in full, and nothing else.`
@@ -16,7 +16,7 @@ import { build_agent_prompt } from './utils/build-agent-prompt'
 import { replace_symbols } from '@/views/prompt/backend/utils/symbols/replace-symbols'
 import { search_files } from '@/features/search-files'
 import { WebSocketManager } from '@/services/websocket-manager'
-import { invoke_headless_cli } from '@/utils/headless-cli-invocation'
+import { invoke_agentic_cli } from '@/utils/agentic-cli-invocation'
 
 export const agentic_search = async (params: {
   workspace_provider: WorkspaceProvider
@@ -62,17 +62,16 @@ export const agentic_search = async (params: {
       }
     )
 
-    const result = await invoke_headless_cli({
+    const result = await invoke_agentic_cli({
       workspace_provider: params.workspace_provider,
       extension_context: params.extension_context,
       title: t('common.title.agentic-search'),
       waiting_message: t(
-        'utils.headless-cli-invocation.agent.waiting-for-agent'
+        'utils.agentic-cli-invocation.agent.waiting-for-agent'
       ),
       last_used_agent_state_key: LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY,
       last_selected_workspace_state_key:
         LAST_SELECTED_WORKSPACE_IN_AGENTIC_SEARCH_STATE_KEY,
-      config_key_prefix: 'agenticSearch',
       show_back_button: true,
       build_prompt: async () => {
         const { instructions: processed_query, skill_definitions } =
 
@@ -1,5 +1,5 @@
 export const translations = {
-  'utils.headless-cli-invocation.info.no-agents': {
+  'utils.agentic-cli-invocation.info.no-agents': {
     en: 'No agents available.',
     pl: 'Brak dostępnych agentów.',
     'zh-cn': '没有可用的智能体。',
@@ -17,7 +17,7 @@ export const translations = {
     hu: 'Nincsenek elérhető ügynökök.',
     bg: 'Няма налични агенти.'
   },
-  'utils.headless-cli-invocation.agent.add-flags': {
+  'utils.agentic-cli-invocation.agent.add-flags': {
     en: 'Add flags',
     pl: 'Dodaj flagi',
     'zh-cn': '添加标志',
@@ -35,7 +35,7 @@ export const translations = {
     hu: 'Jelzők hozzáadása',
     bg: 'Добавяне на флагове'
   },
-  'utils.headless-cli-invocation.agent.edit-flags': {
+  'utils.agentic-cli-invocation.agent.edit-flags': {
     en: 'Edit flags',
     pl: 'Edytuj flagi',
     'zh-cn': '编辑标志',
@@ -53,7 +53,7 @@ export const translations = {
     hu: 'Jelzők szerkesztése',
     bg: 'Редактиране на флагове'
   },
-  'utils.headless-cli-invocation.agent.delete-flags': {
+  'utils.agentic-cli-invocation.agent.delete-flags': {
     en: 'Delete flags',
     pl: 'Usuń flagi',
     'zh-cn': '删除标志',
@@ -71,7 +71,7 @@ export const translations = {
     hu: 'Jelzők törlése',
     bg: 'Изтриване на флагове'
   },
-  'utils.headless-cli-invocation.agent.installed-coding-agents': {
+  'utils.agentic-cli-invocation.agent.installed-coding-agents': {
     en: 'Installed Coding Agents',
     pl: 'Zainstalowani agenci programistyczni',
     'zh-cn': '已安装的编程智能体',
@@ -89,7 +89,7 @@ export const translations = {
     hu: 'Telepített kódoló ügynökök',
     bg: 'Инсталирани агенти за програмиране'
   },
-  'utils.headless-cli-invocation.agent.installed-coding-agents-placeholder': {
+  'utils.agentic-cli-invocation.agent.installed-coding-agents-placeholder': {
     en: 'Select an agent to perform the search',
     pl: 'Wybierz agenta, aby wykonać wyszukiwanie',
     'zh-cn': '选择一个智能体来执行搜索',
@@ -107,7 +107,7 @@ export const translations = {
     hu: 'Válasszon ügynököt a keresés végrehajtásához',
     bg: 'Изберете агент, който да извърши търсенето'
   },
-  'utils.headless-cli-invocation.agent.edit-flags-prompt': {
+  'utils.agentic-cli-invocation.agent.edit-flags-prompt': {
     en: 'Enter custom CLI flags for the agent',
     pl: 'Wprowadź niestandardowe flagi CLI dla agenta',
     'zh-cn': '输入智能体的自定义 CLI 标志',
@@ -125,7 +125,7 @@ export const translations = {
     hu: 'Adjon meg egyéni CLI jelzőket az ügynökhöz',
     bg: 'Въведете персонализирани CLI флагове за агента'
   },
-  'utils.headless-cli-invocation.agent.edit-flags-placeholder': {
+  'utils.agentic-cli-invocation.agent.edit-flags-placeholder': {
     en: 'e.g. --verbose --max-steps 10',
     pl: 'np. --verbose --max-steps 10',
     'zh-cn': '例如 --verbose --max-steps 10',
@@ -143,7 +143,7 @@ export const translations = {
     hu: 'pl. --verbose --max-steps 10',
     bg: 'напр. --verbose --max-steps 10'
   },
-  'utils.headless-cli-invocation.agent.select-workspace': {
+  'utils.agentic-cli-invocation.agent.select-workspace': {
     en: 'Select Workspace',
     pl: 'Wybierz obszar roboczy',
     'zh-cn': '选择工作区',
@@ -161,7 +161,7 @@ export const translations = {
     hu: 'Munkaterület kiválasztása',
     bg: 'Изберете работно пространство'
   },
-  'utils.headless-cli-invocation.agent.select-workspace-placeholder': {
+  'utils.agentic-cli-invocation.agent.select-workspace-placeholder': {
     en: 'Select the workspace for the agent to run in',
     pl: 'Wybierz obszar roboczy, w którym agent zostanie uruchomiony',
     'zh-cn': '选择智能体运行的工作区',
@@ -179,7 +179,7 @@ export const translations = {
     hu: 'Válassza ki a munkaterületet, amelyben az ügynök futni fog',
     bg: 'Изберете работното пространство, в което да работи агентът'
   },
-  'utils.headless-cli-invocation.agent.waiting-for-agent': {
+  'utils.agentic-cli-invocation.agent.waiting-for-agent': {
     en: 'waiting for agent...',
     pl: 'oczekiwanie na agenta...',
     'zh-cn': '等待代理...',
@@ -197,7 +197,7 @@ export const translations = {
     hu: 'várakozás az ügynökre...',
     bg: 'изчакване на агент...'
   },
-  'utils.headless-cli-invocation.error.failed': {
+  'utils.agentic-cli-invocation.error.failed': {
     en: 'Agent execution failed: {error}',
     pl: 'Wykonywanie agenta nie powiodło się: {error}',
     'zh-cn': '智能体执行失败: {error}',
@@ -215,7 +215,7 @@ export const translations = {
     hu: 'Az ügynök futtatása sikertelen: {error}',
     bg: 'Изпълнението на агента се провали: {error}'
   },
-  'utils.headless-cli-invocation.agent.finished': {
+  'utils.agentic-cli-invocation.agent.finished': {
     en: 'Agent finished in {duration}.',
     pl: 'Agent zakończył działanie w {duration}.',
     'zh-cn': '智能体完成于 {duration}。',
 
@@ -1,11 +1,11 @@
 import { translations as show_parent_folder_quick_pick } from './show-parent-folder-quick-pick'
 import { translations as git_repository_utils } from './git-repository-utils'
 import { translations as show_missing_configuration_notification } from './show-missing-configuration-notification'
-import { translations as headless_cli_invocation } from './headless-cli-invocation'
+import { translations as agentic_cli_invocation } from './agentic-cli-invocation'
 
 export const translations = {
   ...show_parent_folder_quick_pick,
   ...git_repository_utils,
   ...show_missing_configuration_notification,
-  ...headless_cli_invocation
+  ...agentic_cli_invocation
 }
@@ -1,5 +1,5 @@
 export const translations = {
-  'views.prompt.handlers.handle-invoke-headless-cli.title': {
+  'views.prompt.handlers.handle-invoke-agentic-cli.title': {
     en: 'Edit With CLI',
     pl: 'Edytuj z CLI',
     'zh-cn': '使用 CLI 编辑',
 
@@ -10,7 +10,7 @@ import { translations as handle_template_quick_pick } from './handle-template-qu
 import { translations as handle_patch_repair } from './handle-patch-repair'
 import { translations as handle_agentic_search } from './handle-agentic-search'
 import { translations as handle_autofill } from './handle-autofill'
-import { translations as handle_invoke_headless_cli } from './handle-invoke-headless-cli'
+import { translations as handle_invoke_agentic_cli } from './handle-invoke-agentic-cli'
 
 export const translations = {
   ...handle_delete_task,
@@ -25,5 +25,5 @@ export const translations = {
   ...handle_patch_repair,
   ...handle_agentic_search,
   ...handle_autofill,
-  ...handle_invoke_headless_cli
+  ...handle_invoke_agentic_cli
 }