{"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[c3cbcaa7] refactor\n\nSide A — 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\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[9ecc4e2e] nice\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 5675dcd2e28062acbe3c037b94b77c33adf32474..a18241f3ed7b4a248748fcefc799f9801ca62461 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -936,7 +936,15 @@ pub async fn handle_rpc_batch(\n                 line_ok(RpcResult::ForumThreads(rpc_list_forum_threads(&reduced, &room)))\n             }\n             RpcCommand::RoomCreate { slug, visibility } => {\n-                match verify_bearer_principal(&headers, &*state.reduced.read().await) {\n+                // Scope the first read so its guard drops before any nested `read().await` / `write().await`.\n+                // A guard from `match verify(..., &*state.reduced.read().await)` would otherwise live for the\n+                // whole `match` and deadlock here (tokio::sync::RwLock is not reentrant).\n+                let principal = {\n+                    let reduced = state.reduced.read().await;\n+                    verify_bearer_principal(&headers, &*reduced)\n+                };\n+                match principal {\n+                    Err((_, m)) => line_err(m, None),\n                     Ok(principal) => {\n                         let slug = slug.trim().to_lowercase();\n                         if slug.is_empty() || slug.len() > 64 {\n@@ -994,7 +1002,6 @@ pub async fn handle_rpc_batch(\n                             }\n                         }\n                     }\n-                    Err((_, m)) => line_err(m, None),\n                 }\n             }\n             RpcCommand::RoomGrant {\n@@ -1002,17 +1009,28 @@ pub async fn handle_rpc_batch(\n                 username,\n                 capability,\n             } => {\n-                match verify_bearer_principal(&headers, &*state.reduced.read().await) {\n+                let principal = {\n+                    let reduced = state.reduced.read().await;\n+                    verify_bearer_principal(&headers, &*reduced)\n+                };\n+                match principal {\n                     Err((_, m)) => line_err(m, None),\n                     Ok(principal) => {\n-                        let reduced = state.reduced.read().await;\n-                        if !reduced.user_has_cap(&room, &principal, ThreadCapability::Manage) {\n+                        let can_manage = {\n+                            let reduced = state.reduced.read().await;\n+                            reduced.user_has_cap(&room, &principal, ThreadCapability::Manage)\n+                        };\n+                        if !can_manage {\n                             line_err(\"requires Manage capability\", None)\n                         } else {\n                             match parse_username(&username) {\n                                 Err(msg) => line_err(\"invalid username\", Some(msg)),\n                                 Ok(target) => {\n-                                    if !reduced.users_by_provider.values().any(|u| u == &target) {\n+                                    let user_exists = {\n+                                        let reduced = state.reduced.read().await;\n+                                        reduced.users_by_provider.values().any(|u| u == &target)\n+                                    };\n+                                    if !user_exists {\n                                         line_err(format!(\"user @{target} not found\"), None)\n                                     } else {\n                                         match parse_capability(&capability) {\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex 9162bd5bee84035e3908bfb9c8e201b7878ca339..b930120da09fe7d307f0411b84fb639fb8bd0b15 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -95,6 +95,23 @@ async fn test_healthz() {\n     assert_eq!(response.text().await.unwrap(), \"ok\");\n }\n \n+#[tokio::test]\n+async fn test_room_create_private_rpc() {\n+    let (addr, _tmp, _log, _handle) = create_test_server().await;\n+    let client = reqwest::Client::new();\n+    let batch = serde_json::json!([{\n+        \"RoomCreate\": { \"slug\": \"secret-project\", \"visibility\": \"private\" }\n+    }]);\n+    let body = rpc_batch(&client, addr, Some(&test_bearer()), batch).await;\n+    let line = &body[\"results\"][0];\n+    assert_eq!(line[\"ok\"], true, \"room create: {:?}\", line);\n+    let room_id = line[\"result\"][\"RoomCreated\"][\"room_id\"].as_str().unwrap();\n+    assert!(\n+        room_id.contains(\"/secret-project\"),\n+        \"expected room_id to contain slug, got {room_id}\"\n+    );\n+}\n+\n #[tokio::test]\n async fn test_index_page() {\n     // HTML routes are offline during the auth-v3 refactor.\ndiff --git a/test/auth.bb b/test/auth.bb\nindex 611e04f1806ef81d678a91f499597fe55f691dd7..a67cc1de763434176d2f68e419dd37a8cd328395 100644\n--- a/test/auth.bb\n+++ b/test/auth.bb\n@@ -176,7 +176,7 @@\n          (assert! (= 200 (:status poll)) \"pending-session poll returns 200\")\n          (let [poll-json (json/parse-string (:body poll) true)]\n            (assert! (:complete poll-json) \"pending session complete=true\")\n-           (assert! (= \"@bbuser\" (:user poll-json)) \"poll returns @bbuser\")\n+           (assert! (= \"bbuser\" (:user poll-json)) \"poll returns stored username bbuser\")\n            (assert! (clojure.string/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n \n            (println \"\\nwhoami…\")\n@@ -184,7 +184,7 @@\n                                :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n              (assert! (= 200 (:status who)) \"whoami returns 200\")\n              (let [who-json (json/parse-string (:body who) true)]\n-               (assert! (= \"@bbuser\" (:user who-json)) \"whoami user is @bbuser\"))))))\n+               (assert! (= \"bbuser\" (:user who-json)) \"whoami user is bbuser (stored form)\"))))))\n \n      (println \"\\nCLI: identity start → OAuth → identity poll → whoami…\")\n      (let [cli-home (str tmp-dir \"/cli-home\")\n@@ -208,7 +208,7 @@\n                       (str \"identity poll exits 0 (stderr: \" (:err poll-proc) \")\"))\n              (let [poll-cli (json/parse-string (:out poll-proc) true)]\n                (assert! (= \"complete\" (:phase poll-cli)) \"identity poll --json phase\")\n-               (assert! (= \"@cliuser\" (:user poll-cli)) \"CLI poll user\")\n+               (assert! (= \"cliuser\" (:user poll-cli)) \"CLI poll user (stored form)\")\n                (assert! (clojure.string/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n                (let [token-path (str cli-home \"/.config/slugsocial/token\")]\n                  (assert! (fs/exists? token-path) \"token written under isolated HOME\")\n@@ -219,7 +219,7 @@\n                  (assert! (zero? (:exit who-proc))\n                           (str \"whoami exits 0 (stderr: \" (:err who-proc) \")\"))\n                  (let [who-cli (json/parse-string (:out who-proc) true)]\n-                   (assert! (= \"@cliuser\" (:user who-cli)) \"CLI whoami uses saved token\"))))))))\n+                   (assert! (= \"cliuser\" (:user who-cli)) \"CLI whoami uses saved token\"))))))))\n \n      (finally\n        (when-some [s @!server] (common/kill-server s))\ndiff --git a/test/common.bb b/test/common.bb\nindex ebb16c615a8b40e8830b5d5765d1e935a45538d0..4ed450377cdbb020f5ff164a812dfbbfc23c0f47 100644\n--- a/test/common.bb\n+++ b/test/common.bb\n@@ -78,9 +78,20 @@\n \n (defn start-server\n   \"Start the slugsocial-server binary with the given env map.\n-   Returns the babashka.process map.\"\n-  [server-bin env-map]\n-  (p/process [server-bin] {:out :inherit :err :inherit :env env-map}))\n+   Returns the babashka.process map.\n+\n+   When `log-file` (string path) is provided, stdout and stderr are appended there\n+   instead of inheriting the parent descriptors. Inheriting shared pipes while the\n+   parent blocks on HTTP I/O can fill the pipe buffer and deadlock the server on log writes.\"\n+  ([server-bin env-map]\n+   (start-server server-bin env-map nil))\n+  ([server-bin env-map log-file]\n+   (p/process [server-bin]\n+              (if log-file\n+                ;; Two string paths (same file): babashka.process can deref the process cleanly.\n+                ;; :err :out + ProcessBuilder$Redirect breaks stream copying in deref/kill-server.\n+                {:env env-map :out log-file :err log-file}\n+                {:out :inherit :err :inherit :env env-map}))))\n \n (defn kill-server\n   \"Forcibly kill a server process (babashka.process map) and wait for it to exit.\"\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 7066c1f2a57f39a362052f8524206dccf37bb7b1..793ba216f2de76a77eb20a76d08403db07ff411b 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -35,13 +35,14 @@\n (defn- http-client []\n   (-> (java.net.http.HttpClient/newBuilder)\n       (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n+      (.connectTimeout (java.time.Duration/ofSeconds 15))\n       (.build)))\n \n (defn- http-get [url & {:keys [headers]}]\n   (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n     (doseq [[k v] (or headers {})]\n       (.header b k v))\n-    (let [req (-> b (.GET) (.build))\n+    (let [req (-> b (.timeout (java.time.Duration/ofSeconds 60)) (.GET) (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n       {:status (.statusCode resp) :body (.body resp)})))\n \n@@ -52,6 +53,7 @@\n     (doseq [[k v] (or headers {})]\n       (.header b k v))\n     (let [req (-> b\n+                  (.timeout (java.time.Duration/ofSeconds 60))\n                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n                   (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -67,6 +69,7 @@\n         b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n     (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n     (let [req (-> b\n+                  (.timeout (java.time.Duration/ofSeconds 60))\n                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n                   (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n","role":"user"}],"model":"openai/gpt-chat-latest"}