{"messages":[{"content":"You are a constitutional council ranking individual git commits for ownership allocation.\n\nCompare these two commits. Decide which contributed more lasting value to the project.\n\nJudge substance, not spectacle:\n- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.\n- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.\n- Do not favor a side merely because its patch is longer or noisier.\n- Weight what the change does for the project, not the contributor's name.\n\nReturn ONLY a JSON object: {\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}\nThe explanation must cite concrete differences in the patches (1-3 sentences).\n\nSide A — contributor: tommy-mor\nSide A — commit message:\n[3f35edab] progress\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex a10ce662105cff8fad949c6b83f7035ce79bed18..a986f706ea4b261cbaf004c02b4cf84184b41371 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -3,6 +3,7 @@ mod helpers;\n mod rpc;\n mod stream;\n mod validate;\n+mod ui_html;\n mod web_post;\n \n pub use auth::{\n@@ -33,6 +34,7 @@ pub use stream::{get_html_stream, get_stream};\n \n pub use validate::{normalize_room_and_thread, validate_ingest_document, ValidatedIngest};\n \n+pub use ui_html::post_ui_html;\n pub use web_post::{check_web_ingest, post_web_ingest, post_web_redact};\n \n #[cfg(test)]\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..2b40a72059981d558768f73d189b991f3448c257\n--- /dev/null\n+++ b/server/src/api/ui_html.rs\n@@ -0,0 +1,139 @@\n+//! Single `POST /ui` entry for browser [`crate::html::ui_action::HtmlUiAction`] (JSON in `__rpc__` + holes).\n+\n+use axum::{\n+    body::Body,\n+    extract::State,\n+    http::{header, HeaderMap, StatusCode},\n+    response::{IntoResponse, Response},\n+    Form,\n+};\n+use axum_extra::extract::cookie::CookieJar;\n+use std::collections::HashMap;\n+\n+use crate::{\n+    api::{\n+        auth::optional_principal,\n+        web_post::{run_check_web_ingest, run_post_web_ingest, run_post_web_redact, WebPostForm, WebRedactForm},\n+    },\n+    html::{\n+        fragment_public_new_thread_form, fragment_room_new_thread_form, login_to_post_hint_markup,\n+        parse_html_ui_from_form, user_can_post_room, user_can_view_room, HtmlUiAction, JsBuilder,\n+        ThreadNav,\n+    },\n+    state::AppState,\n+};\n+\n+pub async fn post_ui_html(\n+    State(state): State<AppState>,\n+    headers: HeaderMap,\n+    jar: CookieJar,\n+    Form(form): Form<HashMap<String, String>>,\n+) -> impl IntoResponse {\n+    let action = match parse_html_ui_from_form(&form) {\n+        Ok(a) => a,\n+        Err(e) => return ui_js_warn(&e.to_string()).into_response(),\n+    };\n+\n+    match action {\n+        HtmlUiAction::PostIngest {\n+            room,\n+            thread_tag,\n+            text,\n+            error_target,\n+            form_id,\n+        } => {\n+            run_post_web_ingest(\n+                &state,\n+                &headers,\n+                &jar,\n+                WebPostForm {\n+                    room,\n+                    thread_tag,\n+                    text,\n+                    error_target,\n+                    form_id,\n+                },\n+            )\n+            .await\n+        }\n+        HtmlUiAction::CheckIngest {\n+            room,\n+            thread_tag,\n+            text,\n+            error_target,\n+            form_id,\n+        } => {\n+            run_check_web_ingest(\n+                &state,\n+                &headers,\n+                &jar,\n+                WebPostForm {\n+                    room,\n+                    thread_tag,\n+                    text,\n+                    error_target,\n+                    form_id,\n+                },\n+            )\n+            .await\n+        }\n+        HtmlUiAction::RedactPost { post_id } => {\n+            run_post_web_redact(&state, &headers, &jar, WebRedactForm { post_id }).await\n+        }\n+        HtmlUiAction::ExpandPublicNewThreadForm => {\n+            let reduced = state.reduced.read().await;\n+            let user = optional_principal(&headers, &jar, &reduced);\n+            drop(reduced);\n+            let markup = if user.is_some() {\n+                fragment_public_new_thread_form(true)\n+            } else {\n+                login_to_post_hint_markup()\n+            };\n+            JsBuilder::new()\n+                .morph_selector(\"#public-new-thread-ui-slot\", markup)\n+                .into_response()\n+        }\n+        HtmlUiAction::ExpandRoomNewThreadForm { room_wire } => {\n+            let room_wire = room_wire.trim().to_string();\n+            if room_wire.is_empty() {\n+                return ui_js_warn(\"missing room\").into_response();\n+            }\n+            let reduced = state.reduced.read().await;\n+            let user = optional_principal(&headers, &jar, &reduced);\n+            if !reduced.rooms.contains(&room_wire) {\n+                drop(reduced);\n+                return ui_js_warn(\"room not found\").into_response();\n+            }\n+            if !user_can_view_room(&reduced, &room_wire, user.as_deref()) {\n+                drop(reduced);\n+                return ui_js_warn(\"forbidden\").into_response();\n+            }\n+            let can_post = user\n+                .as_ref()\n+                .map(|u| user_can_post_room(&reduced, &room_wire, u))\n+                .unwrap_or(false);\n+            drop(reduced);\n+            let Some(nav) = ThreadNav::from_room_id(&room_wire) else {\n+                return ui_js_warn(\"bad room\").into_response();\n+            };\n+            let markup = if can_post {\n+                fragment_room_new_thread_form(&nav, true)\n+            } else {\n+                login_to_post_hint_markup()\n+            };\n+            JsBuilder::new()\n+                .morph_selector(\"#room-new-thread-ui-slot\", markup)\n+                .into_response()\n+        }\n+    }\n+}\n+\n+fn ui_js_warn(msg: &str) -> Response {\n+    use crate::html::js_string_literal;\n+    let js = format!(\"console.warn({});\", js_string_literal(msg));\n+    Response::builder()\n+        .status(StatusCode::OK)\n+        .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n+        .body(Body::from(js))\n+        .unwrap()\n+}\ndiff --git a/server/src/api/web_post.rs b/server/src/api/web_post.rs\nindex a64010e382d3039821c836a5529adad0fe67cce5..265025f41ff1548d05b2d2d5d84202245388053f 100644\n--- a/server/src/api/web_post.rs\n+++ b/server/src/api/web_post.rs\n@@ -222,8 +222,18 @@ pub async fn post_web_redact(\n     jar: CookieJar,\n     Form(form): Form<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+    let Some(_username) = optional_principal(headers, jar, &reduced) else {\n         drop(reduced);\n         return js_redirect(\"/login\").into_response();\n     };\n@@ -239,8 +249,8 @@ pub async fn post_web_redact(\n         return js_redirect(\"/login\").into_response();\n     };\n \n-    match rpc_post_redact(&state, &headers, form.post_id).await {\n-        Ok(RpcResult::RedactPostOk {}) => redact_success_response(&state).await.into_response(),\n+    match rpc_post_redact(state, headers, form.post_id).await {\n+        Ok(RpcResult::RedactPostOk {}) => redact_success_response(state).await.into_response(),\n         Ok(_) => (StatusCode::BAD_REQUEST, \"unexpected response\").into_response(),\n         Err((msg, hint)) => {\n             let detail = hint.as_deref().unwrap_or(\"\");\n@@ -255,8 +265,18 @@ pub async fn post_web_ingest(\n     jar: CookieJar,\n     Form(form): Form<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+    let Some(_username) = optional_principal(headers, jar, &reduced) else {\n         drop(reduced);\n         return js_redirect(\"/login\").into_response();\n     };\n@@ -282,8 +302,8 @@ pub async fn post_web_ingest(\n             .into_response();\n     }\n \n-    match rpc_post_with_bearer(&state, &bearer, room.clone(), thread_tag.clone(), text).await {\n-        Ok(RpcResult::PostOk { .. }) => post_success_response(&state, &form, &headers, &jar)\n+    match rpc_post_with_bearer(state, &bearer, room.clone(), thread_tag.clone(), text).await {\n+        Ok(RpcResult::PostOk { .. }) => post_success_response(state, &form, headers, jar)\n             .await\n             .into_response(),\n         Ok(_) => form_js_error(&form, \"unexpected response\", \"Post did not return PostOk.\").into_response(),\n@@ -297,8 +317,18 @@ pub async fn check_web_ingest(\n     jar: CookieJar,\n     Form(form): Form<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+    let Some(_username) = optional_principal(headers, jar, &reduced) else {\n         drop(reduced);\n         return js_redirect(\"/login\").into_response();\n     };\n@@ -324,7 +354,7 @@ pub async fn check_web_ingest(\n         return js_clear_errors(&form_error_target(&form)).into_response();\n     }\n \n-    match rpc_check_with_bearer(&state, &bearer, room, form.text.clone()).await {\n+    match rpc_check_with_bearer(state, &bearer, room, form.text.clone()).await {\n         Ok(RpcResult::CheckOk { .. }) => js_clear_errors(&form_error_target(&form)).into_response(),\n         Ok(_) => form_js_error(&form, \"unexpected response\", \"Check did not return CheckOk.\").into_response(),\n         Err((msg, hint)) => form_js_error(&form, &msg, hint.as_deref().unwrap_or(\"\")).into_response(),\ndiff --git a/server/src/form_template.rs b/server/src/form_template.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..3709c2c09a859da006e4af173413d5d235bc19be\n--- /dev/null\n+++ b/server/src/form_template.rs\n@@ -0,0 +1,142 @@\n+//! Plan2-style JSON templates with `{\"$form\": \"field_name\"}` holes, filled from\n+//! `application/x-www-form-urlencoded` (or any `String` → `String` map) **before**\n+//! deserializing into a typed struct.\n+//!\n+//! # Wire format\n+//!\n+//! Templates are **compact JSON** (`serde_json::to_string`): one line, no pretty\n+//! printing, strings escaped per JSON rules (`\\\"`, `\\n`, etc.). Embed that string\n+//! in HTML attributes or text nodes with normal HTML escaping (e.g. maud), not\n+//! bespoke encodings.\n+//!\n+//! # Power vs flat hidden fields\n+//!\n+//! A form is always a string→string map. You can fake depth with dotted keys (`a.b.c`),\n+//! but one structured blob (`__rpc__` = compact JSON) gives you nested objects,\n+//! arrays, and optional fields without inventing a new naming scheme each time.\n+//!\n+//! # Security\n+//!\n+//! Substitution runs **before** `serde` into your command type. It does not fix\n+//! authorization: if the client can replace the hidden `__rpc__` value, they can\n+//! change the command shape unless you validate (signed blob, server-side session\n+//! context, or treat the blob as hints only). Same threat model as any hidden field.\n+\n+use serde::Serialize;\n+use serde_json::Value;\n+use std::collections::HashMap;\n+\n+/// Serialize a value to compact JSON for a hidden `__rpc__` (or similar) field.\n+pub fn template_json_compact<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+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+                }\n+            }\n+            for v in map.values_mut() {\n+                substitute_form_vars(v, form_data);\n+            }\n+        }\n+        Value::Array(arr) => {\n+            for v in arr.iter_mut() {\n+                substitute_form_vars(v, form_data);\n+            }\n+        }\n+        _ => {}\n+    }\n+}\n+\n+/// Parse JSON, apply [`substitute_form_vars`], return the mutated value.\n+pub fn fill_template_from_form(\n+    template_json: &str,\n+    form_data: &HashMap<String, String>,\n+) -> Result<Value, serde_json::Error> {\n+    let mut v: Value = serde_json::from_str(template_json)?;\n+    substitute_form_vars(&mut v, form_data);\n+    Ok(v)\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+    use super::*;\n+    use serde::Deserialize;\n+\n+    #[derive(Debug, Deserialize, PartialEq, Eq)]\n+    struct Demo {\n+        room: String,\n+        thread_tag: String,\n+        nested: Nested,\n+    }\n+\n+    #[derive(Debug, Deserialize, PartialEq, Eq)]\n+    struct Nested {\n+        text: String,\n+    }\n+\n+    #[test]\n+    fn holes_become_strings() {\n+        let json = r#\"{\n+            \"room\": \"public\",\n+            \"thread_tag\": {\"$form\": \"tag\"},\n+            \"nested\": {\"text\": {\"$form\": \"body\"}}\n+        }\"#;\n+        let mut form = HashMap::new();\n+        form.insert(\"tag\".into(), \"foo\".into());\n+        form.insert(\"body\".into(), \"hello\\nworld\".into());\n+\n+        let v = fill_template_from_form(json, &form).unwrap();\n+        let d: Demo = serde_json::from_value(v).unwrap();\n+        assert_eq!(\n+            d,\n+            Demo {\n+                room: \"public\".into(),\n+                thread_tag: \"foo\".into(),\n+                nested: Nested {\n+                    text: \"hello\\nworld\".into(),\n+                },\n+            }\n+        );\n+    }\n+\n+    #[test]\n+    fn missing_form_key_is_empty_string() {\n+        let json = r#\"{\"x\": {\"$form\": \"nope\"}}\"#;\n+        let mut form = HashMap::new();\n+        form.insert(\"other\".into(), \"y\".into());\n+        let v = fill_template_from_form(json, &form).unwrap();\n+        assert_eq!(v[\"x\"], \"\");\n+    }\n+\n+    #[test]\n+    fn array_of_holes() {\n+        let json = r#\"{\"items\": [{\"$form\": \"a\"}, {\"$form\": \"b\"}]}\"#;\n+        let mut form = HashMap::new();\n+        form.insert(\"a\".into(), \"1\".into());\n+        form.insert(\"b\".into(), \"2\".into());\n+        let v = fill_template_from_form(json, &form).unwrap();\n+        assert_eq!(v[\"items\"], serde_json::json!([\"1\", \"2\"]));\n+    }\n+\n+    #[test]\n+    fn template_json_compact_escapes_and_single_line() {\n+        let s = template_json_compact(&serde_json::json!({\n+            \"x\": \"quote\\\"and\\nnewline\"\n+        }))\n+        .unwrap();\n+        assert!(!s.contains('\\n'));\n+        assert!(s.contains(\"\\\\\\\"\") || s.contains(\"\\\\n\"));\n+    }\n+}\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\nindex f789e347dc136f8ffd356f4492f0bd76cea04bf0..b1c037f3dd93c7bb96d6624cab6019228432c501 100644\n--- a/server/src/html/forum.rs\n+++ b/server/src/html/forum.rs\n@@ -11,12 +11,15 @@ use crate::{\n     api::optional_principal,\n     canonical_path::{canonicalize_item, canonicalize_tag},\n     events::ThreadCapability,\n+    form_template::template_json_compact,\n     identity::parse_username,\n     reducer::{scope_from_room_wire, ReducerState, ScopeId},\n     state::AppState,\n     timeago,\n };\n \n+use super::ui_action::{HtmlUiAction, UI_RPC_FIELD};\n+\n use super::{\n     bc_segment, bc_threads, cli_panel, layout, now_ms, profile_href, recency_class,\n     render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, JsBuilder,\n@@ -289,7 +292,7 @@ fn rooms_for_user(reduced: &ReducerState, username: &str) -> Vec<String> {\n     v\n }\n \n-fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {\n+pub(crate) fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {\n     if !reduced.rooms.contains(room_id) {\n         return false;\n     }\n@@ -299,7 +302,7 @@ fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&s\n     reduced.user_has_cap(room_id, u, ThreadCapability::View)\n }\n \n-fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {\n+pub(crate) fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {\n     reduced.user_has_cap(room_id, username, ThreadCapability::Post)\n }\n \n@@ -591,7 +594,6 @@ pub async fn home(\n     let nav = ThreadNav::public();\n     let reduced_read = state.reduced.read().await;\n     let strip = auth_strip(&headers, &jar, &reduced_read);\n-    let show_forms = user.is_some();\n     drop(reduced_read);\n \n     let page = layout(\n@@ -617,8 +619,14 @@ pub async fn home(\n                 }\n             }\n             p class=\"muted\" { \"dark = time-ordered · light = vote-ranked\" }\n+            div class=\"thread-feed-toolbar\" {\n+                form method=\"POST\" action=\"/ui\" {\n+                    input type=\"hidden\" name=(UI_RPC_FIELD) value=(expand_public_new_thread_rpc_value());\n+                    button type=\"submit\" class=\"section-add-btn\" { \"+\" }\n+                }\n+            }\n+            div id=\"public-new-thread-ui-slot\" {}\n             (render_thread_feed(Some(&nav), \"thread-feed\", &public_rows, now))\n-            (new_thread_form_public(show_forms))\n             (cli_panel(\"npx slugsocial public forum list\"))\n         },\n         None,\n@@ -901,7 +909,13 @@ pub async fn room_page(\n             h3 { \"threads\" }\n             (render_thread_feed(Some(&nav), \"room-thread-feed\", &rows, now))\n             @if show_new {\n-                (new_thread_form_for_room(&nav, show_new))\n+                div class=\"thread-feed-toolbar\" {\n+                    form method=\"POST\" action=\"/ui\" {\n+                        input type=\"hidden\" name=(UI_RPC_FIELD) value=(expand_room_new_thread_rpc_value(&nav));\n+                        button type=\"submit\" class=\"section-add-btn\" { \"+\" }\n+                    }\n+                }\n+                div id=\"room-new-thread-ui-slot\" {}\n             }\n             (cli_panel(&forum_cli))\n             (cli_panel(&garden_cli))\n@@ -945,6 +959,31 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool) -> Markup {\n     }\n }\n \n+pub(crate) fn expand_public_new_thread_rpc_value() -> String {\n+    template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect(\"static json\")\n+}\n+\n+pub(crate) fn expand_room_new_thread_rpc_value(nav: &ThreadNav) -> String {\n+    template_json_compact(&HtmlUiAction::ExpandRoomNewThreadForm {\n+        room_wire: nav.room_wire.clone(),\n+    })\n+    .expect(\"static json\")\n+}\n+\n+pub(crate) fn login_to_post_hint_markup() -> Markup {\n+    html! {\n+        p class=\"muted\" { \"log in to post\" }\n+    }\n+}\n+\n+pub(crate) fn fragment_public_new_thread_form(show: bool) -> Markup {\n+    new_thread_form_public(show)\n+}\n+\n+pub(crate) fn fragment_room_new_thread_form(nav: &ThreadNav, show: bool) -> Markup {\n+    new_thread_form_for_room(nav, show)\n+}\n+\n async fn thread_post_view_inner(\n     state: AppState,\n     tag: String,\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 53041a0cf0b30e6f20749c92ecc15a4e9ac56e09..a4fd2dd60ac283f7eb9b2e64522501b21d1e27e9 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -16,6 +16,7 @@ mod editor;\n mod forum;\n mod garden;\n mod search;\n+pub mod ui_action;\n use breadcrumb_path::OntologyPath;\n \n pub use auth::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page};\n@@ -27,9 +28,15 @@ pub use forum::{\n     thread_post_collapse_deleted, thread_post_expand, thread_post_expand_deleted, thread_post_view,\n     thread_view, ThreadNav,\n };\n+\n+pub(crate) use forum::{\n+    fragment_public_new_thread_form, fragment_room_new_thread_form, login_to_post_hint_markup,\n+    user_can_post_room, user_can_view_room,\n+};\n pub use garden::{garden_index, ontology_path, room_garden_index, room_ontology_path};\n pub use search::{search_page, search_results_fragment};\n pub use forum::user_profile_page;\n+pub use ui_action::{parse_html_ui_from_form, HtmlUiAction, HtmlUiParseError, UI_RPC_FIELD};\n \n /// Public profile URL path for a stored username (no `@`).\n pub(crate) fn profile_href(username: &str) -> String {\ndiff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..3bc69ecbb7e16a59d2d393b2d59f9cd3fedb12b1\n--- /dev/null\n+++ b/server/src/html/ui_action.rs\n@@ -0,0 +1,116 @@\n+//! Browser-only UI commands: JSON in hidden `__rpc__` plus hole fill ([`crate::form_template`]).\n+//! Not part of [`slug_types::RpcCommand`] (CLI / JSON API).\n+\n+use crate::form_template::fill_template_from_form;\n+use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n+use std::collections::HashMap;\n+use thiserror::Error;\n+\n+/// Form field name for the compact JSON template (possibly with `{\"$form\":\"…\"}` holes).\n+pub const UI_RPC_FIELD: &str = \"__rpc__\";\n+\n+/// HTML form / fetch `POST /ui` payload after template fill and deserialization.\n+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n+#[serde(tag = \"action\", rename_all = \"snake_case\")]\n+pub enum HtmlUiAction {\n+    /// Same semantics as `POST /post` (forum ingest).\n+    PostIngest {\n+        room: String,\n+        thread_tag: String,\n+        text: String,\n+        #[serde(default)]\n+        error_target: Option<String>,\n+        #[serde(default)]\n+        form_id: Option<String>,\n+    },\n+    /// Same as `POST /post/check`.\n+    CheckIngest {\n+        room: String,\n+        thread_tag: String,\n+        text: String,\n+        #[serde(default)]\n+        error_target: Option<String>,\n+        #[serde(default)]\n+        form_id: Option<String>,\n+    },\n+    /// Same as `POST /post/redact`.\n+    RedactPost {\n+        post_id: String,\n+    },\n+    /// Morph `#public-new-thread-ui-slot` to the new-thread form (or login hint).\n+    ExpandPublicNewThreadForm,\n+    /// Morph `#room-new-thread-ui-slot` for the given room wire id.\n+    ExpandRoomNewThreadForm {\n+        room_wire: String,\n+    },\n+}\n+\n+#[derive(Debug, Error)]\n+pub enum HtmlUiParseError {\n+    #[error(\"missing __rpc__ field\")]\n+    MissingRpc,\n+    #[error(\"invalid template json: {0}\")]\n+    Template(serde_json::Error),\n+    #[error(\"invalid ui action: {0}\")]\n+    Action(serde_json::Error),\n+}\n+\n+/// Parse `__rpc__` JSON, apply `$form` holes from the rest of the form map, deserialize.\n+pub fn parse_html_ui_from_form(form: &HashMap<String, String>) -> Result<HtmlUiAction, HtmlUiParseError> {\n+    let template = form\n+        .get(UI_RPC_FIELD)\n+        .ok_or(HtmlUiParseError::MissingRpc)?;\n+    let mut hole_map = form.clone();\n+    hole_map.remove(UI_RPC_FIELD);\n+    let v: Value = fill_template_from_form(template, &hole_map).map_err(HtmlUiParseError::Template)?;\n+    serde_json::from_value(v).map_err(HtmlUiParseError::Action)\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+    use super::*;\n+\n+    #[test]\n+    fn round_trip_post_ingest_with_holes() {\n+        let template = serde_json::json!({\n+            \"action\": \"post_ingest\",\n+            \"room\": \"public\",\n+            \"thread_tag\": {\"$form\": \"thread_tag\"},\n+            \"text\": {\"$form\": \"text\"},\n+            \"error_target\": \"e\",\n+            \"form_id\": \"f\",\n+        });\n+        let mut form = HashMap::new();\n+        form.insert(\n+            UI_RPC_FIELD.to_string(),\n+            serde_json::to_string(&template).unwrap(),\n+        );\n+        form.insert(\"thread_tag\".into(), \"x\".into());\n+        form.insert(\"text\".into(), \"body\".into());\n+\n+        let a = parse_html_ui_from_form(&form).unwrap();\n+        assert_eq!(\n+            a,\n+            HtmlUiAction::PostIngest {\n+                room: \"public\".into(),\n+                thread_tag: \"x\".into(),\n+                text: \"body\".into(),\n+                error_target: Some(\"e\".into()),\n+                form_id: Some(\"f\".into()),\n+            }\n+        );\n+    }\n+\n+    #[test]\n+    fn expand_public_unit_variant() {\n+        let template = serde_json::json!({ \"action\": \"expand_public_new_thread_form\" });\n+        let mut form = HashMap::new();\n+        form.insert(\n+            UI_RPC_FIELD.to_string(),\n+            serde_json::to_string(&template).unwrap(),\n+        );\n+        let a = parse_html_ui_from_form(&form).unwrap();\n+        assert_eq!(a, HtmlUiAction::ExpandPublicNewThreadForm);\n+    }\n+}\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex b9d4b79791ba8dd3a3c26ff777943a2548092de5..5f5b6b0f01b29350c7415e5801ec5caa74f0b452 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -3,6 +3,7 @@ pub mod paths;\n pub mod api;\n pub mod canonical_path;\n pub mod dsl;\n+pub mod form_template;\n pub mod html;\n pub mod event_log;\n pub mod events;\n@@ -33,6 +34,7 @@ pub fn create_app(state: AppState) -> Router {\n         .route(\"/post\", post(api::post_web_ingest))\n         .route(\"/post/redact\", post(api::post_web_redact))\n         .route(\"/post/check\", post(api::check_web_ingest))\n+        .route(\"/ui\", post(api::post_ui_html))\n         .route(\"/theme\", post(crate::html::post_theme))\n         .route(\"/sse\", get(api::get_html_stream))\n         .route(\"/stream\", get(api::get_stream))\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[6e344666] Improve sorterc scan speed, errors, and ingest compile.\n\nMake scan a fast DSL parse pass with human-readable output, surface full parse_error details, and add compile --ingest for single-event replay from a log.\n\nCo-authored-by: Cursor <cursoragent@cursor.com>\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/offline.rs b/server/src/offline.rs\nindex 54ad0ded096a305ef8454ab2cdd1c3af71b14f5d..2db6f67e22e00a24ce673d13095644dd9fa9342d 100644\n--- a/server/src/offline.rs\n+++ b/server/src/offline.rs\n@@ -28,6 +28,10 @@ pub struct CompileResult {\n     pub threads: Vec<String>,\n     pub rankings: Vec<CheckScopeRanking>,\n     pub stats: CompileStats,\n+    #[serde(skip_serializing_if = \"Option::is_none\")]\n+    pub ingest_id: Option<String>,\n+    #[serde(skip_serializing_if = \"Option::is_none\")]\n+    pub ingest_line: Option<usize>,\n }\n \n #[derive(Debug, Clone, Serialize)]\n@@ -36,6 +40,8 @@ pub struct CompileError {\n     pub error: String,\n     #[serde(skip_serializing_if = \"Option::is_none\")]\n     pub hint: Option<String>,\n+    #[serde(skip_serializing_if = \"Option::is_none\")]\n+    pub parse_error: Option<String>,\n }\n \n #[derive(Debug, Clone, Serialize)]\n@@ -50,7 +56,7 @@ pub struct MalformedIngest {\n     pub id: String,\n     pub room_id: String,\n     pub thread_tag: String,\n-    pub reason: String,\n+    pub parse_error: String,\n }\n \n #[derive(Debug, Clone, Serialize)]\n@@ -59,9 +65,36 @@ pub struct ScanResult {\n     pub path: String,\n     pub total_lines: usize,\n     pub parsed_events: usize,\n+    pub ingest_events: usize,\n     pub bad_json_lines: Vec<BadJsonLine>,\n     pub malformed_ingests: Vec<MalformedIngest>,\n-    pub skipped_ingests: usize,\n+}\n+\n+#[derive(Debug)]\n+pub enum CompileIngestError {\n+    NotFound(String),\n+    Io(std::io::Error),\n+    Compile(CompileError),\n+}\n+\n+impl CompileIngestError {\n+    pub fn into_compile_error(self) -> CompileError {\n+        match self {\n+            Self::NotFound(id) => CompileError {\n+                ok: false,\n+                error: format!(\"ingest not found: {id}\"),\n+                hint: Some(\"pass the ingest event id from events.jsonl\".into()),\n+                parse_error: None,\n+            },\n+            Self::Io(e) => CompileError {\n+                ok: false,\n+                error: format!(\"io error: {e}\"),\n+                hint: None,\n+                parse_error: None,\n+            },\n+            Self::Compile(e) => e,\n+        }\n+    }\n }\n \n fn document_stats(doc: &dsl::Document) -> CompileStats {\n@@ -166,19 +199,22 @@ fn rankings_for_simulated(\n         .collect()\n }\n \n-/// Validate and simulate one `.sorter` document against optional base reducer state.\n-pub fn compile_document(\n+fn compile_document_inner(\n     base: &ReducerState,\n     room: &str,\n     text: &str,\n+    ingest_id: Option<String>,\n+    ingest_line: Option<usize>,\n ) -> Result<CompileResult, CompileError> {\n     let room_key = room.trim();\n     let scope = scope_from_room_wire(room_key);\n     let validated = validate_ingest_document(base, text, &scope).map_err(|(_, message, hint)| {\n+        let parse_error = dsl::parse_full(text).err().map(|e| e.to_string());\n         CompileError {\n             ok: false,\n             error: message,\n             hint,\n+            parse_error,\n         }\n     })?;\n \n@@ -200,15 +236,27 @@ pub fn compile_document(\n         threads: threads_in_document(text),\n         rankings: rankings_for_simulated(&simulated, &scope, room_key, &validated.doc),\n         stats: document_stats(&validated.doc),\n+        ingest_id,\n+        ingest_line,\n     })\n }\n \n+/// Validate and simulate one `.sorter` document against optional base reducer state.\n+pub fn compile_document(\n+    base: &ReducerState,\n+    room: &str,\n+    text: &str,\n+) -> Result<CompileResult, CompileError> {\n+    compile_document_inner(base, room, text, None, None)\n+}\n+\n fn ingest_parse_error(raw: &str) -> Option<String> {\n     dsl::parse_full(raw).err().map(|e| e.to_string())\n }\n \n-fn load_events_from_jsonl(path: &Path) -> Result<(Vec<(usize, Event)>, Vec<BadJsonLine>), std::io::Error> {\n+fn load_events_from_jsonl(path: &Path) -> Result<(usize, Vec<(usize, Event)>, Vec<BadJsonLine>), std::io::Error> {\n     let text = std::fs::read_to_string(path)?;\n+    let total_lines = text.lines().count();\n     let mut events = Vec::new();\n     let mut bad_json_lines = Vec::new();\n     for (idx, line) in text.lines().enumerate() {\n@@ -225,61 +273,90 @@ fn load_events_from_jsonl(path: &Path) -> Result<(Vec<(usize, Event)>, Vec<BadJs\n             }),\n         }\n     }\n-    Ok((events, bad_json_lines))\n+    Ok((total_lines, events, bad_json_lines))\n }\n \n-/// Replay a JSONL event log into reducer state (same rules as server boot).\n-pub fn load_reducer_from_jsonl(path: &Path) -> Result<(ReducerState, Vec<BadJsonLine>), std::io::Error> {\n-    let (events, bad_json_lines) = load_events_from_jsonl(path)?;\n+fn replay_events(events: &[(usize, Event)]) -> ReducerState {\n     let mut state = ReducerState::default();\n     for (_line_no, ev) in events {\n-        state.apply_event(ev);\n+        state.apply_event(ev.clone());\n     }\n-    Ok((state, bad_json_lines))\n+    state\n }\n \n-/// Scan an events.jsonl for corrupt JSON lines and ingests that fail DSL replay.\n-pub fn scan_jsonl(path: &Path) -> Result<ScanResult, std::io::Error> {\n-    let text = std::fs::read_to_string(path)?;\n-    let total_lines = text.lines().count();\n-    let (events, bad_json_lines) = load_events_from_jsonl(path)?;\n+/// Replay a JSONL event log into reducer state (same rules as server boot).\n+pub fn load_reducer_from_jsonl(path: &Path) -> Result<(ReducerState, Vec<BadJsonLine>), std::io::Error> {\n+    let (_total_lines, events, bad_json_lines) = load_events_from_jsonl(path)?;\n+    Ok((replay_events(&events), bad_json_lines))\n+}\n \n-    let mut malformed_ingests = Vec::new();\n-    let mut skipped_ingests = 0usize;\n-    let mut state = ReducerState::default();\n-    let parsed_events = events.len();\n+/// Find one ingest in a log and compile it against all prior events as base state.\n+pub fn compile_ingest_from_log(path: &Path, ingest_id: &str) -> Result<CompileResult, CompileIngestError> {\n+    let (_total_lines, events, bad_json_lines) = load_events_from_jsonl(path).map_err(CompileIngestError::Io)?;\n+    if !bad_json_lines.is_empty() {\n+        return Err(CompileIngestError::Compile(CompileError {\n+            ok: false,\n+            error: format!(\"jsonl has {} corrupt line(s)\", bad_json_lines.len()),\n+            hint: Some(\"fix the log or use `sorterc scan`\".into()),\n+            parse_error: None,\n+        }));\n+    }\n+\n+    let needle = ingest_id.trim();\n+    let mut found: Option<(usize, Ingest)> = None;\n+    let mut prior: Vec<(usize, Event)> = Vec::new();\n \n     for (line_no, ev) in events {\n         if let Event::Ingest(ref ing) = ev {\n-            if let Some(reason) = ingest_parse_error(&ing.raw) {\n+            if ing.id == needle {\n+                found = Some((line_no, ing.clone()));\n+                break;\n+            }\n+        }\n+        prior.push((line_no, ev));\n+    }\n+\n+    let (line_no, ing) = found.ok_or_else(|| CompileIngestError::NotFound(needle.to_string()))?;\n+    let base = replay_events(&prior);\n+    compile_document_inner(&base, &ing.room_id, &ing.raw, Some(ing.id.clone()), Some(line_no))\n+        .map_err(CompileIngestError::Compile)\n+}\n+\n+/// Scan an events.jsonl for corrupt JSON lines and ingests whose DSL fails to parse.\n+///\n+/// This does not replay the log (which would run rank centrality on every ingest and\n+/// can take minutes on real logs). It matches what the server skips on boot: parse failure.\n+pub fn scan_jsonl(path: &Path) -> Result<ScanResult, std::io::Error> {\n+    let (total_lines, events, bad_json_lines) = load_events_from_jsonl(path)?;\n+\n+    let mut malformed_ingests = Vec::new();\n+    let mut ingest_events = 0usize;\n+\n+    for (line_no, ev) in &events {\n+        if let Event::Ingest(ing) = ev {\n+            ingest_events += 1;\n+            if let Some(parse_error) = ingest_parse_error(&ing.raw) {\n                 malformed_ingests.push(MalformedIngest {\n-                    line: line_no,\n+                    line: *line_no,\n                     id: ing.id.clone(),\n                     room_id: ing.room_id.clone(),\n                     thread_tag: ing.thread_tag.clone(),\n-                    reason,\n+                    parse_error,\n                 });\n             }\n-            let before = state.ingests_by_id.len();\n-            state.apply_event(ev);\n-            if state.ingests_by_id.len() == before {\n-                skipped_ingests += 1;\n-            }\n-        } else {\n-            state.apply_event(ev);\n         }\n     }\n \n-    let ok = bad_json_lines.is_empty() && malformed_ingests.is_empty() && skipped_ingests == 0;\n+    let ok = bad_json_lines.is_empty() && malformed_ingests.is_empty();\n \n     Ok(ScanResult {\n         ok,\n         path: path.display().to_string(),\n         total_lines,\n-        parsed_events,\n+        parsed_events: events.len(),\n+        ingest_events,\n         bad_json_lines,\n         malformed_ingests,\n-        skipped_ingests,\n     })\n }\n \n@@ -330,4 +407,25 @@ mod tests {\n         assert!(!report.ok);\n         assert_eq!(report.bad_json_lines.len(), 1);\n     }\n+\n+    #[test]\n+    fn scan_reports_dsl_parse_error_detail() {\n+        let dir = tempfile::tempdir().unwrap();\n+        let path = dir.path().join(\"events.jsonl\");\n+        let ingest = serde_json::json!({\n+            \"type\": \"ingest\",\n+            \"ts\": 1,\n+            \"id\": \"bad-ingest-id\",\n+            \"raw\": \"{ no closing brace\\n~/a { body }\\n~/a 1:0 ~/b\",\n+            \"principal\": \"test\",\n+            \"room_id\": \"public\",\n+            \"thread_tag\": \"t\",\n+        });\n+        std::fs::write(&path, format!(\"{ingest}\\n\")).unwrap();\n+        let report = scan_jsonl(&path).unwrap();\n+        assert!(!report.ok);\n+        assert_eq!(report.malformed_ingests.len(), 1);\n+        assert_eq!(report.malformed_ingests[0].id, \"bad-ingest-id\");\n+        assert!(report.malformed_ingests[0].parse_error.contains(\"parse error\"));\n+    }\n }\ndiff --git a/sorterc/readme.md b/sorterc/readme.md\nindex 1ebcc3fc935541ea9e47e0458ec67a750fe19fff..e388615c34b40914ca51fc7a79cb738eebc2909b 100644\n--- a/sorterc/readme.md\n+++ b/sorterc/readme.md\n@@ -60,21 +60,33 @@ Rankings use the same structure as the server's dry-run check: parent scope, con\n \n ### `scan` — lint an `events.jsonl`\n \n-Reads a JSONL event log and reports problems without starting a server.\n+Fast single-pass check. Does **not** replay the log (replay runs rank centrality on every ingest and gets slow fast).\n \n ```bash\n cargo run -p sorterc -- scan events.jsonl\n-cargo run -p sorterc -- scan events.jsonl --pretty\n+cargo run -p sorterc -- scan events.jsonl --json\n+cargo run -p sorterc -- scan events.jsonl --json --pretty\n ```\n \n+Default output is human-readable with a blank line between each problem. Use `--json` for machine output.\n+\n Reports:\n \n - **bad JSON lines** — lines that are not valid JSON\n-- **malformed ingests** — ingest events whose `raw` DSL fails to parse\n-- **skipped ingests** — ingests dropped during replay (same behavior as server boot)\n+- **malformed ingests** — ingest events whose `raw` DSL fails to parse, with full `parse_error` text\n \n Exits 0 when clean, 1 when any issue is found.\n \n+### `compile --ingest` — compile one event from a log\n+\n+Replay all events **before** the target ingest as base state, then compile that ingest's DSL:\n+\n+```bash\n+cargo run -p sorterc -- compile --ingest cabd8adc-57ae-402d-a940-8e24339ac451 --from events.jsonl --pretty\n+```\n+\n+Output includes `ingest_id`, `ingest_line`, and rankings for that post only. This may take a while for ingests late in a large log (full replay up to that point).\n+\n ## Typical uses\n \n - Iterate on `.sorter` files in an editor and pipe through `compile` to see rankings instantly\ndiff --git a/sorterc/src/main.rs b/sorterc/src/main.rs\nindex 71382c180085cb0ad71043c852f8db5d3a48a284..5687c850d16973d28749380b8dc89f3bcebbfc56 100644\n--- a/sorterc/src/main.rs\n+++ b/sorterc/src/main.rs\n@@ -22,9 +22,15 @@ struct Cli {\n enum Command {\n     /// Parse and simulate a .sorter document; emit ranking JSON to stdout.\n     Compile {\n-        /// `.sorter` file, or `-` for stdin.\n-        file: PathBuf,\n-        /// Room wire id (`public` or private room id).\n+        /// `.sorter` file, or `-` for stdin. Omit when using --ingest.\n+        file: Option<PathBuf>,\n+        /// Compile one ingest event from a log (by event id / uuid).\n+        #[arg(long)]\n+        ingest: Option<String>,\n+        /// events.jsonl containing the ingest (required with --ingest).\n+        #[arg(long)]\n+        from: Option<PathBuf>,\n+        /// Room wire id (`public` or private room id). Ignored with --ingest.\n         #[arg(long, default_value = \"public\")]\n         room: String,\n         /// Optional events.jsonl to replay before compiling (seed garden state).\n@@ -34,9 +40,13 @@ enum Command {\n         #[arg(long)]\n         pretty: bool,\n     },\n-    /// Scan an events.jsonl for corrupt JSON lines and malformed ingests.\n+    /// Scan an events.jsonl for corrupt JSON lines and DSL parse failures.\n     Scan {\n         file: PathBuf,\n+        /// Emit JSON instead of human-readable output.\n+        #[arg(long)]\n+        json: bool,\n+        /// Pretty-print JSON (requires --json).\n         #[arg(long)]\n         pretty: bool,\n     },\n@@ -58,6 +68,7 @@ fn load_base_state(base: Option<&Path>) -> Result<ReducerState> {\n     let Some(path) = base else {\n         return Ok(ReducerState::default());\n     };\n+    eprintln!(\"sorterc: replaying {} for base state (may take a while on large logs)…\", path.display());\n     let (state, bad_lines) = offline::load_reducer_from_jsonl(path)\n         .with_context(|| format!(\"load base jsonl {}\", path.display()))?;\n     if !bad_lines.is_empty() {\n@@ -78,25 +89,101 @@ fn print_json<T: serde::Serialize>(value: &T, pretty: bool) -> Result<()> {\n     Ok(())\n }\n \n-fn run_compile(file: PathBuf, room: String, base: Option<PathBuf>, pretty: bool) -> Result<()> {\n-    let text = read_input(&file)?;\n-    let base_state = load_base_state(base.as_deref())?;\n-    match offline::compile_document(&base_state, &room, &text) {\n-        Ok(result) => {\n-            print_json::<CompileResult>(&result, pretty)?;\n-            Ok(())\n+fn run_compile(\n+    file: Option<PathBuf>,\n+    ingest: Option<String>,\n+    from: Option<PathBuf>,\n+    room: String,\n+    base: Option<PathBuf>,\n+    pretty: bool,\n+) -> Result<()> {\n+    if ingest.is_some() ^ from.is_some() {\n+        bail!(\"--ingest and --from must be used together\");\n+    }\n+    if ingest.is_some() && (file.is_some() || base.is_some()) {\n+        bail!(\"with --ingest/--from, omit file and --base\");\n+    }\n+    if file.is_none() && ingest.is_none() {\n+        bail!(\"pass a .sorter file or --ingest <id> --from events.jsonl\");\n+    }\n+\n+    if let (Some(ingest_id), Some(log_path)) = (ingest, from) {\n+        eprintln!(\n+            \"sorterc: compiling ingest {ingest_id} from {}…\",\n+            log_path.display()\n+        );\n+        match offline::compile_ingest_from_log(&log_path, &ingest_id) {\n+            Ok(result) => {\n+                print_json::<CompileResult>(&result, pretty)?;\n+                Ok(())\n+            }\n+            Err(err) => {\n+                print_json::<CompileError>(&err.into_compile_error(), pretty)?;\n+                std::process::exit(1);\n+            }\n+        }\n+    } else {\n+        let file = file.expect(\"checked above\");\n+        let text = read_input(&file)?;\n+        let base_state = load_base_state(base.as_deref())?;\n+        match offline::compile_document(&base_state, &room, &text) {\n+            Ok(result) => {\n+                print_json::<CompileResult>(&result, pretty)?;\n+                Ok(())\n+            }\n+            Err(err) => {\n+                print_json::<CompileError>(&err, pretty)?;\n+                std::process::exit(1);\n+            }\n+        }\n+    }\n+}\n+\n+fn print_scan_human(report: &ScanResult) {\n+    if report.ok {\n+        println!(\n+            \"ok: {} ({} lines, {} events, {} ingests)\",\n+            report.path, report.total_lines, report.parsed_events, report.ingest_events\n+        );\n+        return;\n+    }\n+\n+    let problems = report.bad_json_lines.len() + report.malformed_ingests.len();\n+    println!(\n+        \"{}: {} lines, {} events, {} ingests, {problems} problem(s)\",\n+        report.path, report.total_lines, report.parsed_events, report.ingest_events\n+    );\n+\n+    let mut first = true;\n+    for bad in &report.bad_json_lines {\n+        if !first {\n+            println!();\n         }\n-        Err(err) => {\n-            print_json::<CompileError>(&err, pretty)?;\n-            std::process::exit(1);\n+        first = false;\n+        println!(\"line {}: invalid JSON\", bad.line);\n+        println!(\"{}\", bad.message);\n+    }\n+\n+    for bad in &report.malformed_ingests {\n+        if !first {\n+            println!();\n         }\n+        first = false;\n+        println!(\n+            \"line {}: ingest {} (#{} in {})\",\n+            bad.line, bad.id, bad.thread_tag, bad.room_id\n+        );\n+        println!(\"{}\", bad.parse_error);\n     }\n }\n \n-fn run_scan(file: PathBuf, pretty: bool) -> Result<()> {\n-    let report = offline::scan_jsonl(&file)\n-        .with_context(|| format!(\"scan {}\", file.display()))?;\n-    print_json::<ScanResult>(&report, pretty)?;\n+fn run_scan(file: PathBuf, json: bool, pretty: bool) -> Result<()> {\n+    let report = offline::scan_jsonl(&file).with_context(|| format!(\"scan {}\", file.display()))?;\n+    if json {\n+        print_json::<ScanResult>(&report, pretty)?;\n+    } else {\n+        print_scan_human(&report);\n+    }\n     if !report.ok {\n         std::process::exit(1);\n     }\n@@ -108,10 +195,12 @@ fn main() -> Result<()> {\n     match cli.cmd {\n         Command::Compile {\n             file,\n+            ingest,\n+            from,\n             room,\n             base,\n             pretty,\n-        } => run_compile(file, room, base, pretty),\n-        Command::Scan { file, pretty } => run_scan(file, pretty),\n+        } => run_compile(file, ingest, from, room, base, pretty),\n+        Command::Scan { file, json, pretty } => run_scan(file, json, pretty),\n     }\n }\n","role":"user"}],"model":"~x-ai/grok-latest"}