{"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[c7ef287e] Rank every eligible commit with the LLM council.\n\nStop short-circuiting on a single contributor; pairwise-sort commits, roll scores up for emission payouts, and surface commit rankings on epoch pages.\n\nCo-authored-by: Cursor \n\nSide B — unified diff (full patch):\ndiff --git a/constitution.py b/constitution.py\nindex 26ba130e885e0e69fb7874ca5c3f07f42100a150..71fc46b4c9a4d7a9ea7bf319860b0db1acc4a673 100644\n--- a/constitution.py\n+++ b/constitution.py\n@@ -503,20 +503,22 @@ def _epochs_in_ledger() -> list[int]:\n \n \n def build_pairwise_prompt(side_a: dict, side_b: dict) -> str:\n- return f\"\"\"You are ranking contributions to an open source project.\n-Compare these two sides (each may be one or more commits). Decide which side contributed more.\n+ return f\"\"\"You are ranking individual git commits to an open source project.\n+Compare these two commits. Decide which commit contributed more.\n Return ONLY a JSON object: {{\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}}\n \n-Side A — commit messages:\n+Side A — contributor: {side_a.get('contributor', '?')}\n+Side A — commit message:\n {side_a['message']}\n \n-Side A — unified diffs (full patches):\n+Side A — unified diff (full patch):\n {side_a['diff']}\n \n-Side B — commit messages:\n+Side B — contributor: {side_b.get('contributor', '?')}\n+Side B — commit message:\n {side_b['message']}\n \n-Side B — unified diffs (full patches):\n+Side B — unified diff (full patch):\n {side_b['diff']}\"\"\"\n \n \n@@ -1518,16 +1520,28 @@ async def broadcast_js(js: str):\n await queue.put(js)\n \n \n-def _author_side_for_llm(author: str, author_commits: dict) -> dict:\n- cs = author_commits[author]\n+def _commit_side_for_llm(row: dict) -> dict:\n+ oid = row[\"oid\"]\n+ short = oid.split(\":\", 1)[1][:8] if \":\" in oid else oid[:8]\n return {\n- \"message\": \"\\n\".join(f\"[{c['sha']}] {c['message']}\" for c in cs),\n- \"diff\": \"\\n\\n\".join(f\"=== {c['sha']} ===\\n{c['diff']}\" for c in cs),\n- \"commit_ids\": [c[\"commit_id\"] for c in cs],\n- \"contributor\": author,\n+ \"message\": f\"[{short}] {row['message']}\",\n+ \"diff\": row[\"patch\"] or \"\",\n+ \"commit_id\": commit_id_for_oid(oid),\n+ \"contributor\": row[\"contributor\"],\n+ \"oid\": oid,\n }\n \n \n+def _rollup_contributor_scores(\n+ ordered: list[dict], commit_scores: list[Decimal]\n+) -> dict[str, Decimal]:\n+ totals: dict[str, Decimal] = {}\n+ for row, score in zip(ordered, commit_scores):\n+ contributor = row[\"contributor\"]\n+ totals[contributor] = totals.get(contributor, Decimal(\"0\")) + score\n+ return totals\n+\n+\n def _find_judgment(comparison_id: str, model_id: str) -> dict | None:\n for e in evidence_by_kind(\"llm.judgment\"):\n p = e.payload\n@@ -1546,101 +1560,106 @@ def _find_ranking_models(ranking_run_id: str) -> list[str] | None:\n \n \n async def rank_commits(commits: list[dict], *, epoch: int = -1):\n+ \"\"\"Pairwise-rank every eligible commit; roll scores up to contributors.\"\"\"\n if not commits:\n return {}, [], {\"ranking_run_id\": \"\", \"ranking_event_id\": \"\"}\n \n- commit_ids = sorted(commit_id_for_oid(row[\"oid\"]) for row in commits)\n+ ordered = sorted(commits, key=lambda r: r[\"oid\"])\n+ commit_ids = [commit_id_for_oid(row[\"oid\"]) for row in ordered]\n ranking_run_id = _content_id(\"rank\", {\n \"epoch\": epoch,\n- \"commit_ids\": commit_ids,\n+ \"commit_ids\": sorted(commit_ids),\n })\n- contributors = sorted(set(c[\"contributor\"] for c in commits))\n+ contributors = sorted({c[\"contributor\"] for c in ordered})\n \n- if len(contributors) == 1:\n+ # Nothing to compare: a single commit (not a single contributor).\n+ if len(ordered) == 1:\n await append_evidence(epoch, \"ranking.started\", {\n \"ranking_run_id\": ranking_run_id,\n \"commit_ids\": commit_ids,\n \"contributors\": contributors,\n \"models\": [],\n- \"summary\": f\"ranking epoch {epoch}: single contributor\",\n+ \"summary\": f\"ranking epoch {epoch}: single commit\",\n })\n- ranking = {contributors[0]: Decimal(\"1\")}\n+ commit_ranking = {commit_ids[0]: \"1\"}\n+ contributor_ranking = {ordered[0][\"contributor\"]: Decimal(\"1\")}\n completed = await append_evidence(epoch, \"ranking.completed\", {\n \"ranking_run_id\": ranking_run_id,\n \"models\": [],\n- \"ranking\": {contributors[0]: \"1\"},\n+ \"commit_ranking\": commit_ranking,\n+ \"contributor_ranking\": {ordered[0][\"contributor\"]: \"1\"},\n+ \"ranking\": {ordered[0][\"contributor\"]: \"1\"},\n \"judgment_ids\": [],\n- \"summary\": f\"Only {contributors[0]} is eligible; rank is 1.0\",\n+ \"summary\": f\"Only one eligible commit; {ordered[0]['contributor']} rank 1.0\",\n })\n await broadcast_audit(\n \"ranking\",\n- f\"Only {contributors[0]} is eligible; rank is 1.0\",\n+ f\"Only one eligible commit; {ordered[0]['contributor']} rank 1.0\",\n progress=90,\n phase=\"finalizing\",\n evidence_event_id=completed.event_id,\n evidence_url=_evidence_url(\"event\", completed.event_id),\n links={\"epoch\": _evidence_url(\"epoch\", str(epoch))},\n )\n- return ranking, [], {\n+ return contributor_ranking, [], {\n \"ranking_run_id\": ranking_run_id,\n \"ranking_event_id\": completed.event_id,\n }\n \n if not (OPENROUTER_API_KEY or \"\").strip():\n raise RuntimeError(\n- \"OPENROUTER_API_KEY is required when multiple contributors need ranking\"\n+ \"OPENROUTER_API_KEY is required when multiple commits need ranking\"\n )\n \n models = _find_ranking_models(ranking_run_id)\n if models is None:\n models = await fetch_top_models(n=3)\n if not models:\n- raise RuntimeError(\"no council models available for contributor ranking\")\n+ raise RuntimeError(\"no council models available for commit ranking\")\n await append_evidence(epoch, \"ranking.started\", {\n \"ranking_run_id\": ranking_run_id,\n \"commit_ids\": commit_ids,\n \"contributors\": contributors,\n \"models\": models,\n- \"summary\": f\"Council selected: {', '.join(models)}\",\n+ \"summary\": (\n+ f\"Council selected: {', '.join(models)} — \"\n+ f\"{len(ordered)} commits\"\n+ ),\n })\n await broadcast_audit(\n \"council\",\n- f\"Council selected: {', '.join(models)}\",\n+ f\"Council selected: {', '.join(models)} — ranking {len(ordered)} commits\",\n progress=35,\n phase=\"ranking\",\n )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n- [\"div.log-council\", f\"Council: {', '.join(models)} — {len(commits)} commits\"]\n+ [\"div.log-council\",\n+ f\"Council: {', '.join(models)} — {len(ordered)} commits\"]\n ]))\n \n- authors = contributors\n- author_commits = {a: [] for a in authors}\n- for row in sorted(commits, key=lambda r: r[\"oid\"]):\n- author_commits[row[\"contributor\"]].append({\n- \"message\": row[\"message\"],\n- \"sha\": row[\"oid\"].split(\":\", 1)[1][:8],\n- \"diff\": row[\"patch\"],\n- \"commit_id\": commit_id_for_oid(row[\"oid\"]),\n- })\n-\n+ sides = [_commit_side_for_llm(row) for row in ordered]\n judgment_ids: list[str] = []\n \n async def compare_fn(i, j):\n- a1, a2 = authors[i], authors[j]\n- side_a = _author_side_for_llm(a1, author_commits)\n- side_b = _author_side_for_llm(a2, author_commits)\n+ side_a, side_b = sides[i], sides[j]\n+ label_a = f\"{side_a['commit_id'][:16]} ({side_a['contributor']})\"\n+ label_b = f\"{side_b['commit_id'][:16]} ({side_b['contributor']})\"\n prompt = build_pairwise_prompt(side_a, side_b)\n comparison_material = {\n \"ranking_run_id\": ranking_run_id,\n \"side_a\": {\n- \"contributor\": a1,\n- \"commit_ids\": side_a[\"commit_ids\"],\n+ \"contributor\": side_a[\"contributor\"],\n+ \"commit_id\": side_a[\"commit_id\"],\n+ \"commit_ids\": [side_a[\"commit_id\"]],\n+ \"oid\": side_a[\"oid\"],\n \"message\": _bytes_blob(side_a[\"message\"]),\n \"diff\": _bytes_blob(side_a[\"diff\"]),\n },\n \"side_b\": {\n- \"contributor\": a2,\n- \"commit_ids\": side_b[\"commit_ids\"],\n+ \"contributor\": side_b[\"contributor\"],\n+ \"commit_id\": side_b[\"commit_id\"],\n+ \"commit_ids\": [side_b[\"commit_id\"]],\n+ \"oid\": side_b[\"oid\"],\n \"message\": _bytes_blob(side_b[\"message\"]),\n \"diff\": _bytes_blob(side_b[\"diff\"]),\n },\n@@ -1650,22 +1669,24 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1):\n comparison_material = {\n **comparison_material,\n \"comparison_id\": comparison_id,\n- \"summary\": f\"Comparing {a1} with {a2}\",\n+ \"summary\": f\"Comparing {label_a} with {label_b}\",\n }\n cmp_ev = await append_evidence(epoch, \"comparison.input\", comparison_material)\n await broadcast_audit(\n \"comparison\",\n- f\"Comparing {a1} with {a2}\",\n+ f\"Comparing commits {label_a} vs {label_b}\",\n phase=\"ranking\",\n evidence_event_id=cmp_ev.event_id,\n evidence_url=_evidence_url(\"comparison\", comparison_id),\n links={\n \"comparison\": _evidence_url(\"comparison\", comparison_id),\n+ \"commit_a\": _evidence_url(\"commit\", side_a[\"commit_id\"]),\n+ \"commit_b\": _evidence_url(\"commit\", side_b[\"commit_id\"]),\n \"epoch\": _evidence_url(\"epoch\", str(epoch)),\n },\n )\n await broadcast_js(exec_event(Three[Selector(\"#emission-status\")][MORPH][\n- [\"div#emission-status\", f\"Comparing {a1} vs {a2}…\"]\n+ [\"div#emission-status\", f\"Comparing {label_a} vs {label_b}…\"]\n ]))\n results = []\n for model in models:\n@@ -1697,9 +1718,15 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1):\n jud_id = (existing or _find_judgment(comparison_id, model) or {}).get(\n \"judgment_id\"\n )\n+ win_label = (\n+ f\"{sides[w]['commit_id'][:16]} ({sides[w]['contributor']})\"\n+ )\n+ lose_label = (\n+ f\"{sides[l]['commit_id'][:16]} ({sides[l]['contributor']})\"\n+ )\n await broadcast_audit(\n \"vote\",\n- f\"{model}: {authors[w]} over {authors[l]} ({result['ratio']})\",\n+ f\"{model}: {win_label} over {lose_label} ({result['ratio']})\",\n phase=\"ranking\",\n evidence_url=(\n _evidence_url(\"judgment\", jud_id) if jud_id else None\n@@ -1714,8 +1741,8 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1):\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-vote\",\n [\"span.model\", model], \" — \",\n- [\"span.winner\", authors[w]], f\" beat \",\n- [\"span.loser\", authors[l]], f\" ({result['ratio']}) \",\n+ [\"span.winner\", win_label], f\" beat \",\n+ [\"span.loser\", lose_label], f\" ({result['ratio']}) \",\n [\"span.explanation\", result[\"explanation\"]],\n ]\n ]))\n@@ -1745,24 +1772,46 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1):\n [\"div#emission-status\", label]\n ]))\n \n- pairs = await pairwise_rank(len(authors), compare_fn, progress_fn)\n+ pairs = await pairwise_rank(len(ordered), compare_fn, progress_fn)\n \n if not pairs:\n- ranking = {authors[0]: Decimal(\"1\")} if authors else {}\n+ commit_score_list = [Decimal(\"1\")]\n else:\n scores = rank_centrality(pairs)\n- ranking = {authors[i]: Decimal(str(scores[i])) for i in range(len(authors))}\n- ranking_rows = sorted(ranking.items(), key=lambda x: x[1], reverse=True)\n+ commit_score_list = [Decimal(str(scores[i])) for i in range(len(ordered))]\n+\n+ commit_ranking = {\n+ commit_ids[i]: str(commit_score_list[i]) for i in range(len(ordered))\n+ }\n+ contributor_totals = _rollup_contributor_scores(ordered, commit_score_list)\n+ contrib_rows = sorted(\n+ contributor_totals.items(), key=lambda x: x[1], reverse=True\n+ )\n+ commit_rows = sorted(\n+ ((commit_ids[i], commit_score_list[i], ordered[i][\"contributor\"])\n+ for i in range(len(ordered))),\n+ key=lambda x: x[1],\n+ reverse=True,\n+ )\n completed = await append_evidence(epoch, \"ranking.completed\", {\n \"ranking_run_id\": ranking_run_id,\n \"models\": models,\n- \"ranking\": {a: str(s) for a, s in ranking_rows},\n+ \"commit_ranking\": commit_ranking,\n+ \"contributor_ranking\": {a: str(s) for a, s in contrib_rows},\n+ \"ranking\": {a: str(s) for a, s in contrib_rows},\n \"judgment_ids\": judgment_ids,\n- \"summary\": \"Ranking: \" + \", \".join(f\"{a} {s:.4f}\" for a, s in ranking_rows),\n+ \"summary\": (\n+ \"Commit ranking: \"\n+ + \", \".join(\n+ f\"{cid[:16]}={float(s):.4f}\" for cid, s, _ in commit_rows[:12]\n+ )\n+ + (\"…\" if len(commit_rows) > 12 else \"\")\n+ ),\n })\n await broadcast_audit(\n \"ranking\",\n- \"Ranking: \" + \", \".join(f\"{a} {s:.4f}\" for a, s in ranking_rows),\n+ \"Contributor rollup: \"\n+ + \", \".join(f\"{a} {s:.4f}\" for a, s in contrib_rows),\n progress=90,\n phase=\"finalizing\",\n evidence_event_id=completed.event_id,\n@@ -1772,10 +1821,10 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1):\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-ranking\",\n [\"b\", \"Ranking: \"],\n- *[[\"span.rank-entry\", f\"{a} {float(s):.3f} \"] for a, s in ranking_rows],\n+ *[[\"span.rank-entry\", f\"{a} {float(s):.3f} \"] for a, s in contrib_rows],\n ]\n ]))\n- return ranking, models, {\n+ return contributor_totals, models, {\n \"ranking_run_id\": ranking_run_id,\n \"ranking_event_id\": completed.event_id,\n }\n@@ -2352,6 +2401,23 @@ async def epoch_detail(epoch: int):\n \n ranking_nodes: list = []\n if ranking_completed:\n+ commit_ranking = ranking_completed.payload.get(\"commit_ranking\") or {}\n+ contrib_ranking = (\n+ ranking_completed.payload.get(\"contributor_ranking\")\n+ or ranking_completed.payload.get(\"ranking\")\n+ or {}\n+ )\n+ commit_rank_links = [\n+ (\n+ f\"{cid[:20]} = {score}\",\n+ _evidence_path(\"commit\", cid),\n+ )\n+ for cid, score in sorted(\n+ commit_ranking.items(),\n+ key=lambda kv: Decimal(str(kv[1])),\n+ reverse=True,\n+ )\n+ ]\n ranking_nodes = [\n [\"p\", ranking_completed.payload.get(\"summary\") or \"ranking completed\"],\n _dl_rows([\n@@ -2362,10 +2428,10 @@ async def epoch_detail(epoch: int):\n ranking_completed.event_id,\n )),\n ]),\n- [\"pre.blob\", json.dumps(\n- ranking_completed.payload.get(\"ranking\") or {},\n- indent=2, sort_keys=True,\n- )],\n+ [\"h3\", \"commit ranking\"],\n+ _link_list(commit_rank_links) if commit_rank_links else [\"p.note\", \"(none)\"],\n+ [\"h3\", \"contributor rollup\"],\n+ [\"pre.blob\", json.dumps(contrib_ranking, indent=2, sort_keys=True)],\n ]\n elif ranking_started:\n ranking_nodes = [[\"p.note\", f\"Ranking started: {ranking_started.event_id}\"]]\n@@ -2386,14 +2452,9 @@ async def epoch_detail(epoch: int):\n else:\n emission_node = [\"p.note\", \"No emission for this epoch.\"]\n \n- contributors = {\n- e.payload.get(\"contributor\")\n- for e in commit_evs\n- if e.payload.get(\"contributor\")\n- }\n no_comparisons_note = \"No comparisons.\"\n- if len(contributors) <= 1:\n- no_comparisons_note += \" Single-contributor — no LLM judgments.\"\n+ if len(commit_evs) <= 1:\n+ no_comparisons_note += \" Fewer than two eligible commits — nothing to pairwise-rank.\"\n \n body = [\n _evidence_nav(),\n@@ -2511,9 +2572,14 @@ async def comparison_detail(comparison_id: str):\n j.payload.get(\"summary\") or jid,\n _evidence_path(\"judgment\", jid),\n ))\n- commit_links = []\n- for cid in (side_a.get(\"commit_ids\") or []) + (side_b.get(\"commit_ids\") or []):\n- commit_links.append((cid, _evidence_path(\"commit\", cid)))\n+ commit_ids = []\n+ for side in (side_a, side_b):\n+ cid = side.get(\"commit_id\")\n+ if cid:\n+ commit_ids.append(cid)\n+ else:\n+ commit_ids.extend(side.get(\"commit_ids\") or [])\n+ commit_links = [(cid, _evidence_path(\"commit\", cid)) for cid in commit_ids]\n return _evidence_page(f\"comparison {comparison_id[:24]}\", [\n _evidence_nav(_a(_evidence_path(\"epoch\", str(ev.epoch)), f\"epoch {ev.epoch}\")),\n [\"div.eyebrow\", \"comparison\"],\n@@ -2522,8 +2588,8 @@ async def comparison_detail(comparison_id: str):\n (\"summary\", p.get(\"summary\")),\n (\"ranking_run_id\", p.get(\"ranking_run_id\")),\n (\"evidence_event\", _a(_evidence_path(\"event\", ev.event_id), ev.event_id)),\n- (\"side_a\", side_a.get(\"contributor\")),\n- (\"side_b\", side_b.get(\"contributor\")),\n+ (\"side_a\", f\"{side_a.get('commit_id', '?')} ({side_a.get('contributor', '?')})\"),\n+ (\"side_b\", f\"{side_b.get('commit_id', '?')} ({side_b.get('contributor', '?')})\"),\n ]),\n [\"p\", _a(f\"/comparisons/{comparison_id}/prompt\", \"download prompt\")],\n [\"h2\", \"commits\"],\n@@ -2534,12 +2600,12 @@ async def comparison_detail(comparison_id: str):\n _link_list(judgment_links),\n [\"h2\", \"prompt\"],\n _pre_blob(_blob_text(p.get(\"prompt\"))),\n- [\"h2\", f\"side A — {side_a.get('contributor', '?')}\"],\n+ [\"h2\", f\"side A — {side_a.get('commit_id', side_a.get('contributor', '?'))}\"],\n [\"h3\", \"message\"],\n _pre_blob(_blob_text(side_a.get(\"message\"))),\n [\"h3\", \"diff\"],\n _pre_blob(_blob_text(side_a.get(\"diff\"))),\n- [\"h2\", f\"side B — {side_b.get('contributor', '?')}\"],\n+ [\"h2\", f\"side B — {side_b.get('commit_id', side_b.get('contributor', '?'))}\"],\n [\"h3\", \"message\"],\n _pre_blob(_blob_text(side_b.get(\"message\"))),\n [\"h3\", \"diff\"],\n@@ -3156,9 +3222,9 @@ async def watch():\n ],\n [\"p.note\",\n (\n- \"Pairwise council voting is ready.\"\n+ \"Pairwise council ranks every eligible commit.\"\n if key_ok else\n- \"Single-contributor epochs can finalize, but contested rankings require OPENROUTER_API_KEY.\"\n+ \"Epochs with two or more eligible commits require OPENROUTER_API_KEY.\"\n )\n ],\n ],\ndiff --git a/tests/integration.clj b/tests/integration.clj\nindex 11140e95a8cd86768a661a30e6b29a3ddfc95fcc..39b2476cb5ddf80733769f61343c81ba7287a974 100644\n--- a/tests/integration.clj\n+++ b/tests/integration.clj\n@@ -507,7 +507,7 @@\n \n (bind or-state @(:state or-mock))\n (assert! (pos? (:model-requests or-state)) \"OpenRouter /models was called\")\n- (assert! (>= (:compare-requests or-state) 3) \"at least 3 pairwise LLM calls (2 authors × 3 models)\")\n+ (assert! (>= (:compare-requests or-state) 3) \"at least 3 pairwise LLM calls (2 commits × 3 models)\")\n \n (bind ledger2 (get-json base-url \"/api/ledger\"))\n (assert! (>= (count ledger2) 3)\n@@ -543,6 +543,8 @@\n \"epoch page links comparisons\")\n (assert! (str/includes? epoch-html \"/judgments/\")\n \"epoch page links judgments\")\n+ (assert! (str/includes? epoch-html \"commit ranking\")\n+ \"epoch page shows per-commit ranking\")\n (bind commit-href\n (second (re-find #\"/commits/(c_[a-f0-9]+)\" epoch-html)))\n (assert! (some? commit-href) \"found a commit id on epoch page\")\ndiff --git a/tests/test_git_discovery.py b/tests/test_git_discovery.py\nindex 00d26bfa85737b178c8822804e278211974e0efe..0f002a58bd9a122d41c5a85e32c16ed2b4404d2f 100644\n--- a/tests/test_git_discovery.py\n+++ b/tests/test_git_discovery.py\n@@ -434,7 +434,7 @@ def test_emission_distribution_sums_exactly_to_total(\n assert entry.discovery_snapshot_id == \"ranked-snapshot\"\n \n \n-def test_single_contributor_ranking_is_total_and_uses_no_pairwise_votes(\n+def test_single_commit_ranking_skips_pairwise(\n discovery_config, monkeypatch,\n ):\n monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n@@ -454,6 +454,65 @@ def test_single_contributor_ranking_is_total_and_uses_no_pairwise_votes(\n assert info[\"ranking_event_id\"]\n \n \n+def test_same_contributor_multiple_commits_runs_pairwise(\n+ discovery_config, monkeypatch,\n+):\n+ monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n+ calls = {\"n\": 0}\n+\n+ async def models(n=3):\n+ return [\"m1\", \"m2\", \"m3\"]\n+\n+ async def compare(model_id, side_a, side_b, **kwargs):\n+ calls[\"n\"] += 1\n+ assert \"commit_id\" in side_a and \"commit_id\" in side_b\n+ if kwargs.get(\"persist\"):\n+ attempt_id = c.attempt_id_for(kwargs[\"comparison_id\"], model_id, 1)\n+ await c.append_evidence(kwargs[\"epoch\"], \"llm.judgment\", {\n+ \"judgment_id\": c.judgment_id_for({\n+ \"attempt_id\": attempt_id,\n+ \"comparison_id\": kwargs[\"comparison_id\"],\n+ \"model_id\": model_id,\n+ \"winner\": \"A\",\n+ \"ratio\": \"2:1\",\n+ \"explanation\": \"ok\",\n+ }),\n+ \"attempt_id\": attempt_id,\n+ \"comparison_id\": kwargs[\"comparison_id\"],\n+ \"model_id\": model_id,\n+ \"winner\": \"A\",\n+ \"ratio\": \"2:1\",\n+ \"explanation\": \"ok\",\n+ \"summary\": \"ok\",\n+ })\n+ return {\"winner\": \"A\", \"ratio\": \"2:1\", \"explanation\": \"ok\"}\n+\n+ monkeypatch.setattr(c, \"fetch_top_models\", models)\n+ monkeypatch.setattr(c, \"llm_pairwise_compare\", compare)\n+ monkeypatch.setattr(c, \"OPENROUTER_API_KEY\", \"test-key\")\n+ commits = [\n+ {\n+ \"contributor\": \"alice\",\n+ \"oid\": \"sha1:\" + char * 40,\n+ \"message\": f\"msg-{char}\",\n+ \"patch\": f\"patch-{char}\",\n+ }\n+ for char in (\"a\", \"b\", \"c\")\n+ ]\n+ ranking, used, info = asyncio.run(c.rank_commits(commits, epoch=0))\n+ assert set(ranking) == {\"alice\"}\n+ assert ranking[\"alice\"] > 0\n+ assert used == [\"m1\", \"m2\", \"m3\"]\n+ assert calls[\"n\"] >= 3\n+ completed = next(\n+ e for e in c.store.read()\n+ if isinstance(e, c.Evidence) and e.kind == \"ranking.completed\"\n+ )\n+ assert len(completed.payload[\"commit_ranking\"]) == 3\n+ assert \"alice\" in completed.payload[\"contributor_ranking\"]\n+ assert info[\"ranking_event_id\"]\n+\n+\n def test_any_council_failure_aborts_ranking(discovery_config, monkeypatch):\n monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n \n@@ -479,16 +538,16 @@ def test_any_council_failure_aborts_ranking(discovery_config, monkeypatch):\n asyncio.run(c.rank_commits(commits, epoch=0))\n \n \n-def test_contested_ranking_requires_openrouter_key(monkeypatch):\n+def test_multi_commit_ranking_requires_openrouter_key(monkeypatch):\n monkeypatch.setattr(c, \"OPENROUTER_API_KEY\", \"\")\n commits = [\n {\n- \"contributor\": contributor,\n+ \"contributor\": \"alice\",\n \"oid\": \"sha1:\" + char * 40,\n- \"message\": contributor,\n+ \"message\": char,\n \"patch\": \"patch\",\n }\n- for contributor, char in [(\"alice\", \"a\"), (\"bob\", \"b\")]\n+ for char in (\"a\", \"b\")\n ]\n with pytest.raises(RuntimeError, match=\"OPENROUTER_API_KEY\"):\n asyncio.run(c.rank_commits(commits))\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}