Remove context dependency enforcement from the chat input and enhance prompt context collection

Author: robertpiosik

packages/ui/src/components/editor/ChatInput/ChatInput.stories.tsx

@@ -15,14 +15,16 @@ const translations = {
     'Code completions mode unavailable with text selection',
   code_completions_mode_unavailable_without_active_editor:
     'Code completions mode unavailable without active editor',
-  mode_unavailable_without_context: 'This mode requires context',
   search: 'Search',
   websocket_not_connected: 'Websocket not connected',
   for_history_hint: 'for history hint',
   copy_to_clipboard: 'Copy to clipboard',
   insert_symbol: 'Insert symbol',
   prompt_templates: 'Prompt templates',
-  approximate_token_count: 'Approximate token count'
+  approximate_token_count: 'Approximate token count',
+  last_selection: 'Last selection',
+  use_default: 'Use default',
+  select: 'Select'
 }
 
 export const Empty = () => (
@@ -44,7 +46,6 @@ export const Empty = () => (
     on_submit_with_control={() => {}}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -67,7 +68,6 @@ export const WithText = () => (
     on_submit_with_control={() => {}}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -90,7 +90,6 @@ export const DisabledSubmit = () => (
     on_submit_with_control={() => {}}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -113,7 +112,6 @@ export const MultilineText = () => (
     on_submit_with_control={() => {}}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -136,7 +134,6 @@ export const LongText = () => (
     on_submit_with_control={() => {}}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -160,7 +157,6 @@ export const WithTokenCount = () => (
     on_submit_with_control={() => {}}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -184,7 +180,6 @@ export const WithLargeTokenCount = () => (
     on_submit_with_control={() => {}}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -207,7 +202,6 @@ export const CodeCompletionsMode = () => (
     on_submit_with_control={() => {}}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -230,7 +224,6 @@ export const WithActiveSelection = () => (
     translations={translations}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -253,7 +246,6 @@ export const WithSavedContextPlaceholder = () => (
     translations={translations}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -276,7 +268,6 @@ export const WithActiveSelectionAndPlaceholder = () => (
     translations={translations}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )
 
@@ -299,6 +290,5 @@ export const WithPlaceholderNoSelection = () => (
     translations={translations}
     on_curly_braces_click={() => {}}
     has_context={true}
-    is_in_context_dependent_mode={true}
   />
 )

packages/ui/src/components/editor/ChatInput/ChatInput.tsx

@@ -14,7 +14,6 @@ type Props = {
   token_count?: number
   is_connected: boolean
   is_in_code_completions_mode: boolean
-  is_in_context_dependent_mode: boolean
   has_active_selection: boolean
   has_active_editor: boolean
   on_caret_position_change: (caret_position: number) => void
@@ -32,7 +31,6 @@ type Props = {
     select_config: string
     code_completions_mode_unavailable_with_text_selection: string
     code_completions_mode_unavailable_without_active_editor: string
-    mode_unavailable_without_context: string
     search: string
     websocket_not_connected: string
     for_history_hint: string
@@ -295,20 +293,11 @@ export const ChatInput: React.FC<Props> = (props) => {
         </div>
       )}
 
-      {!props.has_context && props.is_in_context_dependent_mode && (
-        <div className={styles.error}>
-          <div className={styles.error__inner}>
-            {props.translations.mode_unavailable_without_context}
-          </div>
-        </div>
-      )}
-
       <div
         className={cn(styles.container__inner, {
           [styles['container__inner--disabled']]:
-            (props.is_in_code_completions_mode &&
-              (props.has_active_selection || !props.has_active_editor)) ||
-            (!props.has_context && props.is_in_context_dependent_mode)
+            props.is_in_code_completions_mode &&
+            (props.has_active_selection || !props.has_active_editor)
         })}
         onKeyDown={(e) => {
           if (e.key == 'f' && (e.ctrlKey || e.metaKey)) {

packages/vscode/src/commands/code-completion-in-chat-commands.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import { FilesCollector } from '../utils/files-collector'
 import { WebSocketManager } from '../services/websocket-manager'
-import { ConfigPresetFormat } from '@/view/backend/helpers/preset-format-converters'
+import { ConfigPresetFormat } from '@/view/backend/utils/preset-format-converters'
 import { chat_code_completion_instructions } from '../constants/instructions'
 import { CHATBOTS } from '@shared/constants/chatbots'
 

packages/vscode/src/utils/apply-preset-affixes.ts

@@ -1,4 +1,4 @@
-import { ConfigPresetFormat } from '@/view/backend/helpers/preset-format-converters'
+import { ConfigPresetFormat } from '@/view/backend/utils/preset-format-converters'
 import * as vscode from 'vscode'
 
 export function apply_preset_affixes_to_instruction(

packages/vscode/src/utils/files-collector.ts

@@ -23,18 +23,35 @@ export class FilesCollector {
     this.workspace_roots = workspace_provider.getWorkspaceRoots()
   }
 
-  async collect_files(params?: { exclude_path?: string }): Promise<string> {
-    const workspace_files = this.workspace_provider.get_checked_files()
-    const open_editor_files =
-      this.open_editors_provider?.get_checked_files() || []
+  async collect_files(params?: {
+    exclude_path?: string
+    additional_paths?: string[]
+    no_context?: boolean
+  }): Promise<string> {
+    let context_files: string[] = []
+
+    if (params?.no_context) {
+      context_files = params?.additional_paths ?? []
+    } else {
+      const workspace_files = this.workspace_provider.get_checked_files()
+      const open_editor_files =
+        this.open_editors_provider?.get_checked_files() || []
+
+      context_files = Array.from(
+        new Set([
+          ...workspace_files,
+          ...open_editor_files,
+          ...(params?.additional_paths ?? [])
+        ])
+      )
+    }
 
-    const context_files = Array.from(
-      new Set([...workspace_files, ...open_editor_files])
-    ).sort((a, b) => natural_sort(a, b))
+    context_files.sort((a, b) => natural_sort(a, b))
 
     let collected_text = ''
 
-    if (this.websites_provider) {
+    // Only include websites when not in no_context mode
+    if (!params?.no_context && this.websites_provider) {
       const checked_websites = this.websites_provider.get_checked_websites()
 
       for (const website of checked_websites) {

packages/vscode/src/view/backend/message-handlers/handle-copy-prompt.ts

@@ -65,12 +65,14 @@ export const handle_copy_prompt = async (
 
     vscode.env.clipboard.writeText(text.trim())
   } else if (!is_in_code_completions_mode) {
-    const mode =
-      provider.home_view_type == HOME_VIEW_TYPES.WEB
-        ? provider.web_mode
-        : provider.api_mode
-    const context_text =
-      mode != 'no-context' ? await files_collector.collect_files() : ''
+    const additional_paths = await extract_file_paths_from_instruction(
+      final_instruction
+    )
+
+    const context_text = await files_collector.collect_files({
+      additional_paths,
+      no_context: provider.web_mode == 'no-context'
+    })
 
     const instructions = replace_selection_placeholder(final_instruction)
 
@@ -95,7 +97,7 @@ export const handle_copy_prompt = async (
       )
     }
 
-    if (mode == 'edit-context') {
+    if (provider.web_mode == 'edit-context') {
       const edit_format =
         provider.home_view_type == HOME_VIEW_TYPES.WEB
           ? provider.chat_edit_format
@@ -128,3 +130,12 @@ export const handle_copy_prompt = async (
     } copied to clipboard!`
   )
 }
+
+async function extract_file_paths_from_instruction(
+  instruction: string
+): Promise<string[]> {
+  const matches = instruction.match(/`([^`]+)`/g)
+  if (!matches) return []
+
+  return matches.map((match) => match.slice(1, -1)) // Remove backticks
+}

packages/vscode/src/view/backend/message-handlers/handle-create-preset.ts

@@ -4,7 +4,7 @@ import { CHATBOTS } from '@shared/constants/chatbots'
 import {
   config_preset_to_ui_format,
   ConfigPresetFormat
-} from '@/view/backend/helpers/preset-format-converters'
+} from '@/view/backend/utils/preset-format-converters'
 
 export const handle_create_preset = async (
   provider: ViewProvider

packages/vscode/src/view/backend/message-handlers/handle-delete-preset.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import { ViewProvider } from '@/view/backend/view-provider'
 import { DeletePresetMessage } from '@/view/types/messages'
-import { ConfigPresetFormat } from '@/view/backend/helpers/preset-format-converters'
+import { ConfigPresetFormat } from '@/view/backend/utils/preset-format-converters'
 
 export const handle_delete_preset = async (
   provider: ViewProvider,

packages/vscode/src/view/backend/message-handlers/handle-duplicate-preset.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import { ViewProvider } from '@/view/backend/view-provider'
 import { DuplicatePresetMessage } from '@/view/types/messages'
-import { ConfigPresetFormat } from '@/view/backend/helpers/preset-format-converters'
+import { ConfigPresetFormat } from '@/view/backend/utils/preset-format-converters'
 
 export const handle_duplicate_preset = async (
   provider: ViewProvider,

packages/vscode/src/view/backend/message-handlers/handle-replace-presets.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import { ReplacePresetsMessage } from '@/view/types/messages'
-import { ui_preset_to_config_format } from '@/view/backend/helpers/preset-format-converters'
+import { ui_preset_to_config_format } from '@/view/backend/utils/preset-format-converters'
 import { ViewProvider } from '../view-provider'
 
 export const handle_replace_presets = async (