{"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[07715165] nice\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex c3c62a76f424010d77a6090c84dd0b82098f573e..da2536112faea313352624cf2ce0ddd0ab3377c1 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -6,7 +6,7 @@ use axum::{\n use std::collections::HashMap;\n \n use crate::{\n-    html::{demo_counter_panel, js_string_literal, ranking_panel, JsBuilder},\n+    html::{js_string_literal, ranking_panel, JsBuilder},\n     parser::parse_reddit_url,\n     parser_render::parser_panel_morph,\n     state::AppState,\n@@ -35,13 +35,6 @@ pub async fn post_ui_html(\n     };\n \n     match action {\n-        HtmlUiAction::BumpDemoCounter => {\n-            let count = state.bump_demo_counter().await;\n-            let panel = demo_counter_panel(count, state.event_log.path().to_string_lossy().as_ref());\n-            JsBuilder::new()\n-                .morph_selector(\"#demo-counter-panel\", panel)\n-                .into_response()\n-        }\n         HtmlUiAction::RecordVote {\n             a,\n             b,\n@@ -54,8 +47,8 @@ pub async fn post_ui_html(\n             {\n                 return ui_js_warn(&e).into_response();\n             }\n-            let mut group = state.group.write().await;\n-            let panel = ranking_panel(&mut group);\n+            let group = state.group.read().await;\n+            let panel = ranking_panel(&group);\n             JsBuilder::new()\n                 .morph_selector(\"#ranking-panel\", panel)\n                 .into_response()\n@@ -87,20 +80,6 @@ mod tests {\n         assert!(matches!(err, HtmlUiParseError::MissingRpc));\n     }\n \n-    #[test]\n-    fn bump_action_deserializes() {\n-        let template = serde_json::json!({ \"action\": \"bump_demo_counter\" });\n-        let mut form = HashMap::new();\n-        form.insert(\n-            UI_RPC_FIELD.to_string(),\n-            serde_json::to_string(&template).unwrap(),\n-        );\n-        assert_eq!(\n-            parse_html_ui_from_form(&form).unwrap(),\n-            HtmlUiAction::BumpDemoCounter\n-        );\n-    }\n-\n     #[test]\n     fn record_vote_action_deserializes() {\n         let template = serde_json::json!({\ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex b969242534e184d4f0a689543a479670b08a18df..eff80aef0257f706d2341f666e63d6a3d921bf6e 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -5,8 +5,6 @@ use serde::{Deserialize, Serialize};\n pub enum Event {\n     /// Page view recorded (path → counter in views.json).\n     ViewRecorded { path: String, ts: i64 },\n-    /// Demo counter bump from `POST /ui` (persisted in the single JSONL log).\n-    DemoCounterBumped { ts: i64, value: u64 },\n     /// Pairwise comparison vote (replayed into [`crate::reducer::GroupState`] on boot).\n     VoteRecorded {\n         ts: i64,\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 5b1d0b5a887d89e7e80796aa7a6c8ed5baaf2782..d69ed962b5c8625bc83c933b1825f2cc1d0868e2 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -13,7 +13,7 @@ use crate::{\n     form_template::template_json_compact,\n     parser_action::ParserAction,\n     parser_render::parser_panel,\n-    ranking::ranked_items,\n+    ranking::ranked_items_cached,\n     reducer::GroupState,\n     state::AppState,\n     ui_action::UI_RPC_FIELD,\n@@ -199,10 +199,8 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n     }\n }\n \n-pub fn ranking_panel(group: &mut GroupState) -> Markup {\n-    const MAX_ITERS: usize = 10_000;\n-    const TOL: f64 = 1e-8;\n-    let items = ranked_items(group, MAX_ITERS, TOL);\n+pub fn ranking_panel(group: &GroupState) -> Markup {\n+    let items = ranked_items_cached(group);\n     html! {\n         section id=\"ranking-panel\" class=\"demo-panel\" {\n             h2 { \"Ranking\" }\n@@ -260,35 +258,6 @@ pub fn vote_panel() -> Markup {\n }\n \n \n-pub fn demo_counter_panel(count: u64, event_log_path: &str) -> Markup {\n-    let rpc = template_json_compact(&serde_json::json!({ \"action\": \"bump_demo_counter\" }))\n-        .expect(\"rpc json\");\n-    html! {\n-        section id=\"demo-counter-panel\" class=\"demo-panel\" {\n-            h1 { \"sorter2\" }\n-            p class=\"muted\" {\n-                \"Pairwise ranking scaffold — votes persist to JSONL and replay on boot.\"\n-            }\n-            p class=\"demo-count\" {\n-                strong { \"Counter: \" }\n-                span id=\"demo-count-value\" { (count) }\n-            }\n-            p class=\"muted small\" {\n-                \"Event log: \" code { (event_log_path) }\n-            }\n-            form method=\"post\" action=\"/ui\" id=\"demo-bump-form\" {\n-                input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc);\n-                button type=\"submit\" class=\"btn-primary\" { \"Bump (POST /ui → eval JS)\" }\n-            }\n-            p class=\"muted small\" {\n-                \"Uses hidden \"\n-                code { \"__rpc__\" }\n-                \" JSON + Idiomorph morph — no full page reload.\"\n-            }\n-        }\n-    }\n-}\n-\n pub async fn home(\n     State(state): State<AppState>,\n     jar: CookieJar,\n@@ -297,16 +266,15 @@ pub async fn home(\n     let path = uri.path().to_string();\n     state.views.increment(path.clone());\n     let views = state.views.get_views(&path);\n-    let count = *state.demo_counter.read().await;\n     let theme = theme_from_jar(&jar);\n     let theme_next = theme_next_from_uri(&uri);\n-    let mut group = state.group.write().await;\n+    let group = state.group.read().await;\n     let empty_action = ParserAction::suggest(String::new(), None);\n     let body = html! {\n+        h1 { \"sorter2\" }\n         (parser_panel(\"\", &empty_action))\n         (vote_panel())\n-        (ranking_panel(&mut group))\n-        (demo_counter_panel(count, state.event_log.path().to_string_lossy().as_ref()))\n+        (ranking_panel(&group))\n     };\n     layout(\"sorter2\", body, views, theme, &theme_next)\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 6716c5b282e7980a7a0f03d63ad8b25eda61cc55..fa423640d598f4ba97a5885d228e78d7b97f7a22 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -9,6 +9,7 @@ pub mod parser_render;\n pub mod path_types;\n pub mod ranking;\n pub mod reducer;\n+pub mod settlement;\n pub mod state;\n pub mod ui_action;\n pub mod views;\ndiff --git a/server/src/ranking.rs b/server/src/ranking.rs\nindex 89d3280126a8d8f841721ce8cb63ff735d68752a..2d706762792ba9239bb3f1c2e4974a2fde908013 100644\n--- a/server/src/ranking.rs\n+++ b/server/src/ranking.rs\n@@ -91,6 +91,11 @@ pub fn compute_group_ranking(group: &mut GroupState, max_iters: usize, tol: f64)\n \n pub fn ranked_items(group: &mut GroupState, max_iters: usize, tol: f64) -> Vec<RankedItem> {\n     compute_group_ranking(group, max_iters, tol);\n+    ranked_items_cached(group)\n+}\n+\n+/// Read cached scores without recomputing (HTTP fast path).\n+pub fn ranked_items_cached(group: &GroupState) -> Vec<RankedItem> {\n     let mut items: Vec<RankedItem> = group\n         .idx_to_item\n         .iter()\n@@ -105,7 +110,12 @@ pub fn ranked_items(group: &mut GroupState, max_iters: usize, tol: f64) -> Vec<R\n     items\n }\n \n-fn compute_scores_from_edges(n: usize, edges: impl Iterator<Item = ((usize, usize), f64)>, max_iters: usize, tol: f64) -> Vec<f64> {\n+pub fn compute_scores_from_edges(\n+    n: usize,\n+    edges: impl Iterator<Item = ((usize, usize), f64)>,\n+    max_iters: usize,\n+    tol: f64,\n+) -> Vec<f64> {\n     if n == 0 {\n         return vec![];\n     }\ndiff --git a/server/src/settlement.rs b/server/src/settlement.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..1f722ceaea62cda22c28ab71551f259fbf049b81\n--- /dev/null\n+++ b/server/src/settlement.rs\n@@ -0,0 +1,114 @@\n+use std::sync::Arc;\n+\n+use tokio::sync::{mpsc, oneshot, RwLock};\n+\n+use crate::{\n+    event_log::EventLog,\n+    events::Event,\n+    ranking::compute_scores_from_edges,\n+    reducer::{GroupState, VoteData},\n+};\n+\n+const MAX_ITERS: usize = 10_000;\n+const TOL: f64 = 1e-8;\n+\n+pub struct SettlementCommand {\n+    pub vote: VoteData,\n+    pub event: Event,\n+    pub reply: oneshot::Sender<Result<(), String>>,\n+}\n+\n+#[derive(Clone)]\n+pub struct SettlementClient {\n+    tx: mpsc::Sender<SettlementCommand>,\n+}\n+\n+impl SettlementClient {\n+    pub fn spawn(group: Arc<RwLock<GroupState>>, event_log: Arc<EventLog>) -> Self {\n+        let (tx, rx) = mpsc::channel(64);\n+        tokio::spawn(settlement_worker(rx, group, event_log));\n+        Self { tx }\n+    }\n+\n+    pub async fn record_vote(&self, vote: VoteData, event: Event) -> Result<(), String> {\n+        let (reply, rx) = oneshot::channel();\n+        self.tx\n+            .send(SettlementCommand {\n+                vote,\n+                event,\n+                reply,\n+            })\n+            .await\n+            .map_err(|_| \"settlement worker stopped\".to_string())?;\n+        rx.await\n+            .map_err(|_| \"settlement worker stopped\".to_string())?\n+    }\n+}\n+\n+async fn settlement_worker(\n+    mut rx: mpsc::Receiver<SettlementCommand>,\n+    group: Arc<RwLock<GroupState>>,\n+    event_log: Arc<EventLog>,\n+) {\n+    while let Some(first) = rx.recv().await {\n+        let mut batch = vec![first];\n+        while let Ok(more) = rx.try_recv() {\n+            batch.push(more);\n+        }\n+\n+        let mut disk_err: Option<String> = None;\n+        for cmd in &batch {\n+            if let Err(e) = event_log.append(&cmd.event).await {\n+                disk_err = Some(e.to_string());\n+                break;\n+            }\n+        }\n+\n+        if let Some(err) = disk_err {\n+            for cmd in batch {\n+                let _ = cmd.reply.send(Err(err.clone()));\n+            }\n+            continue;\n+        }\n+\n+        let (edges, n) = {\n+            let mut w = group.write().await;\n+            for cmd in &batch {\n+                w.apply_vote(cmd.vote.clone());\n+            }\n+            (w.edges.clone(), w.idx_to_item.len())\n+        };\n+\n+        let new_scores = compute_scores_from_edges(\n+            n,\n+            edges.iter().map(|(&k, &v)| (k, v)),\n+            MAX_ITERS,\n+            TOL,\n+        );\n+\n+        {\n+            let mut w = group.write().await;\n+            w.cached_scores = new_scores;\n+            w.dirty = false;\n+        }\n+\n+        for cmd in batch {\n+            let _ = cmd.reply.send(Ok(()));\n+        }\n+    }\n+}\n+\n+/// Compute ranking cache from current in-memory edges (startup replay only).\n+pub fn warm_ranking_cache(group: &mut GroupState) {\n+    if !group.dirty {\n+        return;\n+    }\n+    let n = group.idx_to_item.len();\n+    group.cached_scores = compute_scores_from_edges(\n+        n,\n+        group.edges.iter().map(|(&k, &v)| (k, v)),\n+        MAX_ITERS,\n+        TOL,\n+    );\n+    group.dirty = false;\n+}\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 8ec9902e2ecc31cf8208f7ad6365891dc5537eed..1922541a4064c2de1df2d993a461cae783320e05 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -6,6 +6,7 @@ use crate::{\n     event_log::EventLog,\n     events::Event,\n     reducer::{GroupState, VoteData},\n+    settlement::{warm_ranking_cache, SettlementClient},\n     views::ViewStore,\n };\n \n@@ -38,8 +39,8 @@ pub struct AppState {\n     pub cfg: Arc<AppConfig>,\n     pub event_log: Arc<EventLog>,\n     pub views: ViewStore,\n-    pub demo_counter: Arc<RwLock<u64>>,\n     pub group: Arc<RwLock<GroupState>>,\n+    settlement: SettlementClient,\n }\n \n impl AppState {\n@@ -48,14 +49,10 @@ impl AppState {\n         let views_path = format!(\"{}/views.json\", cfg.data_dir);\n         let views = ViewStore::new(&views_path);\n \n-        let mut demo_counter: u64 = 0;\n         let mut group = GroupState::new();\n         if let Ok((events, _)) = event_log.load_all().await {\n             for ev in events {\n                 match ev {\n-                    Event::DemoCounterBumped { value, .. } => {\n-                        demo_counter = demo_counter.max(value);\n-                    }\n                     Event::VoteRecorded {\n                         ts,\n                         a,\n@@ -74,30 +71,20 @@ impl AppState {\n             }\n         }\n \n+        warm_ranking_cache(&mut group);\n+\n+        let group = Arc::new(RwLock::new(group));\n+        let settlement = SettlementClient::spawn(group.clone(), event_log.clone());\n+\n         Self {\n             cfg: Arc::new(cfg),\n             event_log,\n             views,\n-            demo_counter: Arc::new(RwLock::new(demo_counter)),\n-            group: Arc::new(RwLock::new(group)),\n+            group,\n+            settlement,\n         }\n     }\n \n-    pub async fn bump_demo_counter(&self) -> u64 {\n-        let mut guard = self.demo_counter.write().await;\n-        *guard += 1;\n-        let value = *guard;\n-        drop(guard);\n-\n-        let ts = crate::html::now_ms();\n-        let _ = self\n-            .event_log\n-            .append(&Event::DemoCounterBumped { ts, value })\n-            .await;\n-\n-        value\n-    }\n-\n     pub async fn record_vote(\n         &self,\n         a: &str,\n@@ -109,23 +96,14 @@ impl AppState {\n         let vote = VoteData::from_recorded(ts, a, b, ratio_left, ratio_right)\n             .ok_or_else(|| \"invalid vote: need two distinct non-empty items\".to_string())?;\n \n-        {\n-            let mut group = self.group.write().await;\n-            group.apply_vote(vote.clone());\n-        }\n-\n-        let _ = self\n-            .event_log\n-            .append(&Event::VoteRecorded {\n-                ts,\n-                a: vote.a.as_str().to_string(),\n-                b: vote.b.as_str().to_string(),\n-                ratio_left: vote.ratio_left,\n-                ratio_right: vote.ratio_right,\n-            })\n-            .await\n-            .map_err(|e| e.to_string())?;\n+        let event = Event::VoteRecorded {\n+            ts,\n+            a: vote.a.as_str().to_string(),\n+            b: vote.b.as_str().to_string(),\n+            ratio_left: vote.ratio_left,\n+            ratio_right: vote.ratio_right,\n+        };\n \n-        Ok(())\n+        self.settlement.record_vote(vote, event).await\n     }\n }\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex 1d488e1ad1d8fd81bd9d016d69255adfe9b22fc8..5d94c84113607b3bcd8d31d03ef5b8e1b87b67a7 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -12,8 +12,6 @@ pub const UI_RPC_FIELD: &str = \"__rpc__\";\n #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n #[serde(tag = \"action\", rename_all = \"snake_case\")]\n pub enum HtmlUiAction {\n-    /// Demo: morph `#demo-counter-panel` after bumping the persisted counter.\n-    BumpDemoCounter,\n     /// Record a pairwise vote and morph `#ranking-panel`.\n     RecordVote {\n         a: String,\n@@ -52,18 +50,6 @@ pub fn parse_html_ui_from_form(\n mod tests {\n     use super::*;\n \n-    #[test]\n-    fn bump_demo_counter_round_trip() {\n-        let template = serde_json::json!({ \"action\": \"bump_demo_counter\" });\n-        let mut form = HashMap::new();\n-        form.insert(\n-            UI_RPC_FIELD.to_string(),\n-            serde_json::to_string(&template).unwrap(),\n-        );\n-        let a = parse_html_ui_from_form(&form).unwrap();\n-        assert_eq!(a, HtmlUiAction::BumpDemoCounter);\n-    }\n-\n     #[test]\n     fn record_vote_round_trip_with_form_holes() {\n         let template = serde_json::json!({\ndiff --git a/server/tests/integration_health.rs b/server/tests/integration_health.rs\nindex 8a58bc14aac68c779e7ce4ffa57d27b3220e9953..1d816e008b9bf629967e3b3c786c41afefc284e3 100644\n--- a/server/tests/integration_health.rs\n+++ b/server/tests/integration_health.rs\n@@ -38,7 +38,7 @@ async fn healthz_ok() {\n }\n \n #[tokio::test]\n-async fn home_has_demo_panel() {\n+async fn home_has_main_panels() {\n     let (addr, _tmp) = start_test_server().await;\n     let client = reqwest::Client::new();\n     let html = client\ndiff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs\nindex bee79407dec120699a083f1a75adf9291e207fc7..7ede46d681fefbe25b1d98fc33520a185515eb1c 100644\n--- a/server/tests/integration_ui.rs\n+++ b/server/tests/integration_ui.rs\n@@ -25,33 +25,6 @@ async fn start_test_server() -> (SocketAddr, TempDir) {\n     (addr, tmp)\n }\n \n-#[tokio::test]\n-async fn post_ui_bump_returns_javascript_morph() {\n-    let (addr, tmp) = start_test_server().await;\n-    let rpc = serde_json::json!({ \"action\": \"bump_demo_counter\" }).to_string();\n-    let mut form = HashMap::new();\n-    form.insert(UI_RPC_FIELD.to_string(), rpc);\n-\n-    let client = reqwest::Client::new();\n-    let body = client\n-        .post(format!(\"http://{addr}/ui\"))\n-        .form(&form)\n-        .send()\n-        .await\n-        .unwrap()\n-        .text()\n-        .await\n-        .unwrap();\n-\n-    assert!(body.contains(\"Idiomorph.morph\"));\n-    assert!(body.contains(\"demo-counter-panel\"));\n-    assert!(body.contains(\"Counter:\"));\n-\n-    let log_path = tmp.path().join(\"events.jsonl\");\n-    let log = std::fs::read_to_string(log_path).unwrap();\n-    assert!(log.contains(\"demo_counter_bumped\"));\n-}\n-\n #[tokio::test]\n async fn post_ui_record_vote_morphs_ranking_and_persists() {\n     let (addr, tmp) = start_test_server().await;\n@@ -90,8 +63,8 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() {\n         port: 0,\n     };\n     let state = create_app_state(cfg).await;\n-    let mut group = state.group.write().await;\n-    let ranked = sorter2_server::ranking::ranked_items(&mut group, 10_000, 1e-8);\n+    let group = state.group.read().await;\n+    let ranked = sorter2_server::ranking::ranked_items_cached(&group);\n     assert_eq!(ranked.len(), 2);\n     assert_eq!(ranked[0].item.as_str(), \"alpha\");\n }\ndiff --git a/test/smoke.clj b/test/smoke.clj\nindex b332324743b58baf3fe96d7477353749f137feae..11887c48282088e140d823a88ba616f6325835b3 100644\n--- a/test/smoke.clj\n+++ b/test/smoke.clj\n@@ -26,7 +26,7 @@\n             false))))))\n \n (deftest http-smoke-against-running-server\n-  (testing \"build, start, healthz, home contains RPC demo\"\n+  (testing \"build, start, healthz, home contains main panels\"\n     (let [root (repo-root)\n           data-dir (.getAbsolutePath (doto (io/file (System/getProperty \"java.io.tmpdir\")\n                                                    (str \"sorter2-smoke-\" (System/currentTimeMillis)))\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<crate::events::ThreadCapability, String> {\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<Self> {\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<AppState>,\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<AppState>,\n-    Path((room_short, room_slug, tag)): Path<(String, String, String)>,\n+    Path((room_key, tag)): Path<(String, String)>,\n     Query(q): Query<ThreadViewQuery>,\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<AppState>,\n-    Path((room_short, room_slug)): Path<(String, String)>,\n+    Path(room_key): Path<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, \"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<AppState>,\n-    Path((room_short, room_slug)): Path<(String, String)>,\n+    Path(room_key): Path<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@@ -341,12 +343,14 @@ pub async fn room_garden_index(\n \n pub async fn room_external_garden_index(\n     State(state): State<AppState>,\n-    Path((room_short, room_slug)): Path<(String, String)>,\n+    Path(room_key): Path<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@@ -416,12 +420,14 @@ pub async fn room_external_garden_index(\n \n pub async fn room_external_ontology_path(\n     State(state): State<AppState>,\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<AppState>,\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<RankRow>,\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<String> {\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::<Vec<_>>()\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<String> {\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<String> {\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<Url, u32> = 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<Url, &str> = 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<String> {\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":"openai/gpt-chat-latest"}