Align thread search with rendered markdown text

leonardoxr · leonardoxr · commit a652fd5ee64e · 2026-03-28T22:41:05.000-03:00
diff --git a/apps/web/src/components/chat/threadSearch.test.ts b/apps/web/src/components/chat/threadSearch.test.ts
@@ -33,6 +33,27 @@ const rows: TimelineRow[] = [
       ],
     },
   },
+  {
+    kind: "message",
+    id: "assistant-markdown-row",
+    createdAt: "2026-03-28T12:00:02.000Z",
+    durationStart: "2026-03-28T12:00:02.000Z",
+    showCompletionDivider: false,
+    message: {
+      id: MessageId.makeUnsafe("message-1a"),
+      role: "assistant",
+      text: [
+        "See [thread search docs](https://example.com/thread-search) for **alpha marker** details.",
+        "",
+        "```ts",
+        "const planSeed = 'seeded';",
+        "```",
+      ].join("\n"),
+      createdAt: "2026-03-28T12:00:02.000Z",
+      streaming: false,
+      attachments: [],
+    },
+  },
   {
     kind: "message",
     id: "user-message-row",
@@ -110,13 +131,36 @@ const rows: TimelineRow[] = [
     proposedPlan: {
       id: "plan-1" as never,
       turnId: null,
-      planMarkdown: "1. Add thread search\n2. Jump to the matching row",
+      planMarkdown: [
+        "# Seeded Thread Search Plan",
+        "",
+        "## Summary",
+        "",
+        "1. Add **thread search**",
+        "2. Jump to the matching row",
+        "3. Review [plan docs](https://example.com/plan-docs)",
+      ].join("\n"),
       implementedAt: null,
       implementationThreadId: null,
       createdAt: "2026-03-28T12:00:20.000Z",
       updatedAt: "2026-03-28T12:00:20.000Z",
     },
   },
+  {
+    kind: "message",
+    id: "assistant-empty-row",
+    createdAt: "2026-03-28T12:00:25.000Z",
+    durationStart: "2026-03-28T12:00:25.000Z",
+    showCompletionDivider: false,
+    message: {
+      id: MessageId.makeUnsafe("message-empty"),
+      role: "assistant",
+      text: "",
+      createdAt: "2026-03-28T12:00:25.000Z",
+      streaming: false,
+      attachments: [],
+    },
+  },
   {
     kind: "working",
     id: "working-row",
@@ -133,8 +177,15 @@ describe("findThreadSearchResults", () => {
         normalizedTexts: ["needle in the response. another needle is here."],
       },
       {
-        rowId: "user-message-row",
+        rowId: "assistant-markdown-row",
         rowIndex: 1,
+        normalizedTexts: [
+          "see thread search docs for alpha marker details.\n\nconst planseed = 'seeded';",
+        ],
+      },
+      {
+        rowId: "user-message-row",
+        rowIndex: 2,
         normalizedTexts: [
           "visible composer text @terminal-1:1-5",
           "terminal 1 lines 1-5",
@@ -143,12 +194,12 @@ describe("findThreadSearchResults", () => {
       },
       {
         rowId: "work-row",
-        rowIndex: 2,
+        rowIndex: 3,
         normalizedTexts: ["edit readme", "bun run lint", "readme.md"],
       },
       {
         rowId: "work-row-visible-files",
-        rowIndex: 3,
+        rowIndex: 4,
         normalizedTexts: [
           "apply patch",
           "git status",
@@ -160,12 +211,20 @@ describe("findThreadSearchResults", () => {
       },
       {
         rowId: "plan-row",
-        rowIndex: 4,
-        normalizedTexts: ["1. add thread search\n2. jump to the matching row"],
+        rowIndex: 5,
+        normalizedTexts: [
+          "seeded thread search plan",
+          "add thread search\njump to the matching row\nreview plan docs",
+        ],
+      },
+      {
+        rowId: "assistant-empty-row",
+        rowIndex: 6,
+        normalizedTexts: ["(empty response)"],
       },
       {
         rowId: "working-row",
-        rowIndex: 5,
+        rowIndex: 7,
         normalizedTexts: [],
       },
     ]);
@@ -185,7 +244,7 @@ describe("findThreadSearchResults", () => {
     expect(findThreadSearchResults(rows, "readme")).toEqual([
       {
         rowId: "work-row",
-        rowIndex: 2,
+        rowIndex: 3,
         matchCount: 2,
       },
     ]);
@@ -195,17 +254,17 @@ describe("findThreadSearchResults", () => {
     expect(findThreadSearchResults(rows, "edit readme")).toEqual([
       {
         rowId: "work-row",
-        rowIndex: 2,
+        rowIndex: 3,
         matchCount: 1,
       },
     ]);
   });
 
-  it("matches proposed plans and ignores the working indicator", () => {
-    expect(findThreadSearchResults(rows, "thread search")).toEqual([
+  it("matches displayed proposed-plan body content and ignores the working indicator", () => {
+    expect(findThreadSearchResults(rows, "jump to the matching row")).toEqual([
       {
         rowId: "plan-row",
-        rowIndex: 4,
+        rowIndex: 5,
         matchCount: 1,
       },
     ]);
@@ -218,21 +277,21 @@ describe("findThreadSearchResults", () => {
     expect(findThreadSearchResults(rows, "visible composer text")).toEqual([
       {
         rowId: "user-message-row",
-        rowIndex: 1,
+        rowIndex: 2,
         matchCount: 1,
       },
     ]);
     expect(findThreadSearchResults(rows, "terminal 1 lines 1-5")).toEqual([
       {
         rowId: "user-message-row",
-        rowIndex: 1,
+        rowIndex: 2,
         matchCount: 1,
       },
     ]);
     expect(findThreadSearchResults(rows, "visible-upload-name")).toEqual([
       {
         rowId: "user-message-row",
-        rowIndex: 1,
+        rowIndex: 2,
         matchCount: 1,
       },
     ]);
@@ -242,21 +301,68 @@ describe("findThreadSearchResults", () => {
     expect(findThreadSearchResults(rows, "apply patch")).toEqual([
       {
         rowId: "work-row-visible-files",
-        rowIndex: 3,
+        rowIndex: 4,
         matchCount: 1,
       },
     ]);
     expect(findThreadSearchResults(rows, "completed")).toEqual([]);
     expect(findThreadSearchResults(rows, "src/d.ts")).toEqual([
       {
         rowId: "work-row-visible-files",
-        rowIndex: 3,
+        rowIndex: 4,
         matchCount: 1,
       },
     ]);
     expect(findThreadSearchResults(rows, "src/e.ts")).toEqual([]);
   });
 
+  it("indexes assistant markdown by rendered text instead of raw markdown syntax", () => {
+    expect(findThreadSearchResults(rows, "thread search docs")).toEqual([
+      {
+        rowId: "assistant-markdown-row",
+        rowIndex: 1,
+        matchCount: 1,
+      },
+    ]);
+    expect(findThreadSearchResults(rows, "alpha marker")).toEqual([
+      {
+        rowId: "assistant-markdown-row",
+        rowIndex: 1,
+        matchCount: 1,
+      },
+    ]);
+    expect(findThreadSearchResults(rows, "https://example.com/thread-search")).toEqual([]);
+  });
+
+  it("indexes proposed plans by displayed title and body instead of raw markdown", () => {
+    expect(findThreadSearchResults(rows, "seeded thread search plan")).toEqual([
+      {
+        rowId: "plan-row",
+        rowIndex: 5,
+        matchCount: 1,
+      },
+    ]);
+    expect(findThreadSearchResults(rows, "plan docs")).toEqual([
+      {
+        rowId: "plan-row",
+        rowIndex: 5,
+        matchCount: 1,
+      },
+    ]);
+    expect(findThreadSearchResults(rows, "summary")).toEqual([]);
+    expect(findThreadSearchResults(rows, "https://example.com/plan-docs")).toEqual([]);
+  });
+
+  it("indexes the rendered empty assistant placeholder text", () => {
+    expect(findThreadSearchResults(rows, "(empty response)")).toEqual([
+      {
+        rowId: "assistant-empty-row",
+        rowIndex: 6,
+        matchCount: 1,
+      },
+    ]);
+  });
+
   it("returns no results for empty queries", () => {
     expect(findThreadSearchResults(rows, "   ")).toEqual([]);
   });
@@ -265,7 +371,7 @@ describe("findThreadSearchResults", () => {
     expect(findThreadSearchResults(rows, "row")).toEqual([
       {
         rowId: "plan-row",
-        rowIndex: 4,
+        rowIndex: 5,
         matchCount: 1,
       },
     ]);
@@ -299,7 +405,10 @@ describe("findThreadSearchResults", () => {
     const previousState = findThreadSearchLookupState(index, "thread search");
     const nextState = findThreadSearchLookupState(index, "e", previousState);
 
-    expect(previousState.matchingEntries.map((entry) => entry.rowId)).toEqual(["plan-row"]);
+    expect(previousState.matchingEntries.map((entry) => entry.rowId)).toEqual([
+      "assistant-markdown-row",
+      "plan-row",
+    ]);
     expect(nextState.results).toEqual(findThreadSearchResultsFromIndex(index, "e"));
   });
 });
diff --git a/apps/web/src/components/chat/threadSearch.ts b/apps/web/src/components/chat/threadSearch.ts
@@ -4,6 +4,8 @@ import {
   renderableWorkEntryPreview,
   type TimelineRow,
 } from "./MessagesTimeline.logic";
+import { stripDisplayedPlanMarkdown, proposedPlanTitle } from "~/proposedPlan";
+import { markdownToPlainText } from "~/lib/markdownPlainText";
 import { deriveDisplayedUserMessageState } from "~/lib/terminalContext";
 
 export interface ThreadSearchResult {
@@ -50,6 +52,10 @@ function countMatches(haystack: string, needle: string): number {
 function collectRowSearchText(row: TimelineRow): string[] {
   switch (row.kind) {
     case "message": {
+      const visibleAssistantText =
+        row.message.role === "assistant"
+          ? row.message.text || (row.message.streaming ? "" : "(empty response)")
+          : "";
       const visibleMessageState =
         row.message.role === "user" ? deriveDisplayedUserMessageState(row.message.text) : null;
       const visibleAttachmentNames =
@@ -63,13 +69,18 @@ function collectRowSearchText(row: TimelineRow): string[] {
           ? (visibleMessageState?.contexts.map((context) => context.header) ?? [])
           : [];
       return [
-        row.message.role === "user" ? (visibleMessageState?.visibleText ?? "") : row.message.text,
+        row.message.role === "user"
+          ? (visibleMessageState?.visibleText ?? "")
+          : markdownToPlainText(visibleAssistantText),
         ...visibleTerminalChipLabels,
         ...visibleAttachmentNames,
       ];
     }
-    case "proposed-plan":
-      return [row.proposedPlan.planMarkdown];
+    case "proposed-plan": {
+      const title = proposedPlanTitle(row.proposedPlan.planMarkdown) ?? "";
+      const displayedBody = stripDisplayedPlanMarkdown(row.proposedPlan.planMarkdown);
+      return [title, markdownToPlainText(displayedBody)];
+    }
     case "work":
       return row.groupedEntries.flatMap((entry) => [
         renderableWorkEntryHeading(entry),
diff --git a/apps/web/src/lib/markdownPlainText.test.ts b/apps/web/src/lib/markdownPlainText.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from "vitest";
+
+import { markdownToPlainText } from "./markdownPlainText";
+
+describe("markdownToPlainText", () => {
+  it("keeps rendered link text and removes raw markdown destinations", () => {
+    expect(
+      markdownToPlainText("See [thread search docs](https://example.com/thread-search) next."),
+    ).toBe("See thread search docs next.");
+  });
+
+  it("keeps visible code text while removing markdown fence syntax", () => {
+    expect(markdownToPlainText("```ts\nconst marker = 'alpha';\n```")).toBe(
+      "const marker = 'alpha';",
+    );
+  });
+
+  it("removes the first-line markdown structure while preserving visible content", () => {
+    expect(
+      markdownToPlainText("# Heading\n\n## Summary\n\n- **alpha marker**\n- `thread search`"),
+    ).toBe("Heading\nSummary\nalpha marker\nthread search");
+  });
+});
diff --git a/apps/web/src/lib/markdownPlainText.ts b/apps/web/src/lib/markdownPlainText.ts
@@ -0,0 +1,42 @@
+const FENCED_CODE_BLOCK_REGEX = /(^|\n)(`{3,}|~{3,})[^\n]*\n([\s\S]*?)\n\2(?=\n|$)/g;
+const INLINE_CODE_REGEX = /`([^`\n]+)`/g;
+const IMAGE_LINK_REGEX = /!\[([^\]]*)\]\((?:\\.|[^)])*\)/g;
+const INLINE_LINK_REGEX = /\[([^\]]+)\]\((?:\\.|[^)])*\)/g;
+const REFERENCE_LINK_REGEX = /\[([^\]]+)\]\[[^\]]*]/g;
+const REFERENCE_DEFINITION_REGEX = /^\s{0,3}\[[^\]]+]:\s+\S+(?:\s+.+)?$/gm;
+const HTML_COMMENT_REGEX = /<!--[\s\S]*?-->/g;
+const AUTOLINK_REGEX = /<((?:https?|mailto):[^>\s]+)>/g;
+const HTML_TAG_REGEX = /<\/?[^>\n]+>/g;
+const HEADING_PREFIX_REGEX = /^\s{0,3}#{1,6}\s+/gm;
+const BLOCKQUOTE_PREFIX_REGEX = /^\s{0,3}>\s?/gm;
+const LIST_PREFIX_REGEX = /^\s{0,3}(?:[-+*]|\d+[.)])\s+/gm;
+const THEMATIC_BREAK_REGEX = /^\s{0,3}(?:[-*_]\s*){3,}$/gm;
+const EMPHASIS_REGEXES = [/(\*\*\*|___)(.*?)\1/gs, /(\*\*|__)(.*?)\1/gs, /(~~)(.*?)\1/gs] as const;
+
+export function markdownToPlainText(markdown: string): string {
+  let text = markdown.replace(/\r\n?/g, "\n");
+
+  text = text.replace(HTML_COMMENT_REGEX, " ");
+  text = text.replace(
+    FENCED_CODE_BLOCK_REGEX,
+    (_match, prefix: string, _fence: string, code: string) => `${prefix}${code}\n`,
+  );
+  text = text.replace(IMAGE_LINK_REGEX, "$1");
+  text = text.replace(INLINE_LINK_REGEX, "$1");
+  text = text.replace(REFERENCE_LINK_REGEX, "$1");
+  text = text.replace(REFERENCE_DEFINITION_REGEX, "");
+  text = text.replace(AUTOLINK_REGEX, "$1");
+  text = text.replace(INLINE_CODE_REGEX, "$1");
+
+  for (const regex of EMPHASIS_REGEXES) {
+    text = text.replace(regex, "$2");
+  }
+
+  text = text.replace(HEADING_PREFIX_REGEX, "");
+  text = text.replace(BLOCKQUOTE_PREFIX_REGEX, "");
+  text = text.replace(LIST_PREFIX_REGEX, "");
+  text = text.replace(THEMATIC_BREAK_REGEX, "");
+  text = text.replace(HTML_TAG_REGEX, " ");
+
+  return text.trim();
+}
