{"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<AuthCallbackQuery>, State(state): State<AppState>) -> impl IntoResponse {\n+pub async fn get_auth_callback(\n+    Query(q): Query<AuthCallbackQuery>,\n+    State(state): State<AppState>,\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<AuthCallbackQuery>, 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<String>,\n }\n \n-pub async fn get_choose_username(Query(q): Query<ChooseUsernameQuery>, State(state): State<AppState>) -> impl IntoResponse {\n+pub async fn get_choose_username(\n+    Query(q): Query<ChooseUsernameQuery>,\n+    State(state): State<AppState>,\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<AppState>,\n+    jar: CookieJar,\n     Form(form): Form<ChooseUsernameForm>,\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<AppState>, 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<String, String> {\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<ScopeRankChanges> {\n     fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap<String, Option<RankPosition>> {\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<usize>,\n     want_percent: bool,\n+    room_wire: &str,\n ) -> Result<RankResponse, RpcErr> {\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<String> = 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 <TAG> --delegate <uuid:rig:model>\".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 <TAG> --delegate <uuid:rig:model>\"),\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 <TAG> --delegate <uuid:rig:model>\".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<RankRow> = 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<VoteRow> = 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<String> = 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<PathSummary> = 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<AppState>,\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<ThreadViewQuery>,\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<ThreadViewQuery>,\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<String>,\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<String>,\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<AppState>) -> impl IntoResponse {\n+pub async fn garden_index(\n+    State(state): State<AppState>,\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<AppState>) -> 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<AppState>) -> impl IntoResponse {\n pub async fn ontology_path(\n     State(state): State<AppState>,\n     Path(path): Path<String>,\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<HeaderValue> {\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<String>,\n+}\n+\n+/// `POST /theme` — set theme cookie and redirect back (full navigation, no fetch).\n+pub async fn post_theme(Form(form): Form<ThemeForm>) -> 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<u64>) -> Markup {\n+pub(super) fn layout(title: &str, view: &str, body: Markup, views: Option<u64>, 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<u64>)\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<u64>)\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<SearchQuery>,\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 <query>\"))\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[40b975bf] nice\n\nSide B — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 266e876bb7ccbe788beb1d5bd53ad5b45ee5825b..2cea973082716e761ef6f5dd5886acc08ff9aac0 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -222,6 +222,12 @@ dependencies = [\n  \"syn\",\n ]\n \n+[[package]]\n+name = \"dotenvy\"\n+version = \"0.15.7\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b\"\n+\n [[package]]\n name = \"encoding_rs\"\n version = \"0.8.35\"\n@@ -1238,6 +1244,7 @@ version = \"0.0.1\"\n dependencies = [\n  \"axum\",\n  \"axum-extra\",\n+ \"dotenvy\",\n  \"maud\",\n  \"reqwest\",\n  \"serde\",\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex 4677fedcb45292eebebe7e9cf6ce2f5738f18ddf..bd600138b613bd0f546bdec217a5334cdcb20aa5 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -17,6 +17,7 @@ tower-http = { version = \"0.5\", features = [\"trace\"] }\n tracing = \"0.1\"\n tracing-subscriber = { version = \"0.3\", features = [\"env-filter\"] }\n reqwest = { version = \"0.12\", features = [\"json\"] }\n+dotenvy = \"0.15\"\n \n [dev-dependencies]\n reqwest = { version = \"0.12\", features = [\"json\"] }\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex d2024bd4582bcc8482b461b2ba4fedbd8bff7c66..b33a84e8bb5e817b26592868d88090e6d664d950 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -6,7 +6,7 @@ use axum::{\n use std::collections::HashMap;\n \n use crate::{\n-    html::{input_panel, js_string_literal, ranking_panel, JsBuilder},\n+    html::{entity_section, input_panel, js_string_literal, ranking_panel, JsBuilder},\n     parser::parse_reddit_url,\n     path_types::ItemId,\n     reddit::ensure_partial_tree,\n@@ -87,6 +87,20 @@ pub async fn post_ui_html(\n                     .into_response()\n             }\n         },\n+        HtmlUiAction::FetchEntity { item } => {\n+            let id = parse_item_param(&item);\n+            if id.is_root() {\n+                return ui_js_warn(\"nothing to fetch for the root\").into_response();\n+            }\n+            state.queue_entity_fetch(id.clone());\n+            let tree = state.tree.read().await;\n+            let empty = crate::reducer::NodeState::default();\n+            let node = tree.get(&id).unwrap_or(&empty);\n+            let panel = entity_section(&id, node, true);\n+            JsBuilder::new()\n+                .morph_selector(\"#entity-section\", panel)\n+                .into_response()\n+        },\n     }\n }\n \ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex ed5be6b13b9d46e838831d6ce0f96f569b401730..07ce24b5e56cf72b0b442c3c3241efbf6c3b006a 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -1,4 +1,5 @@\n use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n \n #[derive(Debug, Clone, Serialize, Deserialize)]\n #[serde(tag = \"type\", rename_all = \"snake_case\")]\n@@ -18,4 +19,10 @@ pub enum Event {\n     },\n     /// Register a node path in the fractal tree (no external fetch).\n     NodeEnsured { id: String },\n+    /// Full upstream API payload for a node (domain-specific view derived at replay/render time).\n+    EntityImported {\n+        id: String,\n+        ts: i64,\n+        payload: Value,\n+    },\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex df6505021d9f446c2b453e20e3eb3cf696a111f9..caf1309c8d93b47104499c57f9cc35ee7631fbb9 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -10,6 +10,7 @@ use crate::{\n     form_template::template_json_compact,\n     path_types::ItemId,\n     ranking::{top_bottom, RankedItem},\n+    reddit::is_fetchable,\n     reducer::{GroupState, NodeState},\n     state::AppState,\n     ui_action::UI_RPC_FIELD,\n@@ -151,7 +152,7 @@ pub fn breadcrumb_path(item: &ItemId) -> Markup {\n fn entity_panel(node: &NodeState) -> Markup {\n     html! {\n         @if let Some(data) = &node.data {\n-            section id=\"entity-panel\" class=\"demo-panel entity-card\" {\n+            div id=\"entity-panel\" class=\"entity-card\" {\n                 h2 { (data.title) }\n                 @if let Some(author) = &data.author {\n                     p class=\"muted small\" { \"by \" (author) }\n@@ -164,6 +165,42 @@ fn entity_panel(node: &NodeState) -> Markup {\n     }\n }\n \n+/// Reddit/API import control — only shown on fetchable pages; never auto-fires.\n+pub fn fetch_entity_panel(item: &ItemId, has_data: bool, fetching: bool) -> Markup {\n+    if !is_fetchable(item) {\n+        return html! {};\n+    }\n+    let label = if fetching {\n+        \"Fetching…\"\n+    } else if has_data {\n+        \"Fetch more\"\n+    } else {\n+        \"Fetch from Reddit\"\n+    };\n+    let rpc = template_json_compact(&serde_json::json!({\n+        \"action\": \"fetch_entity\",\n+        \"item\": item.as_str(),\n+    }))\n+    .expect(\"fetch_entity rpc template\");\n+    html! {\n+        form method=\"post\" action=\"/ui\" id=\"fetch-entity-form\" class=\"fetch-entity-form\" {\n+            input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc);\n+            button type=\"submit\" class=\"btn-secondary\" disabled=(fetching) { (label) }\n+        }\n+    }\n+}\n+\n+/// Entity card + explicit fetch control (morphed as `#entity-section`).\n+pub fn entity_section(item: &ItemId, node: &NodeState, fetching: bool) -> Markup {\n+    let has_data = node.data.is_some();\n+    html! {\n+        section id=\"entity-section\" class=\"demo-panel\" {\n+            (entity_panel(node))\n+            (fetch_entity_panel(item, has_data, fetching))\n+        }\n+    }\n+}\n+\n fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {\n     html! {\n         @if !items.is_empty() {\n@@ -260,7 +297,7 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n         h1 { \"sorter\" }\n         (input_panel(\"\", None))\n         (breadcrumb_path(&item))\n-        (entity_panel(node))\n+        (entity_section(&item, node, false))\n         (ranking_panel(&item, group))\n     };\n     layout(\"sorter2\", body, views)\n@@ -272,16 +309,5 @@ pub async fn home(State(state): State<AppState>, uri: Uri) -> impl IntoResponse\n \n pub async fn browse(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {\n     let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n-    if item.as_str().starts_with(\"reddit.com\") {\n-        let needs_fetch = {\n-            let tree = state.tree.read().await;\n-            tree.get(&item)\n-                .map(|n| n.data.is_none())\n-                .unwrap_or(true)\n-        };\n-        if needs_fetch {\n-            state.reddit.request_fetch(item.clone());\n-        }\n-    }\n     item_page(state, uri, item).await\n }\ndiff --git a/server/src/main.rs b/server/src/main.rs\nindex c22ec6c9f5358e5ec99fb83210dc351938505a93..1f0cddc39302b35b0cd6a6219f44c9d59202facf 100644\n--- a/server/src/main.rs\n+++ b/server/src/main.rs\n@@ -2,6 +2,10 @@ use sorter2_server::state::AppConfig;\n \n #[tokio::main]\n async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n+    if std::env::var(\"SORTER2_SKIP_DOTENV\").is_err() {\n+        let _ = dotenvy::dotenv();\n+    }\n+\n     tracing_subscriber::fmt()\n         .with_env_filter(\n             tracing_subscriber::EnvFilter::try_from_default_env()\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex 90053ad03b1d7c8e94f325dd4ee64c2b4f7da900..ff0f01e57b18af878eb5be3efc47204a7673589d 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -6,11 +6,15 @@ use std::time::{Duration, Instant};\n \n use reqwest::{header, Client, StatusCode};\n use serde::Deserialize;\n+use serde_json::Value;\n use tokio::sync::{mpsc, RwLock};\n \n use crate::{\n+    event_log::EventLog,\n+    events::Event,\n+    html::now_ms,\n     path_types::ItemId,\n-    reducer::{EntityData, GlobalTree},\n+    reducer::GlobalTree,\n };\n \n /// Bootstrap blank nodes along a URL path so breadcrumbs and voting work before fetch.\n@@ -20,6 +24,8 @@ pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) {\n \n pub struct RedditCommand {\n     pub id: ItemId,\n+    /// User-initiated fetch bypasses the in-memory \"recently fetched\" cache.\n+    pub force: bool,\n }\n \n #[derive(Clone)]\n@@ -33,19 +39,31 @@ struct RedditCredentials {\n     client_secret: String,\n }\n \n+#[derive(Clone)]\n+pub struct RedditApiConfig {\n+    pub api_base: String,\n+    pub oauth_base: String,\n+    pub user_agent: String,\n+    creds: Option<RedditCredentials>,\n+}\n+\n struct OAuthToken {\n     access_token: String,\n     expires_at: Instant,\n }\n \n impl RedditBroker {\n-    pub fn spawn(tree: Arc<RwLock<GlobalTree>>, user_agent: &str) -> Self {\n+    pub fn spawn(\n+        tree: Arc<RwLock<GlobalTree>>,\n+        event_log: Arc<EventLog>,\n+        config: RedditApiConfig,\n+    ) -> Self {\n         let (tx, rx) = mpsc::channel(100);\n \n         let mut headers = header::HeaderMap::new();\n         headers.insert(\n             header::USER_AGENT,\n-            header::HeaderValue::from_str(user_agent).expect(\"valid user agent\"),\n+            header::HeaderValue::from_str(&config.user_agent).expect(\"valid user agent\"),\n         );\n \n         let client = Client::builder()\n@@ -54,22 +72,38 @@ impl RedditBroker {\n             .build()\n             .expect(\"reqwest client\");\n \n-        let creds = RedditCredentials::from_env();\n-        tokio::spawn(reddit_worker(rx, tree, client, creds));\n+        tokio::spawn(reddit_worker(rx, tree, event_log, client, config));\n \n         Self { tx }\n     }\n \n-    /// Fire-and-forget: queue a fetch; worker updates the tree when done.\n-    pub fn request_fetch(&self, id: ItemId) {\n-        let _ = self.tx.try_send(RedditCommand { id });\n+    /// Queue a fetch; drops when the channel is full (backpressure).\n+    pub fn request_fetch(&self, id: ItemId, force: bool) {\n+        let _ = self.tx.try_send(RedditCommand { id, force });\n+    }\n+}\n+\n+impl RedditApiConfig {\n+    pub fn from_env() -> Self {\n+        Self {\n+            api_base: reddit_api_base(),\n+            oauth_base: reddit_oauth_base(),\n+            user_agent: default_user_agent(),\n+            creds: RedditCredentials::from_env(),\n+        }\n     }\n }\n \n impl RedditCredentials {\n+    /// Reddit's OAuth docs call these \"client id\" and \"client secret\"; the app\n+    /// registration UI often labels them \"app id\" / \"app secret\" — same values.\n     fn from_env() -> Option<Self> {\n-        let client_id = std::env::var(\"REDDIT_CLIENT_ID\").ok()?;\n-        let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\").ok()?;\n+        let client_id = std::env::var(\"REDDIT_CLIENT_ID\")\n+            .or_else(|_| std::env::var(\"REDDIT_APP_ID\"))\n+            .ok()?;\n+        let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\")\n+            .or_else(|_| std::env::var(\"REDDIT_APP_SECRET\"))\n+            .ok()?;\n         if client_id.is_empty() || client_secret.is_empty() {\n             return None;\n         }\n@@ -80,29 +114,63 @@ impl RedditCredentials {\n     }\n }\n \n+pub fn reddit_api_base() -> String {\n+    std::env::var(\"REDDIT_API_BASE\").unwrap_or_else(|_| \"https://www.reddit.com\".into())\n+}\n+\n+pub fn reddit_oauth_base() -> String {\n+    std::env::var(\"REDDIT_OAUTH_BASE\").unwrap_or_else(|_| \"https://www.reddit.com\".into())\n+}\n+\n pub fn default_user_agent() -> String {\n     std::env::var(\"REDDIT_USER_AGENT\").unwrap_or_else(|_| {\n         \"web:sorter2.social:v0.0.1 (by /u/sorter2)\".to_string()\n     })\n }\n \n+/// True when this node can be loaded from the Reddit JSON API.\n+pub fn is_fetchable(id: &ItemId) -> bool {\n+    !map_item_to_reddit_api(id, \"https://example.com\").is_empty()\n+}\n+\n+/// Derive UI-facing fields from a stored payload (Reddit-specific when under reddit.com).\n+pub fn entity_view_from_payload(id: &ItemId, payload: &Value) -> Option<crate::reducer::EntityData> {\n+    if id.as_str().starts_with(\"reddit.com\") {\n+        return parse_reddit_view(id, payload);\n+    }\n+    None\n+}\n+\n+/// Apply a full API payload to the in-memory tree (view derived for known domains).\n+pub fn apply_entity_import(tree: &mut GlobalTree, id: &ItemId, payload: Value) {\n+    let view = entity_view_from_payload(id, &payload);\n+    tree.apply_entity_raw(id, payload, view);\n+}\n+\n async fn reddit_worker(\n     mut rx: mpsc::Receiver<RedditCommand>,\n     tree: Arc<RwLock<GlobalTree>>,\n+    event_log: Arc<EventLog>,\n     client: Client,\n-    creds: Option<RedditCredentials>,\n+    config: RedditApiConfig,\n ) {\n     let mut in_flight = HashSet::new();\n     let mut recently_fetched: HashMap<ItemId, Instant> = HashMap::new();\n     let mut current_delay = Duration::from_secs(1);\n     let mut oauth: Option<OAuthToken> = None;\n     let cache_ttl = Duration::from_secs(300);\n+    let creds = config.creds.clone();\n+    let api_base = config.api_base.clone();\n+    let oauth_base = config.oauth_base.clone();\n \n     while let Some(cmd) = rx.recv().await {\n         let now = Instant::now();\n         recently_fetched.retain(|_, t| now.duration_since(*t) < cache_ttl);\n \n-        if in_flight.contains(&cmd.id) || recently_fetched.contains_key(&cmd.id) {\n+        if in_flight.contains(&cmd.id) {\n+            continue;\n+        }\n+        if !cmd.force && recently_fetched.contains_key(&cmd.id) {\n             continue;\n         }\n \n@@ -112,18 +180,26 @@ async fn reddit_worker(\n         tokio::time::sleep(current_delay).await;\n \n         if let Some(c) = &creds {\n-            oauth = ensure_oauth_token(&client, c, oauth.take()).await;\n+            oauth = ensure_oauth_token(&client, &oauth_base, c, oauth.take()).await;\n         }\n \n         let token = oauth.as_ref().map(|t| t.access_token.as_str());\n-        let use_oauth = token.is_some();\n \n-        match do_fetch(&client, &fetch_id, use_oauth, token).await {\n-            Ok(FetchOutcome::Entity(data)) => {\n-                let mut w = tree.write().await;\n-                w.set_entity_data(&fetch_id, data);\n-                recently_fetched.insert(fetch_id.clone(), Instant::now());\n-                current_delay = Duration::from_millis(600);\n+        match do_fetch(&client, &api_base, &fetch_id, token).await {\n+            Ok(FetchOutcome::Payload(payload)) => {\n+                let ts = now_ms();\n+                let event = Event::EntityImported {\n+                    id: fetch_id.as_str().to_string(),\n+                    ts,\n+                    payload: payload.clone(),\n+                };\n+                if let Err(e) = event_log.append(&event).await {\n+                    tracing::warn!(\"event log append failed for {}: {}\", fetch_id, e);\n+                } else {\n+                    apply_entity_import(&mut *tree.write().await, &fetch_id, payload);\n+                    recently_fetched.insert(fetch_id.clone(), Instant::now());\n+                    current_delay = Duration::from_millis(600);\n+                }\n             }\n             Ok(FetchOutcome::NotFound) => {\n                 recently_fetched.insert(fetch_id.clone(), Instant::now());\n@@ -149,13 +225,14 @@ async fn reddit_worker(\n }\n \n enum FetchOutcome {\n-    Entity(EntityData),\n+    Payload(Value),\n     NotFound,\n     RateLimited { reset_secs: u64 },\n }\n \n async fn ensure_oauth_token(\n     client: &Client,\n+    oauth_base: &str,\n     creds: &RedditCredentials,\n     existing: Option<OAuthToken>,\n ) -> Option<OAuthToken> {\n@@ -165,8 +242,13 @@ async fn ensure_oauth_token(\n         }\n     }\n \n+    let url = format!(\n+        \"{}/api/v1/access_token\",\n+        oauth_base.trim_end_matches('/')\n+    );\n+\n     let resp = client\n-        .post(\"https://www.reddit.com/api/v1/access_token\")\n+        .post(&url)\n         .basic_auth(&creds.client_id, Some(&creds.client_secret))\n         .form(&[(\"grant_type\", \"client_credentials\")])\n         .send()\n@@ -207,11 +289,11 @@ async fn ensure_oauth_token(\n \n async fn do_fetch(\n     client: &Client,\n+    api_base: &str,\n     id: &ItemId,\n-    use_oauth: bool,\n     bearer: Option<&str>,\n ) -> Result<FetchOutcome, String> {\n-    let url = map_item_to_reddit_api(id, use_oauth);\n+    let url = map_item_to_reddit_api(id, api_base);\n     if url.is_empty() {\n         return Ok(FetchOutcome::NotFound);\n     }\n@@ -241,10 +323,8 @@ async fn do_fetch(\n         return Ok(FetchOutcome::RateLimited { reset_secs: reset });\n     }\n \n-    let bytes = resp.bytes().await.map_err(|e| e.to_string())?;\n-    Ok(parse_reddit_json(id, &bytes)\n-        .map(FetchOutcome::Entity)\n-        .unwrap_or(FetchOutcome::NotFound))\n+    let payload: Value = resp.json().await.map_err(|e| e.to_string())?;\n+    Ok(FetchOutcome::Payload(payload))\n }\n \n fn rate_limit_remaining(resp: &reqwest::Response) -> Option<u64> {\n@@ -264,18 +344,14 @@ fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 {\n         .unwrap_or(5)\n }\n \n-/// Map canonical item id to Reddit JSON API URL.\n-pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n+/// Map canonical item id to a Reddit JSON API URL under `api_base`.\n+pub fn map_item_to_reddit_api(id: &ItemId, api_base: &str) -> String {\n     let path = id.as_str();\n     if !path.starts_with(\"reddit.com/\") && path != \"reddit.com\" {\n         return String::new();\n     }\n \n-    let base = if oauth {\n-        \"https://oauth.reddit.com\"\n-    } else {\n-        \"https://www.reddit.com\"\n-    };\n+    let base = api_base.trim_end_matches('/');\n \n     let segments: Vec<&str> = path.split('/').collect();\n \n@@ -293,18 +369,17 @@ pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n     String::new()\n }\n \n-fn parse_reddit_json(id: &ItemId, bytes: &[u8]) -> Option<EntityData> {\n-    let v: serde_json::Value = serde_json::from_slice(bytes).ok()?;\n+fn parse_reddit_view(id: &ItemId, v: &Value) -> Option<crate::reducer::EntityData> {\n     let segments: Vec<&str> = id.as_str().split('/').collect();\n \n     if segments.iter().any(|&p| p == \"comments\") {\n-        parse_post_listing(&v)\n+        parse_post_listing(v)\n     } else {\n-        parse_subreddit_about(&v)\n+        parse_subreddit_about(v)\n     }\n }\n \n-fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n+fn parse_subreddit_about(v: &Value) -> Option<crate::reducer::EntityData> {\n     let data = v.get(\"data\")?;\n     let title = data\n         .get(\"title\")\n@@ -323,7 +398,7 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n         .filter(|s| !s.is_empty())\n         .map(|s| s.to_string());\n \n-    Some(EntityData {\n+    Some(crate::reducer::EntityData {\n         title,\n         author: None,\n         body_html,\n@@ -331,10 +406,9 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n     })\n }\n \n-fn parse_post_listing(v: &serde_json::Value) -> Option<EntityData> {\n+fn parse_post_listing(v: &Value) -> Option<crate::reducer::EntityData> {\n     let listing = v.as_array()?.first()?;\n-    let child = listing\n-        .pointer(\"/data/children/0/data\")?;\n+    let child = listing.pointer(\"/data/children/0/data\")?;\n     let title = child.get(\"title\")?.as_str()?.to_string();\n     let author = child\n         .get(\"author\")\n@@ -352,7 +426,7 @@ fn parse_post_listing(v: &serde_json::Value) -> Option<EntityData> {\n         .filter(|s| s.starts_with(\"http\"))\n         .map(|s| s.to_string());\n \n-    Some(EntityData {\n+    Some(crate::reducer::EntityData {\n         title,\n         author,\n         body_html,\n@@ -368,48 +442,51 @@ mod tests {\n     fn map_subreddit_about_url() {\n         let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n         assert_eq!(\n-            map_item_to_reddit_api(&id, false),\n+            map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n             \"https://www.reddit.com/r/rust/about.json?raw_json=1\"\n         );\n         assert_eq!(\n-            map_item_to_reddit_api(&id, true),\n-            \"https://oauth.reddit.com/r/rust/about.json?raw_json=1\"\n+            map_item_to_reddit_api(&id, \"http://127.0.0.1:9999\"),\n+            \"http://127.0.0.1:9999/r/rust/about.json?raw_json=1\"\n         );\n     }\n \n     #[test]\n     fn map_post_url() {\n-        let id =\n-            ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n+        let id = ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n         assert_eq!(\n-            map_item_to_reddit_api(&id, false),\n+            map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n             \"https://www.reddit.com/r/amitheasshole/comments/1trnvdl.json?raw_json=1\"\n         );\n     }\n \n     #[test]\n-    fn map_non_reddit_empty() {\n-        let id = ItemId::opaque(\"example.com/foo\");\n-        assert!(map_item_to_reddit_api(&id, false).is_empty());\n+    fn is_fetchable_reddit_sub() {\n+        let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+        assert!(is_fetchable(&id));\n+        assert!(!is_fetchable(&ItemId::opaque(\"example.com/x\")));\n     }\n \n     #[test]\n     fn parse_subreddit_fixture() {\n-        let json = r#\"{\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\",\"public_description\":\"systems\"}}\"#;\n-        let entity = parse_reddit_json(\n+        let json = include_str!(\"../../test/fixtures/reddit/r_rust_about.json\");\n+        let v: Value = serde_json::from_str(json).unwrap();\n+        let entity = entity_view_from_payload(\n             &ItemId::parse(\"reddit.com/r/rust\").unwrap(),\n-            json.as_bytes(),\n+            &v,\n         )\n         .unwrap();\n-        assert_eq!(entity.title, \"Rust\");\n+        assert_eq!(entity.title, \"The Rust Programming Language\");\n+        assert!(entity.body_html.as_ref().is_some_and(|b| b.contains(\"Rust\")));\n     }\n \n     #[test]\n     fn parse_post_fixture() {\n         let json = r#\"[{\"kind\":\"Listing\",\"data\":{\"children\":[{\"kind\":\"t3\",\"data\":{\"title\":\"AITA\",\"author\":\"op\",\"selftext_html\":\"&lt;p&gt;hi&lt;/p&gt;\",\"thumbnail\":\"https://b.thumbs.redditmedia.com/x.jpg\"}}]}}]\"#;\n-        let entity = parse_reddit_json(\n+        let v: Value = serde_json::from_str(json).unwrap();\n+        let entity = entity_view_from_payload(\n             &ItemId::parse(\"reddit.com/r/x/comments/abc\").unwrap(),\n-            json.as_bytes(),\n+            &v,\n         )\n         .unwrap();\n         assert_eq!(entity.title, \"AITA\");\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 077f700bf00ddefe18ffd004bb5288bdc7c4adaf..60db81a562e3590775012573225a76ba82a14563 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -1,6 +1,7 @@\n use std::collections::{HashMap, HashSet, VecDeque};\n \n use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n \n use crate::path_types::ItemId;\n \n@@ -128,6 +129,9 @@ pub struct EntityData {\n #[derive(Debug, Clone, Default)]\n pub struct NodeState {\n     pub id: ItemId,\n+    /// Full imported API JSON (persisted in the event log).\n+    pub entity_raw: Option<Value>,\n+    /// Domain-specific view derived from `entity_raw` (e.g. Reddit title/author).\n     pub data: Option<EntityData>,\n     pub children: HashSet<ItemId>,\n     pub local_ranking: GroupState,\n@@ -197,10 +201,11 @@ impl GlobalTree {\n         }\n     }\n \n-    pub fn set_entity_data(&mut self, id: &ItemId, data: EntityData) {\n+    pub fn apply_entity_raw(&mut self, id: &ItemId, payload: Value, view: Option<EntityData>) {\n         self.ensure_path(id);\n         if let Some(node) = self.nodes.get_mut(id) {\n-            node.data = Some(data);\n+            node.entity_raw = Some(payload);\n+            node.data = view;\n         }\n     }\n }\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 8c03aa60c15aee803a534439400b69935b1a3d84..d71d1079a8f486cdab15795384aef0b81b32544d 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -7,7 +7,7 @@ use crate::{\n     events::Event,\n     journal::JournalClient,\n     path_types::ItemId,\n-    reddit::{default_user_agent, RedditBroker},\n+    reddit::{apply_entity_import, RedditApiConfig, RedditBroker},\n     reducer::{GlobalTree, VoteData},\n     views::ViewStore,\n };\n@@ -108,13 +108,18 @@ impl AppState {\n                             tree.ensure_path(&parsed);\n                         }\n                     }\n+                    Event::EntityImported { id, payload, .. } => {\n+                        if let Some(parsed) = ItemId::parse(&id).or_else(|| ItemId::from_url(&id)) {\n+                            apply_entity_import(&mut tree, &parsed, payload);\n+                        }\n+                    }\n                 }\n             }\n         }\n \n         let tree = Arc::new(RwLock::new(tree));\n         let journal = JournalClient::spawn(tree.clone(), event_log.clone());\n-        let reddit = RedditBroker::spawn(tree.clone(), &default_user_agent());\n+        let reddit = RedditBroker::spawn(tree.clone(), event_log.clone(), RedditApiConfig::from_env());\n \n         Self {\n             cfg: Arc::new(cfg),\n@@ -135,10 +140,14 @@ impl AppState {\n             let mut w = self.tree.write().await;\n             w.ensure_path(id);\n         }\n-        self.reddit.request_fetch(id.clone());\n         Ok(())\n     }\n \n+    /// User-initiated Reddit/API import (via \"Fetch more\" — never on paste or navigate).\n+    pub fn queue_entity_fetch(&self, id: ItemId) {\n+        self.reddit.request_fetch(id, true);\n+    }\n+\n     pub async fn record_vote(\n         &self,\n         parent: &ItemId,\n@@ -169,6 +178,44 @@ impl AppState {\n #[cfg(test)]\n mod tests {\n     use super::{normalize_scope, parse_item_param};\n+    use crate::{\n+        event_log::EventLog,\n+        events::Event,\n+        path_types::ItemId,\n+        reddit::apply_entity_import,\n+        reducer::GlobalTree,\n+    };\n+    use serde_json::json;\n+\n+    #[tokio::test]\n+    async fn replay_entity_imported_restores_view() {\n+        let tmp = tempfile::tempdir().unwrap();\n+        let log_path = tmp.path().join(\"events.jsonl\");\n+        let log = EventLog::new(log_path.to_string_lossy().into_owned());\n+        let payload = json!({\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\"}});\n+        log.append(&Event::EntityImported {\n+            id: \"reddit.com/r/rust\".into(),\n+            ts: 1,\n+            payload: payload.clone(),\n+        })\n+        .await\n+        .unwrap();\n+\n+        let mut tree = GlobalTree::new();\n+        let (events, _) = log.load_all().await.unwrap();\n+        for ev in events {\n+            if let Event::EntityImported { id, payload, .. } = ev {\n+                let parsed = ItemId::parse(&id).unwrap();\n+                apply_entity_import(&mut tree, &parsed, payload);\n+            }\n+        }\n+        let node = tree.get(&ItemId::parse(\"reddit.com/r/rust\").unwrap()).unwrap();\n+        assert_eq!(node.data.as_ref().unwrap().title, \"Rust\");\n+        assert_eq!(\n+            node.entity_raw.as_ref().unwrap()[\"data\"][\"display_name\"],\n+            \"rust\"\n+        );\n+    }\n \n     #[test]\n     fn normalize_scope_strips_prefix_and_lowercases() {\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex d798874d1d94c0dfee59ec1ff703f9ee6ef432c0..3d6a49a2a3fb950752827efe1f5a049308f09baf 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -26,6 +26,10 @@ pub enum HtmlUiAction {\n     ParseQuery {\n         query: String,\n     },\n+    /// Fetch upstream entity data for the current page (explicit user action only).\n+    FetchEntity {\n+        item: String,\n+    },\n }\n \n #[derive(Debug, Error)]\ndiff --git a/server/static/sorter.css b/server/static/sorter.css\nindex 36f68d415cea33c8562d5d02c0c9d4c5b225a782..1f9f5158414902d43a380dd899232c70d8cf5d63 100644\n--- a/server/static/sorter.css\n+++ b/server/static/sorter.css\n@@ -52,6 +52,25 @@ body {\n   filter: brightness(1.1);\n }\n \n+.btn-secondary {\n+  background: transparent;\n+  color: var(--accent);\n+  border: 1px solid var(--border);\n+  padding: 0.4rem 0.85rem;\n+  font-size: 0.9rem;\n+  cursor: pointer;\n+  margin-top: 0.75rem;\n+}\n+\n+.btn-secondary:disabled {\n+  opacity: 0.6;\n+  cursor: wait;\n+}\n+\n+.fetch-entity-form {\n+  margin-top: 0.5rem;\n+}\n+\n code {\n   font-size: 0.85em;\n   background: var(--bg);\ndiff --git a/test/fixtures/reddit/r_rust_about.json b/test/fixtures/reddit/r_rust_about.json\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..bb7fd74ab00d63356d9b672a775996ed155b984d\n--- /dev/null\n+++ b/test/fixtures/reddit/r_rust_about.json\n@@ -0,0 +1,21 @@\n+{\n+  \"kind\": \"t5\",\n+  \"data\": {\n+    \"user_flair_background_color\": null,\n+    \"submit_text_html\": null,\n+    \"banner_img\": \"\",\n+    \"user_is_banned\": null,\n+    \"wiki_enabled\": true,\n+    \"show_media\": true,\n+    \"id\": \"2qh0i\",\n+    \"display_name\": \"rust\",\n+    \"title\": \"The Rust Programming Language\",\n+    \"public_description\": \"A place for all things related to the Rust programming language.\",\n+    \"public_description_html\": \"&lt;!-- SC_OFF --&gt;&lt;div class=\\\"md\\\"&gt;&lt;p&gt;A place for all things related to the Rust programming language.&lt;/p&gt;\\n&lt;/div&gt;&lt;!-- SC_ON --&gt;\",\n+    \"icon_img\": \"https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png\",\n+    \"community_icon\": \"https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png\",\n+    \"subscribers\": 350000,\n+    \"active_user_count\": 1200,\n+    \"over18\": false\n+  }\n+}\ndiff --git a/test/reddit_import.clj b/test/reddit_import.clj\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..54edaedeef08718c8f184d6aa468d8e6415068c7\n--- /dev/null\n+++ b/test/reddit_import.clj\n@@ -0,0 +1,116 @@\n+(ns test.reddit-import\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+\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- start-mock-reddit [port fixtures-dir]\n+  (let [fixture (io/file fixtures-dir \"r_rust_about.json\")\n+        body (.getBytes (slurp fixture) \"UTF-8\")\n+        server (HttpServer/create (InetSocketAddress. \"127.0.0.1\" port) 0)\n+        handler\n+        (proxy [HttpHandler] []\n+          (handle [^HttpExchange exchange]\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+    (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-post-ui [base rpc-json]\n+  (process/shell {:out :string :err :string}\n+                 \"curl\" \"-sf\" \"-X\" \"POST\" (str base \"/ui\")\n+                 \"--data-urlencode\" (str \"__rpc__=\" rpc-json)))\n+\n+(defn- wait-event-log [path ms]\n+  (let [deadline (+ (System/currentTimeMillis) ms)]\n+    (loop []\n+      (if (.exists (io/file path))\n+        true\n+        (if (< (System/currentTimeMillis) deadline)\n+          (do (Thread/sleep 200) (recur))\n+          false)))))\n+\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+          data-dir (.getAbsolutePath\n+                    (doto (io/file (System/getProperty \"java.io.tmpdir\")\n+                                   (str \"sorter2-reddit-\" (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 (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 [browse-url (str app-base \"/~/https://reddit.com/r/rust\")\n+                  before (:out (process/shell {:out :string :err :string}\n+                                              \"curl\" \"-sf\" browse-url))]\n+              (is (str/includes? before \"Fetch from Reddit\"))\n+              (is (not (str/includes? before \"The Rust Programming Language\")))\n+              (let [rpc \"{\\\"action\\\":\\\"fetch_entity\\\",\\\"item\\\":\\\"reddit.com/r/rust\\\"}\"\n+                    post (curl-post-ui app-base rpc)\n+                    log-path (str data-dir \"/events.jsonl\")]\n+                (is (zero? (:exit post)) \"fetch_entity POST succeeds\")\n+                (is (wait-event-log log-path 10000) \"event log written\")\n+                (let [after (:out (process/shell {:out :string :err :string}\n+                                                 \"curl\" \"-sf\" browse-url))\n+                      log (slurp (io/file log-path))]\n+                  (is (str/includes? after \"The Rust Programming Language\"))\n+                  (is (str/includes? log \"\\\"type\\\":\\\"entity_imported\\\"\"))\n+                  (is (str/includes? log \"\\\"subscribers\\\":350000\"))\n+                  (is (str/includes? log \"\\\"display_name\\\":\\\"rust\\\"\")))))\n+            (finally\n+              (process/destroy proc))))\n+        (finally\n+          (stop-mock))))))\n","role":"user"}],"model":"~x-ai/grok-latest"}