Fix caret position handling in PromptField to properly maintain selection when unfocused and adjust keyword deletion spacing logic

Author: robertpiosik

packages/ui/src/components/editor/panel/PromptField/PromptField.tsx

@@ -170,11 +170,22 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
 
   useEffect(() => {
     if (input_ref.current && input_ref.current.innerHTML !== highlighted_html) {
-      const selection_start = get_caret_position_from_div(input_ref.current)
+      let selection_start = 0
+
+      if (is_focused) {
+        selection_start = get_caret_position_from_div(input_ref.current)
+      } else {
+        selection_start = map_raw_pos_to_display_pos(
+          props.value.length,
+          props.value,
+          props.context_file_paths ?? []
+        )
+      }
+
       input_ref.current.innerHTML = highlighted_html
       set_caret_position_for_div(input_ref.current, selection_start)
     }
-  }, [highlighted_html])
+  }, [highlighted_html, is_focused, props.value, props.context_file_paths])
 
   useEffect(() => {
     if (input_ref.current) {

packages/ui/src/components/editor/panel/PromptField/hooks/use-handlers.ts

@@ -227,10 +227,10 @@ export const use_handlers = (
     let leading_part = props.value.substring(0, start_pos)
     let trailing_part = props.value.substring(end_pos)
 
-    if (leading_part.endsWith(' ')) {
-      leading_part = leading_part.slice(0, -1)
-    } else if (trailing_part.startsWith(' ')) {
+    if (trailing_part.startsWith(' ')) {
       trailing_part = trailing_part.substring(1)
+    } else if (leading_part.endsWith(' ')) {
+      leading_part = leading_part.slice(0, -1)
     }
 
     const new_value = leading_part + trailing_part

packages/vscode/src/views/panel/frontend/hooks/use-panel.ts

@@ -174,16 +174,8 @@ export const use_panel = (vscode: any) => {
 
   const handle_task_forward = (text: string) => {
     handle_instructions_change(text, 'edit-context')
-
-    if (mode == MODE.WEB) {
-      handle_web_prompt_type_change('edit-context')
-    } else {
-      handle_api_prompt_type_change('edit-context')
-    }
-
     set_active_view('main')
     set_main_view_scroll_reset_key((k) => k + 1)
-    set_chat_input_focus_and_select_key((k) => k + 1)
   }
 
   useEffect(() => {