Edit: Use system prompt format (#3579)

sourcegraph · Mar 27, 2024 · 9c8c47f · 9c8c47f
1 parent 65354ed
commit 9c8c47f
Show file tree

Hide file tree

Showing 8 changed files with 5,542 additions and 5,466 deletions.
diff --git a/agent/recordings/defaultClient_631904893/recording.har.yaml b/agent/recordings/defaultClient_631904893/recording.har.yaml
diff --git a/agent/recordings/enterpriseClient_3965582033/recording.har.yaml b/agent/recordings/enterpriseClient_3965582033/recording.har.yaml
diff --git a/agent/src/index.test.ts b/agent/src/index.test.ts
@@ -880,11 +880,11 @@ describe('Agent', () => {
             checkDocumentCommand(client, 'commands/document (basic function)', 'sum.ts', obtained =>
                 expect(obtained).toMatchInlineSnapshot(`
                   "/**
-                   * Sums two numbers together.
+                   * Adds two numbers together and returns the result.
                    *
-                   * @param a - The first number to add.
-                   * @param b - The second number to add.
-                   * @returns The sum of the two numbers.
+                   * @param a The first number to add.
+                   * @param b The second number to add.
+                   * @returns The sum of \`a\` and \`b\`.
                    */
                   export function sum(a: number, b: number): number {
                       /* CURSOR */
@@ -905,7 +905,7 @@ describe('Agent', () => {
                           constructor(private shouldGreet: boolean) {}
 
                               /**
-                           * Logs a greeting message to the console if the \`shouldGreet\` flag is true.
+                           * Greets the user with "Hello World!" if the \`shouldGreet\` flag is true.
                            */
                       public functionName() {
                               if (this.shouldGreet) {
@@ -964,8 +964,8 @@ describe('Agent', () => {
                           it('does something else', () => {
                               // This line will error due to incorrect usage of \`performance.now\`
                                       /**
-                               * Retrieves the current time in milliseconds since the page was loaded.
-                               * This can be used to measure the elapsed time of an operation.
+                               * Returns the current time in milliseconds since the page was loaded.
+                               * This can be used to measure the duration of an operation.
                                */
                       const startTime = performance.now(/* CURSOR */)
                           })
@@ -1130,14 +1130,16 @@ describe('Agent', () => {
             const originalDocument = client.workspace.getDocument(animalUri)!
             expect(trimEndOfLine(originalDocument.getText())).toMatchInlineSnapshot(
                 `
-              "export interface Animal {
+              "/* SELECTION_START */
+              export interface Animal {
                   name: string
                   makeAnimalSound(): string
                   isMammal: boolean
                   logName(): void {
-                      console.log(this.name)
+                      console.log(this.name);
                   }
               }
+              /* SELECTION_END */
               "
             `,
                 explainPollyError
@@ -1290,10 +1292,11 @@ describe('Agent', () => {
                   import { describe } from 'vitest'
 
                   /**
-                   * Test block that contains 3 sample test cases.
-                   * The 1st case asserts true is true.
-                   * The 2nd case asserts true is true.
-                   * The 3rd case attempts to error by incorrectly using \`performance.now\`.
+                   * Describe block that runs vitest tests.
+                   * Contains 3 test cases:
+                   * - Does test 1
+                   * - Does test 2
+                   * - Does something else (has incorrect usage of performance.now)
                   */
                   describe('test block', () => {
                       it('does 1', () => {

diff --git a/vscode/src/edit/prompt/index.ts b/vscode/src/edit/prompt/index.ts
@@ -101,7 +101,7 @@ export const buildInteraction = async ({
 
     const promptBuilder = new PromptBuilder(contextWindow)
 
-    const preamble = getSimplePreamble(model, codyApiVersion)
+    const preamble = getSimplePreamble(model, codyApiVersion, prompt.system)
     promptBuilder.tryAddToPrefix(preamble)
 
     // Add pre-instruction for edit commands to end of human prompt to override the default
@@ -111,7 +111,7 @@ export const buildInteraction = async ({
         .get('preInstruction')
     const additionalRule = preInstruction ? `\nIMPORTANT: ${preInstruction.trim()}` : ''
 
-    const transcript: ChatMessage[] = [{ speaker: 'human', text: prompt + additionalRule }]
+    const transcript: ChatMessage[] = [{ speaker: 'human', text: prompt.instruction + additionalRule }]
     if (assistantText) {
         transcript.push({ speaker: 'assistant', text: assistantText })
     }