improve test debug messages

Author: dlants

bun/chat/chat.ts

@@ -222,16 +222,30 @@ export function init({ nvim, lsp }: { nvim: Nvim; lsp: Lsp }) {
         }
 
         if (msg.msg.type == "diff-error") {
-          const message = model.messages[msg.idx];
-          const edit = message.edits[msg.msg.filePath];
-          edit.status = {
-            status: "error",
-            message: msg.msg.message,
-          };
-
-          // TODO: maybe update request status with error?
-          // for (const requestId of edit.requestIds) {
-          // }
+          if (msg.msg.requestId) {
+            const toolWrapper =
+              model.toolManager.toolWrappers[msg.msg.requestId];
+            if (toolWrapper) {
+              toolWrapper.model.state = {
+                state: "done",
+                result: {
+                  type: "tool_result",
+                  id: msg.msg.requestId,
+                  result: {
+                    status: "error",
+                    error: msg.msg.message,
+                  },
+                },
+              };
+            }
+          } else {
+            const message = model.messages[msg.idx];
+            const edit = message.edits[msg.msg.filePath];
+            edit.status = {
+              status: "error",
+              message: msg.msg.message,
+            };
+          }
           return [model];
         }
 

bun/chat/message.spec.ts

@@ -4,7 +4,7 @@ import type { ToolRequestId } from "../tools/toolManager";
 import { REVIEW_PROMPT } from "../tools/diff";
 
 describe("bun/chat/message.spec.ts", () => {
-  it("display multiple edits to the same file, and edit details", async () => {
+  it.only("display multiple edits to the same file, and edit details", async () => {
     await withDriver(async (driver) => {
       await driver.showSidebar();
       await driver.inputMagentaText(
@@ -60,6 +60,7 @@ Edits:
 # assistant:
 ok, I will try to rewrite the poem in that file
 Replace [[ -2 / +1 ]] in bun/test/fixtures/poem.txt Awaiting user review.
+id: id1
 replace: {
     filePath: bun/test/fixtures/poem.txt
     match:
@@ -79,8 +80,7 @@ ${REVIEW_PROMPT}
 Replace [[ -2 / +1 ]] in bun/test/fixtures/poem.txt Awaiting user review.
 
 Edits:
-  bun/test/fixtures/poem.txt (2 edits). **[👀 review edits ]**
-`);
+  bun/test/fixtures/poem.txt (2 edits). **[👀 review edits ]**`);
 
       await driver.triggerDisplayBufferKey(reviewPos, "<CR>");
 

bun/test/driver.ts

@@ -12,6 +12,7 @@ import { pollUntil } from "../utils/async";
 import { calculatePosition } from "../tea/util";
 import type { BindingKey } from "../tea/bindings";
 import { getAllWindows, getCurrentWindow } from "../nvim/nvim";
+import { expect } from "bun:test";
 
 export class NvimDriver {
   constructor(
@@ -88,23 +89,31 @@ export class NvimDriver {
     text: string,
     start: number = 0,
   ): Promise<Position0Indexed> {
-    return pollUntil(async () => {
+    try {
+      return await pollUntil(async () => {
+        const displayBuffer = this.getDisplayBuffer();
+        const lines = await displayBuffer.getLines({ start: 0, end: -1 });
+        const content = lines.slice(start).join("\n");
+        const index = Buffer.from(content).indexOf(text) as ByteIdx;
+        if (index == -1) {
+          throw new Error(
+            `! Unable to find text after line ${start} in displayBuffer`,
+          );
+        }
+
+        return calculatePosition(
+          { row: start, col: 0 } as Position0Indexed,
+          Buffer.from(content),
+          index,
+        );
+      });
+    } catch (e) {
       const displayBuffer = this.getDisplayBuffer();
       const lines = await displayBuffer.getLines({ start: 0, end: -1 });
       const content = lines.slice(start).join("\n");
-      const index = Buffer.from(content).indexOf(text) as ByteIdx;
-      if (index == -1) {
-        throw new Error(
-          `Unable to find text:\n"${text}"\nafter line ${start} in displayBuffer.\ndisplayBuffer content:\n${content}`,
-        );
-      }
-
-      return calculatePosition(
-        { row: start, col: 0 } as Position0Indexed,
-        Buffer.from(content),
-        index,
-      );
-    });
+      expect(content, (e as Error).message).toEqual(text);
+      throw e;
+    }
   }
 
   async assertInputBufferContains(

bun/tools/diff.spec.ts

@@ -414,7 +414,8 @@ Paints its colors in the light.`,
       await driver.assertDisplayBufferContains(`\
 # assistant:
 ok, I will try to rewrite the poem in that file
-Replace [[ -1 / +1 ]] in bun/test/fixtures/poem.txt Awaiting user review.
+Replace [[ -1 / +1 ]] in bun/test/fixtures/poem.txt ⚠️ Error: "Unable to find text \\"bogus line...\\" in file bun/test/fixtures/poem.txt"
+id: id1
 replace: {
     filePath: bun/test/fixtures/poem.txt
     match:
@@ -426,27 +427,20 @@ bogus line...
 Replace text
 \`\`\`
 }
-Result:
-\`\`\`
-The user will review your proposed change.
-Assume that your change will be accepted and address other parts of the question, if any exist.
-Do not take more attempts at the same edit unless the user requests it.
-\`\`\`
+Error: Unable to find text "bogus line..." in file bun/test/fixtures/poem.txt
 Insert 1 lines. Awaiting user review.
 
 Edits:
-  bun/test/fixtures/poem.txt (2 edits). **[👀 review edits ]**
-Error applying edit: Unable to find text "bogus line..." in file bun/test/fixtures/poem.txt`);
+  bun/test/fixtures/poem.txt (2 edits). **[👀 review edits ]**`);
       await driver.triggerDisplayBufferKey(detailsPos, "<CR>");
       await driver.assertDisplayBufferContains(`\
 # assistant:
 ok, I will try to rewrite the poem in that file
-Replace [[ -1 / +1 ]] in bun/test/fixtures/poem.txt Awaiting user review.
+Replace [[ -1 / +1 ]] in bun/test/fixtures/poem.txt ⚠️ Error: "Unable to find text \\"bogus line...\\" in file bun/test/fixtures/poem.txt"
 Insert 1 lines. Awaiting user review.
 
 Edits:
-  bun/test/fixtures/poem.txt (2 edits). **[👀 review edits ]**
-Error applying edit: Unable to find text "bogus line..." in file bun/test/fixtures/poem.txt`);
+  bun/test/fixtures/poem.txt (2 edits). **[👀 review edits ]**`);
     });
   });
 });