feat: wrap each recently viewed code snippet inside a token block (#7269)

* feat: wrap each recently viewed code snippet inside a token block

* fix: update vitest

* fix: update test

Author: jpoly1219

core/nextEdit/templating/NextEditPromptEngine.vitest.ts

@@ -14,6 +14,8 @@ import {
   MERCURY_EDIT_DIFF_HISTORY_OPEN,
   MERCURY_RECENTLY_VIEWED_CODE_SNIPPETS_CLOSE,
   MERCURY_RECENTLY_VIEWED_CODE_SNIPPETS_OPEN,
+  MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_CLOSE,
+  MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_OPEN,
 } from "../constants";
 import {
   renderDefaultSystemPrompt,
@@ -31,7 +33,7 @@ describe("NextEditPromptEngine", () => {
 
     beforeEach(() => {
       mercuryHelper = {
-        modelName: "inception/mercury-coder-nextedit" as NEXT_EDIT_MODELS,
+        modelName: "inception/mercury-coder" as NEXT_EDIT_MODELS,
         fileContents: "function test() {\n  const a = 1;\n  return a;\n}",
         pos: { line: 1, character: 12 } as Position,
         lang: { name: "typescript" },
@@ -63,7 +65,7 @@ describe("NextEditPromptEngine", () => {
       };
     });
 
-    it("should render mercury-coder-nextedit prompt correctly", async () => {
+    it("should render mercury-coder prompt correctly", async () => {
       const result = await renderPrompt(mercuryHelper, ctx);
 
       expect(result).toHaveProperty("prompt");
@@ -72,6 +74,8 @@ describe("NextEditPromptEngine", () => {
       const content = result.prompt.content;
       expect(content).toContain(MERCURY_RECENTLY_VIEWED_CODE_SNIPPETS_OPEN);
       expect(content).toContain(MERCURY_RECENTLY_VIEWED_CODE_SNIPPETS_CLOSE);
+      expect(content).toContain(MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_OPEN);
+      expect(content).toContain(MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_CLOSE);
       expect(content).toContain(MERCURY_CURRENT_FILE_CONTENT_OPEN);
       expect(content).toContain(MERCURY_CURRENT_FILE_CONTENT_CLOSE);
       expect(content).toContain(MERCURY_EDIT_DIFF_HISTORY_OPEN);

core/nextEdit/templating/mercuryCoderNextEdit.ts

@@ -3,6 +3,8 @@ import {
   MERCURY_CODE_TO_EDIT_CLOSE,
   MERCURY_CODE_TO_EDIT_OPEN,
   MERCURY_CURSOR,
+  MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_CLOSE,
+  MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_OPEN,
 } from "../constants";
 import { insertCursorToken } from "./utils";
 
@@ -11,8 +13,10 @@ export function recentlyViewedCodeSnippetsBlock(
 ) {
   return recentlyViewedCodeSnippets.reduce((acc, snippet, i) => {
     const block = [
+      MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_OPEN,
       `code_snippet_file_path: ${snippet.filepath}`,
       snippet.content,
+      MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_CLOSE,
     ].join("\n");
 
     return (

core/nextEdit/templating/mercuryCoderNextEdit.vitest.ts

@@ -4,6 +4,8 @@ import {
   MERCURY_CODE_TO_EDIT_CLOSE,
   MERCURY_CODE_TO_EDIT_OPEN,
   MERCURY_CURSOR,
+  MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_CLOSE,
+  MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_OPEN,
 } from "../constants";
 import {
   currentFileContentBlock,
@@ -25,10 +27,14 @@ describe("mercuryCoderNextEdit", () => {
       const result = recentlyViewedCodeSnippetsBlock(snippets);
 
       const expected =
+        `${MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_OPEN}\n` +
         "code_snippet_file_path: /path/to/file1.ts\n" +
         "const a = 1;\n" +
+        `${MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_CLOSE}\n` +
+        `${MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_OPEN}\n` +
         "code_snippet_file_path: /path/to/file2.ts\n" +
-        "function test() { return true; }";
+        "function test() { return true; }\n" +
+        MERCURY_RECENTLY_VIEWED_CODE_SNIPPET_CLOSE;
 
       expect(result).toBe(expected);
     });