Open-source AI browser agent for Chrome and Firefox (monorepo) ðŸ§
JavaScript ai-agentai-agentsai-toolsbrowser-aibrowser-automationbrowser-extensionchrome-aichrome-devtoolschrome-extensionchrome-extensionsfirefox-addonfirefox-addonsfirefox-extensionfirefox-extensionsgemmagemma4minimaxoffline-aioffline-llmqwen
Preserve nested Markdown fences in final assistant renders
Emre Sokulluea149d45b9da
diff --git a/src/chrome/src/ui/sidepanel.js b/src/chrome/src/ui/sidepanel.jsindex 610cd2a8e..8ce807ac5 100644--- a/src/chrome/src/ui/sidepanel.js+++ b/src/chrome/src/ui/sidepanel.js@@ -3468,7 +3468,7 @@ async function settleScheduledRun(event, job, tabId = currentTabId) {['completed', 'clarification_required'].includes(event)|| watchPollEvent) && job?.lastResult) {- textEl.innerHTML = formatMarkdown(job.lastResult);+ textEl.innerHTML = formatMarkdown(job.lastResult, { recoverNestedMarkdown: true });addMessageCopyButton(assistantEl);}}@@ -9221,7 +9221,7 @@ async function sendMessage(extraChatParams = {}) {retryPayload,})&& !renderSubscribeError(textEl, res.content, modeForSend)) {- textEl.innerHTML = formatMarkdown(res.content);+ textEl.innerHTML = formatMarkdown(res.content, { recoverNestedMarkdown: true });}addMessageCopyButton(assistantEl);}@@ -10023,7 +10023,7 @@ function handleAgentUpdateMessage(msg) {submittedTurnDurable: data.submittedTurnDurable,retryPayload: activeRetryPayloadForRequest(eventTabId, msg.requestId),})- && !renderSubscribeError(textEl, data.finalContent)) textEl.innerHTML = formatMarkdown(data.finalContent);+ && !renderSubscribeError(textEl, data.finalContent)) textEl.innerHTML = formatMarkdown(data.finalContent, { recoverNestedMarkdown: true });addMessageCopyButton(currentAssistantEl);}}@@ -11263,13 +11263,15 @@ function renderAssistantTextUpdate(assistantEl, content, options = {}) {const streamedText = getStreamedAssistantText(textEl);const hasStreamedText = hasStreamedAssistantText(textEl);const restoredStreamNeedsReplacement = hasStreamedText && !streamedText;+ // Final text must keep the same Markdown fence structure shown during streaming.+ const renderedContent = formatMarkdown(content, { recoverNestedMarkdown: true });if (options.replace === true || restoredStreamNeedsReplacement) {// A rejected streamed terminal must replace its already-rendered deltas// even in Verbose mode; appending would leave the invalid plan visible.// Empty content clears the bubble (plan-only retry before recovery tools).if (content) {- textEl.innerHTML = formatMarkdown(content);+ textEl.innerHTML = renderedContent;streamedAssistantTextByEl.set(textEl, String(content));} else {textEl.textContent = '';@@ -11282,12 +11284,12 @@ function renderAssistantTextUpdate(assistantEl, content, options = {}) {// content in place even when cleanup changed it from the raw stream.const para = document.createElement('div');para.className = 'reasoning-step';- para.innerHTML = formatMarkdown(content);+ para.innerHTML = renderedContent;textEl.appendChild(para);} else {// Compact mode keeps only the latest blurb. A streamed final lands here// too for one authoritative render with terminal-only enhancements.- textEl.innerHTML = formatMarkdown(content);+ textEl.innerHTML = renderedContent;}clearStreamedAssistantText(textEl);@@ -12109,7 +12111,7 @@ function addMessage(role, content, options = {}) {options.costAllowanceResume,)&& !renderSubscribeError(textEl, content, options.subscribeResumeMode)) {- textEl.innerHTML = content ? formatMarkdown(content) : '';+ textEl.innerHTML = content ? formatMarkdown(content, { recoverNestedMarkdown: role === 'assistant' }) : '';}contentEl.appendChild(textEl);@@ -12336,7 +12338,7 @@ async function continueAgent(options = {}) {submittedTurnDurable: res.submittedTurnDurable,})&& !renderSubscribeError(textEl, res.content)) {- textEl.innerHTML = formatMarkdown(res.content);+ textEl.innerHTML = formatMarkdown(res.content, { recoverNestedMarkdown: true });}addMessageCopyButton(assistantEl);}diff --git a/src/firefox/src/ui/sidepanel.js b/src/firefox/src/ui/sidepanel.jsindex a87115be5..c27b46f56 100644--- a/src/firefox/src/ui/sidepanel.js+++ b/src/firefox/src/ui/sidepanel.js@@ -3319,7 +3319,7 @@ async function settleScheduledRun(event, job, tabId = currentTabId) {['completed', 'clarification_required'].includes(event)|| watchPollEvent) && job?.lastResult) {- textEl.innerHTML = formatMarkdown(job.lastResult);+ textEl.innerHTML = formatMarkdown(job.lastResult, { recoverNestedMarkdown: true });addMessageCopyButton(assistantEl);}}@@ -8872,7 +8872,7 @@ async function sendMessage(extraChatParams = {}) {retryPayload,})&& !renderSubscribeError(textEl, res.content, modeForSend)) {- textEl.innerHTML = formatMarkdown(res.content);+ textEl.innerHTML = formatMarkdown(res.content, { recoverNestedMarkdown: true });}addMessageCopyButton(assistantEl);}@@ -9483,7 +9483,7 @@ function handleAgentUpdateMessage(msg) {submittedTurnDurable: data.submittedTurnDurable,retryPayload: activeRetryPayloadForRequest(eventTabId, msg.requestId),})- && !renderSubscribeError(textEl, data.finalContent)) textEl.innerHTML = formatMarkdown(data.finalContent);+ && !renderSubscribeError(textEl, data.finalContent)) textEl.innerHTML = formatMarkdown(data.finalContent, { recoverNestedMarkdown: true });addMessageCopyButton(currentAssistantEl);}}@@ -10862,13 +10862,15 @@ function renderAssistantTextUpdate(assistantEl, content, options = {}) {const streamedText = getStreamedAssistantText(textEl);const hasStreamedText = hasStreamedAssistantText(textEl);const restoredStreamNeedsReplacement = hasStreamedText && !streamedText;+ // Final text must keep the same Markdown fence structure shown during streaming.+ const renderedContent = formatMarkdown(content, { recoverNestedMarkdown: true });if (options.replace === true || restoredStreamNeedsReplacement) {// A rejected streamed terminal must replace its already-rendered deltas// even in Verbose mode; appending would leave the invalid plan visible.// Empty content clears the bubble (plan-only retry before recovery tools).if (content) {- textEl.innerHTML = formatMarkdown(content);+ textEl.innerHTML = renderedContent;streamedAssistantTextByEl.set(textEl, String(content));} else {textEl.textContent = '';@@ -10881,12 +10883,12 @@ function renderAssistantTextUpdate(assistantEl, content, options = {}) {// content in place even when cleanup changed it from the raw stream.const para = document.createElement('div');para.className = 'reasoning-step';- para.innerHTML = formatMarkdown(content);+ para.innerHTML = renderedContent;textEl.appendChild(para);} else {// Compact mode keeps only the latest blurb. A streamed final lands here// too for one authoritative render with terminal-only enhancements.- textEl.innerHTML = formatMarkdown(content);+ textEl.innerHTML = renderedContent;}clearStreamedAssistantText(textEl);@@ -11708,7 +11710,7 @@ function addMessage(role, content, options = {}) {options.costAllowanceResume,)&& !renderSubscribeError(textEl, content, options.subscribeResumeMode)) {- textEl.innerHTML = content ? formatMarkdown(content) : '';+ textEl.innerHTML = content ? formatMarkdown(content, { recoverNestedMarkdown: role === 'assistant' }) : '';}contentEl.appendChild(textEl);@@ -11932,7 +11934,7 @@ async function continueAgent(options = {}) {submittedTurnDurable: res.submittedTurnDurable,})&& !renderSubscribeError(textEl, res.content)) {- textEl.innerHTML = formatMarkdown(res.content);+ textEl.innerHTML = formatMarkdown(res.content, { recoverNestedMarkdown: true });}addMessageCopyButton(assistantEl);}diff --git a/test/markdown-render.mjs b/test/markdown-render.mjsindex d25cf7b32..751dacb99 100644--- a/test/markdown-render.mjs+++ b/test/markdown-render.mjs@@ -4,12 +4,13 @@ import vm from 'node:vm';import { test } from 'node:test';const readUi = (build, name) => fs.readFileSync(new URL(`../src/${build}/src/ui/${name}`, import.meta.url), 'utf8');-const panelFormatter = (build) => {+const panelFunction = (build, name) => {const source = readUi(build, 'sidepanel.js');- const start = source.indexOf('function formatMarkdown(');+ const start = source.indexOf(`function ${name}(`);assert.ok(start >= 0);return source.slice(start, source.indexOf('\n}', start) + 2);};+const panelFormatter = build => panelFunction(build, 'formatMarkdown');// Reduced reproduction of a model-authored README with same-length nested// fences. Keep user traces and their private page content out of the fixture.const readme = [@@ -671,7 +672,7 @@ for (const build of ['chrome', 'firefox']) {});await page.goto('http://markdown.test/');await page.addStyleTag({ content: fs.readFileSync(new URL(`../src/${build}/styles/sidepanel.css`, import.meta.url), 'utf8') });- const result = await page.evaluate(async ({ formatter, source, expected }) => {+ const result = await page.evaluate(async ({ formatter, terminalRenderer, source, expected }) => {const helpers = await import('/markdown-render.js');const { sanitizeMarkdownLinks } = await import('/markdown-link.js');const { escapeHtml } = await import('/utils.js');@@ -684,7 +685,25 @@ for (const build of ['chrome', 'firefox']) {const message = document.querySelector('#message');message.innerHTML = format(source, { recoverNestedMarkdown: true });const streamed = message.querySelector('pre code').textContent;- message.innerHTML = format(source, { recoverNestedMarkdown: true });+ const updateDependencies = {+ formatMarkdown: format,+ isStoppedByUserStatus: () => false,+ parseCostAllowanceError: () => false,+ renderSubscribeError: () => false,+ getStreamedAssistantText: () => source,+ hasStreamedAssistantText: () => true,+ clearStreamedAssistantText() {},+ streamedAssistantTextByEl: new Map(),+ addMessageCopyButton() {},+ verboseMode: false,+ document,+ };+ const renderTerminal = new Function(...Object.keys(updateDependencies), `return (${terminalRenderer})`)(...Object.values(updateDependencies));+ const assistantEl = { querySelector: selector => selector === '.message-text' ? message : {} };+ renderTerminal(assistantEl, source);+ const terminalBlocks = message.querySelectorAll('pre').length;+ renderTerminal(assistantEl, source, { replace: true });+ const replacedBlocks = message.querySelectorAll('pre').length;await new Promise(resolve => setTimeout(resolve, 20));message.querySelector('.code-copy-btn').click();await Promise.resolve();@@ -693,6 +712,8 @@ for (const build of ['chrome', 'firefox']) {history.innerHTML = renderSkillMarkdown(saved);return {blocks: message.querySelectorAll('pre').length,+ terminalBlocks,+ replacedBlocks,streamedMatches: streamed === expected,copiedMatches: copied === expected,historyMatches: history.querySelector('pre code').textContent === expected,@@ -700,8 +721,8 @@ for (const build of ['chrome', 'firefox']) {nextHeading: message.querySelector('h2').textContent,unsafeElements: message.querySelectorAll('script, img').length,};- }, { formatter: panelFormatter(build), source: draft, expected: readme });- assert.deepEqual(result, { blocks: 1, streamedMatches: true, copiedMatches: true, historyMatches: true, historyBlocks: 1, nextHeading: 'Next steps', unsafeElements: 0 });+ }, { formatter: panelFormatter(build), terminalRenderer: panelFunction(build, 'renderAssistantTextUpdate'), source: draft, expected: readme });+ assert.deepEqual(result, { blocks: 1, terminalBlocks: 1, replacedBlocks: 1, streamedMatches: true, copiedMatches: true, historyMatches: true, historyBlocks: 1, nextHeading: 'Next steps', unsafeElements: 0 });if (process.env.WEBBRAIN_MARKDOWN_SCREENSHOT_DIR) {await page.screenshot({ path: `${process.env.WEBBRAIN_MARKDOWN_SCREENSHOT_DIR}/${build}-markdown.png`, fullPage: true });}