Merge pull request #7107 from continuedev/jacob/con-3358

fix: prompt building

Author: jpoly1219

core/llm/autodetect.ts

@@ -178,7 +178,7 @@ function isProviderHandlesTemplatingOrNoTemplateTypeRequired(
 // update core/nextEdit/templating/NextEditPromptEngine.ts as well.
 const MODEL_SUPPORTS_NEXT_EDIT: string[] = [
   NEXT_EDIT_MODELS.MERCURY_CODER_NEXTEDIT,
-  NEXT_EDIT_MODELS.MODEL_1,
+  NEXT_EDIT_MODELS.INSTINCT,
 ];
 
 function modelSupportsNextEdit(

core/llm/autodetect.vitest.ts

@@ -245,8 +245,10 @@ describe("modelSupportsNextEdit", () => {
       ).toBe(true);
     });
 
-    it("should return true for model-1", () => {
-      expect(modelSupportsNextEdit(undefined, "model-1", undefined)).toBe(true);
+    it("should return true for instinct", () => {
+      expect(modelSupportsNextEdit(undefined, "instinct", undefined)).toBe(
+        true,
+      );
     });
 
     it("should return true when model contains supported model name as substring", () => {
@@ -269,9 +271,9 @@ describe("modelSupportsNextEdit", () => {
       ).toBe(true);
     });
 
-    it("should return true when title contains model-1", () => {
+    it("should return true when title contains instinct", () => {
       expect(
-        modelSupportsNextEdit(undefined, "some-model", "model-1 deployment"),
+        modelSupportsNextEdit(undefined, "some-model", "instinct deployment"),
       ).toBe(true);
     });
 
@@ -317,7 +319,7 @@ describe("modelSupportsNextEdit", () => {
 
     it("should handle case sensitivity correctly", () => {
       expect(
-        modelSupportsNextEdit(undefined, "MERCURY-CODER-NEXTEDIT", "MODEL-1"),
+        modelSupportsNextEdit(undefined, "MERCURY-CODER-NEXTEDIT", "instinct"),
       ).toBe(true);
     });
 

core/llm/constants.ts

@@ -21,7 +21,7 @@ export enum LLMConfigurationStatuses {
 
 export enum NEXT_EDIT_MODELS {
   MERCURY_CODER_NEXTEDIT = "mercury-coder-nextedit",
-  MODEL_1 = "model-1",
+  INSTINCT = "instinct",
 }
 
 export {

core/nextEdit/NextEditEditableRegionCalculator.ts

@@ -1,11 +1,9 @@
 import Parser from "web-tree-sitter";
 import { Chunk, IDE, ILLM, Position, Range, RangeInFile } from "..";
 import { getAst } from "../autocomplete/util/ast";
+import { NEXT_EDIT_MODELS } from "../llm/constants";
 import { DocumentHistoryTracker } from "./DocumentHistoryTracker";
-import {
-  NEXT_EDIT_EDITABLE_REGION_BOTTOM_MARGIN,
-  NEXT_EDIT_EDITABLE_REGION_TOP_MARGIN,
-} from "./constants";
+import { MODEL_WINDOW_SIZES } from "./constants";
 
 export enum EditableRegionStrategy {
   Naive = "naive",
@@ -60,16 +58,16 @@ function naiveJump(ctx: any): RangeInFile[] | null {
 
 // Sliding splits the file using into sliding window.
 function slidingJump(ctx: any): RangeInFile[] | null {
-  const { fileLines, filepath } = ctx;
-  if (!fileLines || !filepath) {
-    console.warn("Missing required context for naive jump");
+  const { fileLines, filepath, modelName, currentCursorPos } = ctx;
+  if (!fileLines || !filepath || !modelName || !currentCursorPos) {
+    console.warn("Missing required context for sliding jump");
     return null;
   }
 
-  const windowSize =
-    NEXT_EDIT_EDITABLE_REGION_TOP_MARGIN +
-    NEXT_EDIT_EDITABLE_REGION_BOTTOM_MARGIN +
-    1; // 1 for current line;
+  const topMargin = MODEL_WINDOW_SIZES[modelName as NEXT_EDIT_MODELS].topMargin;
+  const bottomMargin =
+    MODEL_WINDOW_SIZES[modelName as NEXT_EDIT_MODELS].bottomMargin;
+  const windowSize = topMargin + bottomMargin + 1; // 1 for current line
 
   if (fileLines.length <= windowSize) {
     return [
@@ -86,29 +84,74 @@ function slidingJump(ctx: any): RangeInFile[] | null {
     ];
   }
 
-  const slidingStep = Math.max(1, Math.floor(windowSize / 2));
   const ranges: RangeInFile[] = [];
+  const cursorLine = currentCursorPos.line;
 
-  for (
-    let startLine = 0;
-    startLine < fileLines.length;
-    startLine += slidingStep
-  ) {
-    const endLine = Math.min(startLine + windowSize - 1, fileLines.length - 1);
+  // Create the first window centered around the cursor position
+  const firstWindowStart = Math.max(0, cursorLine - topMargin);
+  const firstWindowEnd = Math.min(
+    fileLines.length - 1,
+    cursorLine + bottomMargin,
+  );
 
-    ranges.push({
-      filepath,
-      range: {
-        start: { line: startLine, character: 0 },
-        end: {
-          line: endLine,
-          character: fileLines[endLine].length,
-        },
+  ranges.push({
+    filepath,
+    range: {
+      start: { line: firstWindowStart, character: 0 },
+      end: {
+        line: firstWindowEnd,
+        character: fileLines[firstWindowEnd].length,
       },
-    });
+    },
+  });
+
+  // Alternating pattern: down once, up once, repeat
+  const slidingStep = Math.max(1, Math.floor(windowSize / 2));
+  let currentStartDown = firstWindowEnd + 1;
+  let currentStartUp = firstWindowStart - slidingStep;
+  while (currentStartDown < fileLines.length || currentStartUp >= 0) {
+    // Go down once
+    if (currentStartDown < fileLines.length) {
+      const windowStart = currentStartDown;
+      const windowEnd = Math.min(
+        windowStart + windowSize - 1,
+        fileLines.length - 1,
+      );
+
+      ranges.push({
+        filepath,
+        range: {
+          start: { line: windowStart, character: 0 },
+          end: {
+            line: windowEnd,
+            character: fileLines[windowEnd].length,
+          },
+        },
+      });
+
+      currentStartDown += slidingStep;
+    }
+
+    // Go up once
+    if (currentStartUp >= 0) {
+      const windowStart = Math.max(0, currentStartUp);
+      const windowEnd = Math.min(
+        windowStart + windowSize - 1,
+        fileLines.length - 1,
+      );
+
+      ranges.push({
+        filepath,
+        range: {
+          start: { line: windowStart, character: 0 },
+          end: {
+            line: windowEnd,
+            character: fileLines[windowEnd].length,
+          },
+        },
+      });
 
-    if (endLine >= fileLines.length - 1) {
-      break;
+      currentStartUp -= slidingStep;
     }
   }
 

core/nextEdit/NextEditPrefetchQueue.ts

@@ -59,6 +59,11 @@ export class PrefetchQueue {
       !this.abortController.signal.aborted
     ) {
       const location = this.dequeueUnprocessed();
+      console.log("processing:");
+      console.log(
+        location?.range.start.line + " to " + location?.range.end.line,
+      );
+
       if (!location) break;
 
       try {
@@ -70,12 +75,20 @@ export class PrefetchQueue {
             this.usingFullFileDiff,
           );
 
-        if (!outcome) continue;
+        if (!outcome) {
+          console.log("outcome is undefined");
+          continue;
+        }
 
         this.enqueueProcessed({
           location,
           outcome,
         });
+
+        console.log(
+          "the length of processed queue after processing is:",
+          this.processedQueue.length,
+        );
       } catch (error) {
         if (!this.abortController.signal.aborted) {
           // Handle error
@@ -115,6 +128,16 @@ export class PrefetchQueue {
     return this.processedQueue[0];
   }
 
+  peekThreeProcessed(): void {
+    const count = Math.min(3, this.processedQueue.length);
+    const firstThree = this.processedQueue.slice(0, count);
+    firstThree.forEach((item, index) => {
+      console.log(
+        `Item ${index + 1}: ${item.location.range.start.line} to ${item.location.range.end.line}`,
+      );
+    });
+  }
+
   setPreetchLimit(limit: number): void {
     this.prefetchLimit = limit;
   }