Rename chat commands and UI elements to explicitly reflect their "Edit Context" and "Code Completion" functionalities

Author: robertpiosik

README.md

@@ -90,9 +90,9 @@ Generate meaningful commit messages precisely adhering to your preferred style.
 
 ### Chat
 
-- `Code Web Chat: Chat` - Type instructions and open chatbot with default preset.
-- `Code Web Chat: Chat using...` - Type instructions and open chatbot with preset selection.
-- `Code Web Chat: Chat to Clipboard` - Enter instructions and copy prompt to clipboard.
+- `Code Web Chat: Edit Context in Chat` - Type instructions and open chatbot with default preset.
+- `Code Web Chat: Edit Context in Chat using...` - Type instructions and open chatbot with preset selection.
+- `Code Web Chat: Edit Context to Clipboard` - Enter instructions and copy prompt to clipboard.
 
 ### Context
 

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

@@ -6,7 +6,7 @@ export default {
 
 const translations = {
   type_something: 'Type something',
-  optional_suggestions: 'Optional suggestions',
+  completion_instructions: 'Completion instructions',
   send_request: 'Send request',
   initialize_chat: 'Initialize chat',
   select_preset: 'Select preset',

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

@@ -23,7 +23,7 @@ type Props = {
   on_at_sign_click: () => void
   translations: {
     type_something: string
-    optional_suggestions: string
+    completion_instructions: string
     send_request: string
     initialize_chat: string
     select_preset: string
@@ -213,9 +213,9 @@ export const ChatInput: React.FC<Props> = (props) => {
 
     if (props.is_in_code_completions_mode) {
       if (active_history.length > 0 && is_history_enabled) {
-        return `${props.translations.optional_suggestions} (⇅ for history)`
+        return `${props.translations.completion_instructions} (⇅ for history)`
       } else {
-        return props.translations.optional_suggestions
+        return props.translations.completion_instructions
       }
     }
 

packages/vscode/package.json

@@ -254,18 +254,18 @@
         "category": "Code Web Chat"
       },
       {
-        "command": "codeWebChat.chat",
-        "title": "Chat",
+        "command": "codeWebChat.editContextInChat",
+        "title": "Edit Context in Chat",
         "category": "Code Web Chat"
       },
       {
-        "command": "codeWebChat.chatUsing",
-        "title": "Chat using...",
+        "command": "codeWebChat.editContextInChatUsing",
+        "title": "Edit Context in Chat using...",
         "category": "Code Web Chat"
       },
       {
-        "command": "codeWebChat.chatToClipboard",
-        "title": "Chat to Clipboard",
+        "command": "codeWebChat.editContextToClipboard",
+        "title": "Edit Context to Clipboard",
         "category": "Code Web Chat"
       },
       {

…ges/vscode/src/commands/chat-commands.ts …ommands/edit-context-in-chat-commands.tspackages/vscode/src/commands/chat-commands.ts renamed to packages/vscode/src/commands/edit-context-in-chat-commands.ts packages/vscode/src/commands/chat-commands.ts renamed to packages/vscode/src/commands/edit-context-in-chat-commands.ts

@@ -192,7 +192,7 @@ async function process_chat_instructions(
   )
 }
 
-export async function handle_chat_command(
+export async function handle_edit_context_in_chat_command(
   context: vscode.ExtensionContext,
   file_tree_provider: any,
   open_editors_provider: any,
@@ -216,121 +216,127 @@ export async function handle_chat_command(
   websocket_server_instance.initialize_chats(chats, presets_config_key)
 }
 
-export function chat_using_command(
+export function edit_context_in_chat_using_command(
   context: vscode.ExtensionContext,
   file_tree_provider: any,
   open_editors_provider: any,
   websocket_server_instance: WebSocketManager
 ) {
-  return vscode.commands.registerCommand('codeWebChat.chatUsing', async () => {
-    if (!websocket_server_instance.is_connected_with_browser()) {
-      vscode.window.showInformationMessage(
-        'Could not connect to the web browser. Please check if it is running and if the connector extension is installed.'
-      )
-      return
-    }
+  return vscode.commands.registerCommand(
+    'codeWebChat.editContextInChatUsing',
+    async () => {
+      if (!websocket_server_instance.is_connected_with_browser()) {
+        vscode.window.showInformationMessage(
+          'Could not connect to the web browser. Please check if it is running and if the connector extension is installed.'
+        )
+        return
+      }
 
-    const instructions = await get_chat_instructions(context)
-    if (!instructions) return
+      const instructions = await get_chat_instructions(context)
+      if (!instructions) return
 
-    const config = vscode.workspace.getConfiguration('codeWebChat')
-    const presets_config_key = 'chatPresetsForEditContext'
-    const web_chat_presets = config.get<ConfigPresetFormat[]>(
-      presets_config_key,
-      []
-    )
+      const config = vscode.workspace.getConfiguration('codeWebChat')
+      const presets_config_key = 'chatPresetsForEditContext'
+      const web_chat_presets = config.get<ConfigPresetFormat[]>(
+        presets_config_key,
+        []
+      )
 
-    const preset_quick_pick_items = web_chat_presets
-      .filter((preset) => CHATBOTS[preset.chatbot])
-      .map((preset) => ({
-        label: preset.name,
-        description: `${preset.chatbot}${
-          preset.model ? ` - ${preset.model}` : ''
-        }`
-      }))
-
-    const selected_preset = await vscode.window.showQuickPick(
-      preset_quick_pick_items,
-      {
-        placeHolder: 'Select preset'
-      }
-    )
+      const preset_quick_pick_items = web_chat_presets
+        .filter((preset) => CHATBOTS[preset.chatbot])
+        .map((preset) => ({
+          label: preset.name,
+          description: `${preset.chatbot}${
+            preset.model ? ` - ${preset.model}` : ''
+          }`
+        }))
 
-    if (!selected_preset) return
+      const selected_preset = await vscode.window.showQuickPick(
+        preset_quick_pick_items,
+        {
+          placeHolder: 'Select preset'
+        }
+      )
 
-    const chats = await process_chat_instructions(
-      instructions,
-      [selected_preset.label],
-      context,
-      file_tree_provider,
-      open_editors_provider,
-      presets_config_key
-    )
-    if (!chats) return
+      if (!selected_preset) return
 
-    websocket_server_instance.initialize_chats(chats, presets_config_key)
-  })
+      const chats = await process_chat_instructions(
+        instructions,
+        [selected_preset.label],
+        context,
+        file_tree_provider,
+        open_editors_provider,
+        presets_config_key
+      )
+      if (!chats) return
+
+      websocket_server_instance.initialize_chats(chats, presets_config_key)
+    }
+  )
 }
 
-export function chat_command(
+export function edit_context_in_chat_command(
   context: vscode.ExtensionContext,
   file_tree_provider: any,
   open_editors_provider: any,
   websocket_server_instance: WebSocketManager
 ) {
-  return vscode.commands.registerCommand('codeWebChat.chat', async () => {
-    if (!websocket_server_instance.is_connected_with_browser()) {
-      vscode.window.showInformationMessage(
-        'Could not connect to the web browser. Please check if it is running and if the connector extension is installed.'
-      )
-      return
-    }
+  return vscode.commands.registerCommand(
+    'codeWebChat.editContextInChat',
+    async () => {
+      if (!websocket_server_instance.is_connected_with_browser()) {
+        vscode.window.showInformationMessage(
+          'Could not connect to the web browser. Please check if it is running and if the connector extension is installed.'
+        )
+        return
+      }
 
-    const config = vscode.workspace.getConfiguration('codeWebChat')
-    const chat_presets = config.get<ConfigPresetFormat[]>(
-      'chatPresetsForEditContext',
-      []
-    )
+      const config = vscode.workspace.getConfiguration('codeWebChat')
+      const chat_presets = config.get<ConfigPresetFormat[]>(
+        'chatPresetsForEditContext',
+        []
+      )
 
-    let selected_names = context.globalState.get<string[]>(
-      'selectedPresets.edit',
-      []
-    )
+      let selected_names = context.globalState.get<string[]>(
+        'selectedPresets.edit',
+        []
+      )
 
-    if (!selected_names.length) {
-      const preset_quick_pick_items = chat_presets
-        .filter((preset) => CHATBOTS[preset.chatbot])
-        .map((preset) => ({
-          label: preset.name,
-          description: `${preset.chatbot}${
-            preset.model ? ` - ${preset.model}` : ''
-          }`,
-          picked: false
-        }))
+      if (!selected_names.length) {
+        const preset_quick_pick_items = chat_presets
+          .filter((preset) => CHATBOTS[preset.chatbot])
+          .map((preset) => ({
+            label: preset.name,
+            description: `${preset.chatbot}${
+              preset.model ? ` - ${preset.model}` : ''
+            }`,
+            picked: false
+          }))
+
+        const selected_presets = await vscode.window.showQuickPick(
+          preset_quick_pick_items,
+          {
+            placeHolder: 'Select one or more chat presets',
+            canPickMany: true
+          }
+        )
 
-      const selected_presets = await vscode.window.showQuickPick(
-        preset_quick_pick_items,
-        {
-          placeHolder: 'Select one or more chat presets',
-          canPickMany: true
+        if (!selected_presets || selected_presets.length == 0) {
+          return
         }
-      )
 
-      if (!selected_presets || selected_presets.length == 0) {
-        return
+        selected_names = selected_presets.map((preset) => preset.label)
+        await context.globalState.update('selectedPresets.edit', selected_names)
       }
 
-      selected_names = selected_presets.map((preset) => preset.label)
-      await context.globalState.update('selectedPresets.edit', selected_names)
+      await handle_edit_context_in_chat_command(
+        context,
+        file_tree_provider,
+        open_editors_provider,
+        websocket_server_instance,
+        selected_names,
+        'chatPresetsForEditContext'
+      )
     }
-
-    await handle_chat_command(
-      context,
-      file_tree_provider,
-      open_editors_provider,
-      websocket_server_instance,
-      selected_names,
-      'chatPresetsForEditContext'
-    )
-  })
+  )
 }

…rc/commands/chat-to-clipboard-command.ts …nds/edit-context-to-clipboard-command.tspackages/vscode/src/commands/chat-to-clipboard-command.ts renamed to packages/vscode/src/commands/edit-context-to-clipboard-command.ts packages/vscode/src/commands/chat-to-clipboard-command.ts renamed to packages/vscode/src/commands/edit-context-to-clipboard-command.ts

@@ -35,13 +35,13 @@ async function handle_at_sign_in_chat_input(
   return new_value
 }
 
-export function chat_to_clipboard_command(
+export function edit_context_to_clipboard_command(
   context: vscode.ExtensionContext,
   file_tree_provider: any,
   open_editors_provider?: any
 ) {
   return vscode.commands.registerCommand(
-    'codeWebChat.chatToClipboard',
+    'codeWebChat.editContextToClipboard',
     async () => {
       const last_chat_prompt =
         context.workspaceState.get<string>('last-chat-prompt') || ''

packages/vscode/src/commands/index.ts

@@ -1,5 +1,5 @@
 export * from './apply-chat-response-command/apply-chat-response-command'
-export * from './chat-to-clipboard-command'
+export * from './edit-context-to-clipboard-command'
 export * from './close-all-editors-command'
 export * from './close-editor-command'
 export * from './code-completion-commands'
@@ -20,6 +20,6 @@ export * from './revert-command'
 export * from './save-all-command'
 export * from './save-context-command'
 export * from './apply-context-command'
-export * from './chat-commands'
+export * from './edit-context-in-chat-commands'
 export * from './edit-context-commands'
 export * from './apply-context-from-clipboard-command'

packages/vscode/src/extension.ts

@@ -14,9 +14,9 @@ import {
 import {
   apply_chat_response_command,
   code_completion_commands,
-  chat_command,
-  chat_using_command,
-  chat_to_clipboard_command,
+  edit_context_in_chat_command,
+  edit_context_in_chat_using_command,
+  edit_context_to_clipboard_command,
   close_editor_command,
   close_all_editors_command,
   save_all_command,
@@ -130,19 +130,19 @@ export async function activate(context: vscode.ExtensionContext) {
       open_editors_provider,
       websocket_server_instance
     ),
-    chat_command(
+    edit_context_in_chat_command(
       context,
       workspace_provider,
       open_editors_provider,
       websocket_server_instance
     ),
-    chat_using_command(
+    edit_context_in_chat_using_command(
       context,
       workspace_provider,
       open_editors_provider,
       websocket_server_instance
     ),
-    chat_to_clipboard_command(
+    edit_context_to_clipboard_command(
       context,
       workspace_provider,
       open_editors_provider

packages/vscode/src/view/backend/message-handlers/handle-get-code-completion-suggestions.ts

@@ -1,11 +1,11 @@
 import { ViewProvider } from '@/view/backend/view-provider'
 import { SaveCodeCompletionSuggestionsMessage } from '@/view/types/messages'
 
-export const handle_save_code_completion_suggestions = async (
+export const handle_save_code_completion_instructions = async (
   provider: ViewProvider,
   message: SaveCodeCompletionSuggestionsMessage
 ): Promise<void> => {
-  provider.code_completion_suggestions = message.instruction
+  provider.code_completion_instructions = message.instruction
   await provider.context.workspaceState.update(
     'code-completion-suggestions',
     message.instruction