{"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[2fe70b0e] themes\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/auth.rs b/server/src/api/auth.rs\nindex 559db65de14c6157690ffbf18eca0cf65b0a5202..b3631b06153d52f88348fef927e7a024b7b85ad6 100644\n--- a/server/src/api/auth.rs\n+++ b/server/src/api/auth.rs\n@@ -1,7 +1,7 @@\n use axum::{\n body::Body,\n extract::{Path, Query, State},\n- http::{header, HeaderMap, HeaderValue, StatusCode},\n+ http::{header, HeaderMap, HeaderValue, StatusCode, Uri},\n response::{IntoResponse, Redirect, Response},\n Form, Json,\n };\n@@ -17,7 +17,7 @@ use crate::{\n events::{Event, GrantAdded, TokenIssued, UserRegistered},\n html::{\n auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment,\n- choose_username_page, JsBuilder,\n+ choose_username_page, theme_cookie_header_from_jar, theme_from_jar, theme_next_from_uri, JsBuilder,\n },\n identity::{parse_agent, parse_username},\n reducer::ReducerState,\n@@ -48,15 +48,17 @@ fn js_form_error_fragment(session: &str, error: &str) -> Response {\n .into_response()\n }\n \n-fn js_signed_in_fragment(bearer: &str) -> Response {\n+fn js_signed_in_fragment(bearer: &str, jar: &CookieJar) -> Response {\n let mut response = JsBuilder::new()\n .id(\"choose-username-form\")\n .morph_inner(auth_signed_in_fragment())\n .redirect(\"/auth/complete\")\n .into_response();\n- response\n- .headers_mut()\n- .insert(header::SET_COOKIE, session_cookie_header_value(bearer));\n+ let headers = response.headers_mut();\n+ headers.append(header::SET_COOKIE, session_cookie_header_value(bearer));\n+ if let Some(theme) = theme_cookie_header_from_jar(jar) {\n+ headers.append(header::SET_COOKIE, theme);\n+ }\n response\n }\n \n@@ -69,13 +71,18 @@ pub fn optional_principal(headers: &HeaderMap, jar: &CookieJar, reduced: &Reduce\n verify_token(reduced, c.value()).ok()\n }\n \n-fn redirect_with_session_cookie(public_url: &str, path_and_query: &str, bearer: &str) -> Response {\n- Response::builder()\n+fn redirect_with_session_cookie(public_url: &str, path_and_query: &str, bearer: &str, jar: &CookieJar) -> Response {\n+ let mut res = Response::builder()\n .status(StatusCode::TEMPORARY_REDIRECT)\n .header(header::LOCATION, format!(\"{public_url}{path_and_query}\"))\n- .header(header::SET_COOKIE, session_cookie_header_value(bearer))\n .body(Body::empty())\n- .unwrap()\n+ .unwrap();\n+ let headers = res.headers_mut();\n+ headers.append(header::SET_COOKIE, session_cookie_header_value(bearer));\n+ if let Some(theme) = theme_cookie_header_from_jar(jar) {\n+ headers.append(header::SET_COOKIE, theme);\n+ }\n+ res\n }\n \n async fn apply_invite_redemption(state: &AppState, invite_token: &str, grantee_username: &str) -> Result<(), String> {\n@@ -286,7 +293,11 @@ pub struct AuthCallbackQuery {\n pub state: String,\n }\n \n-pub async fn get_auth_callback(Query(q): Query, State(state): State) -> impl IntoResponse {\n+pub async fn get_auth_callback(\n+ Query(q): Query,\n+ State(state): State,\n+ jar: CookieJar,\n+) -> impl IntoResponse {\n let sessions = pending_sessions(&state);\n {\n let sessions_read = sessions.read().await;\n@@ -365,7 +376,7 @@ pub async fn get_auth_callback(Query(q): Query, State(state):\n }\n let cookie_bearer = bearer.clone();\n s.complete = Some((username, bearer));\n- return redirect_with_session_cookie(&public_url, \"/\", &cookie_bearer).into_response();\n+ return redirect_with_session_cookie(&public_url, \"/\", &cookie_bearer, &jar).into_response();\n }\n }\n \n@@ -378,14 +389,20 @@ pub struct ChooseUsernameQuery {\n pub error: Option,\n }\n \n-pub async fn get_choose_username(Query(q): Query, State(state): State) -> impl IntoResponse {\n+pub async fn get_choose_username(\n+ Query(q): Query,\n+ State(state): State,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n let sessions = pending_sessions(&state);\n let sessions_read = sessions.read().await;\n if !sessions_read.contains_key(&q.session) {\n return api_error(StatusCode::NOT_FOUND, \"unknown session\", None).into_response();\n }\n drop(sessions_read);\n- choose_username_page(&q.session, q.error.as_deref()).into_response()\n+ let next = theme_next_from_uri(&uri);\n+ choose_username_page(&q.session, q.error.as_deref(), theme_from_jar(&jar), &next).into_response()\n }\n \n #[derive(Debug, Deserialize)]\n@@ -396,6 +413,7 @@ pub struct ChooseUsernameForm {\n \n pub async fn post_choose_username(\n State(state): State,\n+ jar: CookieJar,\n Form(form): Form,\n ) -> impl IntoResponse {\n let canon_user = match parse_username(&form.username) {\n@@ -477,7 +495,7 @@ pub async fn post_choose_username(\n s.complete = Some((canon_user.clone(), bearer.clone()));\n }\n \n- js_signed_in_fragment(&bearer).into_response()\n+ js_signed_in_fragment(&bearer, &jar).into_response()\n }\n \n /// Start a browser-only OAuth flow (no CLI polling). Sets session cookie on success.\n@@ -569,8 +587,9 @@ pub async fn get_pending_session(\n .into_response()\n }\n \n-pub async fn get_auth_complete() -> impl IntoResponse {\n- auth_complete_page()\n+pub async fn get_auth_complete(jar: CookieJar, uri: Uri) -> impl IntoResponse {\n+ let next = theme_next_from_uri(&uri);\n+ auth_complete_page(theme_from_jar(&jar), &next).into_response()\n }\n \n pub async fn get_whoami(State(state): State, headers: HeaderMap) -> impl IntoResponse {\ndiff --git a/server/src/api/helpers.rs b/server/src/api/helpers.rs\nindex 81e2a55fa3abb8609b4099f91a989480336e11eb..9b71491e9f9efc44a2a4beba09be8f64bd2ff2ee 100644\n--- a/server/src/api/helpers.rs\n+++ b/server/src/api/helpers.rs\n@@ -39,6 +39,55 @@ pub fn item_path_for_api(item: &str) -> String {\n }\n }\n \n+/// Same as [`item_path_for_api`], but for private rooms ontology items are prefixed with\n+/// `/r/{short}/{slug}` so the URL matches the web app (`/r/…/~/…` routes).\n+pub fn item_path_for_api_in_room(item: &str, room_wire: &str) -> String {\n+ let room = room_wire.trim();\n+ if room.is_empty() || room == \"public\" {\n+ return item_path_for_api(item);\n+ }\n+ let Some((short, slug)) = room.split_once('/') else {\n+ return item_path_for_api(item);\n+ };\n+ if short.is_empty() || slug.is_empty() {\n+ return item_path_for_api(item);\n+ }\n+ let Some(c) = CanonicalItemUrl::parse(item) else {\n+ return item_path_for_api(item);\n+ };\n+ let root = CanonicalItemUrl::ontology_root();\n+ let item_norm = c.as_str().trim_end_matches('/');\n+ let root_norm = root.as_str().trim_end_matches('/');\n+ if let Some(tail) = c.tilde_tail() {\n+ return if tail.is_empty() {\n+ format!(\"https://slug.social/r/{short}/{slug}/~\")\n+ } else {\n+ format!(\"https://slug.social/r/{short}/{slug}/~/{}\", tail)\n+ };\n+ }\n+ if item_norm == root_norm {\n+ return format!(\"https://slug.social/r/{short}/{slug}/~\");\n+ }\n+ item_path_for_api(item)\n+}\n+\n+/// Absolute thread URL for forum JSON (`/t/…` vs `/r/…/t/…`).\n+pub fn forum_thread_web_url(room_wire: &str, thread_tag: &str) -> String {\n+ let room = room_wire.trim();\n+ let tag = thread_tag.trim().trim_start_matches('#');\n+ if room.is_empty() || room == \"public\" {\n+ format!(\"https://slug.social/t/{tag}\")\n+ } else if let Some((short, slug)) = room.split_once('/') {\n+ if short.is_empty() || slug.is_empty() {\n+ format!(\"https://slug.social/t/{tag}\")\n+ } else {\n+ format!(\"https://slug.social/r/{short}/{slug}/t/{tag}\")\n+ }\n+ } else {\n+ format!(\"https://slug.social/t/{tag}\")\n+ }\n+}\n+\n /// Resolve an item path as a first-class canonical path.\n pub fn resolve_item(item: &str) -> Result {\n let canonical = canonicalize_item(item);\n@@ -188,3 +237,52 @@ pub fn vote_touches_path(a: &str, b: &str, parent_canon: &str) -> bool {\n let under = |item: &str| item == parent_canon || item.starts_with(&format!(\"{}/\", parent_canon));\n under(a) || under(b)\n }\n+\n+#[cfg(test)]\n+mod wire_url_tests {\n+ use super::{forum_thread_web_url, item_path_for_api_in_room};\n+\n+ #[test]\n+ fn public_room_unchanged() {\n+ let u = \"https://slug.social/~/a/b\";\n+ assert_eq!(item_path_for_api_in_room(u, \"public\"), u);\n+ }\n+\n+ #[test]\n+ fn private_room_prefixes_ontology() {\n+ assert_eq!(\n+ item_path_for_api_in_room(\"https://slug.social/~/topic/x\", \"9ab12cd/my-room\"),\n+ \"https://slug.social/r/9ab12cd/my-room/~/topic/x\"\n+ );\n+ }\n+\n+ #[test]\n+ fn private_room_ontology_root() {\n+ assert_eq!(\n+ item_path_for_api_in_room(\"https://slug.social/~\", \"9ab12cd/my-room\"),\n+ \"https://slug.social/r/9ab12cd/my-room/~\"\n+ );\n+ assert_eq!(\n+ item_path_for_api_in_room(\"https://slug.social/~/\", \"9ab12cd/my-room\"),\n+ \"https://slug.social/r/9ab12cd/my-room/~\"\n+ );\n+ }\n+\n+ #[test]\n+ fn external_url_untouched_in_private_room() {\n+ let u = \"https://example.com/z\";\n+ assert_eq!(item_path_for_api_in_room(u, \"9ab12cd/my-room\"), u);\n+ }\n+\n+ #[test]\n+ fn forum_web_public_vs_room() {\n+ assert_eq!(\n+ forum_thread_web_url(\"public\", \"debate\"),\n+ \"https://slug.social/t/debate\"\n+ );\n+ assert_eq!(\n+ forum_thread_web_url(\"9ab12cd/my-room\", \"#debate\"),\n+ \"https://slug.social/r/9ab12cd/my-room/t/debate\"\n+ );\n+ }\n+}\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 31f5fcfb4eaf4df0a9cbac532dd3dedfe3611810..5b91f5836625eedbb1cd9423168046e3fb576c17 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -27,8 +27,9 @@ use crate::{\n \n use super::auth::verify_bearer_principal;\n use super::helpers::{\n- compute_connectivity_stats, is_pair_voted, item_path_for_api, now_ms, paginate_rankings,\n- parse_parent_specs, pick_random_distinct, resolve_item, vote_touches_path,\n+ compute_connectivity_stats, forum_thread_web_url, is_pair_voted, item_path_for_api,\n+ item_path_for_api_in_room, now_ms, paginate_rankings, parse_parent_specs, pick_random_distinct,\n+ resolve_item, vote_touches_path,\n };\n use super::validate::{normalize_room_and_thread, validate_ingest_document};\n \n@@ -148,6 +149,7 @@ fn compute_scope_rank_changes(\n parent: &str,\n before: &crate::scope_rank::ChildrenRankings,\n after: &crate::scope_rank::ChildrenRankings,\n+ room_wire: &str,\n ) -> Option {\n fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap> {\n let mut map = HashMap::new();\n@@ -182,7 +184,7 @@ fn compute_scope_rank_changes(\n };\n if changed {\n changes.push(RankChange {\n- item: item_path_for_api(&item),\n+ item: item_path_for_api_in_room(&item, room_wire),\n before: b,\n after: a,\n });\n@@ -204,7 +206,7 @@ fn compute_scope_rank_changes(\n parent: if parent.is_empty() {\n \"/\".to_string()\n } else {\n- item_path_for_api(parent)\n+ item_path_for_api_in_room(parent, room_wire)\n },\n changes,\n })\n@@ -256,6 +258,7 @@ fn build_rank_response_for_content(\n offset: usize,\n limit: Option,\n want_percent: bool,\n+ room_wire: &str,\n ) -> Result {\n let parent_owned = parent.map(|s| s.to_string());\n let specs = parse_parent_specs(parent_owned.as_ref());\n@@ -299,7 +302,7 @@ fn build_rank_response_for_content(\n .ranked\n .into_iter()\n .map(|r| RankRow {\n- item: item_path_for_api(r.item.as_str()),\n+ item: item_path_for_api_in_room(r.item.as_str(), room_wire),\n percent: if want_percent {\n Some((r.score / max_score) * 100.0)\n } else {\n@@ -315,7 +318,7 @@ fn build_rank_response_for_content(\n let prefixed_unranked: Vec = rankings\n .unranked_items\n .into_iter()\n- .map(|s| item_path_for_api(s.as_str()))\n+ .map(|s| item_path_for_api_in_room(s.as_str(), room_wire))\n .collect();\n \n let (components, unranked_items) = if offset > 0 || limit.is_some() {\n@@ -522,7 +525,7 @@ async fn rpc_post(\n .filter_map(|p| {\n let before = pre_rankings.get(p)?;\n let after = crate::scope_rank::build_children_rankings(content, p);\n- compute_scope_rank_changes(p.as_str(), before, &after)\n+ compute_scope_rank_changes(p.as_str(), before, &after, &room_key)\n })\n .collect();\n if v.is_empty() { None } else { Some(v) }\n@@ -530,14 +533,28 @@ async fn rpc_post(\n None\n };\n \n+ let (pair_hint, rank_hint, web_url) = if room_key == \"public\" {\n+ (\n+ \"npx slugsocial public garden pair\".to_string(),\n+ \"npx slugsocial public garden rank\".to_string(),\n+ forum_thread_web_url(\"public\", &thread_id),\n+ )\n+ } else {\n+ (\n+ format!(\"npx slugsocial private {room_key} garden pair\"),\n+ format!(\"npx slugsocial private {room_key} garden rank\"),\n+ forum_thread_web_url(&room_key, &thread_id),\n+ )\n+ };\n+\n Ok(RpcResult::PostOk {\n events_appended,\n ranking_changes,\n threads: vec![format!(\"#{}\", thread_id)],\n next: NextMoves {\n- pair: \"npx slugsocial public garden pair\".to_string(),\n- rank: \"npx slugsocial public garden rank\".to_string(),\n- web: format!(\"https://slug.social/t/{}\", thread_id),\n+ pair: pair_hint,\n+ rank: rank_hint,\n+ web: web_url,\n },\n })\n }\n@@ -609,7 +626,7 @@ async fn rpc_check(\n raw: v.raw_text.clone(),\n principal,\n delegate,\n- room_id: room_key,\n+ room_id: room_key.clone(),\n thread_tag: thread_id.clone(),\n });\n \n@@ -647,7 +664,7 @@ async fn rpc_check(\n .ranked\n .into_iter()\n .map(|r| RankRow {\n- item: item_path_for_api(r.item.as_str()),\n+ item: item_path_for_api_in_room(r.item.as_str(), &room_key),\n score: r.score,\n percent: None,\n })\n@@ -655,25 +672,35 @@ async fn rpc_check(\n })\n .collect();\n CheckScopeRanking {\n- parent: item_path_for_api(parent.as_str()),\n+ parent: item_path_for_api_in_room(parent.as_str(), &room_key),\n components,\n unranked_items: scoped\n .unranked_items\n .into_iter()\n- .map(|it| item_path_for_api(it.as_str()))\n+ .map(|it| item_path_for_api_in_room(it.as_str(), &room_key))\n .collect(),\n }\n })\n .collect();\n \n+ let check_next = if room_key == \"public\" {\n+ vec![\n+ \"npx slugsocial public forum post --delegate \".to_string(),\n+ \"npx slugsocial public forum list\".to_string(),\n+ forum_thread_web_url(\"public\", &thread_id),\n+ ]\n+ } else {\n+ vec![\n+ format!(\"npx slugsocial private {room_key} forum post --delegate \"),\n+ format!(\"npx slugsocial private {room_key} forum list\"),\n+ forum_thread_web_url(&room_key, &thread_id),\n+ ]\n+ };\n+\n Ok(RpcResult::CheckOk {\n rankings,\n threads: vec![format!(\"#{}\", thread_id)],\n- next: vec![\n- \"npx slugsocial public forum post --delegate \".to_string(),\n- \"npx slugsocial public forum list\".to_string(),\n- format!(\"https://slug.social/t/{}\", thread_id),\n- ],\n+ next: check_next,\n })\n }\n \n@@ -690,7 +717,7 @@ fn rpc_list_forum_threads(reduced: &ReducerState, room: &str) -> ThreadsResponse\n .map(|((_, tag), ts)| ThreadSummary {\n thread: format!(\"#{tag}\"),\n last_activity_ts: ts.last_activity_ts,\n- web: format!(\"https://slug.social/t/{}\", tag),\n+ web: forum_thread_web_url(room, tag),\n })\n .collect();\n out.sort_by(|a, b| b.last_activity_ts.cmp(&a.last_activity_ts));\n@@ -1031,8 +1058,8 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n .collect();\n let cs = compute_connectivity_stats(&content.ranking_group, &pool);\n Ok(RpcResult::Pair(PairResponse {\n- left: item_path_for_api(&left),\n- right: item_path_for_api(&right),\n+ left: item_path_for_api_in_room(&left, &room),\n+ right: item_path_for_api_in_room(&right, &room),\n left_body: lb,\n right_body: rb,\n threads: th,\n@@ -1088,6 +1115,7 @@ pub async fn handle_rpc_batch(\n offset.unwrap_or(0),\n limit,\n percent.unwrap_or(false),\n+ &room,\n ) {\n Ok(r) => line_ok(RpcResult::GardenRank(r)),\n Err((e, h)) => line_err(e, h),\n@@ -1109,7 +1137,7 @@ pub async fn handle_rpc_batch(\n if !content.items.contains(&item) {\n line_err(\n \"item not found\",\n- Some(format!(\"{} does not exist\", item_path_for_api(&item_str))),\n+ Some(format!(\"{} does not exist\", item_path_for_api_in_room(&item_str, &room))),\n )\n } else {\n const MAX_ITEM_BODY: usize = 10_000;\n@@ -1132,7 +1160,7 @@ pub async fn handle_rpc_batch(\n .map(|s| s.iter().cloned().collect())\n .unwrap_or_default();\n line_ok(RpcResult::GardenItem(ItemResponse {\n- item: item_str,\n+ item: item_path_for_api_in_room(&item_str, &room),\n body,\n truncated,\n body_len,\n@@ -1525,7 +1553,11 @@ pub async fn handle_rpc_batch(\n let range = (top - bot).max(1e-12);\n for r in items {\n let pct = want_percent.then(|| ((r.score - bot) / range * 100.0).clamp(0.0, 100.0));\n- ranked.push(RankRow { item: item_path_for_api(r.item.as_str()), score: r.score, percent: pct });\n+ ranked.push(RankRow {\n+ item: item_path_for_api_in_room(r.item.as_str(), &room),\n+ score: r.score,\n+ percent: pct,\n+ });\n }\n }\n \n@@ -1542,7 +1574,7 @@ pub async fn handle_rpc_batch(\n let page: Vec = ranked\n .into_iter()\n .chain(unranked.into_iter().map(|it| RankRow {\n- item: item_path_for_api(&it),\n+ item: item_path_for_api_in_room(&it, &room),\n score: 0.0,\n percent: want_percent.then_some(0.0),\n }))\n@@ -1586,7 +1618,7 @@ pub async fn handle_rpc_batch(\n if !content.items.contains(&item) {\n line_err(\n \"item not found\",\n- Some(format!(\"{} does not exist\", item_path_for_api(&item_str))),\n+ Some(format!(\"{} does not exist\", item_path_for_api_in_room(&item_str, &room))),\n )\n } else {\n let votes: Vec = content\n@@ -1597,8 +1629,8 @@ pub async fn handle_rpc_batch(\n .take(limit)\n .map(|v| VoteRow {\n ts: v.ts,\n- a: v.a.as_str().to_string(),\n- b: v.b.as_str().to_string(),\n+ a: item_path_for_api_in_room(v.a.as_str(), &room),\n+ b: item_path_for_api_in_room(v.b.as_str(), &room),\n ratio: format!(\"{}:{}\", v.ratio_left, v.ratio_right),\n actor: Some(v.principal.clone()),\n body: v.body.clone(),\n@@ -1608,7 +1640,7 @@ pub async fn handle_rpc_batch(\n })\n .unwrap_or_default();\n line_ok(RpcResult::Matchup(MatchupResponse {\n- item: item_path_for_api(&item_str),\n+ item: item_path_for_api_in_room(&item_str, &room),\n votes,\n }))\n }\n@@ -1635,8 +1667,8 @@ pub async fn handle_rpc_batch(\n if a == item_str || b == item_str {\n Some(VoteRow {\n ts: e.ts,\n- a: item_path_for_api(&a),\n- b: item_path_for_api(&b),\n+ a: item_path_for_api_in_room(&a, &room),\n+ b: item_path_for_api_in_room(&b, &room),\n ratio: format!(\"{}:{}\", ratio_left, ratio_right),\n actor: reduced.ingests_by_id.get(&e.post_id).map(|ing| ing.principal.clone()),\n body: explanation,\n@@ -1672,7 +1704,7 @@ pub async fn handle_rpc_batch(\n }\n }).collect();\n line_ok(RpcResult::RankHistory(RankHistoryResponse {\n- item: item_path_for_api(&item_str),\n+ item: item_path_for_api_in_room(&item_str, &room),\n history,\n }))\n }\n@@ -1691,6 +1723,10 @@ pub async fn handle_rpc_batch(\n .map(|p| p.as_str().to_string())\n .collect();\n paths.sort();\n+ let paths: Vec = paths\n+ .into_iter()\n+ .map(|p| item_path_for_api_in_room(&p, &room))\n+ .collect();\n line_ok(RpcResult::Leaves(LeavesResponse { paths }))\n }\n },\n@@ -1707,10 +1743,21 @@ pub async fn handle_rpc_batch(\n let mut v: Vec = roots.iter()\n .map(|path| {\n let children = content.item_children.get(path.as_str()).map(|s| s.len()).unwrap_or(0);\n+ let path_label = CanonicalItemUrl::parse(path.as_str())\n+ .and_then(|c| {\n+ c.tilde_tail().map(|t| {\n+ if t.is_empty() {\n+ \"~/\".to_string()\n+ } else {\n+ format!(\"~/{}\", t)\n+ }\n+ })\n+ })\n+ .unwrap_or_else(|| path.to_string());\n PathSummary {\n- path: format!(\"~/{}\", path),\n+ path: path_label,\n children,\n- web: format!(\"https://slug.social/~/{}\", path),\n+ web: item_path_for_api_in_room(path.as_str(), &room),\n }\n }).collect();\n v.sort_by(|a, b| a.path.cmp(&b.path));\n@@ -1743,8 +1790,8 @@ pub async fn handle_rpc_batch(\n .take(limit)\n .map(|v| VoteRow {\n ts: v.ts,\n- a: v.a.as_str().to_string(),\n- b: v.b.as_str().to_string(),\n+ a: item_path_for_api_in_room(v.a.as_str(), &room),\n+ b: item_path_for_api_in_room(v.b.as_str(), &room),\n ratio: format!(\"{}:{}\", v.ratio_left, v.ratio_right),\n actor: Some(v.principal.clone()),\n body: v.body.clone(),\ndiff --git a/server/src/html/auth.rs b/server/src/html/auth.rs\nindex d57b1c725ce3e06b1d904882b9388c3da48d85cb..5df77c76b89ed2bb11d936e1dbb804d50a0e79a1 100644\n--- a/server/src/html/auth.rs\n+++ b/server/src/html/auth.rs\n@@ -23,7 +23,7 @@ fn form_inner(session: &str, error: Option<&str>) -> Markup {\n }\n }\n \n-pub fn choose_username_page(session: &str, error: Option<&str>) -> Markup {\n+pub fn choose_username_page(session: &str, error: Option<&str>, theme: &str, theme_next: &str) -> Markup {\n let body = html! {\n nav.breadcrumb {\n a href=\"/\" { \"slug.social\" }\n@@ -36,7 +36,7 @@ pub fn choose_username_page(session: &str, error: Option<&str>) -> Markup {\n (form_inner(session, error))\n }\n };\n- super::layout(\"join — slug.social\", \"view-auth\", body, None)\n+ super::layout(\"join — slug.social\", \"view-auth\", body, None, theme, theme_next)\n }\n \n /// Fragment returned to the poem JS on error — replaces the form's innerHTML.\n@@ -52,7 +52,7 @@ pub fn auth_signed_in_fragment() -> Markup {\n }\n }\n \n-pub fn auth_complete_page() -> Markup {\n+pub fn auth_complete_page(theme: &str, theme_next: &str) -> Markup {\n let body = html! {\n nav.breadcrumb {\n a href=\"/\" { \"slug.social\" }\n@@ -63,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- super::layout(\"signed in — slug.social\", \"view-auth\", body, None)\n+ super::layout(\"signed in — slug.social\", \"view-auth\", body, None, theme, theme_next)\n }\ndiff --git a/server/src/html/editor.rs b/server/src/html/editor.rs\nindex 07f6ab3b778f07f60765fa3f39060ebc5f72bc1a..ecdd226b1b17d5f11d1b79f99add5759ef918281 100644\n--- a/server/src/html/editor.rs\n+++ b/server/src/html/editor.rs\n@@ -1,8 +1,10 @@\n use axum::{\n extract::State,\n+ http::Uri,\n response::{Html, IntoResponse},\n Form,\n };\n+use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup};\n use serde::Deserialize;\n \n@@ -13,7 +15,7 @@ use crate::{\n state::AppState,\n };\n \n-use super::{bc_segment, layout};\n+use super::{bc_segment, layout, theme_from_jar, theme_next_from_uri};\n \n fn bc_try() -> Markup {\n html! {\n@@ -23,7 +25,7 @@ fn bc_try() -> Markup {\n }\n \n /// The interactive editor page — `/try`.\n-pub async fn editor_page() -> impl IntoResponse {\n+pub async fn editor_page(jar: CookieJar, uri: Uri) -> impl IntoResponse {\n let page = layout(\n \"try — slug.social\",\n \"view-thread\",\n@@ -68,6 +70,8 @@ pub async fn editor_page() -> impl IntoResponse {\n \"#)) }\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string())\n }\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\nindex 5c5f9e2ba0e5cb1d661c113117988ec80c01deca..368b1016eb43d83e9ff39464ff6164fa9a8b558a 100644\n--- a/server/src/html/forum.rs\n+++ b/server/src/html/forum.rs\n@@ -1,6 +1,6 @@\n use axum::{\n extract::{Path, Query, State},\n- http::{HeaderMap, StatusCode},\n+ http::{HeaderMap, StatusCode, Uri},\n response::{Html, IntoResponse},\n };\n use axum_extra::extract::cookie::CookieJar;\n@@ -19,7 +19,7 @@ use crate::{\n \n use super::{\n bc_segment, bc_threads, cli_panel, layout, now_ms, profile_href, recency_class,\n- render_linkified_with_embeds_in_scope, JsBuilder,\n+ render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, JsBuilder,\n };\n \n #[derive(Clone)]\n@@ -577,6 +577,7 @@ pub async fn home(\n State(state): State,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let now = now_ms();\n let reduced = state.reduced.read().await;\n@@ -624,6 +625,8 @@ pub async fn home(\n (cli_panel(\"npx slugsocial public forum list\"))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string())\n }\n@@ -679,6 +682,7 @@ async fn thread_view_inner(\n nav: ThreadNav,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let tag = canonicalize_tag(&tag);\n let scope = nav.scope();\n@@ -778,6 +782,8 @@ async fn thread_view_inner(\n (cli_panel(&cli))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string()).into_response()\n }\n@@ -789,8 +795,9 @@ pub async fn thread_view(\n Query(q): Query,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n- thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar).await\n+ thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar, uri).await\n }\n \n /// Room thread — `/r/:short/:slug/t/:tag`\n@@ -800,31 +807,39 @@ pub async fn room_thread_view(\n Query(q): Query,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n drop(reduced);\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n- thread_view_inner(state, tag, q, nav, headers, jar)\n+ thread_view_inner(state, tag, q, nav, headers, jar, uri)\n .await\n .into_response()\n }\n \n-fn room_not_found_page() -> impl IntoResponse {\n+fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse {\n let body = html! {\n nav class=\"breadcrumb\" { a href=\"/\" { \"slug.social\" } }\n h1 { \"not found\" }\n p { \"The requested page could not be found.\" }\n p { a href=\"/\" { \"home\" } }\n };\n- let page = layout(\"not found — slug.social\", \"view-thread\", body, None);\n+ let page = layout(\n+ \"not found — slug.social\",\n+ \"view-thread\",\n+ body,\n+ None,\n+ theme_from_jar(jar),\n+ &theme_next_from_uri(uri),\n+ );\n (StatusCode::NOT_FOUND, Html(page.into_string()))\n }\n \n@@ -834,6 +849,7 @@ pub async fn room_page(\n Path((room_short, room_slug)): Path<(String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let now = now_ms();\n@@ -845,7 +861,7 @@ pub async fn room_page(\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n let scope = ScopeId::Room(room_id.clone());\n let mut rows = collect_thread_rows_for_scope(&reduced, &scope, now);\n@@ -902,6 +918,8 @@ pub async fn room_page(\n (cli_panel(&audit_cli))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string()).into_response()\n }\n@@ -943,6 +961,8 @@ async fn thread_post_view_inner(\n index_str: String,\n nav: ThreadNav,\n viewer: Option,\n+ jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let tag = canonicalize_tag(&tag);\n let index: usize = index_str.parse().unwrap_or(0);\n@@ -987,6 +1007,8 @@ async fn thread_post_view_inner(\n }\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string()).into_response()\n }\n@@ -996,11 +1018,12 @@ pub async fn thread_post_view(\n Path((tag, index_str)): Path<(String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let reduced = state.reduced.read().await;\n let viewer = optional_principal(&headers, &jar, &reduced);\n drop(reduced);\n- thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer)\n+ thread_post_view_inner(state, tag, index_str, ThreadNav::public(), viewer, jar, uri)\n .await\n }\n \n@@ -1009,19 +1032,20 @@ pub async fn room_thread_post_view(\n Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n drop(reduced);\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n- thread_post_view_inner(state, tag, index_str, nav, user)\n+ thread_post_view_inner(state, tag, index_str, nav, user, jar, uri)\n .await\n .into_response()\n }\n@@ -1193,6 +1217,7 @@ pub async fn user_profile_page(\n Path(username): Path,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let canon = match parse_username(&username) {\n Ok(u) => u,\n@@ -1270,6 +1295,8 @@ pub async fn user_profile_page(\n (cli_panel(&format!(\"npx slugsocial public forum list\")))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string()).into_response()\n }\n@@ -1292,13 +1319,14 @@ pub async fn room_thread_post_expand(\n Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n drop(reduced);\n@@ -1328,13 +1356,14 @@ pub async fn room_thread_post_expand_deleted(\n Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n drop(reduced);\n@@ -1364,13 +1393,14 @@ pub async fn room_thread_post_collapse_deleted(\n Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n drop(reduced);\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex e08f068ae04f5a2542ec2c43c240f931f87146bf..9b4789a79c3e293cbfc5f033a0eac8650320d94d 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -1,6 +1,6 @@\n use axum::{\n extract::{Path, State},\n- http::{HeaderMap, StatusCode},\n+ http::{HeaderMap, StatusCode, Uri},\n response::{Html, IntoResponse},\n };\n use axum_extra::extract::cookie::CookieJar;\n@@ -20,7 +20,8 @@ use crate::{\n \n use super::{\n bc_path, bc_segment, cli_panel, layout, now_ms, ratio_pct,\n- render_linkified_with_embeds_in_scope, breadcrumb_path::OntologyPath,\n+ render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri,\n+ breadcrumb_path::OntologyPath,\n forum::ThreadNav,\n };\n \n@@ -59,14 +60,21 @@ fn scoped_bc_path(path: &OntologyPath, nav: &ThreadNav) -> maud::Markup {\n }\n }\n \n-fn room_not_found_page() -> impl IntoResponse {\n+fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoResponse {\n let body = html! {\n nav class=\"breadcrumb\" { a href=\"/\" { \"slug.social\" } }\n h1 { \"not found\" }\n p { \"The requested page could not be found.\" }\n p { a href=\"/\" { \"home\" } }\n };\n- let page = layout(\"not found — slug.social\", \"view-thread\", body, None);\n+ let page = layout(\n+ \"not found — slug.social\",\n+ \"view-thread\",\n+ body,\n+ None,\n+ theme_from_jar(jar),\n+ &theme_next_from_uri(uri),\n+ );\n (StatusCode::NOT_FOUND, Html(page.into_string()))\n }\n \n@@ -81,7 +89,11 @@ fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&s\n }\n \n /// Ontology index — root-level paths. Private (UUID) roots are excluded.\n-pub async fn garden_index(State(state): State) -> impl IntoResponse {\n+pub async fn garden_index(\n+ State(state): State,\n+ jar: CookieJar,\n+ uri: Uri,\n+) -> impl IntoResponse {\n let nav = ThreadNav::public();\n let child_rankings = {\n let reduced = state.reduced.read().await;\n@@ -130,6 +142,8 @@ pub async fn garden_index(State(state): State) -> impl IntoResponse {\n (cli_panel(\"npx slugsocial garden tree\"))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string())\n }\n@@ -138,9 +152,11 @@ pub async fn garden_index(State(state): State) -> impl IntoResponse {\n pub async fn ontology_path(\n State(state): State,\n Path(path): Path,\n+ jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let path = OntologyPath::from_input(&path);\n- render_scope_view(state, path, ThreadNav::public()).await\n+ render_scope_view(state, path, ThreadNav::public(), jar, uri).await\n }\n \n pub async fn room_garden_index(\n@@ -148,19 +164,20 @@ pub async fn room_garden_index(\n Path((room_short, room_slug)): Path<(String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n drop(reduced);\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n- render_scope_view(state, OntologyPath::root(), nav).await\n+ render_scope_view(state, OntologyPath::root(), nav, jar, uri).await\n }\n \n pub async fn room_ontology_path(\n@@ -168,20 +185,21 @@ pub async fn room_ontology_path(\n Path((room_short, room_slug, path)): Path<(String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let room_id = format!(\"{room_short}/{room_slug}\");\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n drop(reduced);\n- return room_not_found_page().into_response();\n+ return room_not_found_page(&jar, &uri).into_response();\n }\n drop(reduced);\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n let path = OntologyPath::from_input(&path);\n- render_scope_view(state, path, nav).await\n+ render_scope_view(state, path, nav, jar, uri).await\n }\n \n #[derive(Debug, Clone)]\n@@ -375,6 +393,8 @@ async fn render_scope_view(\n state: AppState,\n path: OntologyPath,\n nav: ThreadNav,\n+ jar: CookieJar,\n+ uri: Uri,\n ) -> axum::response::Response {\n let scope = nav.scope();\n let model = {\n@@ -525,6 +545,8 @@ async fn render_scope_view(\n (cli_panel(&cli))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n \n Html(page.into_string()).into_response()\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex a8fd73433d120b07351dd027faf0b25f8f101321..53041a0cf0b30e6f20749c92ecc15a4e9ac56e09 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -1,10 +1,13 @@\n use axum::{\n body::Body,\n extract::Path,\n- http::{header, StatusCode},\n+ http::{header, HeaderValue, StatusCode, Uri},\n response::{IntoResponse, Response},\n+ Form,\n };\n+use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup, DOCTYPE};\n+use serde::Deserialize;\n use std::collections::HashSet;\n \n mod auth;\n@@ -33,6 +36,75 @@ pub(crate) fn profile_href(username: &str) -> String {\n format!(\"/u/{username}\")\n }\n \n+/// Cookie name for UI theme (must match document.cookie migration in [`layout`]).\n+pub const SLUG_THEME_COOKIE: &str = \"slug-theme\";\n+\n+/// Normalize a requested theme id to a known stylesheet key.\n+pub fn normalize_theme(raw: &str) -> &'static str {\n+ match raw {\n+ \"retro\" => \"retro\",\n+ \"retro_craft\" => \"retro_craft\",\n+ _ => \"default\",\n+ }\n+}\n+\n+/// Resolved theme for rendering and cookie re-issue.\n+pub fn theme_from_jar(jar: &CookieJar) -> &'static str {\n+ jar.get(SLUG_THEME_COOKIE)\n+ .map(|c| normalize_theme(c.value()))\n+ .unwrap_or(\"default\")\n+}\n+\n+/// `Path` + optional `?query` for round-tripping after `POST /theme`.\n+pub fn theme_next_from_uri(uri: &Uri) -> String {\n+ uri.path_and_query()\n+ .map(|pq| pq.as_str().to_string())\n+ .filter(|s| !s.is_empty())\n+ .unwrap_or_else(|| \"/\".to_string())\n+}\n+\n+/// `Set-Cookie` for a validated theme (ASCII cookie value).\n+pub fn theme_cookie_header_value(theme: &str) -> HeaderValue {\n+ let t = normalize_theme(theme);\n+ let s = format!(\"{SLUG_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000\");\n+ HeaderValue::from_str(&s).expect(\"theme cookie must be ASCII\")\n+}\n+\n+/// Re-issue theme cookie on responses that also set `slug_session`, so login does not drop theme.\n+pub fn theme_cookie_header_from_jar(jar: &CookieJar) -> Option {\n+ let c = jar.get(SLUG_THEME_COOKIE)?;\n+ Some(theme_cookie_header_value(c.value()))\n+}\n+\n+fn sanitize_theme_next(next: Option<&str>) -> String {\n+ let s = next.unwrap_or(\"/\").trim();\n+ if s.starts_with('/') && !s.starts_with(\"//\") && s.len() < 8192 {\n+ s.to_string()\n+ } else {\n+ \"/\".to_string()\n+ }\n+}\n+\n+#[derive(Debug, Deserialize)]\n+pub struct ThemeForm {\n+ theme: String,\n+ next: Option,\n+}\n+\n+/// `POST /theme` — set theme cookie and redirect back (full navigation, no fetch).\n+pub async fn post_theme(Form(form): Form) -> impl IntoResponse {\n+ let theme = normalize_theme(&form.theme);\n+ let next = sanitize_theme_next(form.next.as_deref());\n+ let loc = HeaderValue::try_from(next.as_str())\n+ .unwrap_or_else(|_| HeaderValue::from_static(\"/\"));\n+ Response::builder()\n+ .status(StatusCode::SEE_OTHER)\n+ .header(header::LOCATION, loc)\n+ .header(header::SET_COOKIE, theme_cookie_header_value(theme))\n+ .body(Body::empty())\n+ .expect(\"theme redirect response\")\n+}\n+\n // Embed CSS files at compile time\n const THEME_DEFAULT_CSS: &str = include_str!(\"../../static/theme_default.css\");\n const THEME_RETRO_CSS: &str = include_str!(\"../../static/theme_retro.css\");\n@@ -173,7 +245,9 @@ impl JsQueryBuilder {\n }\n }\n \n-pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option) -> Markup {\n+pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option, theme: &str, theme_next: &str) -> Markup {\n+ let theme = normalize_theme(theme);\n+ let css_href = format!(\"/static/theme_{theme}.css\");\n html! {\n (DOCTYPE)\n html {\n@@ -181,7 +255,20 @@ pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option)\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\" id=\"theme-stylesheet\";\n+ script { (maud::PreEscaped(r#\"\n+(function() {\n+ try {\n+ var ls = localStorage.getItem('slug-theme');\n+ if (!ls) return;\n+ var m = document.cookie.match(/(?:^|;\\s*)slug-theme=([^;]+)/);\n+ var c = m ? decodeURIComponent(m[1].replace(/\\+/g, ' ')) : '';\n+ if (ls === c) { localStorage.removeItem('slug-theme'); return; }\n+ document.cookie = 'slug-theme=' + encodeURIComponent(ls) + '; Path=/; SameSite=Lax; Max-Age=31536000';\n+ location.reload();\n+ } catch (e) {}\n+})();\n+\"#)) }\n+ link rel=\"stylesheet\" href=(css_href) id=\"theme-stylesheet\";\n script src=\"https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js\" {}\n }\n body class=(view) {\n@@ -196,32 +283,21 @@ pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option)\n input type=\"range\" id=\"spread-slider\" min=\"0\" max=\"1\" step=\"0.05\" value=\"1\";\n }\n a id=\"search-btn\" href=\"/search\" { \"search\" }\n- div id=\"theme-switcher\" { \"theme\" }\n+ form id=\"slug-theme-form\" method=\"post\" action=\"/theme\" {\n+ input type=\"hidden\" name=\"next\" value=(theme_next);\n+ select id=\"theme-select\" name=\"theme\" onchange=\"this.form.submit()\" aria-label=\"Theme\" {\n+ @for (val, label) in [(\"default\", \"default\"), (\"retro\", \"retro\"), (\"retro_craft\", \"craft\")] {\n+ @if theme == val {\n+ option value=(val) selected { (label) }\n+ } @else {\n+ option value=(val) { (label) }\n+ }\n+ }\n+ }\n+ }\n }\n script { (maud::PreEscaped(r#\"\n (function() {\n- // Theme switching\n- const themes = ['default', 'retro', 'retro_craft'];\n- const themeLabel = { default: 'default', retro: 'retro', retro_craft: 'craft' };\n- const storedTheme = localStorage.getItem('slug-theme') || 'default';\n- const switcher = document.getElementById('theme-switcher');\n- const stylesheet = document.getElementById('theme-stylesheet');\n-\n- function setTheme(name) {\n- stylesheet.href = `/static/theme_${name}.css`;\n- localStorage.setItem('slug-theme', name);\n- switcher.textContent = themeLabel[name] || name;\n- setTimeout(() => setSpread(parseFloat(slider.value)), 50);\n- }\n-\n- setTheme(storedTheme);\n-\n- switcher.addEventListener('click', function() {\n- const current = themes.indexOf(localStorage.getItem('slug-theme') || 'default');\n- const next = (current + 1) % themes.length;\n- setTheme(themes[next]);\n- });\n-\n // Spread control\n const slider = document.getElementById('spread-slider');\n const storedSpread = localStorage.getItem('slug-spread');\n@@ -245,6 +321,7 @@ script { (maud::PreEscaped(r#\"\n const f = e.target;\n if (!f || f.tagName !== 'FORM') return;\n if ((f.method || 'get').toLowerCase() !== 'post') return;\n+ if (f.id === 'slug-theme-form') return;\n e.preventDefault();\n const resp = await fetch(f.action, {\n method: 'POST',\ndiff --git a/server/src/html/search.rs b/server/src/html/search.rs\nindex 0871ddb7a87e3153e2cb6c1f827b46de2c9f0f3b..28ceaa53c3fcac6777311535e95fb771b19438f5 100644\n--- a/server/src/html/search.rs\n+++ b/server/src/html/search.rs\n@@ -1,6 +1,6 @@\n use axum::{\n extract::{Query, State},\n- http::HeaderMap,\n+ http::{HeaderMap, Uri},\n response::{Html, IntoResponse},\n };\n use axum_extra::extract::cookie::CookieJar;\n@@ -15,7 +15,7 @@ use crate::{\n timeago,\n };\n \n-use super::{authorship_address, bc_segment, cli_panel, layout, now_ms};\n+use super::{authorship_address, bc_segment, cli_panel, layout, now_ms, theme_from_jar, theme_next_from_uri};\n \n /// Escape HTML special chars for safe injection.\n fn escape_html(s: &str) -> String {\n@@ -396,6 +396,7 @@ pub async fn search_page(\n Query(params): Query,\n headers: HeaderMap,\n jar: CookieJar,\n+ uri: Uri,\n ) -> impl IntoResponse {\n let query = params.q.clone().unwrap_or_default();\n let results = if query.len() >= 2 {\n@@ -420,6 +421,8 @@ pub async fn search_page(\n (cli_panel(\"npx slugsocial search \"))\n },\n None,\n+ theme_from_jar(&jar),\n+ &theme_next_from_uri(&uri),\n );\n Html(page.into_string())\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 43b63293c2a62b9700948767c618cb0614ddf6d9..b9d4b79791ba8dd3a3c26ff777943a2548092de5 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -33,6 +33,7 @@ pub fn create_app(state: AppState) -> Router {\n .route(\"/post\", post(api::post_web_ingest))\n .route(\"/post/redact\", post(api::post_web_redact))\n .route(\"/post/check\", post(api::check_web_ingest))\n+ .route(\"/theme\", post(crate::html::post_theme))\n .route(\"/sse\", get(api::get_html_stream))\n .route(\"/stream\", get(api::get_stream))\n .route(\"/search\", get(crate::html::search_page))\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex 997597f6659c1ba2092bc5348e393bf7a8fa7ae0..cad58cac7da948f92d6ea2a5587d917ab21d57ea 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -8,6 +8,12 @@\n //!\n //! This module adds lightweight newtypes so code can be explicit about what it\n //! expects without changing core storage formats.\n+//!\n+//! **Storage vs wire:** [`CanonicalItemUrl`] values are shared across scopes\n+//! (`https://slug.social/~/…`); which [`crate::reducer::ContentState`] they live in\n+//! is determined by scope, not by embedding the room id in the string. For JSON/RPC\n+//! and browser links in a private room, use [`crate::api::helpers::item_path_for_api_in_room`]\n+//! so ontology items become `https://slug.social/r/{short}/{slug}/~/…`.\n \n use std::borrow::Borrow;\n use std::fmt;\ndiff --git a/server/static/theme_default.css b/server/static/theme_default.css\nindex 2b06b12f3e77c9ed305272fe3ab47a8ad08504df..5e6304bcc36caed8aeda913fd241fc8fb9cf6d25 100644\n--- a/server/static/theme_default.css\n+++ b/server/static/theme_default.css\n@@ -678,7 +678,10 @@ details > summary::-webkit-details-marker { display: none; }\n gap: 6px;\n }\n #spread-slider { accent-color: var(--ui); width: 80px; }\n-#theme-switcher {\n+#slug-theme-form {\n+ display: contents;\n+}\n+#theme-select {\n background: var(--g4);\n border: var(--bv) solid;\n border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n@@ -688,8 +691,8 @@ details > summary::-webkit-details-marker { display: none; }\n padding: 2px 10px;\n user-select: none;\n }\n-#theme-switcher:hover { color: var(--signal); }\n-#theme-switcher:active {\n+#theme-select:hover { color: var(--signal); }\n+#theme-select:active {\n border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n transform: translate(1px, 1px);\n }\ndiff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css\nindex 508222443a3bb2f16d3034a07af53a7df37a0314..3fde7e2b77fa4e4f46418927eb0fb0e5cd195c75 100644\n--- a/server/static/theme_retro_craft.css\n+++ b/server/static/theme_retro_craft.css\n@@ -35,7 +35,6 @@ h1, h2, h3 {\n font-weight: 600;\n letter-spacing: 0.14em;\n margin: 1.5rem 0 0.5rem;\n- text-transform: uppercase;\n }\n \n a {\n@@ -354,7 +353,10 @@ div.cli-panel {\n accent-color: var(--accent);\n width: 72px;\n }\n-#theme-switcher,\n+#slug-theme-form {\n+ display: contents;\n+}\n+#theme-select,\n #search-btn,\n a#src-link {\n border: 1px solid var(--line);\n@@ -365,7 +367,7 @@ a#src-link {\n padding: 0.25rem 0.6rem;\n text-decoration: none;\n }\n-#theme-switcher:hover,\n+#theme-select:hover,\n #search-btn:hover,\n a#src-link:hover {\n border-color: var(--accent);\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":"~anthropic/claude-sonnet-latest"}