mirror of
https://github.com/nesquena/hermes-webui.git
synced 2026-05-19 13:47:04 +00:00
498b51bfc6
* fix(css): add overflow-wrap:anywhere to chat bubbles — prevents long URL overflow (#1080) * fix(projects): rename now works via dblclick timer guard + right-click color picker (#1078) * fix(renderer): block-level constructs inside blockquotes now render Fenced code blocks, headings, horizontal rules, and ordered lists inside blockquotes now render correctly. Six related bugs documented in blockquote-rendering-bugs.md were collapsed into one architectural fix in renderMd(). Bugs fixed (all 6): 1. Fenced code blocks inside blockquotes -- > prefixes leaked into the <pre> body and the blockquote got fragmented around the rendered code, sometimes leaving raw <pre>/<div class="pre-header"> as visible text. 2. Blank > continuation lines fragmented multi-paragraph blockquotes into separate <blockquote> elements with literal > between them. 3. ## headings inside blockquotes rendered as literal "##" text. 4. Numbered lists inside blockquotes rendered as plain prose. 5. Complex blockquote (mixed headings + code + list + inline code) collapsed into a monospace blob with raw markdown syntax leaking everywhere. 6. Horizontal rules (---) inside blockquotes rendered as literal text. Root cause: The per-line passes for fenced code, headings, hr, ordered lists all ran BEFORE the blockquote handler and could not match lines that started with >, so by the time blockquote stripping ran those constructs had already been mishandled. Fix: A new blockquote pre-pass at the top of renderMd(): - Walks lines fence-aware so > -prefixed lines inside non-blockquote code fences (e.g. shell prompts in bash code blocks) are not miscaptured as a blockquote. - Groups consecutive > -prefixed lines, strips the > prefix, and recursively calls renderMd() on the stripped content. The recursive call handles all block-level constructs (fenced code, headings, hr, ordered/unordered lists, nested blockquotes) using the same pipeline. - Wraps the rendered HTML in <blockquote> and stashes it with a \x00Q token. Restored at the very end of renderMd() so no later pass can mangle the inner HTML. The old _applyBlockquotes regex-replace is removed entirely along with its limited inline branches for nested blockquotes and unordered lists. Behaviour change: Blockquotes now produce CommonMark-compliant <p> wrapping for text content (was: bare text directly inside <blockquote>). The visual output is the same in browsers but the HTML structure is now standard. Tests: - 14 new behavioural tests in tests/test_renderer_js_behaviour.py drive the actual renderMd() via node and lock all 6 bug fixes. - .local-review/test_blockquote_bugs.js -- node harness covering the same scenarios, runnable manually for fast iteration. - 2407/2408 tests pass (1 pre-existing macOS-only failure deselected). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(renderer): entity decode before blockquote pre-pass + CSS margin fix - Move the >/</& entity-decode to run at the very top of renderMd(), before the blockquote pre-pass. Previously decode() ran at line 756 (after the pre-pass at line 697), so LLM output containing >-encoded blockquotes was never matched by the pre-pass. - Add .msg-body blockquote p{margin:0} and .preview-md blockquote p{margin:0} so the new CommonMark-compliant <p> wrapping inside blockquotes doesn't add extra vertical spacing. Prior shape (bare text) had no default p-margins. - Add Node-driven tests: TestBlockquoteEntityEncodedInput covers > prefix and >-encoded fenced code inside blockquotes. - Add struct test: TestBlockquotePrePassOrdering::test_entity_decode_runs_before_blockquote_pre_pass locks decode < _bq_stash ordering in ui.js. Fixes found during Opus independent review of #1083. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * docs: v0.50.218 release notes, test count 2458, roadmap update --------- Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
256 lines
10 KiB
Python
256 lines
10 KiB
Python
"""Regression tests for the blockquote rendering fix (fix/blockquote-rendering).
|
|
|
|
Root cause: the old rule was `s.replace(/^> (.+)$/gm, ...)` which had three bugs:
|
|
1. `.+` required at least one character — bare `>` lines passed through as literal `>`
|
|
2. Each line became its own `<blockquote>` — no grouping, so 10-line quotes became
|
|
10 stacked `<blockquote>` elements
|
|
3. Fenced code blocks inside blockquotes left orphaned `>` literals after the
|
|
fence-stash pass had consumed the code content
|
|
|
|
Fix: group consecutive `>` lines into a single `<blockquote>`, handle bare `>` lines
|
|
as `<br>`, and strip the `>` prefix before passing each line to `inlineMd()`.
|
|
"""
|
|
import re
|
|
import pathlib
|
|
|
|
UI_JS = (pathlib.Path(__file__).parent.parent / "static" / "ui.js").read_text(encoding="utf-8")
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Python mirror of the new blockquote rule + inlineMd (for behavioural tests)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
import html as _html
|
|
|
|
|
|
def _esc(s):
|
|
return _html.escape(str(s), quote=True)
|
|
|
|
|
|
def _inline_md(t):
|
|
"""Minimal inlineMd mirror — bold, italic, inline-code only."""
|
|
t = re.sub(r"`([^`\n]+)`", lambda m: f"<code>{_esc(m.group(1))}</code>", t)
|
|
t = re.sub(r"\*\*\*(.+?)\*\*\*", lambda m: f"<strong><em>{_esc(m.group(1))}</em></strong>", t)
|
|
t = re.sub(r"\*\*(.+?)\*\*", lambda m: f"<strong>{_esc(m.group(1))}</strong>", t)
|
|
t = re.sub(r"\*([^*\n]+)\*", lambda m: f"<em>{_esc(m.group(1))}</em>", t)
|
|
return t
|
|
|
|
|
|
def _apply_blockquote(s):
|
|
"""Python mirror of the new group-based blockquote rule in ui.js."""
|
|
def replacer(m):
|
|
block = m.group(0)
|
|
lines = block.split("\n")
|
|
# Drop a lone trailing ">" artifact that the regex can leave
|
|
while lines and lines[-1].strip() in (">", ""):
|
|
if lines[-1].strip() == ">":
|
|
lines.pop()
|
|
break
|
|
lines.pop()
|
|
processed = []
|
|
for l in lines:
|
|
stripped = re.sub(r"^>[ \t]?", "", l)
|
|
if stripped.strip() == "":
|
|
processed.append("<br>")
|
|
else:
|
|
processed.append(_inline_md(stripped))
|
|
inner = "\n".join(processed)
|
|
return f"<blockquote>{inner}</blockquote>"
|
|
|
|
return re.sub(r"((?:^>[^\n]*(?:\n|$))+)", replacer, s, flags=re.MULTILINE)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Source-level structural tests
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestBlockquoteSourceStructure:
|
|
"""The new rule must be present in ui.js and the old single-line rule must be gone."""
|
|
|
|
def test_old_single_line_rule_removed(self):
|
|
"""The old `.+` pattern that skipped blank lines must be gone."""
|
|
assert "replace(/^> (.+)$/gm" not in UI_JS, (
|
|
"Old single-line blockquote rule still present — it misses blank '>'"
|
|
" lines and creates one <blockquote> per line"
|
|
)
|
|
|
|
def test_blockquote_pre_pass_present(self):
|
|
"""The blockquote pre-pass (line walker + recursive render + stash)
|
|
must be present in ui.js."""
|
|
assert "_bq_stash" in UI_JS, (
|
|
"Blockquote stash array (_bq_stash) not found — pre-pass missing"
|
|
)
|
|
assert "_applyBlockquotes" in UI_JS, (
|
|
"_applyBlockquotes line-walker function not found"
|
|
)
|
|
|
|
def test_prefix_strip_present(self):
|
|
"""The fix must strip the '> ' prefix from each line."""
|
|
assert "replace(/^> ?/" in UI_JS, (
|
|
"Expected prefix-strip pattern `^> ?` not found in the blockquote block"
|
|
)
|
|
|
|
def test_bq_stash_token_in_paragraph_bypass(self):
|
|
"""\\x00Q must be in the paragraph-splitter bypass so blockquote
|
|
stash tokens are not wrapped in <p>."""
|
|
assert r"\x00[EQ]" in UI_JS, (
|
|
"Paragraph-splitter bypass must accept \\x00Q (blockquote token) "
|
|
"alongside \\x00E (pre stash token)"
|
|
)
|
|
|
|
def test_bq_stash_restore_present(self):
|
|
"""The stash restore must run at the end of renderMd."""
|
|
assert r"\x00Q(\d+)\x00" in UI_JS, (
|
|
"Blockquote stash restore regex not found in ui.js"
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Behavioural tests (using the Python mirror)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestMultiLineBlockquote:
|
|
"""Consecutive > lines must become ONE <blockquote>, not many."""
|
|
|
|
def test_single_line_still_works(self):
|
|
out = _apply_blockquote("> Hello world")
|
|
assert out.count("<blockquote>") == 1
|
|
assert "Hello world" in out
|
|
assert ">" not in out.replace("<blockquote>", "").replace("</blockquote>", "")
|
|
|
|
def test_two_consecutive_lines_grouped(self):
|
|
src = "> Line one\n> Line two"
|
|
out = _apply_blockquote(src)
|
|
assert out.count("<blockquote>") == 1, (
|
|
f"Expected 1 <blockquote>, got {out.count('<blockquote>')}: {out!r}"
|
|
)
|
|
|
|
def test_ten_lines_one_blockquote(self):
|
|
src = "\n".join(f"> Line {i}" for i in range(10))
|
|
out = _apply_blockquote(src)
|
|
assert out.count("<blockquote>") == 1
|
|
|
|
def test_two_separate_quotes_stay_separate(self):
|
|
src = "> First quote\n\n> Second quote"
|
|
out = _apply_blockquote(src)
|
|
# Each quote is its own group (separated by a blank line)
|
|
assert out.count("<blockquote>") == 2
|
|
|
|
|
|
class TestBlankContinuationLines:
|
|
"""Bare '>' lines (blank continuation) must not appear as literal '>'."""
|
|
|
|
def test_bare_gt_line_no_literal(self):
|
|
src = "> Para one\n>\n> Para two"
|
|
out = _apply_blockquote(src)
|
|
assert out.count("<blockquote>") == 1, f"Expected 1 blockquote: {out!r}"
|
|
# No stray '>' outside of HTML tags
|
|
text_only = re.sub(r"<[^>]+>", "", out)
|
|
assert ">" not in text_only, f"Literal '>' in text: {text_only!r}"
|
|
|
|
def test_bare_gt_no_space_handled(self):
|
|
"""'>' with no space at all should also be consumed, not rendered literally."""
|
|
src = ">no space after"
|
|
out = _apply_blockquote(src)
|
|
assert out.count("<blockquote>") == 1
|
|
text_only = re.sub(r"<[^>]+>", "", out)
|
|
assert ">" not in text_only
|
|
|
|
def test_blank_line_becomes_br(self):
|
|
src = "> First\n>\n> Second"
|
|
out = _apply_blockquote(src)
|
|
assert "<br>" in out, f"Expected <br> for blank > line: {out!r}"
|
|
|
|
|
|
class TestInlineMarkdownInsideBlockquote:
|
|
"""Bold, italic, and inline code must still render correctly inside a blockquote."""
|
|
|
|
def test_bold_inside_blockquote(self):
|
|
out = _apply_blockquote("> This is **important**")
|
|
assert "<strong>" in out
|
|
assert "<blockquote>" in out
|
|
|
|
def test_inline_code_inside_blockquote(self):
|
|
out = _apply_blockquote("> Run `git status` first")
|
|
assert "<code>" in out
|
|
assert "<blockquote>" in out
|
|
|
|
def test_italic_inside_blockquote(self):
|
|
out = _apply_blockquote("> *emphasis* here")
|
|
assert "<em>" in out
|
|
assert "<blockquote>" in out
|
|
|
|
|
|
class TestNoPhantomTrailingBr:
|
|
"""The fix must drop both empty trailing lines (from a trailing \\n in the
|
|
match) and bare '>' artifacts. Without this, the common case — a blockquote
|
|
followed by another paragraph — renders with a phantom <br> right before
|
|
</blockquote>, leaving a visible blank line at the bottom of the quote.
|
|
"""
|
|
|
|
def test_input_ending_with_newline_no_trailing_br(self):
|
|
"""`> Hello\\n` must NOT produce `<blockquote>Hello\\n<br></blockquote>`."""
|
|
out = _apply_blockquote("> Hello\n")
|
|
assert "<br></blockquote>" not in out, (
|
|
f"Trailing <br> leaked inside the blockquote (phantom blank line): {out!r}"
|
|
)
|
|
|
|
def test_blockquote_followed_by_paragraph_no_trailing_br(self):
|
|
"""The common real-world shape: quote + blank line + paragraph."""
|
|
src = "> Quoted text\n\nNormal paragraph"
|
|
out = _apply_blockquote(src)
|
|
assert "<br></blockquote>" not in out, (
|
|
f"Trailing <br> leaked inside blockquote when followed by paragraph: {out!r}"
|
|
)
|
|
|
|
def test_multiline_quote_ending_with_newline_no_trailing_br(self):
|
|
out = _apply_blockquote("> Line one\n> Line two\n")
|
|
assert "<br></blockquote>" not in out, (
|
|
f"Multi-line quote ending with \\n must not leave a trailing <br>: {out!r}"
|
|
)
|
|
|
|
def test_quote_with_blank_continuation_then_newline(self):
|
|
"""`> A\\n>\\n> B\\n` — the internal `<br>` for the blank line stays,
|
|
but the trailing newline must not add a second `<br>` at the end."""
|
|
out = _apply_blockquote("> A\n>\n> B\n")
|
|
# Internal <br> for the blank-line continuation is intentional
|
|
assert "<br>" in out
|
|
# But there must not be a <br> immediately before the closing tag
|
|
assert "<br></blockquote>" not in out, (
|
|
f"Trailing <br> leaked at end of blockquote: {out!r}"
|
|
)
|
|
|
|
|
|
class TestBlockquoteFollowedByParagraph:
|
|
"""A blockquote followed by a normal paragraph must not bleed into each other."""
|
|
|
|
def test_non_blockquote_paragraph_untouched(self):
|
|
src = "> Quoted text\n\nNormal paragraph"
|
|
out = _apply_blockquote(src)
|
|
assert out.count("<blockquote>") == 1
|
|
assert "Normal paragraph" in out
|
|
# Normal paragraph must be outside the blockquote
|
|
after_bq = out[out.index("</blockquote>"):]
|
|
assert "Normal paragraph" in after_bq
|
|
|
|
|
|
class TestBlockquotePrePassOrdering:
|
|
"""Structural checks that lock the ordering of the blockquote pre-pass
|
|
relative to the entity-decode and MEDIA-stash passes in renderMd()."""
|
|
|
|
def test_entity_decode_runs_before_blockquote_pre_pass(self):
|
|
"""The entity decode must appear BEFORE the blockquote pre-pass in
|
|
renderMd() so >-prefixed lines are recognised as blockquotes."""
|
|
# The entity decode is represented by '>' replacement or the
|
|
# inline decode line, whichever appears first.
|
|
decode_idx = min(
|
|
UI_JS.find("replace(/>/g"),
|
|
UI_JS.find("replace(/</g"),
|
|
)
|
|
bq_stash_idx = UI_JS.find("_bq_stash")
|
|
assert decode_idx != -1, "Entity decode (> or <) not found in renderMd"
|
|
assert bq_stash_idx != -1, "_bq_stash not found"
|
|
assert decode_idx < bq_stash_idx, (
|
|
"Entity decode must appear before the blockquote pre-pass (_bq_stash). "
|
|
f"decode at {decode_idx}, _bq_stash at {bq_stash_idx}"
|
|
)
|