{"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[4e327784] deploy live constitution dashboard\n\nExpose auditable progress and event streaming, configure the production roots and runtime, and make tested main-branch commits the deployment authority.\n\nCo-authored-by: Cursor \n\nSide A — unified diff (full patch):\ndiff --git a/.dockerignore b/.dockerignore\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..c9d63a722beba0a0297fc853089332c460ab78dd\n--- /dev/null\n+++ b/.dockerignore\n@@ -0,0 +1,7 @@\n+.git\n+.venv\n+.hypothesis\n+__pycache__\n+tests\n+*.json\n+*.bsp\ndiff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..76dcdf82d53177c1e47d86b23a54523239d232a6\n--- /dev/null\n+++ b/.github/workflows/deploy.yml\n@@ -0,0 +1,49 @@\n+name: Test and deploy\n+\n+on:\n+ push:\n+ branches: [main]\n+\n+concurrency:\n+ group: production\n+ cancel-in-progress: false\n+\n+permissions:\n+ contents: read\n+\n+jobs:\n+ test:\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions/checkout@v4\n+\n+ - uses: astral-sh/setup-uv@v6\n+ with:\n+ enable-cache: true\n+\n+ - name: Run Python tests\n+ run: uv run pytest -q\n+\n+ - name: Install Babashka\n+ run: |\n+ curl -fsSL https://raw.githubusercontent.com/babashka/babashka/master/install \\\n+ | sudo bash -s -- --dir /usr/local/bin\n+\n+ - name: Run process integration tests\n+ run: bb TEST.sh\n+\n+ deploy:\n+ needs: test\n+ runs-on: ubuntu-latest\n+ environment:\n+ name: production\n+ url: https://token.slug.social\n+ steps:\n+ - uses: actions/checkout@v4\n+\n+ - uses: superfly/flyctl-actions/setup-flyctl@master\n+\n+ - name: Deploy to Fly\n+ run: flyctl deploy --remote-only\n+ env:\n+ FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}\ndiff --git a/Dockerfile b/Dockerfile\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..c9a5c00782371c19ad5ab5c58cf6f5a8ffec0141\n--- /dev/null\n+++ b/Dockerfile\n@@ -0,0 +1,17 @@\n+FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim\n+\n+RUN apt-get update \\\n+ && apt-get install -y --no-install-recommends git ca-certificates \\\n+ && rm -rf /var/lib/apt/lists/*\n+\n+WORKDIR /app\n+COPY pyproject.toml uv.lock ./\n+RUN uv sync --frozen --no-install-project\n+\n+COPY constitution.py ./\n+\n+ENV PATH=\"/app/.venv/bin:${PATH}\" \\\n+ PYTHONUNBUFFERED=\"1\"\n+\n+EXPOSE 8080\n+CMD [\"python\", \"constitution.py\"]\ndiff --git a/constitution.py b/constitution.py\nindex 4bee9f83663ab7fb36db95129b92b64b4ef57258..a58257e1881b21d1d6fa8e68a3faa222e4f661ef 100644\n--- a/constitution.py\n+++ b/constitution.py\n@@ -24,12 +24,12 @@ A daily GitHub Action backs up the JSONL ledger to the same repo.\n Run: uv run constitution.py\n \"\"\"\n \n-from decimal import Decimal, getcontext\n+from decimal import Decimal, getcontext, DefaultContext\n from datetime import datetime, timezone\n from fastapi import FastAPI, Request, Response\n from fastapi.responses import PlainTextResponse, HTMLResponse\n from starlette.middleware.sessions import SessionMiddleware\n-import json, time, os, asyncio, httpx, pathlib, subprocess, hashlib, re, fcntl\n+import json, time, os, asyncio, httpx, pathlib, subprocess, hashlib, re, fcntl, base64\n import sympy as sp # type: ignore[reportMissingImports]\n from tenacity import retry, retry_if_exception, stop_after_attempt, wait_exponential\n from evaleval import (\n@@ -37,6 +37,7 @@ from evaleval import (\n exec_event, One, Two, Three, Selector, MORPH, PREPEND,\n )\n \n+DefaultContext.prec = 50\n getcontext().prec = 50\n \n app = FastAPI()\n@@ -129,14 +130,47 @@ OPENROUTER_BASE_URL = os.environ.get(\"OPENROUTER_BASE_URL\", \"https://openrouter.\n # using the exact same source; their normalized values are committed to every\n # discovery event.\n DEFAULT_REPOSITORIES = [\n+ {\n+ \"id\": \"constitution\",\n+ \"url\": \"https://github.com/sortersocial/constitution.git\",\n+ \"refs\": [\"refs/heads/**\"],\n+ },\n {\n \"id\": \"slug\",\n- \"url\": \"https://github.com/tommy-mor/slug.git\",\n+ \"url\": \"https://github.com/sortersocial/slug.git\",\n+ \"refs\": [\"refs/heads/**\"],\n+ },\n+ {\n+ \"id\": \"sorter\",\n+ \"url\": \"https://github.com/sorterisntonline/sorter.git\",\n+ \"refs\": [\"refs/heads/**\"],\n+ },\n+ {\n+ \"id\": \"sorter2\",\n+ \"url\": \"https://github.com/sortersocial/sorter2.git\",\n+ \"refs\": [\"refs/heads/**\"],\n+ },\n+ {\n+ \"id\": \"sorter-oldest\",\n+ \"url\": \"https://github.com/tommy-mor/sorter.git\",\n \"refs\": [\"refs/heads/**\"],\n },\n ]\n DEFAULT_CONTRIBUTORS = {\n \"tommy-mor\": [\"thmorriss@gmail.com\"],\n+ \"christopher-whitman\": [\n+ \"chris@cwwhitman.com\",\n+ \"7566903+cwwhitman@users.noreply.github.com\",\n+ ],\n+ \"jake-chvatal\": [\n+ \"jake+github@uln.industries\",\n+ \"jakechvatal@gmail.com\",\n+ \"jake@isnt.online\",\n+ ],\n+ \"lara\": [\"me@lara.lv\"],\n+ \"nat-reid\": [\"nathanielreid@gmail.com\"],\n+ \"zod\": [\"jason.p.mcel@gmail.com\", \"me@zod.tf\"],\n+ \"jovan\": [\"jovan@slug.social\", \"jovan@getcivicai.com\"],\n }\n \n REPOSITORIES = json.loads(\n@@ -147,6 +181,7 @@ CONTRIBUTORS = json.loads(\n )\n GIT_MIRROR_DIR = pathlib.Path(os.environ.get(\"GIT_MIRROR_DIR\", \"/data/git\"))\n GIT_TIMEOUT_SECONDS = int(os.environ.get(\"GIT_TIMEOUT_SECONDS\", \"120\"))\n+GITHUB_TOKEN = os.environ.get(\"GITHUB_TOKEN\", \"\")\n \n # Council model IDs: slug.social garden rank under this parent (bodies = OpenRouter URLs), then top-up from OpenRouter list.\n SLUG_SOCIAL_BASE_URL = os.environ.get(\"SLUG_SOCIAL_BASE_URL\", \"https://slug.social\").rstrip(\"/\")\n@@ -661,20 +696,30 @@ def _git(repo: pathlib.Path | None, *args: str, input_bytes: bytes | None = None\n if repo is not None:\n command += [\"-C\", str(repo)]\n command += list(args)\n+ git_env = {\n+ **os.environ,\n+ \"GIT_CONFIG_NOSYSTEM\": \"1\",\n+ \"GIT_CONFIG_GLOBAL\": os.devnull,\n+ \"GIT_NO_REPLACE_OBJECTS\": \"1\",\n+ \"LC_ALL\": \"C\",\n+ \"TZ\": \"UTC\",\n+ }\n+ if GITHUB_TOKEN:\n+ credential = base64.b64encode(\n+ f\"x-access-token:{GITHUB_TOKEN}\".encode()\n+ ).decode()\n+ git_env.update({\n+ \"GIT_CONFIG_COUNT\": \"1\",\n+ \"GIT_CONFIG_KEY_0\": \"http.https://github.com/.extraHeader\",\n+ \"GIT_CONFIG_VALUE_0\": f\"Authorization: Basic {credential}\",\n+ })\n try:\n result = subprocess.run(\n command,\n input=input_bytes,\n stdout=subprocess.PIPE,\n stderr=subprocess.PIPE,\n- env={\n- **os.environ,\n- \"GIT_CONFIG_NOSYSTEM\": \"1\",\n- \"GIT_CONFIG_GLOBAL\": os.devnull,\n- \"GIT_NO_REPLACE_OBJECTS\": \"1\",\n- \"LC_ALL\": \"C\",\n- \"TZ\": \"UTC\",\n- },\n+ env=git_env,\n timeout=GIT_TIMEOUT_SECONDS,\n check=False,\n )\n@@ -844,9 +889,15 @@ def _build_discovery(epoch_n: int, boundary_ms: int, events: list) -> GitDiscove\n canonical_location = min(\n locations[qualified_oid], key=lambda x: (x[0], x[1])\n )\n+ # One commit may be reachable from dozens of refs in the same mirror.\n+ # Verify its object once per repository, not once per source ref.\n+ object_locations = {\n+ (str(m), raw_oid): (m, raw_oid)\n+ for _, _, m, raw_oid in locations[qualified_oid]\n+ }\n object_hashes = {\n hashlib.sha256(_git(m, \"cat-file\", \"commit\", raw_oid)).hexdigest()\n- for _, _, m, raw_oid in locations[qualified_oid]\n+ for m, raw_oid in object_locations.values()\n }\n if len(object_hashes) != 1:\n raise RuntimeError(f\"conflicting Git objects share OID {qualified_oid}\")\n@@ -994,11 +1045,55 @@ async def discover_repositories(epoch_n: int, boundary_ms: int) -> GitDiscovery:\n \n \n SSE_CLIENTS = []\n+AUDIT_HISTORY = []\n+AUDIT_SEQUENCE = 0\n+PROCESS_STATE = {\n+ \"running\": False,\n+ \"phase\": \"idle\",\n+ \"progress\": 100,\n+ \"message\": \"Waiting for the next epoch\",\n+}\n+\n+\n+def _sse_event(event_name: str, payload: dict) -> str:\n+ return (\n+ f\"event: {event_name}\\n\"\n+ f\"data: {json.dumps(payload, separators=(',', ':'))}\\n\\n\"\n+ )\n+\n+\n+async def broadcast_audit(\n+ kind: str,\n+ message: str,\n+ *,\n+ progress: int | None = None,\n+ phase: str | None = None,\n+) -> dict:\n+ global AUDIT_SEQUENCE\n+ AUDIT_SEQUENCE += 1\n+ if progress is not None:\n+ PROCESS_STATE[\"progress\"] = max(0, min(100, int(progress)))\n+ if phase is not None:\n+ PROCESS_STATE[\"phase\"] = phase\n+ PROCESS_STATE[\"message\"] = message\n+ payload = {\n+ \"id\": AUDIT_SEQUENCE,\n+ \"timestamp_ms\": int(time.time() * 1000),\n+ \"kind\": kind,\n+ \"message\": message,\n+ **PROCESS_STATE,\n+ }\n+ AUDIT_HISTORY.append(payload)\n+ del AUDIT_HISTORY[:-200]\n+ wire = _sse_event(\"audit\", payload)\n+ for queue in list(SSE_CLIENTS):\n+ await queue.put(wire)\n+ return payload\n \n \n async def broadcast_js(js: str):\n \"\"\"Send a JS snippet to all connected SSE clients.\"\"\"\n- for queue in SSE_CLIENTS:\n+ for queue in list(SSE_CLIENTS):\n await queue.put(js)\n \n \n@@ -1006,10 +1101,29 @@ async def rank_commits(commits: list[dict]):\n if not commits:\n return {}, []\n \n- models = await fetch_top_models(n=3)\n contributors = sorted(set(c[\"contributor\"] for c in commits))\n- if len(contributors) > 1 and not models:\n+ if len(contributors) == 1:\n+ await broadcast_audit(\n+ \"ranking\",\n+ f\"Only {contributors[0]} is eligible; rank is 1.0\",\n+ progress=90,\n+ phase=\"finalizing\",\n+ )\n+ return {contributors[0]: Decimal(\"1\")}, []\n+ if not (OPENROUTER_API_KEY or \"\").strip():\n+ raise RuntimeError(\n+ \"OPENROUTER_API_KEY is required when multiple contributors need ranking\"\n+ )\n+\n+ models = await fetch_top_models(n=3)\n+ if not models:\n raise RuntimeError(\"no council models available for contributor ranking\")\n+ await broadcast_audit(\n+ \"council\",\n+ f\"Council selected: {', '.join(models)}\",\n+ progress=35,\n+ phase=\"ranking\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-council\", f\"Council: {', '.join(models)} — {len(commits)} commits\"]\n ]))\n@@ -1035,6 +1149,11 @@ async def rank_commits(commits: list[dict]):\n \n async def compare_fn(i, j):\n a1, a2 = authors[i], authors[j]\n+ await broadcast_audit(\n+ \"comparison\",\n+ f\"Comparing {a1} with {a2}\",\n+ phase=\"ranking\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-status\")][MORPH][\n [\"div#emission-status\", f\"Comparing {a1} vs {a2}…\"]\n ]))\n@@ -1050,6 +1169,11 @@ async def rank_commits(commits: list[dict]):\n if winner_weight <= 0 or loser_weight <= 0:\n raise ValueError(\"ratio weights must be positive\")\n results.append((w, l, winner_weight, loser_weight))\n+ await broadcast_audit(\n+ \"vote\",\n+ f\"{model}: {authors[w]} over {authors[l]} ({result['ratio']})\",\n+ phase=\"ranking\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-vote\",\n [\"span.model\", model], \" — \",\n@@ -1059,6 +1183,11 @@ async def rank_commits(commits: list[dict]):\n ]\n ]))\n except Exception as e:\n+ await broadcast_audit(\n+ \"error\",\n+ f\"{model} failed: {e}\",\n+ phase=\"error\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-error\", f\"⚠ {model}: {e}\"]\n ]))\n@@ -1068,8 +1197,13 @@ async def rank_commits(commits: list[dict]):\n async def progress_fn(ev):\n if ev[\"phase\"] == \"spanning_tree\":\n label = f\"Spanning tree: {ev['step']}/{ev['total']}\"\n+ percent = 35 + round(35 * ev[\"step\"] / max(ev[\"total\"], 1))\n else:\n label = f\"Zip pass {ev['pass']}: {ev['step']}/{ev['total']}\"\n+ percent = 70 + round(20 * ev[\"step\"] / max(ev[\"total\"], 1))\n+ await broadcast_audit(\n+ \"progress\", label, progress=percent, phase=\"ranking\"\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-status\")][MORPH][\n [\"div#emission-status\", label]\n ]))\n@@ -1083,6 +1217,12 @@ async def rank_commits(commits: list[dict]):\n scores = rank_centrality(pairs)\n ranking = {authors[i]: Decimal(str(scores[i])) for i in range(len(authors))}\n ranking_rows = sorted(ranking.items(), key=lambda x: x[1], reverse=True)\n+ await broadcast_audit(\n+ \"ranking\",\n+ \"Ranking: \" + \", \".join(f\"{a} {s:.4f}\" for a, s in ranking_rows),\n+ progress=90,\n+ phase=\"finalizing\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-ranking\",\n [\"b\", \"Ranking: \"],\n@@ -1104,11 +1244,33 @@ def pool_remaining(events: list) -> Decimal:\n \n \n async def run_emission(epoch_n, boundary_ms):\n+ PROCESS_STATE[\"running\"] = True\n+ await broadcast_audit(\n+ \"start\",\n+ f\"Epoch {epoch_n} emission started\",\n+ progress=2,\n+ phase=\"starting\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-start\", f\"⚡ Epoch {epoch_n} emission started\"]\n ]))\n \n+ await broadcast_audit(\n+ \"discovery\",\n+ \"Fetching configured repositories and snapshotting refs\",\n+ progress=8,\n+ phase=\"discovery\",\n+ )\n discovery = await discover_repositories(epoch_n, boundary_ms)\n+ await broadcast_audit(\n+ \"discovery\",\n+ (\n+ f\"Discovered {len(discovery.observations)} new commits; \"\n+ f\"{len(discovery.commits)} are eligible\"\n+ ),\n+ progress=30,\n+ phase=\"discovery\",\n+ )\n ranking, models = await rank_commits(discovery.commits)\n \n def make_emission(events):\n@@ -1146,6 +1308,13 @@ async def run_emission(epoch_n, boundary_ms):\n \n entry = await store.atomic(make_emission)\n if entry:\n+ PROCESS_STATE[\"running\"] = False\n+ await broadcast_audit(\n+ \"complete\",\n+ f\"Epoch {entry.epoch} complete; emitted {entry.total_emitted} SLG\",\n+ progress=100,\n+ phase=\"idle\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-amount\",\n f\"Pool {entry.pool_before} → emit {entry.total_emitted} → {entry.pool_after}\"]\n@@ -1189,13 +1358,24 @@ async def distribute_usdc(holdings, treasury_balance):\n async def epoch_loop():\n while True:\n epoch_n, current_start, next_boundary = current_epoch()\n+ processed = {e.epoch for e in store.read() if isinstance(e, Emission)}\n+ if epoch_n >= 0 and epoch_n not in processed:\n+ try:\n+ await run_emission(epoch_n, current_start)\n+ except Exception as exc:\n+ PROCESS_STATE[\"running\"] = False\n+ await broadcast_audit(\n+ \"error\",\n+ f\"Epoch {epoch_n} failed: {exc}; retrying in 60 seconds\",\n+ phase=\"error\",\n+ )\n+ print(f\"epoch {epoch_n} emission failed: {exc}\", flush=True)\n+ await asyncio.sleep(60)\n+ continue\n+\n now = int(time.time() * 1000)\n wait_ms = next_boundary - now\n-\n if wait_ms <= 0:\n- processed = {e.epoch for e in store.read() if isinstance(e, Emission)}\n- if epoch_n not in processed and epoch_n >= 0:\n- await run_emission(epoch_n, current_start)\n await asyncio.sleep(60)\n elif wait_ms < 86_400_000:\n await broadcast_js(exec_event(Three[Selector(\"#emission-status\")][MORPH][\n@@ -1243,6 +1423,36 @@ async def get_ranking():\n return {\"ranking\": latest.ranking, \"epoch\": latest.epoch}\n \n \n+@app.get(\"/api/status\")\n+async def get_status():\n+ events = store.read()\n+ discoveries = [e for e in events if isinstance(e, GitDiscovery)]\n+ emissions = [e for e in events if isinstance(e, Emission)]\n+ return {\n+ **PROCESS_STATE,\n+ \"epoch\": current_epoch()[0],\n+ \"openrouter_configured\": bool((OPENROUTER_API_KEY or \"\").strip()),\n+ \"sse_clients\": len(SSE_CLIENTS),\n+ \"latest_discovery\": (\n+ {\n+ \"epoch\": discoveries[-1].epoch,\n+ \"snapshot_id\": discoveries[-1].snapshot_id,\n+ \"observations\": len(discoveries[-1].observations),\n+ \"eligible_commits\": len(discoveries[-1].commits),\n+ }\n+ if discoveries else None\n+ ),\n+ \"latest_emission\": (\n+ {\n+ \"epoch\": emissions[-1].epoch,\n+ \"total_emitted\": emissions[-1].total_emitted,\n+ \"ranking\": emissions[-1].ranking,\n+ }\n+ if emissions else None\n+ ),\n+ }\n+\n+\n @app.get(\"/api/contributor/{github_username}\")\n async def get_contributor(github_username: str):\n history = [\n@@ -1306,13 +1516,6 @@ async def test_emit():\n \n # ===========================================================================\n # §9. SSE — live audit stream of the pairwise voting process\n-#\n-# TODO: the /sse emission audit page needs a real SSE-driven UI. votes arrive\n-# incrementally during rank_commits(), and the client should show a live\n-# progress bar and per-vote results as they stream in. this requires a\n-# dedicated page that connects to /sse and updates the DOM on each event\n-# (council, comparing, vote, ranking, emission_complete). defer until we\n-# have playwright tests to cover it — the incremental rendering is fiddly.\n # ===========================================================================\n \n @app.get(\"/sse\")\n@@ -1322,6 +1525,13 @@ async def sse_stream(request: Request):\n \n async def generate():\n try:\n+ yield _sse_event(\"audit\", {\n+ \"id\": AUDIT_SEQUENCE,\n+ \"timestamp_ms\": int(time.time() * 1000),\n+ \"kind\": \"connection\",\n+ \"message\": f\"Connected to epoch {current_epoch()[0]}\",\n+ **PROCESS_STATE,\n+ })\n yield exec_event(Three[Selector(\"#emission-status\")][MORPH][\n [\"div#emission-status\", f\"Connected — epoch {current_epoch()[0]}\"]\n ])\n@@ -1334,10 +1544,15 @@ async def sse_stream(request: Request):\n except asyncio.TimeoutError:\n yield \": keepalive\\n\\n\"\n finally:\n- SSE_CLIENTS.remove(queue)\n+ if queue in SSE_CLIENTS:\n+ SSE_CLIENTS.remove(queue)\n \n from starlette.responses import StreamingResponse\n- return StreamingResponse(generate(), media_type=\"text/event-stream\")\n+ return StreamingResponse(\n+ generate(),\n+ media_type=\"text/event-stream\",\n+ headers={\"Cache-Control\": \"no-cache\", \"X-Accel-Buffering\": \"no\"},\n+ )\n \n \n # ===========================================================================\n@@ -1359,6 +1574,7 @@ def _page(title: str, body: list) -> HTMLResponse:\n [\"meta\", {\"charset\": \"utf-8\"}],\n [\"meta\", {\"name\": \"viewport\", \"content\": \"width=device-width, initial-scale=1\"}],\n [\"title\", title],\n+ [\"style\", RawContent(_WATCH_CSS)],\n ],\n [\"body\",\n body,\n@@ -1367,6 +1583,387 @@ def _page(title: str, body: list) -> HTMLResponse:\n ]))\n \n \n+_WATCH_CSS = \"\"\"\n+/* ================================================================\n+ ZIGGURAT — bevel-first dark theme\n+ --spread (0→1) controls bevel depth. 0 = flat. 1 = full relief.\n+ Light source: top-left. Shadow: bottom-right.\n+ Platforms nest. Each level is raised. Nothing is rounded.\n+ ================================================================ */\n+\n+:root {\n+ color-scheme: dark;\n+ --spread: 1;\n+\n+ --g0: #080808;\n+ --g1: #131313;\n+ --g2: #1c1c1c;\n+ --g3: #252525;\n+ --g4: #2e2e2e;\n+ --g5: #383838;\n+\n+ --hi: #5e5e5e;\n+ --lo: #050505;\n+ --bv: calc(var(--spread) * 4px + 1px);\n+ --bv-lg: calc(var(--spread) * 6px + 2px);\n+\n+ --signal: #f0f0f0;\n+ --prose: #c2c2c2;\n+ --ui: #888;\n+ --meta: #4a4a4a;\n+ --link: #8899ee;\n+ --code-fg: #c8dda0;\n+\n+ --font-prose: \"Iowan Old Style\", \"Palatino Linotype\", Palatino, \"Book Antiqua\", Georgia, serif;\n+ --font-ui: system-ui, -apple-system, sans-serif;\n+ --font-code: ui-monospace, \"Cascadia Code\", \"SF Mono\", Menlo, monospace;\n+}\n+\n+*, *::before, *::after { box-sizing: border-box; }\n+html, body { margin: 0; padding: 0; }\n+\n+body {\n+ background: var(--g0);\n+ color: var(--prose);\n+ font-family: var(--font-ui);\n+ font-size: 14px;\n+ line-height: 1.6;\n+ margin: 0 auto;\n+ max-width: 560px;\n+ min-height: 100vh;\n+ padding: 0 16px 48px;\n+}\n+main { width: 100%; padding: 18px 0 48px; }\n+\n+h1, h2, h3 {\n+ color: var(--signal);\n+ font-size: 11px;\n+ font-weight: bold;\n+ letter-spacing: 0.12em;\n+ margin: 14px 0 6px;\n+ text-transform: uppercase;\n+}\n+a { color: var(--link); text-decoration: none; }\n+a:hover { color: var(--signal); }\n+.eyebrow {\n+ background: var(--g2);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ color: var(--ui);\n+ font-size: 11px;\n+ letter-spacing: 0.12em;\n+ padding: 4px 10px;\n+ text-transform: uppercase;\n+ width: fit-content;\n+}\n+\n+/* Every dashboard section is a raised platform. */\n+.panel {\n+ background: var(--g2);\n+ border: var(--bv-lg) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ margin: 8px 0;\n+ padding: 10px;\n+ width: 100%;\n+}\n+.status-row {\n+ align-items: center;\n+ display: flex;\n+ flex-wrap: wrap;\n+ gap: 8px;\n+ justify-content: space-between;\n+}\n+#process-status { color: var(--signal); font-family: var(--font-code); font-weight: bold; }\n+.badge {\n+ align-items: center;\n+ background: var(--g3);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ color: var(--ui);\n+ display: inline-flex;\n+ font-size: 11px;\n+ gap: 7px;\n+ padding: 3px 8px;\n+}\n+.dot { background: var(--meta); height: 8px; width: 8px; }\n+.live .dot { background: #7acc7a; }\n+.warn .dot { background: #cc9955; }\n+\n+/* The progress track is inset; its signal is raised inside it. */\n+.progress-shell {\n+ background: var(--g1);\n+ border: var(--bv-lg) solid;\n+ border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n+ height: 58px;\n+ margin: 14px 0 10px;\n+ overflow: hidden;\n+ position: relative;\n+}\n+#progress-fill {\n+ background: var(--link);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ height: 100%;\n+ transition: width .35s steps(8, end);\n+ width: 0;\n+}\n+#progress-label {\n+ color: var(--signal);\n+ display: grid;\n+ font-family: var(--font-code);\n+ font-size: 18px;\n+ font-weight: bold;\n+ inset: 0;\n+ place-items: center;\n+ position: absolute;\n+ text-shadow: 1px 1px var(--lo);\n+}\n+\n+.controls { align-items: center; display: flex; flex-wrap: wrap; gap: 8px; }\n+button {\n+ background: var(--g5);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ color: var(--signal);\n+ cursor: pointer;\n+ font: inherit;\n+ font-size: 12px;\n+ padding: 4px 10px;\n+}\n+button:hover { background: #404040; }\n+button:active {\n+ background: var(--g4);\n+ border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n+ transform: translate(1px, 1px);\n+}\n+button:disabled { cursor: default; opacity: .4; }\n+.note { color: var(--meta); font-size: 11px; margin: 4px 0; }\n+\n+.feed-head { align-items: baseline; display: flex; justify-content: space-between; }\n+#audit-feed {\n+ background: var(--g1);\n+ border: var(--bv) solid;\n+ border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n+ display: flex;\n+ flex-direction: column;\n+ gap: 5px;\n+ margin-top: 8px;\n+ padding: 6px;\n+}\n+.event {\n+ background: var(--g3);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ display: grid;\n+ gap: 6px;\n+ grid-template-columns: 82px 88px 1fr;\n+ padding: 5px 8px;\n+}\n+.event[data-kind=\"error\"] { border-left-color: #cc5555; }\n+.event[data-kind=\"complete\"], .event[data-kind=\"ranking\"] { border-left-color: #7acc7a; }\n+.event[data-kind=\"vote\"] { border-left-color: var(--link); }\n+.event time, .event-kind { color: var(--meta); font-family: var(--font-code); font-size: 10px; }\n+.event-kind { text-transform: uppercase; }\n+.event-message { color: var(--prose); font-family: var(--font-prose); }\n+\n+code {\n+ background: var(--g1);\n+ border: 2px solid;\n+ border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n+ color: var(--code-fg);\n+ font-family: var(--font-code);\n+ font-size: 12px;\n+ padding: 1px 4px;\n+}\n+\n+@media (max-width: 520px) {\n+ .event { grid-template-columns: 72px 1fr; }\n+ .event-message { grid-column: 1 / -1; }\n+}\n+\"\"\"\n+\n+\n+def _watch_initial_state() -> dict:\n+ events = store.read()\n+ feed = []\n+ for event_ in events[-40:]:\n+ if isinstance(event_, GitDiscovery):\n+ feed.append({\n+ \"id\": f\"discovery-{event_.snapshot_id}\",\n+ \"timestamp_ms\": event_.timestamp_ms,\n+ \"kind\": \"discovery\",\n+ \"message\": (\n+ f\"Epoch {event_.epoch}: observed {len(event_.observations)} commits; \"\n+ f\"{len(event_.commits)} eligible\"\n+ ),\n+ })\n+ elif isinstance(event_, Emission):\n+ feed.append({\n+ \"id\": f\"emission-{event_.epoch}\",\n+ \"timestamp_ms\": event_.timestamp_ms,\n+ \"kind\": \"complete\",\n+ \"message\": (\n+ f\"Epoch {event_.epoch}: emitted {event_.total_emitted} SLG; \"\n+ f\"ranking {event_.ranking}\"\n+ ),\n+ })\n+ feed.extend(AUDIT_HISTORY)\n+ return {\n+ \"process\": dict(PROCESS_STATE),\n+ \"openrouter_configured\": bool((OPENROUTER_API_KEY or \"\").strip()),\n+ \"epoch\": current_epoch()[0],\n+ \"feed\": feed[-200:],\n+ }\n+\n+\n+_WATCH_JS = \"\"\"\n+const initial = __INITIAL__;\n+const feed = document.querySelector('#audit-feed');\n+const processStatus = document.querySelector('#process-status');\n+const connection = document.querySelector('#connection-status');\n+const fill = document.querySelector('#progress-fill');\n+const progressLabel = document.querySelector('#progress-label');\n+const play = document.querySelector('#play');\n+const pause = document.querySelector('#pause');\n+const seen = new Set();\n+let source = null;\n+\n+function setProgress(value) {\n+ const n = Math.max(0, Math.min(100, Number(value ?? 0)));\n+ fill.style.width = `${n}%`;\n+ progressLabel.textContent = `${Math.round(n)}%`;\n+ document.querySelector('.progress-shell').setAttribute('aria-valuenow', String(n));\n+}\n+\n+function addEvent(event) {\n+ const id = String(event.id);\n+ if (seen.has(id)) return;\n+ seen.add(id);\n+ const row = document.createElement('div');\n+ row.className = 'event';\n+ row.dataset.kind = event.kind || 'event';\n+ const when = document.createElement('time');\n+ when.dateTime = new Date(event.timestamp_ms).toISOString();\n+ when.textContent = new Date(event.timestamp_ms).toLocaleTimeString();\n+ const kind = document.createElement('span');\n+ kind.className = 'event-kind';\n+ kind.textContent = event.kind || 'event';\n+ const message = document.createElement('span');\n+ message.className = 'event-message';\n+ message.textContent = event.message;\n+ row.append(when, kind, message);\n+ feed.prepend(row);\n+ while (feed.children.length > 200) feed.lastElementChild.remove();\n+}\n+\n+function applyState(event) {\n+ processStatus.textContent = event.message || 'Waiting for the next epoch';\n+ setProgress(event.progress);\n+ if (event.kind !== 'connection') addEvent(event);\n+}\n+\n+function connect() {\n+ if (source) return;\n+ source = new EventSource('/sse');\n+ connection.classList.remove('warn');\n+ connection.classList.add('live');\n+ connection.querySelector('span:last-child').textContent = 'connecting';\n+ play.disabled = true;\n+ pause.disabled = false;\n+ source.onopen = () => {\n+ connection.querySelector('span:last-child').textContent = 'live';\n+ };\n+ source.addEventListener('audit', event => applyState(JSON.parse(event.data)));\n+ source.onerror = () => {\n+ connection.classList.remove('live');\n+ connection.classList.add('warn');\n+ connection.querySelector('span:last-child').textContent = 'reconnecting';\n+ };\n+}\n+\n+function disconnect() {\n+ if (source) source.close();\n+ source = null;\n+ connection.classList.remove('live');\n+ connection.classList.add('warn');\n+ connection.querySelector('span:last-child').textContent = 'paused locally';\n+ play.disabled = false;\n+ pause.disabled = true;\n+}\n+\n+play.addEventListener('click', connect);\n+pause.addEventListener('click', disconnect);\n+initial.feed.forEach(addEvent);\n+processStatus.textContent = initial.process.message;\n+setProgress(initial.process.progress);\n+connect();\n+\"\"\"\n+\n+\n+@app.get(\"/watch\")\n+async def watch():\n+ initial = json.dumps(\n+ _watch_initial_state(), separators=(\",\", \":\")\n+ ).replace(\" 0\")\n \n- ;; 9. SSE connects and sends initial event\n+ ;; 9. watch UI exposes progress, controls, readiness, and live SSE\n+ (println \"\\nchecking /watch UI…\")\n+ (bind watch-html (slurp (str base-url \"/watch\")))\n+ (assert! (str/includes? watch-html \"role=\\\"progressbar\\\"\")\n+ \"watch page has progress bar\")\n+ (assert! (str/includes? watch-html \"id=\\\"play\\\"\")\n+ \"watch page has play control\")\n+ (assert! (str/includes? watch-html \"id=\\\"pause\\\"\")\n+ \"watch page has pause control\")\n+ (assert! (str/includes? watch-html \"OpenRouter configured\")\n+ \"watch page reports council readiness\")\n+ (bind status-resp (get-json base-url \"/api/status\"))\n+ (assert! (true? (:openrouter_configured status-resp))\n+ \"status API reports OpenRouter configuration\")\n+\n+ ;; 10. SSE connects and sends initial event\n (println \"\\nchecking /sse initial event…\")\n (bind sse-events (read-sse-events (str base-url \"/sse\") 1 5000))\n (assert! (= 1 (count sse-events)) \"received 1 SSE event\")\n (assert! (not (str/blank? (first sse-events)))\n \"initial SSE event contains executable audit data\")\n \n- ;; 10. POST /test/emit — full ranking pipeline hits mocks\n+ ;; 11. POST /test/emit — full ranking pipeline hits mocks\n (println \"\\ntriggering /test/emit (epoch 1)…\")\n (bind emit-resp (post-json! base-url \"/test/emit\"))\n (assert! (= \"emission\" (:type emit-resp)) \"emit response type is emission\")\n@@ -503,7 +518,7 @@\n (bind rank-after (get-json base-url \"/api/ranking\"))\n (assert! (= 1 (:epoch rank-after)) \"latest ranking is epoch 1\")\n \n- ;; 11. kill and restart — prove replay determinism\n+ ;; 12. kill and restart — prove replay determinism\n (println \"\\nkilling server for replay test…\")\n (.destroyForcibly (:proc server))\n (deref server)\ndiff --git a/tests/test_git_discovery.py b/tests/test_git_discovery.py\nindex 0dd31bc42a19bc8c59842dc61f193c595c474659..5a9e167e16ad2ffb25988af85820f6f19e8910cd 100644\n--- a/tests/test_git_discovery.py\n+++ b/tests/test_git_discovery.py\n@@ -393,7 +393,9 @@ def test_empty_epoch_records_zero_emission_without_burning_pool(\n monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n \n async def discover(_epoch, _boundary):\n- return SimpleNamespace(commits=[], snapshot_id=\"empty-snapshot\")\n+ return SimpleNamespace(\n+ observations=[], commits=[], snapshot_id=\"empty-snapshot\"\n+ )\n \n async def rank(_commits):\n return {}, []\n@@ -412,7 +414,11 @@ def test_emission_distribution_sums_exactly_to_total(\n monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n \n async def discover(_epoch, _boundary):\n- return SimpleNamespace(commits=[{\"x\": 1}], snapshot_id=\"ranked-snapshot\")\n+ return SimpleNamespace(\n+ observations=[{\"x\": 1}],\n+ commits=[{\"x\": 1}],\n+ snapshot_id=\"ranked-snapshot\",\n+ )\n \n async def rank(_commits):\n return {\n@@ -454,6 +460,7 @@ def test_any_council_failure_aborts_ranking(monkeypatch):\n \n monkeypatch.setattr(c, \"fetch_top_models\", models)\n monkeypatch.setattr(c, \"llm_pairwise_compare\", compare)\n+ monkeypatch.setattr(c, \"OPENROUTER_API_KEY\", \"test-key\")\n commits = [\n {\n \"contributor\": contributor,\n@@ -465,3 +472,54 @@ def test_any_council_failure_aborts_ranking(monkeypatch):\n ]\n with pytest.raises(RuntimeError, match=\"council model failed\"):\n asyncio.run(c.rank_commits(commits))\n+\n+\n+def test_contested_ranking_requires_openrouter_key(monkeypatch):\n+ monkeypatch.setattr(c, \"OPENROUTER_API_KEY\", \"\")\n+ commits = [\n+ {\n+ \"contributor\": contributor,\n+ \"oid\": \"sha1:\" + char * 40,\n+ \"message\": contributor,\n+ \"patch\": \"patch\",\n+ }\n+ for contributor, char in [(\"alice\", \"a\"), (\"bob\", \"b\")]\n+ ]\n+ with pytest.raises(RuntimeError, match=\"OPENROUTER_API_KEY\"):\n+ asyncio.run(c.rank_commits(commits))\n+\n+\n+def test_watch_page_has_live_controls_progress_and_key_warning(\n+ discovery_config, monkeypatch\n+):\n+ monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n+ monkeypatch.setattr(c, \"OPENROUTER_API_KEY\", \"\")\n+ monkeypatch.setattr(c, \"current_epoch\", lambda: (3, 0, 1))\n+ response = asyncio.run(c.watch())\n+ html = response.body.decode()\n+ assert 'role=\"progressbar\"' in html\n+ assert 'id=\"play\"' in html\n+ assert 'id=\"pause\"' in html\n+ assert \"new EventSource('/sse')\" in html\n+ assert \"OpenRouter key missing\" in html\n+\n+\n+def test_audit_events_are_json_sse_and_update_process_state(monkeypatch):\n+ clients = []\n+ history = []\n+ monkeypatch.setattr(c, \"SSE_CLIENTS\", clients)\n+ monkeypatch.setattr(c, \"AUDIT_HISTORY\", history)\n+ queue = asyncio.Queue()\n+ clients.append(queue)\n+\n+ async def emit():\n+ event = await c.broadcast_audit(\n+ \"progress\", \"halfway\", progress=50, phase=\"ranking\"\n+ )\n+ return event, await queue.get()\n+\n+ event, wire = asyncio.run(emit())\n+ assert event[\"progress\"] == 50\n+ assert event[\"phase\"] == \"ranking\"\n+ assert wire.startswith(\"event: audit\\ndata: {\")\n+ assert '\"message\":\"halfway\"' in wire\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[2bc302c3] refactor\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex 06001212820101e0cc953d3687dea64f85e60787..d2f9769108def7ca2c5857aec8b4319426188a66 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -47,7 +47,7 @@ pub async fn post_ui_html(\n ratio_left,\n ratio_right,\n scope,\n- next,\n+ vote_compare,\n } => {\n let parent = parent_from_scope(&scope);\n if let Err(e) = state\n@@ -57,14 +57,12 @@ pub async fn post_ui_html(\n return ui_js_warn(&e).into_response();\n }\n let tree = state.tree.read().await;\n- if !next.trim().is_empty() {\n+ if vote_compare {\n+ let left = parse_item_param(&a);\n+ let right = parse_item_param(&b);\n+ let morph = crate::html::vote::vote_recorded_morph(&tree, &parent, &left, &right);\n drop(tree);\n- return JsBuilder::new()\n- .raw(&format!(\n- \"window.location.href={};\",\n- js_string_literal(next.trim())\n- ))\n- .into_response();\n+ return morph.into_response();\n }\n let empty = crate::reducer::NodeState::default();\n let node = tree.get(&parent).unwrap_or(&empty);\n@@ -137,7 +135,7 @@ mod tests {\n ratio_left: 3,\n ratio_right: 1,\n scope: String::new(),\n- next: String::new(),\n+ vote_compare: false,\n }\n );\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 61cdbc094819ddedb755572c59456ec0d6617619..cd578a5fea46a9a1d49e238d08a80c2caf18708d 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -65,6 +65,15 @@ impl JsBuilder {\n self\n }\n \n+ pub(crate) fn morph_inner_selector(mut self, selector: &str, markup: Markup) -> Self {\n+ let html = js_string_literal(&markup.into_string());\n+ self.snippets.push(format!(\n+ \"var __el = document.querySelector({sel}); if (__el) {{ Idiomorph.morph(__el, {html}, {{ morphStyle: 'innerHTML' }}); }}\",\n+ sel = js_string_literal(selector),\n+ ));\n+ self\n+ }\n+\n pub(crate) fn raw(mut self, js: &str) -> Self {\n if !js.is_empty() {\n self.snippets.push(js.to_string());\ndiff --git a/server/src/html/vote.rs b/server/src/html/vote.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..89ed621ad861214e147add2062224fc4137ff8ad\n--- /dev/null\n+++ b/server/src/html/vote.rs\n@@ -0,0 +1,306 @@\n+//! Pairwise vote UI — `/vote?parent=` with optional `left` / `right`.\n+\n+use axum::{\n+ extract::{Query, State},\n+ response::{Html, IntoResponse},\n+};\n+use maud::{html, Markup};\n+use serde::Deserialize;\n+\n+use crate::{\n+ form_template::template_json_compact,\n+ html::JsBuilder,\n+ pair::{children_of, resolve_pair, suggest_next_pair_in_pool},\n+ path_types::ItemId,\n+ reducer::{GlobalTree, GroupState, NodeState, VoteData},\n+ state::{parse_item_param, AppState},\n+ ui_action::UI_RPC_FIELD,\n+};\n+\n+use super::{breadcrumb_path, item_href, layout};\n+\n+#[derive(Debug, Deserialize)]\n+pub struct VoteQuery {\n+ pub parent: String,\n+ #[serde(default)]\n+ pub left: Option,\n+ #[serde(default)]\n+ pub right: Option,\n+}\n+\n+pub fn vote_href(parent: &ItemId) -> String {\n+ format!(\n+ \"/vote?parent={}\",\n+ urlencoding::encode(parent.as_str())\n+ )\n+}\n+\n+fn vote_compare_href(parent: &ItemId, left: &ItemId, right: &ItemId) -> String {\n+ format!(\n+ \"/vote?parent={}&left={}&right={}\",\n+ urlencoding::encode(parent.as_str()),\n+ urlencoding::encode(left.as_str()),\n+ urlencoding::encode(right.as_str()),\n+ )\n+}\n+\n+fn display_label(id: &ItemId) -> String {\n+ id.segments()\n+ .last()\n+ .map_or(\"item\".into(), |v| v.to_string())\n+}\n+\n+fn child_title(tree: &GlobalTree, id: &ItemId) -> String {\n+ tree.get(id)\n+ .and_then(|n| n.data.as_ref())\n+ .map(|d| d.title.clone())\n+ .unwrap_or_else(|| display_label(id))\n+}\n+\n+fn ratio_pct(ratio_left: i32, ratio_right: i32) -> f64 {\n+ let l = ratio_left.max(0) as f64;\n+ let r = ratio_right.max(0) as f64;\n+ let sum = l + r;\n+ if sum <= 0.0 {\n+ 50.0\n+ } else {\n+ (l / sum) * 100.0\n+ }\n+}\n+\n+fn ratios_for_page(v: &VoteData, page_left: &ItemId, page_right: &ItemId) -> (i32, i32) {\n+ match (v.a.as_str(), v.b.as_str()) {\n+ (a, b) if a == page_left.as_str() && b == page_right.as_str() => {\n+ (v.ratio_left, v.ratio_right)\n+ }\n+ (a, b) if a == page_right.as_str() && b == page_left.as_str() => {\n+ (v.ratio_right, v.ratio_left)\n+ }\n+ _ => (v.ratio_left, v.ratio_right),\n+ }\n+}\n+\n+fn edge_votes(group: &GroupState, left: &ItemId, right: &ItemId) -> Vec {\n+ group\n+ .recent_votes\n+ .iter()\n+ .filter(|v| {\n+ (v.a.as_str() == left.as_str() && v.b.as_str() == right.as_str())\n+ || (v.a.as_str() == right.as_str() && v.b.as_str() == left.as_str())\n+ })\n+ .cloned()\n+ .collect()\n+}\n+\n+fn vote_edge_history(tree: &GlobalTree, group: &GroupState, left: &ItemId, right: &ItemId) -> Markup {\n+ let mut votes = edge_votes(group, left, right);\n+ votes.sort_by(|a, b| b.ts.cmp(&a.ts));\n+ let legend_left = child_title(tree, left);\n+ let legend_right = child_title(tree, right);\n+ html! {\n+ @if votes.is_empty() {\n+ p class=\"muted vote-edge-empty\" { \"no votes on this pair yet\" }\n+ } @else {\n+ h3 class=\"vote-edge-history-title\" {\n+ \"votes on this pair\"\n+ span class=\"vote-edge-history-axis muted\" { \" · \" (legend_left) \" : \" (legend_right) }\n+ }\n+ ul class=\"vote-edge-history\" {\n+ @for v in &votes {\n+ @let (r_left, r_right) = ratios_for_page(v, left, right);\n+ @let pct = ratio_pct(r_left, r_right);\n+ li class=\"vote-edge-history-row\" {\n+ div class=\"vote-edge-meta\" {\n+ span class=\"vote-edge-ratio\" { (format!(\"{}:{}\", r_left, r_right)) }\n+ }\n+ div class=\"ratio-bar vote-edge-bar\" aria-hidden=\"true\" {\n+ div class=\"ratio-left\" style={(format!(\"width: {:.3}%;\", pct))} {}\n+ div class=\"ratio-right\" style={(format!(\"width: {:.3}%;\", 100.0 - pct))} {}\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+fn vote_back_nav(parent: &ItemId) -> Markup {\n+ html! {\n+ div class=\"vote-compare-nav\" {\n+ a class=\"vote-compare-back muted\" href=(item_href(parent)) { \"← back to \" (display_label(parent)) }\n+ }\n+ }\n+}\n+\n+fn vote_compare_actions(parent: &ItemId, next: Option<&(ItemId, ItemId)>) -> Markup {\n+ let next_href = next.map(|(l, r)| vote_compare_href(parent, l, r));\n+ html! {\n+ div id=\"vote-compare-actions\" class=\"vote-compare-actions\" {\n+ button type=\"submit\" class=\"btn-primary\" data-testid=\"vote-post\" { \"post vote\" }\n+ @if let Some(href) = &next_href {\n+ a class=\"btn-secondary vote-compare-next\" data-testid=\"vote-next-pair\" href=(href) { \"next pair\" }\n+ } @else {\n+ span class=\"btn-secondary vote-compare-next is-disabled\" { \"no next pair\" }\n+ }\n+ }\n+ }\n+}\n+\n+/// After recording a vote on the compare page: refresh edge history and next-pair link.\n+pub(crate) fn vote_recorded_morph(\n+ tree: &GlobalTree,\n+ parent: &ItemId,\n+ left: &ItemId,\n+ right: &ItemId,\n+) -> JsBuilder {\n+ let pool = children_of(tree, parent);\n+ let empty = NodeState::default();\n+ let group = tree\n+ .get(parent)\n+ .unwrap_or(&empty)\n+ .local_ranking\n+ .clone();\n+ let edge_history = vote_edge_history(tree, &group, left, right);\n+ let next_pair = suggest_next(&group, left, right, &pool);\n+ let actions = vote_compare_actions(parent, next_pair.as_ref());\n+ JsBuilder::new()\n+ .morph_inner_selector(\"#vote-edge-history-region\", edge_history)\n+ .morph_selector(\"#vote-compare-actions\", actions)\n+}\n+\n+fn vote_compare_item_card(tree: &GlobalTree, item: &ItemId, side_class: &str) -> Markup {\n+ let href = item_href(item);\n+ let title = child_title(tree, item);\n+ html! {\n+ div class=(format!(\"vote-compare-side {side_class}\")) {\n+ a class=(format!(\"vote-compare-item {side_class}\")) href=(href) {\n+ @if let Some(row) = crate::render::reddit::child_row_markup(tree, item, &href) {\n+ (row)\n+ } @else {\n+ strong { (title) }\n+ }\n+ }\n+ @if let Some(node) = tree.get(item) {\n+ @if crate::render::reddit::is_reddit_post(item) {\n+ @if let Some(data) = &node.data {\n+ @if let Some(src) = data.image_url.as_ref().or(data.thumb_url.as_ref()) {\n+ figure class=\"vote-compare-figure\" {\n+ img class=\"vote-compare-image\" src=(src) alt=\"\" loading=\"lazy\";\n+ }\n+ }\n+ @if let Some(author) = &data.author {\n+ p class=\"muted small\" { \"by \" (author) }\n+ }\n+ }\n+ } @else if let Some(data) = &node.data {\n+ @if let Some(body) = &data.body_html {\n+ div class=\"vote-compare-item-body\" {\n+ (maud::PreEscaped(body))\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+\n+fn suggest_next(group: &GroupState, left: &ItemId, right: &ItemId, pool: &[ItemId]) -> Option<(ItemId, ItemId)> {\n+ suggest_next_pair_in_pool(group, pool, Some((left, right)))\n+}\n+\n+pub async fn vote_page(\n+ State(state): State,\n+ Query(q): Query,\n+) -> impl IntoResponse {\n+ let parent = parse_item_param(&q.parent);\n+ let left_param = q.left.as_deref().map(parse_item_param);\n+ let right_param = q.right.as_deref().map(parse_item_param);\n+\n+ let tree = state.tree.read().await;\n+ let empty = NodeState::default();\n+ let parent_node = tree.get(&parent).unwrap_or(&empty);\n+\n+ let (left, right) = match resolve_pair(\n+ &tree,\n+ &parent,\n+ left_param.as_ref(),\n+ right_param.as_ref(),\n+ ) {\n+ Ok(p) => p,\n+ Err(e) => {\n+ let (msg, status) = e.status_message();\n+ return (status, msg).into_response();\n+ }\n+ };\n+\n+ let pool = children_of(&tree, &parent);\n+ let group = &parent_node.local_ranking;\n+ let next_pair = suggest_next(group, &left, &right, &pool);\n+ let edge_history = vote_edge_history(&tree, group, &left, &right);\n+\n+ let rpc_json = template_json_compact(&serde_json::json!({\n+ \"action\": \"record_vote\",\n+ \"a\": left.as_str(),\n+ \"b\": right.as_str(),\n+ \"ratio_left\": {\"$form:i32\": \"ratio_left\"},\n+ \"ratio_right\": {\"$form:i32\": \"ratio_right\"},\n+ \"scope\": parent.as_str(),\n+ \"vote_compare\": true,\n+ }))\n+ .expect(\"vote rpc json\");\n+\n+ let title = format!(\n+ \"vote — {} vs {}\",\n+ child_title(&tree, &left),\n+ child_title(&tree, &right)\n+ );\n+\n+ let body = html! {\n+ section class=\"vote-compare-shell\" {\n+ h1 { \"compare\" }\n+ (breadcrumb_path(&parent))\n+ p class=\"muted vote-compare-scope\" {\n+ \"ranking children of \"\n+ a href=(item_href(&parent)) { (child_title(&tree, &parent)) }\n+ }\n+ div class=\"vote-compare-pair\" {\n+ (vote_compare_item_card(&tree, &left, \"vote-compare-left\"))\n+ span class=\"vote-compare-vs\" { \"vs\" }\n+ (vote_compare_item_card(&tree, &right, \"vote-compare-right\"))\n+ }\n+ (vote_back_nav(&parent))\n+ div id=\"vote-edge-history-region\" {\n+ (edge_history)\n+ }\n+ form id=\"vote-compare-form\" method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc_json);\n+ input type=\"hidden\" name=\"ratio_left\" id=\"vote-ratio-left\" value=\"50\";\n+ input type=\"hidden\" name=\"ratio_right\" id=\"vote-ratio-right\" value=\"50\";\n+ label class=\"vote-compare-slider-label\" {\n+ span id=\"vote-slider-left-label\" { (child_title(&tree, &left)) }\n+ input type=\"range\" id=\"vote-preference-slider\" min=\"0\" max=\"100\" value=\"50\"\n+ aria-valuemin=\"0\" aria-valuemax=\"100\";\n+ span id=\"vote-slider-right-label\" { (child_title(&tree, &right)) }\n+ }\n+ (vote_compare_actions(&parent, next_pair.as_ref()))\n+ }\n+ }\n+ };\n+\n+ drop(tree);\n+\n+ let path = format!(\"/vote?parent={}\", urlencoding::encode(parent.as_str()));\n+ state.views.increment(path.clone());\n+ let views = state.views.get_views(&path);\n+\n+ Html(\n+ layout(\n+ &title,\n+ body,\n+ views,\n+ )\n+ .into_string(),\n+ )\n+ .into_response()\n+}\ndiff --git a/server/src/pair.rs b/server/src/pair.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..606ffa51038a57ffacf335aa48bdb1185f8483fb\n--- /dev/null\n+++ b/server/src/pair.rs\n@@ -0,0 +1,340 @@\n+//! Pick two children of a parent scope for pairwise voting.\n+//!\n+//! Pair selection prefers **bridge** votes — comparisons between items in\n+//! different connected components of the voted-pairs graph — so the pool\n+//! merges into one ranking group before refining within it.\n+\n+use rand::seq::SliceRandom;\n+use std::collections::{HashMap, HashSet};\n+\n+use crate::{\n+ path_types::ItemId,\n+ ranking::connected_components_from_voted_pairs,\n+ reducer::{GlobalTree, GroupState},\n+};\n+\n+fn pairs_match(a: &ItemId, b: &ItemId, x: &ItemId, y: &ItemId) -> bool {\n+ (a == x && b == y) || (a == y && b == x)\n+}\n+\n+fn pair_is_voted(group: &GroupState, a: &ItemId, b: &ItemId) -> bool {\n+ let Some(&ai) = group.item_to_idx.get(a) else {\n+ return false;\n+ };\n+ let Some(&bi) = group.item_to_idx.get(b) else {\n+ return false;\n+ };\n+ let (i, j) = if ai < bi { (ai, bi) } else { (bi, ai) };\n+ group.voted_pairs.contains(&(i, j))\n+}\n+\n+/// Component id per pool item: voted-pairs graph components plus one id per\n+/// never-voted child.\n+fn component_ids(group: &GroupState, pool: &[ItemId]) -> HashMap {\n+ let n = group.idx_to_item.len();\n+ let (comps, isolates) =\n+ connected_components_from_voted_pairs(n, group.voted_pairs.iter().copied());\n+\n+ let mut out: HashMap = HashMap::new();\n+ for (comp_idx, comp) in comps.iter().enumerate() {\n+ for &idx in comp {\n+ if idx < n {\n+ out.insert(group.idx_to_item[idx].clone(), comp_idx);\n+ }\n+ }\n+ }\n+ let mut next = comps.len();\n+ for &idx in &isolates {\n+ if idx < n {\n+ out.insert(group.idx_to_item[idx].clone(), next);\n+ next += 1;\n+ }\n+ }\n+ for item in pool {\n+ out.entry(item.clone()).or_insert_with(|| {\n+ let id = next;\n+ next += 1;\n+ id\n+ });\n+ }\n+ out\n+}\n+\n+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]\n+enum PairPriority {\n+ /// Unvoted edge between two components — grows the ranking group.\n+ BridgeUnvoted = 0,\n+ /// Unvoted edge inside one component — refines order.\n+ WithinUnvoted = 1,\n+ /// Re-vote across components (rare once merged).\n+ BridgeVoted = 2,\n+ /// Re-vote within a component.\n+ WithinVoted = 3,\n+}\n+\n+fn pair_priority(\n+ group: &GroupState,\n+ components: &HashMap,\n+ a: &ItemId,\n+ b: &ItemId,\n+) -> PairPriority {\n+ let voted = pair_is_voted(group, a, b);\n+ let bridge = components.get(a) != components.get(b);\n+ match (bridge, voted) {\n+ (true, false) => PairPriority::BridgeUnvoted,\n+ (false, false) => PairPriority::WithinUnvoted,\n+ (true, true) => PairPriority::BridgeVoted,\n+ (false, true) => PairPriority::WithinVoted,\n+ }\n+}\n+\n+/// All unordered pairs from `pool`, optionally skipping `exclude`.\n+fn candidate_pairs(\n+ pool: &[ItemId],\n+ exclude: Option<(&ItemId, &ItemId)>,\n+) -> Vec<(ItemId, ItemId)> {\n+ let mut out = Vec::new();\n+ for i in 0..pool.len() {\n+ for j in (i + 1)..pool.len() {\n+ let a = &pool[i];\n+ let b = &pool[j];\n+ if a == b {\n+ continue;\n+ }\n+ if exclude.is_some_and(|(x, y)| pairs_match(a, b, x, y)) {\n+ continue;\n+ }\n+ out.push((a.clone(), b.clone()));\n+ }\n+ }\n+ out\n+}\n+\n+/// Pick the next pair to vote on within `pool`.\n+///\n+/// 1. Prefer unvoted **bridge** pairs (connect separate ranking components).\n+/// 2. Then unvoted within-component pairs (refinement).\n+/// 3. Then already-voted pairs (re-compare).\n+pub fn suggest_next_pair_in_pool(\n+ group: &GroupState,\n+ pool: &[ItemId],\n+ exclude: Option<(&ItemId, &ItemId)>,\n+) -> Option<(ItemId, ItemId)> {\n+ let candidates = candidate_pairs(pool, exclude);\n+ if candidates.is_empty() {\n+ return None;\n+ }\n+ let components = component_ids(group, pool);\n+ let best = candidates\n+ .iter()\n+ .map(|(a, b)| (pair_priority(group, &components, a, b), (a, b)))\n+ .min_by_key(|(p, _)| *p)?\n+ .0;\n+ let best_pairs: Vec<(ItemId, ItemId)> = candidates\n+ .into_iter()\n+ .filter(|(a, b)| pair_priority(group, &components, a, b) == best)\n+ .collect();\n+ best_pairs.choose(&mut rand::thread_rng()).cloned()\n+}\n+\n+/// Random distinct pair from `children` (legacy pair.rs behavior).\n+pub fn random_pair(children: &[ItemId]) -> Option<(ItemId, ItemId)> {\n+ if children.len() < 2 {\n+ return None;\n+ }\n+ let left = children.choose(&mut rand::thread_rng())?;\n+ let mut right = children.choose(&mut rand::thread_rng())?;\n+ let mut guard = 0;\n+ while left == right && guard < 32 {\n+ right = children.choose(&mut rand::thread_rng())?;\n+ guard += 1;\n+ }\n+ if left == right {\n+ return None;\n+ }\n+ Some((left.clone(), right.clone()))\n+}\n+\n+/// Sorted children of `parent` from the global tree.\n+pub fn children_of(tree: &GlobalTree, parent: &ItemId) -> Vec {\n+ let Some(node) = tree.get(parent) else {\n+ return Vec::new();\n+ };\n+ let mut children: Vec = node.children.iter().cloned().collect();\n+ children.sort_by(|a, b| a.as_str().cmp(b.as_str()));\n+ children\n+}\n+\n+/// Resolve a pair to compare under `parent`.\n+pub fn resolve_pair(\n+ tree: &GlobalTree,\n+ parent: &ItemId,\n+ left: Option<&ItemId>,\n+ right: Option<&ItemId>,\n+) -> Result<(ItemId, ItemId), PairError> {\n+ let children = children_of(tree, parent);\n+ if children.len() < 2 {\n+ return Err(PairError::TooFewChildren);\n+ }\n+ let child_set: HashSet<_> = children.iter().collect();\n+\n+ match (left, right) {\n+ (Some(l), Some(r)) => {\n+ if l == r {\n+ return Err(PairError::SameItem);\n+ }\n+ if !child_set.contains(l) || !child_set.contains(r) {\n+ return Err(PairError::NotChild);\n+ }\n+ Ok((l.clone(), r.clone()))\n+ }\n+ (None, None) => {\n+ let group = tree\n+ .get(parent)\n+ .map(|n| &n.local_ranking)\n+ .cloned()\n+ .unwrap_or_default();\n+ suggest_next_pair_in_pool(&group, &children, None).ok_or(PairError::NoPair)\n+ }\n+ _ => Err(PairError::IncompletePair),\n+ }\n+}\n+\n+#[derive(Debug, Clone, PartialEq, Eq)]\n+pub enum PairError {\n+ TooFewChildren,\n+ SameItem,\n+ NotChild,\n+ IncompletePair,\n+ NoPair,\n+}\n+\n+impl PairError {\n+ pub fn status_message(&self) -> (&'static str, axum::http::StatusCode) {\n+ match self {\n+ Self::TooFewChildren => (\n+ \"parent needs at least 2 children to vote\",\n+ axum::http::StatusCode::BAD_REQUEST,\n+ ),\n+ Self::SameItem => (\n+ \"left and right must differ\",\n+ axum::http::StatusCode::BAD_REQUEST,\n+ ),\n+ Self::NotChild => (\n+ \"left and right must be children of parent\",\n+ axum::http::StatusCode::BAD_REQUEST,\n+ ),\n+ Self::IncompletePair => (\n+ \"provide both left and right, or neither\",\n+ axum::http::StatusCode::BAD_REQUEST,\n+ ),\n+ Self::NoPair => (\n+ \"no pair available\",\n+ axum::http::StatusCode::BAD_REQUEST,\n+ ),\n+ }\n+ }\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+ use crate::reducer::{GlobalTree, VoteData};\n+\n+ fn seed_children(parent: &ItemId, ids: &[&str]) -> GlobalTree {\n+ let mut tree = GlobalTree::new();\n+ tree.ensure_path(parent);\n+ for id in ids {\n+ let child = ItemId::parse(id).unwrap();\n+ tree.ensure_path(&child);\n+ if let Some(p) = tree.nodes.get_mut(parent) {\n+ p.children.insert(child);\n+ }\n+ }\n+ tree\n+ }\n+\n+ fn pair_set(pair: &(ItemId, ItemId)) -> HashSet<&str> {\n+ [pair.0.as_str(), pair.1.as_str()].into_iter().collect()\n+ }\n+\n+ #[test]\n+ fn suggest_prefers_unvoted_pair() {\n+ let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let mut tree = seed_children(\n+ &parent,\n+ &[\n+ \"reddit.com/r/rust/a\",\n+ \"reddit.com/r/rust/b\",\n+ \"reddit.com/r/rust/c\",\n+ ],\n+ );\n+ let vote =\n+ VoteData::from_recorded(1, \"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 2, 1).unwrap();\n+ tree.apply_vote(&parent, vote);\n+ let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let pool = children_of(&tree, &parent);\n+ let (l, r) = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n+ let voted_ab = (l.as_str() == \"reddit.com/r/rust/a\" && r.as_str() == \"reddit.com/r/rust/b\")\n+ || (l.as_str() == \"reddit.com/r/rust/b\" && r.as_str() == \"reddit.com/r/rust/a\");\n+ assert!(!voted_ab);\n+ }\n+\n+ #[test]\n+ fn suggest_bridges_separate_components() {\n+ let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let mut tree = seed_children(\n+ &parent,\n+ &[\n+ \"reddit.com/r/rust/a\",\n+ \"reddit.com/r/rust/b\",\n+ \"reddit.com/r/rust/c\",\n+ \"reddit.com/r/rust/d\",\n+ ],\n+ );\n+ let ab = VoteData::from_recorded(1, \"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 2, 1).unwrap();\n+ let cd = VoteData::from_recorded(2, \"reddit.com/r/rust/c\", \"reddit.com/r/rust/d\", 2, 1).unwrap();\n+ tree.apply_vote(&parent, ab);\n+ tree.apply_vote(&parent, cd);\n+ let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let pool = children_of(&tree, &parent);\n+ let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n+ let chosen = pair_set(&pair);\n+ let from_ab = chosen.contains(\"reddit.com/r/rust/a\") || chosen.contains(\"reddit.com/r/rust/b\");\n+ let from_cd = chosen.contains(\"reddit.com/r/rust/c\") || chosen.contains(\"reddit.com/r/rust/d\");\n+ assert!(from_ab && from_cd, \"expected bridge pair, got {:?}\", chosen);\n+ }\n+\n+ #[test]\n+ fn suggest_connects_isolate_to_existing_component() {\n+ let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let mut tree = seed_children(\n+ &parent,\n+ &[\n+ \"reddit.com/r/rust/a\",\n+ \"reddit.com/r/rust/b\",\n+ \"reddit.com/r/rust/c\",\n+ ],\n+ );\n+ let ab = VoteData::from_recorded(1, \"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 2, 1).unwrap();\n+ tree.apply_vote(&parent, ab);\n+ let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let pool = children_of(&tree, &parent);\n+ let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n+ let chosen = pair_set(&pair);\n+ assert!(chosen.contains(\"reddit.com/r/rust/c\"));\n+ assert!(chosen.contains(\"reddit.com/r/rust/a\") || chosen.contains(\"reddit.com/r/rust/b\"));\n+ }\n+\n+ #[test]\n+ fn resolve_pair_picks_from_pool() {\n+ let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let tree = seed_children(&parent, &[\"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\"]);\n+ let pair = resolve_pair(&tree, &parent, None, None).unwrap();\n+ let pool: HashSet<_> = [\"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\"]\n+ .into_iter()\n+ .collect();\n+ assert!(pool.contains(pair.0.as_str()));\n+ assert!(pool.contains(pair.1.as_str()));\n+ }\n+}\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex 12dce9888f5cd4e1a0974d12d6468368d0f775b9..a0d1a028b8bd3c5d1c714dea3ec597d1ac39e1bc 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -40,6 +40,22 @@ impl ItemId {\n Self::canonicalize(raw_url).map(Self)\n }\n \n+ /// Normalize strings from forms, events, and Reddit imports into the same\n+ /// stored id shape (e.g. drop post title slug after comment id).\n+ pub fn from_storage(s: &str) -> Option {\n+ let t = s.trim();\n+ if t.is_empty() {\n+ return None;\n+ }\n+ if t.contains(\"://\") || t.starts_with(\"r/\") {\n+ return Self::from_url(t).or_else(|| Self::parse(t));\n+ }\n+ if t.starts_with(\"reddit.com/\") && t.contains(\"/comments/\") {\n+ return Self::from_url(t).or_else(|| Self::parse(t));\n+ }\n+ Self::parse(t).or_else(|| Self::from_url(t))\n+ }\n+\n /// Map legacy scope keys (`\"\"`, `\"rust\"`) to fractal parent nodes.\n pub fn from_legacy_scope(raw: &str) -> Self {\n let s = raw.trim();\n@@ -324,6 +340,12 @@ mod tests {\n assert_eq!(id.as_str(), \"reddit.com/r/amitheasshole\");\n }\n \n+ #[test]\n+ fn from_storage_strips_post_title_slug() {\n+ let id = ItemId::from_storage(\"reddit.com/r/rust/comments/aaa/announcing_rust_199\").unwrap();\n+ assert_eq!(id.as_str(), \"reddit.com/r/rust/comments/aaa\");\n+ }\n+\n #[test]\n fn from_browse_uri_strips_prefix() {\n let id = ItemId::from_browse_uri(\"/~/https://reddit.com/r/rust\").unwrap();\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex 1168ec2afc77c092514eec91b513bac301cbe225..626454e5a2f638734193b5190a2beea286af85b6 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -567,7 +567,7 @@ fn parse_children(_parent: &ItemId, payload: &Value) -> Vec<(ItemId, Value)> {\n _ => continue,\n };\n let path = format!(\"reddit.com{}\", permalink.trim_end_matches('/'));\n- if let Some(id) = ItemId::parse(&path) {\n+ if let Some(id) = ItemId::from_storage(&path) {\n out.push((id, child.clone()));\n }\n }\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 336e78b77d3ab59361b89af5c9868e13da4ac962..fc23f41137d7df33997afe19c533505c250cc305 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -28,8 +28,8 @@ impl VoteData {\n ratio_left: i32,\n ratio_right: i32,\n ) -> Option {\n- let a = ItemId::parse(a)?;\n- let b = ItemId::parse(b)?;\n+ let a = ItemId::from_storage(a)?;\n+ let b = ItemId::from_storage(b)?;\n if a == b {\n return None;\n }\n@@ -85,8 +85,8 @@ impl GroupState {\n }\n \n pub fn apply_vote(&mut self, mut vote: VoteData) {\n- vote.a = ItemId::parse(vote.a.as_str()).unwrap_or_else(|| vote.a.clone());\n- vote.b = ItemId::parse(vote.b.as_str()).unwrap_or_else(|| vote.b.clone());\n+ vote.a = ItemId::from_storage(vote.a.as_str()).unwrap_or(vote.a.clone());\n+ vote.b = ItemId::from_storage(vote.b.as_str()).unwrap_or(vote.b.clone());\n if vote.ratio_left < 0 {\n vote.ratio_left = 0;\n }\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex d238701208a1c708b94a778a6a2e1891a678ecbc..4c3008e73cc74d8483a2064a0a280e73d82a01ec 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -18,7 +18,7 @@ pub fn parse_item_param(raw: &str) -> ItemId {\n if s.is_empty() {\n return ItemId::root();\n }\n- ItemId::from_url(s).or_else(|| ItemId::parse(s)).unwrap_or_else(|| ItemId::opaque(s))\n+ ItemId::from_storage(s).unwrap_or_else(|| ItemId::opaque(s))\n }\n \n /// Legacy: normalize raw ranking subject into a scope key for old event replay.\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex 53581e1362bfcc5dfb4ae3069c41ea6f7be41437..237411a689fb10ad1b7022ea66aee1969c7507ec 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -31,9 +31,9 @@ pub enum HtmlUiAction {\n /// Parent node [`ItemId`] string; empty = tree root.\n #[serde(default)]\n scope: String,\n- /// After vote, navigate here (vote compare page).\n+ /// Posted from `/vote` compare UI — morph edge history in place.\n #[serde(default)]\n- next: String,\n+ vote_compare: bool,\n },\n /// Parse pasted Reddit URL/path; redirect to subreddit ranking on success.\n ParseQuery {\n@@ -98,7 +98,7 @@ mod tests {\n ratio_left: 60,\n ratio_right: 40,\n scope: \"parent\".into(),\n- next: String::new(),\n+ vote_compare: false,\n }\n );\n }\n@@ -129,7 +129,7 @@ mod tests {\n ratio_left: 2,\n ratio_right: 1,\n scope: \"amitheasshole\".into(),\n- next: String::new(),\n+ vote_compare: false,\n }\n );\n }\n@@ -156,7 +156,7 @@ mod tests {\n ratio_left: 2,\n ratio_right: 1,\n scope: String::new(),\n- next: String::new(),\n+ vote_compare: false,\n }\n );\n }\ndiff --git a/server/static/sorter.css b/server/static/sorter.css\nindex 3c2cec5cb5094013387147c621d75bd341bc06cc..b95718ce463b200a5667d3014dac2119836a0bef 100644\n--- a/server/static/sorter.css\n+++ b/server/static/sorter.css\n@@ -289,11 +289,27 @@ h1 {\n }\n \n .vote-compare-nav {\n+ margin: 1rem 0 0.5rem;\n+}\n+\n+.vote-compare-actions {\n display: flex;\n- justify-content: space-between;\n+ flex-wrap: wrap;\n align-items: center;\n- gap: 1rem;\n- margin: 1rem 0;\n+ gap: 0.75rem;\n+ margin-top: 0.5rem;\n+}\n+\n+.vote-compare-actions .btn-secondary {\n+ margin-top: 0;\n+ display: inline-block;\n+ text-decoration: none;\n+ line-height: 1.4;\n+}\n+\n+.vote-compare-actions .vote-compare-next.is-disabled {\n+ opacity: 0.6;\n+ cursor: default;\n }\n \n .vote-compare-next {\ndiff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js\nindex c8d7c3ef2413399ced7898a7edb3e7a2c8e16163..ab15d27f508cc6f5fbca9d8926fd0ca26d64857b 100644\n--- a/server/static/sorter_ui.js\n+++ b/server/static/sorter_ui.js\n@@ -104,11 +104,10 @@\n if (f.getAttribute('data-navigate') === 'full') return;\n e.preventDefault();\n await postUiForm(f);\n- if (f.id === 'vote-form' || f.id === 'vote-compare-form') {\n+ if (f.id === 'vote-form') {\n f.reset();\n- var slider = f.querySelector('#vote-preference-slider');\n- if (slider) slider.value = '50';\n- initVoteSlider();\n+ var firstField = f.querySelector('input[type=\"text\"]');\n+ if (firstField) firstField.focus();\n }\n });\n }\ndiff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs\nindex df7d9ab357531c5146d0b326c149fdaa6b531a4a..56d2db313b313ffce07eff38a8ccdaa2fbb9498f 100644\n--- a/server/tests/integration_ui.rs\n+++ b/server/tests/integration_ui.rs\n@@ -25,6 +25,53 @@ async fn start_test_server() -> (SocketAddr, TempDir) {\n (addr, tmp)\n }\n \n+#[tokio::test]\n+async fn post_ui_vote_compare_morphs_edge_history() {\n+ let (addr, _tmp) = start_test_server().await;\n+ let parent = \"reddit.com/r/rust\";\n+ let a = \"reddit.com/r/rust/comments/aaa/announcing_rust_199\";\n+ let b = \"reddit.com/r/rust/comments/bbb/what_are_you_working_on\";\n+\n+ let rpc = serde_json::json!({\n+ \"action\": \"record_vote\",\n+ \"a\": a,\n+ \"b\": b,\n+ \"ratio_left\": {\"$form:i32\": \"ratio_left\"},\n+ \"ratio_right\": {\"$form:i32\": \"ratio_right\"},\n+ \"scope\": parent,\n+ \"vote_compare\": true,\n+ })\n+ .to_string();\n+ let mut form = HashMap::new();\n+ form.insert(UI_RPC_FIELD.to_string(), rpc);\n+ form.insert(\"ratio_left\".into(), \"70\".into());\n+ form.insert(\"ratio_right\".into(), \"30\".into());\n+\n+ let client = reqwest::Client::new();\n+ let body = client\n+ .post(format!(\"http://{addr}/ui\"))\n+ .form(&form)\n+ .send()\n+ .await\n+ .unwrap()\n+ .text()\n+ .await\n+ .unwrap();\n+\n+ assert!(\n+ body.contains(\"vote-edge-history\"),\n+ \"expected edge history morph, got: {body}\"\n+ );\n+ assert!(\n+ body.contains(\"70:30\"),\n+ \"expected recorded ratio in morph, got: {body}\"\n+ );\n+ assert!(\n+ !body.contains(\"no votes on this pair yet\"),\n+ \"should not show empty edge history after vote, got: {body}\"\n+ );\n+}\n+\n #[tokio::test]\n async fn post_ui_record_vote_morphs_ranking_and_persists() {\n let (addr, tmp) = start_test_server().await;\ndiff --git a/test/reddit_import.clj b/test/reddit_import.clj\nindex 45a2a19f20799d77e84d8aa64735ab5e7e45f97c..b476488526252c13fd73bdda76e5201678e4a714 100644\n--- a/test/reddit_import.clj\n+++ b/test/reddit_import.clj\n@@ -2,9 +2,8 @@\n (:require [babashka.process :as process]\n [clojure.java.io :as io]\n [clojure.string :as str]\n- [clojure.test :refer [deftest is testing]])\n- (:import [com.sun.net.httpserver HttpServer HttpHandler HttpExchange]\n- [java.net InetSocketAddress]))\n+ [clojure.test :refer [deftest is testing]]\n+ [test.support.mock-reddit :as mock-reddit]))\n \n (defn- repo-root []\n (.getCanonicalPath (io/file (System/getProperty \"user.dir\"))))\n@@ -13,29 +12,6 @@\n (with-open [s (java.net.ServerSocket. 0)]\n (.getLocalPort s)))\n \n-(defn- start-mock-reddit [port fixtures-dir]\n- (let [about (.getBytes (slurp (io/file fixtures-dir \"r_rust_about.json\")) \"UTF-8\")\n- listing (.getBytes (slurp (io/file fixtures-dir \"r_rust_listing.json\")) \"UTF-8\")\n- server (HttpServer/create (InetSocketAddress. \"127.0.0.1\" port) 0)\n- handler\n- (proxy [HttpHandler] []\n- (handle [^HttpExchange exchange]\n- ;; Route by path: `/r//about.json` is the subreddit entity,\n- ;; `/r/.json` is the children listing.\n- (let [path (.getPath (.getRequestURI exchange))\n- body (if (str/includes? path \"/about\")\n- about\n- listing)]\n- (.sendResponseHeaders exchange 200 (alength body))\n- (let [out (.getResponseBody exchange)]\n- (.write out body)\n- (.close out)))))]\n- (.createContext server \"/\" handler)\n- (.setExecutor server nil)\n- (.start server)\n- (fn stop []\n- (.stop server 0))))\n-\n (defn- wait-health [base-url ms]\n (let [deadline (+ (System/currentTimeMillis) ms)\n url (str base-url \"/healthz\")]\n@@ -100,7 +76,7 @@\n (deftest reddit-fetch-via-mock-api\n (testing \"Fetch more queues import; event log stores full payload; page shows title\"\n (let [root (repo-root)\n- fixtures (str root \"/test/fixtures/reddit\")\n+ fixtures (mock-reddit/fixtures-dir root)\n data-dir (.getAbsolutePath\n (doto (io/file (System/getProperty \"java.io.tmpdir\")\n (str \"sorter2-reddit-\" (System/currentTimeMillis)))\n@@ -110,7 +86,7 @@\n reddit-base (str \"http://127.0.0.1:\" reddit-port)\n app-base (str \"http://127.0.0.1:\" app-port)\n bin (str root \"/target/release/sorter2-server\")\n- stop-mock (start-mock-reddit reddit-port fixtures)]\n+ stop-mock (mock-reddit/start-mock-reddit reddit-port fixtures)]\n (try\n (is (zero? (:exit (process/shell {:dir root}\n \"cargo\" \"build\" \"--release\" \"--package\" \"sorter2-server\")))\ndiff --git a/test/support/mock_reddit.clj b/test/support/mock_reddit.clj\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..5efa92db3e1f79b8f423a2f1adcbda959123c1ad\n--- /dev/null\n+++ b/test/support/mock_reddit.clj\n@@ -0,0 +1,35 @@\n+(ns test.support.mock-reddit\n+ \"In-process HTTP stub for Reddit API fixtures (`test/fixtures/reddit/`).\"\n+ (:require [clojure.java.io :as io]\n+ [clojure.string :as str])\n+ (:import [com.sun.net.httpserver HttpServer HttpHandler HttpExchange]\n+ [java.net InetSocketAddress]))\n+\n+(defn fixtures-dir\n+ ([] (fixtures-dir (System/getProperty \"user.dir\")))\n+ ([root] (str root \"/test/fixtures/reddit\")))\n+\n+(defn start-mock-reddit\n+ \"Start a mock Reddit API on `port`. Returns a zero-arg `stop` function.\"\n+ ([port] (start-mock-reddit port (fixtures-dir)))\n+ ([port dir]\n+ (let [about (.getBytes (slurp (io/file dir \"r_rust_about.json\")) \"UTF-8\")\n+ listing (.getBytes (slurp (io/file dir \"r_rust_listing.json\")) \"UTF-8\")\n+ server (HttpServer/create (InetSocketAddress. \"127.0.0.1\" port) 0)\n+ handler\n+ (proxy [HttpHandler] []\n+ (handle [^HttpExchange exchange]\n+ ;; `/r//about.json` → subreddit entity; `/r/.json` → listing.\n+ (let [path (.getPath (.getRequestURI exchange))\n+ body (if (str/includes? path \"/about\")\n+ about\n+ listing)]\n+ (.sendResponseHeaders exchange 200 (alength body))\n+ (let [out (.getResponseBody exchange)]\n+ (.write out body)\n+ (.close out)))))]\n+ (.createContext server \"/\" handler)\n+ (.setExecutor server nil)\n+ (.start server)\n+ (fn stop []\n+ (.stop server 0)))))\ndiff --git a/test/vote_compare.clj b/test/vote_compare.clj\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..fbc00281e466a1ba0833193c7b96fa30aeb45a5c\n--- /dev/null\n+++ b/test/vote_compare.clj\n@@ -0,0 +1,101 @@\n+(ns test.vote-compare\n+ (:require [babashka.process :as process]\n+ [clojure.java.io :as io]\n+ [clojure.string :as str]\n+ [clojure.test :refer [deftest is testing]]\n+ [com.blockether.spel.core :as core]\n+ [com.blockether.spel.locator :as loc]\n+ [com.blockether.spel.page :as page]\n+ [test.support.mock-reddit :as mock-reddit])\n+ (:import [java.net URLEncoder]))\n+\n+(defn- repo-root []\n+ (.getCanonicalPath (io/file (System/getProperty \"user.dir\"))))\n+\n+(defn- pick-port []\n+ (with-open [s (java.net.ServerSocket. 0)]\n+ (.getLocalPort s)))\n+\n+(defn- wait-health [base-url ms]\n+ (let [deadline (+ (System/currentTimeMillis) ms)\n+ url (str base-url \"/healthz\")]\n+ (loop []\n+ (let [resp (try\n+ (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" url)\n+ (catch Exception _ nil))]\n+ (if (and resp (zero? (:exit resp)) (= \"ok\" (str/trim (:out resp \"\"))))\n+ true\n+ (if (< (System/currentTimeMillis) deadline)\n+ (do (Thread/sleep 200) (recur))\n+ false))))))\n+\n+(defn- curl-fetch-children [base item]\n+ (process/shell {:out :string :err :string}\n+ \"curl\" \"-sfN\" \"--max-time\" \"20\"\n+ \"-X\" \"POST\" (str base \"/ui\")\n+ \"--data-urlencode\"\n+ (str \"__rpc__={\\\"action\\\":\\\"fetch_entity\\\",\\\"item\\\":\\\"\" item\n+ \"\\\",\\\"kind\\\":\\\"children\\\"}\")))\n+\n+(defn- vote-page-url [base parent]\n+ (str base \"/vote?parent=\"\n+ (URLEncoder/encode parent \"UTF-8\")))\n+\n+(deftest vote-compare-shows-recorded-vote-after-post\n+ (testing \"post vote on /vote morphs edge history (mock Reddit children seeded)\"\n+ (let [root (repo-root)\n+ fixtures (mock-reddit/fixtures-dir root)\n+ data-dir (.getAbsolutePath\n+ (doto (io/file (System/getProperty \"java.io.tmpdir\")\n+ (str \"sorter2-vote-\" (System/currentTimeMillis)))\n+ (.mkdirs)))\n+ reddit-port (pick-port)\n+ app-port (pick-port)\n+ reddit-base (str \"http://127.0.0.1:\" reddit-port)\n+ app-base (str \"http://127.0.0.1:\" app-port)\n+ bin (str root \"/target/release/sorter2-server\")\n+ stop-mock (mock-reddit/start-mock-reddit reddit-port fixtures)]\n+ (try\n+ (is (zero? (:exit (process/shell {:dir root}\n+ \"cargo\" \"build\" \"--release\" \"--package\" \"sorter2-server\")))\n+ \"release build succeeds\")\n+ (let [proc (process/process {:dir root\n+ :env (into (into {} (System/getenv))\n+ {\"SORTER2_SKIP_DOTENV\" \"1\"\n+ \"SORTER2_DATA_DIR\" data-dir\n+ \"SORTER2_EVENT_LOG\" (str data-dir \"/events.jsonl\")\n+ \"PORT\" (str app-port)\n+ \"REDDIT_API_BASE\" reddit-base\n+ \"REDDIT_OAUTH_BASE\" reddit-base\n+ \"REDDIT_CLIENT_ID\" \"\"\n+ \"REDDIT_CLIENT_SECRET\" \"\"\n+ \"REDDIT_APP_ID\" \"\"\n+ \"REDDIT_APP_SECRET\" \"\"})\n+ :out :string\n+ :err :string}\n+ bin)]\n+ (try\n+ (is (wait-health app-base 20000) \"app healthz\")\n+ (let [fetch (curl-fetch-children app-base \"reddit.com/r/rust\")]\n+ (is (zero? (:exit fetch)) \"fetch posts via mock Reddit\")\n+ (is (str/includes? (:out fetch) \"Idiomorph.morph\")))\n+ (core/with-testing-page [pg]\n+ (page/navigate pg (vote-page-url app-base \"reddit.com/r/rust\"))\n+ (page/wait-for-selector pg \"#vote-compare-form\")\n+ (let [before (loc/text-content (page/locator pg \"#vote-edge-history-region\"))]\n+ (is (str/includes? before \"no votes on this pair yet\")\n+ \"empty edge history before first vote\"))\n+ (loc/click (page/get-by-test-id pg \"vote-post\"))\n+ (page/wait-for-selector pg \".vote-edge-history-title\")\n+ (let [after (loc/text-content (page/locator pg \"#vote-edge-history-region\"))]\n+ (is (str/includes? after \"votes on this pair\")\n+ \"shows edge history title after vote\")\n+ (is (str/includes? after \"50:50\")\n+ \"shows submitted ratio after vote\")\n+ (is (not (str/includes? after \"no votes on this pair yet\"))\n+ \"does not revert to empty edge history\")))\n+ (finally\n+ (process/destroy proc))))\n+ (finally\n+ (stop-mock))))))\n","role":"user"}],"model":"~x-ai/grok-latest"}