Skip to content

Commit 37ed1f7

Browse files
tsapa44claude
andcommitted
fix(web): keep typed list numbers only in user messages
The sent bubble should show what the composer showed and what the agent received, which is the text as typed. Agent replies, PR descriptions and file previews are markdown written to be rendered, so they keep CommonMark numbering, and a README written as 1. 1. 1. still reads 1, 2, 3. User message bodies opt in through extraRemarkPlugins. They render without the sanitizer, so li value no longer needs to be allowed there. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent e767724 commit 37ed1f7

5 files changed

Lines changed: 50 additions & 14 deletions

File tree

‎apps/web/src/components/chat/TimelineUserMessageRow.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { InlineAudioPreview } from "../files/InlineAudioPreview";
22
import { filePreviewKind } from "@t3tools/shared/filePreview";
3+
import { remarkEnableOrderedListNumbers } from "@t3tools/shared/markdownPipeline";
34
import { findRevealRef } from "./markdownFindContext";
45
import {
56
type EnvironmentId,
@@ -1174,6 +1175,8 @@ const CollapsibleUserMessageBody = memo(function CollapsibleUserMessageBody(prop
11741175
);
11751176
});
11761177

1178+
const USER_MESSAGE_REMARK_PLUGINS = [remarkEnableOrderedListNumbers];
1179+
11771180
const UserMessageBody = memo(function UserMessageBody(props: {
11781181
text: string;
11791182
renderContextReference?: (reference: ChatMarkdownContextReference) => ReactNode;
@@ -1193,6 +1196,7 @@ const UserMessageBody = memo(function UserMessageBody(props: {
11931196
className="text-foreground"
11941197
lineBreaks
11951198
parseRawHtml={false}
1199+
extraRemarkPlugins={USER_MESSAGE_REMARK_PLUGINS}
11961200
renderContextReference={props.renderContextReference}
11971201
headingLevelOffset={MESSAGE_HEADING_LEVEL}
11981202
/>

‎packages/shared/src/markdownListIndentation.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { keepOrderedListNumbers } from "./markdownOrderedListNumbers.ts";
1+
import { keepOrderedListNumbers, keepsOrderedListNumbers } from "./markdownOrderedListNumbers.ts";
22

33
interface MarkdownPosition {
44
readonly start?: {
@@ -93,7 +93,9 @@ function parseRecoveredMarkdown(value: string, parser: MarkdownParser): Recovere
9393
function blocksFromIndentedCode(node: MarkdownAstNode, parser: MarkdownParser): RecoveredMarkdown {
9494
const value = typeof node.value === "string" ? node.value.trim() : "";
9595
const recovered = parseRecoveredMarkdown(value, parser);
96-
for (const block of recovered.blocks) keepOrderedListNumbers(block, recovered.source);
96+
if (keepsOrderedListNumbers(parser)) {
97+
for (const block of recovered.blocks) keepOrderedListNumbers(block, recovered.source);
98+
}
9799
const first = recovered.blocks[0];
98100
return {
99101
...recovered,

‎packages/shared/src/markdownOrderedListNumbers.ts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,23 @@ export function keepOrderedListNumbers(node: MarkdownListNode, source: string):
4040
for (const child of node.children) keepOrderedListNumbers(child, source);
4141
}
4242

43-
export function remarkKeepOrderedListNumbers(): Transformer<Root> {
44-
return (tree, file) => keepOrderedListNumbers(tree, String(file));
43+
const enabledProcessors = new WeakSet<object>();
44+
45+
/**
46+
* Opts a processor in. User messages use it so the sent bubble shows the numbers the composer
47+
* showed and the agent received; agent replies and files keep CommonMark numbering.
48+
*/
49+
export function remarkEnableOrderedListNumbers(this: object): undefined {
50+
enabledProcessors.add(this);
51+
}
52+
53+
export function keepsOrderedListNumbers(processor: object): boolean {
54+
return enabledProcessors.has(processor);
55+
}
56+
57+
/** Sits before list recovery so offsets still point into the file. */
58+
export function remarkKeepOrderedListNumbers(this: object): Transformer<Root> {
59+
return (tree, file) => {
60+
if (enabledProcessors.has(this)) keepOrderedListNumbers(tree, String(file));
61+
};
4562
}

‎packages/shared/src/markdownPipeline.test.ts‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect, it } from "vite-plus/test";
2-
import { unified } from "unified";
2+
import { type PluggableList, unified } from "unified";
33
import rehypeRaw from "rehype-raw";
44
import remarkParse from "remark-parse";
55
import remarkRehype from "remark-rehype";
@@ -8,6 +8,7 @@ import {
88
CHAT_MARKDOWN_REHYPE_PLUGINS,
99
CHAT_MARKDOWN_REMARK_PLUGINS,
1010
CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS,
11+
remarkEnableOrderedListNumbers,
1112
} from "./markdownPipeline.ts";
1213

1314
it.each([
@@ -309,21 +310,27 @@ it("keeps an image on its own line under a label but leaves inline images inline
309310
expect(render("Hard-wrapped\nprose")).toBe("Hard-wrapped\nprose");
310311
});
311312

312-
it("keeps the number written on each ordered list item", () => {
313-
const processor = unified()
314-
.use(remarkParse)
315-
.use(CHAT_MARKDOWN_REMARK_PLUGINS)
316-
.use(remarkRehype, { allowDangerousHtml: true })
317-
.use(CHAT_MARKDOWN_REHYPE_PLUGINS);
313+
it("keeps the number written on each ordered list item only when enabled", () => {
318314
type Node = { tagName?: string; properties?: { value?: unknown }; children?: Node[] };
319315
const values = (node: Node): unknown[] => [
320316
...(node.tagName === "li" ? [node.properties?.value] : []),
321317
...(node.children ?? []).flatMap(values),
322318
];
323-
const render = (markdown: string) =>
324-
values(processor.runSync(processor.parse(markdown), markdown) as Node);
319+
const renderer = (plugins: PluggableList) => {
320+
const processor = unified()
321+
.use(remarkParse)
322+
.use(plugins)
323+
.use(remarkRehype, { allowDangerousHtml: true });
324+
return (markdown: string) =>
325+
values(processor.runSync(processor.parse(markdown), markdown) as Node);
326+
};
327+
const render = renderer([
328+
...CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS,
329+
remarkEnableOrderedListNumbers,
330+
]);
325331

326332
expect(render("3. first\n5. second\n6. third")).toEqual([undefined, "5", undefined]);
333+
expect(render("1. one\n1. one again")).toEqual([undefined, "1"]);
327334
expect(render("> 1. quoted\n> 4. skipped")).toEqual([undefined, "4"]);
328335
expect(render("1. outer\n 1. nested\n 7. jump\n9. back")).toEqual([
329336
undefined,
@@ -337,6 +344,11 @@ it("keeps the number written on each ordered list item", () => {
337344
undefined,
338345
"5",
339346
]);
347+
expect(
348+
renderer(CHAT_MARKDOWN_REMARK_PLUGINS)(
349+
"3. first\n5. second\n\n- first block\n\n 3. first\n 5. second",
350+
),
351+
).toEqual([undefined, undefined, undefined, undefined, undefined]);
340352
});
341353

342354
it("moves a <picture>'s color-scheme sources onto its <img>, which the renderer resolves", () => {

‎packages/shared/src/markdownPipeline.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import {
1919
import { isWindowsDrivePathHref, normalizeMarkdownLinkDestination } from "./markdownLinks.ts";
2020
import { THREAD_LINK_PROTOCOL } from "./threadLinks.ts";
2121

22+
export { remarkEnableOrderedListNumbers } from "./markdownOrderedListNumbers.ts";
23+
2224
type MarkdownImageHastNode = {
2325
type?: string;
2426
value?: string;
@@ -200,7 +202,6 @@ const CHAT_MARKDOWN_SANITIZE_SCHEMA = {
200202
blockquote: [...(defaultSchema.attributes?.blockquote ?? []), "dataAlert"],
201203
div: [...(defaultSchema.attributes?.div ?? []), ...CODEX_ARTIFACT_TEMPLATE_HAST_PROPERTIES],
202204
a: [...(defaultSchema.attributes?.a ?? []), "dataPullRequestAutolink"],
203-
li: [...(defaultSchema.attributes?.li ?? []), "value"],
204205
img: [
205206
...(defaultSchema.attributes?.img ?? []),
206207
"dataDarkSrc",

0 commit comments

Comments
 (0)