{"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[7964b28f] fix\n\nSide A — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 8c43fb75c472b102e6e1d3b837dce3355be898f2..e55d87f32ab32064686431c7082ef8c9ca872d63 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -923,6 +923,15 @@ version = \"0.2.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391\"\n \n+[[package]]\n+name = \"ppv-lite86\"\n+version = \"0.2.21\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9\"\n+dependencies = [\n+ \"zerocopy\",\n+]\n+\n [[package]]\n name = \"prettyplease\"\n version = \"0.2.37\"\n@@ -980,6 +989,36 @@ version = \"6.0.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf\"\n \n+[[package]]\n+name = \"rand\"\n+version = \"0.8.6\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a\"\n+dependencies = [\n+ \"libc\",\n+ \"rand_chacha\",\n+ \"rand_core\",\n+]\n+\n+[[package]]\n+name = \"rand_chacha\"\n+version = \"0.3.1\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88\"\n+dependencies = [\n+ \"ppv-lite86\",\n+ \"rand_core\",\n+]\n+\n+[[package]]\n+name = \"rand_core\"\n+version = \"0.6.4\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c\"\n+dependencies = [\n+ \"getrandom 0.2.17\",\n+]\n+\n [[package]]\n name = \"regex-automata\"\n version = \"0.4.14\"\n@@ -1270,6 +1309,7 @@ dependencies = [\n  \"dotenvy\",\n  \"futures-util\",\n  \"maud\",\n+ \"rand\",\n  \"reqwest\",\n  \"serde\",\n  \"serde_json\",\n@@ -1280,6 +1320,7 @@ dependencies = [\n  \"tower-http 0.5.2\",\n  \"tracing\",\n  \"tracing-subscriber\",\n+ \"urlencoding\",\n ]\n \n [[package]]\n@@ -1656,6 +1697,12 @@ dependencies = [\n  \"serde\",\n ]\n \n+[[package]]\n+name = \"urlencoding\"\n+version = \"2.1.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da\"\n+\n [[package]]\n name = \"utf8_iter\"\n version = \"1.0.4\"\n@@ -2052,6 +2099,26 @@ dependencies = [\n  \"synstructure\",\n ]\n \n+[[package]]\n+name = \"zerocopy\"\n+version = \"0.8.50\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1\"\n+dependencies = [\n+ \"zerocopy-derive\",\n+]\n+\n+[[package]]\n+name = \"zerocopy-derive\"\n+version = \"0.8.50\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639\"\n+dependencies = [\n+ \"proc-macro2\",\n+ \"quote\",\n+ \"syn\",\n+]\n+\n [[package]]\n name = \"zerofrom\"\n version = \"0.1.8\"\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex c940acb687fb141d21760a3d6656172013cf6f41..6fb7bf52fa58f46f5e8fb0f7fd395247b57506d7 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -20,6 +20,8 @@ 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+rand = \"0.8\"\n+urlencoding = \"2\"\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 e649a7d192feade465e19ce6187a829f6ec74372..06001212820101e0cc953d3687dea64f85e60787 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -47,6 +47,7 @@ pub async fn post_ui_html(\n             ratio_left,\n             ratio_right,\n             scope,\n+            next,\n         } => {\n             let parent = parent_from_scope(&scope);\n             if let Err(e) = state\n@@ -56,9 +57,19 @@ pub async fn post_ui_html(\n                 return ui_js_warn(&e).into_response();\n             }\n             let tree = state.tree.read().await;\n+            if !next.trim().is_empty() {\n+                drop(tree);\n+                return JsBuilder::new()\n+                    .raw(&format!(\n+                        \"window.location.href={};\",\n+                        js_string_literal(next.trim())\n+                    ))\n+                    .into_response();\n+            }\n             let empty = crate::reducer::NodeState::default();\n             let node = tree.get(&parent).unwrap_or(&empty);\n             let panel = ranking_panel(&parent, node, &tree);\n+            drop(tree);\n             JsBuilder::new()\n                 .morph_selector(\"#ranking-panel\", panel)\n                 .into_response()\n@@ -126,6 +137,7 @@ mod tests {\n                 ratio_left: 3,\n                 ratio_right: 1,\n                 scope: String::new(),\n+                next: String::new(),\n             }\n         );\n     }\ndiff --git a/server/src/form_template.rs b/server/src/form_template.rs\nindex b9bc3982a125e94e67c99175ea9055979541abba..bd4a7195a6eaabfed55333bab5640708ea108b81 100644\n--- a/server/src/form_template.rs\n+++ b/server/src/form_template.rs\n@@ -7,19 +7,30 @@ pub fn template_json_compact<T: Serialize>(v: &T) -> serde_json::Result<String>\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+/// Recursively walk the JSON AST and replace form holes with submitted values.\n+///\n+/// - `{\"$form\": \"key\"}` → string (empty if missing)\n+/// - `{\"$form:i32\": \"key\"}` → JSON number (0 if missing or unparseable)\n pub fn substitute_form_vars(val: &mut Value, form_data: &HashMap<String, String>) {\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+                if let Some((hole_key, Value::String(field_name))) = map.iter().next() {\n+                    if let Some(form_type) = hole_key.strip_prefix(\"$form\") {\n+                        let submitted = form_data\n+                            .get(field_name.as_str())\n+                            .map(|s| s.as_str())\n+                            .unwrap_or(\"\");\n+                        *val = match form_type {\n+                            \"\" => Value::String(submitted.to_string()),\n+                            \":i32\" => {\n+                                let n: i32 = submitted.trim().parse().unwrap_or(0);\n+                                Value::Number(n.into())\n+                            }\n+                            _ => Value::String(submitted.to_string()),\n+                        };\n+                        return;\n+                    }\n                 }\n             }\n             for v in map.values_mut() {\n@@ -62,6 +73,45 @@ mod tests {\n         text: String,\n     }\n \n+    #[test]\n+    fn i32_holes_become_numbers() {\n+        let json = r#\"{\n+            \"ratio_left\": {\"$form:i32\": \"ratio_left\"},\n+            \"ratio_right\": {\"$form:i32\": \"ratio_right\"}\n+        }\"#;\n+        let mut form = HashMap::new();\n+        form.insert(\"ratio_left\".into(), \"75\".into());\n+        form.insert(\"ratio_right\".into(), \"25\".into());\n+        let v = fill_template_from_form(json, &form).unwrap();\n+        assert_eq!(v[\"ratio_left\"], 75);\n+        assert_eq!(v[\"ratio_right\"], 25);\n+\n+        #[derive(Debug, Deserialize, PartialEq, Eq)]\n+        struct Ratios {\n+            ratio_left: i32,\n+            ratio_right: i32,\n+        }\n+        let r: Ratios = serde_json::from_value(v).unwrap();\n+        assert_eq!(\n+            r,\n+            Ratios {\n+                ratio_left: 75,\n+                ratio_right: 25,\n+            }\n+        );\n+    }\n+\n+    #[test]\n+    fn i32_hole_missing_or_bad_defaults_to_zero() {\n+        let json = r#\"{\"n\": {\"$form:i32\": \"missing\"}}\"#;\n+        let v = fill_template_from_form(json, &HashMap::new()).unwrap();\n+        assert_eq!(v[\"n\"], 0);\n+        let mut form = HashMap::new();\n+        form.insert(\"missing\".into(), \"nope\".into());\n+        let v = fill_template_from_form(json, &form).unwrap();\n+        assert_eq!(v[\"n\"], 0);\n+    }\n+\n     #[test]\n     fn holes_become_strings() {\n         let json = r#\"{\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 3bf9fc7e92e50beed24e2c25106a77421038c90b..61cdbc094819ddedb755572c59456ec0d6617619 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -20,6 +20,8 @@ use crate::{\n     ui_action::UI_RPC_FIELD,\n };\n \n+pub mod vote;\n+\n const SORTER_CSS: &str = include_str!(\"../../static/sorter.css\");\n const SORTER_UI_JS: &str = include_str!(\"../../static/sorter_ui.js\");\n \n@@ -131,7 +133,7 @@ fn layout(title: &str, body: Markup, views: u64) -> Markup {\n     }\n }\n \n-fn item_href(id: &ItemId) -> String {\n+pub(crate) fn item_href(id: &ItemId) -> String {\n     id.browse_href()\n }\n \n@@ -309,11 +311,23 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n     let empty_node = NodeState::default();\n     let node = tree.get(&item).unwrap_or(&empty_node);\n \n+    let child_count = node.children.len();\n+    let vote_link = if child_count >= 2 {\n+        Some(vote::vote_href(&item))\n+    } else {\n+        None\n+    };\n+\n     let body = html! {\n         h1 { \"sorter\" }\n         (input_panel(\"\", None))\n         (breadcrumb_path(&item))\n         (entity_section(&item, node, false))\n+        @if let Some(href) = vote_link {\n+            p class=\"vote-cta\" {\n+                a class=\"btn-primary\" href=(href) data-testid=\"vote-children\" { \"Vote on children\" }\n+            }\n+        }\n         (ranking_panel(&item, node, &tree))\n     };\n     layout(\"sorter2\", body, views)\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex da5f3ebecec1794b05a2a69cc78379551b2ad769..7f7e28c8ac3758de87f1f8e073b24be4132d38da 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -4,6 +4,7 @@ pub mod events;\n pub mod fetch;\n pub mod form_template;\n pub mod html;\n+pub mod pair;\n pub mod parser;\n pub mod path_types;\n pub mod ranking;\n@@ -33,6 +34,7 @@ pub fn create_app(state: AppState) -> Router {\n         .route(\"/static/:filename\", get(crate::html::serve_static))\n         .route(\"/~/*item_path\", get(crate::html::browse))\n         .route(\"/\", get(crate::html::home))\n+        .route(\"/vote\", get(crate::html::vote::vote_page))\n         .route(\"/ui\", post(crate::api::ui_html::post_ui_html))\n         .with_state(state)\n         .layer(TraceLayer::new_for_http())\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex 2047713762c932ac9bc325fe15624f2aecb3364d..53581e1362bfcc5dfb4ae3069c41ea6f7be41437 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -31,6 +31,9 @@ pub enum HtmlUiAction {\n         /// Parent node [`ItemId`] string; empty = tree root.\n         #[serde(default)]\n         scope: String,\n+        /// After vote, navigate here (vote compare page).\n+        #[serde(default)]\n+        next: String,\n     },\n     /// Parse pasted Reddit URL/path; redirect to subreddit ranking on success.\n     ParseQuery {\n@@ -70,6 +73,36 @@ pub fn parse_html_ui_from_form(\n mod tests {\n     use super::*;\n \n+    #[test]\n+    fn record_vote_round_trip_with_typed_ratio_holes() {\n+        let template = serde_json::json!({\n+            \"action\": \"record_vote\",\n+            \"a\": \"x\",\n+            \"b\": \"y\",\n+            \"ratio_left\": {\"$form:i32\": \"ratio_left\"},\n+            \"ratio_right\": {\"$form:i32\": \"ratio_right\"},\n+            \"scope\": \"parent\",\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(\"ratio_left\".into(), \"60\".into());\n+        form.insert(\"ratio_right\".into(), \"40\".into());\n+        assert_eq!(\n+            parse_html_ui_from_form(&form).unwrap(),\n+            HtmlUiAction::RecordVote {\n+                a: \"x\".into(),\n+                b: \"y\".into(),\n+                ratio_left: 60,\n+                ratio_right: 40,\n+                scope: \"parent\".into(),\n+                next: String::new(),\n+            }\n+        );\n+    }\n+\n     #[test]\n     fn record_vote_round_trip_with_form_holes() {\n         let template = serde_json::json!({\n@@ -96,6 +129,7 @@ mod tests {\n                 ratio_left: 2,\n                 ratio_right: 1,\n                 scope: \"amitheasshole\".into(),\n+                next: String::new(),\n             }\n         );\n     }\n@@ -122,6 +156,7 @@ mod tests {\n                 ratio_left: 2,\n                 ratio_right: 1,\n                 scope: String::new(),\n+                next: String::new(),\n             }\n         );\n     }\ndiff --git a/server/static/sorter.css b/server/static/sorter.css\nindex 021918f8e778b84e4b3eac8559fab7d223a3d490..3c2cec5cb5094013387147c621d75bd341bc06cc 100644\n--- a/server/static/sorter.css\n+++ b/server/static/sorter.css\n@@ -224,4 +224,148 @@ code {\n \n h1 {\n   margin: 0;\n+}\n+\n+.vote-cta {\n+  margin: 0.75rem 0;\n+}\n+\n+.vote-compare-shell {\n+  max-width: 960px;\n+}\n+\n+.vote-compare-scope {\n+  margin: 0.5rem 0 1rem;\n+}\n+\n+.vote-compare-pair {\n+  display: grid;\n+  grid-template-columns: 1fr auto 1fr;\n+  gap: 1rem;\n+  align-items: start;\n+  margin: 1rem 0;\n+}\n+\n+.vote-compare-vs {\n+  align-self: center;\n+  font-size: 1.25rem;\n+  color: var(--muted);\n+  font-weight: 600;\n+}\n+\n+.vote-compare-side {\n+  background: var(--panel);\n+  border: 1px solid var(--border);\n+  border-radius: 8px;\n+  padding: 1rem;\n+  min-height: 120px;\n+}\n+\n+.vote-compare-item {\n+  color: var(--accent);\n+  text-decoration: none;\n+  display: block;\n+}\n+\n+.vote-compare-item:hover {\n+  text-decoration: underline;\n+}\n+\n+.vote-compare-figure {\n+  margin: 0.75rem 0 0;\n+}\n+\n+.vote-compare-image {\n+  display: block;\n+  max-width: 100%;\n+  height: auto;\n+  border-radius: 6px;\n+  border: 1px solid var(--border);\n+}\n+\n+.vote-compare-item-body {\n+  margin-top: 0.75rem;\n+  font-size: 0.9rem;\n+}\n+\n+.vote-compare-nav {\n+  display: flex;\n+  justify-content: space-between;\n+  align-items: center;\n+  gap: 1rem;\n+  margin: 1rem 0;\n+}\n+\n+.vote-compare-next {\n+  color: var(--accent);\n+  text-decoration: none;\n+}\n+\n+.vote-compare-next.is-disabled {\n+  color: var(--muted);\n+}\n+\n+.vote-compare-back {\n+  text-decoration: none;\n+}\n+\n+.vote-compare-back:hover {\n+  text-decoration: underline;\n+}\n+\n+.vote-compare-slider-label {\n+  display: grid;\n+  grid-template-columns: 1fr auto 1fr;\n+  gap: 0.75rem;\n+  align-items: center;\n+  margin: 1.25rem 0;\n+}\n+\n+.vote-compare-slider-label input[type=\"range\"] {\n+  width: 100%;\n+  min-width: 160px;\n+}\n+\n+#vote-slider-left-label {\n+  text-align: right;\n+}\n+\n+#vote-slider-right-label {\n+  text-align: left;\n+}\n+\n+.vote-edge-history-title {\n+  margin: 1.5rem 0 0.5rem;\n+  font-size: 1rem;\n+}\n+\n+.vote-edge-history {\n+  list-style: none;\n+  padding: 0;\n+  margin: 0;\n+}\n+\n+.vote-edge-history-row {\n+  margin-bottom: 0.75rem;\n+}\n+\n+.vote-edge-meta {\n+  font-size: 0.875rem;\n+  margin-bottom: 0.25rem;\n+}\n+\n+.ratio-bar {\n+  display: flex;\n+  height: 8px;\n+  border-radius: 4px;\n+  overflow: hidden;\n+  background: var(--border);\n+}\n+\n+.ratio-left {\n+  background: var(--accent);\n+}\n+\n+.ratio-right {\n+  background: var(--muted);\n }\n\\ No newline at end of file\ndiff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js\nindex 62c9158ecb3c2140b83efd2b27ea706a9e0ae127..c8d7c3ef2413399ced7898a7edb3e7a2c8e16163 100644\n--- a/server/static/sorter_ui.js\n+++ b/server/static/sorter_ui.js\n@@ -81,7 +81,22 @@\n     });\n   }\n \n+  function initVoteSlider() {\n+    var slider = document.getElementById('vote-preference-slider');\n+    if (!slider) return;\n+    var leftInput = document.getElementById('vote-ratio-left');\n+    var rightInput = document.getElementById('vote-ratio-right');\n+    function update() {\n+      var v = parseInt(slider.value, 10);\n+      if (leftInput) leftInput.value = String(v);\n+      if (rightInput) rightInput.value = String(100 - v);\n+    }\n+    slider.addEventListener('input', update);\n+    update();\n+  }\n+\n   function initSorterUi() {\n+    initVoteSlider();\n     document.addEventListener('submit', async function (e) {\n       var f = e.target;\n       if (!f || f.tagName !== 'FORM') return;\n@@ -89,10 +104,11 @@\n       if (f.getAttribute('data-navigate') === 'full') return;\n       e.preventDefault();\n       await postUiForm(f);\n-      if (f.id === 'vote-form') {\n+      if (f.id === 'vote-form' || f.id === 'vote-compare-form') {\n         f.reset();\n-        var firstField = f.querySelector('input[type=\"text\"]');\n-        if (firstField) firstField.focus();\n+        var slider = f.querySelector('#vote-preference-slider');\n+        if (slider) slider.value = '50';\n+        initVoteSlider();\n       }\n     });\n   }\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[c3cbcaa7] refactor\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/auth.rs b/server/src/api/auth.rs\nindex b3631b06153d52f88348fef927e7a024b7b85ad6..cd556eb89e9dd8203eba6c8969ffd144db5d329d 100644\n--- a/server/src/api/auth.rs\n+++ b/server/src/api/auth.rs\n@@ -71,6 +71,24 @@ pub fn optional_principal(headers: &HeaderMap, jar: &CookieJar, reduced: &Reduce\n     verify_token(reduced, c.value()).ok()\n }\n \n+/// Browser session: principal + bearer token string (same shape as CLI session cookie).\n+#[derive(Debug, Clone)]\n+pub struct WebSession {\n+    pub username: String,\n+    pub bearer: String,\n+}\n+\n+/// Resolve username and bearer together for `POST /ui` dispatch (one read of headers + jar).\n+pub fn resolve_web_session(headers: &HeaderMap, jar: &CookieJar, reduced: &ReducerState) -> Option<WebSession> {\n+    let username = optional_principal(headers, jar, reduced)?;\n+    let bearer = headers\n+        .get(header::AUTHORIZATION)\n+        .and_then(|v| v.to_str().ok())\n+        .and_then(|s| s.strip_prefix(\"Bearer \").map(|t| t.trim().to_string()))\n+        .or_else(|| jar.get(SLUG_SESSION_COOKIE).map(|c| c.value().to_string()))?;\n+    Some(WebSession { username, bearer })\n+}\n+\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)\ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex a986f706ea4b261cbaf004c02b4cf84184b41371..4e223a7460997c464706dca850281447bd754ed5 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -4,7 +4,6 @@ mod rpc;\n mod stream;\n mod validate;\n mod ui_html;\n-mod web_post;\n \n pub use auth::{\n     get_join_invite,\n@@ -19,7 +18,9 @@ pub use auth::{\n     get_web_login,\n     get_logout,\n     optional_principal,\n+    resolve_web_session,\n     session_cookie_header_value,\n+    WebSession,\n     SLUG_SESSION_COOKIE,\n };\n \n@@ -35,7 +36,6 @@ pub use stream::{get_html_stream, get_stream};\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)]\n mod tests {\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex 2b40a72059981d558768f73d189b991f3448c257..497f8fdd222a8ec7c3d76b0695e0352e973ca3ba 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -1,25 +1,29 @@\n-//! Single `POST /ui` entry for browser [`crate::html::ui_action::HtmlUiAction`] (JSON in `__rpc__` + holes).\n+//! Single `POST /ui` entry: parse `__rpc__` → [`HtmlUiAction`], resolve [`WebSession`] once, dispatch.\n \n use axum::{\n-    body::Body,\n+    body,\n     extract::State,\n-    http::{header, HeaderMap, StatusCode},\n+    http::{header, HeaderMap, HeaderValue, StatusCode},\n     response::{IntoResponse, Response},\n     Form,\n };\n use axum_extra::extract::cookie::CookieJar;\n+use slug_types::{RpcBatch, RpcBatchResponse, RpcCommand, RpcResult};\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+        auth::{resolve_web_session, WebSession},\n+        handle_rpc_batch,\n+        rpc::{rpc_post_redact, rpc_post_with_bearer},\n     },\n+    canonical_path::canonicalize_tag,\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+        parse_html_ui_from_form, thread_feed_html, thread_feed_html_for_room, thread_feed_region_markup,\n+        user_can_post_room, user_can_view_room, HtmlUiAction, JsBuilder, ThreadNav,\n     },\n+    reducer::{scope_from_room_wire, ScopeId},\n     state::AppState,\n };\n \n@@ -34,6 +38,19 @@ pub async fn post_ui_html(\n         Err(e) => return ui_js_warn(&e.to_string()).into_response(),\n     };\n \n+    let reduced = state.reduced.read().await;\n+    let session = resolve_web_session(&headers, &jar, &reduced);\n+    drop(reduced);\n+\n+    dispatch_ui_action(&state, session.as_ref(), action).await\n+}\n+\n+/// All UI command logic: HTTP extractors stop above; this only sees [`AppState`], session, and [`HtmlUiAction`].\n+async fn dispatch_ui_action(\n+    state: &AppState,\n+    session: Option<&WebSession>,\n+    action: HtmlUiAction,\n+) -> Response {\n     match action {\n         HtmlUiAction::PostIngest {\n             room,\n@@ -42,47 +59,87 @@ pub async fn post_ui_html(\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+            let Some(session) = session else {\n+                return js_redirect(\"/login\").into_response();\n+            };\n+            let room = room.trim().to_string();\n+            let thread_tag = thread_tag.trim().to_string();\n+            if text.trim().is_empty() {\n+                return form_js_error(\n+                    error_target.as_ref(),\n+                    \"empty post\",\n+                    \"Write something in the text area (DSL / prose).\",\n+                )\n+                .into_response();\n+            }\n+            match rpc_post_with_bearer(state, &session.bearer, room.clone(), thread_tag.clone(), text).await {\n+                Ok(RpcResult::PostOk { .. }) => {\n+                    post_success_response(\n+                        state,\n+                        &room,\n+                        &thread_tag,\n+                        error_target.as_ref(),\n+                        form_id.as_ref(),\n+                        Some(session.username.as_str()),\n+                    )\n+                    .await\n+                    .into_response()\n+                }\n+                Ok(_) => form_js_error(\n+                    error_target.as_ref(),\n+                    \"unexpected response\",\n+                    \"Post did not return PostOk.\",\n+                )\n+                .into_response(),\n+                Err((msg, hint)) => form_js_error(error_target.as_ref(), &msg, hint.as_deref().unwrap_or(\"\")).into_response(),\n+            }\n         }\n         HtmlUiAction::CheckIngest {\n             room,\n             thread_tag,\n             text,\n             error_target,\n-            form_id,\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+            let Some(session) = session else {\n+                return js_redirect(\"/login\").into_response();\n+            };\n+            let room = room.trim().to_string();\n+            let thread_tag = canonicalize_tag(&thread_tag);\n+            if thread_tag.is_empty() {\n+                return form_js_error(\n+                    error_target.as_ref(),\n+                    \"missing thread tag\",\n+                    \"Set a thread tag before posting.\",\n+                )\n+                .into_response();\n+            }\n+            if text.trim().is_empty() {\n+                return js_clear_errors(&form_error_target(error_target.as_ref())).into_response();\n+            }\n+            match rpc_check_with_bearer(state, &session.bearer, room, text.clone()).await {\n+                Ok(RpcResult::CheckOk { .. }) => js_clear_errors(&form_error_target(error_target.as_ref())).into_response(),\n+                Ok(_) => form_js_error(error_target.as_ref(), \"unexpected response\", \"Check did not return CheckOk.\").into_response(),\n+                Err((msg, hint)) => form_js_error(error_target.as_ref(), &msg, hint.as_deref().unwrap_or(\"\")).into_response(),\n+            }\n         }\n         HtmlUiAction::RedactPost { post_id } => {\n-            run_post_web_redact(&state, &headers, &jar, WebRedactForm { post_id }).await\n+            let Some(session) = session else {\n+                return js_redirect(\"/login\").into_response();\n+            };\n+            let h = headers_from_bearer(&session.bearer);\n+            match rpc_post_redact(state, &h, 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+                    js_error(\"#errors\", &msg, detail).into_response()\n+                }\n+            }\n         }\n         HtmlUiAction::ExpandPublicNewThreadForm => {\n             let reduced = state.reduced.read().await;\n-            let user = optional_principal(&headers, &jar, &reduced);\n+            let user = session.map(|s| s.username.as_str());\n             drop(reduced);\n             let markup = if user.is_some() {\n                 fragment_public_new_thread_form(true)\n@@ -99,18 +156,18 @@ pub async fn post_ui_html(\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+            let user = session.map(|s| s.username.as_str());\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+            if !user_can_view_room(&reduced, &room_wire, user) {\n                 drop(reduced);\n                 return ui_js_warn(\"forbidden\").into_response();\n             }\n-            let can_post = user\n+            let can_post = session\n                 .as_ref()\n-                .map(|u| user_can_post_room(&reduced, &room_wire, u))\n+                .map(|s| user_can_post_room(&reduced, &room_wire, &s.username))\n                 .unwrap_or(false);\n             drop(reduced);\n             let Some(nav) = ThreadNav::from_room_id(&room_wire) else {\n@@ -128,12 +185,195 @@ pub async fn post_ui_html(\n     }\n }\n \n+fn headers_from_bearer(bearer: &str) -> HeaderMap {\n+    let mut headers = HeaderMap::new();\n+    if let Ok(hv) = HeaderValue::from_str(&format!(\"Bearer {bearer}\")) {\n+        headers.insert(header::AUTHORIZATION, hv);\n+    }\n+    headers\n+}\n+\n+fn post_redirect_location(room: &str, thread_tag: &str) -> String {\n+    let tag = canonicalize_tag(thread_tag);\n+    if room.trim() == \"public\" {\n+        format!(\"/t/{tag}\")\n+    } else {\n+        let room = room.trim();\n+        let Some((a, b)) = room.split_once('/') else {\n+            return \"/\".to_string();\n+        };\n+        format!(\"/r/{a}/{b}/t/{tag}\")\n+    }\n+}\n+\n+fn js_quote(s: &str) -> String {\n+    serde_json::to_string(s).expect(\"js string escaping must succeed\")\n+}\n+\n+fn js_redirect(to: &str) -> Response {\n+    let js = format!(\"window.location = {};\", js_quote(to));\n+    Response::builder()\n+        .status(StatusCode::OK)\n+        .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n+        .body(axum::body::Body::from(js))\n+        .unwrap()\n+}\n+\n+fn js_error(error_target: &str, title: &str, detail: &str) -> Response {\n+    let markup = maud::html! {\n+        div id=(error_target.trim_start_matches('#')) {\n+            p class=\"auth-error\" { (title) }\n+            @if !detail.is_empty() {\n+                pre class=\"muted\" { (detail) }\n+            }\n+        }\n+    };\n+    JsBuilder::new()\n+        .morph_selector(error_target, markup)\n+        .into_response()\n+}\n+\n+fn form_error_target(error_target: Option<&String>) -> String {\n+    error_target\n+        .map(|s| s.as_str())\n+        .filter(|s| !s.trim().is_empty())\n+        .map(|s| {\n+            if s.starts_with('#') {\n+                s.to_string()\n+            } else {\n+                format!(\"#{s}\")\n+            }\n+        })\n+        .unwrap_or_else(|| \"#errors\".to_string())\n+}\n+\n+fn form_js_error(error_target: Option<&String>, title: &str, detail: &str) -> Response {\n+    js_error(&form_error_target(error_target), title, detail)\n+}\n+\n+fn js_clear_errors(error_target: &str) -> Response {\n+    let markup = maud::html! {\n+        div id=(error_target.trim_start_matches('#')) {}\n+    };\n+    JsBuilder::new()\n+        .morph_selector(error_target, markup)\n+        .into_response()\n+}\n+\n+fn empty_error_markup(error_target: &str) -> maud::Markup {\n+    maud::html! {\n+        div id=(error_target.trim_start_matches('#')) {}\n+    }\n+}\n+\n+async fn rpc_check_with_bearer(\n+    state: &AppState,\n+    bearer_token: &str,\n+    room: String,\n+    text: String,\n+) -> Result<RpcResult, (String, Option<String>)> {\n+    let mut headers = HeaderMap::new();\n+    let hv = HeaderValue::from_str(&format!(\"Bearer {bearer_token}\"))\n+        .map_err(|_| (\"invalid session token\".into(), None))?;\n+    headers.insert(header::AUTHORIZATION, hv);\n+\n+    let response = handle_rpc_batch(\n+        State(state.clone()),\n+        headers,\n+        axum::Json(RpcBatch(vec![RpcCommand::Check { room, text }])),\n+    )\n+    .await\n+    .into_response();\n+\n+    let status = response.status();\n+    if !status.is_success() {\n+        return Err((format!(\"rpc check http {}\", status), None));\n+    }\n+\n+    let body = body::to_bytes(response.into_body(), usize::MAX)\n+        .await\n+        .map_err(|e| (e.to_string(), None))?;\n+    let parsed: RpcBatchResponse =\n+        serde_json::from_slice(&body).map_err(|e| (e.to_string(), None))?;\n+    let line = parsed\n+        .results\n+        .into_iter()\n+        .next()\n+        .ok_or_else(|| (\"empty rpc check response\".to_string(), None))?;\n+    if line.ok {\n+        line.result\n+            .ok_or_else(|| (\"missing rpc check result\".to_string(), None))\n+    } else {\n+        Err((\n+            line.error.unwrap_or_else(|| \"check failed\".to_string()),\n+            line.hint,\n+        ))\n+    }\n+}\n+\n+async fn post_success_response(\n+    state: &AppState,\n+    room: &str,\n+    thread_tag: &str,\n+    error_target: Option<&String>,\n+    form_id: Option<&String>,\n+    viewer: Option<&str>,\n+) -> Response {\n+    let error_target = form_error_target(error_target);\n+    let room = room.trim().to_string();\n+    let thread_tag = canonicalize_tag(thread_tag);\n+    let thread_location = post_redirect_location(&room, &thread_tag);\n+    let form_id = form_id.map(|s| s.as_str()).unwrap_or(\"\");\n+    let scope = scope_from_room_wire(&room);\n+    let feed_markup = match &scope {\n+        ScopeId::Public => thread_feed_html(state).await,\n+        ScopeId::Room(_) => thread_feed_html_for_room(state, &room).await,\n+    };\n+    let thread_markup = thread_feed_region_markup(\n+        state,\n+        match &scope {\n+            ScopeId::Public => None,\n+            ScopeId::Room(_) => Some(room.as_str()),\n+        },\n+        &thread_tag,\n+        viewer.as_deref(),\n+    )\n+    .await;\n+    let feed_selector = match &scope {\n+        ScopeId::Public => \"#thread-feed\",\n+        ScopeId::Room(_) => \"#room-thread-feed\",\n+    };\n+\n+    let builder = JsBuilder::new()\n+        .morph_selector(&error_target, empty_error_markup(&error_target))\n+        .morph_selector(feed_selector, feed_markup)\n+        .if_current_path_matches(&thread_location, |builder| {\n+            let builder = builder.morph_selector(\"#thread-feed-region\", thread_markup);\n+            let builder = if !form_id.trim().is_empty() {\n+                builder.qs(&format!(\"#{form_id}\")).reset()\n+            } else {\n+                builder\n+            };\n+            builder\n+        })\n+        .if_current_path_not_matches(&thread_location, |builder| builder.redirect(&thread_location));\n+\n+    builder.into_response()\n+}\n+\n+async fn redact_success_response(state: &AppState) -> Response {\n+    let feed_markup = thread_feed_html(state).await;\n+    JsBuilder::new()\n+        .morph_selector(\"#thread-feed\", feed_markup)\n+        .into_response()\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+        .body(axum::body::Body::from(js))\n         .unwrap()\n }\ndiff --git a/server/src/api/web_post.rs b/server/src/api/web_post.rs\ndeleted file mode 100644\nindex 265025f41ff1548d05b2d2d5d84202245388053f..0000000000000000000000000000000000000000\n--- a/server/src/api/web_post.rs\n+++ /dev/null\n@@ -1,362 +0,0 @@\n-use axum::{\n-    body,\n-    extract::State,\n-    http::{header, HeaderMap, HeaderValue, StatusCode},\n-    response::{IntoResponse, Response},\n-    Form,\n-};\n-use axum_extra::extract::cookie::CookieJar;\n-use serde::Deserialize;\n-use slug_types::{RpcBatch, RpcBatchResponse, RpcCommand, RpcResult};\n-\n-use crate::{\n-    api::{\n-        auth::{optional_principal, SLUG_SESSION_COOKIE},\n-        handle_rpc_batch,\n-        rpc::{rpc_post_redact, rpc_post_with_bearer},\n-    },\n-    canonical_path::canonicalize_tag,\n-    html::{thread_feed_html, thread_feed_html_for_room, thread_feed_region_markup, JsBuilder},\n-    reducer::{scope_from_room_wire, ScopeId},\n-    state::AppState,\n-};\n-\n-#[derive(Debug, Deserialize)]\n-pub struct WebPostForm {\n-    pub room: String,\n-    pub thread_tag: String,\n-    pub text: String,\n-    #[serde(default)]\n-    pub error_target: Option<String>,\n-    #[serde(default)]\n-    pub form_id: Option<String>,\n-}\n-\n-#[derive(Debug, Deserialize)]\n-pub struct WebRedactForm {\n-    pub post_id: String,\n-}\n-\n-fn post_redirect_location(room: &str, thread_tag: &str) -> String {\n-    let tag = canonicalize_tag(thread_tag);\n-    if room.trim() == \"public\" {\n-        format!(\"/t/{tag}\")\n-    } else {\n-        let room = room.trim();\n-        let Some((a, b)) = room.split_once('/') else {\n-            return \"/\".to_string();\n-        };\n-        format!(\"/r/{a}/{b}/t/{tag}\")\n-    }\n-}\n-\n-fn js_quote(s: &str) -> String {\n-    serde_json::to_string(s).expect(\"js string escaping must succeed\")\n-}\n-\n-fn js_redirect(to: &str) -> Response {\n-    let js = format!(\"window.location = {};\", js_quote(to));\n-    Response::builder()\n-        .status(StatusCode::OK)\n-        .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n-        .body(axum::body::Body::from(js))\n-        .unwrap()\n-}\n-\n-fn js_error(error_target: &str, title: &str, detail: &str) -> Response {\n-    let markup = maud::html! {\n-        div id=(error_target.trim_start_matches('#')) {\n-            p class=\"auth-error\" { (title) }\n-            @if !detail.is_empty() {\n-                pre class=\"muted\" { (detail) }\n-            }\n-        }\n-    };\n-    JsBuilder::new()\n-        .morph_selector(error_target, markup)\n-        .into_response()\n-}\n-\n-fn form_error_target(form: &WebPostForm) -> String {\n-    form.error_target\n-        .as_deref()\n-        .filter(|s| !s.trim().is_empty())\n-        .map(|s| {\n-            if s.starts_with('#') {\n-                s.to_string()\n-            } else {\n-                format!(\"#{s}\")\n-            }\n-        })\n-        .unwrap_or_else(|| \"#errors\".to_string())\n-}\n-\n-fn form_js_error(form: &WebPostForm, title: &str, detail: &str) -> Response {\n-    js_error(&form_error_target(form), title, detail)\n-}\n-\n-fn js_clear_errors(error_target: &str) -> Response {\n-    let markup = maud::html! {\n-        div id=(error_target.trim_start_matches('#')) {}\n-    };\n-    JsBuilder::new()\n-        .morph_selector(error_target, markup)\n-        .into_response()\n-}\n-\n-fn empty_error_markup(error_target: &str) -> maud::Markup {\n-    maud::html! {\n-        div id=(error_target.trim_start_matches('#')) {}\n-    }\n-}\n-\n-async fn rpc_check_with_bearer(\n-    state: &AppState,\n-    bearer_token: &str,\n-    room: String,\n-    text: String,\n-) -> Result<RpcResult, (String, Option<String>)> {\n-    let mut headers = HeaderMap::new();\n-    let hv = HeaderValue::from_str(&format!(\"Bearer {bearer_token}\"))\n-        .map_err(|_| (\"invalid session token\".into(), None))?;\n-    headers.insert(header::AUTHORIZATION, hv);\n-\n-    let response = handle_rpc_batch(\n-        State(state.clone()),\n-        headers,\n-        axum::Json(RpcBatch(vec![RpcCommand::Check { room, text }])),\n-    )\n-    .await\n-    .into_response();\n-\n-    let status = response.status();\n-    if !status.is_success() {\n-        return Err((format!(\"rpc check http {}\", status), None));\n-    }\n-\n-    let body = body::to_bytes(response.into_body(), usize::MAX)\n-        .await\n-        .map_err(|e| (e.to_string(), None))?;\n-    let parsed: RpcBatchResponse =\n-        serde_json::from_slice(&body).map_err(|e| (e.to_string(), None))?;\n-    let line = parsed\n-        .results\n-        .into_iter()\n-        .next()\n-        .ok_or_else(|| (\"empty rpc check response\".to_string(), None))?;\n-    if line.ok {\n-        line.result\n-            .ok_or_else(|| (\"missing rpc check result\".to_string(), None))\n-    } else {\n-        Err((\n-            line.error.unwrap_or_else(|| \"check failed\".to_string()),\n-            line.hint,\n-        ))\n-    }\n-}\n-\n-fn post_success_response<'a>(\n-    state: &'a AppState,\n-    form: &'a WebPostForm,\n-    headers: &'a HeaderMap,\n-    jar: &'a CookieJar,\n-) -> impl std::future::Future<Output = Response> + 'a {\n-    async move {\n-        let error_target = form_error_target(form);\n-        let room = form.room.trim().to_string();\n-        let thread_tag = canonicalize_tag(&form.thread_tag);\n-        let thread_location = post_redirect_location(&room, &thread_tag);\n-        let form_id = form.form_id.as_deref().unwrap_or_default();\n-        let scope = scope_from_room_wire(&room);\n-        let viewer = {\n-            let reduced = state.reduced.read().await;\n-            optional_principal(headers, jar, &reduced)\n-        };\n-        let feed_markup = match &scope {\n-            ScopeId::Public => thread_feed_html(state).await,\n-            ScopeId::Room(_) => thread_feed_html_for_room(state, &room).await,\n-        };\n-        let thread_markup = thread_feed_region_markup(\n-            state,\n-            match &scope {\n-                ScopeId::Public => None,\n-                ScopeId::Room(_) => Some(room.as_str()),\n-            },\n-            &thread_tag,\n-            viewer.as_deref(),\n-        )\n-        .await;\n-        let feed_selector = match &scope {\n-            ScopeId::Public => \"#thread-feed\",\n-            ScopeId::Room(_) => \"#room-thread-feed\",\n-        };\n-\n-        let builder = JsBuilder::new()\n-            .morph_selector(&error_target, empty_error_markup(&error_target))\n-            .morph_selector(feed_selector, feed_markup)\n-            .if_current_path_matches(&thread_location, |builder| {\n-                let builder = builder.morph_selector(\"#thread-feed-region\", thread_markup);\n-                let builder = if !form_id.trim().is_empty() {\n-                    builder.qs(&format!(\"#{form_id}\")).reset()\n-                } else {\n-                    builder\n-                };\n-                builder\n-            })\n-            .if_current_path_not_matches(&thread_location, |builder| builder.redirect(&thread_location));\n-\n-        builder.into_response()\n-    }\n-}\n-\n-async fn redact_success_response(state: &AppState) -> Response {\n-    let feed_markup = thread_feed_html(state).await;\n-    JsBuilder::new()\n-        .morph_selector(\"#thread-feed\", feed_markup)\n-        .into_response()\n-}\n-\n-pub async fn post_web_redact(\n-    State(state): State<AppState>,\n-    headers: HeaderMap,\n-    jar: CookieJar,\n-    Form(form): Form<WebRedactForm>,\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-        drop(reduced);\n-        return js_redirect(\"/login\").into_response();\n-    };\n-    drop(reduced);\n-\n-    let bearer = headers\n-        .get(axum::http::header::AUTHORIZATION)\n-        .and_then(|v| v.to_str().ok())\n-        .and_then(|s| s.strip_prefix(\"Bearer \").map(|t| t.trim().to_string()))\n-        .or_else(|| jar.get(SLUG_SESSION_COOKIE).map(|c| c.value().to_string()));\n-\n-    let Some(_bearer) = bearer else {\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-        Ok(_) => (StatusCode::BAD_REQUEST, \"unexpected response\").into_response(),\n-        Err((msg, hint)) => {\n-            let detail = hint.as_deref().unwrap_or(\"\");\n-            js_error(\"#errors\", &msg, detail).into_response()\n-        }\n-    }\n-}\n-\n-pub async fn post_web_ingest(\n-    State(state): State<AppState>,\n-    headers: HeaderMap,\n-    jar: CookieJar,\n-    Form(form): Form<WebPostForm>,\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-        drop(reduced);\n-        return js_redirect(\"/login\").into_response();\n-    };\n-\n-    let bearer = headers\n-        .get(axum::http::header::AUTHORIZATION)\n-        .and_then(|v| v.to_str().ok())\n-        .and_then(|s| s.strip_prefix(\"Bearer \").map(|t| t.trim().to_string()))\n-        .or_else(|| jar.get(SLUG_SESSION_COOKIE).map(|c| c.value().to_string()));\n-\n-    drop(reduced);\n-\n-    let Some(bearer) = bearer else {\n-        return js_redirect(\"/login\").into_response();\n-    };\n-\n-    let room = form.room.trim().to_string();\n-    let thread_tag = form.thread_tag.trim().to_string();\n-    let text = form.text.clone();\n-\n-    if text.trim().is_empty() {\n-        return form_js_error(&form, \"empty post\", \"Write something in the text area (DSL / prose).\")\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-            .await\n-            .into_response(),\n-        Ok(_) => form_js_error(&form, \"unexpected response\", \"Post did not return PostOk.\").into_response(),\n-        Err((msg, hint)) => form_js_error(&form, &msg, hint.as_deref().unwrap_or(\"\")).into_response(),\n-    }\n-}\n-\n-pub async fn check_web_ingest(\n-    State(state): State<AppState>,\n-    headers: HeaderMap,\n-    jar: CookieJar,\n-    Form(form): Form<WebPostForm>,\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-        drop(reduced);\n-        return js_redirect(\"/login\").into_response();\n-    };\n-\n-    let bearer = headers\n-        .get(axum::http::header::AUTHORIZATION)\n-        .and_then(|v| v.to_str().ok())\n-        .and_then(|s| s.strip_prefix(\"Bearer \").map(|t| t.trim().to_string()))\n-        .or_else(|| jar.get(SLUG_SESSION_COOKIE).map(|c| c.value().to_string()));\n-    drop(reduced);\n-\n-    let Some(bearer) = bearer else {\n-        return js_redirect(\"/login\").into_response();\n-    };\n-\n-    let room = form.room.trim().to_string();\n-    let thread_tag = canonicalize_tag(&form.thread_tag);\n-    if thread_tag.is_empty() {\n-        return form_js_error(&form, \"missing thread tag\", \"Set a thread tag before posting.\").into_response();\n-    }\n-\n-    if form.text.trim().is_empty() {\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-        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(),\n-    }\n-}\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\nindex b1c037f3dd93c7bb96d6624cab6019228432c501..a173e7aea7a81c7cfab5f2f6a5549e0db560fb2b 100644\n--- a/server/src/html/forum.rs\n+++ b/server/src/html/forum.rs\n@@ -17,6 +17,7 @@ use crate::{\n     state::AppState,\n     timeago,\n };\n+use serde_json::json;\n \n use super::ui_action::{HtmlUiAction, UI_RPC_FIELD};\n \n@@ -182,8 +183,8 @@ fn post_header_row(\n         div class=\"ingest-header-row\" {\n             (meta)\n             @if show_delete {\n-                form class=\"post-delete-form\" method=\"POST\" action=\"/post/redact\" {\n-                    input type=\"hidden\" name=\"post_id\" value=(ing.id);\n+                form class=\"post-delete-form\" method=\"POST\" action=\"/ui\" {\n+                    input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::RedactPost { post_id: ing.id.clone() }).unwrap());\n                     button type=\"submit\" class=\"post-delete-btn\" { \"delete\" }\n                 }\n             }\n@@ -427,13 +428,28 @@ fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup {\n     if !show {\n         return html! {};\n     }\n+    let rpc_post = template_json_compact(&json!({\n+        \"action\": \"post_ingest\",\n+        \"room\": nav.room_wire,\n+        \"thread_tag\": thread_tag,\n+        \"text\": {\"$form\": \"text\"},\n+        \"error_target\": \"thread-compose-errors\",\n+        \"form_id\": \"thread-compose-form\",\n+    }))\n+    .unwrap();\n+    let rpc_check = template_json_compact(&json!({\n+        \"action\": \"check_ingest\",\n+        \"room\": nav.room_wire,\n+        \"thread_tag\": thread_tag,\n+        \"text\": {\"$form\": \"text\"},\n+        \"error_target\": \"thread-compose-errors\",\n+        \"form_id\": \"thread-compose-form\",\n+    }))\n+    .unwrap();\n     html! {\n         section class=\"compose\" id=\"thread-compose\" {\n-            form id=\"thread-compose-form\" method=\"POST\" action=\"/post\" data-check-action=\"/post/check\" {\n-                input type=\"hidden\" name=\"room\" value=(nav.room_wire.clone());\n-                input type=\"hidden\" name=\"thread_tag\" value=(thread_tag);\n-                input type=\"hidden\" name=\"error_target\" value=\"thread-compose-errors\";\n-                input type=\"hidden\" name=\"form_id\" value=\"thread-compose-form\";\n+            form id=\"thread-compose-form\" method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(rpc_check) {\n+                input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc_post);\n                 textarea name=\"text\" rows=\"5\" cols=\"80\" placeholder=\"prose or ~/items and votes…\" {}\n                 p {\n                     button type=\"submit\" { \"post\" }\n@@ -463,10 +479,22 @@ fn new_thread_form_public(show: bool) -> Markup {\n             h3 { \"new public thread\" }\n             p class=\"muted\" { \"Set thread tag and body. Example: start with a title line or use the CLI-shaped DSL.\" }\n             div id=\"public-new-thread-errors\" {}\n-            form id=\"public-new-thread-form\" method=\"POST\" action=\"/post\" data-check-action=\"/post/check\" {\n-                input type=\"hidden\" name=\"room\" value=\"public\";\n-                input type=\"hidden\" name=\"error_target\" value=\"public-new-thread-errors\";\n-                input type=\"hidden\" name=\"form_id\" value=\"public-new-thread-form\";\n+            form id=\"public-new-thread-form\" method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(template_json_compact(&json!({\n+                \"action\": \"check_ingest\",\n+                \"room\": \"public\",\n+                \"thread_tag\": {\"$form\": \"thread_tag\"},\n+                \"text\": {\"$form\": \"text\"},\n+                \"error_target\": \"public-new-thread-errors\",\n+                \"form_id\": \"public-new-thread-form\",\n+            })).unwrap()) {\n+                input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n+                    \"action\": \"post_ingest\",\n+                    \"room\": \"public\",\n+                    \"thread_tag\": {\"$form\": \"thread_tag\"},\n+                    \"text\": {\"$form\": \"text\"},\n+                    \"error_target\": \"public-new-thread-errors\",\n+                    \"form_id\": \"public-new-thread-form\",\n+                })).unwrap());\n                 label for=\"new-thread-tag\" { \"thread tag\" }\n                 input type=\"text\" id=\"new-thread-tag\" name=\"thread_tag\" pattern=\"[a-z0-9_\\\\-]{1,64}\" placeholder=\"my-topic\";\n                 label for=\"new-thread-text\" { \"text\" }\n@@ -946,10 +974,22 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool) -> Markup {\n         section class=\"compose\" id=\"room-new-thread-compose\" hidden {\n             h3 { \"new thread in this room\" }\n             div id=\"room-new-thread-errors\" {}\n-            form id=\"room-new-thread-form\" method=\"POST\" action=\"/post\" data-check-action=\"/post/check\" {\n-                input type=\"hidden\" name=\"room\" value=(nav.room_wire.clone());\n-                input type=\"hidden\" name=\"error_target\" value=\"room-new-thread-errors\";\n-                input type=\"hidden\" name=\"form_id\" value=\"room-new-thread-form\";\n+            form id=\"room-new-thread-form\" method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(template_json_compact(&json!({\n+                \"action\": \"check_ingest\",\n+                \"room\": nav.room_wire,\n+                \"thread_tag\": {\"$form\": \"thread_tag\"},\n+                \"text\": {\"$form\": \"text\"},\n+                \"error_target\": \"room-new-thread-errors\",\n+                \"form_id\": \"room-new-thread-form\",\n+            })).unwrap()) {\n+                input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n+                    \"action\": \"post_ingest\",\n+                    \"room\": nav.room_wire,\n+                    \"thread_tag\": {\"$form\": \"thread_tag\"},\n+                    \"text\": {\"$form\": \"text\"},\n+                    \"error_target\": \"room-new-thread-errors\",\n+                    \"form_id\": \"room-new-thread-form\",\n+                })).unwrap());\n                 label for=\"room-new-tag\" { \"thread tag\" }\n                 input type=\"text\" id=\"room-new-tag\" name=\"thread_tag\" pattern=\"[a-z0-9_\\\\-]{1,64}\" required;\n                 textarea name=\"text\" rows=\"4\" placeholder=\"First post body…\" required {}\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex a4fd2dd60ac283f7eb9b2e64522501b21d1e27e9..63f723804be511af80b5c13e792109754b606fce 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -373,9 +373,14 @@ script { (maud::PreEscaped(r#\"\n                         async function runFormCheck(form) {\n                             const action = form.getAttribute('data-check-action');\n                             if (!action) return;\n+                            const fd = new URLSearchParams(new FormData(form));\n+                            const checkRpc = form.getAttribute('data-check-rpc');\n+                            if (checkRpc) {\n+                                fd.set('__rpc__', checkRpc);\n+                            }\n                             const resp = await fetch(action, {\n                                 method: 'POST',\n-                                body: new URLSearchParams(new FormData(form)),\n+                                body: fd,\n                                 headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n                                 credentials: 'same-origin',\n                             });\ndiff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs\nindex 3bc69ecbb7e16a59d2d393b2d59f9cd3fedb12b1..73180737db8ba8d16fb7b42b790e44d2d7b796f5 100644\n--- a/server/src/html/ui_action.rs\n+++ b/server/src/html/ui_action.rs\n@@ -14,7 +14,7 @@ pub const UI_RPC_FIELD: &str = \"__rpc__\";\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+    /// Forum ingest via `POST /ui`.\n     PostIngest {\n         room: String,\n         thread_tag: String,\n@@ -24,7 +24,7 @@ pub enum HtmlUiAction {\n         #[serde(default)]\n         form_id: Option<String>,\n     },\n-    /// Same as `POST /post/check`.\n+    /// DSL check / validation via `POST /ui`.\n     CheckIngest {\n         room: String,\n         thread_tag: String,\n@@ -34,7 +34,7 @@ pub enum HtmlUiAction {\n         #[serde(default)]\n         form_id: Option<String>,\n     },\n-    /// Same as `POST /post/redact`.\n+    /// Author redacts own post via `POST /ui`.\n     RedactPost {\n         post_id: String,\n     },\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 5f5b6b0f01b29350c7415e5801ec5caa74f0b452..c28c2335d23080671e71155ea3fb023f9b8d98c4 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -31,9 +31,6 @@ pub fn create_app(state: AppState) -> Router {\n         .route(\"/\", get(crate::html::home))\n         .route(\"/login\", get(api::get_web_login))\n         .route(\"/logout\", get(api::get_logout))\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@@ -64,6 +61,7 @@ pub fn create_app(state: AppState) -> Router {\n         )\n         .route(\"/t/:tag/:index\", get(crate::html::thread_post_view))\n         .route(\"/t/:tag\", get(crate::html::thread_view))\n+        // TODO DELETE THESE AND USE __RPC__ PATTERN\n         .route(\n             \"/r/:room_short/:room_slug/t/:thread_tag/:index/expand\",\n             get(crate::html::room_thread_post_expand),\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex d86de2dd446516807a3c8a607aa88787d1b136b0..831722430d6b41308e3f03d485cd62f887ace799 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -21,6 +21,30 @@ fn test_bearer() -> String {\n     format!(\"slug_{token_id}_{secret}\")\n }\n \n+/// Compact JSON for `POST /ui` (`HtmlUiAction::PostIngest`).\n+fn ui_post_ingest_rpc(room: &str, thread_tag: &str, text: &str) -> String {\n+    serde_json::json!({\n+        \"action\": \"post_ingest\",\n+        \"room\": room,\n+        \"thread_tag\": thread_tag,\n+        \"text\": text,\n+    })\n+    .to_string()\n+}\n+\n+/// Compact JSON for `POST /ui` (`HtmlUiAction::CheckIngest`).\n+fn ui_check_ingest_rpc(room: &str, thread_tag: &str, text: &str, error_target: &str) -> String {\n+    serde_json::json!({\n+        \"action\": \"check_ingest\",\n+        \"room\": room,\n+        \"thread_tag\": thread_tag,\n+        \"text\": text,\n+        \"error_target\": error_target,\n+        \"form_id\": \"thread-compose-form\",\n+    })\n+    .to_string()\n+}\n+\n /// `commands` is a JSON array of RPC commands (`RpcBatch` is a transparent `Vec`).\n async fn rpc_batch(\n     client: &reqwest::Client,\n@@ -343,14 +367,11 @@ async fn test_private_room_thread_urls_use_t_segment() {\n         .to_string();\n     let (room_short, room_slug) = room_id.split_once('/').unwrap();\n \n+    let rpc = ui_post_ingest_rpc(&room_id, \"main-thread\", \"private post via web\");\n     let post = client\n-        .post(format!(\"http://{addr}/post\"))\n+        .post(format!(\"http://{addr}/ui\"))\n         .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n-        .form(&[\n-            (\"room\", room_id.as_str()),\n-            (\"thread_tag\", \"main-thread\"),\n-            (\"text\", \"private post via web\"),\n-        ])\n+        .form(&[(\"__rpc__\", rpc.as_str())])\n         .send()\n         .await\n         .unwrap();\n@@ -404,14 +425,15 @@ async fn test_private_room_post_links_use_private_garden_routes() {\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+        \"garden-thread\",\n+        \"~/secret/item {classified}\\n~/secret/other {other body}\\n~/secret/item 3:1 ~/secret/other {because}\\n\",\n+    );\n     let post = client\n-        .post(format!(\"http://{addr}/post\"))\n+        .post(format!(\"http://{addr}/ui\"))\n         .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n-        .form(&[\n-            (\"room\", room_id.as_str()),\n-            (\"thread_tag\", \"garden-thread\"),\n-            (\"text\", \"~/secret/item {classified}\\n~/secret/other {other body}\\n~/secret/item 3:1 ~/secret/other {because}\\n\"),\n-        ])\n+        .form(&[(\"__rpc__\", rpc.as_str())])\n         .send()\n         .await\n         .unwrap();\n@@ -449,15 +471,11 @@ async fn test_post_check_returns_targeted_js_error_for_missing_thread_tag() {\n         .unwrap();\n     let bearer = test_bearer();\n \n+    let rpc = ui_check_ingest_rpc(\"public\", \"\", \"hello\", \"thread-compose-errors\");\n     let resp = client\n-        .post(format!(\"http://{addr}/post/check\"))\n+        .post(format!(\"http://{addr}/ui\"))\n         .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n-        .form(&[\n-            (\"room\", \"public\"),\n-            (\"thread_tag\", \"\"),\n-            (\"text\", \"hello\"),\n-            (\"error_target\", \"thread-compose-errors\"),\n-        ])\n+        .form(&[(\"__rpc__\", rpc.as_str())])\n         .send()\n         .await\n         .unwrap();\n@@ -553,14 +571,11 @@ async fn test_sse_stream_emits_evalable_js_after_post() {\n         .unwrap();\n     assert!(sse_resp.status().is_success());\n \n+    let rpc = ui_post_ingest_rpc(&room_id, \"live-thread\", \"hello over sse\");\n     let _post = client\n-        .post(format!(\"http://{addr}/post\"))\n+        .post(format!(\"http://{addr}/ui\"))\n         .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n-        .form(&[\n-            (\"room\", room_id.as_str()),\n-            (\"thread_tag\", \"live-thread\"),\n-            (\"text\", \"hello over sse\"),\n-        ])\n+        .form(&[(\"__rpc__\", rpc.as_str())])\n         .send()\n         .await\n         .unwrap();\ndiff --git a/test/walkthrough_fixture.clj b/test/walkthrough_fixture.clj\nindex ec7914464b1a0389e40c5be53af59cf8ed82b09e..4b814822029c913e38151ca53848d1c64fb58373 100644\n--- a/test/walkthrough_fixture.clj\n+++ b/test/walkthrough_fixture.clj\n@@ -52,22 +52,28 @@\n                          \"~/secret/item {classified}\\n\"\n                          \"~/secret/other {secondary}\\n\"\n                          \"~/secret/item 3:1 ~/secret/other {because}\\n\")\n+          rpc (json/generate-string\n+                {:action \"post_ingest\"\n+                 :room room-id\n+                 :thread_tag \"walkthrough-thread\"\n+                 :text wall-text})\n           post-resp (oauth/http-post-form\n-                      (str base-url \"/post\")\n-                      {:room room-id\n-                       :thread_tag \"walkthrough-thread\"\n-                       :text wall-text}\n+                      (str base-url \"/ui\")\n+                      {:__rpc__ rpc}\n                       :headers {\"Authorization\" (str \"Bearer \" alice-token)})]\n       (assert! (= 200 (:status post-resp)) \"seed post must succeed\"))\n     (let [bob-reply (str \"Bob here — reply with another long block so the thread has multiple cards.\\n\\n\"\n                          \"Paragraph two: repeating slugs ~/secret/item and ~/secret/other for cross-post link styling. \"\n                          \"If everything wraps cleanly, monospace pre + serif body (in craft theme) should still feel readable.\\n\\n\"\n                          \"More overflow: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\\n\")\n+          bob-rpc (json/generate-string\n+                    {:action \"post_ingest\"\n+                     :room room-id\n+                     :thread_tag \"walkthrough-thread\"\n+                     :text bob-reply})\n           bob-post (oauth/http-post-form\n-                     (str base-url \"/post\")\n-                     {:room room-id\n-                      :thread_tag \"walkthrough-thread\"\n-                      :text bob-reply}\n+                     (str base-url \"/ui\")\n+                     {:__rpc__ bob-rpc}\n                      :headers {\"Authorization\" (str \"Bearer \" bob-token)})]\n       (assert! (= 200 (:status bob-post)) \"seed reply post must succeed\"))\n     {:users {:alice {:token alice-token}\n","role":"user"}],"model":"openai/gpt-chat-latest"}