{"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[8d5328d3] -theme\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex 82b2aa51d21ada1d0d849d3ddfc3a81e4241d861..e74e42e0f0ffc4224f5ef5421b486a5f35434999 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -73,11 +73,7 @@ pub async fn post_ui_html(\n                     ensure_partial_tree(&mut tree, &item);\n                 }\n                 let _ = state.ensure_node(&item).await;\n-                let dest = if item.is_root() {\n-                    \"/\".to_string()\n-                } else {\n-                    format!(\"/?item={}\", item.as_str())\n-                };\n+                let dest = item.browse_href();\n                 JsBuilder::new()\n                     .raw(&format!(\n                         \"window.location.href={};\",\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex c973cb718ac74b95570dabea76e24459417790b9..a8353c6de0cd6d268219e552b7ca1ba4e3000585 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -1,13 +1,10 @@\n use axum::{\n     body::Body,\n     extract::{Path, State},\n-    http::{header, HeaderValue, StatusCode, Uri},\n+    http::{header, StatusCode, Uri},\n     response::{IntoResponse, Response},\n-    Form,\n };\n-use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup, DOCTYPE};\n-use serde::Deserialize;\n \n use crate::{\n     form_template::template_json_compact,\n@@ -15,96 +12,25 @@ use crate::{\n     path_types::ItemId,\n     ranking::{top_bottom, RankedItem},\n     reducer::{GroupState, NodeState},\n-    state::{parse_item_param, AppState},\n+    state::AppState,\n     ui_action::UI_RPC_FIELD,\n };\n \n-const THEME_DEFAULT_CSS: &str = include_str!(\"../../static/theme_default.css\");\n-const THEME_RETRO_CSS: &str = include_str!(\"../../static/theme_retro.css\");\n+const SORTER_CSS: &str = include_str!(\"../../static/sorter.css\");\n const SORTER_UI_JS: &str = include_str!(\"../../static/sorter_ui.js\");\n \n-pub const SORTER_THEME_COOKIE: &str = \"sorter-theme\";\n-\n-pub fn normalize_theme(raw: &str) -> &'static str {\n-    match raw {\n-        \"retro\" => \"retro\",\n-        _ => \"default\",\n-    }\n-}\n-\n-pub fn theme_from_jar(jar: &CookieJar) -> &'static str {\n-    jar.get(SORTER_THEME_COOKIE)\n-        .map(|c| normalize_theme(c.value()))\n-        .unwrap_or(\"default\")\n-}\n-\n-pub fn theme_next_from_uri(uri: &Uri) -> String {\n-    uri.path_and_query()\n-        .map(|pq| pq.as_str().to_string())\n-        .filter(|s| !s.is_empty())\n-        .unwrap_or_else(|| \"/\".to_string())\n-}\n-\n-pub fn theme_cookie_header_value(theme: &str) -> HeaderValue {\n-    let t = normalize_theme(theme);\n-    let s = format!(\"{SORTER_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000\");\n-    HeaderValue::from_str(&s).expect(\"theme cookie must be ASCII\")\n-}\n-\n-fn sanitize_theme_next(next: Option<&str>) -> String {\n-    let s = next.unwrap_or(\"/\").trim();\n-    if s.starts_with('/') && !s.starts_with(\"//\") && s.len() < 8192 {\n-        s.to_string()\n-    } else {\n-        \"/\".to_string()\n-    }\n-}\n-\n-#[derive(Debug, Deserialize)]\n-pub struct ThemeForm {\n-    theme: String,\n-    next: Option<String>,\n-}\n-\n-pub async fn post_theme(Form(form): Form<ThemeForm>) -> impl IntoResponse {\n-    let theme = normalize_theme(&form.theme);\n-    let next = sanitize_theme_next(form.next.as_deref());\n-    let loc =\n-        HeaderValue::try_from(next.as_str()).unwrap_or_else(|_| HeaderValue::from_static(\"/\"));\n-    Response::builder()\n-        .status(StatusCode::SEE_OTHER)\n-        .header(header::LOCATION, loc)\n-        .header(header::SET_COOKIE, theme_cookie_header_value(theme))\n-        .body(Body::empty())\n-        .expect(\"theme redirect response\")\n-}\n-\n pub async fn serve_static(Path(filename): Path<String>) -> impl IntoResponse {\n-    if filename == \"sorter_ui.js\" {\n-        return Response::builder()\n-            .status(StatusCode::OK)\n-            .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n-            .header(header::CACHE_CONTROL, \"public, max-age=3600\")\n-            .body(SORTER_UI_JS.to_string())\n-            .unwrap()\n-            .into_response();\n-    }\n-\n-    let theme = filename\n-        .strip_prefix(\"theme_\")\n-        .and_then(|s| s.strip_suffix(\".css\"));\n-\n-    let css = match theme {\n-        Some(\"default\") => THEME_DEFAULT_CSS,\n-        Some(\"retro\") => THEME_RETRO_CSS,\n+    let (content_type, body) = match filename.as_str() {\n+        \"sorter.css\" => (\"text/css; charset=utf-8\", SORTER_CSS),\n+        \"sorter_ui.js\" => (\"text/javascript; charset=utf-8\", SORTER_UI_JS),\n         _ => return (StatusCode::NOT_FOUND, \"static file not found\").into_response(),\n     };\n \n     Response::builder()\n         .status(StatusCode::OK)\n-        .header(header::CONTENT_TYPE, \"text/css; charset=utf-8\")\n+        .header(header::CONTENT_TYPE, content_type)\n         .header(header::CACHE_CONTROL, \"public, max-age=3600\")\n-        .body(css.to_string())\n+        .body(body.to_string())\n         .unwrap()\n         .into_response()\n }\n@@ -162,8 +88,7 @@ fn asset_version() -> &'static str {\n     V.get_or_init(|| {\n         use std::hash::{Hash, Hasher};\n         let mut h = std::collections::hash_map::DefaultHasher::new();\n-        THEME_DEFAULT_CSS.hash(&mut h);\n-        THEME_RETRO_CSS.hash(&mut h);\n+        SORTER_CSS.hash(&mut h);\n         SORTER_UI_JS.hash(&mut h);\n         format!(\"{:x}\", h.finish())\n     })\n@@ -176,9 +101,9 @@ pub fn now_ms() -> i64 {\n     t.as_millis() as i64\n }\n \n-fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) -> Markup {\n+fn layout(title: &str, body: Markup, views: u64) -> Markup {\n     let ver = asset_version();\n-    let css_href = format!(\"/static/theme_{theme}.css?v={ver}\");\n+    let css_href = format!(\"/static/sorter.css?v={ver}\");\n     let js_src = format!(\"/static/sorter_ui.js?v={ver}\");\n     html! {\n         (DOCTYPE)\n@@ -187,7 +112,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n                 meta charset=\"utf-8\";\n                 meta name=\"viewport\" content=\"width=device-width, initial-scale=1\";\n                 title { (title) }\n-                link rel=\"stylesheet\" href=(css_href) id=\"theme-stylesheet\";\n+                link rel=\"stylesheet\" href=(css_href);\n                 script src=\"https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js\" {}\n             }\n             body class=\"home\" {\n@@ -196,21 +121,6 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n                 }\n                 div id=\"errors\" {}\n                 (body)\n-                div id=\"controls\" {\n-                    a href=\"https://github.com/sortersocial/sorter2\" id=\"src-link\" { \"src\" }\n-                    form id=\"sorter-theme-form\" method=\"post\" action=\"/theme\" data-navigate=\"full\" {\n-                        input type=\"hidden\" name=\"next\" value=(theme_next);\n-                        select id=\"theme-select\" name=\"theme\" onchange=\"this.form.submit()\" aria-label=\"Theme\" {\n-                            @for (val, label) in [(\"default\", \"default\"), (\"retro\", \"retro\")] {\n-                                @if theme == val {\n-                                    option value=(val) selected { (label) }\n-                                } @else {\n-                                    option value=(val) { (label) }\n-                                }\n-                            }\n-                        }\n-                    }\n-                }\n                 script src=(js_src) {}\n             }\n         }\n@@ -218,11 +128,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n }\n \n fn item_href(id: &ItemId) -> String {\n-    if id.is_root() {\n-        \"/\".to_string()\n-    } else {\n-        format!(\"/?item={}\", id.as_str())\n-    }\n+    id.browse_href()\n }\n \n fn segment_label(seg: &str) -> &str {\n@@ -361,39 +267,10 @@ pub fn vote_panel(parent: &ItemId) -> Markup {\n }\n \n \n-fn query_param(uri: &Uri, key: &str) -> Option<String> {\n-    let q = uri.query()?;\n-    q.split('&').find_map(|pair| {\n-        let mut it = pair.splitn(2, '=');\n-        if it.next()? == key {\n-            Some(it.next().unwrap_or(\"\").to_string())\n-        } else {\n-            None\n-        }\n-    })\n-}\n-\n-pub async fn home(\n-    State(state): State<AppState>,\n-    jar: CookieJar,\n-    uri: Uri,\n-) -> impl IntoResponse {\n+async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n     let path = uri.path().to_string();\n     state.views.increment(path.clone());\n     let views = state.views.get_views(&path);\n-    let theme = theme_from_jar(&jar);\n-    let theme_next = theme_next_from_uri(&uri);\n-\n-    let item_raw = query_param(&uri, \"item\")\n-        .or_else(|| query_param(&uri, \"sub\").map(|sub| {\n-            if sub.is_empty() {\n-                String::new()\n-            } else {\n-                format!(\"reddit.com/r/{sub}\")\n-            }\n-        }))\n-        .unwrap_or_default();\n-    let item = parse_item_param(&item_raw);\n \n     let tree = state.tree.read().await;\n     let empty_node = NodeState::default();\n@@ -408,5 +285,14 @@ pub async fn home(\n         (vote_panel(&item))\n         (ranking_panel(&item, group))\n     };\n-    layout(\"sorter2\", body, views, theme, &theme_next)\n+    layout(\"sorter2\", body, views)\n+}\n+\n+pub async fn home(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {\n+    item_page(state, uri, ItemId::root()).await\n+}\n+\n+pub async fn browse(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {\n+    let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n+    item_page(state, uri, item).await\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 14e7cfbc38feb5d07aff859b64bce6e2ec45cf91..cd56743192919cf4dcea539b3d8873a21fb7e72b 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -30,9 +30,9 @@ pub fn create_app(state: AppState) -> Router {\n     Router::new()\n         .route(\"/healthz\", get(|| async { \"ok\" }))\n         .route(\"/static/:filename\", get(crate::html::serve_static))\n+        .route(\"/~/*item_path\", get(crate::html::browse))\n         .route(\"/\", get(crate::html::home))\n         .route(\"/ui\", post(crate::api::ui_html::post_ui_html))\n-        .route(\"/theme\", post(crate::html::post_theme))\n         .with_state(state)\n         .layer(TraceLayer::new_for_http())\n }\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex b5c41444f7bcd4d8d289ed3af464bc3f14d0df99..12dce9888f5cd4e1a0974d12d6468368d0f775b9 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -90,6 +90,50 @@ impl ItemId {\n         paths\n     }\n \n+    /// Full URL for the browser location bar after `/~/`.\n+    pub fn to_browse_url(&self) -> String {\n+        if self.is_root() {\n+            return String::new();\n+        }\n+        if self.as_str().contains(\"://\") {\n+            return self.as_str().to_string();\n+        }\n+        if self\n+            .segments()\n+            .first()\n+            .is_some_and(|s| s.contains('.'))\n+        {\n+            format!(\"https://{}\", self.as_str())\n+        } else {\n+            self.as_str().to_string()\n+        }\n+    }\n+\n+    /// App route, e.g. `/~/https://reddit.com/r/rust`.\n+    pub fn browse_href(&self) -> String {\n+        if self.is_root() {\n+            \"/\".to_string()\n+        } else {\n+            format!(\"/~/{}\", self.to_browse_url())\n+        }\n+    }\n+\n+    /// Parse the tail after `/~/` in a request path.\n+    pub fn from_browse_tail(tail: &str) -> ItemId {\n+        let raw = normalize_browse_tail(tail);\n+        if raw.is_empty() {\n+            return ItemId::root();\n+        }\n+        ItemId::from_url(&raw)\n+            .or_else(|| ItemId::parse(&raw))\n+            .unwrap_or_else(|| ItemId::opaque(raw))\n+    }\n+\n+    pub fn from_browse_uri(path: &str) -> Option<ItemId> {\n+        path.strip_prefix(\"/~/\")\n+            .map(ItemId::from_browse_tail)\n+    }\n+\n     fn canonicalize(raw: &str) -> Option<String> {\n         let s = raw.trim();\n         if s.is_empty() {\n@@ -155,6 +199,21 @@ fn normalize_host(host: &str) -> String {\n     }\n }\n \n+fn normalize_browse_tail(tail: &str) -> String {\n+    let t = tail.trim();\n+    if t.is_empty() {\n+        return String::new();\n+    }\n+    // Some HTTP stacks collapse `https://` → `https:/` inside a path segment.\n+    if t.starts_with(\"https:/\") && !t.starts_with(\"https://\") {\n+        return format!(\"https://{}\", &t[7..]);\n+    }\n+    if t.starts_with(\"http:/\") && !t.starts_with(\"http://\") {\n+        return format!(\"http://{}\", &t[6..]);\n+    }\n+    t.to_string()\n+}\n+\n fn normalize_reddit_host_path(s: &str) -> String {\n     let (host, path) = s.split_once('/').unwrap_or((s, \"\"));\n     let host = normalize_host(host);\n@@ -252,4 +311,22 @@ mod tests {\n         );\n         assert!(ItemId::from_legacy_scope(\"\").is_root());\n     }\n+\n+    #[test]\n+    fn browse_href_wraps_canonical_path() {\n+        let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+        assert_eq!(id.browse_href(), \"/~/https://reddit.com/r/rust\");\n+    }\n+\n+    #[test]\n+    fn from_browse_tail_parses_full_url() {\n+        let id = ItemId::from_browse_tail(\"https://reddit.com/r/AmITheAsshole\");\n+        assert_eq!(id.as_str(), \"reddit.com/r/amitheasshole\");\n+    }\n+\n+    #[test]\n+    fn from_browse_uri_strips_prefix() {\n+        let id = ItemId::from_browse_uri(\"/~/https://reddit.com/r/rust\").unwrap();\n+        assert_eq!(id.as_str(), \"reddit.com/r/rust\");\n+    }\n }\ndiff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js\nindex 9c475d8e076ba527aaf7a25c177d0d651bd46ca9..d9b016f197547f37ca4b2bcdd7ee6b673d0fb3f0 100644\n--- a/server/static/sorter_ui.js\n+++ b/server/static/sorter_ui.js\n@@ -24,7 +24,6 @@\n       var f = e.target;\n       if (!f || f.tagName !== 'FORM') return;\n       if ((f.method || 'get').toLowerCase() !== 'post') return;\n-      if (f.id === 'sorter-theme-form') return;\n       if (f.getAttribute('data-navigate') === 'full') return;\n       e.preventDefault();\n       await postUiForm(f);\ndiff --git a/server/static/theme_default.css b/server/static/theme_default.css\ndeleted file mode 100644\nindex 1bf8ac7a25207336c019f93cd4119bd0e06229f0..0000000000000000000000000000000000000000\n--- a/server/static/theme_default.css\n+++ /dev/null\n@@ -1,186 +0,0 @@\n-:root {\n-  --bg: #0f1115;\n-  --fg: #e8eaed;\n-  --muted: #9aa0a6;\n-  --accent: #7cacf8;\n-  --panel: #1a1d24;\n-  --border: #2a2f3a;\n-}\n-\n-* {\n-  box-sizing: border-box;\n-}\n-\n-body {\n-  margin: 0;\n-  font-family: system-ui, -apple-system, sans-serif;\n-  background: var(--bg);\n-  color: var(--fg);\n-  line-height: 1.5;\n-}\n-\n-.muted {\n-  color: var(--muted);\n-}\n-\n-.small {\n-  font-size: 0.875rem;\n-}\n-\n-.view-meta {\n-  position: fixed;\n-  top: 0.5rem;\n-  right: 0.5rem;\n-  font-size: 0.75rem;\n-}\n-\n-#controls {\n-  position: fixed;\n-  bottom: 0;\n-  left: 0;\n-  right: 0;\n-  display: flex;\n-  gap: 1rem;\n-  align-items: center;\n-  padding: 0.75rem 1rem;\n-  background: var(--panel);\n-  border-top: 1px solid var(--border);\n-  font-size: 0.875rem;\n-}\n-\n-#controls a {\n-  color: var(--accent);\n-}\n-\n-.demo-panel {\n-  max-width: 40rem;\n-  margin: 4rem auto 6rem;\n-  padding: 2rem;\n-  background: var(--panel);\n-  border: 1px solid var(--border);\n-  border-radius: 8px;\n-}\n-\n-.demo-panel h1 {\n-  margin-top: 0;\n-}\n-\n-.btn-primary {\n-  background: var(--accent);\n-  color: #0f1115;\n-  border: none;\n-  padding: 0.5rem 1rem;\n-  border-radius: 4px;\n-  font-size: 1rem;\n-  cursor: pointer;\n-}\n-\n-.btn-primary:hover {\n-  filter: brightness(1.1);\n-}\n-\n-code {\n-  font-size: 0.85em;\n-  background: var(--bg);\n-  padding: 0.1em 0.35em;\n-  border-radius: 3px;\n-}\n-\n-.vote-fields {\n-  display: flex;\n-  flex-direction: column;\n-  gap: 0.75rem;\n-  margin-bottom: 1rem;\n-}\n-\n-.vote-fields label {\n-  display: flex;\n-  flex-direction: column;\n-  gap: 0.25rem;\n-}\n-\n-.vote-fields input {\n-  padding: 0.4rem 0.5rem;\n-  border: 1px solid var(--border);\n-  border-radius: 4px;\n-  background: var(--bg);\n-  color: var(--fg);\n-}\n-\n-.rank-list {\n-  margin: 0;\n-  padding-left: 0;\n-  list-style: none;\n-}\n-\n-.rank-list li {\n-  margin-bottom: 0.35rem;\n-}\n-\n-.rank-num {\n-  color: var(--muted);\n-}\n-\n-#parser-input {\n-  width: 100%;\n-  padding: 0.5rem;\n-  border: 1px solid var(--border);\n-  border-radius: 4px;\n-  background: var(--bg);\n-  color: var(--fg);\n-  font-size: 1rem;\n-  font-family: inherit;\n-  resize: vertical;\n-}\n-\n-#parser-form .btn-primary {\n-  margin-top: 0.5rem;\n-}\n-\n-.breadcrumbs {\n-  font-size: 0.875rem;\n-  margin-bottom: 1rem;\n-  color: var(--muted);\n-}\n-\n-.breadcrumbs a {\n-  color: var(--accent);\n-  text-decoration: none;\n-}\n-\n-.breadcrumbs a:hover {\n-  text-decoration: underline;\n-}\n-\n-.breadcrumbs .separator {\n-  color: var(--muted);\n-}\n-\n-.rank-list a {\n-  color: var(--accent);\n-  text-decoration: none;\n-}\n-\n-.rank-list a:hover {\n-  text-decoration: underline;\n-}\n-\n-.entity-card h2 {\n-  margin-top: 0;\n-}\n-\n-.scope-name {\n-  color: var(--accent);\n-  font-weight: 600;\n-}\n-\n-.rank-heading {\n-  margin: 0.75rem 0 0.25rem;\n-  text-transform: uppercase;\n-  letter-spacing: 0.04em;\n-}\n-\n-.rank-gap {\n-  text-align: center;\n-  margin: 0.25rem 0;\n-}\ndiff --git a/server/static/theme_retro.css b/server/static/theme_retro.css\ndeleted file mode 100644\nindex ceee99494b873a6e658857be97f02ee739db85e9..0000000000000000000000000000000000000000\n--- a/server/static/theme_retro.css\n+++ /dev/null\n@@ -1,5 +0,0 @@\n-@import url(\"/static/theme_default.css\");\n-\n-:root {\n-  --accent: #f4a261;\n-}\ndiff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs\nindex f7ac9c26bf9f9277ad5f5708603224c095165fb8..df7d9ab357531c5146d0b326c149fdaa6b531a4a 100644\n--- a/server/tests/integration_ui.rs\n+++ b/server/tests/integration_ui.rs\n@@ -70,6 +70,22 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() {\n     assert_eq!(ranked[0].item.as_str(), \"alpha\");\n }\n \n+#[tokio::test]\n+async fn browse_url_renders_subreddit_page() {\n+    let (addr, _tmp) = start_test_server().await;\n+    let client = reqwest::Client::new();\n+    let html = client\n+        .get(format!(\"http://{addr}/~/https://reddit.com/r/rust\"))\n+        .send()\n+        .await\n+        .unwrap()\n+        .text()\n+        .await\n+        .unwrap();\n+    assert!(html.contains(\"ranking-panel\"));\n+    assert!(html.contains(\"/~/https://reddit.com/r/rust\"));\n+}\n+\n #[tokio::test]\n async fn post_ui_parse_query_redirects_to_subreddit() {\n     let (addr, _tmp) = start_test_server().await;\n@@ -93,5 +109,5 @@ async fn post_ui_parse_query_redirects_to_subreddit() {\n         .unwrap();\n \n     assert!(body.contains(\"window.location.href\"));\n-    assert!(body.contains(\"/?item=reddit.com/r/rust\"));\n+    assert!(body.contains(\"/~/https://reddit.com/r/rust\"));\n }\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"}