{"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[3f35edab] progress\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex a10ce662105cff8fad949c6b83f7035ce79bed18..a986f706ea4b261cbaf004c02b4cf84184b41371 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -3,6 +3,7 @@ mod helpers;\n mod rpc;\n mod stream;\n mod validate;\n+mod ui_html;\n mod web_post;\n \n pub use auth::{\n@@ -33,6 +34,7 @@ pub use stream::{get_html_stream, get_stream};\n \n pub use validate::{normalize_room_and_thread, validate_ingest_document, ValidatedIngest};\n \n+pub use ui_html::post_ui_html;\n pub use web_post::{check_web_ingest, post_web_ingest, post_web_redact};\n \n #[cfg(test)]\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..2b40a72059981d558768f73d189b991f3448c257\n--- /dev/null\n+++ b/server/src/api/ui_html.rs\n@@ -0,0 +1,139 @@\n+//! Single `POST /ui` entry for browser [`crate::html::ui_action::HtmlUiAction`] (JSON in `__rpc__` + holes).\n+\n+use axum::{\n+ body::Body,\n+ extract::State,\n+ http::{header, HeaderMap, StatusCode},\n+ response::{IntoResponse, Response},\n+ Form,\n+};\n+use axum_extra::extract::cookie::CookieJar;\n+use std::collections::HashMap;\n+\n+use crate::{\n+ api::{\n+ auth::optional_principal,\n+ web_post::{run_check_web_ingest, run_post_web_ingest, run_post_web_redact, WebPostForm, WebRedactForm},\n+ },\n+ html::{\n+ fragment_public_new_thread_form, fragment_room_new_thread_form, login_to_post_hint_markup,\n+ parse_html_ui_from_form, user_can_post_room, user_can_view_room, HtmlUiAction, JsBuilder,\n+ ThreadNav,\n+ },\n+ state::AppState,\n+};\n+\n+pub async fn post_ui_html(\n+ State(state): State,\n+ headers: HeaderMap,\n+ jar: CookieJar,\n+ Form(form): Form>,\n+) -> impl IntoResponse {\n+ let action = match parse_html_ui_from_form(&form) {\n+ Ok(a) => a,\n+ Err(e) => return ui_js_warn(&e.to_string()).into_response(),\n+ };\n+\n+ match action {\n+ HtmlUiAction::PostIngest {\n+ room,\n+ thread_tag,\n+ text,\n+ error_target,\n+ form_id,\n+ } => {\n+ run_post_web_ingest(\n+ &state,\n+ &headers,\n+ &jar,\n+ WebPostForm {\n+ room,\n+ thread_tag,\n+ text,\n+ error_target,\n+ form_id,\n+ },\n+ )\n+ .await\n+ }\n+ HtmlUiAction::CheckIngest {\n+ room,\n+ thread_tag,\n+ text,\n+ error_target,\n+ form_id,\n+ } => {\n+ run_check_web_ingest(\n+ &state,\n+ &headers,\n+ &jar,\n+ WebPostForm {\n+ room,\n+ thread_tag,\n+ text,\n+ error_target,\n+ form_id,\n+ },\n+ )\n+ .await\n+ }\n+ HtmlUiAction::RedactPost { post_id } => {\n+ run_post_web_redact(&state, &headers, &jar, WebRedactForm { post_id }).await\n+ }\n+ HtmlUiAction::ExpandPublicNewThreadForm => {\n+ let reduced = state.reduced.read().await;\n+ let user = optional_principal(&headers, &jar, &reduced);\n+ drop(reduced);\n+ let markup = if user.is_some() {\n+ fragment_public_new_thread_form(true)\n+ } else {\n+ login_to_post_hint_markup()\n+ };\n+ JsBuilder::new()\n+ .morph_selector(\"#public-new-thread-ui-slot\", markup)\n+ .into_response()\n+ }\n+ HtmlUiAction::ExpandRoomNewThreadForm { room_wire } => {\n+ let room_wire = room_wire.trim().to_string();\n+ if room_wire.is_empty() {\n+ return ui_js_warn(\"missing room\").into_response();\n+ }\n+ let reduced = state.reduced.read().await;\n+ let user = optional_principal(&headers, &jar, &reduced);\n+ if !reduced.rooms.contains(&room_wire) {\n+ drop(reduced);\n+ return ui_js_warn(\"room not found\").into_response();\n+ }\n+ if !user_can_view_room(&reduced, &room_wire, user.as_deref()) {\n+ drop(reduced);\n+ return ui_js_warn(\"forbidden\").into_response();\n+ }\n+ let can_post = user\n+ .as_ref()\n+ .map(|u| user_can_post_room(&reduced, &room_wire, u))\n+ .unwrap_or(false);\n+ drop(reduced);\n+ let Some(nav) = ThreadNav::from_room_id(&room_wire) else {\n+ return ui_js_warn(\"bad room\").into_response();\n+ };\n+ let markup = if can_post {\n+ fragment_room_new_thread_form(&nav, true)\n+ } else {\n+ login_to_post_hint_markup()\n+ };\n+ JsBuilder::new()\n+ .morph_selector(\"#room-new-thread-ui-slot\", markup)\n+ .into_response()\n+ }\n+ }\n+}\n+\n+fn ui_js_warn(msg: &str) -> Response {\n+ use crate::html::js_string_literal;\n+ let js = format!(\"console.warn({});\", js_string_literal(msg));\n+ Response::builder()\n+ .status(StatusCode::OK)\n+ .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n+ .body(Body::from(js))\n+ .unwrap()\n+}\ndiff --git a/server/src/api/web_post.rs b/server/src/api/web_post.rs\nindex a64010e382d3039821c836a5529adad0fe67cce5..265025f41ff1548d05b2d2d5d84202245388053f 100644\n--- a/server/src/api/web_post.rs\n+++ b/server/src/api/web_post.rs\n@@ -222,8 +222,18 @@ pub async fn post_web_redact(\n jar: CookieJar,\n Form(form): Form,\n ) -> impl IntoResponse {\n+ run_post_web_redact(&state, &headers, &jar, form).await\n+}\n+\n+/// Shared with [`crate::api::ui_html::post_ui_html`].\n+pub(crate) async fn run_post_web_redact(\n+ state: &AppState,\n+ headers: &HeaderMap,\n+ jar: &CookieJar,\n+ form: WebRedactForm,\n+) -> Response {\n let reduced = state.reduced.read().await;\n- let Some(_username) = optional_principal(&headers, &jar, &reduced) else {\n+ let Some(_username) = optional_principal(headers, jar, &reduced) else {\n drop(reduced);\n return js_redirect(\"/login\").into_response();\n };\n@@ -239,8 +249,8 @@ pub async fn post_web_redact(\n return js_redirect(\"/login\").into_response();\n };\n \n- match rpc_post_redact(&state, &headers, form.post_id).await {\n- Ok(RpcResult::RedactPostOk {}) => redact_success_response(&state).await.into_response(),\n+ match rpc_post_redact(state, headers, form.post_id).await {\n+ Ok(RpcResult::RedactPostOk {}) => redact_success_response(state).await.into_response(),\n Ok(_) => (StatusCode::BAD_REQUEST, \"unexpected response\").into_response(),\n Err((msg, hint)) => {\n let detail = hint.as_deref().unwrap_or(\"\");\n@@ -255,8 +265,18 @@ pub async fn post_web_ingest(\n jar: CookieJar,\n Form(form): Form,\n ) -> impl IntoResponse {\n+ run_post_web_ingest(&state, &headers, &jar, form).await\n+}\n+\n+/// Shared with [`crate::api::ui_html::post_ui_html`] (`POST /ui`).\n+pub(crate) async fn run_post_web_ingest(\n+ state: &AppState,\n+ headers: &HeaderMap,\n+ jar: &CookieJar,\n+ form: WebPostForm,\n+) -> Response {\n let reduced = state.reduced.read().await;\n- let Some(_username) = optional_principal(&headers, &jar, &reduced) else {\n+ let Some(_username) = optional_principal(headers, jar, &reduced) else {\n drop(reduced);\n return js_redirect(\"/login\").into_response();\n };\n@@ -282,8 +302,8 @@ pub async fn post_web_ingest(\n .into_response();\n }\n \n- match rpc_post_with_bearer(&state, &bearer, room.clone(), thread_tag.clone(), text).await {\n- Ok(RpcResult::PostOk { .. }) => post_success_response(&state, &form, &headers, &jar)\n+ match rpc_post_with_bearer(state, &bearer, room.clone(), thread_tag.clone(), text).await {\n+ Ok(RpcResult::PostOk { .. }) => post_success_response(state, &form, headers, jar)\n .await\n .into_response(),\n Ok(_) => form_js_error(&form, \"unexpected response\", \"Post did not return PostOk.\").into_response(),\n@@ -297,8 +317,18 @@ pub async fn check_web_ingest(\n jar: CookieJar,\n Form(form): Form,\n ) -> impl IntoResponse {\n+ run_check_web_ingest(&state, &headers, &jar, form).await\n+}\n+\n+/// Shared with [`crate::api::ui_html::post_ui_html`] (`POST /ui`).\n+pub(crate) async fn run_check_web_ingest(\n+ state: &AppState,\n+ headers: &HeaderMap,\n+ jar: &CookieJar,\n+ form: WebPostForm,\n+) -> Response {\n let reduced = state.reduced.read().await;\n- let Some(_username) = optional_principal(&headers, &jar, &reduced) else {\n+ let Some(_username) = optional_principal(headers, jar, &reduced) else {\n drop(reduced);\n return js_redirect(\"/login\").into_response();\n };\n@@ -324,7 +354,7 @@ pub async fn check_web_ingest(\n return js_clear_errors(&form_error_target(&form)).into_response();\n }\n \n- match rpc_check_with_bearer(&state, &bearer, room, form.text.clone()).await {\n+ match rpc_check_with_bearer(state, &bearer, room, form.text.clone()).await {\n Ok(RpcResult::CheckOk { .. }) => js_clear_errors(&form_error_target(&form)).into_response(),\n Ok(_) => form_js_error(&form, \"unexpected response\", \"Check did not return CheckOk.\").into_response(),\n Err((msg, hint)) => form_js_error(&form, &msg, hint.as_deref().unwrap_or(\"\")).into_response(),\ndiff --git a/server/src/form_template.rs b/server/src/form_template.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..3709c2c09a859da006e4af173413d5d235bc19be\n--- /dev/null\n+++ b/server/src/form_template.rs\n@@ -0,0 +1,142 @@\n+//! Plan2-style JSON templates with `{\"$form\": \"field_name\"}` holes, filled from\n+//! `application/x-www-form-urlencoded` (or any `String` → `String` map) **before**\n+//! deserializing into a typed struct.\n+//!\n+//! # Wire format\n+//!\n+//! Templates are **compact JSON** (`serde_json::to_string`): one line, no pretty\n+//! printing, strings escaped per JSON rules (`\\\"`, `\\n`, etc.). Embed that string\n+//! in HTML attributes or text nodes with normal HTML escaping (e.g. maud), not\n+//! bespoke encodings.\n+//!\n+//! # Power vs flat hidden fields\n+//!\n+//! A form is always a string→string map. You can fake depth with dotted keys (`a.b.c`),\n+//! but one structured blob (`__rpc__` = compact JSON) gives you nested objects,\n+//! arrays, and optional fields without inventing a new naming scheme each time.\n+//!\n+//! # Security\n+//!\n+//! Substitution runs **before** `serde` into your command type. It does not fix\n+//! authorization: if the client can replace the hidden `__rpc__` value, they can\n+//! change the command shape unless you validate (signed blob, server-side session\n+//! context, or treat the blob as hints only). Same threat model as any hidden field.\n+\n+use serde::Serialize;\n+use serde_json::Value;\n+use std::collections::HashMap;\n+\n+/// Serialize a value to compact JSON for a hidden `__rpc__` (or similar) field.\n+pub fn template_json_compact(v: &T) -> serde_json::Result {\n+ serde_json::to_string(v)\n+}\n+\n+/// Recursively walk the JSON AST and replace `{\"$form\": \"key\"}` with the submitted\n+/// string for `key` (empty if missing). Other keys are unchanged.\n+pub fn substitute_form_vars(val: &mut Value, form_data: &HashMap) {\n+ match val {\n+ Value::Object(map) => {\n+ if map.len() == 1 {\n+ if let Some(Value::String(field_name)) = map.get(\"$form\") {\n+ let submitted = form_data\n+ .get(field_name.as_str())\n+ .map(|s| s.as_str())\n+ .unwrap_or(\"\");\n+ *val = Value::String(submitted.to_string());\n+ return;\n+ }\n+ }\n+ for v in map.values_mut() {\n+ substitute_form_vars(v, form_data);\n+ }\n+ }\n+ Value::Array(arr) => {\n+ for v in arr.iter_mut() {\n+ substitute_form_vars(v, form_data);\n+ }\n+ }\n+ _ => {}\n+ }\n+}\n+\n+/// Parse JSON, apply [`substitute_form_vars`], return the mutated value.\n+pub fn fill_template_from_form(\n+ template_json: &str,\n+ form_data: &HashMap,\n+) -> Result {\n+ let mut v: Value = serde_json::from_str(template_json)?;\n+ substitute_form_vars(&mut v, form_data);\n+ Ok(v)\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+ use serde::Deserialize;\n+\n+ #[derive(Debug, Deserialize, PartialEq, Eq)]\n+ struct Demo {\n+ room: String,\n+ thread_tag: String,\n+ nested: Nested,\n+ }\n+\n+ #[derive(Debug, Deserialize, PartialEq, Eq)]\n+ struct Nested {\n+ text: String,\n+ }\n+\n+ #[test]\n+ fn holes_become_strings() {\n+ let json = r#\"{\n+ \"room\": \"public\",\n+ \"thread_tag\": {\"$form\": \"tag\"},\n+ \"nested\": {\"text\": {\"$form\": \"body\"}}\n+ }\"#;\n+ let mut form = HashMap::new();\n+ form.insert(\"tag\".into(), \"foo\".into());\n+ form.insert(\"body\".into(), \"hello\\nworld\".into());\n+\n+ let v = fill_template_from_form(json, &form).unwrap();\n+ let d: Demo = serde_json::from_value(v).unwrap();\n+ assert_eq!(\n+ d,\n+ Demo {\n+ room: \"public\".into(),\n+ thread_tag: \"foo\".into(),\n+ nested: Nested {\n+ text: \"hello\\nworld\".into(),\n+ },\n+ }\n+ );\n+ }\n+\n+ #[test]\n+ fn missing_form_key_is_empty_string() {\n+ let json = r#\"{\"x\": {\"$form\": \"nope\"}}\"#;\n+ let mut form = HashMap::new();\n+ form.insert(\"other\".into(), \"y\".into());\n+ let v = fill_template_from_form(json, &form).unwrap();\n+ assert_eq!(v[\"x\"], \"\");\n+ }\n+\n+ #[test]\n+ fn array_of_holes() {\n+ let json = r#\"{\"items\": [{\"$form\": \"a\"}, {\"$form\": \"b\"}]}\"#;\n+ let mut form = HashMap::new();\n+ form.insert(\"a\".into(), \"1\".into());\n+ form.insert(\"b\".into(), \"2\".into());\n+ let v = fill_template_from_form(json, &form).unwrap();\n+ assert_eq!(v[\"items\"], serde_json::json!([\"1\", \"2\"]));\n+ }\n+\n+ #[test]\n+ fn template_json_compact_escapes_and_single_line() {\n+ let s = template_json_compact(&serde_json::json!({\n+ \"x\": \"quote\\\"and\\nnewline\"\n+ }))\n+ .unwrap();\n+ assert!(!s.contains('\\n'));\n+ assert!(s.contains(\"\\\\\\\"\") || s.contains(\"\\\\n\"));\n+ }\n+}\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\nindex f789e347dc136f8ffd356f4492f0bd76cea04bf0..b1c037f3dd93c7bb96d6624cab6019228432c501 100644\n--- a/server/src/html/forum.rs\n+++ b/server/src/html/forum.rs\n@@ -11,12 +11,15 @@ use crate::{\n api::optional_principal,\n canonical_path::{canonicalize_item, canonicalize_tag},\n events::ThreadCapability,\n+ form_template::template_json_compact,\n identity::parse_username,\n reducer::{scope_from_room_wire, ReducerState, ScopeId},\n state::AppState,\n timeago,\n };\n \n+use super::ui_action::{HtmlUiAction, UI_RPC_FIELD};\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, theme_from_jar, theme_next_from_uri, JsBuilder,\n@@ -289,7 +292,7 @@ fn rooms_for_user(reduced: &ReducerState, username: &str) -> Vec {\n v\n }\n \n-fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {\n+pub(crate) fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {\n if !reduced.rooms.contains(room_id) {\n return false;\n }\n@@ -299,7 +302,7 @@ fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&s\n reduced.user_has_cap(room_id, u, ThreadCapability::View)\n }\n \n-fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {\n+pub(crate) fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {\n reduced.user_has_cap(room_id, username, ThreadCapability::Post)\n }\n \n@@ -591,7 +594,6 @@ pub async fn home(\n let nav = ThreadNav::public();\n let reduced_read = state.reduced.read().await;\n let strip = auth_strip(&headers, &jar, &reduced_read);\n- let show_forms = user.is_some();\n drop(reduced_read);\n \n let page = layout(\n@@ -617,8 +619,14 @@ pub async fn home(\n }\n }\n p class=\"muted\" { \"dark = time-ordered · light = vote-ranked\" }\n+ div class=\"thread-feed-toolbar\" {\n+ form method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(expand_public_new_thread_rpc_value());\n+ button type=\"submit\" class=\"section-add-btn\" { \"+\" }\n+ }\n+ }\n+ div id=\"public-new-thread-ui-slot\" {}\n (render_thread_feed(Some(&nav), \"thread-feed\", &public_rows, now))\n- (new_thread_form_public(show_forms))\n (cli_panel(\"npx slugsocial public forum list\"))\n },\n None,\n@@ -901,7 +909,13 @@ pub async fn room_page(\n h3 { \"threads\" }\n (render_thread_feed(Some(&nav), \"room-thread-feed\", &rows, now))\n @if show_new {\n- (new_thread_form_for_room(&nav, show_new))\n+ div class=\"thread-feed-toolbar\" {\n+ form method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(expand_room_new_thread_rpc_value(&nav));\n+ button type=\"submit\" class=\"section-add-btn\" { \"+\" }\n+ }\n+ }\n+ div id=\"room-new-thread-ui-slot\" {}\n }\n (cli_panel(&forum_cli))\n (cli_panel(&garden_cli))\n@@ -945,6 +959,31 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool) -> Markup {\n }\n }\n \n+pub(crate) fn expand_public_new_thread_rpc_value() -> String {\n+ template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect(\"static json\")\n+}\n+\n+pub(crate) fn expand_room_new_thread_rpc_value(nav: &ThreadNav) -> String {\n+ template_json_compact(&HtmlUiAction::ExpandRoomNewThreadForm {\n+ room_wire: nav.room_wire.clone(),\n+ })\n+ .expect(\"static json\")\n+}\n+\n+pub(crate) fn login_to_post_hint_markup() -> Markup {\n+ html! {\n+ p class=\"muted\" { \"log in to post\" }\n+ }\n+}\n+\n+pub(crate) fn fragment_public_new_thread_form(show: bool) -> Markup {\n+ new_thread_form_public(show)\n+}\n+\n+pub(crate) fn fragment_room_new_thread_form(nav: &ThreadNav, show: bool) -> Markup {\n+ new_thread_form_for_room(nav, show)\n+}\n+\n async fn thread_post_view_inner(\n state: AppState,\n tag: String,\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 53041a0cf0b30e6f20749c92ecc15a4e9ac56e09..a4fd2dd60ac283f7eb9b2e64522501b21d1e27e9 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -16,6 +16,7 @@ mod editor;\n mod forum;\n mod garden;\n mod search;\n+pub mod ui_action;\n use breadcrumb_path::OntologyPath;\n \n pub use auth::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page};\n@@ -27,9 +28,15 @@ pub use forum::{\n thread_post_collapse_deleted, thread_post_expand, thread_post_expand_deleted, thread_post_view,\n thread_view, ThreadNav,\n };\n+\n+pub(crate) use forum::{\n+ fragment_public_new_thread_form, fragment_room_new_thread_form, login_to_post_hint_markup,\n+ user_can_post_room, user_can_view_room,\n+};\n pub use garden::{garden_index, ontology_path, room_garden_index, room_ontology_path};\n pub use search::{search_page, search_results_fragment};\n pub use forum::user_profile_page;\n+pub use ui_action::{parse_html_ui_from_form, HtmlUiAction, HtmlUiParseError, UI_RPC_FIELD};\n \n /// Public profile URL path for a stored username (no `@`).\n pub(crate) fn profile_href(username: &str) -> String {\ndiff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..3bc69ecbb7e16a59d2d393b2d59f9cd3fedb12b1\n--- /dev/null\n+++ b/server/src/html/ui_action.rs\n@@ -0,0 +1,116 @@\n+//! Browser-only UI commands: JSON in hidden `__rpc__` plus hole fill ([`crate::form_template`]).\n+//! Not part of [`slug_types::RpcCommand`] (CLI / JSON API).\n+\n+use crate::form_template::fill_template_from_form;\n+use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n+use std::collections::HashMap;\n+use thiserror::Error;\n+\n+/// Form field name for the compact JSON template (possibly with `{\"$form\":\"…\"}` holes).\n+pub const UI_RPC_FIELD: &str = \"__rpc__\";\n+\n+/// HTML form / fetch `POST /ui` payload after template fill and deserialization.\n+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n+#[serde(tag = \"action\", rename_all = \"snake_case\")]\n+pub enum HtmlUiAction {\n+ /// Same semantics as `POST /post` (forum ingest).\n+ PostIngest {\n+ room: String,\n+ thread_tag: String,\n+ text: String,\n+ #[serde(default)]\n+ error_target: Option,\n+ #[serde(default)]\n+ form_id: Option,\n+ },\n+ /// Same as `POST /post/check`.\n+ CheckIngest {\n+ room: String,\n+ thread_tag: String,\n+ text: String,\n+ #[serde(default)]\n+ error_target: Option,\n+ #[serde(default)]\n+ form_id: Option,\n+ },\n+ /// Same as `POST /post/redact`.\n+ RedactPost {\n+ post_id: String,\n+ },\n+ /// Morph `#public-new-thread-ui-slot` to the new-thread form (or login hint).\n+ ExpandPublicNewThreadForm,\n+ /// Morph `#room-new-thread-ui-slot` for the given room wire id.\n+ ExpandRoomNewThreadForm {\n+ room_wire: String,\n+ },\n+}\n+\n+#[derive(Debug, Error)]\n+pub enum HtmlUiParseError {\n+ #[error(\"missing __rpc__ field\")]\n+ MissingRpc,\n+ #[error(\"invalid template json: {0}\")]\n+ Template(serde_json::Error),\n+ #[error(\"invalid ui action: {0}\")]\n+ Action(serde_json::Error),\n+}\n+\n+/// Parse `__rpc__` JSON, apply `$form` holes from the rest of the form map, deserialize.\n+pub fn parse_html_ui_from_form(form: &HashMap) -> Result {\n+ let template = form\n+ .get(UI_RPC_FIELD)\n+ .ok_or(HtmlUiParseError::MissingRpc)?;\n+ let mut hole_map = form.clone();\n+ hole_map.remove(UI_RPC_FIELD);\n+ let v: Value = fill_template_from_form(template, &hole_map).map_err(HtmlUiParseError::Template)?;\n+ serde_json::from_value(v).map_err(HtmlUiParseError::Action)\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+\n+ #[test]\n+ fn round_trip_post_ingest_with_holes() {\n+ let template = serde_json::json!({\n+ \"action\": \"post_ingest\",\n+ \"room\": \"public\",\n+ \"thread_tag\": {\"$form\": \"thread_tag\"},\n+ \"text\": {\"$form\": \"text\"},\n+ \"error_target\": \"e\",\n+ \"form_id\": \"f\",\n+ });\n+ let mut form = HashMap::new();\n+ form.insert(\n+ UI_RPC_FIELD.to_string(),\n+ serde_json::to_string(&template).unwrap(),\n+ );\n+ form.insert(\"thread_tag\".into(), \"x\".into());\n+ form.insert(\"text\".into(), \"body\".into());\n+\n+ let a = parse_html_ui_from_form(&form).unwrap();\n+ assert_eq!(\n+ a,\n+ HtmlUiAction::PostIngest {\n+ room: \"public\".into(),\n+ thread_tag: \"x\".into(),\n+ text: \"body\".into(),\n+ error_target: Some(\"e\".into()),\n+ form_id: Some(\"f\".into()),\n+ }\n+ );\n+ }\n+\n+ #[test]\n+ fn expand_public_unit_variant() {\n+ let template = serde_json::json!({ \"action\": \"expand_public_new_thread_form\" });\n+ let mut form = HashMap::new();\n+ form.insert(\n+ UI_RPC_FIELD.to_string(),\n+ serde_json::to_string(&template).unwrap(),\n+ );\n+ let a = parse_html_ui_from_form(&form).unwrap();\n+ assert_eq!(a, HtmlUiAction::ExpandPublicNewThreadForm);\n+ }\n+}\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex b9d4b79791ba8dd3a3c26ff777943a2548092de5..5f5b6b0f01b29350c7415e5801ec5caa74f0b452 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -3,6 +3,7 @@ pub mod paths;\n pub mod api;\n pub mod canonical_path;\n pub mod dsl;\n+pub mod form_template;\n pub mod html;\n pub mod event_log;\n pub mod events;\n@@ -33,6 +34,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(\"/ui\", post(api::post_ui_html))\n .route(\"/theme\", post(crate::html::post_theme))\n .route(\"/sse\", get(api::get_html_stream))\n .route(\"/stream\", get(api::get_stream))\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[993d359c] Fix Reddit children import wiring and unranked child labels.\n\nListing imports attach posts directly under the subreddit without ensure_path\npulling comment-path segments in, and the ranking panel shows imported titles.\nUpdate integration tests for JS SSE morphs and children fetch.\n\nCo-authored-by: Cursor \n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex d1defd28242fd2ca3b886adc91a7070bef75e653..e649a7d192feade465e19ce6187a829f6ec74372 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -58,7 +58,7 @@ pub async fn post_ui_html(\n let tree = state.tree.read().await;\n let empty = crate::reducer::NodeState::default();\n let node = tree.get(&parent).unwrap_or(&empty);\n- let panel = ranking_panel(&parent, node);\n+ let panel = ranking_panel(&parent, node, &tree);\n JsBuilder::new()\n .morph_selector(\"#ranking-panel\", panel)\n .into_response()\ndiff --git a/server/src/fetch/mod.rs b/server/src/fetch/mod.rs\nindex 0177bb161cea1b72a100b52efdfc5e710271c9eb..35f968c21c69ca557bab7951413e3cfbbccfebfd 100644\n--- a/server/src/fetch/mod.rs\n+++ b/server/src/fetch/mod.rs\n@@ -107,7 +107,7 @@ pub fn fetch_entity_stream(\n let mut b = JsBuilder::new()\n .morph_selector(\"#entity-section\", html::entity_section(&id, node, false));\n if kind == FetchKind::Children {\n- b = b.morph_selector(\"#ranking-panel\", ranking_panel(&id, node));\n+ b = b.morph_selector(\"#ranking-panel\", ranking_panel(&id, node, &tree));\n }\n yield Ok(js_event(b.build()));\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 27ce9118c73ec5643e04363ab1a36cf5da6101bf..e88cc43ddc9d8100f7994be6f5960ec4d8f22c55 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -15,7 +15,7 @@ use crate::{\n ranking::{\n connected_components_from_voted_pairs, ranked_items_subset, RankedItem, MAX_ITERS, TOL,\n },\n- reducer::NodeState,\n+ reducer::{GlobalTree, NodeState},\n state::AppState,\n ui_action::UI_RPC_FIELD,\n };\n@@ -182,8 +182,15 @@ fn display_label(id: &ItemId) -> String {\n .to_string()\n }\n \n+fn child_label(tree: &GlobalTree, id: &ItemId) -> String {\n+ tree.get(id)\n+ .and_then(|n| n.data.as_ref())\n+ .map(|d| d.title.clone())\n+ .unwrap_or_else(|| display_label(id))\n+}\n+\n /// Plain (unscored) list of children that have no votes yet.\n-fn unranked_list(label: &str, items: &[ItemId]) -> Markup {\n+fn unranked_list(label: &str, items: &[ItemId], tree: &GlobalTree) -> Markup {\n html! {\n @if !items.is_empty() {\n h3 class=\"rank-heading muted small\" { (label) }\n@@ -191,7 +198,7 @@ fn unranked_list(label: &str, items: &[ItemId]) -> Markup {\n @for it in items {\n li {\n a href=(item_href(it)) {\n- strong { (display_label(it)) }\n+ strong { (child_label(tree, it)) }\n }\n }\n }\n@@ -200,7 +207,7 @@ fn unranked_list(label: &str, items: &[ItemId]) -> Markup {\n }\n }\n \n-pub fn ranking_panel(item: &ItemId, node: &NodeState) -> Markup {\n+pub fn ranking_panel(item: &ItemId, node: &NodeState, tree: &GlobalTree) -> Markup {\n let group = &node.local_ranking;\n let n = group.idx_to_item.len();\n let (comps, _isolates) =\n@@ -248,7 +255,7 @@ pub fn ranking_panel(item: &ItemId, node: &NodeState) -> Markup {\n @let label = if multi { format!(\"Ranking group {}\", gi + 1) } else { \"Ranking\".to_string() };\n (rank_list(&label, ranked, 1))\n }\n- (unranked_list(\"Unranked\", &unranked))\n+ (unranked_list(\"Unranked\", &unranked, tree))\n }\n }\n }\n@@ -297,7 +304,7 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n (input_panel(\"\", None))\n (breadcrumb_path(&item))\n (entity_section(&item, node, false))\n- (ranking_panel(&item, node))\n+ (ranking_panel(&item, node, &tree))\n };\n layout(\"sorter2\", body, views)\n }\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex a0eb688709478ee0185b953b41a5d26cc354764d..69d979bc7e4a1cb078f70114dc539bdc1986b574 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -300,9 +300,16 @@ async fn reddit_worker(\n }\n {\n let mut tree = tree.write().await;\n- apply_entity_import(&mut tree, &child_id, child_payload);\n if kind == FetchKind::Children {\n- tree.link_child(&fetch_id, &child_id);\n+ let view = entity_view_from_payload(&child_id, &child_payload);\n+ tree.apply_entity_under_parent(\n+ &fetch_id,\n+ &child_id,\n+ child_payload,\n+ view,\n+ );\n+ } else {\n+ apply_entity_import(&mut tree, &child_id, child_payload);\n }\n }\n written += 1;\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex a36cd5c9287d61536f9f4a3f6b0df2342388857a..4e42d0369dab50bb2f8ca664aa69b628292f6c07 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -209,14 +209,24 @@ impl GlobalTree {\n }\n }\n \n- /// Directly attach `child` under `parent`, bypassing path-based nesting.\n- /// Used for imported listings (e.g. a subreddit's posts) so they show up\n- /// as children of the subreddit rather than a deep `…/comments/` path.\n- pub fn link_child(&mut self, parent: &ItemId, child: &ItemId) {\n+ /// Import entity data for `id` and attach it as a direct child of `parent`\n+ /// without running [`Self::ensure_path`] on `id` (avoids Reddit `/comments/`\n+ /// parent rules pulling intermediate path segments into the subreddit).\n+ pub fn apply_entity_under_parent(\n+ &mut self,\n+ parent: &ItemId,\n+ id: &ItemId,\n+ payload: Value,\n+ view: Option,\n+ ) {\n self.ensure_path(parent);\n- self.ensure_path(child);\n+ self.ensure_node(id);\n+ if let Some(node) = self.nodes.get_mut(id) {\n+ node.entity_raw = Some(payload);\n+ node.data = view;\n+ }\n if let Some(p) = self.nodes.get_mut(parent) {\n- p.children.insert(child.clone());\n+ p.children.insert(id.clone());\n }\n }\n }\ndiff --git a/test/reddit_import.clj b/test/reddit_import.clj\nindex 84cbdcf7965e50290313cbce2243a16b583d2097..45a2a19f20799d77e84d8aa64735ab5e7e45f97c 100644\n--- a/test/reddit_import.clj\n+++ b/test/reddit_import.clj\n@@ -67,6 +67,36 @@\n (do (Thread/sleep 200) (recur))\n false)))))\n \n+(defn- run-reddit-fetch-assertions [app-base data-dir]\n+ (let [browse-url (str app-base \"/~/https://reddit.com/r/rust\")\n+ log-path (str data-dir \"/events.jsonl\")\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 [sse (curl-fetch-ui-sse app-base \"reddit.com/r/rust\" \"self\")]\n+ (is (zero? (:exit sse)) \"POST /ui fetch_entity (self) SSE succeeds\")\n+ (is (str/includes? (:out sse) \"Idiomorph.morph\"))\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+ (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+ (let [children-sse (curl-fetch-ui-sse app-base \"reddit.com/r/rust\" \"children\")]\n+ (is (zero? (:exit children-sse)) \"POST /ui fetch_entity (children) SSE succeeds\")\n+ (is (str/includes? (:out children-sse) \"Idiomorph.morph\"))\n+ (is (str/includes? (:out children-sse) \"Announcing Rust 1.99\")))\n+ (let [after-children (:out (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" browse-url))\n+ log2 (slurp (io/file log-path))]\n+ (is (str/includes? after-children \"Announcing Rust 1.99\"))\n+ (is (str/includes? after-children \"Unranked\"))\n+ (is (str/includes? log2 \"announcing_rust_199\")))))\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@@ -102,24 +132,7 @@\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 [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- (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+ (run-reddit-fetch-assertions app-base data-dir)\n (finally\n (process/destroy proc))))\n (finally\ndiff --git a/test/smoke.clj b/test/smoke.clj\nindex 11887c48282088e140d823a88ba616f6325835b3..ce9f958c84b9a89ae55e215ab519f1df6435e24b 100644\n--- a/test/smoke.clj\n+++ b/test/smoke.clj\n@@ -49,7 +49,7 @@\n (is (wait-health base 15000) \"server responds to /healthz\")\n (let [home (:out (process/shell {:out :string :err :string}\n \"curl\" \"-sf\" (str base \"/\")))]\n- (is (str/includes? home \"vote-panel\"))\n+ (is (str/includes? home \"entity-section\"))\n (is (str/includes? home \"ranking-panel\"))\n (is (str/includes? home \"parser-panel\"))\n (is (str/includes? home \"__rpc__\")))\n","role":"user"}],"model":"openai/gpt-chat-latest"}