{"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[9ecc4e2e] nice\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 5675dcd2e28062acbe3c037b94b77c33adf32474..a18241f3ed7b4a248748fcefc799f9801ca62461 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -936,7 +936,15 @@ pub async fn handle_rpc_batch(\n                 line_ok(RpcResult::ForumThreads(rpc_list_forum_threads(&reduced, &room)))\n             }\n             RpcCommand::RoomCreate { slug, visibility } => {\n-                match verify_bearer_principal(&headers, &*state.reduced.read().await) {\n+                // Scope the first read so its guard drops before any nested `read().await` / `write().await`.\n+                // A guard from `match verify(..., &*state.reduced.read().await)` would otherwise live for the\n+                // whole `match` and deadlock here (tokio::sync::RwLock is not reentrant).\n+                let principal = {\n+                    let reduced = state.reduced.read().await;\n+                    verify_bearer_principal(&headers, &*reduced)\n+                };\n+                match principal {\n+                    Err((_, m)) => line_err(m, None),\n                     Ok(principal) => {\n                         let slug = slug.trim().to_lowercase();\n                         if slug.is_empty() || slug.len() > 64 {\n@@ -994,7 +1002,6 @@ pub async fn handle_rpc_batch(\n                             }\n                         }\n                     }\n-                    Err((_, m)) => line_err(m, None),\n                 }\n             }\n             RpcCommand::RoomGrant {\n@@ -1002,17 +1009,28 @@ pub async fn handle_rpc_batch(\n                 username,\n                 capability,\n             } => {\n-                match verify_bearer_principal(&headers, &*state.reduced.read().await) {\n+                let principal = {\n+                    let reduced = state.reduced.read().await;\n+                    verify_bearer_principal(&headers, &*reduced)\n+                };\n+                match principal {\n                     Err((_, m)) => line_err(m, None),\n                     Ok(principal) => {\n-                        let reduced = state.reduced.read().await;\n-                        if !reduced.user_has_cap(&room, &principal, ThreadCapability::Manage) {\n+                        let can_manage = {\n+                            let reduced = state.reduced.read().await;\n+                            reduced.user_has_cap(&room, &principal, ThreadCapability::Manage)\n+                        };\n+                        if !can_manage {\n                             line_err(\"requires Manage capability\", None)\n                         } else {\n                             match parse_username(&username) {\n                                 Err(msg) => line_err(\"invalid username\", Some(msg)),\n                                 Ok(target) => {\n-                                    if !reduced.users_by_provider.values().any(|u| u == &target) {\n+                                    let user_exists = {\n+                                        let reduced = state.reduced.read().await;\n+                                        reduced.users_by_provider.values().any(|u| u == &target)\n+                                    };\n+                                    if !user_exists {\n                                         line_err(format!(\"user @{target} not found\"), None)\n                                     } else {\n                                         match parse_capability(&capability) {\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex 9162bd5bee84035e3908bfb9c8e201b7878ca339..b930120da09fe7d307f0411b84fb639fb8bd0b15 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -95,6 +95,23 @@ async fn test_healthz() {\n     assert_eq!(response.text().await.unwrap(), \"ok\");\n }\n \n+#[tokio::test]\n+async fn test_room_create_private_rpc() {\n+    let (addr, _tmp, _log, _handle) = create_test_server().await;\n+    let client = reqwest::Client::new();\n+    let batch = serde_json::json!([{\n+        \"RoomCreate\": { \"slug\": \"secret-project\", \"visibility\": \"private\" }\n+    }]);\n+    let body = rpc_batch(&client, addr, Some(&test_bearer()), batch).await;\n+    let line = &body[\"results\"][0];\n+    assert_eq!(line[\"ok\"], true, \"room create: {:?}\", line);\n+    let room_id = line[\"result\"][\"RoomCreated\"][\"room_id\"].as_str().unwrap();\n+    assert!(\n+        room_id.contains(\"/secret-project\"),\n+        \"expected room_id to contain slug, got {room_id}\"\n+    );\n+}\n+\n #[tokio::test]\n async fn test_index_page() {\n     // HTML routes are offline during the auth-v3 refactor.\ndiff --git a/test/auth.bb b/test/auth.bb\nindex 611e04f1806ef81d678a91f499597fe55f691dd7..a67cc1de763434176d2f68e419dd37a8cd328395 100644\n--- a/test/auth.bb\n+++ b/test/auth.bb\n@@ -176,7 +176,7 @@\n          (assert! (= 200 (:status poll)) \"pending-session poll returns 200\")\n          (let [poll-json (json/parse-string (:body poll) true)]\n            (assert! (:complete poll-json) \"pending session complete=true\")\n-           (assert! (= \"@bbuser\" (:user poll-json)) \"poll returns @bbuser\")\n+           (assert! (= \"bbuser\" (:user poll-json)) \"poll returns stored username bbuser\")\n            (assert! (clojure.string/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n \n            (println \"\\nwhoami…\")\n@@ -184,7 +184,7 @@\n                                :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n              (assert! (= 200 (:status who)) \"whoami returns 200\")\n              (let [who-json (json/parse-string (:body who) true)]\n-               (assert! (= \"@bbuser\" (:user who-json)) \"whoami user is @bbuser\"))))))\n+               (assert! (= \"bbuser\" (:user who-json)) \"whoami user is bbuser (stored form)\"))))))\n \n      (println \"\\nCLI: identity start → OAuth → identity poll → whoami…\")\n      (let [cli-home (str tmp-dir \"/cli-home\")\n@@ -208,7 +208,7 @@\n                       (str \"identity poll exits 0 (stderr: \" (:err poll-proc) \")\"))\n              (let [poll-cli (json/parse-string (:out poll-proc) true)]\n                (assert! (= \"complete\" (:phase poll-cli)) \"identity poll --json phase\")\n-               (assert! (= \"@cliuser\" (:user poll-cli)) \"CLI poll user\")\n+               (assert! (= \"cliuser\" (:user poll-cli)) \"CLI poll user (stored form)\")\n                (assert! (clojure.string/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n                (let [token-path (str cli-home \"/.config/slugsocial/token\")]\n                  (assert! (fs/exists? token-path) \"token written under isolated HOME\")\n@@ -219,7 +219,7 @@\n                  (assert! (zero? (:exit who-proc))\n                           (str \"whoami exits 0 (stderr: \" (:err who-proc) \")\"))\n                  (let [who-cli (json/parse-string (:out who-proc) true)]\n-                   (assert! (= \"@cliuser\" (:user who-cli)) \"CLI whoami uses saved token\"))))))))\n+                   (assert! (= \"cliuser\" (:user who-cli)) \"CLI whoami uses saved token\"))))))))\n \n      (finally\n        (when-some [s @!server] (common/kill-server s))\ndiff --git a/test/common.bb b/test/common.bb\nindex ebb16c615a8b40e8830b5d5765d1e935a45538d0..4ed450377cdbb020f5ff164a812dfbbfc23c0f47 100644\n--- a/test/common.bb\n+++ b/test/common.bb\n@@ -78,9 +78,20 @@\n \n (defn start-server\n   \"Start the slugsocial-server binary with the given env map.\n-   Returns the babashka.process map.\"\n-  [server-bin env-map]\n-  (p/process [server-bin] {:out :inherit :err :inherit :env env-map}))\n+   Returns the babashka.process map.\n+\n+   When `log-file` (string path) is provided, stdout and stderr are appended there\n+   instead of inheriting the parent descriptors. Inheriting shared pipes while the\n+   parent blocks on HTTP I/O can fill the pipe buffer and deadlock the server on log writes.\"\n+  ([server-bin env-map]\n+   (start-server server-bin env-map nil))\n+  ([server-bin env-map log-file]\n+   (p/process [server-bin]\n+              (if log-file\n+                ;; Two string paths (same file): babashka.process can deref the process cleanly.\n+                ;; :err :out + ProcessBuilder$Redirect breaks stream copying in deref/kill-server.\n+                {:env env-map :out log-file :err log-file}\n+                {:out :inherit :err :inherit :env env-map}))))\n \n (defn kill-server\n   \"Forcibly kill a server process (babashka.process map) and wait for it to exit.\"\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 7066c1f2a57f39a362052f8524206dccf37bb7b1..793ba216f2de76a77eb20a76d08403db07ff411b 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -35,13 +35,14 @@\n (defn- http-client []\n   (-> (java.net.http.HttpClient/newBuilder)\n       (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n+      (.connectTimeout (java.time.Duration/ofSeconds 15))\n       (.build)))\n \n (defn- http-get [url & {:keys [headers]}]\n   (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n     (doseq [[k v] (or headers {})]\n       (.header b k v))\n-    (let [req (-> b (.GET) (.build))\n+    (let [req (-> b (.timeout (java.time.Duration/ofSeconds 60)) (.GET) (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n       {:status (.statusCode resp) :body (.body resp)})))\n \n@@ -52,6 +53,7 @@\n     (doseq [[k v] (or headers {})]\n       (.header b k v))\n     (let [req (-> b\n+                  (.timeout (java.time.Duration/ofSeconds 60))\n                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n                   (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -67,6 +69,7 @@\n         b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n     (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n     (let [req (-> b\n+                  (.timeout (java.time.Duration/ofSeconds 60))\n                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n                   (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[674964ef] refactor: Deref for href newtypes, CanonicalItemUrl through resolve_item\n\n- Implement Deref<Target=str> for GardenItemUrl, ForumThreadUrl, TildeOntologyPath\n- resolve_item returns CanonicalItemUrl; validate uses HashSet<CanonicalItemUrl>\n- compute_scope_rank_changes keys are CanonicalItemUrl; pair RPC uses Vec pool\n- pick_random_distinct_canonical; connectivity stats on &[CanonicalItemUrl]\n- Global rank unranked uses stored ids before GardenItemUrl mapping\n\nMade-with: Cursor\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/helpers.rs b/server/src/api/helpers.rs\nindex 03b3e77911ccd662bec8635345dafe2593cf242e..1b291db83df7364a026f2e147e0a29a70a399371 100644\n--- a/server/src/api/helpers.rs\n+++ b/server/src/api/helpers.rs\n@@ -30,13 +30,13 @@ pub fn now_ms() -> i64 {\n     t.as_millis() as i64\n }\n \n-/// Resolve an item path as a first-class canonical path.\n-pub fn resolve_item(item: &str) -> Result<String, String> {\n+/// Resolve DSL/user input to a stored canonical item id.\n+pub fn resolve_item(item: &str) -> Result<CanonicalItemUrl, String> {\n     let canonical = canonicalize_item(item);\n     if canonical.is_empty() {\n         return Err(format!(\"empty item path: `{}`\", item));\n     }\n-    Ok(canonical)\n+    Ok(CanonicalItemUrl(canonical))\n }\n \n pub fn parse_parent_specs(parent: Option<&String>) -> Vec<String> {\n@@ -94,7 +94,7 @@ pub fn paginate_rankings(\n     (out_components, out_unranked)\n }\n \n-pub fn pick_random_distinct(items: &[String]) -> Option<(String, String)> {\n+pub fn pick_random_distinct_canonical(items: &[CanonicalItemUrl]) -> Option<(CanonicalItemUrl, CanonicalItemUrl)> {\n     use rand::seq::SliceRandom;\n     if items.len() < 2 {\n         return None;\n@@ -123,15 +123,12 @@ pub fn is_pair_voted(group: &crate::reducer::GroupState, a: &str, b: &str) -> bo\n     group.voted_pairs.contains(&(i, j))\n }\n \n-pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[String]) -> ConnectivityStats {\n+pub fn compute_connectivity_stats(group: &crate::reducer::GroupState, pool: &[CanonicalItemUrl]) -> ConnectivityStats {\n     let n = pool.len();\n \n     let global_idxs: Vec<Option<usize>> = pool\n         .iter()\n-        .map(|it| {\n-            let key = CanonicalItemUrl(it.clone());\n-            group.item_to_idx.get(&key).copied()\n-        })\n+        .map(|it| group.item_to_idx.get(it).copied())\n         .collect();\n     let present: Vec<usize> = global_idxs.iter().filter_map(|x| *x).collect();\n \ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex cf22cb0129366c3aed031bc86f3197a4321cb806..a10ce662105cff8fad949c6b83f7035ce79bed18 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -24,7 +24,7 @@ pub use auth::{\n \n pub use helpers::{\n     api_error, compute_connectivity_stats, is_pair_voted, now_ms, paginate_rankings,\n-    parse_parent_specs, pick_random_distinct, resolve_item, sha256_hex, vote_touches_path,\n+    parse_parent_specs, pick_random_distinct_canonical, resolve_item, sha256_hex, vote_touches_path,\n };\n \n pub use rpc::handle_rpc_batch;\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 5f7d50188f1381267402f2e57e671234ef5db2fd..de0955d0887d32740e1fd18365205c5bdb53c247 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -29,7 +29,7 @@ use crate::{\n use super::auth::verify_bearer_principal;\n use super::helpers::{\n     compute_connectivity_stats, is_pair_voted, now_ms, paginate_rankings, parse_parent_specs,\n-    pick_random_distinct, resolve_item, vote_touches_path,\n+    pick_random_distinct_canonical, resolve_item, vote_touches_path,\n };\n use super::validate::{normalize_room_and_thread, validate_ingest_document};\n \n@@ -146,21 +146,21 @@ fn authorize_room_read(reduced: &ReducerState, headers: &HeaderMap, room: &str)\n }\n \n fn compute_scope_rank_changes(\n-    parent: &str,\n+    parent: &CanonicalItemUrl,\n     before: &crate::scope_rank::ChildrenRankings,\n     after: &crate::scope_rank::ChildrenRankings,\n     room_wire: &str,\n ) -> Option<ScopeRankChanges> {\n-    fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap<String, Option<RankPosition>> {\n+    fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap<CanonicalItemUrl, Option<RankPosition>> {\n         let mut map = HashMap::new();\n         for comp in &rankings.component_rankings {\n             let total = comp.ranked.len();\n             for (i, item) in comp.ranked.iter().enumerate() {\n-                map.insert(item.item.as_str().to_string(), Some(RankPosition { rank: i + 1, of: total }));\n+                map.insert(item.item.clone(), Some(RankPosition { rank: i + 1, of: total }));\n             }\n         }\n         for item in &rankings.unranked_items {\n-            map.insert(item.as_str().to_string(), None);\n+            map.insert(item.clone(), None);\n         }\n         map\n     }\n@@ -168,7 +168,7 @@ fn compute_scope_rank_changes(\n     let before_pos = build_positions(before);\n     let after_pos = build_positions(after);\n \n-    let all_items: std::collections::BTreeSet<String> = before_pos.keys().cloned()\n+    let all_items: std::collections::BTreeSet<CanonicalItemUrl> = before_pos.keys().cloned()\n         .chain(after_pos.keys().cloned())\n         .collect();\n \n@@ -184,7 +184,7 @@ fn compute_scope_rank_changes(\n         };\n         if changed {\n             changes.push(RankChange {\n-                item: GardenItemUrl::from_storage_str(&item, room_wire),\n+                item: GardenItemUrl::from_stored(&item, room_wire),\n                 before: b,\n                 after: a,\n             });\n@@ -203,11 +203,7 @@ fn compute_scope_rank_changes(\n     });\n \n     Some(ScopeRankChanges {\n-        parent: if parent.is_empty() {\n-            \"/\".to_string()\n-        } else {\n-            GardenItemUrl::from_storage_str(parent, room_wire).into_inner()\n-        },\n+        parent: GardenItemUrl::from_stored(parent, room_wire).into_inner(),\n         changes,\n     })\n }\n@@ -473,8 +469,8 @@ async fn rpc_post(\n         for s in &v.doc.statements {\n             if let dsl::Stmt::Vote { item1, item2, .. } = s {\n                 if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) {\n-                    if let Some(p) = CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); }\n-                    if let Some(p) = CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); }\n+                    if let Some(p) = a.parent() { parents.insert(p); }\n+                    if let Some(p) = b.parent() { parents.insert(p); }\n                 }\n             }\n         }\n@@ -525,7 +521,7 @@ async fn rpc_post(\n             .filter_map(|p| {\n                 let before = pre_rankings.get(p)?;\n                 let after = crate::scope_rank::build_children_rankings(content, p);\n-                compute_scope_rank_changes(p.as_str(), before, &after, &room_key)\n+                compute_scope_rank_changes(p, before, &after, &room_key)\n             })\n             .collect();\n         if v.is_empty() { None } else { Some(v) }\n@@ -638,8 +634,8 @@ async fn rpc_check(\n         for s in &v.doc.statements {\n             if let dsl::Stmt::Vote { item1, item2, .. } = s {\n                 if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) {\n-                    if let Some(p) = CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); }\n-                    if let Some(p) = CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); }\n+                    if let Some(p) = a.parent() { parents.insert(p); }\n+                    if let Some(p) = b.parent() { parents.insert(p); }\n                 }\n             }\n         }\n@@ -961,7 +957,7 @@ fn rpc_search(reduced: &ReducerState, q: &str, limit: usize, principal: Option<&\n async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Result<RpcResult, RpcErr> {\n     let scope = scope_from_room_wire(&room);\n     let reduced_arc = state.reduced.clone();\n-    let pool: Vec<String> = {\n+    let pool: Vec<CanonicalItemUrl> = {\n         let reduced = reduced_arc.read().await;\n         let content = content_for_room(&reduced, &room);\n         let tmp = if parent_path.trim().is_empty() {\n@@ -970,12 +966,11 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n             Some(parent_path.clone())\n         };\n         let specs = parse_parent_specs(tmp.as_ref());\n-        let raw_pool: Vec<CanonicalItemUrl> = if specs.is_empty() {\n+        if specs.is_empty() {\n             content.ranking_group.idx_to_item.clone()\n         } else {\n             crate::scope_rank::resolve_scope(content, &specs)\n-        };\n-        raw_pool.into_iter().map(|it| it.0).collect()\n+        }\n     };\n     if pool.len() < 2 {\n         return Err((\n@@ -983,31 +978,30 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n             Some(\"add items via ingest\".into()),\n         ));\n     }\n-    let selected: Option<(String, String)> = {\n+    let selected: Option<(CanonicalItemUrl, CanonicalItemUrl)> = {\n         let mut reduced = reduced_arc.write().await;\n         let content = reduced.content.entry(scope.clone()).or_default();\n         let group = &mut content.ranking_group;\n         if group.idx_to_item.is_empty() {\n-            pick_random_distinct(&pool)\n+            pick_random_distinct_canonical(&pool)\n         } else {\n             let mut rng = rand::thread_rng();\n-            let idxs: Vec<usize> = pool.iter()\n-                .filter_map(|it| {\n-                    let key = CanonicalItemUrl(it.clone());\n-                    group.item_to_idx.get(&key).copied()\n-                })\n+            let idxs: Vec<usize> = pool\n+                .iter()\n+                .filter_map(|it| group.item_to_idx.get(it).copied())\n                 .collect();\n             let ranked = ranked_items_subset(group, &idxs, 10000, 1e-8);\n-            let ranked_set: HashSet<String> = ranked.iter().map(|r| r.item.as_str().to_string()).collect();\n-            let unsorted: Vec<String> = pool.iter()\n+            let ranked_set: HashSet<CanonicalItemUrl> = ranked.iter().map(|r| r.item.clone()).collect();\n+            let unsorted: Vec<CanonicalItemUrl> = pool\n+                .iter()\n                 .filter(|it| !ranked_set.contains(*it))\n                 .cloned()\n                 .collect();\n-            let mut pick: Option<(String, String)> = None;\n+            let mut pick: Option<(CanonicalItemUrl, CanonicalItemUrl)> = None;\n             if !unsorted.is_empty() {\n                 if let Some(left) = unsorted.choose(&mut rng).cloned() {\n-                    let mut candidates: Vec<String> = if !ranked.is_empty() {\n-                        ranked.iter().map(|r| r.item.as_str().to_string()).collect()\n+                    let mut candidates: Vec<CanonicalItemUrl> = if !ranked.is_empty() {\n+                        ranked.iter().map(|r| r.item.clone()).collect()\n                     } else {\n                         pool.clone()\n                     };\n@@ -1021,21 +1015,21 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n                     let a = ranked[i].item.as_str();\n                     let b = ranked[i + 1].item.as_str();\n                     if a != b && !is_pair_voted(group, a, b) {\n-                        pick = Some((a.to_string(), b.to_string()));\n+                        pick = Some((ranked[i].item.clone(), ranked[i + 1].item.clone()));\n                         break;\n                     }\n                 }\n                 if pick.is_none() {\n                     for _ in 0..64 {\n                         let (Some(a), Some(b)) = (pool.choose(&mut rng).cloned(), pool.choose(&mut rng).cloned()) else { break; };\n-                        if a != b && !is_pair_voted(group, &a, &b) {\n+                        if a != b && !is_pair_voted(group, a.as_str(), b.as_str()) {\n                             pick = Some((a, b));\n                             break;\n                         }\n                     }\n                 }\n             }\n-            pick.or_else(|| pick_random_distinct(&pool))\n+            pick.or_else(|| pick_random_distinct_canonical(&pool))\n         }\n     };\n     let Some((left, right)) = selected else {\n@@ -1043,8 +1037,8 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n     };\n     let reduced = reduced_arc.read().await;\n     let content = content_for_room(&reduced, &room);\n-    let left_key = CanonicalItemUrl(left.clone());\n-    let right_key = CanonicalItemUrl(right.clone());\n+    let left_key = left.clone();\n+    let right_key = right.clone();\n     let lb = content.item_bodies.get(&left_key).cloned();\n     let rb = content.item_bodies.get(&right_key).cloned();\n     let th: Vec<String> = content\n@@ -1058,8 +1052,8 @@ async fn rpc_get_pair(state: &AppState, room: String, parent_path: String) -> Re\n         .collect();\n     let cs = compute_connectivity_stats(&content.ranking_group, &pool);\n     Ok(RpcResult::Pair(PairResponse {\n-        left: GardenItemUrl::from_storage_str(&left, &room),\n-        right: GardenItemUrl::from_storage_str(&right, &room),\n+        left: GardenItemUrl::from_stored(&left, &room),\n+        right: GardenItemUrl::from_stored(&right, &room),\n         left_body: lb,\n         right_body: rb,\n         threads: th,\n@@ -1554,7 +1548,7 @@ pub async fn handle_rpc_batch(\n                     for r in items {\n                         let pct = want_percent.then(|| ((r.score - bot) / range * 100.0).clamp(0.0, 100.0));\n                         ranked.push(RankRow {\n-                            item: GardenItemUrl::from_storage_str(r.item.as_str(), &room),\n+                            item: GardenItemUrl::from_stored(&r.item, &room),\n                             score: r.score,\n                             percent: pct,\n                         });\n@@ -1562,11 +1556,11 @@ pub async fn handle_rpc_batch(\n                 }\n \n                 let ranked_total = ranked.len();\n-                let mut unranked: Vec<String> = content\n+                let mut unranked: Vec<CanonicalItemUrl> = content\n                     .items\n                     .iter()\n                     .filter(|it| !group.item_to_idx.contains_key(*it))\n-                    .map(|it| it.as_str().to_string())\n+                    .cloned()\n                     .collect();\n                 unranked.sort();\n                 let unranked_total = unranked.len();\n@@ -1574,7 +1568,7 @@ pub async fn handle_rpc_batch(\n                 let page: Vec<RankRow> = ranked\n                     .into_iter()\n                     .chain(unranked.into_iter().map(|it| RankRow {\n-                        item: GardenItemUrl::from_storage_str(&it, &room),\n+                        item: GardenItemUrl::from_stored(&it, &room),\n                         score: 0.0,\n                         percent: want_percent.then_some(0.0),\n                     }))\n@@ -1722,7 +1716,7 @@ pub async fn handle_rpc_batch(\n                     .filter(|p| !parents.contains(p.as_str()))\n                     .map(|p| GardenItemUrl::from_stored(p, &room))\n                     .collect();\n-                paths.sort_by(|a, b| a.as_str().cmp(b.as_str()));\n+                paths.sort();\n                 line_ok(RpcResult::Leaves(LeavesResponse { paths }))\n                 }\n             },\ndiff --git a/server/src/api/validate.rs b/server/src/api/validate.rs\nindex a51c783ee9785569b5a44c0b1572471fe00d174b..3c7aa80fd485cf247231fe5c5c7e6fea62f22534 100644\n--- a/server/src/api/validate.rs\n+++ b/server/src/api/validate.rs\n@@ -52,7 +52,7 @@ pub fn validate_ingest_document(\n     };\n \n     let ts = super::helpers::now_ms();\n-    let mut defined_in_doc: HashSet<String> = HashSet::new();\n+    let mut defined_in_doc: HashSet<CanonicalItemUrl> = HashSet::new();\n \n     for s in &doc.statements {\n         match s {\n@@ -66,14 +66,14 @@ pub fn validate_ingest_document(\n                 let Some(body_text) = body else {\n                     return Err((\n                         StatusCode::BAD_REQUEST,\n-                        format!(\"item missing body: {}\", GardenItemUrl::from_storage_str(&item, room_wire)),\n+                        format!(\"item missing body: {}\", GardenItemUrl::from_stored(&item, room_wire)),\n                         Some(\"items must be declared with bodies, e.g. `~/path/item { ... }`\".to_string()),\n                     ));\n                 };\n                 if body_text.trim().is_empty() {\n                     return Err((\n                         StatusCode::BAD_REQUEST,\n-                        format!(\"item body is empty: {}\", GardenItemUrl::from_storage_str(&item, room_wire)),\n+                        format!(\"item body is empty: {}\", GardenItemUrl::from_stored(&item, room_wire)),\n                         Some(\"write at least one sentence inside `{ ... }`\".to_string()),\n                     ));\n                 }\n@@ -102,11 +102,8 @@ pub fn validate_ingest_document(\n                 };\n                 let missing: Vec<String> = [&a, &b]\n                     .into_iter()\n-                    .filter(|it| {\n-                        let key = CanonicalItemUrl((*it).clone());\n-                        !defined_in_doc.contains(*it) && !item_exists(&key)\n-                    })\n-                    .map(|it| GardenItemUrl::from_storage_str(it, room_wire).into_inner())\n+                    .filter(|it| !defined_in_doc.contains(*it) && !item_exists(it))\n+                    .map(|it| GardenItemUrl::from_stored(it, room_wire).into_inner())\n                     .collect();\n                 if !missing.is_empty() {\n                     return Err((\n@@ -120,11 +117,8 @@ pub fn validate_ingest_document(\n                 }\n                 let missing_body: Vec<String> = [&a, &b]\n                     .into_iter()\n-                    .filter(|it| {\n-                        let key = CanonicalItemUrl((*it).clone());\n-                        !defined_in_doc.contains(*it) && !body_exists(&key)\n-                    })\n-                    .map(|it| GardenItemUrl::from_storage_str(it, room_wire).into_inner())\n+                    .filter(|it| !defined_in_doc.contains(*it) && !body_exists(it))\n+                    .map(|it| GardenItemUrl::from_stored(it, room_wire).into_inner())\n                     .collect();\n                 if !missing_body.is_empty() {\n                     return Err((\ndiff --git a/server/src/html/editor.rs b/server/src/html/editor.rs\nindex ecdd226b1b17d5f11d1b79f99add5759ef918281..26d648d7c8d6e5d53ce5ed7a051b44856fca2fcf 100644\n--- a/server/src/html/editor.rs\n+++ b/server/src/html/editor.rs\n@@ -130,8 +130,8 @@ pub async fn editor_check(\n                 for s in &v.doc.statements {\n                     if let crate::dsl::Stmt::Vote { item1, item2, .. } = s {\n                         if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) {\n-                            if let Some(p) = crate::path_types::CanonicalItemUrl::parse(&a).and_then(|c| c.parent()) { parents.insert(p); }\n-                            if let Some(p) = crate::path_types::CanonicalItemUrl::parse(&b).and_then(|c| c.parent()) { parents.insert(p); }\n+                            if let Some(p) = a.parent() { parents.insert(p); }\n+                            if let Some(p) = b.parent() { parents.insert(p); }\n                         }\n                     }\n                 }\ndiff --git a/types/src/paths.rs b/types/src/paths.rs\nindex 2950a7502255927583fbacdfd2adb700f0b0c221..839684dfa0ecdd6c2572e2d8132ecee4d5c41bf8 100644\n--- a/types/src/paths.rs\n+++ b/types/src/paths.rs\n@@ -3,6 +3,7 @@\n \n use std::borrow::Borrow;\n use std::fmt;\n+use std::ops::Deref;\n \n use serde::{Deserialize, Serialize};\n \n@@ -319,6 +320,14 @@ impl fmt::Display for GardenItemUrl {\n     }\n }\n \n+impl Deref for GardenItemUrl {\n+    type Target = str;\n+\n+    fn deref(&self) -> &Self::Target {\n+        &self.0\n+    }\n+}\n+\n fn garden_href_string(item: &str, room_wire: &str) -> String {\n     let room = room_wire.trim();\n     if room.is_empty() || room == \"public\" {\n@@ -386,6 +395,14 @@ impl fmt::Display for ForumThreadUrl {\n     }\n }\n \n+impl Deref for ForumThreadUrl {\n+    type Target = str;\n+\n+    fn deref(&self) -> &Self::Target {\n+        &self.0\n+    }\n+}\n+\n /// `~/a/b` style path for list UIs (paths index `path` field).\n #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]\n #[serde(transparent)]\n@@ -412,6 +429,14 @@ impl fmt::Display for TildeOntologyPath {\n     }\n }\n \n+impl Deref for TildeOntologyPath {\n+    type Target = str;\n+\n+    fn deref(&self) -> &Self::Target {\n+        &self.0\n+    }\n+}\n+\n #[cfg(test)]\n mod tests {\n     use super::*;\n@@ -452,6 +477,13 @@ mod tests {\n         assert_eq!(c.tilde_segments(), Vec::<&str>::new());\n     }\n \n+    #[test]\n+    fn garden_item_url_deref_to_str() {\n+        let g = GardenItemUrl::from_storage_str(\"https://slug.social/~/x\", \"public\");\n+        let s: &str = &*g;\n+        assert_eq!(s, \"https://slug.social/~/x\");\n+    }\n+\n     #[test]\n     fn garden_public_passthrough_https() {\n         let u = \"https://slug.social/~/a/b\";\n","role":"user"}],"model":"~x-ai/grok-latest"}