{"messages":[{"content":"You are a constitutional council ranking individual git commits for ownership allocation.\n\nCompare these two commits. Decide which contributed more lasting value to the project.\n\nJudge substance, not spectacle:\n- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.\n- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.\n- Do not favor a side merely because its patch is longer or noisier.\n- Weight what the change does for the project, not the contributor's name.\n\nReturn ONLY a JSON object: {\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}\nThe explanation must cite concrete differences in the patches (1-3 sentences).\n\nSide A — contributor: tommy-mor\nSide A — commit message:\n[bda5f8aa] Remove legacy evidence projection; Evidence envelopes only.\n\nEpoch and commit pages no longer invent history from bare GitDiscovery rows. Production ledger will be wiped to re-emit under the current schema.\n\nCo-authored-by: Cursor \n\nSide A — unified diff (full patch):\ndiff --git a/constitution.py b/constitution.py\nindex 4dd5b9dfbba231d46289c490f91b1dd5b1018bcf..26ba130e885e0e69fb7874ca5c3f07f42100a150 100644\n--- a/constitution.py\n+++ b/constitution.py\n@@ -210,10 +210,10 @@ class Emission:\n distributions: dict # author -> amount str\n ranking: dict # author -> score str\n models_used: list\n- discovery_snapshot_id: str = \"\" # empty only for pre-discovery ledger history\n- evidence_schema_version: int = 1\n- ranking_run_id: str = \"\"\n- ranking_event_id: str = \"\"\n+ discovery_snapshot_id: str\n+ evidence_schema_version: int\n+ ranking_run_id: str\n+ ranking_event_id: str\n \n \n @event\n@@ -502,26 +502,6 @@ def _epochs_in_ledger() -> list[int]:\n return sorted(epochs)\n \n \n-def _legacy_commit_row(commit_id: str) -> tuple[GitDiscovery | None, dict | None]:\n- for discovery in store.read():\n- if not isinstance(discovery, GitDiscovery):\n- continue\n- for commit in discovery.commits:\n- if commit_id_for_oid(commit[\"oid\"]) == commit_id:\n- return discovery, commit\n- return None, None\n-\n-\n-def _legacy_observation(commit_id: str) -> tuple[GitDiscovery | None, dict | None]:\n- for discovery in store.read():\n- if not isinstance(discovery, GitDiscovery):\n- continue\n- for obs in discovery.observations:\n- if commit_id_for_oid(obs[\"oid\"]) == commit_id:\n- return discovery, obs\n- return None, None\n-\n-\n def build_pairwise_prompt(side_a: dict, side_b: dict) -> str:\n return f\"\"\"You are ranking contributions to an open source project.\n Compare these two sides (each may be one or more commits). Decide which side contributed more.\n@@ -2040,7 +2020,7 @@ def _strip_heavy_fields(obj: dict) -> dict:\n \n @app.get(\"/api/ledger\")\n async def get_ledger(offset: int = 0, limit: int = 100, full: int = 0):\n- \"\"\"List of ledger dicts (backward-compatible). Heavy blobs stripped unless full=1.\"\"\"\n+ \"\"\"List of ledger dicts. Heavy blobs stripped unless full=1.\"\"\"\n limit = max(1, min(limit, 500))\n rows = []\n for e in store.read()[offset:offset + limit]:\n@@ -2274,23 +2254,25 @@ async def epochs_index():\n epochs = _epochs_in_ledger()\n rows = []\n for epoch in epochs:\n- discovery = _discovery_for_epoch(epoch)\n emission = _emission_for_epoch(epoch)\n- evidence_n = sum(\n- 1 for e in evidence_by_kind() if e.epoch == epoch\n+ evidence_n = sum(1 for e in evidence_by_kind() if e.epoch == epoch)\n+ disc = next(\n+ (\n+ e for e in evidence_by_kind(\"git.discovery_completed\")\n+ if e.epoch == epoch\n+ ),\n+ None,\n )\n detail = []\n- if discovery:\n+ if disc:\n detail.append(\n- f\"{len(discovery.commits)} eligible / \"\n- f\"{len(discovery.observations)} observed\"\n+ f\"{disc.payload.get('eligible_count', 0)} eligible / \"\n+ f\"{disc.payload.get('observation_count', 0)} observed\"\n )\n if emission:\n detail.append(f\"emitted {emission.total_emitted}\")\n if evidence_n:\n detail.append(f\"{evidence_n} evidence events\")\n- elif discovery or emission:\n- detail.append(\"legacy (no Evidence envelopes)\")\n rows.append([\"li\",\n _a(_evidence_path(\"epoch\", str(epoch)), f\"epoch {epoch}\"),\n \" — \",\n@@ -2307,37 +2289,37 @@ async def epochs_index():\n \n @app.get(\"/epochs/{epoch}\")\n async def epoch_detail(epoch: int):\n- discovery = _discovery_for_epoch(epoch)\n emission = _emission_for_epoch(epoch)\n evidence_rows = [e for e in evidence_by_kind() if e.epoch == epoch]\n+ if not evidence_rows and emission is None:\n+ return _evidence_page(f\"epoch {epoch}\", [\n+ _evidence_nav(),\n+ [\"h1\", f\"epoch {epoch}\"],\n+ [\"p.note\", \"No evidence for this epoch.\"],\n+ ])\n+\n commit_evs = [e for e in evidence_rows if e.kind == \"git.commit\"]\n comparison_evs = [e for e in evidence_rows if e.kind == \"comparison.input\"]\n judgment_evs = [e for e in evidence_rows if e.kind == \"llm.judgment\"]\n+ discovery_ev = next(\n+ (e for e in evidence_rows if e.kind == \"git.discovery_completed\"), None\n+ )\n ranking_started = next(\n (e for e in evidence_rows if e.kind == \"ranking.started\"), None\n )\n ranking_completed = next(\n (e for e in evidence_rows if e.kind == \"ranking.completed\"), None\n )\n- legacy = not evidence_rows and (discovery is not None or emission is not None)\n-\n- commit_links: list[tuple[str, str]] = []\n- if commit_evs:\n- for e in commit_evs:\n- cid = e.payload.get(\"commit_id\") or \"\"\n- label = (\n- f\"{e.payload.get('oid', cid)[:24]} \"\n- f\"({e.payload.get('contributor', '?')})\"\n- )\n- commit_links.append((label, _evidence_path(\"commit\", cid)))\n- elif discovery:\n- for c in discovery.commits:\n- cid = commit_id_for_oid(c[\"oid\"])\n- commit_links.append((\n- f\"{c['oid'][:24]} ({c.get('contributor', '?')})\",\n- _evidence_path(\"commit\", cid),\n- ))\n \n+ commit_links = [\n+ (\n+ f\"{e.payload.get('oid', e.payload.get('commit_id', ''))[:24]} \"\n+ f\"({e.payload.get('contributor', '?')})\",\n+ _evidence_path(\"commit\", e.payload[\"commit_id\"]),\n+ )\n+ for e in commit_evs\n+ if e.payload.get(\"commit_id\")\n+ ]\n comparison_links = [\n (\n e.payload.get(\"summary\") or e.payload.get(\"comparison_id\", e.event_id),\n@@ -2360,16 +2342,13 @@ async def epoch_detail(epoch: int):\n ]\n \n excluded = []\n- if discovery:\n- for obs in discovery.observations:\n+ if discovery_ev:\n+ for obs in discovery_ev.payload.get(\"observations\") or []:\n if obs.get(\"eligible\"):\n continue\n oid = obs.get(\"oid\", \"?\")\n reason = obs.get(\"exclusion_reason\") or \"excluded\"\n- excluded.append([\"li\",\n- f\"{oid[:28]} — {reason} — \",\n- [\"span.note\", \"legacy evidence unavailable\"],\n- ])\n+ excluded.append([\"li\", f\"{oid[:28]} — {reason}\"])\n \n ranking_nodes: list = []\n if ranking_completed:\n@@ -2388,21 +2367,10 @@ async def epoch_detail(epoch: int):\n indent=2, sort_keys=True,\n )],\n ]\n- elif emission:\n- if legacy and len(emission.ranking or {}) <= 1:\n- ranking_nodes.append([\"p.note\",\n- \"Single-contributor epoch — no LLM judgments.\"\n- ])\n- ranking_nodes.extend([\n- [\"p\", \"Projected from Emission (no ranking Evidence event).\"],\n- [\"pre.blob\", json.dumps(emission.ranking, indent=2, sort_keys=True)],\n- ])\n+ elif ranking_started:\n+ ranking_nodes = [[\"p.note\", f\"Ranking started: {ranking_started.event_id}\"]]\n else:\n- ranking_nodes = [[\"p.note\", \"No ranking recorded.\"]]\n- if ranking_started and not ranking_completed:\n- ranking_nodes.insert(0, [\"p.note\",\n- f\"Ranking started: {ranking_started.event_id}\"\n- ])\n+ ranking_nodes = [[\"p.note\", \"No ranking evidence.\"]]\n \n if emission:\n emission_node = _dl_rows([\n@@ -2411,44 +2379,41 @@ async def epoch_detail(epoch: int):\n (\"pool_after\", emission.pool_after),\n (\"discovery_snapshot_id\", emission.discovery_snapshot_id),\n (\"ranking_run_id\", emission.ranking_run_id or None),\n+ (\"ranking_event_id\", emission.ranking_event_id or None),\n (\"models_used\", \", \".join(emission.models_used or [])),\n (\"distributions\", json.dumps(emission.distributions, sort_keys=True)),\n ])\n else:\n emission_node = [\"p.note\", \"No emission for this epoch.\"]\n \n- single_contributor = False\n- if discovery:\n- single_contributor = len({c.get(\"contributor\") for c in discovery.commits}) <= 1\n- elif emission:\n- single_contributor = len(emission.ranking or {}) <= 1\n+ contributors = {\n+ e.payload.get(\"contributor\")\n+ for e in commit_evs\n+ if e.payload.get(\"contributor\")\n+ }\n+ no_comparisons_note = \"No comparisons.\"\n+ if len(contributors) <= 1:\n+ no_comparisons_note += \" Single-contributor — no LLM judgments.\"\n \n body = [\n _evidence_nav(),\n [\"div.eyebrow\", f\"epoch {epoch}\"],\n [\"h1\", f\"epoch {epoch}\"],\n ]\n- if legacy:\n- body.append([\"p.note\",\n- \"Legacy epoch: projected from GitDiscovery/Emission without Evidence \"\n- \"envelopes. Eligible commits use discovery patches; discarded observation \"\n- \"metadata is marked legacy evidence unavailable. Single-contributor \"\n- \"epochs have no LLM judgments.\"\n- ])\n- if discovery:\n+ if discovery_ev:\n body.extend([\n [\"h2\", \"discovery\"],\n _dl_rows([\n- (\"snapshot_id\", discovery.snapshot_id),\n- (\"config_digest\", discovery.config_digest),\n- (\"initial_snapshot\", discovery.initial_snapshot),\n- (\"observations\", len(discovery.observations)),\n- (\"eligible\", len(discovery.commits)),\n+ (\"snapshot_id\", discovery_ev.payload.get(\"snapshot_id\")),\n+ (\"config_digest\", discovery_ev.payload.get(\"config_digest\")),\n+ (\"observations\", discovery_ev.payload.get(\"observation_count\")),\n+ (\"eligible\", discovery_ev.payload.get(\"eligible_count\")),\n+ (\"event\", _a(\n+ _evidence_path(\"event\", discovery_ev.event_id),\n+ discovery_ev.event_id,\n+ )),\n ]),\n ])\n- no_comparisons_note = \"No comparisons.\"\n- if single_contributor:\n- no_comparisons_note += \" Single-contributor — no LLM judgments.\"\n body.extend([\n [\"h2\", \"commits\"],\n _link_list(commit_links),\n@@ -2471,92 +2436,42 @@ async def epoch_detail(epoch: int):\n @app.get(\"/commits/{commit_id}\")\n async def commit_detail(commit_id: str):\n ev = find_evidence_payload(\"git.commit\", \"commit_id\", commit_id)\n- discovery, legacy_row = (None, None)\n if not ev:\n- discovery, legacy_row = _legacy_commit_row(commit_id)\n- if not ev and not legacy_row:\n- discovery, obs = _legacy_observation(commit_id)\n- if obs is not None:\n- epoch = discovery.epoch if discovery else \"?\"\n- return _evidence_page(f\"commit {commit_id[:24]}\", [\n- _evidence_nav(\n- _a(_evidence_path(\"epoch\", str(epoch)), f\"epoch {epoch}\")\n- ),\n- [\"div.eyebrow\", \"commit\"],\n- [\"h1\", commit_id],\n- [\"p.note\", \"legacy evidence unavailable\"],\n- _dl_rows([\n- (\"oid\", obs.get(\"oid\")),\n- (\"eligible\", obs.get(\"eligible\")),\n- (\"exclusion_reason\", obs.get(\"exclusion_reason\")),\n- (\"epoch\", str(epoch)),\n- ]),\n- ])\n return _evidence_page(\"commit not found\", [\n _evidence_nav(),\n [\"h1\", \"commit not found\"],\n [\"p\", commit_id],\n ])\n- if ev:\n- p = ev.payload\n- epoch = ev.epoch\n- oid = p.get(\"oid\", \"\")\n- contributor = p.get(\"contributor\", \"\")\n- message = _blob_text(p.get(\"message\"))\n- patch = _blob_text(p.get(\"patch\"))\n- meta = _dl_rows([\n+ p = ev.payload\n+ epoch = ev.epoch\n+ return _evidence_page(f\"commit {commit_id[:24]}\", [\n+ _evidence_nav(_a(_evidence_path(\"epoch\", str(epoch)), f\"epoch {epoch}\")),\n+ [\"div.eyebrow\", \"commit\"],\n+ [\"h1\", commit_id],\n+ _dl_rows([\n (\"commit_id\", commit_id),\n- (\"oid\", oid),\n- (\"contributor\", contributor),\n+ (\"oid\", p.get(\"oid\", \"\")),\n+ (\"contributor\", p.get(\"contributor\", \"\")),\n (\"patch_sha256\", p.get(\"patch_sha256\")),\n (\"patch_identity\", p.get(\"patch_identity\")),\n (\"committer_timestamp_ms\", p.get(\"committer_timestamp_ms\")),\n (\"evidence_event\", _a(_evidence_path(\"event\", ev.event_id), ev.event_id)),\n (\"epoch\", _a(_evidence_path(\"epoch\", str(epoch)), str(epoch))),\n- ])\n- legacy_note = None\n- else:\n- assert legacy_row is not None and discovery is not None\n- epoch = discovery.epoch\n- oid = legacy_row.get(\"oid\", \"\")\n- contributor = legacy_row.get(\"contributor\", \"\")\n- message = legacy_row.get(\"message\") or \"\"\n- patch = legacy_row.get(\"patch\") or \"\"\n- meta = _dl_rows([\n- (\"commit_id\", commit_id),\n- (\"oid\", oid),\n- (\"contributor\", contributor),\n- (\"patch_sha256\", legacy_row.get(\"patch_sha256\")),\n- (\"patch_identity\", legacy_row.get(\"patch_identity\")),\n- (\"committer_timestamp_ms\", legacy_row.get(\"committer_timestamp_ms\")),\n- (\"epoch\", _a(_evidence_path(\"epoch\", str(epoch)), str(epoch))),\n- (\"source\", \"legacy GitDiscovery projection\"),\n- ])\n- legacy_note = [\"p.note\", \"Projected from GitDiscovery — Evidence envelope absent.\"]\n- return _evidence_page(f\"commit {commit_id[:24]}\", [\n- _evidence_nav(_a(_evidence_path(\"epoch\", str(epoch)), f\"epoch {epoch}\")),\n- [\"div.eyebrow\", \"commit\"],\n- [\"h1\", commit_id],\n- *([legacy_note] if legacy_note else []),\n- meta,\n+ ]),\n [\"p\", _a(f\"/commits/{commit_id}/patch\", \"download patch\")],\n [\"h2\", \"message\"],\n- _pre_blob(message),\n+ _pre_blob(_blob_text(p.get(\"message\"))),\n [\"h2\", \"patch\"],\n- _pre_blob(patch),\n+ _pre_blob(_blob_text(p.get(\"patch\"))),\n ])\n \n \n @app.get(\"/commits/{commit_id}/patch\")\n async def commit_patch_download(commit_id: str):\n ev = find_evidence_payload(\"git.commit\", \"commit_id\", commit_id)\n- if ev:\n- raw = _decode_blob(ev.payload.get(\"patch\")) or _blob_text(ev.payload.get(\"patch\")).encode()\n- else:\n- _, row = _legacy_commit_row(commit_id)\n- if not row:\n- return PlainTextResponse(\"not found\", status_code=404)\n- raw = (row.get(\"patch\") or \"\").encode(\"utf-8\")\n+ if not ev:\n+ return PlainTextResponse(\"not found\", status_code=404)\n+ raw = _decode_blob(ev.payload.get(\"patch\")) or _blob_text(ev.payload.get(\"patch\")).encode()\n return Response(\n content=raw,\n media_type=\"text/plain; charset=utf-8\",\n@@ -3226,7 +3141,9 @@ async def watch():\n [\"div.controls\",\n [\"button#play\", {\"type\": \"button\", \"disabled\": \"true\"}, \"▶ Play live feed\"],\n [\"button#pause\", {\"type\": \"button\"}, \"Ⅱ Pause feed\"],\n- [\"span.note\", \"Pause stops local updates; the constitutional process continues.\"],\n+ [\"span.note\",\n+ \"Play/pause only affect this browser feed — they do not run or stop emission. \"\n+ \"The server emits at each epoch boundary; status above is that process.\"],\n ],\n ],\n [\"section.panel\",\ndiff --git a/tests/integration.clj b/tests/integration.clj\nindex 204b0fedfbad57846205cb140c4ed9406b5f8e0e..11140e95a8cd86768a661a30e6b29a3ddfc95fcc 100644\n--- a/tests/integration.clj\n+++ b/tests/integration.clj\n@@ -247,7 +247,10 @@\n :decay_rate \"0.003253356063468\"\n :distributions {\"alice\" \"381.4282558872\" \"bob\" \"190.7141279436\"}\n :ranking {\"alice\" \"0.6666\" \"bob\" \"0.3334\"}\n- :models_used [\"mock/chat-v1\" \"mock/chat-v2\"]}]\n+ :models_used [\"mock/chat-v1\" \"mock/chat-v2\"]\n+ :evidence_schema_version 2\n+ :ranking_run_id \"seed-rank\"\n+ :ranking_event_id \"seed-rank-ev\"}]\n (spit path (str (json/generate-string entry) \"\\n\"))))\n \n ;; ---------------------------------------------------------------------------\ndiff --git a/tests/test_evidence.py b/tests/test_evidence.py\nindex 76adcd343eec3a65dec58fda93b068356fb1adcd..7cb74fd7fb1bcd0ab17d2cbe2e6ca7e61e164221 100644\n--- a/tests/test_evidence.py\n+++ b/tests/test_evidence.py\n@@ -1,4 +1,4 @@\n-\"\"\"HTML evidence graph: byte fidelity, resume, legacy projection, private ack.\"\"\"\n+\"\"\"HTML evidence graph: byte fidelity, resume, and Evidence-only pages.\"\"\"\n \n from __future__ import annotations\n \n@@ -86,55 +86,10 @@ def test_html_evidence_pages_escape_and_link(evidence_store):\n assert patch_resp.headers[\"content-disposition\"].startswith(\"attachment\")\n \n \n-def test_legacy_epoch_projects_from_gitdiscovery_without_evidence(evidence_store):\n- oid = \"sha1:\" + \"b\" * 40\n- discovery = c.GitDiscovery(\n- schema_version=1,\n- epoch=3,\n- snapshot_id=\"legacy-snap\",\n- timestamp_ms=1,\n- config_digest=\"d\",\n- initial_snapshot=True,\n- configuration={\"repositories\": [], \"contributors\": {}},\n- repositories=[],\n- observations=[{\n- \"oid\": oid,\n- \"eligible\": False,\n- \"exclusion_reason\": \"before_genesis\",\n- \"first_sources\": [],\n- }, {\n- \"oid\": \"sha1:\" + \"c\" * 40,\n- \"eligible\": True,\n- \"exclusion_reason\": None,\n- \"first_sources\": [],\n- }],\n- commits=[{\n- \"oid\": \"sha1:\" + \"c\" * 40,\n- \"contributor\": \"tommy-mor\",\n- \"message\": \"eligible\",\n- \"patch\": \"diff --git a/x b/x\\n\",\n- }],\n- )\n- emission = c.Emission(\n- epoch=3,\n- timestamp_ms=2,\n- pool_before=\"1\",\n- total_emitted=\"0.1\",\n- pool_after=\"0.9\",\n- decay_rate=\"0.1\",\n- distributions={\"tommy-mor\": \"0.1\"},\n- ranking={\"tommy-mor\": \"1\"},\n- models_used=[],\n- discovery_snapshot_id=\"legacy-snap\",\n- )\n- asyncio.run(c.store.append(discovery))\n- asyncio.run(c.store.append(emission))\n- html = asyncio.run(c.epoch_detail(3)).body.decode()\n- assert \"legacy\" in html.lower()\n- assert \"Single-contributor\" in html or \"no LLM\" in html\n- excluded_id = c.commit_id_for_oid(oid)\n- excluded_html = asyncio.run(c.commit_detail(excluded_id)).body.decode()\n- assert \"legacy evidence unavailable\" in excluded_html.lower()\n+def test_commit_without_evidence_is_not_found(evidence_store):\n+ html = asyncio.run(c.commit_detail(\"c_missing\")).body.decode()\n+ assert \"commit not found\" in html\n+ assert \"legacy\" not in html.lower()\n \n \n def test_ranking_resume_skips_duplicate_provider_calls(evidence_store, monkeypatch):\n@@ -202,6 +157,10 @@ def test_epochs_index_lists_epochs(evidence_store):\n distributions={},\n ranking={},\n models_used=[],\n+ discovery_snapshot_id=\"snap\",\n+ evidence_schema_version=c.EVIDENCE_SCHEMA_VERSION,\n+ ranking_run_id=\"r\",\n+ ranking_event_id=\"e\",\n )))\n html = asyncio.run(c.epochs_index()).body.decode()\n assert \"/epochs/3\" in html\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[bf118bdf] Sanitize Reddit entity body HTML before rendering.\n\nUse ammonia at render time so untrusted selftext_html cannot execute scripts in our origin.\n\nCo-authored-by: Cursor \n\nSide B — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 3dec7cb72a182dc654a37dca8ba0b49d77504daa..0dd4fce5fb6400ae153cca4e3dbf5a5158e6d8b4 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -11,6 +11,19 @@ dependencies = [\n \"memchr\",\n ]\n \n+[[package]]\n+name = \"ammonia\"\n+version = \"4.1.2\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"17e913097e1a2124b46746c980134e8c954bc17a6a59bb3fde96f088d126dde6\"\n+dependencies = [\n+ \"cssparser\",\n+ \"html5ever\",\n+ \"maplit\",\n+ \"tendril\",\n+ \"url\",\n+]\n+\n [[package]]\n name = \"anyhow\"\n version = \"1.0.102\"\n@@ -355,6 +368,29 @@ version = \"0.2.4\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5\"\n \n+[[package]]\n+name = \"cssparser\"\n+version = \"0.35.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa\"\n+dependencies = [\n+ \"cssparser-macros\",\n+ \"dtoa-short\",\n+ \"itoa\",\n+ \"phf\",\n+ \"smallvec\",\n+]\n+\n+[[package]]\n+name = \"cssparser-macros\"\n+version = \"0.6.1\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331\"\n+dependencies = [\n+ \"quote\",\n+ \"syn\",\n+]\n+\n [[package]]\n name = \"deranged\"\n version = \"0.5.8\"\n@@ -381,6 +417,21 @@ version = \"0.15.7\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b\"\n \n+[[package]]\n+name = \"dtoa\"\n+version = \"1.0.11\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590\"\n+\n+[[package]]\n+name = \"dtoa-short\"\n+version = \"0.3.5\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87\"\n+dependencies = [\n+ \"dtoa\",\n+]\n+\n [[package]]\n name = \"durable\"\n version = \"0.2.0\"\n@@ -482,6 +533,16 @@ dependencies = [\n \"percent-encoding\",\n ]\n \n+[[package]]\n+name = \"futf\"\n+version = \"0.1.5\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843\"\n+dependencies = [\n+ \"mac\",\n+ \"new_debug_unreachable\",\n+]\n+\n [[package]]\n name = \"futures-channel\"\n version = \"0.3.32\"\n@@ -614,6 +675,17 @@ version = \"0.5.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea\"\n \n+[[package]]\n+name = \"html5ever\"\n+version = \"0.35.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4\"\n+dependencies = [\n+ \"log\",\n+ \"markup5ever\",\n+ \"match_token\",\n+]\n+\n [[package]]\n name = \"http\"\n version = \"1.4.1\"\n@@ -974,6 +1046,15 @@ version = \"0.8.2\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0\"\n \n+[[package]]\n+name = \"lock_api\"\n+version = \"0.4.14\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965\"\n+dependencies = [\n+ \"scopeguard\",\n+]\n+\n [[package]]\n name = \"log\"\n version = \"0.4.30\"\n@@ -990,6 +1071,40 @@ dependencies = [\n \"libc\",\n ]\n \n+[[package]]\n+name = \"mac\"\n+version = \"0.1.1\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4\"\n+\n+[[package]]\n+name = \"maplit\"\n+version = \"1.0.2\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d\"\n+\n+[[package]]\n+name = \"markup5ever\"\n+version = \"0.35.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3\"\n+dependencies = [\n+ \"log\",\n+ \"tendril\",\n+ \"web_atoms\",\n+]\n+\n+[[package]]\n+name = \"match_token\"\n+version = \"0.35.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf\"\n+dependencies = [\n+ \"proc-macro2\",\n+ \"quote\",\n+ \"syn\",\n+]\n+\n [[package]]\n name = \"matchers\"\n version = \"0.2.0\"\n@@ -1092,6 +1207,12 @@ dependencies = [\n \"tempfile\",\n ]\n \n+[[package]]\n+name = \"new_debug_unreachable\"\n+version = \"1.0.6\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086\"\n+\n [[package]]\n name = \"nom\"\n version = \"7.1.3\"\n@@ -1175,6 +1296,29 @@ dependencies = [\n \"vcpkg\",\n ]\n \n+[[package]]\n+name = \"parking_lot\"\n+version = \"0.12.5\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a\"\n+dependencies = [\n+ \"lock_api\",\n+ \"parking_lot_core\",\n+]\n+\n+[[package]]\n+name = \"parking_lot_core\"\n+version = \"0.9.12\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1\"\n+dependencies = [\n+ \"cfg-if\",\n+ \"libc\",\n+ \"redox_syscall\",\n+ \"smallvec\",\n+ \"windows-link\",\n+]\n+\n [[package]]\n name = \"peeking_take_while\"\n version = \"0.1.2\"\n@@ -1187,6 +1331,58 @@ version = \"2.3.2\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220\"\n \n+[[package]]\n+name = \"phf\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078\"\n+dependencies = [\n+ \"phf_macros\",\n+ \"phf_shared\",\n+]\n+\n+[[package]]\n+name = \"phf_codegen\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a\"\n+dependencies = [\n+ \"phf_generator\",\n+ \"phf_shared\",\n+]\n+\n+[[package]]\n+name = \"phf_generator\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d\"\n+dependencies = [\n+ \"phf_shared\",\n+ \"rand 0.8.6\",\n+]\n+\n+[[package]]\n+name = \"phf_macros\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216\"\n+dependencies = [\n+ \"phf_generator\",\n+ \"phf_shared\",\n+ \"proc-macro2\",\n+ \"quote\",\n+ \"syn\",\n+]\n+\n+[[package]]\n+name = \"phf_shared\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5\"\n+dependencies = [\n+ \"siphasher\",\n+]\n+\n [[package]]\n name = \"pin-project-lite\"\n version = \"0.2.17\"\n@@ -1223,6 +1419,12 @@ dependencies = [\n \"zerocopy\",\n ]\n \n+[[package]]\n+name = \"precomputed-hash\"\n+version = \"0.1.1\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c\"\n+\n [[package]]\n name = \"prettyplease\"\n version = \"0.2.37\"\n@@ -1379,6 +1581,15 @@ dependencies = [\n \"rand_core 0.9.5\",\n ]\n \n+[[package]]\n+name = \"redox_syscall\"\n+version = \"0.5.18\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d\"\n+dependencies = [\n+ \"bitflags 2.11.1\",\n+]\n+\n [[package]]\n name = \"regex\"\n version = \"1.12.3\"\n@@ -1563,6 +1774,12 @@ dependencies = [\n \"windows-sys 0.61.2\",\n ]\n \n+[[package]]\n+name = \"scopeguard\"\n+version = \"1.2.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49\"\n+\n [[package]]\n name = \"security-framework\"\n version = \"3.7.0\"\n@@ -1683,6 +1900,12 @@ dependencies = [\n \"libc\",\n ]\n \n+[[package]]\n+name = \"siphasher\"\n+version = \"1.0.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649\"\n+\n [[package]]\n name = \"slab\"\n version = \"0.4.12\"\n@@ -1709,6 +1932,7 @@ dependencies = [\n name = \"sorter2-server\"\n version = \"0.0.1\"\n dependencies = [\n+ \"ammonia\",\n \"async-stream\",\n \"axum\",\n \"axum-extra\",\n@@ -1742,6 +1966,31 @@ version = \"1.2.1\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596\"\n \n+[[package]]\n+name = \"string_cache\"\n+version = \"0.8.9\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f\"\n+dependencies = [\n+ \"new_debug_unreachable\",\n+ \"parking_lot\",\n+ \"phf_shared\",\n+ \"precomputed-hash\",\n+ \"serde\",\n+]\n+\n+[[package]]\n+name = \"string_cache_codegen\"\n+version = \"0.5.4\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0\"\n+dependencies = [\n+ \"phf_generator\",\n+ \"phf_shared\",\n+ \"proc-macro2\",\n+ \"quote\",\n+]\n+\n [[package]]\n name = \"subtle\"\n version = \"2.6.1\"\n@@ -1813,6 +2062,17 @@ dependencies = [\n \"windows-sys 0.61.2\",\n ]\n \n+[[package]]\n+name = \"tendril\"\n+version = \"0.4.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0\"\n+dependencies = [\n+ \"futf\",\n+ \"mac\",\n+ \"utf-8\",\n+]\n+\n [[package]]\n name = \"thiserror\"\n version = \"1.0.69\"\n@@ -2116,6 +2376,12 @@ version = \"2.1.3\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da\"\n \n+[[package]]\n+name = \"utf-8\"\n+version = \"0.7.6\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9\"\n+\n [[package]]\n name = \"utf8_iter\"\n version = \"1.0.4\"\n@@ -2281,6 +2547,18 @@ dependencies = [\n \"wasm-bindgen\",\n ]\n \n+[[package]]\n+name = \"web_atoms\"\n+version = \"0.1.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414\"\n+dependencies = [\n+ \"phf\",\n+ \"phf_codegen\",\n+ \"string_cache\",\n+ \"string_cache_codegen\",\n+]\n+\n [[package]]\n name = \"windows-link\"\n version = \"0.2.1\"\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex 47659ff82fbfb50972eb2b87575e80f66e572ba4..27f552c20b97ef28cdde4cb6b1a4980375135111 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -13,6 +13,7 @@ serde = { version = \"1\", features = [\"derive\"] }\n serde_json = \"1\"\n thiserror = \"1\"\n maud = { version = \"0.26\", features = [\"axum\"] }\n+ammonia = \"4.1\"\n tower = \"0.5\"\n tower-http = { version = \"0.5\", features = [\"trace\"] }\n tracing = \"0.1\"\ndiff --git a/server/src/fetch/html.rs b/server/src/fetch/html.rs\nindex dadf050515f0473943dad97df5d318032c8cb385..5b160c6b8bd216dfaf80149854aec0566cd00460 100644\n--- a/server/src/fetch/html.rs\n+++ b/server/src/fetch/html.rs\n@@ -4,6 +4,7 @@ use maud::{html, Markup};\n \n use crate::{\n form_template::template_json_compact,\n+ html::sanitize::entity_body_html,\n path_types::ItemId,\n reddit::{is_children_fetchable, is_fetchable},\n reducer::NodeState,\n@@ -27,7 +28,7 @@ pub fn entity_panel(node: &NodeState) -> Markup {\n p class=\"muted small\" { \"by \" (author) }\n }\n @if let Some(body) = &data.body_html {\n- div class=\"entity-body\" { (maud::PreEscaped(body)) }\n+ div class=\"entity-body\" { (maud::PreEscaped(entity_body_html(body))) }\n }\n }\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex e180a0ca542a33e2300c0a4809e6b9cfee07ecfe..a58cbbee3490a08a625cb06df06848c59a615d65 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -20,6 +20,7 @@ use crate::{\n ui_action::UI_RPC_FIELD,\n };\n \n+pub mod sanitize;\n pub mod vote;\n \n const SORTER_CSS: &str = include_str!(\"../../static/sorter.css\");\ndiff --git a/server/src/html/sanitize.rs b/server/src/html/sanitize.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..6685ed2535281b9fd5d65b042cbc5a11c5d4df37\n--- /dev/null\n+++ b/server/src/html/sanitize.rs\n@@ -0,0 +1,39 @@\n+//! Whitelist sanitization for untrusted HTML fragments (e.g. Reddit `selftext_html`).\n+\n+use std::sync::LazyLock;\n+\n+use ammonia::Builder;\n+\n+static ENTITY_BODY: LazyLock> = LazyLock::new(|| {\n+ let mut b = Builder::default();\n+ b.strip_comments(true);\n+ b.link_rel(Some(\"noopener noreferrer\"));\n+ b\n+});\n+\n+/// Sanitize HTML safe for embedding in our pages via [`maud::PreEscaped`].\n+pub fn entity_body_html(raw: &str) -> String {\n+ ENTITY_BODY.clean(raw).to_string()\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::entity_body_html;\n+\n+ #[test]\n+ fn keeps_benign_markup() {\n+ assert_eq!(\n+ entity_body_html(\"

release notes

\"),\n+ \"

release notes

\"\n+ );\n+ }\n+\n+ #[test]\n+ fn strips_scripts_and_event_handlers() {\n+ let raw = \"

ok

\";\n+ let clean = entity_body_html(raw);\n+ assert!(!clean.contains(\"ok

\"));\n+ }\n+}\ndiff --git a/server/src/render/reddit.rs b/server/src/render/reddit.rs\nindex c4f98fc760c32ce1b41a91bd41e97908bd198937..7f840aa33b734a31d8cf3341a0581c8bcb9bbcf3 100644\n--- a/server/src/render/reddit.rs\n+++ b/server/src/render/reddit.rs\n@@ -3,6 +3,7 @@\n use maud::{html, Markup};\n \n use crate::{\n+ html::sanitize::entity_body_html,\n path_types::ItemId,\n reducer::{EntityData, GlobalTree, NodeState},\n };\n@@ -57,7 +58,7 @@ fn post_entity_card(data: &EntityData) -> Markup {\n }\n }\n @if let Some(body) = &data.body_html {\n- div class=\"entity-body\" { (maud::PreEscaped(body)) }\n+ div class=\"entity-body\" { (maud::PreEscaped(entity_body_html(body))) }\n }\n }\n }\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}