{"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[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 A — 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\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[5ca518f6] url refactor\n\nSide B — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 67a09a3b54f778fa7e857fdd589c3ed9c92e1322..ad7e4fe6d4ba2f2b033916194c1ef1ed873f1d46 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -1757,6 +1757,7 @@ name = \"slug-types\"\n version = \"0.1.0\"\n dependencies = [\n \"serde\",\n+ \"url\",\n ]\n \n [[package]]\n@@ -2272,6 +2273,7 @@ dependencies = [\n \"idna\",\n \"percent-encoding\",\n \"serde\",\n+ \"serde_derive\",\n ]\n \n [[package]]\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex 606f7d6f97a4428efb90d1e0d544934c861fc4c5..cd3e0f0afd972d9ad9e7e4b92c5fa4c22bb8f620 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -270,10 +270,10 @@ fn post_redirect_location(room: &str, thread_tag: &str) -> String {\n format!(\"/t/{tag}\")\n } else {\n let room = room.trim();\n- let Some((a, b)) = room.split_once('/') else {\n+ let Some(seg) = slug_types::room_route_segment(room) else {\n return \"/\".to_string();\n };\n- format!(\"/r/{a}/{b}/t/{tag}\")\n+ format!(\"/r/{seg}/t/{tag}\")\n }\n }\n \ndiff --git a/server/src/api/write_actor.rs b/server/src/api/write_actor.rs\nindex cb78d2f3f95b1bc163c1fb064d1d5f657e18000f..f9c3b8bd3fbf8fcb9c035e1a1572fef0b08fa8a9 100644\n--- a/server/src/api/write_actor.rs\n+++ b/server/src/api/write_actor.rs\n@@ -19,13 +19,15 @@ use crate::{\n use super::auth::{issue_token_for_user, verify_token};\n use super::helpers::{now_ms, resolve_item};\n use super::validate::{normalize_room_and_thread, validate_ingest_document};\n-use slug_types::RpcResult;\n+use slug_types::{room_route_segment, RpcResult, ROOM_SHORT_ID_LEN};\n \n fn gen_short_id() -> String {\n use rand::Rng;\n const ALPHABET: &[u8] = b\"0123456789abcdefghijklmnopqrstuvwxyz\";\n let mut rng = rand::thread_rng();\n- (0..7).map(|_| ALPHABET[rng.gen_range(0..ALPHABET.len())] as char).collect()\n+ (0..ROOM_SHORT_ID_LEN)\n+ .map(|_| ALPHABET[rng.gen_range(0..ALPHABET.len())] as char)\n+ .collect()\n }\n \n fn parse_capability(s: &str) -> Result {\n@@ -55,8 +57,8 @@ async fn broadcast_web_refresh(state: &AppState, room_key: &str, thread_id: &str\n let feed_id = if room_key == \"public\" { \"thread-feed\" } else { \"room-thread-feed\" };\n let thread_url = if room_key == \"public\" {\n format!(\"/t/{thread_id}\")\n- } else if let Some((short, slug)) = room_key.split_once('/') {\n- format!(\"/r/{short}/{slug}/t/{thread_id}\")\n+ } else if let Some(seg) = room_route_segment(room_key) {\n+ format!(\"/r/{seg}/t/{thread_id}\")\n } else {\n format!(\"/t/{thread_id}\")\n };\n@@ -78,8 +80,8 @@ async fn broadcast_web_refresh(state: &AppState, room_key: &str, thread_id: &str\n let js = builder.build();\n let mut path_prefixes = vec![if room_key == \"public\" {\n \"/\".to_string()\n- } else if let Some((short, slug)) = room_key.split_once('/') {\n- format!(\"/r/{short}/{slug}\")\n+ } else if let Some(seg) = room_route_segment(room_key) {\n+ format!(\"/r/{seg}\")\n } else {\n \"/\".to_string()\n }];\ndiff --git a/server/src/html/forum/nav.rs b/server/src/html/forum/nav.rs\nindex 0ee33d91160fc5542817b5e3e9ab4fee1d0e600f..48fe11e46731670874ff8b6b05baa6f09ae0b7e4 100644\n--- a/server/src/html/forum/nav.rs\n+++ b/server/src/html/forum/nav.rs\n@@ -1,7 +1,8 @@\n use crate::canonical_path::canonicalize_item;\n use crate::reducer::ScopeId;\n+use slug_types::room_route_segment;\n \n-/// URL helpers for public `/t/…` and private room threads `/r/{short}/{slug}/t/…`.\n+/// URL helpers for public `/t/…` and private room threads `/r/{short}{slug}/t/…`.\n #[derive(Clone)]\n pub struct ThreadNav {\n pub room_wire: String,\n@@ -22,18 +23,15 @@ impl ThreadNav {\n }\n }\n \n- /// `room_id` wire form `shortid/slug`.\n+ /// `room_id` wire form `shortid/slug` (HTTP uses [`slug_types::room_route_segment`]).\n pub(crate) fn from_room_id(room_id: &str) -> Option {\n- let (short, slug) = room_id.split_once('/')?;\n- if short.is_empty() || slug.is_empty() {\n- return None;\n- }\n+ let room_seg = room_route_segment(room_id)?;\n Some(Self {\n room_wire: room_id.to_string(),\n scope: ScopeId::Room(room_id.to_string()),\n- room_path: format!(\"/r/{short}/{slug}\"),\n- thread_path_prefix: format!(\"/r/{short}/{slug}/t\"),\n- garden_path_prefix: format!(\"/r/{short}/{slug}/~\"),\n+ room_path: format!(\"/r/{room_seg}\"),\n+ thread_path_prefix: format!(\"/r/{room_seg}/t\"),\n+ garden_path_prefix: format!(\"/r/{room_seg}/~\"),\n })\n }\n \ndiff --git a/server/src/html/forum/post_single.rs b/server/src/html/forum/post_single.rs\nindex c316f8f836df9d4ef9c05ebd9e54f699540e6d72..473747b3da3d4d7a54b5e0c63165d2533df643e1 100644\n--- a/server/src/html/forum/post_single.rs\n+++ b/server/src/html/forum/post_single.rs\n@@ -93,12 +93,14 @@ pub async fn thread_post_view(\n \n pub async fn room_thread_post_view(\n State(state): State,\n- Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,\n+ Path((room_key, tag, index_str)): Path<(String, String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n uri: Uri,\n ) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n+ let Some(room_id) = slug_types::room_id_from_route_segment(&room_key) else {\n+ return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n+ };\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\ndiff --git a/server/src/html/forum/views.rs b/server/src/html/forum/views.rs\nindex be5df1745ef580891a167c23c3dd6c06f804f295..1ec421f84335cbfe7f9db775b73a8ed24b197174 100644\n--- a/server/src/html/forum/views.rs\n+++ b/server/src/html/forum/views.rs\n@@ -183,16 +183,18 @@ pub async fn thread_view(\n thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar, uri).await\n }\n \n-/// Room thread — `/r/:short/:slug/t/:tag`\n+/// Room thread — `/r/:room_key/t/:tag` (`room_key` = `{short}{slug}`).\n pub async fn room_thread_view(\n State(state): State,\n- Path((room_short, room_slug, tag)): Path<(String, String, String)>,\n+ Path((room_key, tag)): Path<(String, String)>,\n Query(q): Query,\n headers: HeaderMap,\n jar: CookieJar,\n uri: Uri,\n ) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n+ let Some(room_id) = slug_types::room_id_from_route_segment(&room_key) else {\n+ return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n+ };\n let reduced = state.reduced.read().await;\n let user = optional_principal(&headers, &jar, &reduced);\n if !user_can_view_room(&reduced, &room_id, user.as_deref()) {\n@@ -226,15 +228,17 @@ pub(super) fn room_not_found_page(jar: &CookieJar, uri: &Uri) -> impl IntoRespon\n (StatusCode::NOT_FOUND, Html(page.into_string()))\n }\n \n-/// Private room index — `/r/:short/:slug`\n+/// Private room index — `/r/:room_key`\n pub async fn room_page(\n State(state): State,\n- Path((room_short, room_slug)): Path<(String, String)>,\n+ Path(room_key): Path,\n headers: HeaderMap,\n jar: CookieJar,\n uri: Uri,\n ) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n+ let Some(room_id) = slug_types::room_id_from_route_segment(&room_key) else {\n+ return (StatusCode::NOT_FOUND, \"room not found\").into_response();\n+ };\n let now = now_ms();\n let reduced = state.reduced.read().await;\n if !reduced.rooms.contains(&room_id) {\n@@ -266,7 +270,10 @@ pub async fn room_page(\n let audit_cli = format!(\"npx slugsocial private {room_id} audit\");\n drop(reduced);\n \n- let slug_display = room_slug.as_str();\n+ let slug_display = room_id\n+ .split_once('/')\n+ .map(|(_, slug)| slug)\n+ .unwrap_or(room_id.as_str());\n let page = layout(\n &format!(\"room {slug_display} — slug.social\"),\n \"view-thread\",\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex 423f23fd8c9ad7b7f454d6ea7a9a7607a4c9c5b9..e615dd356bcf634232d85610c0a26235ead125fd 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -309,12 +309,14 @@ pub async fn external_ontology_path(\n \n pub async fn room_garden_index(\n State(state): State,\n- Path((room_short, room_slug)): Path<(String, String)>,\n+ Path(room_key): Path,\n headers: HeaderMap,\n jar: CookieJar,\n uri: Uri,\n ) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n+ let Some(room_id) = slug_types::room_id_from_route_segment(&room_key) else {\n+ return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n+ };\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n@@ -341,12 +343,14 @@ pub async fn room_garden_index(\n \n pub async fn room_external_garden_index(\n State(state): State,\n- Path((room_short, room_slug)): Path<(String, String)>,\n+ Path(room_key): Path,\n headers: HeaderMap,\n jar: CookieJar,\n uri: Uri,\n ) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n+ let Some(room_id) = slug_types::room_id_from_route_segment(&room_key) else {\n+ return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n+ };\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n@@ -416,12 +420,14 @@ pub async fn room_external_garden_index(\n \n pub async fn room_external_ontology_path(\n State(state): State,\n- Path((room_short, room_slug, path)): Path<(String, String, String)>,\n+ Path((room_key, path)): Path<(String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n uri: Uri,\n ) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n+ let Some(room_id) = slug_types::room_id_from_route_segment(&room_key) else {\n+ return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n+ };\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\n@@ -442,12 +448,14 @@ pub async fn room_external_ontology_path(\n \n pub async fn room_ontology_path(\n State(state): State,\n- Path((room_short, room_slug, path)): Path<(String, String, String)>,\n+ Path((room_key, path)): Path<(String, String)>,\n headers: HeaderMap,\n jar: CookieJar,\n uri: Uri,\n ) -> impl IntoResponse {\n- let room_id = format!(\"{room_short}/{room_slug}\");\n+ let Some(room_id) = slug_types::room_id_from_route_segment(&room_key) else {\n+ return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n+ };\n let Some(nav) = ThreadNav::from_room_id(&room_id) else {\n return (StatusCode::NOT_FOUND, \"bad room path\").into_response();\n };\ndiff --git a/server/src/html/search.rs b/server/src/html/search.rs\nindex 43e6ebf36cf0fe72c96f0f9d850bea51ac094c43..f01732f7edb32c68fcc10c39545c8f56476adb27 100644\n--- a/server/src/html/search.rs\n+++ b/server/src/html/search.rs\n@@ -351,8 +351,8 @@ fn render_search_results(results: &SearchResults, query: &str) -> Markup {\n ul class=\"search-posts\" {\n @for r in &results.posts {\n @let (post_href, post_label) = if let Some((room, tag)) = r.thread.split_once(\"/#\") {\n- if let Some((short, slug)) = room.split_once('/') {\n- (format!(\"/r/{short}/{slug}/t/{tag}\"), format!(\"{room}/#{tag}\"))\n+ if let Some(seg) = slug_types::room_route_segment(room) {\n+ (format!(\"/r/{seg}/t/{tag}\"), format!(\"{room}/#{tag}\"))\n } else {\n (\"/\".to_string(), r.thread.clone())\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 9e69c3f4a153527caa77b00ad101aca94b425995..71032f9a0b556097d90f3b403c677e0c86429ee4 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -79,30 +79,30 @@ pub fn create_app(state: AppState) -> Router {\n .route(\"/~/*path\", get(crate::html::ontology_path))\n .route(\"/-\", get(crate::html::external_garden_index))\n .route(\"/-/*path\", get(crate::html::external_ontology_path))\n- .route(\"/r/:room_short/:room_slug/~\", get(crate::html::room_garden_index))\n+ .route(\"/r/:room_key/~\", get(crate::html::room_garden_index))\n .route(\n- \"/r/:room_short/:room_slug/~/*path\",\n+ \"/r/:room_key/~/*path\",\n get(crate::html::room_ontology_path),\n )\n .route(\n- \"/r/:room_short/:room_slug/-\",\n+ \"/r/:room_key/-\",\n get(crate::html::room_external_garden_index),\n )\n .route(\n- \"/r/:room_short/:room_slug/-/*path\",\n+ \"/r/:room_key/-/*path\",\n get(crate::html::room_external_ontology_path),\n )\n .route(\"/t/:tag/:index\", get(crate::html::thread_post_view))\n .route(\"/t/:tag\", get(crate::html::thread_view))\n .route(\n- \"/r/:room_short/:room_slug/t/:thread_tag/:index\",\n+ \"/r/:room_key/t/:thread_tag/:index\",\n get(crate::html::room_thread_post_view),\n )\n .route(\n- \"/r/:room_short/:room_slug/t/:thread_tag\",\n+ \"/r/:room_key/t/:thread_tag\",\n get(crate::html::room_thread_view),\n )\n- .route(\"/r/:room_short/:room_slug\", get(crate::html::room_page))\n+ .route(\"/r/:room_key\", get(crate::html::room_page))\n .route(\"/join/:token\", get(api::get_join_invite))\n .route(\"/auth/login\", get(api::get_auth_login))\n .route(\"/auth/callback\", get(api::get_auth_callback))\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex 515c691d04ef3f1f4bdfa8ee911360a43fd2b26e..feb73d475b3fc635d7f16c329d4600718c7472ba 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -1,4 +1,5 @@\n use sha2::{Digest, Sha256};\n+use slug_types::room_route_segment;\n use slugsocial_server::{\n event_log::EventLog,\n events::{Event, TokenIssued, UserRegistered},\n@@ -607,7 +608,7 @@ async fn test_private_room_thread_urls_use_t_segment() {\n .as_str()\n .unwrap()\n .to_string();\n- let (room_short, room_slug) = room_id.split_once('/').unwrap();\n+ let room_seg = room_route_segment(&room_id).unwrap();\n \n let rpc = ui_post_ingest_rpc(&room_id, \"main-thread\", \"private post via web\");\n let post = client\n@@ -626,7 +627,7 @@ async fn test_private_room_thread_urls_use_t_segment() {\n Some(\"text/javascript; charset=utf-8\")\n );\n let post_js = post.text().await.unwrap();\n- let location = format!(\"/r/{room_short}/{room_slug}/t/main-thread\");\n+ let location = format!(\"/r/{room_seg}/t/main-thread\");\n assert!(post_js.contains(&format!(\"window.location = {:?};\", location)));\n assert!(post_js.contains(\"#room-thread-feed\"));\n assert!(post_js.contains(\"#thread-feed-region\"));\n@@ -665,7 +666,7 @@ async fn test_private_room_post_links_use_private_garden_routes() {\n .as_str()\n .unwrap()\n .to_string();\n- let (room_short, room_slug) = room_id.split_once('/').unwrap();\n+ let room_seg = room_route_segment(&room_id).unwrap();\n \n let rpc = ui_post_ingest_rpc(\n &room_id,\n@@ -682,18 +683,18 @@ async fn test_private_room_post_links_use_private_garden_routes() {\n assert_eq!(post.status(), reqwest::StatusCode::OK);\n \n let thread_page = client\n- .get(format!(\"http://{addr}/r/{room_short}/{room_slug}/t/garden-thread\"))\n+ .get(format!(\"http://{addr}/r/{room_seg}/t/garden-thread\"))\n .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n .send()\n .await\n .unwrap();\n assert!(thread_page.status().is_success());\n let body = thread_page.text().await.unwrap();\n- assert!(body.contains(&format!(\"/r/{room_short}/{room_slug}/~/secret/item\")));\n+ assert!(body.contains(&format!(\"/r/{room_seg}/~/secret/item\")));\n assert!(!body.contains(\"href=\\\"/~/secret/item\\\"\"));\n \n let garden_page = client\n- .get(format!(\"http://{addr}/r/{room_short}/{room_slug}/~/secret/item\"))\n+ .get(format!(\"http://{addr}/r/{room_seg}/~/secret/item\"))\n .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n .send()\n .await\n@@ -701,7 +702,7 @@ async fn test_private_room_post_links_use_private_garden_routes() {\n assert!(garden_page.status().is_success());\n let garden_body = garden_page.text().await.unwrap();\n assert!(garden_body.contains(\"classified\"));\n- assert!(garden_body.contains(&format!(\"/r/{room_short}/{room_slug}/t/garden-thread\")));\n+ assert!(garden_body.contains(&format!(\"/r/{room_seg}/t/garden-thread\")));\n }\n \n #[tokio::test]\n@@ -726,7 +727,7 @@ async fn test_private_room_garden_root_lists_top_level_tilde_children() {\n .as_str()\n .unwrap()\n .to_string();\n- let (room_short, room_slug) = room_id.split_once('/').unwrap();\n+ let room_seg = room_route_segment(&room_id).unwrap();\n \n let rpc = ui_post_ingest_rpc(\n &room_id,\n@@ -743,7 +744,7 @@ async fn test_private_room_garden_root_lists_top_level_tilde_children() {\n assert_eq!(post.status(), reqwest::StatusCode::OK);\n \n let root_page = client\n- .get(format!(\"http://{addr}/r/{room_short}/{room_slug}/~\"))\n+ .get(format!(\"http://{addr}/r/{room_seg}/~\"))\n .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n .send()\n .await\n@@ -782,10 +783,10 @@ async fn test_empty_private_room_garden_returns_404() {\n .as_str()\n .unwrap()\n .to_string();\n- let (room_short, room_slug) = room_id.split_once('/').unwrap();\n+ let room_seg = room_route_segment(&room_id).unwrap();\n \n let root = client\n- .get(format!(\"http://{addr}/r/{room_short}/{room_slug}/~\"))\n+ .get(format!(\"http://{addr}/r/{room_seg}/~\"))\n .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n .send()\n .await\n@@ -896,8 +897,8 @@ async fn test_sse_stream_emits_evalable_js_after_post() {\n .as_str()\n .unwrap()\n .to_string();\n- let (room_short, room_slug) = room_id.split_once('/').unwrap();\n- let room_path = format!(\"/r/{room_short}/{room_slug}\");\n+ let room_seg = room_route_segment(&room_id).unwrap();\n+ let room_path = format!(\"/r/{room_seg}\");\n \n let sse_resp = client\n .get(format!(\"http://{addr}/sse?path={}\", urlencoding::encode(&room_path)))\ndiff --git a/test/browser_room_delete.clj b/test/browser_room_delete.clj\nindex 833e3f8aa7f850b60ee59742736143cbf101a07d..764ecaa674798a61c1ffca3859f2a56a91a0e97e 100644\n--- a/test/browser_room_delete.clj\n+++ b/test/browser_room_delete.clj\n@@ -54,7 +54,7 @@\n room-id (get-in create-json [\"results\" 0 \"result\" \"RoomCreated\" \"room_id\"])\n _ (is (string? room-id) \"room id present\")\n [room-short room-slug] (str/split room-id #\"/\" 2)\n- room-path (str \"/r/\" room-short \"/\" room-slug)]\n+ room-path (str \"/r/\" room-short room-slug)]\n (core/with-playwright [pw]\n (core/with-browser [browser (core/launch-chromium pw {:headless true :channel \"chrome\"})]\n (core/with-context [ctx (core/new-context browser)]\ndiff --git a/test/browser_sse.clj b/test/browser_sse.clj\nindex 8bb064dbc2dc0feb6caaa67f520a461645958277..678399b79f78ff48b5e77342fa21e69992393834 100644\n--- a/test/browser_sse.clj\n+++ b/test/browser_sse.clj\n@@ -77,7 +77,7 @@\n (login-user! bob-pg base-url \"bob\")\n \n (let [[room-short room-slug] (str/split room-id #\"/\" 2)\n- room-url (str base-url \"/r/\" room-short \"/\" room-slug)\n+ room-url (str base-url \"/r/\" room-short room-slug)\n thread-url (str room-url \"/t/sse-thread\")]\n ;; Object under test: slug_ui.js intercepts POST /ui, evals JS, morphs\n ;; #new-thread-ui-slot (expand compose), then post_ingest redirects to thread.\ndiff --git a/test/walkthrough_fixture.clj b/test/walkthrough_fixture.clj\nindex a487ff1ef8548580577914fb33f321586859c9af..f7eb1cacca0317129e9baf68fa4f4e33356ad70f 100644\n--- a/test/walkthrough_fixture.clj\n+++ b/test/walkthrough_fixture.clj\n@@ -88,9 +88,9 @@\n :room {:id room-id\n :short room-short\n :slug room-slug\n- :url (str base-url \"/r/\" room-short \"/\" room-slug)\n- :thread_url (str base-url \"/r/\" room-short \"/\" room-slug \"/t/walkthrough-thread\")\n- :garden_url (str base-url \"/r/\" room-short \"/\" room-slug \"/~/secret/item\")}}))\n+ :url (str base-url \"/r/\" room-short room-slug)\n+ :thread_url (str base-url \"/r/\" room-short room-slug \"/t/walkthrough-thread\")\n+ :garden_url (str base-url \"/r/\" room-short room-slug \"/~/secret/item\")}}))\n \n (defn- rebase-fixture-summary [saved current-base-url current-google-url current-data-dir]\n (let [inner (:summary saved)\n@@ -103,9 +103,9 @@\n :data_dir (str current-data-dir)\n :summary (assoc inner\n :room (assoc room\n- :url (str current-base-url \"/r/\" rs \"/\" lg)\n- :thread_url (str current-base-url \"/r/\" rs \"/\" lg \"/t/walkthrough-thread\")\n- :garden_url (str current-base-url \"/r/\" rs \"/\" lg \"/~/secret/item\"))))))\n+ :url (str current-base-url \"/r/\" rs lg)\n+ :thread_url (str current-base-url \"/r/\" rs lg \"/t/walkthrough-thread\")\n+ :garden_url (str current-base-url \"/r/\" rs lg \"/~/secret/item\"))))))\n \n (defn- fixture-log-present? [data-dir]\n (let [p (fs/path data-dir \"events.jsonl\")]\ndiff --git a/types/Cargo.toml b/types/Cargo.toml\nindex 1ed06d483ac7c126516bce27f90e7639c2dfe370..5dc3becf238f23243313dff0484c682a7b225737 100644\n--- a/types/Cargo.toml\n+++ b/types/Cargo.toml\n@@ -5,3 +5,4 @@ edition = \"2021\"\n \n [dependencies]\n serde = { version = \"1.0\", features = [\"derive\"] }\n+url = { version = \"2.5\", features = [\"serde\"] }\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex fce1b5fa5e259a4b86a11cb4d4f7cc9bec3a0aa1..516cf935f15fca97081b39b988da5be894c67725 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -1,5 +1,7 @@\n use serde::{Deserialize, Serialize};\n \n+pub mod room_route;\n+pub mod url_normalize;\n pub mod paths;\n pub mod timeago;\n \n@@ -8,6 +10,8 @@ pub use paths::{\n CanonicalItemUrl, ForumThreadUrl, GardenItemUrl, RelativePath, SLUG_TILDE_ONTOLOGY_ROOT,\n TildeHttpPathTail, TildeOntologyPath, TildePath, tilde_http_path_to_canonical,\n };\n+pub use room_route::{room_id_from_route_segment, room_route_segment, ROOM_SHORT_ID_LEN};\n+pub use url_normalize::normalize_http_identity_url;\n \n /// Max characters returned for a garden item body unless `full=true` / `--full` (API + CLI).\n pub const MAX_ITEM_BODY_PREVIEW_CHARS: usize = 100_000;\n@@ -657,3 +661,6 @@ pub struct VoteResponse {\n pub ranking: Vec,\n pub next: NextMoves,\n }\n+\n+#[cfg(test)]\n+mod url_identity_tests;\ndiff --git a/types/src/paths.rs b/types/src/paths.rs\nindex 8971f599a7ebcf399f60c306d35ee28d0f581194..98787a5fb481a1599556564bbbbd1d54dc693fc3 100644\n--- a/types/src/paths.rs\n+++ b/types/src/paths.rs\n@@ -5,7 +5,7 @@\n //!\n //! - **[`canonicalize_item`] / [`CanonicalItemUrl`]** — graph storage key and DSL form; tilde\n //! ontology root is always [`SLUG_TILDE_ONTOLOGY_ROOT`] (no `…/~/` trailing slash only).\n-//! - **[`TildeHttpPathTail`]** — capture from `GET /~/*path` or `…/r/…/~/…` (the `*path` segment).\n+//! - **[`TildeHttpPathTail`]** — capture from `GET /~/*path` or `…/r/{short}{slug}/~/…` (the `*path` segment).\n //! - **`-/…` wire form** — external items; see [`canonicalize_item`] dash branch.\n //! - **[`GardenItemUrl`], [`ForumThreadUrl`]** — JSON / browser href surfaces.\n \n@@ -15,6 +15,9 @@ use std::ops::Deref;\n \n use serde::{Deserialize, Serialize};\n \n+use crate::room_route::room_route_segment;\n+use crate::url_normalize::{host_preserves_dash_path_case, normalize_http_identity_url};\n+\n // ---------------------------------------------------------------------------\n // Slug tilde ontology (single storage form for `~/`)\n // ---------------------------------------------------------------------------\n@@ -41,6 +44,29 @@ pub fn canonicalize_tag(input: &str) -> String {\n input.trim().trim_start_matches('#').to_lowercase()\n }\n \n+fn finalize_external_identity_url(s: String) -> String {\n+ if s.starts_with(\"https://slug.social/\") {\n+ return s;\n+ }\n+ let normalized = normalize_http_identity_url(&s).unwrap_or_else(|| s.clone());\n+ strip_redundant_root_slash(&normalized).unwrap_or(normalized)\n+}\n+\n+/// `url::Url` serializes bare hosts with a `/` path; we keep host-only items slash-free for stable\n+/// keys matching the pre-normalizer spellings.\n+fn strip_redundant_root_slash(s: &str) -> Option {\n+ let u = url::Url::parse(s).ok()?;\n+ if u.path() == \"/\" && u.query().is_none() && u.fragment().is_none() {\n+ let scheme = u.scheme();\n+ let host = u.host_str()?;\n+ return Some(match u.port() {\n+ Some(p) => format!(\"{scheme}://{host}:{p}\"),\n+ None => format!(\"{scheme}://{host}\"),\n+ });\n+ }\n+ None\n+}\n+\n /// Ontology item reference → canonical absolute URL on the slug host.\n pub fn canonicalize_item(input: &str) -> String {\n let s = input.trim();\n@@ -57,8 +83,9 @@ pub fn canonicalize_item(input: &str) -> String {\n if host.is_empty() {\n return String::new();\n }\n+ let preserve_case = host_preserves_dash_path_case(&host);\n return if tail.is_empty() {\n- format!(\"https://{}\", host)\n+ finalize_external_identity_url(format!(\"https://{}\", host))\n } else {\n let path = tail\n .trim_start_matches('/')\n@@ -68,33 +95,35 @@ pub fn canonicalize_item(input: &str) -> String {\n let t = seg.trim();\n if t.is_empty() {\n None\n+ } else if preserve_case {\n+ Some(t.to_string())\n } else {\n Some(t.to_lowercase())\n }\n })\n .collect::>()\n .join(\"/\");\n- format!(\"https://{}/{}\", host, path)\n+ finalize_external_identity_url(format!(\"https://{}/{}\", host, path))\n };\n }\n \n if let Some(rest) = s.strip_prefix(\"https://\") {\n let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n let host = host.trim().to_lowercase();\n- if tail.is_empty() {\n- return format!(\"https://{}\", host);\n+ return finalize_external_identity_url(if tail.is_empty() {\n+ format!(\"https://{}\", host)\n } else {\n- return format!(\"https://{}/{}\", host, tail);\n- }\n+ format!(\"https://{}/{}\", host, tail)\n+ });\n }\n if let Some(rest) = s.strip_prefix(\"http://\") {\n let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n let host = host.trim().to_lowercase();\n- if tail.is_empty() {\n- return format!(\"http://{}\", host);\n+ return finalize_external_identity_url(if tail.is_empty() {\n+ format!(\"http://{}\", host)\n } else {\n- return format!(\"http://{}/{}\", host, tail);\n- }\n+ format!(\"http://{}/{}\", host, tail)\n+ });\n }\n \n let is_tilde = s.starts_with(\"~/\");\n@@ -319,7 +348,7 @@ impl CanonicalItemUrl {\n }\n }\n \n-/// HTTP route capture: path segment after `~/` in `GET /~/*path` or `…/r/…/~/…` (empty = ontology root).\n+/// HTTP route capture: path segment after `~/` in `GET /~/*path` or `…/r/{short}{slug}/~/…` (empty = ontology root).\n #[derive(Debug, Clone, PartialEq, Eq, Hash)]\n pub struct TildeHttpPathTail(pub String);\n \n@@ -506,12 +535,9 @@ fn garden_href_string(item: &str, room_wire: &str) -> String {\n if room.is_empty() || room == \"public\" {\n return api_path_or_url(item);\n }\n- let Some((short, slug)) = room.split_once('/') else {\n+ let Some(room_seg) = room_route_segment(room) else {\n return api_path_or_url(item);\n };\n- if short.is_empty() || slug.is_empty() {\n- return api_path_or_url(item);\n- }\n let Some(c) = CanonicalItemUrl::parse(item) else {\n return api_path_or_url(item);\n };\n@@ -520,19 +546,19 @@ fn garden_href_string(item: &str, room_wire: &str) -> String {\n let root_norm = root.as_str().trim_end_matches('/');\n if let Some(tail) = c.tilde_tail() {\n return if tail.is_empty() {\n- format!(\"https://slug.social/r/{short}/{slug}/~\")\n+ format!(\"https://slug.social/r/{room_seg}/~\")\n } else {\n- format!(\"https://slug.social/r/{short}/{slug}/~/{}\", tail)\n+ format!(\"https://slug.social/r/{room_seg}/~/{}\", tail)\n };\n }\n if item_norm == root_norm {\n- return format!(\"https://slug.social/r/{short}/{slug}/~\");\n+ return format!(\"https://slug.social/r/{room_seg}/~\");\n }\n // External http(s) items use the same `/-/…` namespace under the room garden.\n if c.as_str().starts_with(\"https://\") || c.as_str().starts_with(\"http://\") {\n let tail = c.display_path();\n let tail = tail.strip_prefix(\"-/\").unwrap_or(tail.as_str());\n- return format!(\"https://slug.social/r/{short}/{slug}/-/{tail}\");\n+ return format!(\"https://slug.social/r/{room_seg}/-/{tail}\");\n }\n api_path_or_url(item)\n }\n@@ -556,12 +582,8 @@ impl ForumThreadUrl {\n let tag = thread_tag.trim().trim_start_matches('#');\n Self(if room.is_empty() || room == \"public\" {\n format!(\"https://slug.social/t/{tag}\")\n- } else if let Some((short, slug)) = room.split_once('/') {\n- if short.is_empty() || slug.is_empty() {\n- format!(\"https://slug.social/t/{tag}\")\n- } else {\n- format!(\"https://slug.social/r/{short}/{slug}/t/{tag}\")\n- }\n+ } else if let Some(room_seg) = room_route_segment(room) {\n+ format!(\"https://slug.social/r/{room_seg}/t/{tag}\")\n } else {\n format!(\"https://slug.social/t/{tag}\")\n })\n@@ -706,7 +728,7 @@ mod tests {\n fn garden_private_room_prefixes_ontology() {\n assert_eq!(\n GardenItemUrl::from_storage_str(\"https://slug.social/~/topic/x\", \"9ab12cd/my-room\").as_str(),\n- \"https://slug.social/r/9ab12cd/my-room/~/topic/x\"\n+ \"https://slug.social/r/9ab12cdmy-room/~/topic/x\"\n );\n }\n \n@@ -714,11 +736,11 @@ mod tests {\n fn garden_private_room_ontology_root() {\n assert_eq!(\n GardenItemUrl::from_storage_str(\"https://slug.social/~\", \"9ab12cd/my-room\").as_str(),\n- \"https://slug.social/r/9ab12cd/my-room/~\"\n+ \"https://slug.social/r/9ab12cdmy-room/~\"\n );\n assert_eq!(\n GardenItemUrl::from_storage_str(\"https://slug.social/~/\", \"9ab12cd/my-room\").as_str(),\n- \"https://slug.social/r/9ab12cd/my-room/~\"\n+ \"https://slug.social/r/9ab12cdmy-room/~\"\n );\n }\n \n@@ -727,7 +749,7 @@ mod tests {\n let u = \"https://example.com/z\";\n assert_eq!(\n GardenItemUrl::from_storage_str(u, \"9ab12cd/my-room\").as_str(),\n- \"https://slug.social/r/9ab12cd/my-room/-/example.com/z\"\n+ \"https://slug.social/r/9ab12cdmy-room/-/example.com/z\"\n );\n }\n \n@@ -739,7 +761,19 @@ mod tests {\n );\n assert_eq!(\n ForumThreadUrl::from_room_tag(\"9ab12cd/my-room\", \"#debate\").as_str(),\n- \"https://slug.social/r/9ab12cd/my-room/t/debate\"\n+ \"https://slug.social/r/9ab12cdmy-room/t/debate\"\n+ );\n+ }\n+\n+ #[test]\n+ fn canonicalize_youtube_short_links() {\n+ assert_eq!(\n+ canonicalize_item(\"https://youtu.be/dQw4w9WgXcQ\"),\n+ \"https://www.youtube.com/watch?v=dQw4w9WgXcQ\"\n+ );\n+ assert_eq!(\n+ canonicalize_item(\"-/youtu.be/dQw4w9WgXcQ\"),\n+ \"https://www.youtube.com/watch?v=dQw4w9WgXcQ\"\n );\n }\n \ndiff --git a/types/src/room_route.rs b/types/src/room_route.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..4f4780c88e30f2b28e2cfcd7aee713d39dbd1c66\n--- /dev/null\n+++ b/types/src/room_route.rs\n@@ -0,0 +1,56 @@\n+//! HTTP path encoding for private rooms: `/r/{short}{slug}` (short is fixed width).\n+\n+/// Byte length of the random `short` segment in `short/slug` room ids.\n+/// Must match room creation (`gen_short_id`) and [`super::paths`][] URL builders.\n+pub const ROOM_SHORT_ID_LEN: usize = 7;\n+\n+/// `ab12cde/my-room` → `ab12cdemy-room` for a single `/r/…` path segment.\n+pub fn room_route_segment(room_id: &str) -> Option {\n+ let (short, slug) = room_id.split_once('/')?;\n+ if short.len() != ROOM_SHORT_ID_LEN || short.is_empty() || slug.is_empty() {\n+ return None;\n+ }\n+ if !short\n+ .bytes()\n+ .all(|b| matches!(b, b'0'..=b'9' | b'a'..=b'z'))\n+ {\n+ return None;\n+ }\n+ Some(format!(\"{short}{slug}\"))\n+}\n+\n+/// `/r/{short}{slug}` path segment → `short/slug` wire id (inverse of [`room_route_segment`]).\n+pub fn room_id_from_route_segment(seg: &str) -> Option {\n+ if seg.len() <= ROOM_SHORT_ID_LEN {\n+ return None;\n+ }\n+ let (short, slug) = seg.split_at(ROOM_SHORT_ID_LEN);\n+ if short.is_empty() || slug.is_empty() {\n+ return None;\n+ }\n+ if !short\n+ .bytes()\n+ .all(|b| matches!(b, b'0'..=b'9' | b'a'..=b'z'))\n+ {\n+ return None;\n+ }\n+ Some(format!(\"{short}/{slug}\"))\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+\n+ #[test]\n+ fn round_trip_room_segment() {\n+ let id = \"9ab12cd/my-room\";\n+ let seg = room_route_segment(id).unwrap();\n+ assert_eq!(seg, \"9ab12cdmy-room\");\n+ assert_eq!(room_id_from_route_segment(&seg).as_deref(), Some(id));\n+ }\n+\n+ #[test]\n+ fn too_short_segment_rejected() {\n+ assert!(room_id_from_route_segment(\"9ab12cd\").is_none());\n+ }\n+}\ndiff --git a/types/src/url_identity_tests.rs b/types/src/url_identity_tests.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..e2ff0a9a64a88049e31f20979c703777df6a9b65\n--- /dev/null\n+++ b/types/src/url_identity_tests.rs\n@@ -0,0 +1,126 @@\n+//! How `url::Url` behaves as `HashMap` keys (`Eq` + `Hash`).\n+//!\n+//! If `ItemId::External` stores `Url`, these tests are the contract you are buying into\n+//! (or the baseline before you add a custom normalization layer).\n+\n+use std::collections::HashMap;\n+use std::hash::{Hash, Hasher};\n+use url::Url;\n+\n+fn hash_one(url: &Url) -> u64 {\n+ let mut h = std::collections::hash_map::DefaultHasher::new();\n+ url.hash(&mut h);\n+ h.finish()\n+}\n+\n+#[test]\n+fn identical_parse_strings_are_eq_and_share_hash_bucket() {\n+ let a = Url::parse(\"https://example.com/path\").unwrap();\n+ let b = Url::parse(\"https://example.com/path\").unwrap();\n+ assert_eq!(a, b);\n+ assert_eq!(hash_one(&a), hash_one(&b));\n+\n+ let mut m: HashMap = HashMap::new();\n+ m.insert(a, 1);\n+ *m.entry(b).or_default() += 10;\n+ assert_eq!(m.len(), 1);\n+ assert_eq!(m[&Url::parse(\"https://example.com/path\").unwrap()], 11);\n+}\n+\n+#[test]\n+fn host_is_ascii_lowercase_in_eq() {\n+ let lower = Url::parse(\"https://examplE.com/\").unwrap();\n+ let upper = Url::parse(\"https://EXAMPLE.com/\").unwrap();\n+ assert_eq!(lower, upper);\n+ assert_eq!(hash_one(&lower), hash_one(&upper));\n+}\n+\n+#[test]\n+fn path_space_normalizes_to_percent_encoding_so_forms_merge() {\n+ let encoded = Url::parse(\"https://example.com/a%20b\").unwrap();\n+ let decoded = Url::parse(\"https://example.com/a b\").unwrap();\n+ // Parser normalizes both to the same internal path (`/a%20b`).\n+ assert_eq!(encoded, decoded);\n+ assert_eq!(hash_one(&encoded), hash_one(&decoded));\n+\n+ let mut m: HashMap = HashMap::new();\n+ m.insert(encoded, \"first\");\n+ assert_eq!(m.insert(decoded, \"second\"), Some(\"first\"));\n+ assert_eq!(m.len(), 1);\n+ assert_eq!(m.values().next().copied(), Some(\"second\"));\n+}\n+\n+#[test]\n+fn encoded_slash_in_segment_stays_distinct_from_real_path_separator() {\n+ let encoded = Url::parse(\"https://example.com/a%2Fb\").unwrap();\n+ let real_slash = Url::parse(\"https://example.com/a/b\").unwrap();\n+ assert_ne!(encoded, real_slash);\n+ assert_ne!(hash_one(&encoded), hash_one(&real_slash));\n+}\n+\n+#[test]\n+fn trailing_slash_on_path_is_significant_for_eq() {\n+ let with_slash = Url::parse(\"https://example.com/foo/\").unwrap();\n+ let no_slash = Url::parse(\"https://example.com/foo\").unwrap();\n+ assert_ne!(with_slash, no_slash);\n+ assert_ne!(hash_one(&with_slash), hash_one(&no_slash));\n+}\n+\n+#[test]\n+fn default_http_port_80_is_normalized_in_representation() {\n+ let explicit = Url::parse(\"http://example.com:80/\").unwrap();\n+ let implicit = Url::parse(\"http://example.com/\").unwrap();\n+ assert_eq!(explicit, implicit);\n+ assert_eq!(hash_one(&explicit), hash_one(&implicit));\n+}\n+\n+#[test]\n+fn default_https_port_443_is_normalized() {\n+ let explicit = Url::parse(\"https://example.com:443/foo\").unwrap();\n+ let implicit = Url::parse(\"https://example.com/foo\").unwrap();\n+ assert_eq!(explicit, implicit);\n+}\n+\n+#[test]\n+fn non_default_port_is_part_of_identity() {\n+ let a = Url::parse(\"https://example.com:444/\").unwrap();\n+ let b = Url::parse(\"https://example.com:445/\").unwrap();\n+ assert_ne!(a, b);\n+}\n+\n+#[test]\n+fn empty_path_vs_slash_only_path_may_differ() {\n+ let root = Url::parse(\"https://example.com\").unwrap();\n+ let slash = Url::parse(\"https://example.com/\").unwrap();\n+ // Both serialize to `https://example.com/` in practice for this crate — verify.\n+ assert_eq!(root, slash, \"document: root and trailing-slash-only merge for this parser\");\n+}\n+\n+#[test]\n+fn scheme_case_is_normalized_to_lowercase() {\n+ let lower = Url::parse(\"https://example.com/\").unwrap();\n+ let upper = Url::parse(\"HTTPS://example.com/\").unwrap();\n+ assert_eq!(lower, upper);\n+}\n+\n+#[test]\n+fn fragment_is_part_of_eq_and_hash() {\n+ let no_frag = Url::parse(\"https://example.com/a\").unwrap();\n+ let frag = Url::parse(\"https://example.com/a#section\").unwrap();\n+ assert_ne!(\n+ no_frag, frag,\n+ \"#fragment is included in PartialEq — anchors are different HashMap keys\"\n+ );\n+ assert_ne!(hash_one(&no_frag), hash_one(&frag));\n+}\n+\n+#[test]\n+fn query_order_and_encoding_can_split_identity() {\n+ let a = Url::parse(\"https://example.com/?b=2&a=1\").unwrap();\n+ let b = Url::parse(\"https://example.com/?a=1&b=2\").unwrap();\n+ assert_ne!(a, b, \"query pairs order is preserved in serialization\");\n+\n+ let plus = Url::parse(\"https://example.com/?q=a+b\").unwrap();\n+ let encoded = Url::parse(\"https://example.com/?q=a%20b\").unwrap();\n+ assert_ne!(plus, encoded, \"space as + vs %20 — different keys unless normalized\");\n+}\ndiff --git a/types/src/url_normalize.rs b/types/src/url_normalize.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..d5bc913f33ad29cd0cd1c7158e28e4fefdbf5f5d\n--- /dev/null\n+++ b/types/src/url_normalize.rs\n@@ -0,0 +1,234 @@\n+//! Normalization for external `http(s)://` item identity (not slug tilde ontology).\n+//!\n+//! Policy (intentional, extend here as new domains need treatment):\n+//! - Query pairs sorted lexicographically by **lowercased** key, then value.\n+//! - YouTube family → stable `www.youtube.com` shapes where possible.\n+\n+use url::Url;\n+\n+/// Whether `-/` → `https://…` path segments should keep original casing (YouTube video IDs are\n+/// case-sensitive).\n+pub(crate) fn host_preserves_dash_path_case(host: &str) -> bool {\n+ let h = host.trim().to_ascii_lowercase();\n+ let h = h.strip_prefix(\"www.\").unwrap_or(h.as_str());\n+ matches!(\n+ h,\n+ \"youtu.be\" | \"youtube.com\" | \"m.youtube.com\" | \"music.youtube.com\"\n+ )\n+}\n+\n+/// Normalize external http(s) URLs for stable [`super::paths::canonicalize_item`] output.\n+pub fn normalize_http_identity_url(s: &str) -> Option {\n+ let mut u = Url::parse(s).ok()?;\n+ if !matches!(u.scheme(), \"http\" | \"https\") {\n+ return None;\n+ }\n+ rewrite_youtube(&mut u);\n+ sort_query_pairs(&mut u);\n+ Some(u.to_string())\n+}\n+\n+fn base_host(host: &str) -> String {\n+ let lower = host.to_ascii_lowercase();\n+ lower\n+ .strip_prefix(\"www.\")\n+ .unwrap_or(lower.as_str())\n+ .to_string()\n+}\n+\n+fn rewrite_youtube(u: &mut Url) {\n+ let Some(host_raw) = u.host_str() else {\n+ return;\n+ };\n+ let base = base_host(host_raw);\n+ let path = u.path().to_string();\n+\n+ match base.as_str() {\n+ \"youtu.be\" => {\n+ let id = path.trim_start_matches('/').split('/').next().unwrap_or(\"\").to_string();\n+ if id.is_empty() {\n+ return;\n+ }\n+ let saved: Vec<(String, String)> = u.query_pairs().into_owned().collect();\n+ let Ok(mut out) = Url::parse(&format!(\"https://www.youtube.com/watch?v={id}\")) else {\n+ return;\n+ };\n+ {\n+ let mut q = out.query_pairs_mut();\n+ for (k, v) in saved {\n+ if k.eq_ignore_ascii_case(\"v\") {\n+ continue;\n+ }\n+ q.append_pair(&k, &v);\n+ }\n+ }\n+ *u = out;\n+ }\n+ \"youtube.com\" | \"m.youtube.com\" => {\n+ if base == \"m.youtube.com\" {\n+ let _ = u.set_host(Some(\"www.youtube.com\"));\n+ }\n+ if path.starts_with(\"/embed/\") {\n+ let id = path\n+ .strip_prefix(\"/embed/\")\n+ .unwrap_or(\"\")\n+ .trim_matches('/')\n+ .split('/')\n+ .next()\n+ .unwrap_or(\"\")\n+ .to_string();\n+ if id.is_empty() {\n+ return;\n+ }\n+ let saved: Vec<(String, String)> = u.query_pairs().into_owned().collect();\n+ let Ok(mut out) = Url::parse(&format!(\"https://www.youtube.com/watch?v={id}\"))\n+ else {\n+ return;\n+ };\n+ {\n+ let mut q = out.query_pairs_mut();\n+ for (k, v) in saved {\n+ if k.eq_ignore_ascii_case(\"v\") {\n+ continue;\n+ }\n+ q.append_pair(&k, &v);\n+ }\n+ }\n+ *u = out;\n+ return;\n+ }\n+ if path.starts_with(\"/v/\") {\n+ let id = path\n+ .strip_prefix(\"/v/\")\n+ .unwrap_or(\"\")\n+ .trim_matches('/')\n+ .split('/')\n+ .next()\n+ .unwrap_or(\"\")\n+ .to_string();\n+ if id.is_empty() {\n+ return;\n+ }\n+ let saved: Vec<(String, String)> = u.query_pairs().into_owned().collect();\n+ let Ok(mut out) = Url::parse(&format!(\"https://www.youtube.com/watch?v={id}\"))\n+ else {\n+ return;\n+ };\n+ {\n+ let mut q = out.query_pairs_mut();\n+ for (k, v) in saved {\n+ if k.eq_ignore_ascii_case(\"v\") {\n+ continue;\n+ }\n+ q.append_pair(&k, &v);\n+ }\n+ }\n+ *u = out;\n+ return;\n+ }\n+ if path.starts_with(\"/watch\") {\n+ let _ = u.set_host(Some(\"www.youtube.com\"));\n+ return;\n+ }\n+ if path.starts_with(\"/shorts/\") {\n+ let id = path\n+ .strip_prefix(\"/shorts/\")\n+ .unwrap_or(\"\")\n+ .trim_matches('/')\n+ .split('/')\n+ .next()\n+ .unwrap_or(\"\")\n+ .to_string();\n+ if id.is_empty() {\n+ return;\n+ }\n+ let saved: Vec<(String, String)> = u.query_pairs().into_owned().collect();\n+ let Ok(mut out) = Url::parse(&format!(\"https://www.youtube.com/shorts/{id}\"))\n+ else {\n+ return;\n+ };\n+ {\n+ let mut q = out.query_pairs_mut();\n+ for (k, v) in saved {\n+ q.append_pair(&k, &v);\n+ }\n+ }\n+ *u = out;\n+ return;\n+ }\n+ let _ = u.set_host(Some(\"www.youtube.com\"));\n+ }\n+ \"music.youtube.com\" => {}\n+ _ => {}\n+ }\n+}\n+\n+fn sort_query_pairs(u: &mut Url) {\n+ let pairs: Vec<(String, String)> = u.query_pairs().into_owned().collect();\n+ if pairs.is_empty() {\n+ u.set_query(None);\n+ return;\n+ }\n+ let mut pairs = pairs;\n+ pairs.sort_by(|a, b| {\n+ a.0.to_ascii_lowercase()\n+ .cmp(&b.0.to_ascii_lowercase())\n+ .then_with(|| a.1.cmp(&b.1))\n+ });\n+ u.set_query(None);\n+ {\n+ let mut q = u.query_pairs_mut();\n+ for (k, v) in pairs {\n+ q.append_pair(&k, &v);\n+ }\n+ }\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+\n+ #[test]\n+ fn youtube_youtu_be_to_watch() {\n+ assert_eq!(\n+ normalize_http_identity_url(\"https://youtu.be/dQw4w9WgXcQ\").as_deref(),\n+ Some(\"https://www.youtube.com/watch?v=dQw4w9WgXcQ\")\n+ );\n+ }\n+\n+ #[test]\n+ fn youtube_watch_query_sorted() {\n+ assert_eq!(\n+ normalize_http_identity_url(\"https://youtube.com/watch?v=Z&a=1&b=2\").as_deref(),\n+ Some(\"https://www.youtube.com/watch?a=1&b=2&v=Z\")\n+ );\n+ assert_eq!(\n+ normalize_http_identity_url(\"https://youtube.com/watch?b=2&a=1&v=Z\").as_deref(),\n+ Some(\"https://www.youtube.com/watch?a=1&b=2&v=Z\")\n+ );\n+ }\n+\n+ #[test]\n+ fn youtube_embed_to_watch() {\n+ assert_eq!(\n+ normalize_http_identity_url(\"https://www.youtube.com/embed/dQw4w9WgXcQ\").as_deref(),\n+ Some(\"https://www.youtube.com/watch?v=dQw4w9WgXcQ\")\n+ );\n+ }\n+\n+ #[test]\n+ fn youtube_shorts_host() {\n+ assert_eq!(\n+ normalize_http_identity_url(\"https://youtube.com/shorts/AbCdEfGhIjK\").as_deref(),\n+ Some(\"https://www.youtube.com/shorts/AbCdEfGhIjK\")\n+ );\n+ }\n+\n+ #[test]\n+ fn arbitrary_query_sorted() {\n+ assert_eq!(\n+ normalize_http_identity_url(\"https://example.com/x?z=1&a=2\").as_deref(),\n+ Some(\"https://example.com/x?a=2&z=1\")\n+ );\n+ }\n+}\n","role":"user"}],"model":"~x-ai/grok-latest"}