{"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[6d04afc2] refactor\n\nSide A — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 2cea973082716e761ef6f5dd5886acc08ff9aac0..8c43fb75c472b102e6e1d3b837dce3355be898f2 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -17,6 +17,28 @@ version = \"1.0.102\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c\"\n \n+[[package]]\n+name = \"async-stream\"\n+version = \"0.3.6\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476\"\n+dependencies = [\n+ \"async-stream-impl\",\n+ \"futures-core\",\n+ \"pin-project-lite\",\n+]\n+\n+[[package]]\n+name = \"async-stream-impl\"\n+version = \"0.3.6\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d\"\n+dependencies = [\n+ \"proc-macro2\",\n+ \"quote\",\n+ \"syn\",\n+]\n+\n [[package]]\n name = \"async-trait\"\n version = \"0.1.89\"\n@@ -1242,9 +1264,11 @@ dependencies = [\n name = \"sorter2-server\"\n version = \"0.0.1\"\n dependencies = [\n+ \"async-stream\",\n \"axum\",\n \"axum-extra\",\n \"dotenvy\",\n+ \"futures-util\",\n \"maud\",\n \"reqwest\",\n \"serde\",\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex bd600138b613bd0f546bdec217a5334cdcb20aa5..c940acb687fb141d21760a3d6656172013cf6f41 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -18,6 +18,8 @@ tracing = \"0.1\"\n tracing-subscriber = { version = \"0.3\", features = [\"env-filter\"] }\n reqwest = { version = \"0.12\", features = [\"json\"] }\n dotenvy = \"0.15\"\n+async-stream = \"0.3\"\n+futures-util = { version = \"0.3\", default-features = false, features = [\"std\"] }\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 b33a84e8bb5e817b26592868d88090e6d664d950..7af6527d03c483f33f3469ce6766c01a554c5fe3 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -6,7 +6,8 @@ use axum::{\n use std::collections::HashMap;\n \n use crate::{\n- html::{entity_section, input_panel, js_string_literal, ranking_panel, JsBuilder},\n+ fetch,\n+ html::{input_panel, js_string_literal, ranking_panel, JsBuilder},\n parser::parse_reddit_url,\n path_types::ItemId,\n reddit::ensure_partial_tree,\n@@ -89,18 +90,8 @@ pub async fn post_ui_html(\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+ fetch::fetch_entity_stream(state, id).into_response()\n+ }\n }\n }\n \ndiff --git a/server/src/fetch/html.rs b/server/src/fetch/html.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..63634508496e224c38b9ec0308b7a6086462f925\n--- /dev/null\n+++ b/server/src/fetch/html.rs\n@@ -0,0 +1,67 @@\n+//! Markup for entity import / “Fetch from Reddit” (`POST /ui`, SSE response).\n+\n+use maud::{html, Markup};\n+\n+use crate::{\n+ form_template::template_json_compact,\n+ path_types::ItemId,\n+ reddit::is_fetchable,\n+ reducer::NodeState,\n+ ui_action::UI_RPC_FIELD,\n+};\n+\n+fn entity_panel(node: &NodeState) -> Markup {\n+ html! {\n+ @if let Some(data) = &node.data {\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+ }\n+ @if let Some(body) = &data.body_html {\n+ div class=\"entity-body\" { (maud::PreEscaped(body)) }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+/// Reddit/API import — `POST /ui` with `fetch_entity` returns an SSE stream.\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+ @if fetching {\n+ button type=\"submit\" class=\"btn-secondary\" disabled { (label) }\n+ } @else {\n+ button type=\"submit\" class=\"btn-secondary\" { (label) }\n+ }\n+ }\n+ }\n+}\n+\n+/// Entity card + fetch control (target `#entity-section` for Idiomorph / SSE).\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+}\ndiff --git a/server/src/fetch/mod.rs b/server/src/fetch/mod.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..2290f9d3a0f1cbf1806c6339f82a4515c11cc3d3\n--- /dev/null\n+++ b/server/src/fetch/mod.rs\n@@ -0,0 +1,115 @@\n+//! Entity import over `POST /ui` as SSE (Reddit worker in [`crate::reddit`]).\n+\n+pub mod html;\n+\n+use std::convert::Infallible;\n+use std::time::Duration;\n+\n+use async_stream::stream;\n+use axum::response::sse::{Event, KeepAlive, Sse};\n+use futures_util::Stream;\n+use serde::Serialize;\n+use tokio::sync::oneshot;\n+\n+use crate::{\n+ path_types::ItemId,\n+ reddit::FetchJobResult,\n+ reducer::NodeState,\n+ state::AppState,\n+};\n+\n+pub fn now_ms() -> i64 {\n+ let t = std::time::SystemTime::now()\n+ .duration_since(std::time::UNIX_EPOCH)\n+ .unwrap_or_default();\n+ t.as_millis() as i64\n+}\n+\n+#[derive(Serialize)]\n+struct SseMorphPayload {\n+ selector: &'static str,\n+ html: String,\n+}\n+\n+fn morph_complete_event(html: maud::Markup) -> Event {\n+ let payload = SseMorphPayload {\n+ selector: \"#entity-section\",\n+ html: html.into_string(),\n+ };\n+ let data = serde_json::to_string(&payload).unwrap_or_else(|_| \"{}\".into());\n+ Event::default().event(\"complete\").data(data)\n+}\n+\n+/// Stream `fetching` → `complete` / `error` for [`crate::ui_action::HtmlUiAction::FetchEntity`].\n+pub fn fetch_entity_stream(\n+ state: AppState,\n+ id: ItemId,\n+) -> Sse>> {\n+ tracing::debug!(item = %id, \"fetch entity stream opened\");\n+\n+ let stream = stream! {\n+ if id.is_root() {\n+ yield Ok(Event::default().event(\"error\").data(\"{\\\"message\\\":\\\"nothing to fetch for the root\\\"}\"));\n+ return;\n+ }\n+\n+ if !crate::reddit::is_fetchable(&id) {\n+ tracing::debug!(item = %id, \"fetch stream: not fetchable\");\n+ yield Ok(Event::default().event(\"error\").data(\"{\\\"message\\\":\\\"this page cannot be fetched from Reddit\\\"}\"));\n+ return;\n+ }\n+\n+ let fetching_html = {\n+ let tree = state.tree.read().await;\n+ let empty = NodeState::default();\n+ let node = tree.get(&id).unwrap_or(&empty);\n+ html::entity_section(&id, node, true).into_string()\n+ };\n+ let fetching_payload = serde_json::json!({\n+ \"selector\": \"#entity-section\",\n+ \"html\": fetching_html,\n+ });\n+ yield Ok(Event::default().event(\"fetching\").data(fetching_payload.to_string()));\n+\n+ let (tx, rx) = oneshot::channel();\n+ state.reddit.request_fetch(id.clone(), true, Some(tx));\n+ tracing::debug!(item = %id, \"fetch stream: queued reddit job\");\n+\n+ let result = match rx.await {\n+ Ok(r) => r,\n+ Err(_) => {\n+ tracing::warn!(item = %id, \"fetch stream: worker dropped oneshot\");\n+ FetchJobResult::Failed(\"reddit worker stopped\".into())\n+ }\n+ };\n+\n+ tracing::debug!(item = %id, ?result, \"fetch stream: job finished\");\n+\n+ match result {\n+ FetchJobResult::Imported | FetchJobResult::NotFound => {\n+ let tree = state.tree.read().await;\n+ let empty = NodeState::default();\n+ let node = tree.get(&id).unwrap_or(&empty);\n+ yield Ok(morph_complete_event(html::entity_section(&id, node, false)));\n+ }\n+ FetchJobResult::SkippedCached | FetchJobResult::SkippedDuplicate => {\n+ let tree = state.tree.read().await;\n+ let empty = NodeState::default();\n+ let node = tree.get(&id).unwrap_or(&empty);\n+ yield Ok(morph_complete_event(html::entity_section(&id, node, false)));\n+ }\n+ FetchJobResult::RateLimited { reset_secs } => {\n+ yield Ok(Event::default().event(\"error\").data(\n+ serde_json::json!({\"message\": format!(\"Reddit rate limit — retry in {reset_secs}s\")}).to_string(),\n+ ));\n+ }\n+ FetchJobResult::Failed(msg) => {\n+ yield Ok(Event::default().event(\"error\").data(\n+ serde_json::json!({\"message\": msg}).to_string(),\n+ ));\n+ }\n+ }\n+ };\n+\n+ Sse::new(stream).keep_alive(KeepAlive::new().interval(Duration::from_secs(15)))\n+}\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex db5b4c7f06b0be64603981166835cde268234f67..9314a7556306ddab969b896dbf4126b542a46722 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -7,10 +7,10 @@ use axum::{\n use maud::{html, Markup, DOCTYPE};\n \n use crate::{\n+ fetch::html::entity_section,\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@@ -149,62 +149,6 @@ pub fn breadcrumb_path(item: &ItemId) -> Markup {\n }\n }\n \n-fn entity_panel(node: &NodeState) -> Markup {\n- html! {\n- @if let Some(data) = &node.data {\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- }\n- @if let Some(body) = &data.body_html {\n- div class=\"entity-body\" { (maud::PreEscaped(body)) }\n- }\n- }\n- }\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- @if fetching {\n- button type=\"submit\" class=\"btn-secondary\" disabled { (label) }\n- } @else {\n- button type=\"submit\" class=\"btn-secondary\" { (label) }\n- }\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() {\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 79b173f391a96ae5d0d96fd656e1e8d2dd070d09..0677363e0ed21d244bfa065f7ec728549ddd9e50 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -1,6 +1,7 @@\n pub mod api;\n pub mod event_log;\n pub mod events;\n+pub mod fetch;\n pub mod form_template;\n pub mod html;\n pub mod parser;\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex ff0f01e57b18af878eb5be3efc47204a7673589d..0e6ce32720951a58456852b67fb76a85dd9f4aad 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -7,12 +7,12 @@ use std::time::{Duration, Instant};\n use reqwest::{header, Client, StatusCode};\n use serde::Deserialize;\n use serde_json::Value;\n-use tokio::sync::{mpsc, RwLock};\n+use tokio::sync::{mpsc, oneshot, RwLock};\n \n use crate::{\n event_log::EventLog,\n events::Event,\n- html::now_ms,\n+ fetch::now_ms,\n path_types::ItemId,\n reducer::GlobalTree,\n };\n@@ -22,10 +22,21 @@ pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) {\n tree.ensure_path(id);\n }\n \n+#[derive(Debug, Clone, PartialEq, Eq)]\n+pub enum FetchJobResult {\n+ Imported,\n+ NotFound,\n+ SkippedDuplicate,\n+ SkippedCached,\n+ RateLimited { reset_secs: u64 },\n+ Failed(String),\n+}\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+ pub done: Option>,\n }\n \n #[derive(Clone)]\n@@ -72,14 +83,29 @@ impl RedditBroker {\n .build()\n .expect(\"reqwest client\");\n \n+ tracing::debug!(\n+ api_base = %config.api_base,\n+ oauth_base = %config.oauth_base,\n+ oauth = config.creds.is_some(),\n+ \"reddit worker started\"\n+ );\n+\n tokio::spawn(reddit_worker(rx, tree, event_log, client, config));\n \n Self { tx }\n }\n \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+ pub fn request_fetch(\n+ &self,\n+ id: ItemId,\n+ force: bool,\n+ done: Option>,\n+ ) {\n+ match self.tx.try_send(RedditCommand { id: id.clone(), force, done }) {\n+ Ok(()) => tracing::debug!(item = %id, force, \"reddit fetch queued\"),\n+ Err(_) => tracing::warn!(item = %id, \"reddit fetch queue full, dropped\"),\n+ }\n }\n }\n \n@@ -95,8 +121,6 @@ impl RedditApiConfig {\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 {\n let client_id = std::env::var(\"REDDIT_CLIENT_ID\")\n .or_else(|_| std::env::var(\"REDDIT_APP_ID\"))\n@@ -128,12 +152,10 @@ pub fn default_user_agent() -> 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 {\n if id.as_str().starts_with(\"reddit.com\") {\n return parse_reddit_view(id, payload);\n@@ -141,12 +163,17 @@ pub fn entity_view_from_payload(id: &ItemId, payload: &Value) -> Option>, result: FetchJobResult) {\n+ if let Some(tx) = done {\n+ let _ = tx.send(result);\n+ }\n+}\n+\n async fn reddit_worker(\n mut rx: mpsc::Receiver,\n tree: Arc>,\n@@ -168,15 +195,25 @@ async fn reddit_worker(\n recently_fetched.retain(|_, t| now.duration_since(*t) < cache_ttl);\n \n if in_flight.contains(&cmd.id) {\n+ tracing::debug!(item = %cmd.id, \"reddit fetch skipped: already in flight\");\n+ notify(cmd.done, FetchJobResult::SkippedDuplicate);\n continue;\n }\n if !cmd.force && recently_fetched.contains_key(&cmd.id) {\n+ tracing::debug!(item = %cmd.id, \"reddit fetch skipped: recently fetched cache\");\n+ notify(cmd.done, FetchJobResult::SkippedCached);\n continue;\n }\n \n in_flight.insert(cmd.id.clone());\n let fetch_id = cmd.id.clone();\n+ let done = cmd.done;\n \n+ tracing::debug!(\n+ item = %fetch_id,\n+ delay_ms = current_delay.as_millis(),\n+ \"reddit fetch starting after delay\"\n+ );\n tokio::time::sleep(current_delay).await;\n \n if let Some(c) = &creds {\n@@ -184,8 +221,18 @@ async fn reddit_worker(\n }\n \n let token = oauth.as_ref().map(|t| t.access_token.as_str());\n+ if token.is_some() {\n+ tracing::debug!(item = %fetch_id, \"reddit fetch using OAuth bearer\");\n+ }\n+\n+ let fetch_base = if token.is_some() {\n+ &oauth_base\n+ } else {\n+ &api_base\n+ };\n+ let outcome = do_fetch(&client, fetch_base, &fetch_id, token).await;\n \n- match do_fetch(&client, &api_base, &fetch_id, token).await {\n+ match outcome {\n Ok(FetchOutcome::Payload(payload)) => {\n let ts = now_ms();\n let event = Event::EntityImported {\n@@ -193,30 +240,49 @@ async fn reddit_worker(\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+ tracing::debug!(\n+ item = %fetch_id,\n+ ts,\n+ payload_keys = ?payload.as_object().map(|o| o.len()),\n+ \"reddit fetch got JSON payload, appending event\"\n+ );\n+ match event_log.append(&event).await {\n+ Err(e) => {\n+ tracing::warn!(\n+ item = %fetch_id,\n+ err = %e,\n+ \"reddit event log append failed\"\n+ );\n+ notify(done, FetchJobResult::Failed(e.to_string()));\n+ }\n+ Ok(()) => {\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+ tracing::info!(item = %fetch_id, \"reddit entity imported\");\n+ notify(done, FetchJobResult::Imported);\n+ }\n }\n }\n Ok(FetchOutcome::NotFound) => {\n+ tracing::debug!(item = %fetch_id, \"reddit fetch: not found (no event written)\");\n recently_fetched.insert(fetch_id.clone(), Instant::now());\n+ notify(done, FetchJobResult::NotFound);\n }\n Ok(FetchOutcome::RateLimited { reset_secs }) => {\n- let wait = Duration::from_secs(reset_secs.max(1));\n tracing::warn!(\n- \"Reddit rate limit for {}; sleeping {}s\",\n- fetch_id,\n- wait.as_secs()\n+ item = %fetch_id,\n+ reset_secs,\n+ \"reddit rate limited\"\n );\n- tokio::time::sleep(wait).await;\n+ tokio::time::sleep(Duration::from_secs(reset_secs.max(1))).await;\n current_delay = (current_delay * 2).min(Duration::from_secs(60));\n+ notify(done, FetchJobResult::RateLimited { reset_secs });\n }\n Err(e) => {\n- tracing::warn!(\"Reddit fetch failed for {}: {}\", fetch_id, e);\n+ tracing::warn!(item = %fetch_id, err = %e, \"reddit fetch failed\");\n current_delay = (current_delay * 2).min(Duration::from_secs(60));\n+ notify(done, FetchJobResult::Failed(e));\n }\n }\n \n@@ -238,6 +304,7 @@ async fn ensure_oauth_token(\n ) -> Option {\n if let Some(t) = existing {\n if Instant::now() < t.expires_at - Duration::from_secs(60) {\n+ tracing::debug!(\"reddit OAuth token still valid\");\n return Some(t);\n }\n }\n@@ -246,6 +313,7 @@ async fn ensure_oauth_token(\n \"{}/api/v1/access_token\",\n oauth_base.trim_end_matches('/')\n );\n+ tracing::debug!(%url, \"reddit OAuth token request\");\n \n let resp = client\n .post(&url)\n@@ -257,13 +325,13 @@ async fn ensure_oauth_token(\n let resp = match resp {\n Ok(r) => r,\n Err(e) => {\n- tracing::warn!(\"Reddit OAuth token request failed: {e}\");\n+ tracing::warn!(\"reddit OAuth token request failed: {e}\");\n return None;\n }\n };\n \n if !resp.status().is_success() {\n- tracing::warn!(\"Reddit OAuth token HTTP {}\", resp.status());\n+ tracing::warn!(\"reddit OAuth token HTTP {}\", resp.status());\n return None;\n }\n \n@@ -276,11 +344,12 @@ async fn ensure_oauth_token(\n let body: TokenResponse = match resp.json().await {\n Ok(b) => b,\n Err(e) => {\n- tracing::warn!(\"Reddit OAuth token parse failed: {e}\");\n+ tracing::warn!(\"reddit OAuth token parse failed: {e}\");\n return None;\n }\n };\n \n+ tracing::debug!(expires_in = body.expires_in, \"reddit OAuth token acquired\");\n Some(OAuthToken {\n access_token: body.access_token,\n expires_at: Instant::now() + Duration::from_secs(body.expires_in),\n@@ -295,35 +364,72 @@ async fn do_fetch(\n ) -> Result {\n let url = map_item_to_reddit_api(id, api_base);\n if url.is_empty() {\n+ tracing::debug!(item = %id, \"reddit do_fetch: no API URL for item\");\n return Ok(FetchOutcome::NotFound);\n }\n \n+ tracing::debug!(item = %id, %url, bearer = bearer.is_some(), \"reddit HTTP GET\");\n+\n let mut req = client.get(&url);\n if let Some(token) = bearer {\n req = req.bearer_auth(token);\n }\n \n- let resp = req.send().await.map_err(|e| e.to_string())?;\n+ let resp = req.send().await.map_err(|e| {\n+ tracing::debug!(item = %id, %url, err = %e, \"reddit HTTP transport error\");\n+ e.to_string()\n+ })?;\n+\n+ let status = resp.status();\n+ tracing::debug!(\n+ item = %id,\n+ %url,\n+ %status,\n+ remaining = ?rate_limit_remaining(&resp),\n+ reset = ?rate_limit_reset_secs(&resp),\n+ \"reddit HTTP response\"\n+ );\n \n- if resp.status() == StatusCode::TOO_MANY_REQUESTS {\n+ if status == StatusCode::TOO_MANY_REQUESTS {\n let reset = rate_limit_reset_secs(&resp);\n return Ok(FetchOutcome::RateLimited { reset_secs: reset });\n }\n \n- if resp.status() == StatusCode::SERVICE_UNAVAILABLE {\n- return Err(\"Reddit unavailable (503)\".to_string());\n+ if status == StatusCode::SERVICE_UNAVAILABLE {\n+ return Err(\"Reddit unavailable (503)\".into());\n }\n \n- if !resp.status().is_success() {\n+ if !status.is_success() {\n+ let body = resp.text().await.unwrap_or_default();\n+ tracing::debug!(\n+ item = %id,\n+ %status,\n+ body_len = body.len(),\n+ body_prefix = %body.chars().take(240).collect::(),\n+ \"reddit non-success body\"\n+ );\n return Ok(FetchOutcome::NotFound);\n }\n \n if rate_limit_remaining(&resp) == Some(0) {\n let reset = rate_limit_reset_secs(&resp);\n+ tracing::debug!(item = %id, reset_secs = reset, \"reddit headers: rate limit exhausted\");\n return Ok(FetchOutcome::RateLimited { reset_secs: reset });\n }\n \n- let payload: Value = resp.json().await.map_err(|e| e.to_string())?;\n+ let text = resp.text().await.map_err(|e| e.to_string())?;\n+ tracing::debug!(item = %id, bytes = text.len(), \"reddit response body received\");\n+\n+ let payload: Value = serde_json::from_str(&text).map_err(|e| {\n+ tracing::debug!(\n+ item = %id,\n+ err = %e,\n+ body_prefix = %text.chars().take(240).collect::(),\n+ \"reddit JSON parse failed\"\n+ );\n+ format!(\"invalid JSON: {e}\")\n+ })?;\n+\n Ok(FetchOutcome::Payload(payload))\n }\n \n@@ -344,7 +450,6 @@ fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 {\n .unwrap_or(5)\n }\n \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@@ -445,26 +550,6 @@ mod tests {\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, \"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 = ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n- assert_eq!(\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 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@@ -477,19 +562,5 @@ mod tests {\n )\n .unwrap();\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\":\"<p>hi</p>\",\"thumbnail\":\"https://b.thumbs.redditmedia.com/x.jpg\"}}]}}]\"#;\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- &v,\n- )\n- .unwrap();\n- assert_eq!(entity.title, \"AITA\");\n- assert_eq!(entity.author.as_deref(), Some(\"op\"));\n }\n }\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex d71d1079a8f486cdab15795384aef0b81b32544d..e7ff9f663e45b5e168d6a3869948e3bd890966d4 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -143,9 +143,9 @@ impl AppState {\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+ /// User-initiated Reddit/API import (SSE / fetch module only).\n+ pub fn queue_entity_fetch(&self, id: ItemId, done: Option>) {\n+ self.reddit.request_fetch(id, true, done);\n }\n \n pub async fn record_vote(\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex 3d6a49a2a3fb950752827efe1f5a049308f09baf..ef9ac873fc0442e0b960f144309c8e91124d7884 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -26,7 +26,7 @@ pub enum HtmlUiAction {\n ParseQuery {\n query: String,\n },\n- /// Fetch upstream entity data for the current page (explicit user action only).\n+ /// Import entity data; `POST /ui` responds with `text/event-stream` (not JS).\n FetchEntity {\n item: String,\n },\ndiff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js\nindex d9b016f197547f37ca4b2bcdd7ee6b673d0fb3f0..fe7bfc657c0fccae5c596d005b0e807abefec677 100644\n--- a/server/static/sorter_ui.js\n+++ b/server/static/sorter_ui.js\n@@ -1,5 +1,5 @@\n /**\n- * sorter2 web UI: fetch/eval for POST /ui. No product logic here.\n+ * sorter2 web UI: POST /ui returns JS (morph) or SSE (entity fetch).\n */\n (function () {\n function evalJs(js) {\n@@ -8,15 +8,98 @@\n }\n }\n \n+ function morphSelector(selector, html) {\n+ var el = document.querySelector(selector);\n+ if (el && typeof Idiomorph !== 'undefined') {\n+ Idiomorph.morph(el, html);\n+ }\n+ }\n+\n+ function handleSseEvent(eventType, data, form) {\n+ if (eventType === 'fetching' || eventType === 'complete') {\n+ try {\n+ var msg = JSON.parse(data);\n+ morphSelector(msg.selector || '#entity-section', msg.html);\n+ } catch (err) {\n+ console.warn('fetch morph parse', err);\n+ }\n+ }\n+ if (eventType === 'complete' || eventType === 'error') {\n+ var btn = form && form.querySelector('button[type=\"submit\"]');\n+ if (btn) btn.disabled = false;\n+ }\n+ if (eventType === 'error') {\n+ try {\n+ var err = JSON.parse(data);\n+ console.warn('fetch error:', err.message || data);\n+ } catch (_e) {\n+ console.warn('fetch error:', data);\n+ }\n+ }\n+ }\n+\n+ function consumeSseStream(response, form) {\n+ var reader = response.body.getReader();\n+ var decoder = new TextDecoder();\n+ var buffer = '';\n+ var eventType = '';\n+ var dataLines = [];\n+\n+ function dispatch() {\n+ if (!eventType && dataLines.length === 0) return;\n+ handleSseEvent(eventType || 'message', dataLines.join('\\n'), form);\n+ eventType = '';\n+ dataLines = [];\n+ }\n+\n+ function pump() {\n+ return reader.read().then(function (chunk) {\n+ if (chunk.done) {\n+ dispatch();\n+ return;\n+ }\n+ buffer += decoder.decode(chunk.value, { stream: true });\n+ var parts = buffer.split('\\n');\n+ buffer = parts.pop() || '';\n+ for (var i = 0; i < parts.length; i++) {\n+ var line = parts[i].replace(/\\r$/, '');\n+ if (line === '') {\n+ dispatch();\n+ } else if (line.indexOf('event:') === 0) {\n+ eventType = line.slice(6).trim();\n+ } else if (line.indexOf('data:') === 0) {\n+ dataLines.push(line.slice(5).trim());\n+ }\n+ }\n+ return pump();\n+ });\n+ }\n+\n+ return pump();\n+ }\n+\n function postUiForm(form) {\n+ var btn = form.querySelector('button[type=\"submit\"]');\n+ if (form.id === 'fetch-entity-form' && btn) {\n+ btn.disabled = true;\n+ }\n return fetch(form.action, {\n method: 'POST',\n body: new URLSearchParams(new FormData(form)),\n headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n credentials: 'same-origin',\n }).then(function (resp) {\n- return resp.text();\n- }).then(evalJs);\n+ var ct = resp.headers.get('content-type') || '';\n+ if (ct.indexOf('text/event-stream') !== -1) {\n+ return consumeSseStream(resp, form);\n+ }\n+ return resp.text().then(evalJs);\n+ }).catch(function (err) {\n+ if (form.id === 'fetch-entity-form' && btn) {\n+ btn.disabled = false;\n+ }\n+ console.warn('POST /ui failed', err);\n+ });\n }\n \n function initSorterUi() {\ndiff --git a/test/reddit_import.clj b/test/reddit_import.clj\nindex 54edaedeef08718c8f184d6aa468d8e6415068c7..17f2ee39e1498b0b6bb6a9d8a7e35608b0bd1b32 100644\n--- a/test/reddit_import.clj\n+++ b/test/reddit_import.clj\n@@ -44,10 +44,12 @@\n (do (Thread/sleep 200) (recur))\n false))))))\n \n-(defn- curl-post-ui [base rpc-json]\n+(defn- curl-fetch-ui-sse [base item]\n (process/shell {:out :string :err :string}\n- \"curl\" \"-sf\" \"-X\" \"POST\" (str base \"/ui\")\n- \"--data-urlencode\" (str \"__rpc__=\" rpc-json)))\n+ \"curl\" \"-sfN\" \"--max-time\" \"20\"\n+ \"-X\" \"POST\" (str base \"/ui\")\n+ \"--data-urlencode\"\n+ (str \"__rpc__={\\\"action\\\":\\\"fetch_entity\\\",\\\"item\\\":\\\"\" item \"\\\"}\")))\n \n (defn- wait-event-log [path ms]\n (let [deadline (+ (System/currentTimeMillis) ms)]\n@@ -98,11 +100,12 @@\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 [log-path (str data-dir \"/events.jsonl\")\n+ sse (curl-fetch-ui-sse app-base \"reddit.com/r/rust\")]\n+ (is (zero? (:exit sse)) \"POST /ui fetch_entity SSE succeeds\")\n+ (is (str/includes? (:out sse) \"event: complete\"))\n+ (is (str/includes? (:out sse) \"The Rust Programming Language\"))\n+ (is (wait-event-log log-path 2000) \"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\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[c59951f5] fixed canonical item paths business\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/html/breadcrumb_path.rs b/server/src/html/breadcrumb_path.rs\nindex 12ad2c84faf2fbb693015d4552e45b5c54d587b9..c8a3937923161a6ff248bd77e87eff0dc6fe9ab0 100644\n--- a/server/src/html/breadcrumb_path.rs\n+++ b/server/src/html/breadcrumb_path.rs\n@@ -1,4 +1,4 @@\n-use crate::path_types::CanonicalItemUrl;\n+use crate::path_types::{tilde_http_path_to_canonical, CanonicalItemUrl};\n \n /// Semantic view of an ontology path for rendering and routing decisions.\n pub(super) struct OntologyPath {\n@@ -11,16 +11,7 @@ impl OntologyPath {\n /// Path is the `*path` segment from `/~/*path` (e.g. `topic/a`). Always treat it as under `~/`\n /// so it canonicalizes to `https://slug.social/~/…`, not the non-tilde site path.\n pub(super) fn from_input(path: &str) -> Self {\n- let p = path.trim_start_matches('/');\n- let raw = if p.starts_with(\"http://\") || p.starts_with(\"https://\") {\n- p.to_string()\n- } else if p.is_empty() {\n- \"~/\".to_string()\n- } else {\n- format!(\"~/{}\", p)\n- };\n- let canonical = CanonicalItemUrl::parse(&raw)\n- .unwrap_or_else(|| CanonicalItemUrl::parse(\"~/\").unwrap());\n+ let canonical = tilde_http_path_to_canonical(path);\n Self::from_canonical(canonical)\n }\n \n@@ -37,7 +28,7 @@ impl OntologyPath {\n }\n \n pub(super) fn root() -> Self {\n- Self::from_canonical(CanonicalItemUrl::parse(\"~/\").unwrap())\n+ Self::from_canonical(CanonicalItemUrl::ontology_root())\n }\n \n pub(super) fn is_root(&self) -> bool {\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex d58d9b46f575eb6b7e4971086b07dda75ca2f645..319feb15a6b68d2b5df98b4289fedbc9bdd048d3 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -459,6 +459,8 @@ struct ItemPageViewModel {\n item: String,\n body: Option,\n sibling_rank: Option,\n+ /// False at the tilde ontology root (`~/`): sibling-rank footnote does not apply.\n+ item_has_parent: bool,\n child_rankings: ChildrenRankings,\n rank_history: Vec,\n /// Forum threads that mention or vote on this item.\n@@ -470,11 +472,12 @@ fn build_sibling_rank(\n scope: &ScopeId,\n item: &CanonicalItemUrl,\n ) -> Option {\n+ let item = item.clone().normalized_storage();\n let content = reduced\n .content_for_scope(scope)\n .unwrap_or_else(|| reduced.public());\n let group = &content.ranking_group;\n- let parent = item.parent()?;\n+ let parent = item.parent()?.normalized_storage();\n let siblings: Vec = content\n .item_children\n .get(&parent)\n@@ -492,7 +495,7 @@ fn build_sibling_rank(\n if scoped_idxs.is_empty() {\n return None;\n }\n- let current_idx = *group.item_to_idx.get(item)?;\n+ let current_idx = *group.item_to_idx.get(&item)?;\n if !scoped_idxs.contains(¤t_idx) {\n return None;\n }\n@@ -520,7 +523,7 @@ fn build_sibling_rank(\n .filter_map(|li| local_to_global.get(*li).copied())\n .collect();\n let ranked = ranked_items_subset(group, &comp_global, 10000, 1e-8);\n- let position = ranked.iter().position(|r| &r.item == item)? + 1;\n+ let position = ranked.iter().position(|r| r.item == item)? + 1;\n Some(SiblingRank {\n position,\n component_size: ranked.len(),\n@@ -597,7 +600,9 @@ fn build_item_page_view_model(\n .content_for_scope(scope)\n .unwrap_or_else(|| reduced.public());\n let item_key = CanonicalItemUrl::parse(item)\n- .unwrap_or_else(|| CanonicalItemUrl::parse(\"~/\").unwrap());\n+ .unwrap_or_else(|| CanonicalItemUrl::parse(\"~/\").unwrap())\n+ .normalized_storage();\n+ let item_has_parent = item_key.parent().is_some();\n let child_rankings = build_children_rankings(content, &item_key);\n \n let rank_history = build_rank_history(reduced, scope, item_key.as_str());\n@@ -617,6 +622,7 @@ fn build_item_page_view_model(\n .cloned()\n .or_else(|| reduced.public().item_bodies.get(&item_key).cloned()),\n sibling_rank: build_sibling_rank(reduced, scope, &item_key),\n+ item_has_parent,\n child_rankings,\n rank_history,\n threads,\n@@ -652,7 +658,7 @@ async fn render_scope_view(\n (format!(\"#{} of {}\", rank.position, rank.component_size))\n }\n span class=\"muted\" { (format!(\"({} siblings)\", rank.sibling_total)) }\n- } @else {\n+ } @else if model.item_has_parent {\n span class=\"muted\" { \"unranked among siblings\" }\n }\n }\n@@ -815,6 +821,18 @@ mod tests {\n }));\n }\n \n+ fn apply_ingest_room(state: &mut ReducerState, ts: i64, room_id: &str, raw: &str) {\n+ state.apply_event(Event::Ingest(Ingest {\n+ ts,\n+ id: format!(\"ing-{ts}\"),\n+ raw: raw.to_string(),\n+ principal: \"testuser\".to_string(),\n+ delegate: Some(\"00000000-0000-0000-0000-000000000000:test:local/test\".to_string()),\n+ room_id: room_id.to_string(),\n+ thread_tag: String::new(),\n+ }));\n+ }\n+\n #[test]\n fn item_page_model_includes_body_and_unranked_without_votes() {\n let mut reduced = ReducerState::default();\n@@ -885,4 +903,85 @@ mod tests {\n || model.child_rankings.unranked_items.contains(&CanonicalItemUrl(\"https://slug.social/~/topic/kid2\".to_string()))\n );\n }\n+\n+ #[test]\n+ fn item_page_room_scope_root_lists_top_level_children() {\n+ let mut reduced = ReducerState::default();\n+ apply_ingest_room(\n+ &mut reduced,\n+ 1,\n+ \"9ab12cd/my-room\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t1 {a}\\n~/t2 {b}\\n\",\n+ );\n+ use crate::path_types::CanonicalItemUrl;\n+ let root = CanonicalItemUrl::ontology_root();\n+ let model = build_item_page_view_model(\n+ &reduced,\n+ &ScopeId::Room(\"9ab12cd/my-room\".to_string()),\n+ root.as_str(),\n+ );\n+ assert!(!model.item_has_parent);\n+ assert_eq!(model.child_rankings.unranked_items.len(), 2);\n+ let set: std::collections::HashSet<&str> = model\n+ .child_rankings\n+ .unranked_items\n+ .iter()\n+ .map(|u| u.as_str())\n+ .collect();\n+ assert!(set.contains(\"https://slug.social/~/t1\"));\n+ assert!(set.contains(\"https://slug.social/~/t2\"));\n+ }\n+\n+ /// Top-level `~/a` vs `~/b` votes form one ranked component under the ontology root.\n+ #[test]\n+ fn item_page_room_scope_root_shows_ranked_child_group() {\n+ let mut reduced = ReducerState::default();\n+ apply_ingest_room(\n+ &mut reduced,\n+ 1,\n+ \"9ab12cd/my-room\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n\\\n+ ~/a {a}\\n~/b {b}\\n~/a 2:1 ~/b {because}\\n\",\n+ );\n+ use crate::path_types::CanonicalItemUrl;\n+ let root = CanonicalItemUrl::ontology_root();\n+ let model = build_item_page_view_model(\n+ &reduced,\n+ &ScopeId::Room(\"9ab12cd/my-room\".to_string()),\n+ root.as_str(),\n+ );\n+ assert_eq!(model.child_rankings.component_rankings.len(), 1);\n+ assert_eq!(model.child_rankings.component_rankings[0].pairs, 1);\n+ let names: Vec<&str> = model.child_rankings.component_rankings[0]\n+ .ranked\n+ .iter()\n+ .map(|r| r.item.as_str())\n+ .collect();\n+ assert_eq!(\n+ names,\n+ vec![\"https://slug.social/~/a\", \"https://slug.social/~/b\"]\n+ );\n+ assert!(model.child_rankings.unranked_items.is_empty());\n+ }\n+\n+ /// Legacy `https://slug.social/~/` spelling still resolves children under the real root key.\n+ #[test]\n+ fn item_page_model_normalizes_legacy_tilde_root_storage_url() {\n+ let mut reduced = ReducerState::default();\n+ apply_ingest(\n+ &mut reduced,\n+ 1,\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/x {x}\\n\",\n+ );\n+ let model = build_item_page_view_model(\n+ &reduced,\n+ &ScopeId::Public,\n+ \"https://slug.social/~/\",\n+ );\n+ assert_eq!(model.child_rankings.unranked_items.len(), 1);\n+ assert_eq!(\n+ model.child_rankings.unranked_items[0].as_str(),\n+ \"https://slug.social/~/x\"\n+ );\n+ }\n }\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex 4c8075bbd488f1b9a5eda9e03ced83f6238c6d5e..361a9d446c9043cbdea5f060db2e8633c2fd9bf9 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -1,3 +1,5 @@\n //! Re-exports — implementations live in `slug-types` (`paths` module).\n \n-pub use slug_types::paths::{CanonicalItemUrl, RelativePath, TildePath};\n+pub use slug_types::paths::{\n+ tilde_http_path_to_canonical, CanonicalItemUrl, RelativePath, TildeHttpPathTail, TildePath,\n+};\ndiff --git a/server/src/scope_rank.rs b/server/src/scope_rank.rs\nindex dc640848232b7e79142bfeeea3003c9023f84854..d656b2f0a0a3623ca6b234b746beaaca8ae6017d 100644\n--- a/server/src/scope_rank.rs\n+++ b/server/src/scope_rank.rs\n@@ -149,9 +149,10 @@ pub fn build_rankings_for_item_set(content: &ContentState, items_in_scope: &[Can\n /// Build connected-component rankings for direct children of parent_scope.\n /// Matches the HTML garden view: multiple components, isolates, no-vote items.\n pub fn build_children_rankings(content: &ContentState, parent: &CanonicalItemUrl) -> ChildrenRankings {\n+ let parent = parent.clone().normalized_storage();\n let items: Vec = content\n .item_children\n- .get(parent)\n+ .get(&parent)\n .map(|s| s.iter().cloned().collect())\n .unwrap_or_default();\n build_rankings_for_item_set(content, &items)\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex f9c218378f6a173e56ae1cec797b3c492986eac0..d4c5bfe9c6f1c71dc61878bd8c5e729b1b7c69ef 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -704,6 +704,62 @@ async fn test_private_room_post_links_use_private_garden_routes() {\n assert!(garden_body.contains(&format!(\"/r/{room_short}/{room_slug}/t/garden-thread\")));\n }\n \n+#[tokio::test]\n+async fn test_private_room_garden_root_lists_top_level_tilde_children() {\n+ let (addr, _tmp, _log, _handle) = create_test_server().await;\n+ let client = reqwest::Client::builder()\n+ .redirect(reqwest::redirect::Policy::none())\n+ .build()\n+ .unwrap();\n+ let bearer = test_bearer();\n+\n+ let create = rpc_batch(\n+ &client,\n+ addr,\n+ Some(&bearer),\n+ serde_json::json!([{\n+ \"RoomCreate\": { \"slug\": \"garden-root-list\" }\n+ }]),\n+ )\n+ .await;\n+ let room_id = create[\"results\"][0][\"result\"][\"RoomCreated\"][\"room_id\"]\n+ .as_str()\n+ .unwrap()\n+ .to_string();\n+ let (room_short, room_slug) = room_id.split_once('/').unwrap();\n+\n+ let rpc = ui_post_ingest_rpc(\n+ &room_id,\n+ \"ing\",\n+ \"~/test1 {wow}\\n~/test2 {wow2}\\n~/test1 2:1 ~/test2 {because}\\n\",\n+ );\n+ let post = client\n+ .post(format!(\"http://{addr}/ui\"))\n+ .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n+ .form(&[(\"__rpc__\", rpc.as_str())])\n+ .send()\n+ .await\n+ .unwrap();\n+ assert_eq!(post.status(), reqwest::StatusCode::OK);\n+\n+ let root_page = client\n+ .get(format!(\"http://{addr}/r/{room_short}/{room_slug}/~\"))\n+ .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n+ .send()\n+ .await\n+ .unwrap();\n+ assert!(root_page.status().is_success());\n+ let body = root_page.text().await.unwrap();\n+ assert!(\n+ body.contains(\"ranked child groups\"),\n+ \"expected garden child panel: {}\",\n+ body.len()\n+ );\n+ assert!(body.contains(\"~/test1\"));\n+ assert!(body.contains(\"~/test2\"));\n+ assert!(body.contains(\"ordering 1\"));\n+}\n+\n #[tokio::test]\n async fn test_post_check_returns_targeted_js_error_for_missing_thread_tag() {\n let (addr, _tmp, _log, _handle) = create_test_server().await;\ndiff --git a/test/browser_public_garden.clj b/test/browser_public_garden.clj\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..7bea08e1cf2c8f5b1a94b0640a46e9ba5607b19b\n--- /dev/null\n+++ b/test/browser_public_garden.clj\n@@ -0,0 +1,100 @@\n+(ns test.browser-public-garden\n+ \"Regression: ingest ontology items in the public room via RPC, then open /~ in the browser\n+ and assert ranked + unranked paths appear (HTML garden index — not JSON API).\"\n+ (:require [babashka.fs :as fs]\n+ [cheshire.core :as json]\n+ [clojure.string :as str]\n+ [clojure.test :refer [deftest is]]\n+ [com.blockether.spel.core :as core]\n+ [com.blockether.spel.locator :as locator]\n+ [com.blockether.spel.page :as page]\n+ [test.common :as common]\n+ [test.oauth :as oauth]))\n+\n+(defn- wait-for-text [pg selector expected timeout-ms]\n+ (let [deadline (+ (System/currentTimeMillis) timeout-ms)]\n+ (loop []\n+ (let [text (locator/text-content (page/locator pg selector))]\n+ (if (and (string? text) (str/includes? text expected))\n+ true\n+ (if (< (System/currentTimeMillis) deadline)\n+ (do (Thread/sleep 200) (recur))\n+ false))))))\n+\n+(defn public-garden-flow! []\n+ (println \"\\n━━━ browser public room garden index (RPC seed + GET /~) ━━━\\n\")\n+\n+ (common/letlocals\n+ (bind build (common/run-cargo-build-release! [\"slugsocial-server\"]))\n+ (is (zero? (:exit build)) \"cargo build succeeds\")\n+ (bind server-bin \"target/release/slugsocial-server\")\n+\n+ (bind tmp-dir (str (fs/create-temp-dir {:prefix \"slug-browser-pub-garden-\"})))\n+ (bind slug-port (common/pick-port))\n+ (bind google-port (common/pick-port))\n+ (bind base-url (str \"http://127.0.0.1:\" slug-port))\n+ (bind google-url (str \"http://127.0.0.1:\" google-port))\n+\n+ (bind !server (atom nil))\n+ (bind !google (atom nil))\n+ (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n+ (try\n+ (reset! !google (oauth/start-mock-google google-port\n+ :google-users [\"google-user-alice\"]))\n+ (reset! !server (common/start-server server-bin server-env))\n+ (is (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n+\n+ (let [alice-token (oauth/fetch-bearer-token! base-url :username \"alice\")\n+ thread-tag \"browser-pub-garden\"\n+ ;; Ranked pair at root + one isolate so both panels are exercised.\n+ raw (str \"# \" thread-tag \"\\n\\n\"\n+ \"~/br-pub-a {alpha}\\n\"\n+ \"~/br-pub-b {beta}\\n\"\n+ \"~/br-pub-c {gamma}\\n\"\n+ \"~/br-pub-a 2:1 ~/br-pub-b {browser regression vote}\\n\")\n+ post-resp (oauth/http-post-json\n+ (str base-url \"/api/v0/rpc\")\n+ [{\"Post\" {\"room\" \"public\"\n+ \"thread_tag\" thread-tag\n+ \"text\" raw\n+ \"return_rank_diff\" false}}]\n+ :headers {\"Authorization\" (str \"Bearer \" alice-token)})\n+ post-json (json/parse-string (:body post-resp) false)\n+ _ (is (true? (get-in post-json [\"results\" 0 \"ok\"])) \"seed public post via rpc\")\n+ rank-resp (oauth/http-post-json\n+ (str base-url \"/api/v0/rpc\")\n+ [{\"GetGardenRank\" {\"room\" \"public\"\n+ \"parent_path\" \"~\"\n+ \"depth\" 1}}])\n+ rank-json (json/parse-string (:body rank-resp) false)\n+ _ (is (true? (get-in rank-json [\"results\" 0 \"ok\"])) \"GetGardenRank ok\")\n+ comps (get-in rank-json [\"results\" 0 \"result\" \"GardenRank\" \"components\"])\n+ _ (is (pos? (count comps)) \"rank API reports at least one component\")]\n+ (core/with-playwright [pw]\n+ (core/with-browser [browser (core/launch-chromium pw {:headless true :channel \"chrome\"})]\n+ (core/with-context [ctx (core/new-context browser)]\n+ (core/with-page [pg (core/new-page-from-context ctx)]\n+ (page/navigate pg (str base-url \"/login\"))\n+ (is (wait-for-text pg \"body\" \"@alice\" 15000) \"alice session after login\")\n+ (page/navigate pg (str base-url \"/~\"))\n+ (is (wait-for-text pg \"body\" \"paths\" 15000) \"public garden index shows paths heading\")\n+ (is (wait-for-text pg \"body\" \"ordering\" 10000)\n+ \"ranked child group meta visible\")\n+ (is (wait-for-text pg \"body\" \"~/br-pub-a\" 10000) \"ranked list shows ~/br-pub-a\")\n+ (is (wait-for-text pg \"body\" \"~/br-pub-b\" 10000) \"ranked list shows ~/br-pub-b\")\n+ (is (wait-for-text pg \"body\" \"unranked\" 10000) \"unranked section present\")\n+ (is (wait-for-text pg \"body\" \"~/br-pub-c\" 10000)\n+ \"unranked list shows ~/br-pub-c\"))))))\n+\n+ (finally\n+ (when-some [s @!server] (common/kill-server s))\n+ (when-some [g @!google] ((:stop-fn g)))\n+ (fs/delete-tree tmp-dir)))\n+\n+ nil))\n+\n+(defn public-garden-browser-test [& _args]\n+ (public-garden-flow!))\n+\n+(deftest browser-public-garden-index-check\n+ (public-garden-flow!))\ndiff --git a/tests.edn b/tests.edn\nindex 56fdfa4f29383ad305fd8068783e4efe2ed334a0..6e96432ba766461b4233c75dc48db2633483e5e0 100644\n--- a/tests.edn\n+++ b/tests.edn\n@@ -16,7 +16,8 @@\n :ns-patterns [\"^test\\\\.browser-sse$\"\n \"^test\\\\.browser-ui-morph$\"\n \"^test\\\\.browser-post-redact$\"\n- \"^test\\\\.browser-room-delete$\"]\n+ \"^test\\\\.browser-room-delete$\"\n+ \"^test\\\\.browser-public-garden$\"]\n :kaocha.filter/skip-meta [:skip]\n :parallel? false}]\n :plugins [:kaocha.plugin/junit-xml]\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex 8cea90238ef6207d65ecdb2903b8958fafb213d2..edbb923e4d7d41ad82dfc254c3bd697562383527 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -4,8 +4,9 @@ pub mod paths;\n pub mod timeago;\n \n pub use paths::{\n- canonicalize_item, canonicalize_tag, item_parent_path, item_path_segments, CanonicalItemUrl,\n- ForumThreadUrl, GardenItemUrl, RelativePath, TildeOntologyPath, TildePath,\n+ canonicalize_item, canonicalize_tag, item_parent_path, item_path_segments, normalize_slug_ontology_storage_url,\n+ CanonicalItemUrl, ForumThreadUrl, GardenItemUrl, RelativePath, SLUG_TILDE_ONTOLOGY_ROOT,\n+ TildeHttpPathTail, TildeOntologyPath, TildePath, tilde_http_path_to_canonical,\n };\n \n /// Max characters returned for a garden item body unless `full=true` / `--full` (API + CLI).\ndiff --git a/types/src/paths.rs b/types/src/paths.rs\nindex 668323ed777f360f2838a0dfe6eae68905d1183b..8971f599a7ebcf399f60c306d35ee28d0f581194 100644\n--- a/types/src/paths.rs\n+++ b/types/src/paths.rs\n@@ -1,5 +1,13 @@\n //! Canonical paths, storage ids, and JSON href newtypes. All normalization and\n //! room-aware URL rules for items live here.\n+//!\n+//! ## String kinds (parse in this module only)\n+//!\n+//! - **[`canonicalize_item`] / [`CanonicalItemUrl`]** — graph storage key and DSL form; tilde\n+//! ontology root is always [`SLUG_TILDE_ONTOLOGY_ROOT`] (no `…/~/` trailing slash only).\n+//! - **[`TildeHttpPathTail`]** — capture from `GET /~/*path` or `…/r/…/~/…` (the `*path` segment).\n+//! - **`-/…` wire form** — external items; see [`canonicalize_item`] dash branch.\n+//! - **[`GardenItemUrl`], [`ForumThreadUrl`]** — JSON / browser href surfaces.\n \n use std::borrow::Borrow;\n use std::fmt;\n@@ -7,6 +15,23 @@ use std::ops::Deref;\n \n use serde::{Deserialize, Serialize};\n \n+// ---------------------------------------------------------------------------\n+// Slug tilde ontology (single storage form for `~/`)\n+// ---------------------------------------------------------------------------\n+\n+/// Canonical absolute URL for the tilde ontology **root** (`~/` in UI). Used as the\n+/// `item_children` parent key for top-level items and must match [`CanonicalItemUrl::ontology_root`].\n+pub const SLUG_TILDE_ONTOLOGY_ROOT: &str = \"https://slug.social/~\";\n+\n+/// Collapse legacy or parser variants of the ontology root to [`SLUG_TILDE_ONTOLOGY_ROOT`].\n+pub fn normalize_slug_ontology_storage_url(s: &str) -> String {\n+ if s == \"https://slug.social/~/\" {\n+ SLUG_TILDE_ONTOLOGY_ROOT.to_string()\n+ } else {\n+ s.to_string()\n+ }\n+}\n+\n // ---------------------------------------------------------------------------\n // Normalization (moved from server `canonical_path`)\n // ---------------------------------------------------------------------------\n@@ -89,6 +114,9 @@ pub fn canonicalize_item(input: &str) -> String {\n .join(\"/\");\n \n if is_tilde {\n+ if tail.is_empty() {\n+ return SLUG_TILDE_ONTOLOGY_ROOT.to_string();\n+ }\n format!(\"https://slug.social/~/{}\", tail)\n } else if tail.is_empty() {\n \"https://slug.social\".to_string()\n@@ -173,7 +201,7 @@ impl CanonicalItemUrl {\n if c.is_empty() {\n None\n } else {\n- Some(Self(c))\n+ Some(Self(normalize_slug_ontology_storage_url(&c)))\n }\n }\n \n@@ -181,8 +209,19 @@ impl CanonicalItemUrl {\n &self.0\n }\n \n+ /// Collapses legacy slug ontology root spellings so [`HashMap`] keys match the reducer graph.\n+ pub fn normalized_storage(self) -> Self {\n+ Self(normalize_slug_ontology_storage_url(self.as_str()))\n+ }\n+\n pub fn tilde_tail(&self) -> Option<&str> {\n- self.0.strip_prefix(\"https://slug.social/~/\")\n+ if let Some(tail) = self.0.strip_prefix(\"https://slug.social/~/\") {\n+ return Some(tail);\n+ }\n+ if self.0 == SLUG_TILDE_ONTOLOGY_ROOT || self.0 == \"https://slug.social/~/\" {\n+ return Some(\"\");\n+ }\n+ None\n }\n \n pub fn last_segment(&self) -> &str {\n@@ -193,7 +232,7 @@ impl CanonicalItemUrl {\n }\n \n pub fn ontology_root() -> Self {\n- Self(\"https://slug.social/~\".to_string())\n+ Self(SLUG_TILDE_ONTOLOGY_ROOT.to_string())\n }\n \n pub fn parent(&self) -> Option {\n@@ -234,9 +273,13 @@ impl CanonicalItemUrl {\n \n /// `-/` representation for external `https://…` items, `~/…` for slug ontology, else unchanged.\n pub fn display_path(&self) -> String {\n- if let Some(tail) = self.0.strip_prefix(\"https://slug.social/~/\") {\n- format!(\"~/{}\", tail)\n- } else if let Some(tail) = self.0.strip_prefix(\"https://\") {\n+ if let Some(tail) = self.tilde_tail() {\n+ if tail.is_empty() {\n+ return \"~/\".to_string();\n+ }\n+ return format!(\"~/{}\", tail);\n+ }\n+ if let Some(tail) = self.0.strip_prefix(\"https://\") {\n if tail.starts_with(\"slug.social\") {\n self.0.clone()\n } else {\n@@ -276,6 +319,37 @@ impl CanonicalItemUrl {\n }\n }\n \n+/// HTTP route capture: path segment after `~/` in `GET /~/*path` or `…/r/…/~/…` (empty = ontology root).\n+#[derive(Debug, Clone, PartialEq, Eq, Hash)]\n+pub struct TildeHttpPathTail(pub String);\n+\n+impl TildeHttpPathTail {\n+ pub fn new(path_segment: &str) -> Self {\n+ Self(path_segment.trim_start_matches('/').to_string())\n+ }\n+\n+ pub fn as_str(&self) -> &str {\n+ &self.0\n+ }\n+\n+ pub fn to_canonical(&self) -> CanonicalItemUrl {\n+ tilde_http_path_to_canonical(self.as_str())\n+ }\n+}\n+\n+/// Map the router's tilde tail (e.g. `topic/a`, or empty for root) to a [`CanonicalItemUrl`].\n+pub fn tilde_http_path_to_canonical(path_segment: &str) -> CanonicalItemUrl {\n+ let p = path_segment.trim_start_matches('/');\n+ let raw = if p.starts_with(\"http://\") || p.starts_with(\"https://\") {\n+ p.to_string()\n+ } else if p.is_empty() {\n+ \"~/\".to_string()\n+ } else {\n+ format!(\"~/{}\", p)\n+ };\n+ CanonicalItemUrl::parse(&raw).unwrap_or_else(|| CanonicalItemUrl::ontology_root())\n+}\n+\n impl fmt::Display for CanonicalItemUrl {\n fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {\n self.0.fmt(f)\n@@ -557,6 +631,44 @@ mod tests {\n fn canonical_parent_root_is_none() {\n let root = CanonicalItemUrl::parse(\"~/\").unwrap();\n assert!(root.parent().is_none());\n+ assert_eq!(root.as_str(), SLUG_TILDE_ONTOLOGY_ROOT);\n+ assert_eq!(root, CanonicalItemUrl::ontology_root());\n+ }\n+\n+ #[test]\n+ fn tilde_ontology_root_unifies_forms() {\n+ assert_eq!(canonicalize_item(\"~/\"), SLUG_TILDE_ONTOLOGY_ROOT);\n+ assert_eq!(\n+ normalize_slug_ontology_storage_url(\"https://slug.social/~/\"),\n+ SLUG_TILDE_ONTOLOGY_ROOT.to_string()\n+ );\n+ assert_eq!(\n+ CanonicalItemUrl::parse(\"https://slug.social/~/\")\n+ .unwrap()\n+ .as_str(),\n+ SLUG_TILDE_ONTOLOGY_ROOT\n+ );\n+ let legacy = CanonicalItemUrl(\"https://slug.social/~/\".to_string());\n+ assert_eq!(legacy.normalized_storage().as_str(), SLUG_TILDE_ONTOLOGY_ROOT);\n+ }\n+\n+ #[test]\n+ fn tilde_http_path_tail_maps_router_segment() {\n+ assert_eq!(\n+ TildeHttpPathTail::new(\"\").to_canonical(),\n+ CanonicalItemUrl::ontology_root()\n+ );\n+ assert_eq!(\n+ tilde_http_path_to_canonical(\"topic/x\").as_str(),\n+ \"https://slug.social/~/topic/x\"\n+ );\n+ }\n+\n+ #[test]\n+ fn display_path_slug_ontology_root() {\n+ let r = CanonicalItemUrl::ontology_root();\n+ assert_eq!(r.display_path(), \"~/\");\n+ assert_eq!(r.tilde_tail(), Some(\"\"));\n }\n \n #[test]\n","role":"user"}],"model":"openai/gpt-chat-latest"}