hacking on inline assist prompt to avoid overgeneration for empty-line inserts that fall before a non-empty line

Co-Authored-By: Nathan <nathan@zed.dev>

assets/prompts/content_prompt.hbs

@@ -1,52 +1,53 @@
-Here's a text file that I'm going to ask you to make an edit to.
-
 {{#if language_name}}
-The file is in {{language_name}}.
+File language: {{language_name}}
 {{/if}}
 
-You need to rewrite a portion of it.
-
-The section you'll need to edit is marked with <rewrite_this></rewrite_this> tags.
+Note the position of `<rewrite_this>...</rewrite_this>` tags in the document.
 
 <document>
 {{{document_content}}}
 </document>
 
 {{#if is_truncated}}
-The context around the relevant section has been truncated (possibly in the middle of a line) for brevity.
+Note: Context around the relevant section has been truncated for brevity.
 {{/if}}
 
-Rewrite the section of {{content_type}} in <rewrite_this></rewrite_this> tags based on the following prompt:
-
+Editing instructions:
+1. Modify the code tagged above with `<rewrite_this>...</rewrite_this>` based on this prompt:
 <prompt>
 {{{user_prompt}}}
 </prompt>
 
-Here's the section to edit based on that prompt again for reference:
+2. Only perform these changes:
+   {{#if has_insertion}}
+   - Add content where you see <insert_here></insert_here>
+   {{/if}}
+   {{#if has_replacement}}
+   - Update content between <edit_here></edit_here> tags
+   {{/if}}
 
-<rewrite_this>
-{{{rewrite_section}}}
-</rewrite_this>
+3. Reminder: immediately surrounding code from the above `document`. Use this to silently recall the context, do not include surrounding code in your output!
+<surrounding-context>
+{{{rewrite_section_surrounding_with_selections}}}
+</surrounding-context>
 
-You'll rewrite this entire section, but you will only make changes within certain subsections.
+4. Important guidelines:
+   - Make only the changes needed to address the prompt
+   - Match the original indentation
+   - Do NOT include any `<rewrite_this>` or {{#if has_insertion}}`<insert_here>`{{/if}}{{#if has_replacement}}`<edit_here>`{{/if}} tags in your response
+   - Only change {{content_type}} that goes between the `{{#if has_insertion}}<insert_here>...</insert_here>{{/if}}{{#if has_replacement}}<edit_here>...</edit_here>{{/if}}` tags
+   - Provide the entire `<rewrite_this>` section, even if parts remain unchanged
+   - Do NOT output any of the code outside of the `<rewrite_this>` section
 
-{{#if has_insertion}}
-Insert text anywhere you see it marked with with <insert_here></insert_here> tags. Do not include <insert_here> tags in your output.
-{{/if}}
-{{#if has_replacement}}
-Edit edit text that you see surrounded with <edit_here></edit_here> tags. Do not include <edit_here> tags in your output.
-{{/if}}
-
-<rewrite_this>
-{{{rewrite_section_with_selections}}}
-</rewrite_this>
-
-Only make changes that are necessary to fulfill the prompt, leave everything else as-is. All surrounding {{content_type}} will be preserved. Do not output the <rewrite_this></rewrite this> tags or anything outside of them.
-
-Start at the indentation level in the original file in the rewritten {{content_type}}. Don't stop until you've rewritten the entire section, even if you have no more changes to make. Always write out the whole section with no unnecessary elisions.
-
-Immediately start with the following format with no remarks:
+Remember, this is the user's prompt:
+<prompt>
+{{{user_prompt}}}
+</prompt>
 
+Example of expected output format:
 ```
-\{{REWRITTEN_CODE}}
+\{{rewritten_{{content_type}}}}
 ```
+Where \{{rewritten_{{content_type}}}} is replaced with your modified `<rewrite_this>' section.
+
+Now, provide your modified `<rewrite_this>' section using the format shown above. Start immediately with the ``` delimiter, no commentary.

crates/assistant/src/inline_assistant.rs

@@ -2258,7 +2258,8 @@ impl Codegen {
         cx: &AppContext,
     ) -> BoxFuture<'static, Result<TokenCounts>> {
         if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
-            let request = self.build_request(user_prompt, assistant_panel_context.clone(), cx);
+            let request =
+                self.build_request(user_prompt, assistant_panel_context.clone(), false, cx);
             match request {
                 Ok(request) => {
                     let total_count = model.count_tokens(request.clone(), cx);
@@ -2304,7 +2305,7 @@ impl Codegen {
             if user_prompt.trim().to_lowercase() == "delete" {
                 async { Ok(stream::empty().boxed()) }.boxed_local()
             } else {
-                let request = self.build_request(user_prompt, assistant_panel_context, cx)?;
+                let request = self.build_request(user_prompt, assistant_panel_context, true, cx)?;
 
                 let chunks =
                     cx.spawn(|_, cx| async move { model.stream_completion(request, &cx).await });
@@ -2318,6 +2319,7 @@ impl Codegen {
         &self,
         user_prompt: String,
         assistant_panel_context: Option<LanguageModelRequest>,
+        log_prompt: bool,
         cx: &AppContext,
     ) -> Result<LanguageModelRequest> {
         let buffer = self.buffer.read(cx).snapshot(cx);
@@ -2385,6 +2387,13 @@ impl Codegen {
             )
             .map_err(|e| anyhow::anyhow!("Failed to generate content prompt: {}", e))?;
 
+        if log_prompt {
+            println!(
+                "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n{}\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
+                prompt
+            );
+        }
+
         let mut messages = Vec::new();
         if let Some(context_request) = assistant_panel_context {
             messages = context_request.messages;

crates/assistant/src/prompts.rs

@@ -6,6 +6,7 @@ use language::BufferSnapshot;
 use parking_lot::Mutex;
 use serde::Serialize;
 use std::{ops::Range, sync::Arc, time::Duration};
+use text::OffsetRangeExt as _;
 use util::ResultExt;
 
 #[derive(Serialize)]
@@ -17,6 +18,7 @@ pub struct ContentPromptContext {
     pub user_prompt: String,
     pub rewrite_section: String,
     pub rewrite_section_with_selections: String,
+    pub rewrite_section_surrounding_with_selections: String,
     pub has_insertion: bool,
     pub has_replacement: bool,
 }
@@ -211,6 +213,7 @@ impl PromptBuilder {
         let rewrite_section_with_selections = {
             let mut section_with_selections = String::new();
             let mut last_end = 0;
+            section_with_selections.push_str("<rewrite_this>\n");
             for selected_range in &selected_ranges {
                 if selected_range.start > last_end {
                     section_with_selections.push_str(
@@ -232,9 +235,30 @@ impl PromptBuilder {
             if last_end < rewrite_section.len() {
                 section_with_selections.push_str(&rewrite_section[last_end..]);
             }
+            section_with_selections.push_str("\n</rewrite_this>");
             section_with_selections
         };
 
+        let rewrite_section_surrounding_with_selections = {
+            let mut context_range = transform_range.to_point(&buffer);
+            context_range.start.row = context_range.start.row.saturating_sub(8);
+            context_range.end = buffer
+                .max_point()
+                .min(context_range.end + rope::Point::new(8, 0));
+            context_range.end.column = buffer.line_len(context_range.end.row);
+            let context_range = context_range.to_offset(&buffer);
+
+            let mut surrounding = String::new();
+            for chunk in buffer.text_for_range(context_range.start..transform_range.start) {
+                surrounding.push_str(chunk);
+            }
+            surrounding.push_str(&rewrite_section_with_selections);
+            for chunk in buffer.text_for_range(transform_range.end..context_range.end) {
+                surrounding.push_str(chunk);
+            }
+            surrounding
+        };
+
         let has_insertion = selected_ranges.iter().any(|range| range.start == range.end);
         let has_replacement = selected_ranges.iter().any(|range| range.start != range.end);
 
@@ -246,6 +270,7 @@ impl PromptBuilder {
             user_prompt,
             rewrite_section,
             rewrite_section_with_selections,
+            rewrite_section_surrounding_with_selections,
             has_insertion,
             has_replacement,
         };