{"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[0728c06a] Vote pool: use display_path in hrefs; test all 45 pairs + assert ranking.\n\n- vote_compare_href and vote_pool_href now encode ~/… and -/… as their\n short display forms (not the full https://slug.social/… storage URL),\n matching what users see in the item display and DSL.\n- Rewrite browser_vote_pool test to vote all C(10,2)=45 pairs in the\n pool, always preferring the alphabetically-earlier letter, then query\n GetGardenRank and assert the 10 items form one component ranked a→j.\n\nCo-Authored-By: Claude Sonnet 4.6 \n\nSide A — unified diff (full patch):\ndiff --git a/server/src/html/garden/vote.rs b/server/src/html/garden/vote.rs\nindex 2682cfcbd2f834b56459a02831aa225cffe67c58..d0ec78cd675eae284d056fb3b8eaf5cc853d6263 100644\n--- a/server/src/html/garden/vote.rs\n+++ b/server/src/html/garden/vote.rs\n@@ -234,8 +234,10 @@ pub(super) fn vote_compare_href(\n thread_override: Option<&str>,\n pool: Option<&ItemId>,\n ) -> String {\n- let left_q = urlencoding::encode(left.as_str());\n- let right_q = urlencoding::encode(right.as_str());\n+ let left_dp = left.display_path();\n+ let right_dp = right.display_path();\n+ let left_q = urlencoding::encode(&left_dp);\n+ let right_q = urlencoding::encode(&right_dp);\n let mut base = format!(\n \"{}/vote?left={}&right={}\",\n nav.room_path_prefix_for_vote_compare(),\n@@ -246,16 +248,20 @@ pub(super) fn vote_compare_href(\n base = format!(\"{}&thread={}\", base, urlencoding::encode(t));\n }\n if let Some(p) = pool {\n- base = format!(\"{}&pool={}\", base, urlencoding::encode(p.as_str()));\n+ let pool_dp = p.display_path();\n+ base = format!(\"{}&pool={}\", base, urlencoding::encode(&pool_dp));\n }\n base\n }\n \n pub(super) fn vote_pool_href(nav: &ThreadNav, pool_item_str: &str) -> String {\n+ let display = ItemId::parse(pool_item_str)\n+ .map(|i| i.display_path())\n+ .unwrap_or_else(|| pool_item_str.to_string());\n format!(\n \"{}/vote?pool={}\",\n nav.room_path_prefix_for_vote_compare(),\n- urlencoding::encode(pool_item_str)\n+ urlencoding::encode(&display)\n )\n }\n \ndiff --git a/test/browser_vote_pool.clj b/test/browser_vote_pool.clj\nindex d51f05db47dc3cb013e56e65f3a1edfbbcbd96ab..23d0bd80b02bd8b1b48853454bed02793296550e 100644\n--- a/test/browser_vote_pool.clj\n+++ b/test/browser_vote_pool.clj\n@@ -1,6 +1,8 @@\n (ns test.browser-vote-pool\n- \"Pool-scoped voting: seed ~/pool/a-j, enter via /vote?pool=~/pool, follow\n- the vote → next-pair → vote sequence until no next pair or 15 iterations.\"\n+ \"Pool-scoped voting: seed ~/pool/a-j (10 letters), follow the\n+ vote → next-pair sequence for all C(10,2)=45 pairs voting the\n+ alphabetically-earlier item each time, then assert the garden\n+ ranking is a…j in order.\"\n (:require [babashka.fs :as fs]\n [cheshire.core :as json]\n [clojure.string :as str]\n@@ -11,26 +13,38 @@\n [test.common :as common]\n [test.oauth :as oauth]))\n \n+(def letters [\"a\" \"b\" \"c\" \"d\" \"e\" \"f\" \"g\" \"h\" \"i\" \"j\"])\n+(def total-pairs (/ (* (count letters) (dec (count letters))) 2)) ; C(10,2) = 45\n+\n (defn- wait-for-text [pg selector expected timeout-ms]\n (let [deadline (+ (System/currentTimeMillis) timeout-ms)]\n (loop []\n- (let [text (locator/text-content (page/locator pg selector))]\n+ (let [text (try (locator/text-content (page/locator pg selector)) (catch Exception _ nil))]\n (if (and (string? text) (str/includes? text expected))\n true\n (if (< (System/currentTimeMillis) deadline)\n- (do (Thread/sleep 200) (recur))\n+ (do (Thread/sleep 150) (recur))\n false))))))\n \n (defn- element-text [pg selector]\n- (try (locator/text-content (page/locator pg selector)) (catch Exception _ nil)))\n+ (try (locator/text-content (page/locator pg selector)) (catch Exception _ \"\")))\n \n (defn- enc [^String s]\n (java.net.URLEncoder/encode s \"UTF-8\"))\n \n-(def letters [\"a\" \"b\" \"c\" \"d\" \"e\" \"f\" \"g\" \"h\" \"i\" \"j\"])\n+;; Extract the terminal path segment, e.g. \"~/pool/c\" → \"c\".\n+(defn- leaf [path] (last (str/split path #\"/\")))\n+\n+;; Set the hidden ratio inputs so the alphabetically-earlier item wins.\n+(defn- set-ratio! [pg left-text right-text]\n+ (let [[rl rr] (if (neg? (compare (leaf left-text) (leaf right-text)))\n+ [100 0] ; left is earlier → prefer left\n+ [0 100])] ; right is earlier → prefer right\n+ (page/evaluate pg (str \"document.getElementById('vote-ratio-left').value='\" rl \"'\"))\n+ (page/evaluate pg (str \"document.getElementById('vote-ratio-right').value='\" rr \"'\"))))\n \n (defn vote-pool-flow! []\n- (println \"\\n━━━ browser vote pool (/vote?pool= seeds + follow next-pair sequence) ━━━\\n\")\n+ (println (str \"\\n━━━ browser vote pool (all \" total-pairs \" pairs → sorted ranking) ━━━\\n\"))\n \n (common/letlocals\n (bind build (common/run-cargo-build-release! [\"slugsocial-server\"]))\n@@ -54,7 +68,6 @@\n \n (let [alice-token (oauth/fetch-bearer-token! base-url :username \"alice\")\n thread-tag \"browser-vote-pool\"\n- ;; seed ~/pool/a through ~/pool/j as items with bodies\n item-lines (str/join \"\\n\"\n (map (fn [l] (str \"~/pool/\" l \" {\" l \"}\")) letters))\n raw (str \"# \" thread-tag \"\\n\\n~/pool {root}\\n\" item-lines \"\\n\")\n@@ -77,51 +90,57 @@\n (page/navigate pg (str base-url \"/login\"))\n (is (wait-for-text pg \"body\" \"@alice\" 15000) \"alice session after login\")\n \n- ;; Enter via pool URL — page picks first pair automatically.\n (page/navigate pg pool-url)\n (is (wait-for-text pg \"body.view-vote-compare\" \"compare\" 15000)\n \"pool entry: vote compare page loads\")\n \n- ;; Verify the initial pair is within the pool.\n- (let [pair-text (element-text pg \".vote-compare-pair\")]\n- (is (and (string? pair-text) (str/includes? pair-text \"~/pool/\"))\n- (str \"initial pair is within ~/pool: \" pair-text)))\n-\n- ;; Follow vote → next-pair sequence up to 15 iterations.\n- (let [votes-cast\n- (loop [i 0]\n- (if (>= i 15)\n- i\n- (let [explanation (str \"pool vote \" i \" reason\")]\n- (locator/fill (page/locator pg \"#vote-explain\") explanation)\n- (locator/click (page/locator pg \"#vote-compare-form button[type=submit]\"))\n- ;; Wait for edge history morph confirming the vote landed.\n- (if-not (wait-for-text pg \"ul.vote-edge-history\" explanation 20000)\n- (do (println \" vote\" i \"history morph timed out — stopping\")\n- i)\n- (let [has-next (wait-for-text pg \"[data-testid=\\\"vote-next-pair\\\"]\"\n- \"next pair\" 8000)]\n- (if-not has-next\n- ;; \"no next pair\" — pool exhausted.\n- (do (println \" no next pair after vote\" i \" — pool exhausted\")\n- (inc i))\n- (do\n- ;; Verify the pair on this page is within the pool before advancing.\n- (let [pt (element-text pg \".vote-compare-pair\")]\n- (is (and (string? pt) (str/includes? pt \"~/pool/\"))\n- (str \"pair at vote \" i \" is within ~/pool: \" pt)))\n- (locator/click (page/locator pg \"[data-testid=\\\"vote-next-pair\\\"]\"))\n- ;; Wait for next pair to load.\n- (wait-for-text pg \"body.view-vote-compare\" \"compare\" 10000)\n- (recur (inc i)))))))))]\n-\n- (is (>= votes-cast 1) (str \"cast at least 1 vote, got: \" votes-cast))\n- (println (str \" pool voting sequence complete: \" votes-cast \" vote(s) cast\")))\n-\n- ;; After the sequence, the current page is still a pool-scoped vote page.\n- (let [url (page/url pg)]\n- (is (str/includes? (or url \"\") \"/vote\")\n- (str \"still on /vote after sequence: \" url))))))))\n+ ;; Vote all 45 pairs, always preferring the alphabetically-earlier item.\n+ (loop [votes-cast 0]\n+ (when (< votes-cast total-pairs)\n+ (let [left-text (element-text pg \".vote-compare-left code\")\n+ right-text (element-text pg \".vote-compare-right code\")]\n+ (is (str/includes? left-text \"~/pool/\")\n+ (str \"vote \" votes-cast \": left is in pool: \" left-text))\n+ (is (str/includes? right-text \"~/pool/\")\n+ (str \"vote \" votes-cast \": right is in pool: \" right-text))\n+ (set-ratio! pg left-text right-text)\n+ (let [winner (if (neg? (compare (leaf left-text) (leaf right-text)))\n+ (leaf left-text) (leaf right-text))]\n+ (locator/fill (page/locator pg \"#vote-explain\")\n+ (str \"prefer \" winner)))\n+ (locator/click (page/locator pg \"#vote-compare-form button[type=submit]\"))\n+ (is (wait-for-text pg \"ul.vote-edge-history\" \"prefer \" 20000)\n+ (str \"vote \" votes-cast \" appears in edge history\"))\n+ (when (< (inc votes-cast) total-pairs)\n+ (is (wait-for-text pg \"[data-testid=\\\"vote-next-pair\\\"]\" \"next pair\" 8000)\n+ (str \"next pair available after vote \" votes-cast))\n+ (locator/click (page/locator pg \"[data-testid=\\\"vote-next-pair\\\"]\"))\n+ (is (wait-for-text pg \"body.view-vote-compare\" \"compare\" 10000)\n+ (str \"vote page loaded for pair \" (inc votes-cast))))\n+ (recur (inc votes-cast)))))\n+\n+ (println (str \" cast all \" total-pairs \" votes\"))\n+\n+ ;; Query the ranking via RPC and assert alphabetical order.\n+ (let [rank-resp (oauth/http-post-json\n+ (str base-url \"/api/v0/rpc\")\n+ [{\"GetGardenRank\" {\"room\" \"public\"\n+ \"parent_path\" \"~/pool\"}}]\n+ :headers {\"Authorization\" (str \"Bearer \" alice-token)})\n+ rank-json (json/parse-string (:body rank-resp) true)\n+ result (get-in rank-json [:results 0 :result :GardenRank])\n+ components (:components result)\n+ unranked (:unranked_items result)\n+ ranked (mapv :item (mapcat :ranking components))\n+ ranked-leaves (mapv #(last (str/split % #\"[/~]+\")) ranked)]\n+ (is (= 1 (count components))\n+ (str \"all 10 items form one connected component (got \" (count components) \")\"))\n+ (is (empty? unranked)\n+ (str \"no unranked items (got \" (count unranked) \")\"))\n+ (is (= 10 (count ranked))\n+ (str \"10 items ranked (got \" (count ranked) \")\"))\n+ (is (= letters ranked-leaves)\n+ (str \"ranking is alphabetical a→j (got \" ranked-leaves \")\"))))))))\n \n (finally\n (when-some [s @!server] (common/kill-server s))\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 for GardenItemUrl, ForumThreadUrl, TildeOntologyPath\n- resolve_item returns CanonicalItemUrl; validate uses HashSet\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 {\n+/// Resolve DSL/user input to a stored canonical item id.\n+pub fn resolve_item(item: &str) -> Result {\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 {\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> = 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 = 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 {\n- fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap> {\n+ fn build_positions(rankings: &crate::scope_rank::ChildrenRankings) -> HashMap> {\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 = before_pos.keys().cloned()\n+ let all_items: std::collections::BTreeSet = 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 {\n let scope = scope_from_room_wire(&room);\n let reduced_arc = state.reduced.clone();\n- let pool: Vec = {\n+ let pool: Vec = {\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 = 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 = 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 = 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 = ranked.iter().map(|r| r.item.as_str().to_string()).collect();\n- let unsorted: Vec = pool.iter()\n+ let ranked_set: HashSet = ranked.iter().map(|r| r.item.clone()).collect();\n+ let unsorted: Vec = 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 = if !ranked.is_empty() {\n- ranked.iter().map(|r| r.item.as_str().to_string()).collect()\n+ let mut candidates: Vec = 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 = 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 = content\n+ let mut unranked: Vec = 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 = 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 = HashSet::new();\n+ let mut defined_in_doc: HashSet = 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 = [&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 = [&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"}