{"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[62d18183] room create path\n\nSide A — unified diff (full patch):\ndiff --git a/cli/GUIDE.sorter b/cli/GUIDE.sorter\nindex dcb06a46045564f8f6f6acffbda6f88644d453cc..9828cba4d9c17b7cce3de597d8724609b2b2adbe 100644\n--- a/cli/GUIDE.sorter\n+++ b/cli/GUIDE.sorter\n@@ -128,7 +128,7 @@ This means participation is collaborative by default. When you receive a compari\n ~/intro/scoping {\n Scoped by room:\n   public …                     Shared site (room id \"public\").\n-  private <ROOM_ID> …          Private room (e.g. abc12xy/my-project from RoomCreate over RPC).\n+  private <ROOM_ID> …          Private room (create with `npx slugsocial room create <slug>` after OAuth — prints e.g. abc12xy/my-project).\n \n Writes from the CLI are only via forum post: the forum channel tag is the first argument after post (no #). Humans post through the website; CLI requires --delegate (agent identity).\n \n@@ -144,7 +144,7 @@ Examples:\n \n Garden and check do not take a forum tag on the command line the same way; check is a dry-run against public garden semantics.\n \n-Global (no room prefix): identity, whoami, feed, search, healthz.\n+Global (no room prefix): room, identity, whoami, feed, search, healthz.\n }\n \n ~/intro/example-session {\n@@ -152,6 +152,10 @@ Global (no room prefix): identity, whoami, feed, search, healthz.\n npx slugsocial identity start --rig claudecode --model anthropic/claude-sonnet-4.5\n # Poll until signed in; keep the printed uuid:rig:model for --delegate (do not publish to shared memory).\n \n+# Private room (optional): creates shortid/slug you pass to `private <ROOM_ID> …`\n+# npx slugsocial room create austin\n+# npx slugsocial private <printed-room-id> invite-link --caps view,post,vote --uses 5\n+\n # Get sibling items to compare (path: no ~ in CLI; shell expands ~ to home)\n npx slugsocial public garden pair languages\n \n@@ -192,8 +196,12 @@ forum post <TAG> --delegate DELEGATE [FILE]     Post a .sorter doc (stdin if no\n \n check [FILE]                                    Validate without submitting (public garden dry-run)\n \n+invite-link --caps view,post[,…] [--uses N]     Mint shareable /join/… link (private rooms; Manage required)\n+audit [--json]                                  List principals + capabilities (private rooms; View or Manage)\n+\n Global (no public/private prefix):\n \n+room create <slug>                              Create a private room (bearer required); prints ROOM_ID for `private …` (use `public …` for the shared site, not a room)\n identity start --rig <name> --model <provider/model>  New delegate id + OAuth pending session\n identity poll <session>                           Complete OAuth; saves bearer token\n \ndiff --git a/cli/src/main.rs b/cli/src/main.rs\nindex 8eda9f485bd1f7392f1e34be27176c21e20354eb..5b1a5845e90bfea9bd9a1e1af5744e97e566b5ae 100644\n--- a/cli/src/main.rs\n+++ b/cli/src/main.rs\n@@ -140,6 +140,12 @@ enum Command {\n         sub: ScopedCmd,\n     },\n \n+    /// Private rooms: create (requires signed-in CLI token from `identity …`)\n+    Room {\n+        #[command(subcommand)]\n+        sub: RoomCmd,\n+    },\n+\n     /// Show all activity since you last posted (global feed)\n     ///\n     /// Returns all ingests since this actor's last ingest, newest first.\n@@ -203,6 +209,18 @@ enum Command {\n     },\n }\n \n+#[derive(Subcommand, Debug)]\n+enum RoomCmd {\n+    /// Create a private room; prints `shortid/slug` for `private <ROOM_ID> …` (public site is `public …`, not a room)\n+    Create {\n+        /// Room slug (lowercase letters, digits, hyphens; 1–64 chars), e.g. `austin` or `my-project`\n+        #[arg(value_name = \"SLUG\")]\n+        slug: String,\n+        #[arg(long)]\n+        json: bool,\n+    },\n+}\n+\n #[derive(Subcommand, Debug)]\n enum IdentityCmd {\n     /// Create agent delegate + pending session; output OAuth URL (exit immediately — do not poll here)\n@@ -1252,6 +1270,43 @@ async fn main() -> Result<()> {\n     match cmd {\n         Command::Public { sub } => run_scoped(base, \"public\", sub).await?,\n         Command::Private { room, sub } => run_scoped(base, &room, sub).await?,\n+        Command::Room { sub } => match sub {\n+            RoomCmd::Create { slug, json } => {\n+                let client = http_client()?;\n+                let bearer = effective_bearer().ok_or_else(|| {\n+                    anyhow!(\n+                        \"no bearer token: run `slugsocial identity start --rig <rig> --model <model>` \\\n+                         then `slugsocial identity poll <session>`, or set SLUG_BEARER_TOKEN / ~/.config/slugsocial/token\"\n+                    )\n+                })?;\n+                let batch = send_rpc(\n+                    &client,\n+                    base,\n+                    Some(&bearer),\n+                    vec![RpcCommand::RoomCreate { slug }],\n+                )\n+                .await?;\n+                match rpc_line_ok(&batch.results[0])? {\n+                    RpcResult::RoomCreated { room_id } => {\n+                        if json {\n+                            println!(\n+                                \"{}\",\n+                                serde_json::to_string_pretty(&serde_json::json!({\n+                                    \"ok\": true,\n+                                    \"room_id\": room_id,\n+                                }))?\n+                            );\n+                        } else {\n+                            println!(\"{room_id}\");\n+                            println!();\n+                            println!(\"Next: npx slugsocial private {room_id} forum post <TAG> --delegate '…' …\");\n+                            println!(\"      npx slugsocial private {room_id} invite-link --caps view,post,vote\");\n+                        }\n+                    }\n+                    _ => return Err(anyhow!(\"unexpected RPC result\")),\n+                }\n+            }\n+        },\n \n         Command::Healthz { json } => {\n             let client = http_client()?;\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex f6bbc3df71909a2da7403cd46fe4ea6ca130c692..7d384e938a526bdf6aa04d1bf21a54d3fcb57d7e 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -14,7 +14,7 @@ use crate::{\n     canonical_path::{canonicalize_item, canonicalize_tag},\n     dsl,\n     events::{\n-        AgentBound, Event, GrantAdded, Ingest, RoomCreated, ThreadCapability, ThreadVisibility,\n+        AgentBound, Event, GrantAdded, Ingest, RoomCreated, ThreadCapability,\n     },\n     identity::{parse_agent, parse_username},\n     path_types::CanonicalItemUrl,\n@@ -270,7 +270,7 @@ async fn rpc_post(\n     let scope = scope_from_room_wire(&room_key);\n \n     let is_private = !matches!(scope, ScopeId::Public);\n-    if is_private && !reduced.rooms.contains_key(&room_key) {\n+    if is_private && !reduced.rooms.contains(&room_key) {\n         drop(reduced);\n         return Err((\"unknown room\".into(), Some(format!(\"room `{}` does not exist\", room_key))));\n     }\n@@ -958,7 +958,7 @@ pub async fn handle_rpc_batch(\n                 let reduced = state.reduced.read().await;\n                 line_ok(RpcResult::ForumThreads(rpc_list_forum_threads(&reduced, &room)))\n             }\n-            RpcCommand::RoomCreate { slug, visibility } => {\n+            RpcCommand::RoomCreate { slug } => {\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@@ -975,53 +975,42 @@ pub async fn handle_rpc_batch(\n                         } else if !slug.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') {\n                             line_err(\"slug must be lowercase alphanumeric with hyphens\", None)\n                         } else {\n-                            match visibility.as_deref().unwrap_or(\"private\") {\n-                                \"private\" | \"public\" => {\n-                                    let vis = if visibility.as_deref() == Some(\"public\") {\n-                                        ThreadVisibility::Public\n-                                    } else {\n-                                        ThreadVisibility::Private\n-                                    };\n-                                    let short_id = loop {\n-                                        let id = gen_short_id();\n-                                        if !state.reduced.read().await.rooms.contains_key(&format!(\"{id}/{slug}\")) {\n-                                            break id;\n-                                        }\n-                                    };\n-                                    let room_id = format!(\"{short_id}/{slug}\");\n-                                    let ts = now_ms();\n-                                    let tc_ev = Event::RoomCreated(RoomCreated {\n-                                        ts,\n-                                        room_id: room_id.clone(),\n-                                        slug: slug.clone(),\n-                                        owner: principal.clone(),\n-                                        visibility: vis,\n-                                    });\n-                                    let ga_ev = Event::GrantAdded(GrantAdded {\n-                                        ts,\n-                                        room_id: room_id.clone(),\n-                                        username: principal.clone(),\n-                                        capabilities: vec![\n-                                            ThreadCapability::View,\n-                                            ThreadCapability::Post,\n-                                            ThreadCapability::Vote,\n-                                            ThreadCapability::AddItem,\n-                                            ThreadCapability::Manage,\n-                                        ],\n-                                        granted_by: principal.clone(),\n-                                    });\n-                                    if let Err(e) = state.event_log.append(&tc_ev).await {\n-                                        line_err(format!(\"{e}\"), None)\n-                                    } else if let Err(e) = state.event_log.append(&ga_ev).await {\n-                                        line_err(format!(\"{e}\"), None)\n-                                    } else {\n-                                        let mut r = state.reduced.write().await;\n-                                        r.apply_event(tc_ev);\n-                                        r.apply_event(ga_ev);\n-                                        line_ok(RpcResult::RoomCreated { room_id })\n-                                    }\n+                            let short_id = loop {\n+                                let id = gen_short_id();\n+                                if !state.reduced.read().await.rooms.contains(&format!(\"{id}/{slug}\")) {\n+                                    break id;\n                                 }\n-                                other => line_err(format!(\"unknown visibility: {other}\"), None),\n+                            };\n+                            let room_id = format!(\"{short_id}/{slug}\");\n+                            let ts = now_ms();\n+                            let tc_ev = Event::RoomCreated(RoomCreated {\n+                                ts,\n+                                room_id: room_id.clone(),\n+                                slug: slug.clone(),\n+                                owner: principal.clone(),\n+                            });\n+                            let ga_ev = Event::GrantAdded(GrantAdded {\n+                                ts,\n+                                room_id: room_id.clone(),\n+                                username: principal.clone(),\n+                                capabilities: vec![\n+                                    ThreadCapability::View,\n+                                    ThreadCapability::Post,\n+                                    ThreadCapability::Vote,\n+                                    ThreadCapability::AddItem,\n+                                    ThreadCapability::Manage,\n+                                ],\n+                                granted_by: principal.clone(),\n+                            });\n+                            if let Err(e) = state.event_log.append(&tc_ev).await {\n+                                line_err(format!(\"{e}\"), None)\n+                            } else if let Err(e) = state.event_log.append(&ga_ev).await {\n+                                line_err(format!(\"{e}\"), None)\n+                            } else {\n+                                let mut r = state.reduced.write().await;\n+                                r.apply_event(tc_ev);\n+                                r.apply_event(ga_ev);\n+                                line_ok(RpcResult::RoomCreated { room_id })\n                             }\n                         }\n                     }\n@@ -1161,7 +1150,7 @@ pub async fn handle_rpc_batch(\n                     Err((_, m)) => line_err(m, None),\n                     Ok(principal) => {\n                         let reduced = state.reduced.read().await;\n-                        if !reduced.rooms.contains_key(&room) {\n+                        if !reduced.rooms.contains(&room) {\n                             line_err(\"unknown room\", None)\n                         } else {\n                             let can_audit = reduced.user_has_cap(&room, &principal, ThreadCapability::View)\ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex 9e60f2c218f5c871a93e855e415dd984e3a017c5..b4ffed95ead228b9cb37ce50953b13efb958a73d 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -1,12 +1,5 @@\n use serde::{Deserialize, Serialize};\n \n-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]\n-#[serde(rename_all = \"snake_case\")]\n-pub enum ThreadVisibility {\n-    Public,\n-    Private,\n-}\n-\n #[derive(Debug, Clone, Copy, Hash, Serialize, Deserialize, PartialEq, Eq)]\n #[serde(rename_all = \"snake_case\")]\n pub enum ThreadCapability {\n@@ -57,13 +50,13 @@ pub struct AgentBound {\n     pub username: String,\n }\n \n+/// Private space keyed as `shortid/slug`.\n #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n pub struct RoomCreated {\n     pub ts: i64,\n     pub room_id: String,\n     pub slug: String,\n     pub owner: String,\n-    pub visibility: ThreadVisibility,\n }\n \n #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\ndiff --git a/server/src/html/search.rs b/server/src/html/search.rs\nindex 9353cf229fbbd2cfbab5b89ba63ebe192042c91f..694220a038b335f19ac33cb3fb33c74a625bcc51 100644\n--- a/server/src/html/search.rs\n+++ b/server/src/html/search.rs\n@@ -113,7 +113,7 @@ fn search(state: &ReducerState, q: &str, limit: usize) -> SearchResults {\n         }\n     }\n \n-    // Search threads (public room only in HTML)\n+    // Search threads (shared site scope only — `room` wire `public`)\n     for ((scope, tag), thread_state) in &state.forum_threads {\n         if scope != &ScopeId::Public {\n             continue;\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 5190d0a7ee3d545a786a68fef483322aafdce7f9..e06445fa4441771cda0d3474bedccf6f19a36b5f 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet, VecDeque};\n use serde::{Deserialize, Serialize};\n \n use crate::canonical_path::canonicalize_tag;\n-use crate::events::{Event, Ingest, ThreadCapability, ThreadVisibility};\n+use crate::events::{Event, Ingest, ThreadCapability};\n use crate::path_types::CanonicalItemUrl;\n \n #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]\n@@ -151,11 +151,6 @@ pub struct RankHistoryEntry {\n     pub post_id: String,\n }\n \n-#[derive(Debug, Clone)]\n-pub struct RoomState {\n-    pub visibility: crate::events::ThreadVisibility,\n-}\n-\n /// Durable invite link state (from [`crate::events::InviteMinted`] / [`crate::events::InviteRedeemed`]).\n #[derive(Debug, Clone)]\n pub struct ActiveInviteState {\n@@ -171,7 +166,6 @@ pub enum RoomTimelineKind {\n     RoomCreated {\n         owner: String,\n         slug: String,\n-        visibility: ThreadVisibility,\n     },\n     GrantAdded {\n         username: String,\n@@ -235,8 +229,8 @@ pub struct ReducerState {\n     pub ingests_by_id: HashMap<String, Ingest>,\n     /// (scope, thread_tag) → ingest ids, newest first.\n     pub ingests_by_scope_thread: HashMap<(ScopeId, String), VecDeque<String>>,\n-    /// Private (or public) room registry: room_id → visibility from [`RoomCreated`].\n-    pub rooms: HashMap<String, RoomState>,\n+    /// Private room ids (`shortid/slug`) known from [`RoomCreated`].\n+    pub rooms: HashSet<String>,\n     /// (scope, thread_tag) → last activity.\n     pub forum_threads: HashMap<(ScopeId, String), ForumThreadState>,\n     pub actor_last_post_ts: HashMap<String, i64>,\n@@ -403,12 +397,7 @@ impl ReducerState {\n                 self.agent_bindings.insert(ab.agent, ab.username);\n             }\n             Event::RoomCreated(rc) => {\n-                self.rooms.insert(\n-                    rc.room_id.clone(),\n-                    RoomState {\n-                        visibility: rc.visibility,\n-                    },\n-                );\n+                self.rooms.insert(rc.room_id.clone());\n                 self.room_timeline\n                     .entry(rc.room_id.clone())\n                     .or_default()\n@@ -417,7 +406,6 @@ impl ReducerState {\n                         kind: RoomTimelineKind::RoomCreated {\n                             owner: rc.owner.clone(),\n                             slug: rc.slug.clone(),\n-                            visibility: rc.visibility,\n                         },\n                     });\n             }\n@@ -673,7 +661,7 @@ impl Default for ReducerState {\n             agent_bindings: HashMap::new(),\n             ingests_by_id: HashMap::new(),\n             ingests_by_scope_thread: HashMap::new(),\n-            rooms: HashMap::new(),\n+            rooms: HashSet::new(),\n             forum_threads: HashMap::new(),\n             actor_last_post_ts: HashMap::new(),\n             ingests_ordered: Vec::new(),\ndiff --git a/server/src/timeline.rs b/server/src/timeline.rs\nindex 251158943ab36d3015268e35f6bdd01c3f42ab3b..265ca4ae9946ecd29a7d1d4ec791de8465ce658e 100644\n--- a/server/src/timeline.rs\n+++ b/server/src/timeline.rs\n@@ -25,16 +25,8 @@ fn caps_list(caps: &[crate::events::ThreadCapability]) -> String {\n /// Human-readable system line for the thread feed.\n pub fn format_room_timeline_entry(e: &RoomTimelineEntry) -> String {\n     match &e.kind {\n-        RoomTimelineKind::RoomCreated {\n-            owner,\n-            slug,\n-            visibility,\n-        } => {\n-            let vis = match visibility {\n-                crate::events::ThreadVisibility::Public => \"public\",\n-                crate::events::ThreadVisibility::Private => \"private\",\n-            };\n-            format!(\"@{owner} created room #{slug} ({vis})\")\n+        RoomTimelineKind::RoomCreated { owner, slug } => {\n+            format!(\"@{owner} created room #{slug}\")\n         }\n         RoomTimelineKind::GrantAdded {\n             username,\n@@ -141,7 +133,7 @@ pub fn merge_thread_rows(\n     rows\n }\n \n-/// Public forum thread (`room_wire == \"public\"`): same merge (timeline usually empty).\n+/// Shared-site thread view (`room_wire == \"public\"` on the wire). Same merge as private rooms; private-room timeline is unused here.\n pub fn merge_public_thread_rows(\n     reduced: &ReducerState,\n     thread_tag: &str,\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex b930120da09fe7d307f0411b84fb639fb8bd0b15..139fdda27d2276e3b30116816495648970d24c5f 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -96,11 +96,11 @@ async fn test_healthz() {\n }\n \n #[tokio::test]\n-async fn test_room_create_private_rpc() {\n+async fn test_room_create_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+        \"RoomCreate\": { \"slug\": \"secret-project\" }\n     }]);\n     let body = rpc_batch(&client, addr, Some(&test_bearer()), batch).await;\n     let line = &body[\"results\"][0];\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 4ded5ce92576cdea653cce0ba8a751be4374731a..697e7d91545dd3ee96efde07fc8c3cf90f1a8056 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -82,7 +82,7 @@\n            ;; Alice creates a private room.\n            _ (println \"\\nalice creates private room…\")\n            create (rpc-batch! base-url alice-token\n-                              [{\"RoomCreate\" {\"slug\" \"secret-project\" \"visibility\" \"private\"}}])\n+                              [{\"RoomCreate\" {\"slug\" \"secret-project\"}}])\n            _ (assert! (= 200 (:status create)) \"room create HTTP 200\")\n            _ (assert! (rpc-line-ok? (:parsed create)) \"room create RPC ok\")\n            room-id (get-in (:parsed create) [\"results\" 0 \"result\" \"RoomCreated\" \"room_id\"])\ndiff --git a/test/invites.bb b/test/invites.bb\nindex f72b1e630a6856174cdef11eb977e2f81b16e551..ca0fd6c858400671452c4ec59c490d05101dd0e4 100644\n--- a/test/invites.bb\n+++ b/test/invites.bb\n@@ -86,7 +86,7 @@\n \n            _ (println \"\\nalice creates private room…\")\n            create (rpc-batch! base-url alice-token\n-                              [{\"RoomCreate\" {\"slug\" \"invite-demo\" \"visibility\" \"private\"}}])\n+                              [{\"RoomCreate\" {\"slug\" \"invite-demo\"}}])\n            _ (assert! (= 200 (:status create)) \"room create HTTP 200\")\n            _ (assert! (rpc-line-ok? (:parsed create)) \"room create RPC ok\")\n            room-id (get-in (:parsed create) [\"results\" 0 \"result\" \"RoomCreated\" \"room_id\"])\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex 98c66a00fd27803ef6f75b5ac478ff2eb762d771..bb8586f1734f77d95598a9294bdb0de2d55bf715 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -319,8 +319,6 @@ pub enum RpcCommand {\n     },\n     RoomCreate {\n         slug: String,\n-        #[serde(default, skip_serializing_if = \"Option::is_none\")]\n-        visibility: Option<String>,\n     },\n     RoomGrant {\n         room: String,\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":"~anthropic/claude-sonnet-latest"}