Fix parsing dyad tags with nested tags: < > (#445)

Fixes #441

src/__tests__/chat_stream_handlers.test.ts

@@ -9,6 +9,7 @@ import {
 import fs from "node:fs";
 import git from "isomorphic-git";
 import { db } from "../db";
+import { cleanFullResponse } from "@/ipc/utils/cleanFullResponse";
 
 // Mock fs with default export
 vi.mock("node:fs", async () => {
@@ -139,6 +140,110 @@ console.log("TodoItem");`,
     ]);
   });
 
+  it("should handle missing description", () => {
+    const result = getDyadWriteTags(`
+      <dyad-write path="src/pages/locations/neighborhoods/louisville/Highlands.tsx">
+import React from 'react';
+</dyad-write>
+    `);
+    expect(result).toEqual([
+      {
+        path: "src/pages/locations/neighborhoods/louisville/Highlands.tsx",
+        description: undefined,
+        content: `import React from 'react';`,
+      },
+    ]);
+  });
+
+  it("should handle extra space", () => {
+    const result = getDyadWriteTags(
+      cleanFullResponse(`
+      <dyad-write path="src/pages/locations/neighborhoods/louisville/Highlands.tsx" description="Updating Highlands neighborhood page to use <a> tags." >
+import React from 'react';
+</dyad-write>
+    `),
+    );
+    expect(result).toEqual([
+      {
+        path: "src/pages/locations/neighborhoods/louisville/Highlands.tsx",
+        description: "Updating Highlands neighborhood page to use ＜a＞ tags.",
+        content: `import React from 'react';`,
+      },
+    ]);
+  });
+
+  it("should handle nested tags", () => {
+    const result = getDyadWriteTags(
+      cleanFullResponse(`
+      BEFORE TAG
+  <dyad-write path="src/pages/locations/neighborhoods/louisville/Highlands.tsx" description="Updating Highlands neighborhood page to use <a> tags.">
+import React from 'react';
+</dyad-write>
+AFTER TAG
+    `),
+    );
+    expect(result).toEqual([
+      {
+        path: "src/pages/locations/neighborhoods/louisville/Highlands.tsx",
+        description: "Updating Highlands neighborhood page to use ＜a＞ tags.",
+        content: `import React from 'react';`,
+      },
+    ]);
+  });
+
+  it("should handle nested tags after preprocessing", () => {
+    // Simulate the preprocessing step that cleanFullResponse would do
+    const inputWithNestedTags = `
+      BEFORE TAG
+  <dyad-write path="src/pages/locations/neighborhoods/louisville/Highlands.tsx" description="Updating Highlands neighborhood page to use <a> tags.">
+import React from 'react';
+</dyad-write>
+AFTER TAG
+    `;
+
+    const cleanedInput = cleanFullResponse(inputWithNestedTags);
+
+    const result = getDyadWriteTags(cleanedInput);
+    expect(result).toEqual([
+      {
+        path: "src/pages/locations/neighborhoods/louisville/Highlands.tsx",
+        description: "Updating Highlands neighborhood page to use ＜a＞ tags.",
+        content: `import React from 'react';`,
+      },
+    ]);
+  });
+
+  it("should handle multiple nested tags after preprocessing", () => {
+    const inputWithMultipleNestedTags = `<dyad-write path="src/file.tsx" description="Testing <div> and <span> and <a> tags.">content</dyad-write>`;
+
+    // This simulates what cleanFullResponse should do
+    const cleanedInput = cleanFullResponse(inputWithMultipleNestedTags);
+    const result = getDyadWriteTags(cleanedInput);
+    expect(result).toEqual([
+      {
+        path: "src/file.tsx",
+        description: "Testing ＜div＞ and ＜span＞ and ＜a＞ tags.",
+        content: `content`,
+      },
+    ]);
+  });
+
+  it("should handle nested tags in multiple attributes", () => {
+    const inputWithNestedInMultipleAttrs = `<dyad-write path="src/<component>.tsx" description="Testing <div> tags.">content</dyad-write>`;
+
+    // This simulates what cleanFullResponse should do
+    const cleanedInput = cleanFullResponse(inputWithNestedInMultipleAttrs);
+
+    const result = getDyadWriteTags(cleanedInput);
+    expect(result).toEqual([
+      {
+        path: "src/＜component＞.tsx",
+        description: "Testing ＜div＞ tags.",
+        content: `content`,
+      },
+    ]);
+  });
+
   it("should return an array of dyad-write tags", () => {
     const result = getDyadWriteTags(
       `I'll create a simple todo list app using React, TypeScript, and shadcn/ui components. Let's get started!

src/__tests__/cleanFullResponse.test.ts

@@ -0,0 +1,89 @@
+import { cleanFullResponse } from "@/ipc/utils/cleanFullResponse";
+import { describe, it, expect } from "vitest";
+
+describe("cleanFullResponse", () => {
+  it("should replace < characters in dyad-write attributes", () => {
+    const input = `<dyad-write path="src/file.tsx" description="Testing <a> tags.">content</dyad-write>`;
+    const expected = `<dyad-write path="src/file.tsx" description="Testing ＜a＞ tags.">content</dyad-write>`;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+
+  it("should replace < characters in multiple attributes", () => {
+    const input = `<dyad-write path="src/<component>.tsx" description="Testing <div> tags.">content</dyad-write>`;
+    const expected = `<dyad-write path="src/＜component＞.tsx" description="Testing ＜div＞ tags.">content</dyad-write>`;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+
+  it("should handle multiple nested HTML tags in a single attribute", () => {
+    const input = `<dyad-write path="src/file.tsx" description="Testing <div> and <span> and <a> tags.">content</dyad-write>`;
+    const expected = `<dyad-write path="src/file.tsx" description="Testing ＜div＞ and ＜span＞ and ＜a＞ tags.">content</dyad-write>`;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+
+  it("should handle complex example with mixed content", () => {
+    const input = `
+      BEFORE TAG
+  <dyad-write path="src/pages/locations/neighborhoods/louisville/Highlands.tsx" description="Updating Highlands neighborhood page to use <a> tags.">
+import React from 'react';
+</dyad-write>
+AFTER TAG
+    `;
+
+    const expected = `
+      BEFORE TAG
+  <dyad-write path="src/pages/locations/neighborhoods/louisville/Highlands.tsx" description="Updating Highlands neighborhood page to use ＜a＞ tags.">
+import React from 'react';
+</dyad-write>
+AFTER TAG
+    `;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+
+  it("should handle other dyad tag types", () => {
+    const input = `<dyad-rename from="src/<old>.tsx" to="src/<new>.tsx"></dyad-rename>`;
+    const expected = `<dyad-rename from="src/＜old＞.tsx" to="src/＜new＞.tsx"></dyad-rename>`;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+
+  it("should handle dyad-delete tags", () => {
+    const input = `<dyad-delete path="src/<component>.tsx"></dyad-delete>`;
+    const expected = `<dyad-delete path="src/＜component＞.tsx"></dyad-delete>`;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+
+  it("should not affect content outside dyad tags", () => {
+    const input = `Some text with <regular> HTML tags. <dyad-write path="test.tsx" description="With <nested> tags.">content</dyad-write> More <html> here.`;
+    const expected = `Some text with <regular> HTML tags. <dyad-write path="test.tsx" description="With ＜nested＞ tags.">content</dyad-write> More <html> here.`;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+
+  it("should handle empty attributes", () => {
+    const input = `<dyad-write path="src/file.tsx">content</dyad-write>`;
+    const expected = `<dyad-write path="src/file.tsx">content</dyad-write>`;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+
+  it("should handle attributes without < characters", () => {
+    const input = `<dyad-write path="src/file.tsx" description="Normal description">content</dyad-write>`;
+    const expected = `<dyad-write path="src/file.tsx" description="Normal description">content</dyad-write>`;
+
+    const result = cleanFullResponse(input);
+    expect(result).toBe(expected);
+  });
+});