{"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[c3f01e01] cleanup\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex f9912115d3c6ac18be66c952c3af445ab0f51cea..5aa6a86326ba3545d261322c010e02fe86ee1c57 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -254,17 +254,7 @@ async fn dispatch_ui_action(\n };\n n\n };\n- let js = vote_compare_post_success_js(\n- state,\n- &nav,\n- &room,\n- &thread_tag,\n- &left_id,\n- &right_id,\n- &pid,\n- post_index,\n- )\n- .await;\n+ let js = vote_compare_post_success_js(state, &nav, &left_id, &right_id).await;\n Response::builder()\n .status(StatusCode::OK)\n .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex 7d309a075405483971109da2f34160409dc608f7..8a46b1e92d38f2c390f88d48750d95d11388cd73 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -176,34 +176,14 @@ fn vote_edge_history_markup(\n pub(crate) async fn vote_compare_post_success_js(\n state: &AppState,\n nav: &ThreadNav,\n- room_wire: &str,\n- thread_tag: &str,\n left: &ItemId,\n right: &ItemId,\n- post_id: &str,\n- post_idx: Option,\n ) -> String {\n- use crate::reducer::scope_from_room_wire;\n let reduced = state.reduced.read().await;\n- let scope = scope_from_room_wire(room_wire.trim());\n- let Some(ing) = reduced.ingests_by_id.get(post_id).cloned() else {\n- drop(reduced);\n- return \"console.warn('vote compare: new post not found');\".to_string();\n- };\n- let idx = match post_idx {\n- Some(i) => i,\n- None => reduced\n- .try_thread_post_index_chronological(&scope, thread_tag, post_id)\n- .unwrap_or(0),\n- };\n- let viewer = None::<&str>;\n- let now = now_ms();\n- let card = ingest_entry_markup(nav, thread_tag, idx, &ing, viewer, now, &reduced);\n let content = content_for_garden_view(&reduced, &nav.scope());\n let edge_history = vote_edge_history_markup(content, left, right, nav);\n drop(reduced);\n let mut b = JsBuilder::new();\n- b = b.morph_inner_selector(\"#vote-compare-preview\", card);\n b = b.morph_inner_selector(\"#vote-edge-history-region\", edge_history);\n b.build()\n }\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[c59951f5] fixed canonical item paths business\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/html/breadcrumb_path.rs b/server/src/html/breadcrumb_path.rs\nindex 12ad2c84faf2fbb693015d4552e45b5c54d587b9..c8a3937923161a6ff248bd77e87eff0dc6fe9ab0 100644\n--- a/server/src/html/breadcrumb_path.rs\n+++ b/server/src/html/breadcrumb_path.rs\n@@ -1,4 +1,4 @@\n-use crate::path_types::CanonicalItemUrl;\n+use crate::path_types::{tilde_http_path_to_canonical, CanonicalItemUrl};\n \n /// Semantic view of an ontology path for rendering and routing decisions.\n pub(super) struct OntologyPath {\n@@ -11,16 +11,7 @@ impl OntologyPath {\n /// Path is the `*path` segment from `/~/*path` (e.g. `topic/a`). Always treat it as under `~/`\n /// so it canonicalizes to `https://slug.social/~/…`, not the non-tilde site path.\n pub(super) fn from_input(path: &str) -> Self {\n- let p = path.trim_start_matches('/');\n- let raw = if p.starts_with(\"http://\") || p.starts_with(\"https://\") {\n- p.to_string()\n- } else if p.is_empty() {\n- \"~/\".to_string()\n- } else {\n- format!(\"~/{}\", p)\n- };\n- let canonical = CanonicalItemUrl::parse(&raw)\n- .unwrap_or_else(|| CanonicalItemUrl::parse(\"~/\").unwrap());\n+ let canonical = tilde_http_path_to_canonical(path);\n Self::from_canonical(canonical)\n }\n \n@@ -37,7 +28,7 @@ impl OntologyPath {\n }\n \n pub(super) fn root() -> Self {\n- Self::from_canonical(CanonicalItemUrl::parse(\"~/\").unwrap())\n+ Self::from_canonical(CanonicalItemUrl::ontology_root())\n }\n \n pub(super) fn is_root(&self) -> bool {\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex d58d9b46f575eb6b7e4971086b07dda75ca2f645..319feb15a6b68d2b5df98b4289fedbc9bdd048d3 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -459,6 +459,8 @@ struct ItemPageViewModel {\n item: String,\n body: Option,\n sibling_rank: Option,\n+ /// False at the tilde ontology root (`~/`): sibling-rank footnote does not apply.\n+ item_has_parent: bool,\n child_rankings: ChildrenRankings,\n rank_history: Vec,\n /// Forum threads that mention or vote on this item.\n@@ -470,11 +472,12 @@ fn build_sibling_rank(\n scope: &ScopeId,\n item: &CanonicalItemUrl,\n ) -> Option {\n+ let item = item.clone().normalized_storage();\n let content = reduced\n .content_for_scope(scope)\n .unwrap_or_else(|| reduced.public());\n let group = &content.ranking_group;\n- let parent = item.parent()?;\n+ let parent = item.parent()?.normalized_storage();\n let siblings: Vec = content\n .item_children\n .get(&parent)\n@@ -492,7 +495,7 @@ fn build_sibling_rank(\n if scoped_idxs.is_empty() {\n return None;\n }\n- let current_idx = *group.item_to_idx.get(item)?;\n+ let current_idx = *group.item_to_idx.get(&item)?;\n if !scoped_idxs.contains(¤t_idx) {\n return None;\n }\n@@ -520,7 +523,7 @@ fn build_sibling_rank(\n .filter_map(|li| local_to_global.get(*li).copied())\n .collect();\n let ranked = ranked_items_subset(group, &comp_global, 10000, 1e-8);\n- let position = ranked.iter().position(|r| &r.item == item)? + 1;\n+ let position = ranked.iter().position(|r| r.item == item)? + 1;\n Some(SiblingRank {\n position,\n component_size: ranked.len(),\n@@ -597,7 +600,9 @@ fn build_item_page_view_model(\n .content_for_scope(scope)\n .unwrap_or_else(|| reduced.public());\n let item_key = CanonicalItemUrl::parse(item)\n- .unwrap_or_else(|| CanonicalItemUrl::parse(\"~/\").unwrap());\n+ .unwrap_or_else(|| CanonicalItemUrl::parse(\"~/\").unwrap())\n+ .normalized_storage();\n+ let item_has_parent = item_key.parent().is_some();\n let child_rankings = build_children_rankings(content, &item_key);\n \n let rank_history = build_rank_history(reduced, scope, item_key.as_str());\n@@ -617,6 +622,7 @@ fn build_item_page_view_model(\n .cloned()\n .or_else(|| reduced.public().item_bodies.get(&item_key).cloned()),\n sibling_rank: build_sibling_rank(reduced, scope, &item_key),\n+ item_has_parent,\n child_rankings,\n rank_history,\n threads,\n@@ -652,7 +658,7 @@ async fn render_scope_view(\n (format!(\"#{} of {}\", rank.position, rank.component_size))\n }\n span class=\"muted\" { (format!(\"({} siblings)\", rank.sibling_total)) }\n- } @else {\n+ } @else if model.item_has_parent {\n span class=\"muted\" { \"unranked among siblings\" }\n }\n }\n@@ -815,6 +821,18 @@ mod tests {\n }));\n }\n \n+ fn apply_ingest_room(state: &mut ReducerState, ts: i64, room_id: &str, raw: &str) {\n+ state.apply_event(Event::Ingest(Ingest {\n+ ts,\n+ id: format!(\"ing-{ts}\"),\n+ raw: raw.to_string(),\n+ principal: \"testuser\".to_string(),\n+ delegate: Some(\"00000000-0000-0000-0000-000000000000:test:local/test\".to_string()),\n+ room_id: room_id.to_string(),\n+ thread_tag: String::new(),\n+ }));\n+ }\n+\n #[test]\n fn item_page_model_includes_body_and_unranked_without_votes() {\n let mut reduced = ReducerState::default();\n@@ -885,4 +903,85 @@ mod tests {\n || model.child_rankings.unranked_items.contains(&CanonicalItemUrl(\"https://slug.social/~/topic/kid2\".to_string()))\n );\n }\n+\n+ #[test]\n+ fn item_page_room_scope_root_lists_top_level_children() {\n+ let mut reduced = ReducerState::default();\n+ apply_ingest_room(\n+ &mut reduced,\n+ 1,\n+ \"9ab12cd/my-room\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/t1 {a}\\n~/t2 {b}\\n\",\n+ );\n+ use crate::path_types::CanonicalItemUrl;\n+ let root = CanonicalItemUrl::ontology_root();\n+ let model = build_item_page_view_model(\n+ &reduced,\n+ &ScopeId::Room(\"9ab12cd/my-room\".to_string()),\n+ root.as_str(),\n+ );\n+ assert!(!model.item_has_parent);\n+ assert_eq!(model.child_rankings.unranked_items.len(), 2);\n+ let set: std::collections::HashSet<&str> = model\n+ .child_rankings\n+ .unranked_items\n+ .iter()\n+ .map(|u| u.as_str())\n+ .collect();\n+ assert!(set.contains(\"https://slug.social/~/t1\"));\n+ assert!(set.contains(\"https://slug.social/~/t2\"));\n+ }\n+\n+ /// Top-level `~/a` vs `~/b` votes form one ranked component under the ontology root.\n+ #[test]\n+ fn item_page_room_scope_root_shows_ranked_child_group() {\n+ let mut reduced = ReducerState::default();\n+ apply_ingest_room(\n+ &mut reduced,\n+ 1,\n+ \"9ab12cd/my-room\",\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n\\\n+ ~/a {a}\\n~/b {b}\\n~/a 2:1 ~/b {because}\\n\",\n+ );\n+ use crate::path_types::CanonicalItemUrl;\n+ let root = CanonicalItemUrl::ontology_root();\n+ let model = build_item_page_view_model(\n+ &reduced,\n+ &ScopeId::Room(\"9ab12cd/my-room\".to_string()),\n+ root.as_str(),\n+ );\n+ assert_eq!(model.child_rankings.component_rankings.len(), 1);\n+ assert_eq!(model.child_rankings.component_rankings[0].pairs, 1);\n+ let names: Vec<&str> = model.child_rankings.component_rankings[0]\n+ .ranked\n+ .iter()\n+ .map(|r| r.item.as_str())\n+ .collect();\n+ assert_eq!(\n+ names,\n+ vec![\"https://slug.social/~/a\", \"https://slug.social/~/b\"]\n+ );\n+ assert!(model.child_rankings.unranked_items.is_empty());\n+ }\n+\n+ /// Legacy `https://slug.social/~/` spelling still resolves children under the real root key.\n+ #[test]\n+ fn item_page_model_normalizes_legacy_tilde_root_storage_url() {\n+ let mut reduced = ReducerState::default();\n+ apply_ingest(\n+ &mut reduced,\n+ 1,\n+ \"@00000000-0000-0000-0000-000000000000:test:local/test\\n~/x {x}\\n\",\n+ );\n+ let model = build_item_page_view_model(\n+ &reduced,\n+ &ScopeId::Public,\n+ \"https://slug.social/~/\",\n+ );\n+ assert_eq!(model.child_rankings.unranked_items.len(), 1);\n+ assert_eq!(\n+ model.child_rankings.unranked_items[0].as_str(),\n+ \"https://slug.social/~/x\"\n+ );\n+ }\n }\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex 4c8075bbd488f1b9a5eda9e03ced83f6238c6d5e..361a9d446c9043cbdea5f060db2e8633c2fd9bf9 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -1,3 +1,5 @@\n //! Re-exports — implementations live in `slug-types` (`paths` module).\n \n-pub use slug_types::paths::{CanonicalItemUrl, RelativePath, TildePath};\n+pub use slug_types::paths::{\n+ tilde_http_path_to_canonical, CanonicalItemUrl, RelativePath, TildeHttpPathTail, TildePath,\n+};\ndiff --git a/server/src/scope_rank.rs b/server/src/scope_rank.rs\nindex dc640848232b7e79142bfeeea3003c9023f84854..d656b2f0a0a3623ca6b234b746beaaca8ae6017d 100644\n--- a/server/src/scope_rank.rs\n+++ b/server/src/scope_rank.rs\n@@ -149,9 +149,10 @@ pub fn build_rankings_for_item_set(content: &ContentState, items_in_scope: &[Can\n /// Build connected-component rankings for direct children of parent_scope.\n /// Matches the HTML garden view: multiple components, isolates, no-vote items.\n pub fn build_children_rankings(content: &ContentState, parent: &CanonicalItemUrl) -> ChildrenRankings {\n+ let parent = parent.clone().normalized_storage();\n let items: Vec = content\n .item_children\n- .get(parent)\n+ .get(&parent)\n .map(|s| s.iter().cloned().collect())\n .unwrap_or_default();\n build_rankings_for_item_set(content, &items)\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex f9c218378f6a173e56ae1cec797b3c492986eac0..d4c5bfe9c6f1c71dc61878bd8c5e729b1b7c69ef 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -704,6 +704,62 @@ async fn test_private_room_post_links_use_private_garden_routes() {\n assert!(garden_body.contains(&format!(\"/r/{room_short}/{room_slug}/t/garden-thread\")));\n }\n \n+#[tokio::test]\n+async fn test_private_room_garden_root_lists_top_level_tilde_children() {\n+ let (addr, _tmp, _log, _handle) = create_test_server().await;\n+ let client = reqwest::Client::builder()\n+ .redirect(reqwest::redirect::Policy::none())\n+ .build()\n+ .unwrap();\n+ let bearer = test_bearer();\n+\n+ let create = rpc_batch(\n+ &client,\n+ addr,\n+ Some(&bearer),\n+ serde_json::json!([{\n+ \"RoomCreate\": { \"slug\": \"garden-root-list\" }\n+ }]),\n+ )\n+ .await;\n+ let room_id = create[\"results\"][0][\"result\"][\"RoomCreated\"][\"room_id\"]\n+ .as_str()\n+ .unwrap()\n+ .to_string();\n+ let (room_short, room_slug) = room_id.split_once('/').unwrap();\n+\n+ let rpc = ui_post_ingest_rpc(\n+ &room_id,\n+ \"ing\",\n+ \"~/test1 {wow}\\n~/test2 {wow2}\\n~/test1 2:1 ~/test2 {because}\\n\",\n+ );\n+ let post = client\n+ .post(format!(\"http://{addr}/ui\"))\n+ .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n+ .form(&[(\"__rpc__\", rpc.as_str())])\n+ .send()\n+ .await\n+ .unwrap();\n+ assert_eq!(post.status(), reqwest::StatusCode::OK);\n+\n+ let root_page = client\n+ .get(format!(\"http://{addr}/r/{room_short}/{room_slug}/~\"))\n+ .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n+ .send()\n+ .await\n+ .unwrap();\n+ assert!(root_page.status().is_success());\n+ let body = root_page.text().await.unwrap();\n+ assert!(\n+ body.contains(\"ranked child groups\"),\n+ \"expected garden child panel: {}\",\n+ body.len()\n+ );\n+ assert!(body.contains(\"~/test1\"));\n+ assert!(body.contains(\"~/test2\"));\n+ assert!(body.contains(\"ordering 1\"));\n+}\n+\n #[tokio::test]\n async fn test_post_check_returns_targeted_js_error_for_missing_thread_tag() {\n let (addr, _tmp, _log, _handle) = create_test_server().await;\ndiff --git a/test/browser_public_garden.clj b/test/browser_public_garden.clj\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..7bea08e1cf2c8f5b1a94b0640a46e9ba5607b19b\n--- /dev/null\n+++ b/test/browser_public_garden.clj\n@@ -0,0 +1,100 @@\n+(ns test.browser-public-garden\n+ \"Regression: ingest ontology items in the public room via RPC, then open /~ in the browser\n+ and assert ranked + unranked paths appear (HTML garden index — not JSON API).\"\n+ (:require [babashka.fs :as fs]\n+ [cheshire.core :as json]\n+ [clojure.string :as str]\n+ [clojure.test :refer [deftest is]]\n+ [com.blockether.spel.core :as core]\n+ [com.blockether.spel.locator :as locator]\n+ [com.blockether.spel.page :as page]\n+ [test.common :as common]\n+ [test.oauth :as oauth]))\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+ (if (and (string? text) (str/includes? text expected))\n+ true\n+ (if (< (System/currentTimeMillis) deadline)\n+ (do (Thread/sleep 200) (recur))\n+ false))))))\n+\n+(defn public-garden-flow! []\n+ (println \"\\n━━━ browser public room garden index (RPC seed + GET /~) ━━━\\n\")\n+\n+ (common/letlocals\n+ (bind build (common/run-cargo-build-release! [\"slugsocial-server\"]))\n+ (is (zero? (:exit build)) \"cargo build succeeds\")\n+ (bind server-bin \"target/release/slugsocial-server\")\n+\n+ (bind tmp-dir (str (fs/create-temp-dir {:prefix \"slug-browser-pub-garden-\"})))\n+ (bind slug-port (common/pick-port))\n+ (bind google-port (common/pick-port))\n+ (bind base-url (str \"http://127.0.0.1:\" slug-port))\n+ (bind google-url (str \"http://127.0.0.1:\" google-port))\n+\n+ (bind !server (atom nil))\n+ (bind !google (atom nil))\n+ (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n+ (try\n+ (reset! !google (oauth/start-mock-google google-port\n+ :google-users [\"google-user-alice\"]))\n+ (reset! !server (common/start-server server-bin server-env))\n+ (is (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n+\n+ (let [alice-token (oauth/fetch-bearer-token! base-url :username \"alice\")\n+ thread-tag \"browser-pub-garden\"\n+ ;; Ranked pair at root + one isolate so both panels are exercised.\n+ raw (str \"# \" thread-tag \"\\n\\n\"\n+ \"~/br-pub-a {alpha}\\n\"\n+ \"~/br-pub-b {beta}\\n\"\n+ \"~/br-pub-c {gamma}\\n\"\n+ \"~/br-pub-a 2:1 ~/br-pub-b {browser regression vote}\\n\")\n+ post-resp (oauth/http-post-json\n+ (str base-url \"/api/v0/rpc\")\n+ [{\"Post\" {\"room\" \"public\"\n+ \"thread_tag\" thread-tag\n+ \"text\" raw\n+ \"return_rank_diff\" false}}]\n+ :headers {\"Authorization\" (str \"Bearer \" alice-token)})\n+ post-json (json/parse-string (:body post-resp) false)\n+ _ (is (true? (get-in post-json [\"results\" 0 \"ok\"])) \"seed public post via rpc\")\n+ rank-resp (oauth/http-post-json\n+ (str base-url \"/api/v0/rpc\")\n+ [{\"GetGardenRank\" {\"room\" \"public\"\n+ \"parent_path\" \"~\"\n+ \"depth\" 1}}])\n+ rank-json (json/parse-string (:body rank-resp) false)\n+ _ (is (true? (get-in rank-json [\"results\" 0 \"ok\"])) \"GetGardenRank ok\")\n+ comps (get-in rank-json [\"results\" 0 \"result\" \"GardenRank\" \"components\"])\n+ _ (is (pos? (count comps)) \"rank API reports at least one component\")]\n+ (core/with-playwright [pw]\n+ (core/with-browser [browser (core/launch-chromium pw {:headless true :channel \"chrome\"})]\n+ (core/with-context [ctx (core/new-context browser)]\n+ (core/with-page [pg (core/new-page-from-context ctx)]\n+ (page/navigate pg (str base-url \"/login\"))\n+ (is (wait-for-text pg \"body\" \"@alice\" 15000) \"alice session after login\")\n+ (page/navigate pg (str base-url \"/~\"))\n+ (is (wait-for-text pg \"body\" \"paths\" 15000) \"public garden index shows paths heading\")\n+ (is (wait-for-text pg \"body\" \"ordering\" 10000)\n+ \"ranked child group meta visible\")\n+ (is (wait-for-text pg \"body\" \"~/br-pub-a\" 10000) \"ranked list shows ~/br-pub-a\")\n+ (is (wait-for-text pg \"body\" \"~/br-pub-b\" 10000) \"ranked list shows ~/br-pub-b\")\n+ (is (wait-for-text pg \"body\" \"unranked\" 10000) \"unranked section present\")\n+ (is (wait-for-text pg \"body\" \"~/br-pub-c\" 10000)\n+ \"unranked list shows ~/br-pub-c\"))))))\n+\n+ (finally\n+ (when-some [s @!server] (common/kill-server s))\n+ (when-some [g @!google] ((:stop-fn g)))\n+ (fs/delete-tree tmp-dir)))\n+\n+ nil))\n+\n+(defn public-garden-browser-test [& _args]\n+ (public-garden-flow!))\n+\n+(deftest browser-public-garden-index-check\n+ (public-garden-flow!))\ndiff --git a/tests.edn b/tests.edn\nindex 56fdfa4f29383ad305fd8068783e4efe2ed334a0..6e96432ba766461b4233c75dc48db2633483e5e0 100644\n--- a/tests.edn\n+++ b/tests.edn\n@@ -16,7 +16,8 @@\n :ns-patterns [\"^test\\\\.browser-sse$\"\n \"^test\\\\.browser-ui-morph$\"\n \"^test\\\\.browser-post-redact$\"\n- \"^test\\\\.browser-room-delete$\"]\n+ \"^test\\\\.browser-room-delete$\"\n+ \"^test\\\\.browser-public-garden$\"]\n :kaocha.filter/skip-meta [:skip]\n :parallel? false}]\n :plugins [:kaocha.plugin/junit-xml]\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex 8cea90238ef6207d65ecdb2903b8958fafb213d2..edbb923e4d7d41ad82dfc254c3bd697562383527 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -4,8 +4,9 @@ pub mod paths;\n pub mod timeago;\n \n pub use paths::{\n- canonicalize_item, canonicalize_tag, item_parent_path, item_path_segments, CanonicalItemUrl,\n- ForumThreadUrl, GardenItemUrl, RelativePath, TildeOntologyPath, TildePath,\n+ canonicalize_item, canonicalize_tag, item_parent_path, item_path_segments, normalize_slug_ontology_storage_url,\n+ CanonicalItemUrl, ForumThreadUrl, GardenItemUrl, RelativePath, SLUG_TILDE_ONTOLOGY_ROOT,\n+ TildeHttpPathTail, TildeOntologyPath, TildePath, tilde_http_path_to_canonical,\n };\n \n /// Max characters returned for a garden item body unless `full=true` / `--full` (API + CLI).\ndiff --git a/types/src/paths.rs b/types/src/paths.rs\nindex 668323ed777f360f2838a0dfe6eae68905d1183b..8971f599a7ebcf399f60c306d35ee28d0f581194 100644\n--- a/types/src/paths.rs\n+++ b/types/src/paths.rs\n@@ -1,5 +1,13 @@\n //! Canonical paths, storage ids, and JSON href newtypes. All normalization and\n //! room-aware URL rules for items live here.\n+//!\n+//! ## String kinds (parse in this module only)\n+//!\n+//! - **[`canonicalize_item`] / [`CanonicalItemUrl`]** — graph storage key and DSL form; tilde\n+//! ontology root is always [`SLUG_TILDE_ONTOLOGY_ROOT`] (no `…/~/` trailing slash only).\n+//! - **[`TildeHttpPathTail`]** — capture from `GET /~/*path` or `…/r/…/~/…` (the `*path` segment).\n+//! - **`-/…` wire form** — external items; see [`canonicalize_item`] dash branch.\n+//! - **[`GardenItemUrl`], [`ForumThreadUrl`]** — JSON / browser href surfaces.\n \n use std::borrow::Borrow;\n use std::fmt;\n@@ -7,6 +15,23 @@ use std::ops::Deref;\n \n use serde::{Deserialize, Serialize};\n \n+// ---------------------------------------------------------------------------\n+// Slug tilde ontology (single storage form for `~/`)\n+// ---------------------------------------------------------------------------\n+\n+/// Canonical absolute URL for the tilde ontology **root** (`~/` in UI). Used as the\n+/// `item_children` parent key for top-level items and must match [`CanonicalItemUrl::ontology_root`].\n+pub const SLUG_TILDE_ONTOLOGY_ROOT: &str = \"https://slug.social/~\";\n+\n+/// Collapse legacy or parser variants of the ontology root to [`SLUG_TILDE_ONTOLOGY_ROOT`].\n+pub fn normalize_slug_ontology_storage_url(s: &str) -> String {\n+ if s == \"https://slug.social/~/\" {\n+ SLUG_TILDE_ONTOLOGY_ROOT.to_string()\n+ } else {\n+ s.to_string()\n+ }\n+}\n+\n // ---------------------------------------------------------------------------\n // Normalization (moved from server `canonical_path`)\n // ---------------------------------------------------------------------------\n@@ -89,6 +114,9 @@ pub fn canonicalize_item(input: &str) -> String {\n .join(\"/\");\n \n if is_tilde {\n+ if tail.is_empty() {\n+ return SLUG_TILDE_ONTOLOGY_ROOT.to_string();\n+ }\n format!(\"https://slug.social/~/{}\", tail)\n } else if tail.is_empty() {\n \"https://slug.social\".to_string()\n@@ -173,7 +201,7 @@ impl CanonicalItemUrl {\n if c.is_empty() {\n None\n } else {\n- Some(Self(c))\n+ Some(Self(normalize_slug_ontology_storage_url(&c)))\n }\n }\n \n@@ -181,8 +209,19 @@ impl CanonicalItemUrl {\n &self.0\n }\n \n+ /// Collapses legacy slug ontology root spellings so [`HashMap`] keys match the reducer graph.\n+ pub fn normalized_storage(self) -> Self {\n+ Self(normalize_slug_ontology_storage_url(self.as_str()))\n+ }\n+\n pub fn tilde_tail(&self) -> Option<&str> {\n- self.0.strip_prefix(\"https://slug.social/~/\")\n+ if let Some(tail) = self.0.strip_prefix(\"https://slug.social/~/\") {\n+ return Some(tail);\n+ }\n+ if self.0 == SLUG_TILDE_ONTOLOGY_ROOT || self.0 == \"https://slug.social/~/\" {\n+ return Some(\"\");\n+ }\n+ None\n }\n \n pub fn last_segment(&self) -> &str {\n@@ -193,7 +232,7 @@ impl CanonicalItemUrl {\n }\n \n pub fn ontology_root() -> Self {\n- Self(\"https://slug.social/~\".to_string())\n+ Self(SLUG_TILDE_ONTOLOGY_ROOT.to_string())\n }\n \n pub fn parent(&self) -> Option {\n@@ -234,9 +273,13 @@ impl CanonicalItemUrl {\n \n /// `-/` representation for external `https://…` items, `~/…` for slug ontology, else unchanged.\n pub fn display_path(&self) -> String {\n- if let Some(tail) = self.0.strip_prefix(\"https://slug.social/~/\") {\n- format!(\"~/{}\", tail)\n- } else if let Some(tail) = self.0.strip_prefix(\"https://\") {\n+ if let Some(tail) = self.tilde_tail() {\n+ if tail.is_empty() {\n+ return \"~/\".to_string();\n+ }\n+ return format!(\"~/{}\", tail);\n+ }\n+ if let Some(tail) = self.0.strip_prefix(\"https://\") {\n if tail.starts_with(\"slug.social\") {\n self.0.clone()\n } else {\n@@ -276,6 +319,37 @@ impl CanonicalItemUrl {\n }\n }\n \n+/// HTTP route capture: path segment after `~/` in `GET /~/*path` or `…/r/…/~/…` (empty = ontology root).\n+#[derive(Debug, Clone, PartialEq, Eq, Hash)]\n+pub struct TildeHttpPathTail(pub String);\n+\n+impl TildeHttpPathTail {\n+ pub fn new(path_segment: &str) -> Self {\n+ Self(path_segment.trim_start_matches('/').to_string())\n+ }\n+\n+ pub fn as_str(&self) -> &str {\n+ &self.0\n+ }\n+\n+ pub fn to_canonical(&self) -> CanonicalItemUrl {\n+ tilde_http_path_to_canonical(self.as_str())\n+ }\n+}\n+\n+/// Map the router's tilde tail (e.g. `topic/a`, or empty for root) to a [`CanonicalItemUrl`].\n+pub fn tilde_http_path_to_canonical(path_segment: &str) -> CanonicalItemUrl {\n+ let p = path_segment.trim_start_matches('/');\n+ let raw = if p.starts_with(\"http://\") || p.starts_with(\"https://\") {\n+ p.to_string()\n+ } else if p.is_empty() {\n+ \"~/\".to_string()\n+ } else {\n+ format!(\"~/{}\", p)\n+ };\n+ CanonicalItemUrl::parse(&raw).unwrap_or_else(|| CanonicalItemUrl::ontology_root())\n+}\n+\n impl fmt::Display for CanonicalItemUrl {\n fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {\n self.0.fmt(f)\n@@ -557,6 +631,44 @@ mod tests {\n fn canonical_parent_root_is_none() {\n let root = CanonicalItemUrl::parse(\"~/\").unwrap();\n assert!(root.parent().is_none());\n+ assert_eq!(root.as_str(), SLUG_TILDE_ONTOLOGY_ROOT);\n+ assert_eq!(root, CanonicalItemUrl::ontology_root());\n+ }\n+\n+ #[test]\n+ fn tilde_ontology_root_unifies_forms() {\n+ assert_eq!(canonicalize_item(\"~/\"), SLUG_TILDE_ONTOLOGY_ROOT);\n+ assert_eq!(\n+ normalize_slug_ontology_storage_url(\"https://slug.social/~/\"),\n+ SLUG_TILDE_ONTOLOGY_ROOT.to_string()\n+ );\n+ assert_eq!(\n+ CanonicalItemUrl::parse(\"https://slug.social/~/\")\n+ .unwrap()\n+ .as_str(),\n+ SLUG_TILDE_ONTOLOGY_ROOT\n+ );\n+ let legacy = CanonicalItemUrl(\"https://slug.social/~/\".to_string());\n+ assert_eq!(legacy.normalized_storage().as_str(), SLUG_TILDE_ONTOLOGY_ROOT);\n+ }\n+\n+ #[test]\n+ fn tilde_http_path_tail_maps_router_segment() {\n+ assert_eq!(\n+ TildeHttpPathTail::new(\"\").to_canonical(),\n+ CanonicalItemUrl::ontology_root()\n+ );\n+ assert_eq!(\n+ tilde_http_path_to_canonical(\"topic/x\").as_str(),\n+ \"https://slug.social/~/topic/x\"\n+ );\n+ }\n+\n+ #[test]\n+ fn display_path_slug_ontology_root() {\n+ let r = CanonicalItemUrl::ontology_root();\n+ assert_eq!(r.display_path(), \"~/\");\n+ assert_eq!(r.tilde_tail(), Some(\"\"));\n }\n \n #[test]\n","role":"user"}],"model":"~x-ai/grok-latest"}