Refactor prompt field history handling to correctly manage the modification state and update default instructions for Edit Context formats

Author: robertpiosik

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

@@ -289,17 +289,15 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
   }, [props.on_caret_position_change, props.value, props.context_file_paths])
 
   const placeholder = useMemo(() => {
-    const active_history = props.chat_history
-
     if (props.is_in_code_completions_mode) {
-      if (active_history.length > 0 && is_history_enabled) {
+      if (props.chat_history.length > 0 && is_history_enabled) {
         return 'Completion instructions (⇅ for history)'
       } else {
         return 'Completion instructions'
       }
     }
 
-    return active_history.length > 0 && is_history_enabled
+    return props.chat_history.length > 0 && is_history_enabled
       ? 'Type something (⇅ for history)'
       : 'Type something'
   }, [

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

@@ -194,8 +194,6 @@ export const use_handlers = (
 
   const update_value = (new_value: string, caret_pos?: number) => {
     if (new_value === props.value) return
-    // Mark that we've modified the current entry (not from history navigation)
-    has_modified_current_entry_ref.current = true
     set_undo_stack((prev) => [
       ...prev,
       { value: props.value, raw_caret_pos: raw_caret_pos_ref.current }
@@ -224,6 +222,7 @@ export const use_handlers = (
 
     const new_value = leading_part + trailing_part
     const new_raw_cursor_pos = leading_part.length
+    has_modified_current_entry_ref.current = new_value !== ''
     update_value(new_value, new_raw_cursor_pos)
   }
 
@@ -394,8 +393,8 @@ export const use_handlers = (
   }
 
   const handle_clear = () => {
-    update_value('')
     has_modified_current_entry_ref.current = false
+    update_value('')
     set_history_index(-1)
   }
 
@@ -436,16 +435,16 @@ export const use_handlers = (
             last_word_in_raw_index
           )
           const final_new_value = `${value_before}\`${matched_path}\` `
+          has_modified_current_entry_ref.current = true
           update_value(final_new_value, final_new_value.length)
           set_history_index(-1)
           return
         }
       }
     }
 
+    has_modified_current_entry_ref.current = new_raw_value !== ''
     update_value(new_raw_value)
-    has_modified_current_entry_ref.current = true
-    set_history_index(-1)
 
     if (char_before_caret == '@') {
       const is_at_start = caret_position == 1
@@ -461,6 +460,8 @@ export const use_handlers = (
     } else if (char_before_caret == '#') {
       props.on_hash_sign_click()
     }
+
+    set_history_index(-1)
   }
 
   const handle_submit = (
@@ -708,9 +709,9 @@ export const use_handlers = (
     e.preventDefault()
 
     const update_and_set_caret = (value: string) => {
-      update_value(value, value.length)
       // Reset the modification flag when navigating history
       has_modified_current_entry_ref.current = false
+      update_value(value, value.length)
     }
 
     if (e.key === 'ArrowUp') {
@@ -725,7 +726,6 @@ export const use_handlers = (
         set_history_index(new_index)
         update_and_set_caret(active_history[new_index])
       } else if (history_index === 0) {
-        has_modified_current_entry_ref.current = false
         set_history_index(-1)
         update_and_set_caret('')
       }
@@ -967,6 +967,7 @@ export const use_handlers = (
         const new_start_pos = i + 1
         const new_value =
           value.substring(0, new_start_pos) + value.substring(raw_pos)
+        has_modified_current_entry_ref.current = new_value !== ''
         update_value(new_value, new_start_pos)
         return
       }

packages/vscode/package.json

@@ -582,9 +582,9 @@
           "scope": "resource",
           "description": "Style of generated code blocks in \"Edit context\" mode.",
           "default": {
-            "whole": "Whenever showing a new or updated file, include a brief explanation of changes, the path and a Markdown Code Block with full contents—because I have a disability which means I can't type and need to be able to just copy and paste.",
-            "truncated": "Whenever showing a new or updated file, include a brief explanation of changes, the path and a Markdown Code Block with truncated contents—unchanged parts should be replaced by ellipsis comments, e.g. \"// ...\".",
-            "diff": "Whenever showing a new or updated file, include a brief explanation of changes, and print them in the Unified Diff format (that's compatible with the git apply command)."
+            "whole": "Whenever showing a new or updated file, print the path and a Markdown Code Block with file's full contents. I have a disability which means I can't type and need to be able to just copy and paste. Briefly explain your reasoning, when you deem appropriate.",
+            "truncated": "Whenever showing a new or updated file, print the path and a Markdown Code Block with truncated contents. To save space, unchanged parts should be replaced by ellipsis comments, e.g. \"// ...\". Briefly explain your reasoning, when you deem appropriate.",
+            "diff": "Whenever showing a new or updated file, use the the Unified Diff format (that's compatible with the git apply command). Each diff should be placed in a Markdown Code Block. Briefly explain your reasoning, when you deem appropriate."
           },
           "properties": {
             "whole": {