{"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[40b975bf] nice\n\nSide A — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 266e876bb7ccbe788beb1d5bd53ad5b45ee5825b..2cea973082716e761ef6f5dd5886acc08ff9aac0 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -222,6 +222,12 @@ dependencies = [\n \"syn\",\n ]\n \n+[[package]]\n+name = \"dotenvy\"\n+version = \"0.15.7\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b\"\n+\n [[package]]\n name = \"encoding_rs\"\n version = \"0.8.35\"\n@@ -1238,6 +1244,7 @@ version = \"0.0.1\"\n dependencies = [\n \"axum\",\n \"axum-extra\",\n+ \"dotenvy\",\n \"maud\",\n \"reqwest\",\n \"serde\",\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex 4677fedcb45292eebebe7e9cf6ce2f5738f18ddf..bd600138b613bd0f546bdec217a5334cdcb20aa5 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -17,6 +17,7 @@ tower-http = { version = \"0.5\", features = [\"trace\"] }\n tracing = \"0.1\"\n tracing-subscriber = { version = \"0.3\", features = [\"env-filter\"] }\n reqwest = { version = \"0.12\", features = [\"json\"] }\n+dotenvy = \"0.15\"\n \n [dev-dependencies]\n reqwest = { version = \"0.12\", features = [\"json\"] }\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex d2024bd4582bcc8482b461b2ba4fedbd8bff7c66..b33a84e8bb5e817b26592868d88090e6d664d950 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -6,7 +6,7 @@ use axum::{\n use std::collections::HashMap;\n \n use crate::{\n- html::{input_panel, js_string_literal, ranking_panel, JsBuilder},\n+ html::{entity_section, input_panel, js_string_literal, ranking_panel, JsBuilder},\n parser::parse_reddit_url,\n path_types::ItemId,\n reddit::ensure_partial_tree,\n@@ -87,6 +87,20 @@ pub async fn post_ui_html(\n .into_response()\n }\n },\n+ HtmlUiAction::FetchEntity { item } => {\n+ let id = parse_item_param(&item);\n+ if id.is_root() {\n+ return ui_js_warn(\"nothing to fetch for the root\").into_response();\n+ }\n+ state.queue_entity_fetch(id.clone());\n+ let tree = state.tree.read().await;\n+ let empty = crate::reducer::NodeState::default();\n+ let node = tree.get(&id).unwrap_or(&empty);\n+ let panel = entity_section(&id, node, true);\n+ JsBuilder::new()\n+ .morph_selector(\"#entity-section\", panel)\n+ .into_response()\n+ },\n }\n }\n \ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex ed5be6b13b9d46e838831d6ce0f96f569b401730..07ce24b5e56cf72b0b442c3c3241efbf6c3b006a 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -1,4 +1,5 @@\n use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n \n #[derive(Debug, Clone, Serialize, Deserialize)]\n #[serde(tag = \"type\", rename_all = \"snake_case\")]\n@@ -18,4 +19,10 @@ pub enum Event {\n },\n /// Register a node path in the fractal tree (no external fetch).\n NodeEnsured { id: String },\n+ /// Full upstream API payload for a node (domain-specific view derived at replay/render time).\n+ EntityImported {\n+ id: String,\n+ ts: i64,\n+ payload: Value,\n+ },\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex df6505021d9f446c2b453e20e3eb3cf696a111f9..caf1309c8d93b47104499c57f9cc35ee7631fbb9 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -10,6 +10,7 @@ use crate::{\n form_template::template_json_compact,\n path_types::ItemId,\n ranking::{top_bottom, RankedItem},\n+ reddit::is_fetchable,\n reducer::{GroupState, NodeState},\n state::AppState,\n ui_action::UI_RPC_FIELD,\n@@ -151,7 +152,7 @@ pub fn breadcrumb_path(item: &ItemId) -> Markup {\n fn entity_panel(node: &NodeState) -> Markup {\n html! {\n @if let Some(data) = &node.data {\n- section id=\"entity-panel\" class=\"demo-panel entity-card\" {\n+ div id=\"entity-panel\" class=\"entity-card\" {\n h2 { (data.title) }\n @if let Some(author) = &data.author {\n p class=\"muted small\" { \"by \" (author) }\n@@ -164,6 +165,42 @@ fn entity_panel(node: &NodeState) -> Markup {\n }\n }\n \n+/// Reddit/API import control — only shown on fetchable pages; never auto-fires.\n+pub fn fetch_entity_panel(item: &ItemId, has_data: bool, fetching: bool) -> Markup {\n+ if !is_fetchable(item) {\n+ return html! {};\n+ }\n+ let label = if fetching {\n+ \"Fetching…\"\n+ } else if has_data {\n+ \"Fetch more\"\n+ } else {\n+ \"Fetch from Reddit\"\n+ };\n+ let rpc = template_json_compact(&serde_json::json!({\n+ \"action\": \"fetch_entity\",\n+ \"item\": item.as_str(),\n+ }))\n+ .expect(\"fetch_entity rpc template\");\n+ html! {\n+ form method=\"post\" action=\"/ui\" id=\"fetch-entity-form\" class=\"fetch-entity-form\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc);\n+ button type=\"submit\" class=\"btn-secondary\" disabled=(fetching) { (label) }\n+ }\n+ }\n+}\n+\n+/// Entity card + explicit fetch control (morphed as `#entity-section`).\n+pub fn entity_section(item: &ItemId, node: &NodeState, fetching: bool) -> Markup {\n+ let has_data = node.data.is_some();\n+ html! {\n+ section id=\"entity-section\" class=\"demo-panel\" {\n+ (entity_panel(node))\n+ (fetch_entity_panel(item, has_data, fetching))\n+ }\n+ }\n+}\n+\n fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {\n html! {\n @if !items.is_empty() {\n@@ -260,7 +297,7 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n h1 { \"sorter\" }\n (input_panel(\"\", None))\n (breadcrumb_path(&item))\n- (entity_panel(node))\n+ (entity_section(&item, node, false))\n (ranking_panel(&item, group))\n };\n layout(\"sorter2\", body, views)\n@@ -272,16 +309,5 @@ pub async fn home(State(state): State, uri: Uri) -> impl IntoResponse\n \n pub async fn browse(State(state): State, uri: Uri) -> impl IntoResponse {\n let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n- if item.as_str().starts_with(\"reddit.com\") {\n- let needs_fetch = {\n- let tree = state.tree.read().await;\n- tree.get(&item)\n- .map(|n| n.data.is_none())\n- .unwrap_or(true)\n- };\n- if needs_fetch {\n- state.reddit.request_fetch(item.clone());\n- }\n- }\n item_page(state, uri, item).await\n }\ndiff --git a/server/src/main.rs b/server/src/main.rs\nindex c22ec6c9f5358e5ec99fb83210dc351938505a93..1f0cddc39302b35b0cd6a6219f44c9d59202facf 100644\n--- a/server/src/main.rs\n+++ b/server/src/main.rs\n@@ -2,6 +2,10 @@ use sorter2_server::state::AppConfig;\n \n #[tokio::main]\n async fn main() -> Result<(), Box> {\n+ if std::env::var(\"SORTER2_SKIP_DOTENV\").is_err() {\n+ let _ = dotenvy::dotenv();\n+ }\n+\n tracing_subscriber::fmt()\n .with_env_filter(\n tracing_subscriber::EnvFilter::try_from_default_env()\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex 90053ad03b1d7c8e94f325dd4ee64c2b4f7da900..ff0f01e57b18af878eb5be3efc47204a7673589d 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -6,11 +6,15 @@ use std::time::{Duration, Instant};\n \n use reqwest::{header, Client, StatusCode};\n use serde::Deserialize;\n+use serde_json::Value;\n use tokio::sync::{mpsc, RwLock};\n \n use crate::{\n+ event_log::EventLog,\n+ events::Event,\n+ html::now_ms,\n path_types::ItemId,\n- reducer::{EntityData, GlobalTree},\n+ reducer::GlobalTree,\n };\n \n /// Bootstrap blank nodes along a URL path so breadcrumbs and voting work before fetch.\n@@ -20,6 +24,8 @@ pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) {\n \n pub struct RedditCommand {\n pub id: ItemId,\n+ /// User-initiated fetch bypasses the in-memory \"recently fetched\" cache.\n+ pub force: bool,\n }\n \n #[derive(Clone)]\n@@ -33,19 +39,31 @@ struct RedditCredentials {\n client_secret: String,\n }\n \n+#[derive(Clone)]\n+pub struct RedditApiConfig {\n+ pub api_base: String,\n+ pub oauth_base: String,\n+ pub user_agent: String,\n+ creds: Option,\n+}\n+\n struct OAuthToken {\n access_token: String,\n expires_at: Instant,\n }\n \n impl RedditBroker {\n- pub fn spawn(tree: Arc>, user_agent: &str) -> Self {\n+ pub fn spawn(\n+ tree: Arc>,\n+ event_log: Arc,\n+ config: RedditApiConfig,\n+ ) -> Self {\n let (tx, rx) = mpsc::channel(100);\n \n let mut headers = header::HeaderMap::new();\n headers.insert(\n header::USER_AGENT,\n- header::HeaderValue::from_str(user_agent).expect(\"valid user agent\"),\n+ header::HeaderValue::from_str(&config.user_agent).expect(\"valid user agent\"),\n );\n \n let client = Client::builder()\n@@ -54,22 +72,38 @@ impl RedditBroker {\n .build()\n .expect(\"reqwest client\");\n \n- let creds = RedditCredentials::from_env();\n- tokio::spawn(reddit_worker(rx, tree, client, creds));\n+ tokio::spawn(reddit_worker(rx, tree, event_log, client, config));\n \n Self { tx }\n }\n \n- /// Fire-and-forget: queue a fetch; worker updates the tree when done.\n- pub fn request_fetch(&self, id: ItemId) {\n- let _ = self.tx.try_send(RedditCommand { id });\n+ /// Queue a fetch; drops when the channel is full (backpressure).\n+ pub fn request_fetch(&self, id: ItemId, force: bool) {\n+ let _ = self.tx.try_send(RedditCommand { id, force });\n+ }\n+}\n+\n+impl RedditApiConfig {\n+ pub fn from_env() -> Self {\n+ Self {\n+ api_base: reddit_api_base(),\n+ oauth_base: reddit_oauth_base(),\n+ user_agent: default_user_agent(),\n+ creds: RedditCredentials::from_env(),\n+ }\n }\n }\n \n impl RedditCredentials {\n+ /// Reddit's OAuth docs call these \"client id\" and \"client secret\"; the app\n+ /// registration UI often labels them \"app id\" / \"app secret\" — same values.\n fn from_env() -> Option {\n- let client_id = std::env::var(\"REDDIT_CLIENT_ID\").ok()?;\n- let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\").ok()?;\n+ let client_id = std::env::var(\"REDDIT_CLIENT_ID\")\n+ .or_else(|_| std::env::var(\"REDDIT_APP_ID\"))\n+ .ok()?;\n+ let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\")\n+ .or_else(|_| std::env::var(\"REDDIT_APP_SECRET\"))\n+ .ok()?;\n if client_id.is_empty() || client_secret.is_empty() {\n return None;\n }\n@@ -80,29 +114,63 @@ impl RedditCredentials {\n }\n }\n \n+pub fn reddit_api_base() -> String {\n+ std::env::var(\"REDDIT_API_BASE\").unwrap_or_else(|_| \"https://www.reddit.com\".into())\n+}\n+\n+pub fn reddit_oauth_base() -> String {\n+ std::env::var(\"REDDIT_OAUTH_BASE\").unwrap_or_else(|_| \"https://www.reddit.com\".into())\n+}\n+\n pub fn default_user_agent() -> String {\n std::env::var(\"REDDIT_USER_AGENT\").unwrap_or_else(|_| {\n \"web:sorter2.social:v0.0.1 (by /u/sorter2)\".to_string()\n })\n }\n \n+/// True when this node can be loaded from the Reddit JSON API.\n+pub fn is_fetchable(id: &ItemId) -> bool {\n+ !map_item_to_reddit_api(id, \"https://example.com\").is_empty()\n+}\n+\n+/// Derive UI-facing fields from a stored payload (Reddit-specific when under reddit.com).\n+pub fn entity_view_from_payload(id: &ItemId, payload: &Value) -> Option {\n+ if id.as_str().starts_with(\"reddit.com\") {\n+ return parse_reddit_view(id, payload);\n+ }\n+ None\n+}\n+\n+/// Apply a full API payload to the in-memory tree (view derived for known domains).\n+pub fn apply_entity_import(tree: &mut GlobalTree, id: &ItemId, payload: Value) {\n+ let view = entity_view_from_payload(id, &payload);\n+ tree.apply_entity_raw(id, payload, view);\n+}\n+\n async fn reddit_worker(\n mut rx: mpsc::Receiver,\n tree: Arc>,\n+ event_log: Arc,\n client: Client,\n- creds: Option,\n+ config: RedditApiConfig,\n ) {\n let mut in_flight = HashSet::new();\n let mut recently_fetched: HashMap = HashMap::new();\n let mut current_delay = Duration::from_secs(1);\n let mut oauth: Option = None;\n let cache_ttl = Duration::from_secs(300);\n+ let creds = config.creds.clone();\n+ let api_base = config.api_base.clone();\n+ let oauth_base = config.oauth_base.clone();\n \n while let Some(cmd) = rx.recv().await {\n let now = Instant::now();\n recently_fetched.retain(|_, t| now.duration_since(*t) < cache_ttl);\n \n- if in_flight.contains(&cmd.id) || recently_fetched.contains_key(&cmd.id) {\n+ if in_flight.contains(&cmd.id) {\n+ continue;\n+ }\n+ if !cmd.force && recently_fetched.contains_key(&cmd.id) {\n continue;\n }\n \n@@ -112,18 +180,26 @@ async fn reddit_worker(\n tokio::time::sleep(current_delay).await;\n \n if let Some(c) = &creds {\n- oauth = ensure_oauth_token(&client, c, oauth.take()).await;\n+ oauth = ensure_oauth_token(&client, &oauth_base, c, oauth.take()).await;\n }\n \n let token = oauth.as_ref().map(|t| t.access_token.as_str());\n- let use_oauth = token.is_some();\n \n- match do_fetch(&client, &fetch_id, use_oauth, token).await {\n- Ok(FetchOutcome::Entity(data)) => {\n- let mut w = tree.write().await;\n- w.set_entity_data(&fetch_id, data);\n- recently_fetched.insert(fetch_id.clone(), Instant::now());\n- current_delay = Duration::from_millis(600);\n+ match do_fetch(&client, &api_base, &fetch_id, token).await {\n+ Ok(FetchOutcome::Payload(payload)) => {\n+ let ts = now_ms();\n+ let event = Event::EntityImported {\n+ id: fetch_id.as_str().to_string(),\n+ ts,\n+ payload: payload.clone(),\n+ };\n+ if let Err(e) = event_log.append(&event).await {\n+ tracing::warn!(\"event log append failed for {}: {}\", fetch_id, e);\n+ } else {\n+ apply_entity_import(&mut *tree.write().await, &fetch_id, payload);\n+ recently_fetched.insert(fetch_id.clone(), Instant::now());\n+ current_delay = Duration::from_millis(600);\n+ }\n }\n Ok(FetchOutcome::NotFound) => {\n recently_fetched.insert(fetch_id.clone(), Instant::now());\n@@ -149,13 +225,14 @@ async fn reddit_worker(\n }\n \n enum FetchOutcome {\n- Entity(EntityData),\n+ Payload(Value),\n NotFound,\n RateLimited { reset_secs: u64 },\n }\n \n async fn ensure_oauth_token(\n client: &Client,\n+ oauth_base: &str,\n creds: &RedditCredentials,\n existing: Option,\n ) -> Option {\n@@ -165,8 +242,13 @@ async fn ensure_oauth_token(\n }\n }\n \n+ let url = format!(\n+ \"{}/api/v1/access_token\",\n+ oauth_base.trim_end_matches('/')\n+ );\n+\n let resp = client\n- .post(\"https://www.reddit.com/api/v1/access_token\")\n+ .post(&url)\n .basic_auth(&creds.client_id, Some(&creds.client_secret))\n .form(&[(\"grant_type\", \"client_credentials\")])\n .send()\n@@ -207,11 +289,11 @@ async fn ensure_oauth_token(\n \n async fn do_fetch(\n client: &Client,\n+ api_base: &str,\n id: &ItemId,\n- use_oauth: bool,\n bearer: Option<&str>,\n ) -> Result {\n- let url = map_item_to_reddit_api(id, use_oauth);\n+ let url = map_item_to_reddit_api(id, api_base);\n if url.is_empty() {\n return Ok(FetchOutcome::NotFound);\n }\n@@ -241,10 +323,8 @@ async fn do_fetch(\n return Ok(FetchOutcome::RateLimited { reset_secs: reset });\n }\n \n- let bytes = resp.bytes().await.map_err(|e| e.to_string())?;\n- Ok(parse_reddit_json(id, &bytes)\n- .map(FetchOutcome::Entity)\n- .unwrap_or(FetchOutcome::NotFound))\n+ let payload: Value = resp.json().await.map_err(|e| e.to_string())?;\n+ Ok(FetchOutcome::Payload(payload))\n }\n \n fn rate_limit_remaining(resp: &reqwest::Response) -> Option {\n@@ -264,18 +344,14 @@ fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 {\n .unwrap_or(5)\n }\n \n-/// Map canonical item id to Reddit JSON API URL.\n-pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n+/// Map canonical item id to a Reddit JSON API URL under `api_base`.\n+pub fn map_item_to_reddit_api(id: &ItemId, api_base: &str) -> String {\n let path = id.as_str();\n if !path.starts_with(\"reddit.com/\") && path != \"reddit.com\" {\n return String::new();\n }\n \n- let base = if oauth {\n- \"https://oauth.reddit.com\"\n- } else {\n- \"https://www.reddit.com\"\n- };\n+ let base = api_base.trim_end_matches('/');\n \n let segments: Vec<&str> = path.split('/').collect();\n \n@@ -293,18 +369,17 @@ pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n String::new()\n }\n \n-fn parse_reddit_json(id: &ItemId, bytes: &[u8]) -> Option {\n- let v: serde_json::Value = serde_json::from_slice(bytes).ok()?;\n+fn parse_reddit_view(id: &ItemId, v: &Value) -> Option {\n let segments: Vec<&str> = id.as_str().split('/').collect();\n \n if segments.iter().any(|&p| p == \"comments\") {\n- parse_post_listing(&v)\n+ parse_post_listing(v)\n } else {\n- parse_subreddit_about(&v)\n+ parse_subreddit_about(v)\n }\n }\n \n-fn parse_subreddit_about(v: &serde_json::Value) -> Option {\n+fn parse_subreddit_about(v: &Value) -> Option {\n let data = v.get(\"data\")?;\n let title = data\n .get(\"title\")\n@@ -323,7 +398,7 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option {\n .filter(|s| !s.is_empty())\n .map(|s| s.to_string());\n \n- Some(EntityData {\n+ Some(crate::reducer::EntityData {\n title,\n author: None,\n body_html,\n@@ -331,10 +406,9 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option {\n })\n }\n \n-fn parse_post_listing(v: &serde_json::Value) -> Option {\n+fn parse_post_listing(v: &Value) -> Option {\n let listing = v.as_array()?.first()?;\n- let child = listing\n- .pointer(\"/data/children/0/data\")?;\n+ let child = listing.pointer(\"/data/children/0/data\")?;\n let title = child.get(\"title\")?.as_str()?.to_string();\n let author = child\n .get(\"author\")\n@@ -352,7 +426,7 @@ fn parse_post_listing(v: &serde_json::Value) -> Option {\n .filter(|s| s.starts_with(\"http\"))\n .map(|s| s.to_string());\n \n- Some(EntityData {\n+ Some(crate::reducer::EntityData {\n title,\n author,\n body_html,\n@@ -368,48 +442,51 @@ mod tests {\n fn map_subreddit_about_url() {\n let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n assert_eq!(\n- map_item_to_reddit_api(&id, false),\n+ map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n \"https://www.reddit.com/r/rust/about.json?raw_json=1\"\n );\n assert_eq!(\n- map_item_to_reddit_api(&id, true),\n- \"https://oauth.reddit.com/r/rust/about.json?raw_json=1\"\n+ map_item_to_reddit_api(&id, \"http://127.0.0.1:9999\"),\n+ \"http://127.0.0.1:9999/r/rust/about.json?raw_json=1\"\n );\n }\n \n #[test]\n fn map_post_url() {\n- let id =\n- ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n+ let id = ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n assert_eq!(\n- map_item_to_reddit_api(&id, false),\n+ map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n \"https://www.reddit.com/r/amitheasshole/comments/1trnvdl.json?raw_json=1\"\n );\n }\n \n #[test]\n- fn map_non_reddit_empty() {\n- let id = ItemId::opaque(\"example.com/foo\");\n- assert!(map_item_to_reddit_api(&id, false).is_empty());\n+ fn is_fetchable_reddit_sub() {\n+ let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ assert!(is_fetchable(&id));\n+ assert!(!is_fetchable(&ItemId::opaque(\"example.com/x\")));\n }\n \n #[test]\n fn parse_subreddit_fixture() {\n- let json = r#\"{\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\",\"public_description\":\"systems\"}}\"#;\n- let entity = parse_reddit_json(\n+ let json = include_str!(\"../../test/fixtures/reddit/r_rust_about.json\");\n+ let v: Value = serde_json::from_str(json).unwrap();\n+ let entity = entity_view_from_payload(\n &ItemId::parse(\"reddit.com/r/rust\").unwrap(),\n- json.as_bytes(),\n+ &v,\n )\n .unwrap();\n- assert_eq!(entity.title, \"Rust\");\n+ assert_eq!(entity.title, \"The Rust Programming Language\");\n+ assert!(entity.body_html.as_ref().is_some_and(|b| b.contains(\"Rust\")));\n }\n \n #[test]\n fn parse_post_fixture() {\n let json = r#\"[{\"kind\":\"Listing\",\"data\":{\"children\":[{\"kind\":\"t3\",\"data\":{\"title\":\"AITA\",\"author\":\"op\",\"selftext_html\":\"<p>hi</p>\",\"thumbnail\":\"https://b.thumbs.redditmedia.com/x.jpg\"}}]}}]\"#;\n- let entity = parse_reddit_json(\n+ let v: Value = serde_json::from_str(json).unwrap();\n+ let entity = entity_view_from_payload(\n &ItemId::parse(\"reddit.com/r/x/comments/abc\").unwrap(),\n- json.as_bytes(),\n+ &v,\n )\n .unwrap();\n assert_eq!(entity.title, \"AITA\");\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 077f700bf00ddefe18ffd004bb5288bdc7c4adaf..60db81a562e3590775012573225a76ba82a14563 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -1,6 +1,7 @@\n use std::collections::{HashMap, HashSet, VecDeque};\n \n use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n \n use crate::path_types::ItemId;\n \n@@ -128,6 +129,9 @@ pub struct EntityData {\n #[derive(Debug, Clone, Default)]\n pub struct NodeState {\n pub id: ItemId,\n+ /// Full imported API JSON (persisted in the event log).\n+ pub entity_raw: Option,\n+ /// Domain-specific view derived from `entity_raw` (e.g. Reddit title/author).\n pub data: Option,\n pub children: HashSet,\n pub local_ranking: GroupState,\n@@ -197,10 +201,11 @@ impl GlobalTree {\n }\n }\n \n- pub fn set_entity_data(&mut self, id: &ItemId, data: EntityData) {\n+ pub fn apply_entity_raw(&mut self, id: &ItemId, payload: Value, view: Option) {\n self.ensure_path(id);\n if let Some(node) = self.nodes.get_mut(id) {\n- node.data = Some(data);\n+ node.entity_raw = Some(payload);\n+ node.data = view;\n }\n }\n }\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 8c03aa60c15aee803a534439400b69935b1a3d84..d71d1079a8f486cdab15795384aef0b81b32544d 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -7,7 +7,7 @@ use crate::{\n events::Event,\n journal::JournalClient,\n path_types::ItemId,\n- reddit::{default_user_agent, RedditBroker},\n+ reddit::{apply_entity_import, RedditApiConfig, RedditBroker},\n reducer::{GlobalTree, VoteData},\n views::ViewStore,\n };\n@@ -108,13 +108,18 @@ impl AppState {\n tree.ensure_path(&parsed);\n }\n }\n+ Event::EntityImported { id, payload, .. } => {\n+ if let Some(parsed) = ItemId::parse(&id).or_else(|| ItemId::from_url(&id)) {\n+ apply_entity_import(&mut tree, &parsed, payload);\n+ }\n+ }\n }\n }\n }\n \n let tree = Arc::new(RwLock::new(tree));\n let journal = JournalClient::spawn(tree.clone(), event_log.clone());\n- let reddit = RedditBroker::spawn(tree.clone(), &default_user_agent());\n+ let reddit = RedditBroker::spawn(tree.clone(), event_log.clone(), RedditApiConfig::from_env());\n \n Self {\n cfg: Arc::new(cfg),\n@@ -135,10 +140,14 @@ impl AppState {\n let mut w = self.tree.write().await;\n w.ensure_path(id);\n }\n- self.reddit.request_fetch(id.clone());\n Ok(())\n }\n \n+ /// User-initiated Reddit/API import (via \"Fetch more\" — never on paste or navigate).\n+ pub fn queue_entity_fetch(&self, id: ItemId) {\n+ self.reddit.request_fetch(id, true);\n+ }\n+\n pub async fn record_vote(\n &self,\n parent: &ItemId,\n@@ -169,6 +178,44 @@ impl AppState {\n #[cfg(test)]\n mod tests {\n use super::{normalize_scope, parse_item_param};\n+ use crate::{\n+ event_log::EventLog,\n+ events::Event,\n+ path_types::ItemId,\n+ reddit::apply_entity_import,\n+ reducer::GlobalTree,\n+ };\n+ use serde_json::json;\n+\n+ #[tokio::test]\n+ async fn replay_entity_imported_restores_view() {\n+ let tmp = tempfile::tempdir().unwrap();\n+ let log_path = tmp.path().join(\"events.jsonl\");\n+ let log = EventLog::new(log_path.to_string_lossy().into_owned());\n+ let payload = json!({\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\"}});\n+ log.append(&Event::EntityImported {\n+ id: \"reddit.com/r/rust\".into(),\n+ ts: 1,\n+ payload: payload.clone(),\n+ })\n+ .await\n+ .unwrap();\n+\n+ let mut tree = GlobalTree::new();\n+ let (events, _) = log.load_all().await.unwrap();\n+ for ev in events {\n+ if let Event::EntityImported { id, payload, .. } = ev {\n+ let parsed = ItemId::parse(&id).unwrap();\n+ apply_entity_import(&mut tree, &parsed, payload);\n+ }\n+ }\n+ let node = tree.get(&ItemId::parse(\"reddit.com/r/rust\").unwrap()).unwrap();\n+ assert_eq!(node.data.as_ref().unwrap().title, \"Rust\");\n+ assert_eq!(\n+ node.entity_raw.as_ref().unwrap()[\"data\"][\"display_name\"],\n+ \"rust\"\n+ );\n+ }\n \n #[test]\n fn normalize_scope_strips_prefix_and_lowercases() {\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex d798874d1d94c0dfee59ec1ff703f9ee6ef432c0..3d6a49a2a3fb950752827efe1f5a049308f09baf 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -26,6 +26,10 @@ pub enum HtmlUiAction {\n ParseQuery {\n query: String,\n },\n+ /// Fetch upstream entity data for the current page (explicit user action only).\n+ FetchEntity {\n+ item: String,\n+ },\n }\n \n #[derive(Debug, Error)]\ndiff --git a/server/static/sorter.css b/server/static/sorter.css\nindex 36f68d415cea33c8562d5d02c0c9d4c5b225a782..1f9f5158414902d43a380dd899232c70d8cf5d63 100644\n--- a/server/static/sorter.css\n+++ b/server/static/sorter.css\n@@ -52,6 +52,25 @@ body {\n filter: brightness(1.1);\n }\n \n+.btn-secondary {\n+ background: transparent;\n+ color: var(--accent);\n+ border: 1px solid var(--border);\n+ padding: 0.4rem 0.85rem;\n+ font-size: 0.9rem;\n+ cursor: pointer;\n+ margin-top: 0.75rem;\n+}\n+\n+.btn-secondary:disabled {\n+ opacity: 0.6;\n+ cursor: wait;\n+}\n+\n+.fetch-entity-form {\n+ margin-top: 0.5rem;\n+}\n+\n code {\n font-size: 0.85em;\n background: var(--bg);\ndiff --git a/test/fixtures/reddit/r_rust_about.json b/test/fixtures/reddit/r_rust_about.json\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..bb7fd74ab00d63356d9b672a775996ed155b984d\n--- /dev/null\n+++ b/test/fixtures/reddit/r_rust_about.json\n@@ -0,0 +1,21 @@\n+{\n+ \"kind\": \"t5\",\n+ \"data\": {\n+ \"user_flair_background_color\": null,\n+ \"submit_text_html\": null,\n+ \"banner_img\": \"\",\n+ \"user_is_banned\": null,\n+ \"wiki_enabled\": true,\n+ \"show_media\": true,\n+ \"id\": \"2qh0i\",\n+ \"display_name\": \"rust\",\n+ \"title\": \"The Rust Programming Language\",\n+ \"public_description\": \"A place for all things related to the Rust programming language.\",\n+ \"public_description_html\": \"<!-- SC_OFF --><div class=\\\"md\\\"><p>A place for all things related to the Rust programming language.</p>\\n</div><!-- SC_ON -->\",\n+ \"icon_img\": \"https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png\",\n+ \"community_icon\": \"https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png\",\n+ \"subscribers\": 350000,\n+ \"active_user_count\": 1200,\n+ \"over18\": false\n+ }\n+}\ndiff --git a/test/reddit_import.clj b/test/reddit_import.clj\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..54edaedeef08718c8f184d6aa468d8e6415068c7\n--- /dev/null\n+++ b/test/reddit_import.clj\n@@ -0,0 +1,116 @@\n+(ns test.reddit-import\n+ (:require [babashka.process :as process]\n+ [clojure.java.io :as io]\n+ [clojure.string :as str]\n+ [clojure.test :refer [deftest is testing]])\n+ (:import [com.sun.net.httpserver HttpServer HttpHandler HttpExchange]\n+ [java.net InetSocketAddress]))\n+\n+(defn- repo-root []\n+ (.getCanonicalPath (io/file (System/getProperty \"user.dir\"))))\n+\n+(defn- pick-port []\n+ (with-open [s (java.net.ServerSocket. 0)]\n+ (.getLocalPort s)))\n+\n+(defn- start-mock-reddit [port fixtures-dir]\n+ (let [fixture (io/file fixtures-dir \"r_rust_about.json\")\n+ body (.getBytes (slurp fixture) \"UTF-8\")\n+ server (HttpServer/create (InetSocketAddress. \"127.0.0.1\" port) 0)\n+ handler\n+ (proxy [HttpHandler] []\n+ (handle [^HttpExchange exchange]\n+ (.sendResponseHeaders exchange 200 (alength body))\n+ (let [out (.getResponseBody exchange)]\n+ (.write out body)\n+ (.close out))))]\n+ (.createContext server \"/\" handler)\n+ (.setExecutor server nil)\n+ (.start server)\n+ (fn stop []\n+ (.stop server 0))))\n+\n+(defn- wait-health [base-url ms]\n+ (let [deadline (+ (System/currentTimeMillis) ms)\n+ url (str base-url \"/healthz\")]\n+ (loop []\n+ (let [resp (try\n+ (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" url)\n+ (catch Exception _ nil))]\n+ (if (and resp (zero? (:exit resp)) (= \"ok\" (str/trim (:out resp \"\"))))\n+ true\n+ (if (< (System/currentTimeMillis) deadline)\n+ (do (Thread/sleep 200) (recur))\n+ false))))))\n+\n+(defn- curl-post-ui [base rpc-json]\n+ (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" \"-X\" \"POST\" (str base \"/ui\")\n+ \"--data-urlencode\" (str \"__rpc__=\" rpc-json)))\n+\n+(defn- wait-event-log [path ms]\n+ (let [deadline (+ (System/currentTimeMillis) ms)]\n+ (loop []\n+ (if (.exists (io/file path))\n+ true\n+ (if (< (System/currentTimeMillis) deadline)\n+ (do (Thread/sleep 200) (recur))\n+ false)))))\n+\n+(deftest reddit-fetch-via-mock-api\n+ (testing \"Fetch more queues import; event log stores full payload; page shows title\"\n+ (let [root (repo-root)\n+ fixtures (str root \"/test/fixtures/reddit\")\n+ data-dir (.getAbsolutePath\n+ (doto (io/file (System/getProperty \"java.io.tmpdir\")\n+ (str \"sorter2-reddit-\" (System/currentTimeMillis)))\n+ (.mkdirs)))\n+ reddit-port (pick-port)\n+ app-port (pick-port)\n+ reddit-base (str \"http://127.0.0.1:\" reddit-port)\n+ app-base (str \"http://127.0.0.1:\" app-port)\n+ bin (str root \"/target/release/sorter2-server\")\n+ stop-mock (start-mock-reddit reddit-port fixtures)]\n+ (try\n+ (is (zero? (:exit (process/shell {:dir root}\n+ \"cargo\" \"build\" \"--release\" \"--package\" \"sorter2-server\")))\n+ \"release build succeeds\")\n+ (let [proc (process/process {:dir root\n+ :env (into (into {} (System/getenv))\n+ {\"SORTER2_SKIP_DOTENV\" \"1\"\n+ \"SORTER2_DATA_DIR\" data-dir\n+ \"SORTER2_EVENT_LOG\" (str data-dir \"/events.jsonl\")\n+ \"PORT\" (str app-port)\n+ \"REDDIT_API_BASE\" reddit-base\n+ \"REDDIT_OAUTH_BASE\" reddit-base\n+ \"REDDIT_CLIENT_ID\" \"\"\n+ \"REDDIT_CLIENT_SECRET\" \"\"\n+ \"REDDIT_APP_ID\" \"\"\n+ \"REDDIT_APP_SECRET\" \"\"})\n+ :out :string\n+ :err :string}\n+ bin)]\n+ (try\n+ (is (wait-health app-base 20000) \"app healthz\")\n+ (let [browse-url (str app-base \"/~/https://reddit.com/r/rust\")\n+ before (:out (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" browse-url))]\n+ (is (str/includes? before \"Fetch from Reddit\"))\n+ (is (not (str/includes? before \"The Rust Programming Language\")))\n+ (let [rpc \"{\\\"action\\\":\\\"fetch_entity\\\",\\\"item\\\":\\\"reddit.com/r/rust\\\"}\"\n+ post (curl-post-ui app-base rpc)\n+ log-path (str data-dir \"/events.jsonl\")]\n+ (is (zero? (:exit post)) \"fetch_entity POST succeeds\")\n+ (is (wait-event-log log-path 10000) \"event log written\")\n+ (let [after (:out (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" browse-url))\n+ log (slurp (io/file log-path))]\n+ (is (str/includes? after \"The Rust Programming Language\"))\n+ (is (str/includes? log \"\\\"type\\\":\\\"entity_imported\\\"\"))\n+ (is (str/includes? log \"\\\"subscribers\\\":350000\"))\n+ (is (str/includes? log \"\\\"display_name\\\":\\\"rust\\\"\")))))\n+ (finally\n+ (process/destroy proc))))\n+ (finally\n+ (stop-mock))))))\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[6bda2635] Use title-first items and explanation-first votes (#135)\n\n* Require block-first sorter DSL statements\n\nCo-authored-by: tommy \n\n* Use title-first items with explanation-first votes\n\nCo-authored-by: tommy \n\n* Update garden vote test DSL fixtures\n\nCo-authored-by: tommy \n\n* Update browser vote DSL payloads\n\nCo-authored-by: tommy \n\n---------\n\nCo-authored-by: Cursor Agent \n\nSide B — unified diff (full patch):\ndiff --git a/cli/DSL.txt b/cli/DSL.txt\nindex 18f69ef25f01583fddf9fc90e077bb2c3fa72bb6..c9b12bf0edaf73ad252f0a202b7fe61e311df50a 100644\n--- a/cli/DSL.txt\n+++ b/cli/DSL.txt\n@@ -18,9 +18,20 @@ Blank lines are preserved to maintain paragraph structure.\n ~/item/a {itembody}\n ~/python { A high-level scripting language }\n \n-~/item/a > ~/python { Item A is better because of X. }\n-~/python 3:1 ~/go { Python's ecosystem is much richer than Go's. }\n-https://example.com/lang = ~/go { They are equally good in this context. }\n+{\n+Item A is better because of X.\n+}\n+~/item/a > ~/python\n+\n+{\n+Python's ecosystem is much richer than Go's.\n+}\n+~/python 3:1 ~/go\n+\n+{\n+They are equally good in this context.\n+}\n+https://example.com/lang = ~/go\n ```\n \n SYNTAX RULES\n@@ -35,7 +46,7 @@ Starts a thread. Tag allows alphanumeric, `-`, `_`, and `/`. Subtitle max 100 ch\n ~/ { description }\n ```\n Defines an ontology item (garden layer). Paths can be nested (e.g. `~/languages/python`).\n-A leading `/` alone is **not** allowed in the DSL — use `~/` only. Descriptions (bodies) are wrapped in `{}`. Can be adjacent (e.g. `~/arrived{ready}`).\n+A leading `/` alone is **not** allowed in the DSL — use `~/` only. Descriptions (bodies) are wrapped in `{}` and follow the item path.\n \n ```sorter\n https://example.com/item { description }\n@@ -46,7 +57,10 @@ Canonicalization rules for URLs:\n - `~/` and `https://slug.social/~/` map to the same local item path.\n \n ```sorter\n- { required explanation }\n+{\n+required explanation\n+}\n+ \n ```\n Compares two items. The explanation is REQUIRED.\n Comparisons:\n@@ -65,7 +79,8 @@ When writing bodies or explanations, you can use braces `{}` and code blocks wit\n 3. Single braces: { ... }\n \n ```sorter\n-~/code { Here is a block: ```def foo(): return {\"a\": 1}``` }\n+{ Here is a block: ```def foo(): return {\"a\": 1}``` }\n+~/code\n ```\n \n STYLE\ndiff --git a/cli/GUIDE.sorter b/cli/GUIDE.sorter\nindex 7ea1c2649cb4a323b46f0bf389025079a9c9ab43..86accba72ecea547215d947fb6552e0ead25687c 100644\n--- a/cli/GUIDE.sorter\n+++ b/cli/GUIDE.sorter\n@@ -83,7 +83,8 @@ Item definitions (attaches a description to an item):\n ~/thread/item { description }\n \n Comparisons:\n- ~/thread/item-a 3:1 ~/thread/item-b { reasoning }\n+ { reasoning }\n+ ~/thread/item-a 3:1 ~/thread/item-b\n \n Ratio formats:\n 3:1 left is 3x better than right\n@@ -95,8 +96,7 @@ Shorthand:\n < means 1:2 (right is better)\n = means 1:1 (equal)\n \n-Bodies can attach without whitespace:\n- ~/thread/item{Description here}\n+Item bodies follow the item path. Vote explanations come first; the comparison is the verdict line.\n }\n \n You can write any prose in your posts. These won't be part of the garden but only the thread.\n@@ -165,7 +165,8 @@ npx slugsocial public forum post languages --delegate '7a3b9c2d-1234-5678-90ab-c\n \n ~/languages/python { A high-level language focused on readability. }\n ~/languages/rust { A systems language focused on safety and performance. }\n-~/languages/python 2:1 ~/languages/rust { Python has simpler syntax for beginners - fewer symbols, explicit over implicit. Rust's borrow checker adds cognitive load even for simple programs. Both are readable once learned, but Python's learning curve is gentler. }\n+{ Python has simpler syntax for beginners - fewer symbols, explicit over implicit. Rust's borrow checker adds cognitive load even for simple programs. Both are readable once learned, but Python's learning curve is gentler. }\n+~/languages/python 2:1 ~/languages/rust\n EOF\n \n # See current ranking\ndiff --git a/ideas/single-thread.md b/ideas/single-thread.md\nindex 86230fe6119c31045c21dbfcb12311b323c02fa8..0efb7199524cc3b308b1922c03e3a99193e4586c 100644\n--- a/ideas/single-thread.md\n+++ b/ideas/single-thread.md\n@@ -15,7 +15,8 @@ Previously a `.sorter` document could scatter `#tags` throughout:\n ~/languages/rust {A systems language.}\n #tools\n ~/tools/cargo {Rust's build system.}\n-~/languages/rust 2:1 ~/tools/cargo {Rust is more foundational than its tooling.}\n+{Rust is more foundational than its tooling.}\n+~/languages/rust 2:1 ~/tools/cargo\n ```\n \n The system would fan the ingest into both `#languages` and `#tools` — the same\ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex 9f3c1cc21c2ae157c024a447980a97e190c8f066..920e967b47852ea82fa61b84c457ae3582dd9800 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -72,16 +72,16 @@ mod tests {\n apply_ingest(\n &mut reduced,\n 1,\n- \"~/t/a {a}\\n~/t/b {b}\\n~/t/a 2:1 ~/t/b {because}\\n\",\n+ \"~/t/a {a}\\n~/t/b {b}\\n{because}\\n~/t/a 2:1 ~/t/b\\n\",\n );\n- let text = \"~/t/a 1:1 ~/t/b {equal}\\n\";\n+ let text = \"{equal}\\n~/t/a 1:1 ~/t/b\\n\";\n validate_ingest_document(&reduced, text, &crate::reducer::ScopeId::Public).unwrap();\n }\n \n #[test]\n fn validate_ingest_document_rejects_vote_on_undefined_item() {\n let reduced = ReducerState::default();\n- let text = \"~/t/a {x}\\n~/t/b 1:1 ~/t/missing {why}\\n\";\n+ let text = \"~/t/a {x}\\n{why}\\n~/t/b 1:1 ~/t/missing\\n\";\n let err = validate_ingest_document(&reduced, text, &crate::reducer::ScopeId::Public).unwrap_err();\n assert_eq!(err.0, StatusCode::BAD_REQUEST);\n assert!(err.1.contains(\"undefined item\"));\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex 696e7b3605e2e68aee0351116c494c2958506add..7cbda3876451687aa7a55547fc06bbe86ac9d260 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -222,13 +222,13 @@ async fn dispatch_ui_action(\n }\n \n let text = format!(\n- \"@{}\\n{} {}:{} {} {{\\n{}\\n}}\\n\",\n+ \"@{}\\n{{\\n{}\\n}}\\n{} {}:{} {}\\n\",\n crate::api::auth::WEB_BROWSER_AGENT,\n+ exp,\n left_id.as_str(),\n rl,\n rr,\n- right_id.as_str(),\n- exp\n+ right_id.as_str()\n );\n \n match rpc_post_with_bearer(state, &session.bearer, room.clone(), thread_tag.clone(), text).await {\ndiff --git a/server/src/dsl.rs b/server/src/dsl.rs\nindex 7962342bd023b3b5061a684d84d4ab164134b111..def8b497c71567016a522648b9630d7038163e41 100644\n--- a/server/src/dsl.rs\n+++ b/server/src/dsl.rs\n@@ -11,16 +11,21 @@ pub struct Document {\n /// A single statement in the DSL (or prose when using `parse_full`).\n #[derive(Debug, Clone, PartialEq, Eq)]\n pub enum Stmt {\n- Item { title: String, body: Option },\n+ Item {\n+ title: String,\n+ body: Option,\n+ },\n Vote {\n item1: String,\n item2: String,\n ratio_left: i32,\n ratio_right: i32,\n- /// Required non-empty explanation (from trailing `{ ... }`).\n+ /// Required non-empty explanation (from leading `{ ... }`).\n explanation: String,\n },\n- Prose { text: String },\n+ Prose {\n+ text: String,\n+ },\n }\n \n #[derive(Debug, thiserror::Error)]\n@@ -391,71 +396,46 @@ fn parse_comparison_at(s: &str, i: usize) -> Option<((i32, i32), usize)> {\n Some(((left, right), j))\n }\n \n-fn parse_item_statement(stripped: &str, masker: &BlockMasker) -> Result {\n- // item: (\"~/\" | \"https://...\" | \"http://...\") item_ref body?\n- // vote: same for both operands.\n- //\n- // Important: body token can be adjacent to the item name (no whitespace),\n- // e.g. \"~/arrived{...}\" -> \"~/arrived__BLOCK_x__\".\n- let s = stripped;\n- let bytes = s.as_bytes();\n- if bytes.is_empty() {\n- return Err(DslError::Parse(\"missing item statement\".to_string()));\n+fn parse_block_prefixed_statement(\n+ block_token: &str,\n+ tail: &str,\n+ masker: &BlockMasker,\n+) -> Result {\n+ // vote: block item_ref comparison item_ref\n+ let s = tail.trim_start();\n+ if s.is_empty() {\n+ return Err(DslError::Parse(\n+ \"missing vote statement after leading explanation block\".to_string(),\n+ ));\n }\n \n let (item1, j) =\n parse_item_name_at(s, 0).ok_or_else(|| DslError::Parse(\"invalid item name\".to_string()))?;\n+ let explanation = masker.extract_body(block_token);\n+ let mut i = skip_ws(s, j);\n \n- // Either we have:\n- // - immediate/whitespace block token => Item\n- // - comparison => Vote\n- // - whitespace then block token => Item\n- // - whitespace then comparison => Vote\n- let i = skip_ws(s, j);\n-\n- // If next is end or a block token => Item.\n if i >= s.len() {\n- return Ok(Stmt::Item {\n- title: item1,\n- body: None,\n- });\n- }\n- if let Some((tok, end)) = parse_block_token_at(s, i) {\n- let body = masker.extract_body(&tok);\n- let tail = s[end..].trim();\n- if !tail.is_empty() {\n- return Err(DslError::Parse(\"extra tokens after item\".to_string()));\n- }\n- return Ok(Stmt::Item {\n- title: item1,\n- body: Some(body),\n- });\n+ return Err(DslError::Parse(\n+ \"leading `{ ... }` blocks are vote explanations; item bodies belong after item paths\"\n+ .to_string(),\n+ ));\n }\n \n- // Otherwise parse comparison then \"/item2\" then REQUIRED body.\n- let ((ratio_left, ratio_right), mut k) = parse_comparison_at(s, i)\n+ let ((ratio_left, ratio_right), k) = parse_comparison_at(s, i)\n .ok_or_else(|| DslError::Parse(format!(\"invalid comparison near: {}\", &s[i..])))?;\n if ratio_left == 0 && ratio_right == 0 {\n return Err(DslError::Parse(\n \"vote ratio 0:0 is invalid; use 1:1 for a tie or omit the vote\".to_string(),\n ));\n }\n- k = skip_ws(s, k);\n- let (item2, mut m) = parse_item_name_at(s, k)\n+ i = skip_ws(s, k);\n+ let (item2, m) = parse_item_name_at(s, i)\n .ok_or_else(|| DslError::Parse(\"invalid rhs item name\".to_string()))?;\n- m = skip_ws(s, m);\n-\n- let Some((tok, end)) = parse_block_token_at(s, m) else {\n- return Err(DslError::Parse(\n- \"missing vote explanation (add a trailing `{ ... }`)\".to_string(),\n- ));\n- };\n- let explanation = masker.extract_body(&tok);\n+ i = skip_ws(s, m);\n if explanation.trim().is_empty() {\n return Err(DslError::Parse(\"empty vote explanation\".to_string()));\n }\n- m = end;\n- let tail = s[m..].trim();\n+ let tail = s[i..].trim();\n if !tail.is_empty() {\n return Err(DslError::Parse(\"extra tokens after vote\".to_string()));\n }\n@@ -469,6 +449,35 @@ fn parse_item_statement(stripped: &str, masker: &BlockMasker) -> Result Result {\n+ let (item1, j) =\n+ parse_item_name_at(stripped, 0).ok_or_else(|| DslError::Parse(\"invalid item name\".to_string()))?;\n+ let i = skip_ws(stripped, j);\n+\n+ if i >= stripped.len() {\n+ return Ok(Stmt::Item {\n+ title: item1,\n+ body: None,\n+ });\n+ }\n+\n+ if let Some((tok, end)) = parse_block_token_at(stripped, i) {\n+ let body = masker.extract_body(&tok);\n+ let tail = stripped[end..].trim();\n+ if !tail.is_empty() {\n+ return Err(DslError::Parse(\"extra tokens after item\".to_string()));\n+ }\n+ return Ok(Stmt::Item {\n+ title: item1,\n+ body: Some(body),\n+ });\n+ }\n+\n+ Err(DslError::Parse(\n+ \"vote explanations must start with a `{ ... }` block before the comparison\".to_string(),\n+ ))\n+}\n+\n fn parse_line(masked_line: &str, masker: &BlockMasker) -> Result, DslError> {\n let stripped = masked_line.trim_start();\n if stripped.is_empty() {\n@@ -477,27 +486,28 @@ fn parse_line(masked_line: &str, masker: &BlockMasker) -> Result, DslE\n let first = stripped.chars().next().unwrap();\n match first {\n '#' => Err(DslError::Parse(\"not a DSL line\".to_string())),\n- ':' => Err(DslError::Parse(\n- \"leading ':' is not supported\".to_string(),\n- )),\n+ ':' => Err(DslError::Parse(\"leading ':' is not supported\".to_string())),\n '@' => Err(DslError::Parse(\"not a DSL line\".to_string())),\n+ '_' => {\n+ let Some((tok, end)) = parse_block_token_at(stripped, 0) else {\n+ return Err(DslError::Parse(\"not a DSL line\".to_string()));\n+ };\n+ parse_block_prefixed_statement(&tok, &stripped[end..], masker).map(|stmt| vec![stmt])\n+ }\n '/' => Err(DslError::Parse(\n- \"item paths must use `~/` (e.g. `~/languages/python`), not a leading `/`\"\n- .to_string(),\n+ \"item paths must use `~/` (e.g. `~/languages/python`), not a leading `/`\".to_string(),\n )),\n- '~' => {\n- Ok(vec![parse_item_statement(stripped, masker)?])\n- }\n+ '~' => Ok(vec![parse_item_definition_statement(stripped, masker)?]),\n 'h' => {\n if stripped.starts_with(\"https://\") || stripped.starts_with(\"http://\") {\n- Ok(vec![parse_item_statement(stripped, masker)?])\n+ Ok(vec![parse_item_definition_statement(stripped, masker)?])\n } else {\n Err(DslError::Parse(\"not a DSL line\".to_string()))\n }\n }\n '-' => {\n if stripped.starts_with(\"-/\") {\n- Ok(vec![parse_item_statement(stripped, masker)?])\n+ Ok(vec![parse_item_definition_statement(stripped, masker)?])\n } else {\n Err(DslError::Parse(\"not a DSL line\".to_string()))\n }\n@@ -516,6 +526,7 @@ pub fn parse_full(text: &str) -> Result {\n let (masker, masked) = mask_all(BlockMasker::new(), text);\n let mut statements: Vec = Vec::new();\n let mut prose_buffer: Vec<&str> = Vec::new();\n+ let mut pending_block: Option = None;\n \n let flush_prose = |buf: &mut Vec<&str>, out: &mut Vec, masker: &BlockMasker| {\n if buf.is_empty() {\n@@ -529,11 +540,29 @@ pub fn parse_full(text: &str) -> Result {\n \n for line in masked.split('\\n') {\n let stripped = line.trim_start();\n+ if let Some(tok) = pending_block.as_ref() {\n+ if stripped.is_empty() {\n+ continue;\n+ }\n+ if stripped.starts_with(\"-/\")\n+ || stripped.starts_with(\"~/\")\n+ || stripped.starts_with(\"https://\")\n+ || stripped.starts_with(\"http://\")\n+ {\n+ statements.push(parse_block_prefixed_statement(tok, stripped, &masker)?);\n+ pending_block = None;\n+ continue;\n+ }\n+ return Err(DslError::Parse(\n+ \"expected vote statement after leading explanation block\".to_string(),\n+ ));\n+ }\n+\n if !stripped.is_empty()\n && (stripped.starts_with(\"-/\")\n || {\n let c = stripped.chars().next().unwrap();\n- \":/!~\".contains(c)\n+ \":/!~_\".contains(c)\n }\n || stripped.starts_with(\"https://\")\n || stripped.starts_with(\"http://\"))\n@@ -541,6 +570,13 @@ pub fn parse_full(text: &str) -> Result {\n // Flush prose buffer first\n flush_prose(&mut prose_buffer, &mut statements, &masker);\n \n+ if let Some((tok, end)) = parse_block_token_at(stripped, 0) {\n+ if stripped[end..].trim().is_empty() {\n+ pending_block = Some(tok);\n+ continue;\n+ }\n+ }\n+\n // Parse DSL line; DSL statements are not prose, so errors should propagate.\n statements.extend(parse_line(line, &masker)?);\n } else {\n@@ -548,6 +584,12 @@ pub fn parse_full(text: &str) -> Result {\n }\n }\n \n+ if pending_block.is_some() {\n+ return Err(DslError::Parse(\n+ \"missing vote statement after leading explanation block\".to_string(),\n+ ));\n+ }\n+\n // Final flush\n flush_prose(&mut prose_buffer, &mut statements, &masker);\n \n@@ -592,7 +634,7 @@ mod tests {\n \n #[test]\n fn parse_vote_ratio_and_symbols() {\n- let d1 = parse_full(\"~/a 3:1 ~/b {because}\").unwrap();\n+ let d1 = parse_full(\"{because}\\n~/a 3:1 ~/b\").unwrap();\n assert_eq!(\n d1.statements,\n vec![Stmt::Vote {\n@@ -604,7 +646,7 @@ mod tests {\n }]\n );\n \n- let d2 = parse_full(\"~/a > ~/b {because}\").unwrap();\n+ let d2 = parse_full(\"{because}\\n~/a > ~/b\").unwrap();\n assert_eq!(\n d2.statements,\n vec![Stmt::Vote {\n@@ -616,7 +658,7 @@ mod tests {\n }]\n );\n \n- let d3 = parse_full(\"~/a = ~/b {because}\").unwrap();\n+ let d3 = parse_full(\"{because}\\n~/a = ~/b\").unwrap();\n assert_eq!(\n d3.statements,\n vec![Stmt::Vote {\n@@ -631,7 +673,7 @@ mod tests {\n \n #[test]\n fn parse_vote_rejects_zero_zero_ratio() {\n- let err = parse_full(\"~/a 0:0 ~/b {tie placeholder}\").unwrap_err();\n+ let err = parse_full(\"{tie placeholder}\\n~/a 0:0 ~/b\").unwrap_err();\n let msg = match err {\n DslError::Parse(m) => m,\n };\n@@ -667,8 +709,8 @@ mod tests {\n }\n \n #[test]\n- fn parse_vote_with_attached_body_without_space() {\n- let input = \"~/a 2:1 ~/b{because}\";\n+ fn parse_vote_with_attached_explanation_without_space() {\n+ let input = \"{because}~/a 2:1 ~/b\";\n let doc = parse_full(input).unwrap();\n assert_eq!(\n doc.statements,\n@@ -697,7 +739,7 @@ mod tests {\n \n #[test]\n fn parse_nested_path_vote() {\n- let input = \"~/whitepaper/a 3:1 ~/whitepaper/b { because }\";\n+ let input = \"{ because }\\n~/whitepaper/a 3:1 ~/whitepaper/b\";\n let doc = parse_full(input).unwrap();\n assert_eq!(\n doc.statements,\n@@ -718,7 +760,10 @@ mod tests {\n let result = parse_full(input);\n assert!(result.is_err(), \"expected parse error for {input:?}\");\n assert!(\n- result.unwrap_err().to_string().contains(\"leading ':' is not supported\"),\n+ result\n+ .unwrap_err()\n+ .to_string()\n+ .contains(\"leading ':' is not supported\"),\n \"wrong error for {input:?}\"\n );\n }\n@@ -741,7 +786,35 @@ mod tests {\n let result = parse_full(input);\n assert!(result.is_err(), \"vote without explanation should fail\");\n let err_msg = result.unwrap_err().to_string();\n- assert!(err_msg.contains(\"missing vote explanation\"), \"error: {}\", err_msg);\n+ assert!(\n+ err_msg.contains(\"vote explanations must start\"),\n+ \"error: {}\",\n+ err_msg\n+ );\n+ }\n+\n+ #[test]\n+ fn parse_full_rejects_legacy_trailing_explanation_vote() {\n+ let result = parse_full(\"~/a 2:1 ~/b {because}\");\n+ assert!(result.is_err(), \"legacy vote syntax should fail\");\n+ let err_msg = result.unwrap_err().to_string();\n+ assert!(\n+ err_msg.contains(\"vote explanations must start\"),\n+ \"error: {}\",\n+ err_msg\n+ );\n+ }\n+\n+ #[test]\n+ fn parse_full_rejects_block_first_item_body() {\n+ let result = parse_full(\"{body}\\n~/a\");\n+ assert!(result.is_err(), \"block-first item body syntax should fail\");\n+ let err_msg = result.unwrap_err().to_string();\n+ assert!(\n+ err_msg.contains(\"item bodies belong after item paths\"),\n+ \"error: {}\",\n+ err_msg\n+ );\n }\n \n #[test]\n@@ -771,7 +844,7 @@ mod tests {\n \n #[test]\n fn parse_url_vote_statement() {\n- let input = \"https://slug.social/~/music/a 3:1 https://slug.social/~/music/b { because }\";\n+ let input = \"{ because }\\nhttps://slug.social/~/music/a 3:1 https://slug.social/~/music/b\";\n let doc = parse_full(input).unwrap();\n assert_eq!(\n doc.statements,\n@@ -785,5 +858,3 @@ mod tests {\n );\n }\n }\n-\n-\ndiff --git a/server/src/html/editor.rs b/server/src/html/editor.rs\nindex 8ff58326eb75806eeec3937f088fa977c7f3886e..216b144a4acef09d0addddd1528e5323433ac832 100644\n--- a/server/src/html/editor.rs\n+++ b/server/src/html/editor.rs\n@@ -39,7 +39,7 @@ pub async fn editor_page(State(state): State, jar: CookieJar, uri: Uri\n p class=\"muted\" { \"write DSL, see what happens. nothing is saved.\" }\n div class=\"editor-container\" {\n textarea id=\"editor-input\" rows=\"12\" cols=\"80\"\n- placeholder=\"your-uuid:rig:provider/model\\n#your-thread\\n\\n~/path/item-a { description }\\n~/path/item-b { description }\\n\\n~/path/item-a 3:1 ~/path/item-b { reasoning }\"\n+ placeholder=\"your-uuid:rig:provider/model\\n#your-thread\\n\\n{ description }\\n~/path/item-a\\n{ description }\\n~/path/item-b\\n\\n{ reasoning }\\n~/path/item-a 3:1 ~/path/item-b\"\n autocomplete=\"off\" autofocus {}\n div id=\"editor-status\" class=\"muted\" { \"type to check…\" }\n div id=\"editor-results\" {}\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex 9e08307e636ce7984766168db1187f84b8635201..86b4c184724910bb464682b9025d19ce6cd2050d 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -1454,8 +1454,8 @@ mod tests {\n ~/topic {root}\\n\\\n ~/topic/a {alpha}\\n\\\n ~/topic/b {beta}\\n\\\n- ~/topic/a 1:9 ~/topic/b {weak for a}\\n\\\n- ~/topic/a 8:2 ~/topic/b {strong for a}\\n\",\n+ {weak for a}\\n ~/topic/a 1:9 ~/topic/b\\n\\\n+ {strong for a}\\n ~/topic/a 8:2 ~/topic/b\\n\",\n );\n let content = content_for_garden_view(&reduced, &ScopeId::Public);\n let page_left = ItemId::parse(\"~/topic/a\").unwrap().normalized_storage();\n@@ -1483,8 +1483,10 @@ mod tests {\n ~/topic {root}\\n\\\n ~/topic/a {alpha}\\n\\\n ~/topic/b {beta}\\n\\\n- ~/topic/a 3:2 ~/topic/b {first vote}\\n\\\n- ~/topic/b 2:3 ~/topic/a {second vote}\\n\",\n+ {first vote}\\n\\\n+ ~/topic/a 3:2 ~/topic/b\\n\\\n+ {second vote}\\n\\\n+ ~/topic/b 2:3 ~/topic/a\\n\",\n );\n let content = content_for_garden_view(&reduced, &ScopeId::Public);\n let a = ItemId::parse(\"~/topic/a\").unwrap().normalized_storage();\n@@ -1525,7 +1527,7 @@ mod tests {\n ~/topic/a {alpha}\\n\\\n ~/topic/b {beta}\\n\\\n ~/topic/c {gamma}\\n\\\n- ~/topic/a 2:1 ~/topic/b {a beats b}\\n\",\n+ {a beats b}\\n ~/topic/a 2:1 ~/topic/b\\n\",\n );\n \n let model = build_item_page_view_model(&reduced, &ScopeId::Public, \"~/topic/a\");\n@@ -1545,7 +1547,7 @@ mod tests {\n ~/topic {root}\\n\\\n ~/topic/a {alpha}\\n\\\n ~/topic/b {beta}\\n\\\n- ~/topic/a 3:1 ~/topic/b {a beats b}\\n\\\n+ {a beats b}\\n ~/topic/a 3:1 ~/topic/b\\n\\\n ~/topic/kid1 {k1}\\n\\\n ~/topic/kid2 {k2}\\n\\\n ~/topic/kid1/leaf {leaf}\\n\",\n@@ -1616,7 +1618,7 @@ mod tests {\n 1,\n \"9ab12cd/my-room\",\n \"@00000000-0000-0000-0000-000000000000:test:local/test\\n\\\n- ~/a {a}\\n~/b {b}\\n~/a 2:1 ~/b {because}\\n\",\n+ ~/a {a}\\n~/b {b}\\n{because}\\n~/a 2:1 ~/b\\n\",\n );\n use crate::path_types::ItemId;\n let root = ItemId::ontology_root();\ndiff --git a/server/tests/basic.rs b/server/tests/basic.rs\nindex 4a4faa73e2f0338fc541237104d99ea05b3e599a..2f17ce91091745ce1b5ebd1575248565df3b3514 100644\n--- a/server/tests/basic.rs\n+++ b/server/tests/basic.rs\n@@ -31,7 +31,7 @@ fn ingest_event(ts: i64, raw: &str) -> Event {\n \n fn vote_doc(tag: &str, a: &str, b: &str, left: i32, right: i32) -> String {\n format!(\n- \"~/{tag}/{a} {{body a}}\\n~/{tag}/{b} {{body b}}\\n~/{tag}/{a} {left}:{right} ~/{tag}/{b} {{because test}}\\n\"\n+ \"~/{tag}/{a} {{body a}}\\n~/{tag}/{b} {{body b}}\\n{{because test}}\\n~/{tag}/{a} {left}:{right} ~/{tag}/{b}\\n\"\n )\n }\n \n@@ -47,7 +47,7 @@ fn reducer_external_namespace_ranking() {\n \"@00000000-0000-0000-0000-000000000000:test:local/test\\n\\\n -/github.com/iss/1 { one }\\n\\\n -/github.com/iss/2 { two }\\n\\\n- -/github.com/iss/1 2:1 -/github.com/iss/2 { because }\\n\",\n+ { because }\\n -/github.com/iss/1 2:1 -/github.com/iss/2\\n\",\n ));\n \n let content = state.public();\n@@ -77,9 +77,9 @@ fn reducer_and_ranking_linear_chain() {\n let mut state = ReducerState::default();\n \n // First ingest: define items + vote a > b.\n- state.apply_event(ingest_event(1, \"~/t/a {a}\\n~/t/b {b}\\n~/t/a 3:1 ~/t/b {because}\\n\"));\n+ state.apply_event(ingest_event(1, \"~/t/a {a}\\n~/t/b {b}\\n{because}\\n~/t/a 3:1 ~/t/b\\n\"));\n // Second ingest: define c + vote b > c.\n- state.apply_event(ingest_event(2, \"~/t/c {c}\\n~/t/b 3:1 ~/t/c {because}\\n\"));\n+ state.apply_event(ingest_event(2, \"~/t/c {c}\\n{because}\\n~/t/b 3:1 ~/t/c\\n\"));\n \n let mut group = state.public().ranking_group.clone();\n let ranked = ranked_items(&mut group, 20000, 1e-9);\n@@ -96,15 +96,15 @@ fn reducer_canonicalizes_identifiers() {\n // Mix of formats across ingests (case + sigils).\n state.apply_event(ingest_event(\n 1,\n- \"~/Tag/Item-A {x}\\n~/Tag/Item-B {y}\\n~/Tag/Item-A 2:1 ~/Tag/Item-B {because}\\n\",\n+ \"~/Tag/Item-A {x}\\n~/Tag/Item-B {y}\\n{because}\\n~/Tag/Item-A 2:1 ~/Tag/Item-B\\n\",\n ));\n state.apply_event(ingest_event(\n 2,\n- \"~/TAG/ITEM-A 2:1 ~/TAG/ITEM-B {because}\\n\",\n+ \"{because}\\n~/TAG/ITEM-A 2:1 ~/TAG/ITEM-B\\n\",\n ));\n state.apply_event(ingest_event(\n 3,\n- \"~/tag/item-a 2:1 ~/tag/item-b {because}\\n\",\n+ \"{because}\\n~/tag/item-a 2:1 ~/tag/item-b\\n\",\n ));\n \n assert_eq!(state.public().ranking_group.idx_to_item.len(), 2); // Should dedupe to 2 items\n@@ -135,7 +135,7 @@ fn reducer_handles_item_and_body_from_ingest() {\n fn reducer_indexes_item_threads_and_vote_thread() {\n let mut state = ReducerState::default();\n // Thread routing is metadata (ingest.thread_tag), not parsed from raw.\n- let mut ev = match ingest_event(1, \"~/sorts/insertion { O(n^2) }\\n~/sorts/mergesort { O(n log n) }\\n~/sorts/insertion 3:1 ~/sorts/mergesort { simpler for small n }\\n\") {\n+ let mut ev = match ingest_event(1, \"~/sorts/insertion { O(n^2) }\\n~/sorts/mergesort { O(n log n) }\\n{ simpler for small n }\\n~/sorts/insertion 3:1 ~/sorts/mergesort\\n\") {\n Event::Ingest(i) => i,\n _ => unreachable!(),\n };\n@@ -175,11 +175,11 @@ fn reducer_clamps_score_bounds() {\n let mut state = ReducerState::default();\n state.apply_event(ingest_event(\n 1,\n- \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t/a {a}\\n~/t/b {b}\\n~/t/a 1000:1 ~/t/b {huge}\\n\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t/a {a}\\n~/t/b {b}\\n{huge}\\n~/t/a 1000:1 ~/t/b\\n\",\n ));\n state.apply_event(ingest_event(\n 2,\n- \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t/a 1:1000 ~/t/b {huge}\\n\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n{huge}\\n~/t/a 1:1000 ~/t/b\\n\",\n ));\n \n assert_eq!(state.public().ranking_group.idx_to_item.len(), 2); // Should still work, scores clamped internally\n@@ -195,15 +195,15 @@ fn ranking_cycle_is_nearly_equal() {\n let mut state = ReducerState::default();\n state.apply_event(ingest_event(\n 1,\n- \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/rps/rock {r}\\n~/rps/scissors {s}\\n~/rps/rock 3:1 ~/rps/scissors {because}\\n\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/rps/rock {r}\\n~/rps/scissors {s}\\n{because}\\n~/rps/rock 3:1 ~/rps/scissors\\n\",\n ));\n state.apply_event(ingest_event(\n 2,\n- \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/rps/paper {p}\\n~/rps/scissors 3:1 ~/rps/paper {because}\\n\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/rps/paper {p}\\n{because}\\n~/rps/scissors 3:1 ~/rps/paper\\n\",\n ));\n state.apply_event(ingest_event(\n 3,\n- \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/rps/paper 3:1 ~/rps/rock {because}\\n\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n{because}\\n~/rps/paper 3:1 ~/rps/rock\\n\",\n ));\n \n let mut group = state.public().ranking_group.clone();\n@@ -233,7 +233,7 @@ fn ranking_dominant_item_wins() {\n let mut state = ReducerState::default();\n state.apply_event(ingest_event(\n 1,\n- \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t/champion {c}\\n~/t/b {b}\\n~/t/c {c}\\n~/t/d {d}\\n~/t/champion 10:1 ~/t/b {because}\\n~/t/champion 10:1 ~/t/c {because}\\n~/t/champion 10:1 ~/t/d {because}\\n~/t/b 2:1 ~/t/c {because}\\n~/t/c 2:1 ~/t/d {because}\\n\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t/champion {c}\\n~/t/b {b}\\n~/t/c {c}\\n~/t/d {d}\\n{because}\\n~/t/champion 10:1 ~/t/b\\n{because}\\n~/t/champion 10:1 ~/t/c\\n{because}\\n~/t/champion 10:1 ~/t/d\\n{because}\\n~/t/b 2:1 ~/t/c\\n{because}\\n~/t/c 2:1 ~/t/d\\n\",\n ));\n \n let mut group = state.public().ranking_group.clone();\n@@ -248,7 +248,7 @@ fn ranking_neutral_votes_produce_equal_scores() {\n let mut state = ReducerState::default();\n state.apply_event(ingest_event(\n 1,\n- \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t/a {a}\\n~/t/b {b}\\n~/t/c {c}\\n~/t/a 1:1 ~/t/b {neutral}\\n~/t/b 1:1 ~/t/c {neutral}\\n~/t/c 1:1 ~/t/a {neutral}\\n\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t/a {a}\\n~/t/b {b}\\n~/t/c {c}\\n{neutral}\\n~/t/a 1:1 ~/t/b\\n{neutral}\\n~/t/b 1:1 ~/t/c\\n{neutral}\\n~/t/c 1:1 ~/t/a\\n\",\n ));\n \n let mut group = state.public().ranking_group.clone();\n@@ -301,8 +301,8 @@ async fn event_log_append_and_load() {\n let log = EventLog::new(log_path);\n \n let events = vec![\n- ingest_event(1, \"~/a {x}\\n~/b {y}\\n~/a 2:1 ~/b {because}\\n\"),\n- ingest_event(2, \"~/b 3:1 ~/c {because}\\n\"),\n+ ingest_event(1, \"~/a {x}\\n~/b {y}\\n{because}\\n~/a 2:1 ~/b\\n\"),\n+ ingest_event(2, \"{because}\\n~/b 3:1 ~/c\\n\"),\n ];\n \n for ev in &events {\n@@ -323,7 +323,7 @@ async fn event_log_handles_corrupt_lines() {\n let log = EventLog::new(&log_path);\n \n // Write valid events using the log itself, then manually corrupt one line.\n- log.append(&ingest_event(1, \"~/a {x}\\n~/b {y}\\n~/a 2:1 ~/b {because}\\n\"))\n+ log.append(&ingest_event(1, \"~/a {x}\\n~/b {y}\\n{because}\\n~/a 2:1 ~/b\\n\"))\n .await\n .unwrap();\n \n@@ -332,7 +332,7 @@ async fn event_log_handles_corrupt_lines() {\n let mut f = fs::OpenOptions::new().append(true).open(&log_path).unwrap();\n writeln!(f, \"not json at all\").unwrap();\n \n- log.append(&ingest_event(2, \"~/b 3:1 ~/c {because}\\n\"))\n+ log.append(&ingest_event(2, \"{because}\\n~/b 3:1 ~/c\\n\"))\n .await\n .unwrap();\n \n@@ -351,7 +351,7 @@ async fn event_log_creates_parent_dirs() {\n let log_path = tmp.path().join(\"subdir\").join(\"nested\").join(\"events.jsonl\");\n let log = EventLog::new(&log_path);\n \n- log.append(&ingest_event(1, \"~/a {x}\\n~/b {y}\\n~/a 2:1 ~/b {because}\\n\"))\n+ log.append(&ingest_event(1, \"~/a {x}\\n~/b {y}\\n{because}\\n~/a 2:1 ~/b\\n\"))\n .await\n .unwrap();\n assert!(log_path.exists());\n@@ -379,7 +379,7 @@ async fn full_workflow_reducer_and_ranking() {\n \n state.apply_event(ingest_event(\n 1,\n- \"~/langs/rust {Systems language}\\n~/langs/go {Simple concurrency}\\n~/langs/rust 3:1 ~/langs/go {because}\\n\",\n+ \"~/langs/rust {Systems language}\\n~/langs/go {Simple concurrency}\\n{because}\\n~/langs/rust 3:1 ~/langs/go\\n\",\n ));\n \n let mut group = state.public().ranking_group.clone();\n@@ -452,21 +452,21 @@ fn ranking_repeated_votes_normalized() {\n let mut state_once = ReducerState::default();\n state_once.apply_event(ingest_event(\n 1,\n- \"~/norm/a {a}\\n~/norm/b {b}\\n~/norm/a 3:1 ~/norm/b {vote}\\n\",\n+ \"~/norm/a {a}\\n~/norm/b {b}\\n{vote}\\n~/norm/a 3:1 ~/norm/b\\n\",\n ));\n \n let mut state_many = ReducerState::default();\n state_many.apply_event(ingest_event(\n 1,\n- \"~/norm/a {a}\\n~/norm/b {b}\\n~/norm/a 3:1 ~/norm/b {vote1}\\n\",\n+ \"~/norm/a {a}\\n~/norm/b {b}\\n{vote1}\\n~/norm/a 3:1 ~/norm/b\\n\",\n ));\n state_many.apply_event(ingest_event(\n 2,\n- \"~/norm/a 3:1 ~/norm/b {vote2}\\n\",\n+ \"{vote2}\\n~/norm/a 3:1 ~/norm/b\\n\",\n ));\n state_many.apply_event(ingest_event(\n 3,\n- \"~/norm/a 3:1 ~/norm/b {vote3}\\n\",\n+ \"{vote3}\\n~/norm/a 3:1 ~/norm/b\\n\",\n ));\n \n let mut group_once = state_once.public().ranking_group.clone();\n@@ -508,7 +508,7 @@ fn reducer_malformed_ingest_is_skipped_no_panic() {\n #[test]\n fn dsl_parse_rejects_zero_zero_vote_ratio() {\n let err = slugsocial_server::dsl::parse_full(\n- \"~/t/a {a}\\n~/t/b {b}\\n~/t/a 0:0 ~/t/b {zero}\\n\",\n+ \"~/t/a {a}\\n~/t/b {b}\\n{zero}\\n~/t/a 0:0 ~/t/b\\n\",\n )\n .expect_err(\"0:0 vote must be rejected by the parser\");\n let msg = match err {\n@@ -522,7 +522,7 @@ fn dsl_parse_rejects_zero_zero_vote_ratio() {\n let mut state = ReducerState::default();\n state.apply_event(ingest_event(\n 1,\n- \"~/t/a {a}\\n~/t/b {b}\\n~/t/a 0:0 ~/t/b {zero}\\n\",\n+ \"~/t/a {a}\\n~/t/b {b}\\n{zero}\\n~/t/a 0:0 ~/t/b\\n\",\n ));\n let content = state.public();\n assert!(\n@@ -620,7 +620,7 @@ fn ranking_convergence_tolerance_triggers_early_exit() {\n let mut state = ReducerState::default();\n state.apply_event(ingest_event(\n 1,\n- \"~/t/a {a}\\n~/t/b {b}\\n~/t/a 3:1 ~/t/b {because}\\n\",\n+ \"~/t/a {a}\\n~/t/b {b}\\n{because}\\n~/t/a 3:1 ~/t/b\\n\",\n ));\n let mut group = state.public().ranking_group.clone();\n // Very tight tolerance but huge max_iters — should still converge fast\n@@ -742,7 +742,7 @@ fn test_thread_timestamp_bump() {\n #[test]\n fn test_thread_id_is_used_for_votes_and_indexes() {\n let mut state = ReducerState::default();\n- let mut ev = match ingest_event(1, \"~/t/a {a}\\n~/t/b {b}\\n~/t/a 2:1 ~/t/b {reason}\\n\") {\n+ let mut ev = match ingest_event(1, \"~/t/a {a}\\n~/t/b {b}\\n{reason}\\n~/t/a 2:1 ~/t/b\\n\") {\n Event::Ingest(i) => i,\n _ => unreachable!(),\n };\n@@ -770,7 +770,7 @@ fn test_rank_history_created_for_voted_items() {\n let mut state = ReducerState::default();\n state.apply_event(ingest_event(\n 1,\n- \"~/t/a {a}\\n~/t/b {b}\\n~/t/a 3:1 ~/t/b {reason}\\n\",\n+ \"~/t/a {a}\\n~/t/b {b}\\n{reason}\\n~/t/a 3:1 ~/t/b\\n\",\n ));\n assert!(\n state.public().rank_history.contains_key(&item_id(\"https://slug.social/~/t/a\")),\n@@ -800,7 +800,7 @@ fn test_rank_history_first_entry_delta_zero() {\n let mut state = ReducerState::default();\n state.apply_event(ingest_event(\n 1,\n- \"~/t/a {a}\\n~/t/b {b}\\n~/t/a 3:1 ~/t/b {reason}\\n\",\n+ \"~/t/a {a}\\n~/t/b {b}\\n{reason}\\n~/t/a 3:1 ~/t/b\\n\",\n ));\n let history_a = state.public().rank_history.get(&item_id(\"https://slug.social/~/t/a\")).unwrap();\n assert_eq!(history_a.len(), 1);\ndiff --git a/server/tests/dsl_fixtures.rs b/server/tests/dsl_fixtures.rs\nindex 2446da86447508b36b7a7dfb112b35cc5a4cc1e6..62f3fa14adc8203562338bf75f9310b99bacbb43 100644\n--- a/server/tests/dsl_fixtures.rs\n+++ b/server/tests/dsl_fixtures.rs\n@@ -28,7 +28,7 @@ fn parses_tutorial_fixture_with_prose() {\n \n #[test]\n fn parses_big_book_fixture_with_attached_bodies() {\n- // This doc heavily uses the \"~/name{...}\" style with no whitespace.\n+ // This doc heavily uses the \"{...}\\n~/name\" style with no whitespace.\n let doc = dsl::parse_full(BIG_BOOK).expect(\"parse_full should succeed\");\n \n let mut items = 0usize;\n@@ -55,7 +55,7 @@ fn parses_big_book_fixture_with_attached_bodies() {\n \n #[test]\n fn parses_external_dash_vote_line() {\n- let doc = dsl::parse_full(\"-/domain.com/a 2:1 -/domain.com/b { reason }\").unwrap();\n+ let doc = dsl::parse_full(\"{ reason }\\n-/domain.com/a 2:1 -/domain.com/b\").unwrap();\n assert_eq!(\n doc.statements,\n vec![dsl::Stmt::Vote {\ndiff --git a/server/tests/fixtures/big-book.sorter b/server/tests/fixtures/big-book.sorter\nindex 7b3ce871d4f56210d48ecbf6f1ca33371d89eda9..3472f18c6d2e7fdd608b5936d34301480498cf40 100644\n--- a/server/tests/fixtures/big-book.sorter\n+++ b/server/tests/fixtures/big-book.sorter\n@@ -1,10 +1,10 @@\n #Big-Book\n \n-~/big-book/arrived{\n+~/big-book/arrived {\n I had arrived.\n }\n \n-~/big-book/how-it-works{\n+~/big-book/how-it-works {\n \n Rarely have we seen a person fail who has thoroughly followed our path.\n Those who do not recover are people who cannot or will not completely give\n@@ -58,7 +58,7 @@ lives. (b) That probably no human power could have relieved our alcoholism.\n }\n \n \n-~/big-book/run-the-show{\n+~/big-book/run-the-show {\n The first requirement is that we be convinced that any life run on\n self-will can hardly be a success. On that basis we are almost always in\n collision with something or somebody, even though our motives are good.\n@@ -94,7 +94,7 @@ all and is locked up. Whatever our protestations, are not most of us\n concerned with ourselves, our resentments, or our self-pity?\n }\n \n-~/big-book/god-director{\n+~/big-book/god-director {\n \n This is the how and why of it. First of all, we had to quit playing God. It\n didn’t work. Next, we decided that hereafter in this drama of life, God was\n@@ -126,7 +126,7 @@ were ready; that we could at last abandon ourselves utterly to Him.\n \n }\n \n-~/big-book/dubious-luxury{\n+~/big-book/dubious-luxury {\n \n But with the alcoholic, whose hope is the maintenance and growth of a\n spiritual experience, this business of resentment is infinitely grave. We\n@@ -139,7 +139,7 @@ poison.\n \n }\n \n-~/big-book/sick-mans-prayer{\n+~/big-book/sick-mans-prayer {\n \n This was our course: We realized that the people who wronged us were\n perhaps spiritually sick. HOW IT WORKS 67 Though we did not like their\n@@ -151,7 +151,7 @@ him? God save me from being angry. Thy will be done.’’\n \n }\n \n-~/big-book/fear-calamity-serenity{\n+~/big-book/fear-calamity-serenity {\n \n Notice that the word “fear’’ is bracketed alongside the difficulties with\n Mr. Brown, Mrs. Jones, the employer, and the wife. This short word somehow\ndiff --git a/server/tests/fixtures/tutorial.sorter b/server/tests/fixtures/tutorial.sorter\nindex d8228c3a2986fbeb08817ebdedd4f61cfa6ee724..60b4dc92d5212703df65e70949f7251cd5a85c3d 100644\n--- a/server/tests/fixtures/tutorial.sorter\n+++ b/server/tests/fixtures/tutorial.sorter\n@@ -15,9 +15,9 @@ subsequent items will be catalogued in the index under this context.\n \n We are in a tag, now let's declare an item.\n \n-~/alphabet/a\n+~/alphabet/a {the letter a}\n \n-~/alphabet/b\n+~/alphabet/b {the letter b}\n \n The prefix `~/` denotes, when the first characters on a line, the beginning\n of the title of an ontology item (the garden layer).\n@@ -25,7 +25,8 @@ Now we have two discrete, addressable items. Imagine two dots floating on a\n 2d plane.\n Now let's draw a line segment between the two dots.\n \n-~/alphabet/a 2:1 ~/alphabet/b {a edges out b in this ranking}\n+{a edges out b in this ranking}\n+~/alphabet/a 2:1 ~/alphabet/b\n \n \n We have asserted that ~/alphabet/a wins over ~/alphabet/b, winning 66% of that matchup.\n@@ -35,12 +36,13 @@ From this assertion we derive the ranking:\n 2) ~/alphabet/b\n \n If we were to send this email right now, we could view the ranking at\n-https://slug.social/~/alphabet\n+the URL https://slug.social/~/alphabet\n Easy enough.\n \n-~/alphabet/c\n+~/alphabet/c {the letter c}\n \n-~/alphabet/a 3:1 ~/alphabet/c {a strongly preferred to c here}\n+{a strongly preferred to c here}\n+~/alphabet/a 3:1 ~/alphabet/c\n Now the ranking is\n \n 1) ~/alphabet/a\n@@ -102,20 +104,24 @@ Sorter is proprietary, trying to become a venture scale business.\n Now we have six dots swimming around. Lets order them.\n \n truth\n-~/sorter-properties/collective = ~/sorter-properties/asynchronous {roughly equally important}\n-~/sorter-properties/asynchronous = ~/sorter-properties/precise {roughly equally important}\n-~/sorter-properties/precise = ~/sorter-properties/transitive {roughly equally important}\n+{roughly equally important}\n+~/sorter-properties/collective = ~/sorter-properties/asynchronous\n+{roughly equally important}\n+~/sorter-properties/asynchronous = ~/sorter-properties/precise\n+{roughly equally important}\n+~/sorter-properties/precise = ~/sorter-properties/transitive\n \n All equally, absolutely true.\n \n-~/sorter-properties/asynchronous 10:1 ~/sorter-properties/new {\n+{\n Sorter is certainly asynchronous.\n There have been many explorations of the core sorter idea. Pairwise\n comparisons have been studied for decades. Conjoint analysis. HotOrNot.\n Sorter is just one iteration of the human desire to rank things collectively\n }\n+~/sorter-properties/asynchronous 10:1 ~/sorter-properties/new\n \n-~/sorter-properties/new 100:1 ~/sorter-properties/proprietary {\n+{\n There are some new things about sorter. The backwards compatible with prose\n syntax.\n The synthesis of email-first, rank-centrality, and social platform. So\n@@ -124,6 +130,7 @@ But sorter is absolutely not ~/sorter-properties/proprietary. Sorter is open sou\n github.com/sortersocial/index\n Therefore, ~/sorter-properties/proprietary is banished 100:1 to the false end of the spectrum.\n }\n+~/sorter-properties/new 100:1 ~/sorter-properties/proprietary\n \n In sorter, there are no binaries. Everything is a spectrum, including\n truth.\n@@ -131,11 +138,17 @@ truth.\n The most important thing, in my mind, about sorter is that it’s collective.\n \n important\n-~/sorter-properties/collective 100:20 ~/sorter-properties/asynchronous { sorter would still be cool if it was\n-live }\n-~/sorter-properties/collective 100:90 ~/sorter-properties/precise { precise thinking is good too }\n-~/sorter-properties/collective 100:90 ~/sorter-properties/transitive { transitivity enables collectivity }\n-~/sorter-properties/collective 100:10 ~/sorter-properties/new { other iterations of sorter were good too }\n+{\n+sorter would still be cool if it was\n+live\n+}\n+~/sorter-properties/collective 100:20 ~/sorter-properties/asynchronous\n+{ precise thinking is good too }\n+~/sorter-properties/collective 100:90 ~/sorter-properties/precise\n+{ transitivity enables collectivity }\n+~/sorter-properties/collective 100:90 ~/sorter-properties/transitive\n+{ other iterations of sorter were good too }\n+~/sorter-properties/collective 100:10 ~/sorter-properties/new\n \n \n Any other person could add to or vote on #sorter-properties, this is just\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex bd10fd2a6ef06ac1a23de790a54ad5aa0065a472..e96d11c820c3bbaa8bb55ad11636397ef225e55a 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -673,7 +673,7 @@ async fn test_private_room_post_links_use_private_garden_routes() {\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+ \"~/secret/item {classified}\\n~/secret/other {other body}\\n{because}\\n~/secret/item 3:1 ~/secret/other\\n\",\n );\n let post = client\n .post(format!(\"http://{addr}/ui\"))\n@@ -734,7 +734,7 @@ async fn test_private_room_garden_root_lists_top_level_tilde_children() {\n let rpc = ui_post_ingest_rpc(\n &room_id,\n \"ing\",\n- \"~/test1 {wow}\\n~/test2 {wow2}\\n~/test1 2:1 ~/test2 {because}\\n\",\n+ \"~/test1 {wow}\\n~/test2 {wow2}\\n{because}\\n~/test1 2:1 ~/test2\\n\",\n );\n let post = client\n .post(format!(\"http://{addr}/ui\"))\n@@ -1003,7 +1003,7 @@ async fn test_post_redact_removes_garden_and_marks_thread() {\n \"room\": \"public\",\n \"thread_tag\": \"redact-test\",\n \"delegate\": \"00000000-0000-0000-0000-000000000000:test:local/test\",\n- \"text\": \"~/del-a {a}\\n~/del-b {b}\\n~/del-a 2:1 ~/del-b {vote line}\\n\",\n+ \"text\": \"~/del-a {a}\\n~/del-b {b}\\n{vote line}\\n~/del-a 2:1 ~/del-b\\n\",\n \"return_rank_diff\": false\n }\n }]),\n@@ -1123,7 +1123,7 @@ async fn test_vote_endpoint() {\n \"room\": \"public\",\n \"thread_tag\": \"cli\",\n \"delegate\": \"00000000-0000-0000-0000-000000000000:test:local/test\",\n- \"text\": \"~/clap {cli parser}\\n~/argh {cli parser}\\n~/clap 3:1 ~/argh {because clap is more full-featured}\\n\",\n+ \"text\": \"~/clap {cli parser}\\n~/argh {cli parser}\\n{because clap is more full-featured}\\n~/clap 3:1 ~/argh\\n\",\n \"return_rank_diff\": true\n }\n }]);\n@@ -1144,7 +1144,7 @@ async fn test_rank_endpoint() {\n \"room\": \"public\",\n \"thread_tag\": \"langs\",\n \"delegate\": \"00000000-0000-0000-0000-000000000000:test:local/test\",\n- \"text\": \"~/rust {systems}\\n~/go {concurrency}\\n~/rust 3:1 ~/go {because i prefer rust for systems work}\\n\",\n+ \"text\": \"~/rust {systems}\\n~/go {concurrency}\\n{because i prefer rust for systems work}\\n~/rust 3:1 ~/go\\n\",\n \"return_rank_diff\": false\n }\n }]);\n@@ -1178,7 +1178,7 @@ async fn test_check_endpoint_does_not_commit() {\n let check_batch = serde_json::json!([{\n \"Check\": {\n \"room\": \"public\",\n- \"text\": \"~/a {x}\\n~/b {y}\\n~/a 2:1 ~/b {because}\\n\",\n+ \"text\": \"~/a {x}\\n~/b {y}\\n{because}\\n~/a 2:1 ~/b\\n\",\n }\n }]);\n let resp_body = rpc_batch(&client, addr, None, check_batch).await;\n@@ -1217,7 +1217,7 @@ async fn test_garden_item_pair_matchup_include_threads() {\n \"room\": \"public\",\n \"thread_tag\": \"sorting-hat\",\n \"delegate\": \"00000000-0000-0000-0000-000000000000:test:local/test\",\n- \"text\": \"~/sorts/insertion { O(n^2) }\\n~/sorts/mergesort { O(n log n) }\\n~/sorts/insertion 3:1 ~/sorts/mergesort { simpler for small n }\\n\",\n+ \"text\": \"~/sorts/insertion { O(n^2) }\\n~/sorts/mergesort { O(n log n) }\\n{ simpler for small n }\\n~/sorts/insertion 3:1 ~/sorts/mergesort\\n\",\n \"return_rank_diff\": false\n }\n }]);\n@@ -1473,7 +1473,7 @@ async fn test_rank_history() {\n \n ingest(\n \"00000000-0000-0000-0000-000000000001:rig:test/model\",\n- \"~/hist/rust { systems }\\n~/hist/python { scripting }\\n~/hist/go { concurrency }\\n~/hist/rust 3:1 ~/hist/python { ownership over gc }\\n~/hist/rust 2:1 ~/hist/go { performance over simplicity }\\n\",\n+ \"~/hist/rust { systems }\\n~/hist/python { scripting }\\n~/hist/go { concurrency }\\n{ ownership over gc }\\n~/hist/rust 3:1 ~/hist/python\\n{ performance over simplicity }\\n~/hist/rust 2:1 ~/hist/go\\n\",\n )\n .await;\n \n@@ -1506,7 +1506,7 @@ async fn test_rank_history() {\n \n ingest(\n \"00000000-0000-0000-0000-000000000002:rig:test/model\",\n- \"~/hist/python 3:1 ~/hist/go { dynamic typing is worth it }\\n\",\n+ \"{ dynamic typing is worth it }\\n~/hist/python 3:1 ~/hist/go\\n\",\n )\n .await;\n \n@@ -1571,7 +1571,7 @@ async fn pair_returns_connectivity_stats() {\n \"room\": \"public\",\n \"thread_tag\": \"connectivity-test\",\n \"delegate\": \"00000000-0000-0000-0000-000000000001:testrig:test/model\",\n- \"text\": \"~/conn/a { item a }\\n~/conn/b { item b }\\n~/conn/c { item c }\\n~/conn/d { item d }\\n~/conn/a 3:1 ~/conn/b { a is better }\\n\",\n+ \"text\": \"~/conn/a { item a }\\n~/conn/b { item b }\\n~/conn/c { item c }\\n~/conn/d { item d }\\n{ a is better }\\n~/conn/a 3:1 ~/conn/b\\n\",\n \"return_rank_diff\": false\n }\n }]);\n@@ -1605,7 +1605,7 @@ async fn pair_returns_connectivity_stats() {\n \"room\": \"public\",\n \"thread_tag\": \"connectivity-test\",\n \"delegate\": \"00000000-0000-0000-0000-000000000001:testrig:test/model\",\n- \"text\": \"~/conn/c 2:1 ~/conn/a { c beats a }\\n\",\n+ \"text\": \"{ c beats a }\\n~/conn/c 2:1 ~/conn/a\\n\",\n \"return_rank_diff\": false\n }\n }]);\ndiff --git a/test/browser_garden_pin.clj b/test/browser_garden_pin.clj\nindex 98c086d5647207f3ac72dbb9cbc13488c030eef1..d4fa9ed60b45e872ec60e29307cfa61bcd9dd6b2 100644\n--- a/test/browser_garden_pin.clj\n+++ b/test/browser_garden_pin.clj\n@@ -60,7 +60,8 @@\n raw (str \"# \" thread-tag \"\\n\\n\"\n \"~/gp-pin-a {alpha}\\n\"\n \"~/gp-pin-b {beta}\\n\"\n- \"~/gp-pin-a 2:1 ~/gp-pin-b {pin test vote}\\n\")\n+ \"{pin test vote}\\n\"\n+ \"~/gp-pin-a 2:1 ~/gp-pin-b\\n\")\n post-resp (oauth/http-post-json\n (str base-url \"/api/v0/rpc\")\n [{\"Post\" {\"room\" \"public\"\ndiff --git a/test/browser_post_redact.clj b/test/browser_post_redact.clj\nindex f8f5fad7c0579f57e68744647465b9dcce1d4802..bf1af0230bc7c8228f947087d4f22d51d5189a5d 100644\n--- a/test/browser_post_redact.clj\n+++ b/test/browser_post_redact.clj\n@@ -60,7 +60,7 @@\n raw (str \"# \" thread-tag \"\\n\\n\"\n \"~/tomb-a {tomb item a}\\n\"\n \"~/tomb-b {tomb item b}\\n\"\n- \"~/tomb-a 2:1 ~/tomb-b {browser redact vote}\\n\")\n+ \"{browser redact vote}\\n~/tomb-a 2:1 ~/tomb-b\\n\")\n post-resp (oauth/http-post-json\n (str base-url \"/api/v0/rpc\")\n [{\"Post\" {\"room\" \"public\"\ndiff --git a/test/browser_public_garden.clj b/test/browser_public_garden.clj\nindex 7bea08e1cf2c8f5b1a94b0640a46e9ba5607b19b..5dd49f1f70c870e25a2a9f5348f0bdb85647e897 100644\n--- a/test/browser_public_garden.clj\n+++ b/test/browser_public_garden.clj\n@@ -51,7 +51,7 @@\n \"~/br-pub-a {alpha}\\n\"\n \"~/br-pub-b {beta}\\n\"\n \"~/br-pub-c {gamma}\\n\"\n- \"~/br-pub-a 2:1 ~/br-pub-b {browser regression vote}\\n\")\n+ \"{browser regression vote}\\n~/br-pub-a 2:1 ~/br-pub-b\\n\")\n post-resp (oauth/http-post-json\n (str base-url \"/api/v0/rpc\")\n [{\"Post\" {\"room\" \"public\"\ndiff --git a/test/browser_redact_thread_index.clj b/test/browser_redact_thread_index.clj\nindex 88a86fb9844fcf78df85e59f21f2e37f27df96a5..39958a85d4de10f284166f4561bc6ada2332b304 100644\n--- a/test/browser_redact_thread_index.clj\n+++ b/test/browser_redact_thread_index.clj\n@@ -63,11 +63,11 @@\n text-first (str \"# \" thread-tag \"\\n\\n\"\n \"~/rix/a {alpha}\\n\"\n \"~/rix/b {beta}\\n\"\n- \"~/rix/a 2:1 ~/rix/b {browser redact thread idx post one}\\n\")\n+ \"{browser redact thread idx post one}\\n~/rix/a 2:1 ~/rix/b\\n\")\n text-second (str \"# \" thread-tag \"\\n\\n\"\n \"~/rix/c {gamma}\\n\"\n \"~/rix/d {delta}\\n\"\n- \"~/rix/c 2:1 ~/rix/d {browser redact thread idx post two}\\n\")\n+ \"{browser redact thread idx post two}\\n~/rix/c 2:1 ~/rix/d\\n\")\n _ (is (true? (get-in (json/parse-string\n (:body (oauth/http-post-json\n (str base-url \"/api/v0/rpc\")\ndiff --git a/test/browser_vote_compare.clj b/test/browser_vote_compare.clj\nindex 839482d12963f130a2063f2212a6b922b2d229e1..f97a4a45e89c388f093694a1bf296f674bcb377a 100644\n--- a/test/browser_vote_compare.clj\n+++ b/test/browser_vote_compare.clj\n@@ -53,7 +53,8 @@\n raw (str \"# \" thread-tag \"\\n\\n\"\n \"~/gp-vote-a {one}\\n\"\n \"~/gp-vote-b {two}\\n\"\n- \"~/gp-vote-a 1:1 ~/gp-vote-b {seed edge vote}\\n\")\n+ \"{seed edge vote}\\n\"\n+ \"~/gp-vote-a 1:1 ~/gp-vote-b\\n\")\n post-resp (oauth/http-post-json\n (str base-url \"/api/v0/rpc\")\n [{\"Post\" {\"room\" \"public\"\ndiff --git a/test/grants.clj b/test/grants.clj\nindex 12846c6259c2c8f0395668d49155ee22c8abfcd5..055e0a94a7fd90d58f234f643ae8998956ef9939 100644\n--- a/test/grants.clj\n+++ b/test/grants.clj\n@@ -125,14 +125,15 @@\n (println \"\\nalice posts items + vote to private room…\")\n (is (rpc-line-ok? (:parsed (ingest! base-url alice-token room-id \"main\"\n \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n- \"~/fruits/apple { A crisp red apple. }\\n~/fruits/banana { A yellow banana. }\\n~/fruits/apple > ~/fruits/banana { apples are better }\")))\n+ \"~/fruits/apple { A crisp red apple. }\\n~/fruits/banana { A yellow banana. }\\n{ apples are better }\\n~/fruits/apple > ~/fruits/banana\")))\n \"alice vote in private room succeeds\")\n \n ;; Bob (View + Post, no Vote) tries to vote.\n (println \"\\nbob (no Vote) tries to vote…\")\n (is (not (rpc-line-ok? (:parsed (ingest! base-url bob-token room-id \"main\"\n \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n- \"~/fruits/apple > ~/fruits/banana { bob's take }\"))))\n+ \"{ bob's take }\n+~/fruits/apple > ~/fruits/banana\"))))\n \"bob without Vote gets RPC failure\")\n \n ;; Alice grants bob Vote.\n@@ -144,7 +145,8 @@\n (println \"\\nbob (View + Post + Vote) votes…\")\n (is (rpc-line-ok? (:parsed (ingest! base-url bob-token room-id \"main\"\n \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n- \"~/fruits/apple > ~/fruits/banana { bob's take }\")))\n+ \"{ bob's take }\n+~/fruits/apple > ~/fruits/banana\")))\n \"bob with Vote succeeds\"))\n \n (finally\ndiff --git a/test/integration.clj b/test/integration.clj\nindex 81261c7f2e0487666ef849f523fe91b2c005e6cd..5530bf9f4533f7f548e47599b5fe33f9be567309 100644\n--- a/test/integration.clj\n+++ b/test/integration.clj\n@@ -39,19 +39,23 @@\n \"#integration-test\"\n \"\"\n \"~/languages/python { General-purpose, dynamically typed }\"\n- \"~/languages/rust { Systems language with ownership model }\"\n- \"~/languages/go { Compiled, garbage-collected, simple concurrency }\"\n+ \"~/languages/rust { Systems language with ownership model }\"\n+ \"~/languages/go { Compiled, garbage-collected, simple concurrency }\"\n \"\"\n- \"~/languages/rust 3:1 ~/languages/python { Rust has stronger type safety }\"\n- \"~/languages/rust 2:1 ~/languages/go { Ownership beats GC for systems work }\"\n- \"~/languages/python 2:1 ~/languages/go { Python's ecosystem is broader }\"]))\n+ \"{ Rust has stronger type safety }\n+~/languages/rust 3:1 ~/languages/python\"\n+ \"{ Ownership beats GC for systems work }\n+~/languages/rust 2:1 ~/languages/go\"\n+ \"{ Python's ecosystem is broader }\n+~/languages/python 2:1 ~/languages/go\"]))\n \n (def sorter-doc-2\n (str/join \"\\n\"\n [actor-2\n \"#integration-test\"\n \"\"\n- \"~/languages/go 2:1 ~/languages/python { Go deploys as a single binary, simpler ops }\"]))\n+ \"{ Go deploys as a single binary, simpler ops }\n+~/languages/go 2:1 ~/languages/python\"]))\n \n (def external-sorter-doc\n (str/join \"\\n\"\n@@ -61,7 +65,8 @@\n \"-/github.com/iss/1 { issue one }\"\n \"-/github.com/iss/2 { issue two }\"\n \"\"\n- \"-/github.com/iss/1 2:1 -/github.com/iss/2 { triage order }\"]))\n+ \"{ triage order }\n+-/github.com/iss/1 2:1 -/github.com/iss/2\"]))\n \n (def check-doc-disconnected\n (str/join \"\\n\"\n@@ -73,8 +78,10 @@\n \"~/disc/c { c }\"\n \"~/disc/d { d }\"\n \"\"\n- \"~/disc/a 2:1 ~/disc/b { first component }\"\n- \"~/disc/c 2:1 ~/disc/d { second component }\"]))\n+ \"{ first component }\n+~/disc/a 2:1 ~/disc/b\"\n+ \"{ second component }\n+~/disc/c 2:1 ~/disc/d\"]))\n \n ;; ---------------------------------------------------------------------------\n ;; main flow (linear integration)\n@@ -291,8 +298,10 @@\n (bind two-vote-doc (str/join \"\\n\"\n [\"@00000000-0000-0000-0000-000000000003:integration:local/test\"\n \"#integration-test\"\n- \"~/languages/rust 4:1 ~/languages/python { type safety }\"\n- \"~/languages/rust 3:1 ~/languages/go { zero-cost abstractions }\"]))\n+ \"{ type safety }\n+~/languages/rust 4:1 ~/languages/python\"\n+ \"{ zero-cost abstractions }\n+~/languages/rust 3:1 ~/languages/go\"]))\n (bind hist-ingest (common/run-cli cli-bin base-url [\"public\" \"forum\" \"post\" \"integration-test\" \"--json\" \"--delegate\" \"00000000-0000-0000-0000-000000000000:cli:local/dev\"] :input two-vote-doc :extra-env token-env))\n (is (zero? (:exit hist-ingest))\n (str \"two-vote ingest exits 0 (err: \" (:err hist-ingest) \")\"))\ndiff --git a/test/walkthrough_fixture.clj b/test/walkthrough_fixture.clj\nindex f7eb1cacca0317129e9baf68fa4f4e33356ad70f..fb7f4ee8c996e7b4ffb55e225f73f3266feda220 100644\n--- a/test/walkthrough_fixture.clj\n+++ b/test/walkthrough_fixture.clj\n@@ -49,7 +49,7 @@\n \"capabilities\" [\"view\" \"post\" \"vote\" \"add_item\"]}}]))\n (let [wall-text (str \"Walkthrough seed — multi-paragraph stress test.\\n\\n\"\n \"Second paragraph: the garden holds ~/secret/item and ~/secret/other. \"\n- \"Votes like ~/secret/item 3:1 ~/secret/other {because} should still parse.\\n\\n\"\n+ \"Votes like {because}\\\\n~/secret/item 3:1 ~/secret/other should parse.\\n\\n\"\n \"Third block: lorem-style filler so wrapping and vertical rhythm are obvious. \"\n \"We want enough prose that the thread view scrolls and pre blocks show overflow \"\n \"behavior (long lines, slug links, embed URLs) without looking like toy data.\\n\\n\"\n@@ -58,7 +58,7 @@\n \"https://open.spotify.com/track/4iV5W9uYEdYUVa79Axb7U9 https://www.youtube.com/watch?v=dQw4w9WgXcQ\\n\\n\"\n \"~/secret/item {classified}\\n\"\n \"~/secret/other {secondary}\\n\"\n- \"~/secret/item 3:1 ~/secret/other {because}\\n\")\n+ \"{because}\\n~/secret/item 3:1 ~/secret/other\\n\")\n rpc (json/generate-string\n {:action \"post_ingest\"\n :room room-id\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}