{"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[0728c06a] Vote pool: use display_path in hrefs; test all 45 pairs + assert ranking.\n\n- vote_compare_href and vote_pool_href now encode ~/… and -/… as their\n short display forms (not the full https://slug.social/… storage URL),\n matching what users see in the item display and DSL.\n- Rewrite browser_vote_pool test to vote all C(10,2)=45 pairs in the\n pool, always preferring the alphabetically-earlier letter, then query\n GetGardenRank and assert the 10 items form one component ranked a→j.\n\nCo-Authored-By: Claude Sonnet 4.6 \n\nSide A — unified diff (full patch):\ndiff --git a/server/src/html/garden/vote.rs b/server/src/html/garden/vote.rs\nindex 2682cfcbd2f834b56459a02831aa225cffe67c58..d0ec78cd675eae284d056fb3b8eaf5cc853d6263 100644\n--- a/server/src/html/garden/vote.rs\n+++ b/server/src/html/garden/vote.rs\n@@ -234,8 +234,10 @@ pub(super) fn vote_compare_href(\n thread_override: Option<&str>,\n pool: Option<&ItemId>,\n ) -> String {\n- let left_q = urlencoding::encode(left.as_str());\n- let right_q = urlencoding::encode(right.as_str());\n+ let left_dp = left.display_path();\n+ let right_dp = right.display_path();\n+ let left_q = urlencoding::encode(&left_dp);\n+ let right_q = urlencoding::encode(&right_dp);\n let mut base = format!(\n \"{}/vote?left={}&right={}\",\n nav.room_path_prefix_for_vote_compare(),\n@@ -246,16 +248,20 @@ pub(super) fn vote_compare_href(\n base = format!(\"{}&thread={}\", base, urlencoding::encode(t));\n }\n if let Some(p) = pool {\n- base = format!(\"{}&pool={}\", base, urlencoding::encode(p.as_str()));\n+ let pool_dp = p.display_path();\n+ base = format!(\"{}&pool={}\", base, urlencoding::encode(&pool_dp));\n }\n base\n }\n \n pub(super) fn vote_pool_href(nav: &ThreadNav, pool_item_str: &str) -> String {\n+ let display = ItemId::parse(pool_item_str)\n+ .map(|i| i.display_path())\n+ .unwrap_or_else(|| pool_item_str.to_string());\n format!(\n \"{}/vote?pool={}\",\n nav.room_path_prefix_for_vote_compare(),\n- urlencoding::encode(pool_item_str)\n+ urlencoding::encode(&display)\n )\n }\n \ndiff --git a/test/browser_vote_pool.clj b/test/browser_vote_pool.clj\nindex d51f05db47dc3cb013e56e65f3a1edfbbcbd96ab..23d0bd80b02bd8b1b48853454bed02793296550e 100644\n--- a/test/browser_vote_pool.clj\n+++ b/test/browser_vote_pool.clj\n@@ -1,6 +1,8 @@\n (ns test.browser-vote-pool\n- \"Pool-scoped voting: seed ~/pool/a-j, enter via /vote?pool=~/pool, follow\n- the vote → next-pair → vote sequence until no next pair or 15 iterations.\"\n+ \"Pool-scoped voting: seed ~/pool/a-j (10 letters), follow the\n+ vote → next-pair sequence for all C(10,2)=45 pairs voting the\n+ alphabetically-earlier item each time, then assert the garden\n+ ranking is a…j in order.\"\n (:require [babashka.fs :as fs]\n [cheshire.core :as json]\n [clojure.string :as str]\n@@ -11,26 +13,38 @@\n [test.common :as common]\n [test.oauth :as oauth]))\n \n+(def letters [\"a\" \"b\" \"c\" \"d\" \"e\" \"f\" \"g\" \"h\" \"i\" \"j\"])\n+(def total-pairs (/ (* (count letters) (dec (count letters))) 2)) ; C(10,2) = 45\n+\n (defn- wait-for-text [pg selector expected timeout-ms]\n (let [deadline (+ (System/currentTimeMillis) timeout-ms)]\n (loop []\n- (let [text (locator/text-content (page/locator pg selector))]\n+ (let [text (try (locator/text-content (page/locator pg selector)) (catch Exception _ nil))]\n (if (and (string? text) (str/includes? text expected))\n true\n (if (< (System/currentTimeMillis) deadline)\n- (do (Thread/sleep 200) (recur))\n+ (do (Thread/sleep 150) (recur))\n false))))))\n \n (defn- element-text [pg selector]\n- (try (locator/text-content (page/locator pg selector)) (catch Exception _ nil)))\n+ (try (locator/text-content (page/locator pg selector)) (catch Exception _ \"\")))\n \n (defn- enc [^String s]\n (java.net.URLEncoder/encode s \"UTF-8\"))\n \n-(def letters [\"a\" \"b\" \"c\" \"d\" \"e\" \"f\" \"g\" \"h\" \"i\" \"j\"])\n+;; Extract the terminal path segment, e.g. \"~/pool/c\" → \"c\".\n+(defn- leaf [path] (last (str/split path #\"/\")))\n+\n+;; Set the hidden ratio inputs so the alphabetically-earlier item wins.\n+(defn- set-ratio! [pg left-text right-text]\n+ (let [[rl rr] (if (neg? (compare (leaf left-text) (leaf right-text)))\n+ [100 0] ; left is earlier → prefer left\n+ [0 100])] ; right is earlier → prefer right\n+ (page/evaluate pg (str \"document.getElementById('vote-ratio-left').value='\" rl \"'\"))\n+ (page/evaluate pg (str \"document.getElementById('vote-ratio-right').value='\" rr \"'\"))))\n \n (defn vote-pool-flow! []\n- (println \"\\n━━━ browser vote pool (/vote?pool= seeds + follow next-pair sequence) ━━━\\n\")\n+ (println (str \"\\n━━━ browser vote pool (all \" total-pairs \" pairs → sorted ranking) ━━━\\n\"))\n \n (common/letlocals\n (bind build (common/run-cargo-build-release! [\"slugsocial-server\"]))\n@@ -54,7 +68,6 @@\n \n (let [alice-token (oauth/fetch-bearer-token! base-url :username \"alice\")\n thread-tag \"browser-vote-pool\"\n- ;; seed ~/pool/a through ~/pool/j as items with bodies\n item-lines (str/join \"\\n\"\n (map (fn [l] (str \"~/pool/\" l \" {\" l \"}\")) letters))\n raw (str \"# \" thread-tag \"\\n\\n~/pool {root}\\n\" item-lines \"\\n\")\n@@ -77,51 +90,57 @@\n (page/navigate pg (str base-url \"/login\"))\n (is (wait-for-text pg \"body\" \"@alice\" 15000) \"alice session after login\")\n \n- ;; Enter via pool URL — page picks first pair automatically.\n (page/navigate pg pool-url)\n (is (wait-for-text pg \"body.view-vote-compare\" \"compare\" 15000)\n \"pool entry: vote compare page loads\")\n \n- ;; Verify the initial pair is within the pool.\n- (let [pair-text (element-text pg \".vote-compare-pair\")]\n- (is (and (string? pair-text) (str/includes? pair-text \"~/pool/\"))\n- (str \"initial pair is within ~/pool: \" pair-text)))\n-\n- ;; Follow vote → next-pair sequence up to 15 iterations.\n- (let [votes-cast\n- (loop [i 0]\n- (if (>= i 15)\n- i\n- (let [explanation (str \"pool vote \" i \" reason\")]\n- (locator/fill (page/locator pg \"#vote-explain\") explanation)\n- (locator/click (page/locator pg \"#vote-compare-form button[type=submit]\"))\n- ;; Wait for edge history morph confirming the vote landed.\n- (if-not (wait-for-text pg \"ul.vote-edge-history\" explanation 20000)\n- (do (println \" vote\" i \"history morph timed out — stopping\")\n- i)\n- (let [has-next (wait-for-text pg \"[data-testid=\\\"vote-next-pair\\\"]\"\n- \"next pair\" 8000)]\n- (if-not has-next\n- ;; \"no next pair\" — pool exhausted.\n- (do (println \" no next pair after vote\" i \" — pool exhausted\")\n- (inc i))\n- (do\n- ;; Verify the pair on this page is within the pool before advancing.\n- (let [pt (element-text pg \".vote-compare-pair\")]\n- (is (and (string? pt) (str/includes? pt \"~/pool/\"))\n- (str \"pair at vote \" i \" is within ~/pool: \" pt)))\n- (locator/click (page/locator pg \"[data-testid=\\\"vote-next-pair\\\"]\"))\n- ;; Wait for next pair to load.\n- (wait-for-text pg \"body.view-vote-compare\" \"compare\" 10000)\n- (recur (inc i)))))))))]\n-\n- (is (>= votes-cast 1) (str \"cast at least 1 vote, got: \" votes-cast))\n- (println (str \" pool voting sequence complete: \" votes-cast \" vote(s) cast\")))\n-\n- ;; After the sequence, the current page is still a pool-scoped vote page.\n- (let [url (page/url pg)]\n- (is (str/includes? (or url \"\") \"/vote\")\n- (str \"still on /vote after sequence: \" url))))))))\n+ ;; Vote all 45 pairs, always preferring the alphabetically-earlier item.\n+ (loop [votes-cast 0]\n+ (when (< votes-cast total-pairs)\n+ (let [left-text (element-text pg \".vote-compare-left code\")\n+ right-text (element-text pg \".vote-compare-right code\")]\n+ (is (str/includes? left-text \"~/pool/\")\n+ (str \"vote \" votes-cast \": left is in pool: \" left-text))\n+ (is (str/includes? right-text \"~/pool/\")\n+ (str \"vote \" votes-cast \": right is in pool: \" right-text))\n+ (set-ratio! pg left-text right-text)\n+ (let [winner (if (neg? (compare (leaf left-text) (leaf right-text)))\n+ (leaf left-text) (leaf right-text))]\n+ (locator/fill (page/locator pg \"#vote-explain\")\n+ (str \"prefer \" winner)))\n+ (locator/click (page/locator pg \"#vote-compare-form button[type=submit]\"))\n+ (is (wait-for-text pg \"ul.vote-edge-history\" \"prefer \" 20000)\n+ (str \"vote \" votes-cast \" appears in edge history\"))\n+ (when (< (inc votes-cast) total-pairs)\n+ (is (wait-for-text pg \"[data-testid=\\\"vote-next-pair\\\"]\" \"next pair\" 8000)\n+ (str \"next pair available after vote \" votes-cast))\n+ (locator/click (page/locator pg \"[data-testid=\\\"vote-next-pair\\\"]\"))\n+ (is (wait-for-text pg \"body.view-vote-compare\" \"compare\" 10000)\n+ (str \"vote page loaded for pair \" (inc votes-cast))))\n+ (recur (inc votes-cast)))))\n+\n+ (println (str \" cast all \" total-pairs \" votes\"))\n+\n+ ;; Query the ranking via RPC and assert alphabetical order.\n+ (let [rank-resp (oauth/http-post-json\n+ (str base-url \"/api/v0/rpc\")\n+ [{\"GetGardenRank\" {\"room\" \"public\"\n+ \"parent_path\" \"~/pool\"}}]\n+ :headers {\"Authorization\" (str \"Bearer \" alice-token)})\n+ rank-json (json/parse-string (:body rank-resp) true)\n+ result (get-in rank-json [:results 0 :result :GardenRank])\n+ components (:components result)\n+ unranked (:unranked_items result)\n+ ranked (mapv :item (mapcat :ranking components))\n+ ranked-leaves (mapv #(last (str/split % #\"[/~]+\")) ranked)]\n+ (is (= 1 (count components))\n+ (str \"all 10 items form one connected component (got \" (count components) \")\"))\n+ (is (empty? unranked)\n+ (str \"no unranked items (got \" (count unranked) \")\"))\n+ (is (= 10 (count ranked))\n+ (str \"10 items ranked (got \" (count ranked) \")\"))\n+ (is (= letters ranked-leaves)\n+ (str \"ranking is alphabetical a→j (got \" ranked-leaves \")\"))))))))\n \n (finally\n (when-some [s @!server] (common/kill-server s))\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[6b6eb0c3] Auth form: poem JS morphs form innerHTML on response; no redirect\n\n- post_choose_username returns HTML fragments instead of redirects:\n success → auth_signed_in_fragment (\"you're signed in — return to your agent\")\n error → choose_username_error_fragment (form re-rendered with error inline)\n- Poem JS now reads response body; if non-empty, morphs form innerHTML with it\n (existing ingest forms return empty body, so they're unaffected)\n- auth.rs: keep full layout() with poem JS — revert to single layout\n- auth-success CSS class added to both themes\n\nCo-Authored-By: Claude Sonnet 4.6 (1M context) \n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/auth.rs b/server/src/api/auth.rs\nindex c1194f79fd89fb47fe6b425b494a0ffa667abb2d..cb0faa29b834931e2c2b2f5c174c875e2e2e9346 100644\n--- a/server/src/api/auth.rs\n+++ b/server/src/api/auth.rs\n@@ -16,7 +16,7 @@ use crate::{\n canonicalize_username, validate_agent_format, validate_username,\n Event, TokenIssued, UserRegistered,\n },\n- html::{auth_complete_page, choose_username_page},\n+ html::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page},\n state::{AppState, PendingSession},\n };\n \n@@ -274,8 +274,6 @@ pub async fn post_choose_username(\n return api_error(StatusCode::BAD_REQUEST, \"invalid agent format\", Some(msg)).into_response();\n }\n \n- let public_url = std::env::var(\"SLUG_PUBLIC_URL\").unwrap_or_else(|_| \"http://127.0.0.1:8080\".to_string());\n-\n let reduced_arc = state.reduced.clone();\n let reduced = reduced_arc.read().await;\n let provider_key = (provider.to_lowercase(), provider_id.clone());\n@@ -284,11 +282,7 @@ pub async fn post_choose_username(\n }\n if reduced.users_by_provider.values().any(|u| u == &canonicalize_username(&form.username)) {\n drop(reduced);\n- return Redirect::to(&format!(\n- \"{public_url}/auth/choose-username?session={}&error={}\",\n- urlencoding::encode(&form.session),\n- urlencoding::encode(\"that username is taken — try another\"),\n- )).into_response();\n+ return choose_username_error_fragment(&form.session, \"that username is taken — try another\").into_response();\n }\n drop(reduced);\n \n@@ -324,7 +318,7 @@ pub async fn post_choose_username(\n s.complete = Some((canon_user.clone(), bearer.clone()));\n }\n \n- Redirect::to(&format!(\"{public_url}/auth/complete\")).into_response()\n+ auth_signed_in_fragment().into_response()\n }\n \n pub async fn post_pending_session(\ndiff --git a/server/src/html/auth.rs b/server/src/html/auth.rs\nindex 40b1ef30a6c1d4063aa2d8e9c93df8972df4b27c..0a14bdbfb66c65d1bd09993ffd4a7bb6f2fe041e 100644\n--- a/server/src/html/auth.rs\n+++ b/server/src/html/auth.rs\n@@ -1,20 +1,25 @@\n-use maud::{html, Markup, DOCTYPE};\n+use maud::{html, Markup};\n \n-/// Minimal layout for auth pages — no JS interceptor, real form navigation works.\n-fn auth_layout(title: &str, body: Markup) -> Markup {\n+fn form_inner(session: &str, error: Option<&str>) -> Markup {\n html! {\n- (DOCTYPE)\n- html {\n- head {\n- meta charset=\"utf-8\";\n- meta name=\"viewport\" content=\"width=device-width, initial-scale=1\";\n- title { (title) }\n- link rel=\"stylesheet\" href=\"/static/theme_default.css\";\n- }\n- body class=\"view-auth\" {\n- (body)\n- }\n+ input type=\"hidden\" name=\"session\" value=(session);\n+ label for=\"username\" { \"username\" }\n+ input\n+ type=\"text\"\n+ id=\"username\"\n+ name=\"username\"\n+ placeholder=\"e.g. alice\"\n+ pattern=\"[a-z0-9_\\\\-]{1,32}\"\n+ maxlength=\"32\"\n+ autocomplete=\"off\"\n+ autofocus;\n+ p.auth-hint {\n+ \"lowercase · alphanumeric · hyphens · underscores · max 32\"\n }\n+ @if let Some(msg) = error {\n+ p.auth-error { (msg) }\n+ }\n+ button type=\"submit\" { \"continue\" }\n }\n }\n \n@@ -28,27 +33,23 @@ pub fn choose_username_page(session: &str, error: Option<&str>) -> Markup {\n h1 { \"choose a username\" }\n p { \"pick a handle for slug.social.\" }\n form.auth-form method=\"POST\" action=\"/auth/choose-username\" {\n- input type=\"hidden\" name=\"session\" value=(session);\n- label for=\"username\" { \"username\" }\n- input\n- type=\"text\"\n- id=\"username\"\n- name=\"username\"\n- placeholder=\"e.g. alice\"\n- pattern=\"[a-z0-9_\\\\-]{1,32}\"\n- maxlength=\"32\"\n- autocomplete=\"off\"\n- autofocus;\n- p.auth-hint {\n- \"lowercase · alphanumeric · hyphens · underscores · max 32\"\n- }\n- @if let Some(msg) = error {\n- p.auth-error { (msg) }\n- }\n- button type=\"submit\" { \"continue\" }\n+ (form_inner(session, error))\n }\n };\n- auth_layout(\"join — slug.social\", body)\n+ super::layout(\"join — slug.social\", \"view-auth\", body, None)\n+}\n+\n+/// Fragment returned to the poem JS on error — replaces the form's innerHTML.\n+pub fn choose_username_error_fragment(session: &str, error: &str) -> Markup {\n+ form_inner(session, Some(error))\n+}\n+\n+/// Fragment returned to the poem JS on success — replaces the form's innerHTML.\n+pub fn auth_signed_in_fragment() -> Markup {\n+ html! {\n+ p.auth-success { \"you're signed in — return to your agent.\" }\n+ p.auth-hint { \"you can close this tab.\" }\n+ }\n }\n \n pub fn auth_complete_page() -> Markup {\n@@ -62,5 +63,5 @@ pub fn auth_complete_page() -> Markup {\n p { \"Return to your terminal — your agent is polling and will collect your token automatically.\" }\n p.auth-hint { \"You can close this tab.\" }\n };\n- auth_layout(\"signed in — slug.social\", body)\n+ super::layout(\"signed in — slug.social\", \"view-auth\", body, None)\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 2f16d701962d703db0c859bb586dfc08ec385690..8b48a25cce79f0eefc7e29849e1a667cae4c7986 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -15,7 +15,7 @@ mod search;\n mod tree;\n use breadcrumb_path::OntologyPath;\n \n-pub use auth::{auth_complete_page, choose_username_page};\n+pub use auth::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page};\n pub use editor::{editor_check, editor_page};\n pub use forum::{index, thread_feed_html, thread_post_expand, thread_post_view, thread_view};\n pub use garden::{garden_index, ontology_path};\n@@ -114,6 +114,8 @@ script { (maud::PreEscaped(r#\"\n });\n \n // Poem: intercept POST forms, send via fetch, await SSE for DOM update.\n+ // If the response body is non-empty HTML, morph the form's innerHTML with it\n+ // (used for inline feedback without a page reload, e.g. auth forms).\n document.addEventListener('submit', async (e) => {\n const f = e.target;\n if (!f || f.tagName !== 'FORM') return;\n@@ -121,14 +123,19 @@ script { (maud::PreEscaped(r#\"\n e.preventDefault();\n const btn = f.querySelector('button[type=\"submit\"], input[type=\"submit\"]');\n if (btn) { btn.disabled = true; btn.textContent = '…'; }\n- await fetch(f.action, {\n+ const resp = await fetch(f.action, {\n method: 'POST',\n body: new URLSearchParams(new FormData(f)),\n headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n credentials: 'same-origin',\n });\n- if (btn) { btn.disabled = false; btn.textContent = 'submit'; }\n- f.reset();\n+ const html = await resp.text();\n+ if (html && html.trim()) {\n+ Idiomorph.morph(f, html, {morphStyle: 'innerHTML'});\n+ } else {\n+ if (btn) { btn.disabled = false; btn.textContent = 'submit'; }\n+ f.reset();\n+ }\n });\n \n // Search: debounced fetch + idiomorph.\ndiff --git a/server/static/theme_default.css b/server/static/theme_default.css\nindex 9e71574da4bed3a0116c347610636780678bd1af..a1d8d1765a7812191edc579125facf1694554c2c 100644\n--- a/server/static/theme_default.css\n+++ b/server/static/theme_default.css\n@@ -250,6 +250,11 @@ p.auth-error {\n font-size: 12px;\n margin: 4px 0 0;\n }\n+p.auth-success {\n+ color: var(--signal);\n+ font-size: 13px;\n+ margin: 4px 0 0;\n+}\n \n /* ----------------------------------------------------------------\n BUTTONS — raised, press on :active\ndiff --git a/server/static/theme_retro.css b/server/static/theme_retro.css\nindex dc9fa4654f529eb1843557fb580cf3982da46901..8ed8fd88efab32b36bd66cf200aa182219b0a8b5 100644\n--- a/server/static/theme_retro.css\n+++ b/server/static/theme_retro.css\n@@ -32,6 +32,7 @@ input[type=\"text\"] {\n input[type=\"text\"]:focus { border-color: #00ff41; }\n p.auth-hint { color: #555; font-family: monospace; font-size: 0.75rem; margin: 0; }\n p.auth-error { color: #ff4444; font-family: monospace; font-size: 0.8rem; margin: 0; }\n+p.auth-success { color: #00ff41; font-family: monospace; font-size: 0.8rem; margin: 0; }\n \n /* Ingest form (poem pattern) */\n .ingest-form-wrap { margin-top: 1.5rem; }\n","role":"user"}],"model":"openai/gpt-chat-latest"}