{"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[239c074b] url schema stuff\n\nSide A — unified diff (full patch):\ndiff --git a/AGENTS.md b/AGENTS.md\nindex 426a88e7c1da54fe0a28c5c76fa4e1f1bc117fcf..e60b9ba6012593361ef10e8fdd9439cd9932e09b 100644\n--- a/AGENTS.md\n+++ b/AGENTS.md\n@@ -58,3 +58,4 @@ Use **tmux** for `cargo run --package sorter2-server` (dev server). Rebuild afte\n \n - First `cargo test` / `cargo build --release` is slow; Clojure smoke test always does a release build.\n - `legacy/` and `ideas/` are not part of the workspace build.\n+- **ItemId** for web URLs is a canonical full URL (`https://reddit.com/r/rust`). Rules live in [`server/src/url_rules/`](server/src/url_rules/) (composable Rust, not a config DSL). After changing canonicalization rules, rebuild the projection: `cargo run --package sorter2-server -- replay-index`.\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 0dd4fce5fb6400ae153cca4e3dbf5a5158e6d8b4..49a908ef935c430dbe63c6a28d8a24e38b489486 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -1951,6 +1951,7 @@ dependencies = [\n \"tower-http 0.5.2\",\n \"tracing\",\n \"tracing-subscriber\",\n+ \"url\",\n \"urlencoding\",\n ]\n \ndiff --git a/REPLAY.sh b/REPLAY.sh\nnew file mode 100755\nindex 0000000000000000000000000000000000000000..f2dbd8aea60c02d2feef74805f7ef5c2b7022537\n--- /dev/null\n+++ b/REPLAY.sh\n@@ -0,0 +1,2 @@\n+cargo run --package sorter2-server -- replay-index\n+\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex 27f552c20b97ef28cdde4cb6b1a4980375135111..ad4912791aff59fb1d3293f66ad381ae618cd60b 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -24,6 +24,7 @@ async-stream = \"0.3\"\n futures-util = { version = \"0.3\", default-features = false, features = [\"std\"] }\n rand = \"0.8\"\n urlencoding = \"2\"\n+url = \"2\"\n durable = { path = \"../durable\" }\n \n [dev-dependencies]\ndiff --git a/server/src/entity_store.rs b/server/src/entity_store.rs\nindex d5d17c3676e4a8ddec998e9f5a9dbafe9c2d9d0e..d29f39aecca6f12cdcf263cf77c3654eb4ee6cfa 100644\n--- a/server/src/entity_store.rs\n+++ b/server/src/entity_store.rs\n@@ -124,7 +124,7 @@ mod tests {\n fn round_trip_payload() {\n let tmp = tempfile::tempdir().unwrap();\n let store = EntityStore::open(tmp.path()).unwrap();\n- let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let id = ItemId::from_url(\"https://reddit.com/r/rust\").unwrap();\n let payload = json!({\"kind\": \"t5\", \"data\": {\"display_name\": \"rust\"}});\n \n store.put(&id, &payload).unwrap();\ndiff --git a/server/src/event_log.rs b/server/src/event_log.rs\nindex 36f5b406084065b608735987cdb483c236e03081..2c9290b6fdbf2c2ad1c0f1ffd7374b2d9cc97f36 100644\n--- a/server/src/event_log.rs\n+++ b/server/src/event_log.rs\n@@ -199,7 +199,7 @@ mod tests {\n log.append(&sample_record(\n 1,\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n ))\n .await\n@@ -237,7 +237,7 @@ mod tests {\n let path = tmp.path().join(\"events.jsonl\");\n let log = EventLog::new(&path);\n let event = Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n };\n log.append(&sample_record(1, event)).await.unwrap();\n \n@@ -255,7 +255,7 @@ mod tests {\n let path = tmp.path().join(\"events.jsonl\");\n std::fs::write(\n &path,\n- r#\"{\"type\":\"node_ensured\",\"id\":\"reddit.com/r/rust\"}\n+ r#\"{\"type\":\"node_ensured\",\"id\":\"https://reddit.com/r/rust\"}\n {\"schema\":1,\"seq\":1,\"ts\":1,\"event\":{\"type\":\"vote_recorded\",\"ts\":1,\"a\":\"a\",\"b\":\"b\",\"ratio_left\":2,\"ratio_right\":1,\"scope\":\"\"}}\n \"#,\n )\n@@ -295,7 +295,7 @@ mod tests {\n log.append(&sample_record(\n 1,\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n ))\n .await\n@@ -303,7 +303,7 @@ mod tests {\n log.append(&sample_record(\n 3,\n Event::NodeEnsured {\n- id: \"reddit.com/r/python\".into(),\n+ id: \"https://reddit.com/r/python\".into(),\n },\n ))\n .await\ndiff --git a/server/src/journal.rs b/server/src/journal.rs\nindex 521a108019de1ea870d14c4fafbfe572c20ce0de..50bc89f976edb82b7b0e49e954a8eccbbe82bf87 100644\n--- a/server/src/journal.rs\n+++ b/server/src/journal.rs\n@@ -141,10 +141,10 @@ mod tests {\n let j2 = journal.clone();\n let (r1, r2) = tokio::join!(\n j1.append(Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n }),\n j2.append(Event::NodeEnsured {\n- id: \"reddit.com/r/python\".into(),\n+ id: \"https://reddit.com/r/python\".into(),\n }),\n );\n r1.unwrap();\n@@ -153,10 +153,10 @@ mod tests {\n assert_eq!(projection_store.last_applied_event_count().unwrap(), 2);\n let tree = projection_store.load_tree().unwrap();\n assert!(tree\n- .get(&ItemId::parse(\"reddit.com/r/rust\").unwrap())\n+ .get(&ItemId::parse(\"https://reddit.com/r/rust\").unwrap())\n .is_some());\n assert!(tree\n- .get(&ItemId::parse(\"reddit.com/r/python\").unwrap())\n+ .get(&ItemId::parse(\"https://reddit.com/r/python\").unwrap())\n .is_some());\n }\n \n@@ -170,7 +170,7 @@ mod tests {\n 1,\n 1,\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n ))\n .await\n@@ -186,7 +186,7 @@ mod tests {\n 1,\n 1,\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n )],\n )\n@@ -202,7 +202,7 @@ mod tests {\n );\n journal\n .append(Event::NodeEnsured {\n- id: \"reddit.com/r/python\".into(),\n+ id: \"https://reddit.com/r/python\".into(),\n })\n .await\n .unwrap();\n@@ -227,13 +227,13 @@ mod tests {\n journal\n .append_many(vec![\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n Event::NodeEnsured {\n- id: \"reddit.com/r/python\".into(),\n+ id: \"https://reddit.com/r/python\".into(),\n },\n Event::NodeEnsured {\n- id: \"reddit.com/r/clojure\".into(),\n+ id: \"https://reddit.com/r/clojure\".into(),\n },\n ])\n .await\n@@ -245,7 +245,7 @@ mod tests {\n assert_eq!(projection_store.last_applied_event_count().unwrap(), 3);\n let tree = projection_store.load_tree().unwrap();\n assert!(tree\n- .get(&ItemId::parse(\"reddit.com/r/clojure\").unwrap())\n+ .get(&ItemId::parse(\"https://reddit.com/r/clojure\").unwrap())\n .is_some());\n }\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 9bd5f76fd1406b9b1be4c272f4ba8647edde2678..5c02c8e704e4664453bad75d819df8a067668176 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -9,6 +9,7 @@ pub mod journal;\n pub mod pair;\n pub mod parser;\n pub mod path_types;\n+pub mod url_rules;\n pub mod projection_apply;\n pub mod projection_store;\n pub mod ranking;\ndiff --git a/server/src/pair.rs b/server/src/pair.rs\nindex 43f780ba6ea6ce1cdc2e1f4cbb252ba8a10684b9..815a97b80e3e9f348e0937a4f147f2862018edb0 100644\n--- a/server/src/pair.rs\n+++ b/server/src/pair.rs\n@@ -381,42 +381,42 @@ mod tests {\n \n #[test]\n fn suggest_prefers_unvoted_pair() {\n- let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let parent = ItemId::parse(\"https://reddit.com/r/rust\").unwrap();\n let mut tree = seed_children(\n &parent,\n &[\n- \"reddit.com/r/rust/a\",\n- \"reddit.com/r/rust/b\",\n- \"reddit.com/r/rust/c\",\n+ \"https://reddit.com/r/rust/a\",\n+ \"https://reddit.com/r/rust/b\",\n+ \"https://reddit.com/r/rust/c\",\n ],\n );\n let vote =\n- VoteData::from_recorded(1, \"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 2, 1).unwrap();\n+ VoteData::from_recorded(1, \"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\", 2, 1).unwrap();\n tree.apply_vote(&parent, vote);\n let group = tree.get(&parent).unwrap().local_ranking.clone();\n let pool = children_of(&tree, &parent);\n let (l, r) = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n- let voted_ab = (l.as_str() == \"reddit.com/r/rust/a\" && r.as_str() == \"reddit.com/r/rust/b\")\n- || (l.as_str() == \"reddit.com/r/rust/b\" && r.as_str() == \"reddit.com/r/rust/a\");\n+ let voted_ab = (l.as_str() == \"https://reddit.com/r/rust/a\" && r.as_str() == \"https://reddit.com/r/rust/b\")\n+ || (l.as_str() == \"https://reddit.com/r/rust/b\" && r.as_str() == \"https://reddit.com/r/rust/a\");\n assert!(!voted_ab);\n }\n \n #[test]\n fn suggest_bridges_separate_components() {\n- let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let parent = ItemId::parse(\"https://reddit.com/r/rust\").unwrap();\n let mut tree = seed_children(\n &parent,\n &[\n- \"reddit.com/r/rust/a\",\n- \"reddit.com/r/rust/b\",\n- \"reddit.com/r/rust/c\",\n- \"reddit.com/r/rust/d\",\n+ \"https://reddit.com/r/rust/a\",\n+ \"https://reddit.com/r/rust/b\",\n+ \"https://reddit.com/r/rust/c\",\n+ \"https://reddit.com/r/rust/d\",\n ],\n );\n let ab =\n- VoteData::from_recorded(1, \"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 2, 1).unwrap();\n+ VoteData::from_recorded(1, \"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\", 2, 1).unwrap();\n let cd =\n- VoteData::from_recorded(2, \"reddit.com/r/rust/c\", \"reddit.com/r/rust/d\", 2, 1).unwrap();\n+ VoteData::from_recorded(2, \"https://reddit.com/r/rust/c\", \"https://reddit.com/r/rust/d\", 2, 1).unwrap();\n tree.apply_vote(&parent, ab);\n tree.apply_vote(&parent, cd);\n let group = tree.get(&parent).unwrap().local_ranking.clone();\n@@ -424,37 +424,37 @@ mod tests {\n let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n let chosen = pair_set(&pair);\n let from_ab =\n- chosen.contains(\"reddit.com/r/rust/a\") || chosen.contains(\"reddit.com/r/rust/b\");\n+ chosen.contains(\"https://reddit.com/r/rust/a\") || chosen.contains(\"https://reddit.com/r/rust/b\");\n let from_cd =\n- chosen.contains(\"reddit.com/r/rust/c\") || chosen.contains(\"reddit.com/r/rust/d\");\n+ chosen.contains(\"https://reddit.com/r/rust/c\") || chosen.contains(\"https://reddit.com/r/rust/d\");\n assert!(from_ab && from_cd, \"expected bridge pair, got {:?}\", chosen);\n }\n \n #[test]\n fn suggest_prefers_attach_over_isolate_pair_among_many_unranked() {\n- let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let parent = ItemId::parse(\"https://reddit.com/r/rust\").unwrap();\n let mut tree = seed_children(\n &parent,\n &[\n- \"reddit.com/r/rust/a\",\n- \"reddit.com/r/rust/b\",\n- \"reddit.com/r/rust/c\",\n- \"reddit.com/r/rust/d\",\n- \"reddit.com/r/rust/e\",\n+ \"https://reddit.com/r/rust/a\",\n+ \"https://reddit.com/r/rust/b\",\n+ \"https://reddit.com/r/rust/c\",\n+ \"https://reddit.com/r/rust/d\",\n+ \"https://reddit.com/r/rust/e\",\n ],\n );\n let ab =\n- VoteData::from_recorded(1, \"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 2, 1).unwrap();\n+ VoteData::from_recorded(1, \"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\", 2, 1).unwrap();\n tree.apply_vote(&parent, ab);\n let group = tree.get(&parent).unwrap().local_ranking.clone();\n let pool = children_of(&tree, &parent);\n let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n let chosen = pair_set(&pair);\n let from_ab =\n- chosen.contains(\"reddit.com/r/rust/a\") || chosen.contains(\"reddit.com/r/rust/b\");\n- let from_cde = chosen.contains(\"reddit.com/r/rust/c\")\n- || chosen.contains(\"reddit.com/r/rust/d\")\n- || chosen.contains(\"reddit.com/r/rust/e\");\n+ chosen.contains(\"https://reddit.com/r/rust/a\") || chosen.contains(\"https://reddit.com/r/rust/b\");\n+ let from_cde = chosen.contains(\"https://reddit.com/r/rust/c\")\n+ || chosen.contains(\"https://reddit.com/r/rust/d\")\n+ || chosen.contains(\"https://reddit.com/r/rust/e\");\n assert!(\n from_ab && from_cde,\n \"expected ranked+unranked attach, got {:?}\",\n@@ -464,40 +464,40 @@ mod tests {\n \n #[test]\n fn suggest_connects_isolate_to_existing_component() {\n- let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let parent = ItemId::parse(\"https://reddit.com/r/rust\").unwrap();\n let mut tree = seed_children(\n &parent,\n &[\n- \"reddit.com/r/rust/a\",\n- \"reddit.com/r/rust/b\",\n- \"reddit.com/r/rust/c\",\n+ \"https://reddit.com/r/rust/a\",\n+ \"https://reddit.com/r/rust/b\",\n+ \"https://reddit.com/r/rust/c\",\n ],\n );\n let ab =\n- VoteData::from_recorded(1, \"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 2, 1).unwrap();\n+ VoteData::from_recorded(1, \"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\", 2, 1).unwrap();\n tree.apply_vote(&parent, ab);\n let group = tree.get(&parent).unwrap().local_ranking.clone();\n let pool = children_of(&tree, &parent);\n let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n let chosen = pair_set(&pair);\n- assert!(chosen.contains(\"reddit.com/r/rust/c\"));\n- assert!(chosen.contains(\"reddit.com/r/rust/a\") || chosen.contains(\"reddit.com/r/rust/b\"));\n+ assert!(chosen.contains(\"https://reddit.com/r/rust/c\"));\n+ assert!(chosen.contains(\"https://reddit.com/r/rust/a\") || chosen.contains(\"https://reddit.com/r/rust/b\"));\n }\n \n #[test]\n fn suggest_zips_adjacent_ranks_when_tree_complete() {\n- let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let parent = ItemId::parse(\"https://reddit.com/r/rust\").unwrap();\n let mut tree = seed_children(\n &parent,\n &[\n- \"reddit.com/r/rust/a\",\n- \"reddit.com/r/rust/b\",\n- \"reddit.com/r/rust/c\",\n+ \"https://reddit.com/r/rust/a\",\n+ \"https://reddit.com/r/rust/b\",\n+ \"https://reddit.com/r/rust/c\",\n ],\n );\n for (a, b, l, r) in [\n- (\"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 3, 1),\n- (\"reddit.com/r/rust/a\", \"reddit.com/r/rust/c\", 2, 1),\n+ (\"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\", 3, 1),\n+ (\"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/c\", 2, 1),\n ] {\n let v = VoteData::from_recorded(1, a, b, l, r).unwrap();\n tree.apply_vote(&parent, v);\n@@ -506,26 +506,26 @@ mod tests {\n let pool = children_of(&tree, &parent);\n let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n let chosen = pair_set(&pair);\n- assert!(chosen.contains(\"reddit.com/r/rust/b\"));\n- assert!(chosen.contains(\"reddit.com/r/rust/c\"));\n+ assert!(chosen.contains(\"https://reddit.com/r/rust/b\"));\n+ assert!(chosen.contains(\"https://reddit.com/r/rust/c\"));\n }\n \n #[test]\n fn suggest_zip_prefers_1v2_before_2v3_when_both_unvoted() {\n- let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let parent = ItemId::parse(\"https://reddit.com/r/rust\").unwrap();\n let mut tree = seed_children(\n &parent,\n &[\n- \"reddit.com/r/rust/a\",\n- \"reddit.com/r/rust/b\",\n- \"reddit.com/r/rust/c\",\n- \"reddit.com/r/rust/d\",\n+ \"https://reddit.com/r/rust/a\",\n+ \"https://reddit.com/r/rust/b\",\n+ \"https://reddit.com/r/rust/c\",\n+ \"https://reddit.com/r/rust/d\",\n ],\n );\n for (a, b, l, r) in [\n- (\"reddit.com/r/rust/c\", \"reddit.com/r/rust/d\", 3, 1),\n- (\"reddit.com/r/rust/b\", \"reddit.com/r/rust/c\", 2, 1),\n- (\"reddit.com/r/rust/a\", \"reddit.com/r/rust/c\", 2, 1),\n+ (\"https://reddit.com/r/rust/c\", \"https://reddit.com/r/rust/d\", 3, 1),\n+ (\"https://reddit.com/r/rust/b\", \"https://reddit.com/r/rust/c\", 2, 1),\n+ (\"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/c\", 2, 1),\n ] {\n let v = VoteData::from_recorded(1, a, b, l, r).unwrap();\n tree.apply_vote(&parent, v);\n@@ -534,16 +534,16 @@ mod tests {\n let pool = children_of(&tree, &parent);\n let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n let chosen = pair_set(&pair);\n- assert!(chosen.contains(\"reddit.com/r/rust/a\"));\n- assert!(chosen.contains(\"reddit.com/r/rust/b\"));\n+ assert!(chosen.contains(\"https://reddit.com/r/rust/a\"));\n+ assert!(chosen.contains(\"https://reddit.com/r/rust/b\"));\n }\n \n #[test]\n fn resolve_pair_picks_from_pool() {\n- let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n- let tree = seed_children(&parent, &[\"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\"]);\n+ let parent = ItemId::parse(\"https://reddit.com/r/rust\").unwrap();\n+ let tree = seed_children(&parent, &[\"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\"]);\n let pair = resolve_pair(&tree, &parent, None, None).unwrap();\n- let pool: HashSet<_> = [\"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\"]\n+ let pool: HashSet<_> = [\"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\"]\n .into_iter()\n .collect();\n assert!(pool.contains(pair.0.as_str()));\ndiff --git a/server/src/parser.rs b/server/src/parser.rs\nindex 9df2dcc9313f7fe250ce3b6aa167f6ec5d57951f..b2a963dd6cab415576c8d3a9a241966758565bb8 100644\n--- a/server/src/parser.rs\n+++ b/server/src/parser.rs\n@@ -23,7 +23,7 @@ mod tests {\n fn parses_short_path() {\n assert_eq!(\n parse_reddit_url(\"r/rust\").unwrap().as_str(),\n- \"reddit.com/r/rust\"\n+ \"https://reddit.com/r/rust\"\n );\n }\n \n@@ -33,7 +33,7 @@ mod tests {\n parse_reddit_url(\"https://www.reddit.com/r/programming/hot\")\n .unwrap()\n .as_str(),\n- \"reddit.com/r/programming\"\n+ \"https://reddit.com/r/programming\"\n );\n }\n \n@@ -43,7 +43,10 @@ mod tests {\n \"https://old.reddit.com/r/AmItheAsshole/comments/1trnvdl/aita_for_cancelling/\",\n )\n .unwrap();\n- assert_eq!(id.as_str(), \"reddit.com/r/amitheasshole/comments/1trnvdl\");\n+ assert_eq!(\n+ id.as_str(),\n+ \"https://reddit.com/r/amitheasshole/comments/1trnvdl\"\n+ );\n }\n \n #[test]\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex fafd924452f6fd85e7a5b27ed2653a19581e6e56..71ffc01f35c5589686ff05dae3b5610fa01f30ce 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -1,13 +1,14 @@\n use serde::{Deserialize, Serialize};\n use std::fmt;\n \n-/// Canonical hierarchical identity for any URL/path in the fractal tree.\n+use crate::url_rules::{looks_like_url, navigable_breadcrumbs, parent_url, resolve_canonical};\n+\n+/// Canonical identity: a real URL (with scheme) or an opaque non-URL key.\n #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default)]\n pub struct ItemId(String);\n \n impl ItemId {\n- /// Parse an already-canonical path (no URL normalization). Empty string is invalid here;\n- /// use [`Self::root`] for the tree root.\n+ /// Parse an already-canonical id (no normalization). Empty string is invalid; use [`Self::root`].\n pub fn parse(s: &str) -> Option {\n let t = s.trim();\n if t.is_empty() {\n@@ -16,12 +17,12 @@ impl ItemId {\n Some(Self(t.to_string()))\n }\n \n- /// Build an opaque item key (legacy demo votes, non-URL items).\n+ /// Build an opaque item key (demo votes, non-URL items).\n pub fn opaque(s: impl Into) -> Self {\n Self(s.into())\n }\n \n- /// Root of the internet tree (empty path).\n+ /// Root of the internet tree.\n pub fn root() -> Self {\n Self(String::new())\n }\n@@ -34,23 +35,18 @@ impl ItemId {\n &self.0\n }\n \n- /// Creates a canonical ID from a raw URL or path. Normalizes domains and\n- /// trims tracking query params.\n+ /// Canonical URL from a raw pasted or fetched URL.\n pub fn from_url(raw_url: &str) -> Option {\n- Self::canonicalize(raw_url).map(Self)\n+ resolve_canonical(raw_url).map(Self)\n }\n \n- /// Normalize strings from forms, events, and Reddit imports into the same\n- /// stored id shape (e.g. drop post title slug after comment id).\n+ /// Normalize strings from forms, events, and imports into canonical identity.\n pub fn from_storage(s: &str) -> Option {\n let t = s.trim();\n if t.is_empty() {\n return None;\n }\n- if t.contains(\"://\") || t.starts_with(\"r/\") {\n- return Self::from_url(t).or_else(|| Self::parse(t));\n- }\n- if t.starts_with(\"reddit.com/\") && t.contains(\"/comments/\") {\n+ if looks_like_url(t) {\n return Self::from_url(t).or_else(|| Self::parse(t));\n }\n Self::parse(t).or_else(|| Self::from_url(t))\n@@ -62,35 +58,52 @@ impl ItemId {\n if s.is_empty() {\n return Self::root();\n }\n- Self(format!(\"reddit.com/r/{s}\"))\n+ if looks_like_url(s) || s.contains('/') {\n+ Self::from_storage(s).unwrap_or_else(|| Self::opaque(s))\n+ } else {\n+ Self(format!(\"https://reddit.com/r/{s}\"))\n+ }\n }\n \n- /// Extract the parent, e.g. `reddit.com/r/aww/comments/1trnvdl` →\n- /// `reddit.com/r/aww`.\n+ /// Immediate parent scope in the tree.\n pub fn parent(&self) -> Option {\n- if self.0.is_empty() {\n+ if self.is_root() {\n return None;\n }\n-\n+ if looks_like_url(self.0.as_str()) {\n+ return parent_url(self.0.as_str()).map(Self);\n+ }\n let parts: Vec<&str> = self.0.trim_end_matches('/').split('/').collect();\n if parts.len() <= 1 {\n return None;\n }\n-\n- if self.0.contains(\"/comments/\") {\n- return Some(Self(parts[..parts.len().saturating_sub(2)].join(\"/\")));\n- }\n-\n Some(Self(parts[..parts.len() - 1].join(\"/\")))\n }\n \n pub fn segments(&self) -> Vec<&str> {\n+ if self.is_root() {\n+ return vec![];\n+ }\n+ if let Some(rest) = self.0.strip_prefix(\"https://\") {\n+ return rest.split('/').filter(|s| !s.is_empty()).collect();\n+ }\n+ if let Some(rest) = self.0.strip_prefix(\"http://\") {\n+ return rest.split('/').filter(|s| !s.is_empty()).collect();\n+ }\n self.0.split('/').filter(|s| !s.is_empty()).collect()\n }\n \n- /// Cumulative paths for breadcrumb rendering, e.g.\n- /// `reddit.com/r/movies` → `[\"reddit.com\", \"reddit.com/r\", \"reddit.com/r/movies\"]`.\n+ /// Cumulative navigable paths for breadcrumbs and tree wiring (includes self).\n pub fn breadcrumb_paths(&self) -> Vec {\n+ if self.is_root() {\n+ return vec![];\n+ }\n+ if looks_like_url(self.0.as_str()) {\n+ return navigable_breadcrumbs(self.0.as_str())\n+ .into_iter()\n+ .map(ItemId)\n+ .collect();\n+ }\n let segs = self.segments();\n let mut paths = Vec::with_capacity(segs.len());\n let mut current = String::new();\n@@ -111,13 +124,13 @@ impl ItemId {\n if self.is_root() {\n return String::new();\n }\n- if self.as_str().contains(\"://\") {\n- return self.as_str().to_string();\n+ if self.0.contains(\"://\") {\n+ return self.0.clone();\n }\n if self.segments().first().is_some_and(|s| s.contains('.')) {\n- format!(\"https://{}\", self.as_str())\n+ format!(\"https://{}\", self.0)\n } else {\n- self.as_str().to_string()\n+ self.0.clone()\n }\n }\n \n@@ -144,70 +157,6 @@ impl ItemId {\n pub fn from_browse_uri(path: &str) -> Option {\n path.strip_prefix(\"/~/\").map(ItemId::from_browse_tail)\n }\n-\n- fn canonicalize(raw: &str) -> Option {\n- let s = raw.trim();\n- if s.is_empty() {\n- return None;\n- }\n-\n- let owned = if let Some(rest) = s.strip_prefix(\"r/\") {\n- format!(\"reddit.com/r/{rest}\")\n- } else if let Some(rest) = s.strip_prefix(\"/r/\") {\n- format!(\"reddit.com/r/{rest}\")\n- } else {\n- s.to_string()\n- };\n-\n- let (host_path, _query) = split_query(&owned);\n- let host_path = host_path.trim_end_matches('/');\n-\n- let path = if host_path.contains(\"://\") {\n- parse_url_host_path(host_path)?\n- } else if host_path.starts_with(\"reddit.com\") || host_path.starts_with(\"www.reddit.com\") {\n- normalize_reddit_host_path(host_path)\n- } else if host_path.contains('/') {\n- host_path.to_string()\n- } else {\n- return None;\n- };\n-\n- Some(normalize_reddit_path(&path))\n- }\n-}\n-\n-fn split_query(s: &str) -> (&str, Option<&str>) {\n- if let Some((path, q)) = s.split_once('?') {\n- (path, Some(q))\n- } else {\n- (s, None)\n- }\n-}\n-\n-fn parse_url_host_path(url: &str) -> Option {\n- let rest = url\n- .strip_prefix(\"https://\")\n- .or_else(|| url.strip_prefix(\"http://\"))\n- .unwrap_or(url);\n- let (host, path) = rest.split_once('/').unwrap_or((rest, \"\"));\n- let host = normalize_host(host);\n- if path.is_empty() {\n- Some(host)\n- } else {\n- Some(format!(\"{host}/{path}\"))\n- }\n-}\n-\n-fn normalize_host(host: &str) -> String {\n- let h = host\n- .strip_prefix(\"www.\")\n- .unwrap_or(host)\n- .to_ascii_lowercase();\n- if h == \"old.reddit.com\" || h == \"new.reddit.com\" || h == \"reddit.com\" {\n- \"reddit.com\".to_string()\n- } else {\n- h\n- }\n }\n \n fn normalize_browse_tail(tail: &str) -> String {\n@@ -215,7 +164,6 @@ fn normalize_browse_tail(tail: &str) -> String {\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@@ -225,33 +173,6 @@ fn normalize_browse_tail(tail: &str) -> String {\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- if path.is_empty() {\n- host\n- } else {\n- format!(\"{host}/{path}\")\n- }\n-}\n-\n-/// Lowercase subreddit segment, drop listing suffixes, drop title slug after post id.\n-fn normalize_reddit_path(path: &str) -> String {\n- let mut parts: Vec = path.split('/').map(str::to_string).collect();\n- if parts.len() >= 3 && parts[1] == \"r\" {\n- parts[2] = parts[2].to_ascii_lowercase();\n- }\n- if let Some(i) = parts.iter().position(|p| p == \"comments\") {\n- if parts.len() > i + 2 {\n- parts.truncate(i + 2);\n- }\n- } else if parts.len() > 3 && parts.get(1).map(|s| s.as_str()) == Some(\"r\") {\n- // reddit.com/r/{sub}/hot → reddit.com/r/{sub}\n- parts.truncate(3);\n- }\n- parts.join(\"/\")\n-}\n-\n impl fmt::Display for ItemId {\n fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {\n f.write_str(&self.0)\n@@ -268,43 +189,59 @@ mod tests {\n \"https://old.reddit.com/r/AmItheAsshole/comments/1trnvdl/aita_for_cancelling/\",\n )\n .unwrap();\n- assert_eq!(id.as_str(), \"reddit.com/r/amitheasshole/comments/1trnvdl\");\n+ assert_eq!(\n+ id.as_str(),\n+ \"https://reddit.com/r/amitheasshole/comments/1trnvdl\"\n+ );\n }\n \n #[test]\n fn from_url_strips_query() {\n let id = ItemId::from_url(\"https://www.reddit.com/r/rust/?sort=top\").unwrap();\n- assert_eq!(id.as_str(), \"reddit.com/r/rust\");\n+ assert_eq!(id.as_str(), \"https://reddit.com/r/rust\");\n }\n \n #[test]\n fn from_url_short_path() {\n assert_eq!(\n ItemId::from_url(\"r/rust\").unwrap().as_str(),\n- \"reddit.com/r/rust\"\n+ \"https://reddit.com/r/rust\"\n );\n }\n \n #[test]\n fn parent_of_post_is_subreddit() {\n- let id = ItemId::parse(\"reddit.com/r/aww/comments/1trnvdl\").unwrap();\n- assert_eq!(id.parent().unwrap().as_str(), \"reddit.com/r/aww\");\n+ let id = ItemId::from_url(\"https://reddit.com/r/aww/comments/1trnvdl\").unwrap();\n+ assert_eq!(id.parent().unwrap().as_str(), \"https://reddit.com/r/aww\");\n }\n \n #[test]\n fn parent_of_subreddit_is_r_segment() {\n- let id = ItemId::parse(\"reddit.com/r/movies\").unwrap();\n- assert_eq!(id.parent().unwrap().as_str(), \"reddit.com/r\");\n+ let id = ItemId::from_url(\"https://reddit.com/r/movies\").unwrap();\n+ assert_eq!(id.parent().unwrap().as_str(), \"https://reddit.com/r\");\n+ }\n+\n+ #[test]\n+ fn breadcrumb_paths_skip_phantom_comments() {\n+ let id = ItemId::from_url(\"https://reddit.com/r/aww/comments/1trnvdl\").unwrap();\n+ let crumbs = id.breadcrumb_paths();\n+ let paths: Vec<_> = crumbs.iter().map(|p| p.as_str()).collect();\n+ assert!(!paths.iter().any(|p| p.ends_with(\"/comments\")));\n+ assert!(paths.contains(&\"https://reddit.com/r/aww\"));\n }\n \n #[test]\n- fn breadcrumb_paths() {\n- let id = ItemId::parse(\"reddit.com/r/movies\").unwrap();\n+ fn breadcrumb_paths_subreddit() {\n+ let id = ItemId::from_url(\"https://reddit.com/r/movies\").unwrap();\n let crumbs = id.breadcrumb_paths();\n let paths: Vec<_> = crumbs.iter().map(|p| p.as_str()).collect();\n assert_eq!(\n paths,\n- vec![\"reddit.com\", \"reddit.com/r\", \"reddit.com/r/movies\"]\n+ vec![\n+ \"https://reddit.com\",\n+ \"https://reddit.com/r\",\n+ \"https://reddit.com/r/movies\"\n+ ]\n );\n }\n \n@@ -312,33 +249,33 @@ mod tests {\n fn legacy_scope_maps_to_reddit_sub() {\n assert_eq!(\n ItemId::from_legacy_scope(\"rust\").as_str(),\n- \"reddit.com/r/rust\"\n+ \"https://reddit.com/r/rust\"\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+ fn browse_href_wraps_canonical_url() {\n+ let id = ItemId::from_url(\"https://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+ assert_eq!(id.as_str(), \"https://reddit.com/r/amitheasshole\");\n }\n \n #[test]\n fn from_storage_strips_post_title_slug() {\n let id =\n ItemId::from_storage(\"reddit.com/r/rust/comments/aaa/announcing_rust_199\").unwrap();\n- assert_eq!(id.as_str(), \"reddit.com/r/rust/comments/aaa\");\n+ assert_eq!(id.as_str(), \"https://reddit.com/r/rust/comments/aaa\");\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+ assert_eq!(id.as_str(), \"https://reddit.com/r/rust\");\n }\n }\ndiff --git a/server/src/projection_apply.rs b/server/src/projection_apply.rs\nindex ebe122e417bda1d9369a53443de93d28213c5a0d..5644557a41b3e9497c7421b444155ae629fa79f1 100644\n--- a/server/src/projection_apply.rs\n+++ b/server/src/projection_apply.rs\n@@ -19,13 +19,21 @@ use crate::{\n storage_schema::{ensure_path_writes, entity_view_writes, vote_writes},\n };\n \n-/// Legacy-compatible scope parsing for persisted vote events.\n+fn parse_event_id(id: &str) -> Result {\n+ ItemId::from_storage(id)\n+ .or_else(|| ItemId::parse(id))\n+ .ok_or_else(|| EventLogError::Apply(format!(\"invalid id: {id}\")))\n+}\n+\n+/// Scope key from a vote event (canonicalized at apply time).\n fn parent_from_event_scope(scope: &str) -> ItemId {\n- if scope.contains('/') {\n- ItemId::parse(scope).unwrap_or_else(|| ItemId::from_legacy_scope(scope))\n- } else {\n- ItemId::from_legacy_scope(scope)\n+ let s = scope.trim();\n+ if s.is_empty() {\n+ return ItemId::root();\n }\n+ ItemId::from_storage(s)\n+ .or_else(|| ItemId::parse(s))\n+ .unwrap_or_else(|| ItemId::from_legacy_scope(s))\n }\n \n pub fn apply_records(\n@@ -68,15 +76,11 @@ pub fn apply_records(\n vote_parents.insert(parent);\n }\n Event::NodeEnsured { id } => {\n- let parsed = ItemId::parse(id)\n- .or_else(|| ItemId::from_url(id))\n- .ok_or_else(|| EventLogError::Apply(format!(\"invalid node id: {id}\")))?;\n+ let parsed = parse_event_id(id)?;\n ensure_path_writes(&mut batch, &parsed);\n }\n Event::EntityImported { id, payload, .. } => {\n- let parsed = ItemId::parse(id)\n- .or_else(|| ItemId::from_url(id))\n- .ok_or_else(|| EventLogError::Apply(format!(\"invalid entity id: {id}\")))?;\n+ let parsed = parse_event_id(id)?;\n let view = entity_view_from_payload(&parsed, payload);\n entity_view_writes(&mut batch, &parsed, view.as_ref());\n entity_store\n@@ -92,7 +96,6 @@ pub fn apply_records(\n .commit_with(durable::Durability::DisableWal)\n .map_err(|e| EventLogError::Apply(e.to_string()))?;\n \n- // Cap recent-vote windows (idempotent, blind; not part of the cursor batch).\n for parent in vote_parents {\n projection_store\n .trim_recent_votes(&parent)\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex 72caf7c33b9dd44ea15b62b59e91227cf96a3431..20b7f9e3f8be39268a1767d09f5cf81eaa6ae0df 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -183,7 +183,7 @@ pub fn entity_view_from_payload(\n id: &ItemId,\n payload: &Value,\n ) -> Option {\n- if id.as_str().starts_with(\"reddit.com\") {\n+ if id.as_str().contains(\"reddit.com\") {\n return parse_reddit_view(id, payload);\n }\n None\n@@ -495,41 +495,59 @@ fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 {\n .unwrap_or(5)\n }\n \n+fn reddit_path_segments(id: &ItemId) -> Option> {\n+ let s = id.as_str();\n+ let rest = s\n+ .strip_prefix(\"https://reddit.com/\")\n+ .or_else(|| s.strip_prefix(\"http://reddit.com/\"))\n+ .or_else(|| s.strip_prefix(\"reddit.com/\"))?;\n+ let segments: Vec = rest\n+ .split('/')\n+ .filter(|p| !p.is_empty())\n+ .map(str::to_string)\n+ .collect();\n+ Some(segments)\n+}\n+\n pub fn map_item_to_reddit_api(id: &ItemId, api_base: &str) -> String {\n- let path = id.as_str();\n- if !path.starts_with(\"reddit.com/\") && path != \"reddit.com\" {\n- return String::new();\n- }\n+ let segments = match reddit_path_segments(id) {\n+ Some(s) => s,\n+ None if matches!(\n+ id.as_str(),\n+ \"https://reddit.com\" | \"http://reddit.com\" | \"reddit.com\"\n+ ) =>\n+ {\n+ return String::new();\n+ }\n+ None => return String::new(),\n+ };\n \n let base = api_base.trim_end_matches('/');\n \n- let segments: Vec<&str> = path.split('/').collect();\n-\n- if let Some(i) = segments.iter().position(|&p| p == \"comments\") {\n+ if let Some(i) = segments.iter().position(|p| p == \"comments\") {\n if segments.len() > i + 1 {\n- let api_path = segments[1..=i + 1].join(\"/\");\n+ let api_path = segments[..=i + 1].join(\"/\");\n return format!(\"{base}/{api_path}.json?raw_json=1\");\n }\n }\n \n- if segments.len() == 3 && segments[1] == \"r\" {\n- return format!(\"{base}/r/{}/about.json?raw_json=1\", segments[2]);\n+ if segments.len() == 2 && segments[0] == \"r\" {\n+ return format!(\"{base}/r/{}/about.json?raw_json=1\", segments[1]);\n }\n \n String::new()\n }\n \n /// Listing URL for a node's children. Currently only subreddits\n-/// (`reddit.com/r/` → `/r/.json`) expose a child listing.\n+/// (`https://reddit.com/r/` → `/r/.json`) expose a child listing.\n pub fn map_children_url(id: &ItemId, api_base: &str) -> String {\n- let path = id.as_str();\n- if !path.starts_with(\"reddit.com/\") {\n- return String::new();\n- }\n+ let segments = match reddit_path_segments(id) {\n+ Some(s) => s,\n+ None => return String::new(),\n+ };\n let base = api_base.trim_end_matches('/');\n- let segments: Vec<&str> = path.split('/').collect();\n- if segments.len() == 3 && segments[1] == \"r\" {\n- return format!(\"{base}/r/{}.json?raw_json=1&limit=25\", segments[2]);\n+ if segments.len() == 2 && segments[0] == \"r\" {\n+ return format!(\"{base}/r/{}.json?raw_json=1&limit=25\", segments[1]);\n }\n String::new()\n }\n@@ -548,8 +566,8 @@ fn parse_children(_parent: &ItemId, payload: &Value) -> Vec<(ItemId, Value)> {\n Some(p) if !p.is_empty() => p,\n _ => continue,\n };\n- let path = format!(\"reddit.com{}\", permalink.trim_end_matches('/'));\n- if let Some(id) = ItemId::from_storage(&path) {\n+ let raw = format!(\"https://reddit.com{}\", permalink.trim_end_matches('/'));\n+ if let Some(id) = ItemId::from_url(&raw) {\n out.push((id, child.clone()));\n }\n }\n@@ -683,7 +701,7 @@ mod tests {\n \n #[test]\n fn map_subreddit_about_url() {\n- let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let id = ItemId::from_url(\"https://reddit.com/r/rust\").unwrap();\n assert_eq!(\n map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n \"https://www.reddit.com/r/rust/about.json?raw_json=1\"\n@@ -699,7 +717,8 @@ mod tests {\n let json = include_str!(\"../../test/fixtures/reddit/r_rust_about.json\");\n let v: Value = serde_json::from_str(json).unwrap();\n let entity =\n- entity_view_from_payload(&ItemId::parse(\"reddit.com/r/rust\").unwrap(), &v).unwrap();\n+ entity_view_from_payload(&ItemId::from_url(\"https://reddit.com/r/rust\").unwrap(), &v)\n+ .unwrap();\n assert_eq!(entity.title, \"The Rust Programming Language\");\n }\n \n@@ -707,7 +726,8 @@ mod tests {\n fn parse_post_listing_extracts_thumb_and_full_preview() {\n let json = include_str!(\"../../test/fixtures/reddit/post_preview.json\");\n let v: Value = serde_json::from_str(json).unwrap();\n- let id = ItemId::parse(\"reddit.com/r/nsfw/comments/1tpy6a1/angel_eyes\").unwrap();\n+ let id =\n+ ItemId::from_url(\"https://reddit.com/r/nsfw/comments/1tpy6a1/angel_eyes\").unwrap();\n let entity = entity_view_from_payload(&id, &v).unwrap();\n assert_eq!(entity.title, \"Angel Eyes\");\n assert!(entity.thumb_url.as_ref().unwrap().contains(\"width=140\"));\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 6578f64a41726845517cdbf59a359c69e0aa56db..5179ddeca7a7cb0fb92dfc4aa9d5a80bd9125611 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -248,16 +248,18 @@ mod from_recorded_tests {\n #[test]\n fn ensure_path_wires_children() {\n let mut tree = GlobalTree::new();\n- let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let id = ItemId::from_url(\"https://reddit.com/r/rust\").unwrap();\n tree.ensure_path(&id);\n let root = tree.get(&ItemId::root()).unwrap();\n assert!(root\n .children\n- .contains(&ItemId::parse(\"reddit.com\").unwrap()));\n- let reddit = tree.get(&ItemId::parse(\"reddit.com\").unwrap()).unwrap();\n+ .contains(&ItemId::from_url(\"https://reddit.com\").unwrap()));\n+ let reddit = tree\n+ .get(&ItemId::from_url(\"https://reddit.com\").unwrap())\n+ .unwrap();\n assert!(reddit\n .children\n- .contains(&ItemId::parse(\"reddit.com/r\").unwrap()));\n+ .contains(&ItemId::from_url(\"https://reddit.com/r\").unwrap()));\n let sub = tree.get(&id).unwrap();\n assert_eq!(sub.id, id);\n }\ndiff --git a/server/src/render/reddit.rs b/server/src/render/reddit.rs\nindex 7f840aa33b734a31d8cf3341a0581c8bcb9bbcf3..595e202436040b0bfc419e68f083f94757ba5d0c 100644\n--- a/server/src/render/reddit.rs\n+++ b/server/src/render/reddit.rs\n@@ -9,7 +9,7 @@ use crate::{\n };\n \n pub fn is_reddit_post(id: &ItemId) -> bool {\n- id.as_str().starts_with(\"reddit.com/\") && id.as_str().contains(\"/comments/\")\n+ id.as_str().contains(\"reddit.com/\") && id.as_str().contains(\"/comments/\")\n }\n \n /// Post detail card (inside [`crate::fetch::html::entity_panel`]).\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 78126f08d90f8069a586279d79258c27a9f9f7a4..513b329ef45fc332e63b3f8ed8498a1f59feb07c 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -217,15 +217,21 @@ impl AppState {\n ratio_right: i32,\n ) -> Result<(), String> {\n let ts = crate::html::now_ms();\n- let vote = VoteData::from_recorded(ts, a, b, ratio_left, ratio_right)\n- .ok_or_else(|| \"invalid vote: need two distinct non-empty items\".to_string())?;\n+ let a_raw = a.trim();\n+ let b_raw = b.trim();\n+ if a_raw.is_empty() || b_raw.is_empty() || a_raw == b_raw {\n+ return Err(\"invalid vote: need two distinct non-empty items\".to_string());\n+ }\n+ // Validate items canonicalize (or are opaque keys) before append.\n+ let _ = VoteData::from_recorded(ts, a_raw, b_raw, ratio_left, ratio_right)\n+ .ok_or_else(|| \"invalid vote: need two distinct parseable items\".to_string())?;\n \n let event = Event::VoteRecorded {\n ts,\n- a: vote.a.as_str().to_string(),\n- b: vote.b.as_str().to_string(),\n- ratio_left: vote.ratio_left,\n- ratio_right: vote.ratio_right,\n+ a: a_raw.to_string(),\n+ b: b_raw.to_string(),\n+ ratio_left,\n+ ratio_right,\n scope: parent.as_str().to_string(),\n };\n \n@@ -253,7 +259,7 @@ mod tests {\n let log = EventLog::new(log_path.to_string_lossy().into_owned());\n let payload = json!({\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\"}});\n let event = Event::EntityImported {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n ts: 1,\n payload: payload.clone(),\n };\n@@ -266,14 +272,14 @@ mod tests {\n .await\n .unwrap();\n let tree = projection_store\n- .scope_tree(&ItemId::parse(\"reddit.com/r/rust\").unwrap())\n+ .scope_tree(&ItemId::parse(\"https://reddit.com/r/rust\").unwrap())\n .unwrap();\n let node = tree\n- .get(&ItemId::parse(\"reddit.com/r/rust\").unwrap())\n+ .get(&ItemId::parse(\"https://reddit.com/r/rust\").unwrap())\n .unwrap();\n assert_eq!(node.data.as_ref().unwrap().title, \"Rust\");\n let stored = entity_store\n- .get(&ItemId::parse(\"reddit.com/r/rust\").unwrap())\n+ .get(&ItemId::parse(\"https://reddit.com/r/rust\").unwrap())\n .unwrap()\n .unwrap();\n assert_eq!(stored[\"data\"][\"display_name\"], \"rust\");\n@@ -289,13 +295,13 @@ mod tests {\n event_record(\n 1,\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n ),\n event_record(\n 2,\n Event::EntityImported {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n ts: 2,\n payload: payload.clone(),\n },\n@@ -325,7 +331,7 @@ mod tests {\n &[event_record(\n 1,\n Event::NodeEnsured {\n- id: \"reddit.com/r/stale\".into(),\n+ id: \"https://reddit.com/r/stale\".into(),\n },\n )],\n )\n@@ -352,11 +358,11 @@ mod tests {\n let root = tree.get(&ItemId::root()).unwrap();\n assert!(root.children.contains(&ItemId::parse(\"alpha\").unwrap()));\n assert!(projection_store\n- .load_node(&ItemId::parse(\"reddit.com/r/stale\").unwrap())\n+ .load_node(&ItemId::parse(\"https://reddit.com/r/stale\").unwrap())\n .unwrap()\n .is_none());\n let stored = entity_store\n- .get(&ItemId::parse(\"reddit.com/r/rust\").unwrap())\n+ .get(&ItemId::parse(\"https://reddit.com/r/rust\").unwrap())\n .unwrap()\n .unwrap();\n assert_eq!(stored[\"data\"][\"display_name\"], \"rust\");\n@@ -370,7 +376,7 @@ mod tests {\n log.append(&event_record(\n 1,\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n ))\n .await\n@@ -387,7 +393,7 @@ mod tests {\n &[event_record(\n 2,\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n )],\n )\n@@ -454,7 +460,7 @@ mod tests {\n port: 0,\n })\n .await;\n- let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ let id = ItemId::parse(\"https://reddit.com/r/rust\").unwrap();\n \n state.ensure_node(&id).await.unwrap();\n \n@@ -465,11 +471,11 @@ mod tests {\n let projected = state.projection_store.load_tree().unwrap();\n assert!(projected.get(&id).is_some());\n let reddit = projected\n- .get(&ItemId::parse(\"reddit.com\").unwrap())\n+ .get(&ItemId::from_url(\"https://reddit.com\").unwrap())\n .unwrap();\n assert!(reddit\n .children\n- .contains(&ItemId::parse(\"reddit.com/r\").unwrap()));\n+ .contains(&ItemId::from_url(\"https://reddit.com/r\").unwrap()));\n }\n \n #[tokio::test]\n@@ -510,7 +516,7 @@ mod tests {\n log.append(&event_record(\n 1,\n Event::NodeEnsured {\n- id: \"reddit.com/r/rust\".into(),\n+ id: \"https://reddit.com/r/rust\".into(),\n },\n ))\n .await\n@@ -518,7 +524,7 @@ mod tests {\n log.append(&event_record(\n 2,\n Event::NodeEnsured {\n- id: \"reddit.com/r/python\".into(),\n+ id: \"https://reddit.com/r/python\".into(),\n },\n ))\n .await\n@@ -544,13 +550,13 @@ mod tests {\n 2\n );\n let tree = second\n- .scope_tree(&ItemId::parse(\"reddit.com/r/rust\").unwrap())\n+ .scope_tree(&ItemId::parse(\"https://reddit.com/r/rust\").unwrap())\n .unwrap();\n assert!(tree\n- .get(&ItemId::parse(\"reddit.com/r/rust\").unwrap())\n+ .get(&ItemId::parse(\"https://reddit.com/r/rust\").unwrap())\n .is_some());\n assert!(tree\n- .get(&ItemId::parse(\"reddit.com/r/python\").unwrap())\n+ .get(&ItemId::parse(\"https://reddit.com/r/python\").unwrap())\n .is_none());\n }\n \n@@ -611,7 +617,7 @@ mod tests {\n #[test]\n fn parse_item_param_from_url() {\n let id = parse_item_param(\"https://reddit.com/r/rust\");\n- assert_eq!(id.as_str(), \"reddit.com/r/rust\");\n+ assert_eq!(id.as_str(), \"https://reddit.com/r/rust\");\n }\n \n #[test]\ndiff --git a/server/src/url_rules/engine.rs b/server/src/url_rules/engine.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..e29b6b48c08deb7bffe031b1e542b1e25a7bef15\n--- /dev/null\n+++ b/server/src/url_rules/engine.rs\n@@ -0,0 +1,187 @@\n+//! Composable URL normalization primitives.\n+\n+use std::collections::HashMap;\n+\n+use url::Url;\n+\n+/// Mutable URL view used by rule combinators before serializing to a canonical string.\n+#[derive(Debug, Clone)]\n+pub struct ParsedUrl {\n+ pub scheme: String,\n+ pub host: String,\n+ pub path_segments: Vec,\n+ pub query: HashMap,\n+ pub fragment: Option,\n+}\n+\n+impl ParsedUrl {\n+ pub fn parse(raw: &str) -> Option {\n+ let trimmed = raw.trim();\n+ if trimmed.is_empty() {\n+ return None;\n+ }\n+\n+ let with_scheme = if trimmed.contains(\"://\") {\n+ trimmed.to_string()\n+ } else if trimmed.starts_with(\"r/\") || trimmed.starts_with(\"/r/\") {\n+ let rest = trimmed.trim_start_matches('/').trim_start_matches(\"r/\");\n+ format!(\"https://reddit.com/r/{rest}\")\n+ } else if trimmed.contains('.') && !trimmed.starts_with('/') {\n+ format!(\"https://{trimmed}\")\n+ } else {\n+ trimmed.to_string()\n+ };\n+\n+ let url = Url::parse(&with_scheme).ok()?;\n+ let host = url.host_str()?.to_string();\n+ let path_segments: Vec = url\n+ .path_segments()\n+ .map(|segs| segs.filter(|s| !s.is_empty()).map(str::to_string).collect())\n+ .unwrap_or_default();\n+\n+ let mut query = HashMap::new();\n+ for (k, v) in url.query_pairs() {\n+ query.insert(k.into_owned(), v.into_owned());\n+ }\n+\n+ Some(Self {\n+ scheme: url.scheme().to_string(),\n+ path_segments,\n+ query,\n+ fragment: url.fragment().map(str::to_string),\n+ host,\n+ })\n+ }\n+\n+ pub fn with_path_segments(&self, segments: &[String]) -> Self {\n+ let mut u = self.clone();\n+ u.path_segments = segments.to_vec();\n+ u\n+ }\n+\n+ pub fn to_url(&self) -> Option {\n+ let mut url = if self.path_segments.is_empty() {\n+ Url::parse(&format!(\"{}://{}\", self.scheme, self.host)).ok()?\n+ } else {\n+ let path = format!(\"/{}\", self.path_segments.join(\"/\"));\n+ Url::parse(&format!(\"{}://{}{}\", self.scheme, self.host, path)).ok()?\n+ };\n+ if !self.query.is_empty() {\n+ let mut pairs: Vec<_> = self.query.iter().collect();\n+ pairs.sort_by(|a, b| a.0.cmp(b.0));\n+ url.query_pairs_mut().clear();\n+ for (k, v) in pairs {\n+ url.query_pairs_mut().append_pair(k, v);\n+ }\n+ }\n+ if let Some(ref frag) = self.fragment {\n+ url.set_fragment(Some(frag));\n+ }\n+ Some(url)\n+ }\n+\n+ pub fn canonical_string(&self) -> Option {\n+ let url = self.to_url()?;\n+ let mut s = url.to_string();\n+ if self.path_segments.is_empty() {\n+ s = s.trim_end_matches('/').to_string();\n+ }\n+ Some(s)\n+ }\n+}\n+\n+pub fn force_https(u: &mut ParsedUrl) {\n+ if u.scheme == \"http\" {\n+ u.scheme = \"https\".to_string();\n+ }\n+}\n+\n+pub fn drop_fragment(u: &mut ParsedUrl) {\n+ u.fragment = None;\n+}\n+\n+pub fn strip_www(u: &mut ParsedUrl) {\n+ if u.host.starts_with(\"www.\") {\n+ u.host = u.host[4..].to_string();\n+ }\n+}\n+\n+pub fn lowercase_host(u: &mut ParsedUrl) {\n+ u.host = u.host.to_ascii_lowercase();\n+}\n+\n+pub fn lowercase_path(u: &mut ParsedUrl) {\n+ for seg in &mut u.path_segments {\n+ *seg = seg.to_ascii_lowercase();\n+ }\n+}\n+\n+pub fn clear_query(u: &mut ParsedUrl) {\n+ u.query.clear();\n+}\n+\n+pub fn keep_only_query(u: &mut ParsedUrl, keys: &[&str]) {\n+ u.query\n+ .retain(|k, _| keys.iter().any(|want| want == &k.as_str()));\n+}\n+\n+pub fn strip_tracking_params(u: &mut ParsedUrl) {\n+ u.query.retain(|k, _| {\n+ let lower = k.to_ascii_lowercase();\n+ !(lower.starts_with(\"utm_\")\n+ || matches!(\n+ lower.as_str(),\n+ \"fbclid\" | \"gclid\" | \"ref\" | \"ref_src\" | \"ref_source\" | \"mc_cid\" | \"mc_eid\"\n+ ))\n+ });\n+}\n+\n+pub fn truncate_after_segment(u: &mut ParsedUrl, name: &str, keep: usize) {\n+ if let Some(i) = u.path_segments.iter().position(|s| s == name) {\n+ let end = (i + 1 + keep).min(u.path_segments.len());\n+ u.path_segments.truncate(end);\n+ }\n+}\n+\n+pub fn drop_listing_suffix(u: &mut ParsedUrl, suffixes: &[&str]) {\n+ if u.path_segments.len() >= 3 && u.path_segments.first().map(String::as_str) == Some(\"r\") {\n+ if let Some(last) = u.path_segments.last() {\n+ if suffixes.iter().any(|s| *s == last.as_str()) {\n+ u.path_segments.pop();\n+ }\n+ }\n+ }\n+}\n+\n+pub fn normalize_reddit_host(u: &mut ParsedUrl) {\n+ if matches!(\n+ u.host.as_str(),\n+ \"old.reddit.com\" | \"new.reddit.com\" | \"www.reddit.com\"\n+ ) {\n+ u.host = \"reddit.com\".to_string();\n+ }\n+}\n+\n+pub fn rewrite_youtu_be(u: &mut ParsedUrl) {\n+ if u.host == \"youtu.be\" && u.path_segments.len() == 1 {\n+ let id = u.path_segments[0].clone();\n+ u.host = \"youtube.com\".to_string();\n+ u.path_segments = vec![\"watch\".to_string()];\n+ u.query.insert(\"v\".to_string(), id);\n+ }\n+}\n+\n+pub fn rewrite_youtube_shorts(u: &mut ParsedUrl) {\n+ if u.host == \"youtube.com\" && u.path_segments.first().map(String::as_str) == Some(\"shorts\") {\n+ if let Some(id) = u.path_segments.get(1).cloned() {\n+ u.path_segments = vec![\"watch\".to_string()];\n+ u.query.insert(\"v\".to_string(), id);\n+ }\n+ }\n+}\n+\n+pub fn normalize_youtube_host(u: &mut ParsedUrl) {\n+ if matches!(u.host.as_str(), \"m.youtube.com\" | \"www.youtube.com\") {\n+ u.host = \"youtube.com\".to_string();\n+ }\n+}\ndiff --git a/server/src/url_rules/mod.rs b/server/src/url_rules/mod.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..03d53bd3e82d704a01ba3fd8dd02b7d31422c0de\n--- /dev/null\n+++ b/server/src/url_rules/mod.rs\n@@ -0,0 +1,13 @@\n+//! URL canonicalization and hierarchy rules for [`crate::path_types::ItemId`].\n+\n+mod engine;\n+mod registry;\n+\n+pub use registry::{\n+ canonicalize_raw, looks_like_url, navigable_breadcrumbs, parent_url, resolve_id, CanonicalResult,\n+};\n+\n+/// Resolve raw input to canonical URL.\n+pub fn resolve_canonical(raw: &str) -> Option {\n+ canonicalize_raw(raw.trim()).map(|r| r.canonical)\n+}\ndiff --git a/server/src/url_rules/registry.rs b/server/src/url_rules/registry.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..14514e9af8385fb2b9b2f35eb9ee14d453d4b97c\n--- /dev/null\n+++ b/server/src/url_rules/registry.rs\n@@ -0,0 +1,235 @@\n+//! Per-domain canonicalization and hierarchy rules.\n+\n+use std::collections::HashSet;\n+\n+use super::engine::{\n+ clear_query, drop_fragment, drop_listing_suffix, force_https, keep_only_query, lowercase_host,\n+ lowercase_path, normalize_reddit_host, normalize_youtube_host, rewrite_youtu_be,\n+ rewrite_youtube_shorts, strip_tracking_params, strip_www, truncate_after_segment, ParsedUrl,\n+};\n+\n+/// Result of canonicalizing a raw URL string.\n+#[derive(Debug, Clone, PartialEq, Eq)]\n+pub struct CanonicalResult {\n+ pub canonical: String,\n+ /// When the input normalizes to a different string, the original is an alias.\n+ pub alias_of: Option,\n+}\n+\n+fn apply_global(u: &mut ParsedUrl) {\n+ force_https(u);\n+ drop_fragment(u);\n+ strip_www(u);\n+ lowercase_host(u);\n+ strip_tracking_params(u);\n+}\n+\n+fn normalize_reddit(u: &mut ParsedUrl) {\n+ normalize_reddit_host(u);\n+ lowercase_path(u);\n+ truncate_after_segment(u, \"comments\", 1);\n+ drop_listing_suffix(u, &[\"hot\", \"top\", \"new\", \"rising\", \"controversial\"]);\n+ clear_query(u);\n+}\n+\n+fn normalize_youtube(u: &mut ParsedUrl) {\n+ rewrite_youtu_be(u);\n+ normalize_youtube_host(u);\n+ rewrite_youtube_shorts(u);\n+ keep_only_query(u, &[\"v\", \"list\"]);\n+}\n+\n+fn normalize_default(_u: &mut ParsedUrl) {\n+ // Global rules only.\n+}\n+\n+fn domain_key(host: &str) -> &'static str {\n+ if host == \"reddit.com\" || host.ends_with(\".reddit.com\") {\n+ \"reddit.com\"\n+ } else if host == \"youtube.com\" || host == \"youtu.be\" {\n+ \"youtube.com\"\n+ } else {\n+ \"default\"\n+ }\n+}\n+\n+fn normalize_for_host(u: &mut ParsedUrl) {\n+ apply_global(u);\n+ match domain_key(&u.host) {\n+ \"reddit.com\" => normalize_reddit(u),\n+ \"youtube.com\" => normalize_youtube(u),\n+ _ => normalize_default(u),\n+ }\n+}\n+\n+/// Structural path segments that must not become standalone tree nodes when more path follows.\n+fn structural_trailing(host: &str) -> &'static [&'static str] {\n+ match domain_key(host) {\n+ \"reddit.com\" => &[\"comments\"],\n+ _ => &[],\n+ }\n+}\n+\n+/// Canonicalize a raw URL. Returns `None` if the input is not URL-like.\n+pub fn canonicalize_raw(raw: &str) -> Option {\n+ let trimmed = raw.trim();\n+ if trimmed.is_empty() {\n+ return None;\n+ }\n+ let mut u = ParsedUrl::parse(trimmed)?;\n+ let input_snapshot = u.canonical_string()?;\n+ normalize_for_host(&mut u);\n+ let canonical = u.canonical_string()?;\n+ let alias_of = if input_snapshot != canonical {\n+ Some(trimmed.to_string())\n+ } else {\n+ None\n+ };\n+ Some(CanonicalResult {\n+ canonical,\n+ alias_of,\n+ })\n+}\n+\n+/// Resolve a stored or event id string to its canonical URL identity.\n+pub fn resolve_id(raw: &str) -> Option {\n+ canonicalize_raw(raw).map(|r| r.canonical)\n+}\n+\n+/// Navigable ancestor URLs from domain root up to and including `canonical` (full URLs).\n+pub fn navigable_breadcrumbs(canonical: &str) -> Vec {\n+ let Some(u) = ParsedUrl::parse(canonical) else {\n+ return vec![canonical.to_string()];\n+ };\n+ let structural: HashSet<&str> = structural_trailing(&u.host).iter().copied().collect();\n+ let n = u.path_segments.len();\n+ let mut out = Vec::new();\n+\n+ // Domain root (no path segments).\n+ if let Some(base) = u.with_path_segments(&[]).canonical_string() {\n+ out.push(base);\n+ }\n+\n+ for i in 0..n {\n+ let segs: Vec = u.path_segments[..=i].to_vec();\n+ let is_last = i == n - 1;\n+ let seg = u.path_segments[i].as_str();\n+ if structural.contains(seg) && !is_last {\n+ continue;\n+ }\n+ if let Some(url) = u.with_path_segments(&segs).canonical_string() {\n+ if out.last() != Some(&url) {\n+ out.push(url);\n+ }\n+ }\n+ }\n+ out\n+}\n+\n+/// Immediate parent scope URL, or `None` for tree root / opaque single-segment ids.\n+pub fn parent_url(canonical: &str) -> Option {\n+ let crumbs = navigable_breadcrumbs(canonical);\n+ if crumbs.len() <= 1 {\n+ None\n+ } else {\n+ crumbs.get(crumbs.len() - 2).cloned()\n+ }\n+}\n+\n+/// True when `raw` looks like a URL (has scheme or host-like shape).\n+pub fn looks_like_url(raw: &str) -> bool {\n+ let t = raw.trim();\n+ t.contains(\"://\")\n+ || t.starts_with(\"r/\")\n+ || t.starts_with(\"/r/\")\n+ || (t.contains('.') && t.contains('/'))\n+ || t.starts_with(\"reddit.com\")\n+ || t.starts_with(\"www.\")\n+ || t.starts_with(\"youtu.be/\")\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+\n+ #[test]\n+ fn reddit_post_drops_slug_and_normalizes_host() {\n+ let r = canonicalize_raw(\n+ \"https://old.reddit.com/r/AmItheAsshole/comments/1trnvdl/aita_for_cancelling/\",\n+ )\n+ .unwrap();\n+ assert_eq!(\n+ r.canonical,\n+ \"https://reddit.com/r/amitheasshole/comments/1trnvdl\"\n+ );\n+ }\n+\n+ #[test]\n+ fn reddit_strips_query_and_listing() {\n+ assert_eq!(\n+ canonicalize_raw(\"https://www.reddit.com/r/rust/?sort=top\")\n+ .unwrap()\n+ .canonical,\n+ \"https://reddit.com/r/rust\"\n+ );\n+ assert_eq!(\n+ canonicalize_raw(\"https://www.reddit.com/r/programming/hot\")\n+ .unwrap()\n+ .canonical,\n+ \"https://reddit.com/r/programming\"\n+ );\n+ }\n+\n+ #[test]\n+ fn reddit_short_path() {\n+ assert_eq!(\n+ canonicalize_raw(\"r/rust\").unwrap().canonical,\n+ \"https://reddit.com/r/rust\"\n+ );\n+ }\n+\n+ #[test]\n+ fn reddit_breadcrumbs_skip_phantom_comments() {\n+ let post = \"https://reddit.com/r/aww/comments/1trnvdl\";\n+ let crumbs = navigable_breadcrumbs(post);\n+ assert!(!crumbs.iter().any(|c| c.ends_with(\"/comments\")));\n+ assert_eq!(\n+ crumbs.last().map(String::as_str),\n+ Some(post)\n+ );\n+ assert!(crumbs.contains(&\"https://reddit.com/r/aww\".to_string()));\n+ }\n+\n+ #[test]\n+ fn reddit_parent_of_post_is_subreddit() {\n+ assert_eq!(\n+ parent_url(\"https://reddit.com/r/aww/comments/1trnvdl\").as_deref(),\n+ Some(\"https://reddit.com/r/aww\")\n+ );\n+ }\n+\n+ #[test]\n+ fn youtube_youtu_be_and_watch_same_canonical() {\n+ let a = canonicalize_raw(\"https://youtu.be/dQw4w9WgXcQ\").unwrap().canonical;\n+ let b = canonicalize_raw(\"https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=10\").unwrap();\n+ assert_eq!(a, b.canonical);\n+ assert_eq!(a, \"https://youtube.com/watch?v=dQw4w9WgXcQ\");\n+ }\n+\n+ #[test]\n+ fn legacy_schemeless_upgrades() {\n+ assert_eq!(\n+ canonicalize_raw(\"reddit.com/r/rust/comments/aaa/announcing_rust_199\")\n+ .unwrap()\n+ .canonical,\n+ \"https://reddit.com/r/rust/comments/aaa\"\n+ );\n+ }\n+\n+ #[test]\n+ fn alias_recorded_when_input_differs() {\n+ let r = canonicalize_raw(\"https://youtu.be/abc123\").unwrap();\n+ assert_eq!(r.canonical, \"https://youtube.com/watch?v=abc123\");\n+ assert!(r.alias_of.is_some());\n+ }\n+}\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[80ad7753] refactor: split canonical_path and identity; strict wire identity without @\n\n- Add canonical_path.rs (tag + item URL normalization) and identity.rs\n (parse_username/parse_agent; reject @ in API input).\n- Slim events.rs to event types only; reducer applies no identity rewriting.\n- JSON APIs return stored-form usernames and agent ids; HTML keeps @/@@ for display.\n- Optional delegate on ingest; CLI and tests use naked uuid:rig:model.\n\nMade-with: Cursor\n\nSide B — unified diff (full patch):\ndiff --git a/cli/src/main.rs b/cli/src/main.rs\nindex 5ac8e289f2b7a366b5959d9338d02f9b546f408a..630c5dea1f78c0ec9bc53e6b96234a0dc75bb705 100644\n--- a/cli/src/main.rs\n+++ b/cli/src/main.rs\n@@ -61,8 +61,8 @@ enum Command {\n /// Example: --before 2026-06-01\n #[arg(long, value_name = \"DATE_OR_MS\")]\n before: Option,\n- /// Filter to posts from this actor (UUID prefix match).\n- /// Example: --actor 4d9d6173\n+ /// Filter to posts from this principal username (prefix match, stored form).\n+ /// Example: --actor alice\n #[arg(long, value_name = \"PREFIX\")]\n actor: Option,\n /// Fetch a single post by its ingest ID (from --json output).\n@@ -75,9 +75,8 @@ enum Command {\n ///\n /// SYNTAX:\n ///\n- /// Actor (required, once per document):\n- /// @::\n- /// Example: @7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet\n+ /// Identity: human comes from the bearer token; optional AI delegate from `--delegate`\n+ /// (`uuid:rig:provider/model`). The document body is DSL only (items, votes, prose) — no `@` lines.\n ///\n /// Thread (required, once per document):\n /// #thread-tag\n@@ -109,7 +108,7 @@ enum Command {\n /// Example: ~/python > ~/rust { Python's simpler syntax reduces learning curve. }\n ///\n /// Prose (optional, anywhere):\n- /// Any line that doesn't start with @, #, or ~ is prose.\n+ /// Any line that doesn't start with # or ~ (or `http`) is prose.\n /// Prose is displayed in thread context but does not affect rankings or items.\n /// Use prose to write blog posts, reasoning, or notes within your ingest.\n ///\n@@ -125,8 +124,7 @@ enum Command {\n /// EXAMPLES:\n ///\n /// # From heredoc (recommended for agents)\n- /// npx slugsocial ingest << 'EOF'\n- /// @7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet\n+ /// npx slugsocial ingest --delegate '7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet' << 'EOF'\n /// #languages: Python vs Rust for systems programming\n ///\n /// ~/languages/python { A high-level language with simple syntax and rich ecosystem. }\n@@ -153,14 +151,9 @@ enum Command {\n /// Thread identifier (public tag like \"languages\", without #).\n #[arg(long, env = \"SLUG_THREAD\", default_value = \"public\", value_name = \"THREAD\")]\n thread: String,\n- /// Agent delegate identity (request form), e.g. @@uuid:rig:provider/model\n- #[arg(\n- long,\n- env = \"SLUG_DELEGATE\",\n- default_value = \"@@00000000-0000-0000-0000-000000000000:cli:local/dev\",\n- value_name = \"DELEGATE\"\n- )]\n- delegate: String,\n+ /// Agent delegate `uuid:rig:provider/model`. Omit for human-only ingests.\n+ #[arg(long, env = \"SLUG_DELEGATE\", value_name = \"DELEGATE\")]\n+ delegate: Option,\n /// Output as JSON for agent parsing\n #[arg(long)]\n json: bool,\n@@ -174,14 +167,9 @@ enum Command {\n /// Thread identifier (public tag like \"languages\", without #).\n #[arg(long, env = \"SLUG_THREAD\", default_value = \"public\", value_name = \"THREAD\")]\n thread: String,\n- /// Agent delegate identity (request form), e.g. @@uuid:rig:provider/model\n- #[arg(\n- long,\n- env = \"SLUG_DELEGATE\",\n- default_value = \"@@00000000-0000-0000-0000-000000000000:cli:local/dev\",\n- value_name = \"DELEGATE\"\n- )]\n- delegate: String,\n+ /// Agent delegate `uuid:rig:provider/model`. Omit for human-only ingests.\n+ #[arg(long, env = \"SLUG_DELEGATE\", value_name = \"DELEGATE\")]\n+ delegate: Option,\n /// Output as JSON for agent parsing\n #[arg(long)]\n json: bool,\n@@ -193,10 +181,10 @@ enum Command {\n /// Useful for agents to catch up on activity after a context reset.\n ///\n /// Examples:\n- /// npx slugsocial feed @::\n- /// npx slugsocial feed @:: --since 2026-01-01\n+ /// npx slugsocial feed tommy\n+ /// npx slugsocial feed tommy --since 2026-01-01\n Feed {\n- /// Actor identifier (@uuid:rig:model)\n+ /// Principal username (stored form)\n #[arg(value_name = \"ACTOR\")]\n actor: String,\n /// Override the lower bound. Accepts Unix ms or YYYY-MM-DD.\n@@ -455,7 +443,7 @@ fn print_rank_history_response(resp: &slug_types::RankHistoryResponse) {\n label,\n );\n for v in &e.caused_by {\n- println!(\" {} {} {} {}\", v.a, v.ratio, v.b, v.actor.as_deref().map(|a| format!(\" (@{})\", a)).unwrap_or_default());\n+ println!(\" {} {} {} {}\", v.a, v.ratio, v.b, v.actor.as_deref().map(|a| format!(\" ({})\", a)).unwrap_or_default());\n if !v.body.is_empty() {\n println!(\" {}\", v.body.lines().next().unwrap_or(&v.body).trim());\n }\n@@ -1116,7 +1104,7 @@ async fn main() -> Result<()> {\n IdentityCmd::Start { rig, model, json } => {\n let client = http_client()?;\n let uuid = uuid::Uuid::new_v4().to_string();\n- let delegate = format!(\"@@{}:{}:{}\", uuid, rig, model);\n+ let delegate = format!(\"{uuid}:{rig}:{model}\");\n \n let start: PendingSessionStartResponse = expect_json(\n client\ndiff --git a/server/src/api/auth.rs b/server/src/api/auth.rs\nindex cb0faa29b834931e2c2b2f5c174c875e2e2e9346..995ce4a61d29b024c399c656134f541ecfd880cf 100644\n--- a/server/src/api/auth.rs\n+++ b/server/src/api/auth.rs\n@@ -12,10 +12,8 @@ use tokio::sync::RwLock;\n \n use crate::{\n api::helpers::{api_error, now_ms, sha256_hex},\n- events::{\n- canonicalize_username, validate_agent_format, validate_username,\n- Event, TokenIssued, UserRegistered,\n- },\n+ events::{Event, TokenIssued, UserRegistered},\n+ identity::{parse_agent, parse_username},\n html::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page},\n state::{AppState, PendingSession},\n };\n@@ -77,9 +75,9 @@ fn verify_token(reduced: &crate::reducer::ReducerState, bearer: &str) -> Result<\n Ok(username)\n }\n \n-fn issue_token_for_user(username: &str) -> (String, TokenIssued, String) {\n- // Returns: (bearer, event, canonical_username)\n- let canonical_user = canonicalize_username(username);\n+/// `stored_username` must already be in persisted shape (lowercase slug, no `@`).\n+fn issue_token_for_user(stored_username: &str) -> (String, TokenIssued) {\n+ let username = stored_username.to_string();\n let token_id = {\n let mut id = String::new();\n let alphabet = b\"abcdefghijklmnopqrstuvwxyz0123456789\";\n@@ -103,13 +101,13 @@ fn issue_token_for_user(username: &str) -> (String, TokenIssued, String) {\n let bearer = format!(\"slug_{token_id}_{secret}\");\n let event = TokenIssued {\n ts: now_ms(),\n- username: canonical_user.clone(),\n+ username: username.clone(),\n token_id,\n token_hash,\n salt,\n issued_via: \"oauth\".to_string(),\n };\n- (bearer, event, canonical_user)\n+ (bearer, event)\n }\n \n #[derive(Debug, Deserialize)]\n@@ -207,7 +205,7 @@ pub async fn get_auth_callback(Query(q): Query, State(state):\n s.provider = Some(\"google\".to_string());\n s.provider_id = Some(sub.clone());\n if let Some(username) = existing {\n- let (bearer, token_event, canon_user) = issue_token_for_user(&username);\n+ let (bearer, token_event) = issue_token_for_user(&username);\n // append token event\n let ev = Event::TokenIssued(token_event);\n if let Err(err) = state.event_log.append(&ev).await {\n@@ -217,7 +215,7 @@ pub async fn get_auth_callback(Query(q): Query, State(state):\n let mut reduced = reduced_arc.write().await;\n reduced.apply_event(ev);\n }\n- s.complete = Some((canon_user, bearer));\n+ s.complete = Some((username, bearer));\n return Redirect::temporary(&format!(\"{public_url}/auth/complete\")).into_response();\n }\n }\n@@ -251,9 +249,10 @@ pub async fn post_choose_username(\n State(state): State,\n Form(form): Form,\n ) -> impl IntoResponse {\n- if let Err(msg) = validate_username(&form.username) {\n- return api_error(StatusCode::BAD_REQUEST, \"invalid username\", Some(msg)).into_response();\n- }\n+ let canon_user = match parse_username(&form.username) {\n+ Ok(u) => u,\n+ Err(msg) => return api_error(StatusCode::BAD_REQUEST, \"invalid username\", Some(msg)).into_response(),\n+ };\n \n let sessions = pending_sessions(&state);\n let (provider, provider_id, agent) = {\n@@ -270,7 +269,7 @@ pub async fn post_choose_username(\n (provider, provider_id, s.agent.clone())\n };\n \n- if let Err(msg) = validate_agent_format(&agent) {\n+ if let Err(msg) = parse_agent(&agent) {\n return api_error(StatusCode::BAD_REQUEST, \"invalid agent format\", Some(msg)).into_response();\n }\n \n@@ -280,7 +279,7 @@ pub async fn post_choose_username(\n if reduced.users_by_provider.contains_key(&provider_key) {\n return api_error(StatusCode::CONFLICT, \"provider already registered\", None).into_response();\n }\n- if reduced.users_by_provider.values().any(|u| u == &canonicalize_username(&form.username)) {\n+ if reduced.users_by_provider.values().any(|u| u == &canon_user) {\n drop(reduced);\n return choose_username_error_fragment(&form.session, \"that username is taken — try another\").into_response();\n }\n@@ -288,12 +287,12 @@ pub async fn post_choose_username(\n \n let ur = Event::UserRegistered(UserRegistered {\n ts: now_ms(),\n- username: canonicalize_username(&form.username),\n+ username: canon_user.clone(),\n provider: provider.to_lowercase(),\n provider_id: provider_id.clone(),\n });\n \n- let (bearer, ti, canon_user) = issue_token_for_user(&form.username);\n+ let (bearer, ti) = issue_token_for_user(&canon_user);\n let ti_ev = Event::TokenIssued(ti);\n \n // Persist events.\n@@ -325,15 +324,18 @@ pub async fn post_pending_session(\n State(state): State,\n Json(req): Json,\n ) -> impl IntoResponse {\n- if let Err(msg) = validate_agent_format(&req.agent) {\n- return api_error(StatusCode::BAD_REQUEST, \"invalid agent format\", Some(msg)).into_response();\n- }\n+ let agent_naked = match parse_agent(&req.agent) {\n+ Ok(a) => a,\n+ Err(msg) => {\n+ return api_error(StatusCode::BAD_REQUEST, \"invalid agent format\", Some(msg)).into_response();\n+ }\n+ };\n let session = format!(\"p_{}\", uuid::Uuid::new_v4().simple());\n let public_url = std::env::var(\"SLUG_PUBLIC_URL\").unwrap_or_else(|_| \"http://127.0.0.1:8080\".to_string());\n let login_url = format!(\"{public_url}/auth/login?session={}\", urlencoding::encode(&session));\n let poll_url = format!(\"/api/v0/pending-session/{}\", session);\n let s = PendingSession {\n- agent: req.agent.clone(),\n+ agent: agent_naked,\n created_ts: now_ms(),\n provider: None,\n provider_id: None,\n@@ -359,7 +361,7 @@ pub async fn get_pending_session(\n return api_error(StatusCode::NOT_FOUND, \"unknown session\", None).into_response();\n };\n let (complete, user, token) = match &s.complete {\n- Some((u, t)) => (true, Some(format!(\"@{}\", u)), Some(t.clone())),\n+ Some((u, t)) => (true, Some(u.clone()), Some(t.clone())),\n None => (false, None, None),\n };\n Json(PendingSessionPollResponse {\n@@ -388,7 +390,7 @@ pub async fn get_whoami(State(state): State, headers: HeaderMap) -> im\n };\n let agents_bound = reduced.agent_bindings.values().filter(|u| *u == &username).count();\n Json(WhoamiResponse {\n- user: format!(\"@{}\", username),\n+ user: username,\n agents_bound,\n })\n .into_response()\ndiff --git a/server/src/api/feed.rs b/server/src/api/feed.rs\nindex f665d34aef12f2bd6e71d1fb4a3d0b4d509aa775..983b7397a846bd540b6baf3773dd54c55ade4c45 100644\n--- a/server/src/api/feed.rs\n+++ b/server/src/api/feed.rs\n@@ -1,11 +1,12 @@\n use axum::{\n extract::{Query, State},\n+ http::StatusCode,\n response::IntoResponse,\n Json,\n };\n use serde::Deserialize;\n \n-use crate::{events::canonicalize_username, state::AppState};\n+use crate::{api::helpers::api_error, identity::parse_username, state::AppState};\n \n // ============================================================================\n // Feed -- global reverse-chronological ingest stream since a cutoff\n@@ -32,7 +33,12 @@ pub async fn get_feed(\n \n let reduced_arc = state.reduced.clone();\n let reduced = reduced_arc.read().await;\n- let actor = canonicalize_username(&q.actor);\n+ let actor = match parse_username(&q.actor) {\n+ Ok(u) => u,\n+ Err(msg) => {\n+ return api_error(StatusCode::BAD_REQUEST, \"invalid actor\", Some(msg)).into_response();\n+ }\n+ };\n let since = q.since.or_else(|| reduced.actor_last_post_ts.get(&actor).copied());\n let cutoff = since.unwrap_or(0);\n let limit = q.limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT);\n@@ -65,7 +71,7 @@ pub async fn get_feed(\n .collect();\n \n Json(slug_types::FeedResponse {\n- actor: format!(\"@{}\", actor),\n+ actor,\n since,\n posts,\n total,\ndiff --git a/server/src/api/forum.rs b/server/src/api/forum.rs\nindex cf134e97a3aa9f2cea5efcf5bfa2564b9fc2ea46..ab6f3ec4936979fed9b3a9c47bef609610c751dd 100644\n--- a/server/src/api/forum.rs\n+++ b/server/src/api/forum.rs\n@@ -8,7 +8,8 @@ use serde::Deserialize;\n use slug_types::*;\n \n use crate::{\n- events::canonicalize_tag,\n+ canonical_path::canonicalize_tag,\n+ identity::parse_username,\n state::AppState,\n };\n \n@@ -46,7 +47,7 @@ pub struct ThreadDetailQuery {\n pub since: Option,\n /// Only posts strictly before this Unix ms timestamp.\n pub before: Option,\n- /// Filter to posts whose actor starts with this prefix (UUID prefix or full actor string).\n+ /// Filter to posts whose principal username starts with this prefix (stored form, no `@`).\n pub actor: Option,\n /// Return the single post with this ingest ID.\n pub post_id: Option,\n@@ -56,6 +57,13 @@ pub struct ThreadDetailQuery {\n pub async fn get_thread(State(state): State, Query(q): Query) -> impl IntoResponse {\n let reduced_arc = state.reduced.clone();\n let tag = canonicalize_tag(&q.tag);\n+ let actor_prefix = match q.actor.as_deref().map(str::trim) {\n+ None | Some(\"\") => String::new(),\n+ Some(s) => match parse_username(s) {\n+ Ok(u) => u,\n+ Err(msg) => return api_error(StatusCode::BAD_REQUEST, \"invalid actor filter\", Some(msg)).into_response(),\n+ },\n+ };\n let reduced = reduced_arc.read().await;\n \n // Single post lookup by ingest ID -- return full body untruncated.\n@@ -72,7 +80,7 @@ pub async fn get_thread(State(state): State, Query(q): Query, Query(q): Query = all_ids\n .into_iter()\n .enumerate()\n@@ -119,7 +126,7 @@ pub async fn get_thread(State(state): State, Query(q): Query = match &req.delegate {\n+ None => None,\n+ Some(s) if s.trim().is_empty() => None,\n+ Some(s) => match parse_agent(s) {\n+ Ok(d) => Some(d),\n+ Err(msg) => {\n+ drop(reduced);\n+ return api_error(StatusCode::BAD_REQUEST, \"invalid delegate format\", Some(msg))\n+ .into_response();\n+ }\n+ },\n+ };\n let thread_id = canonicalize_tag(&req.thread);\n \n let principal = match verify_bearer_principal(&headers, &reduced) {\n@@ -290,36 +296,43 @@ pub async fn post_ingest(\n }\n }\n \n- match reduced.agent_bindings.get(&delegate) {\n- Some(u) if u != &principal => {\n- drop(reduced);\n- return api_error(\n- StatusCode::FORBIDDEN,\n- \"delegate already bound to another user\",\n- None,\n- )\n- .into_response();\n+ if let Some(ref d) = delegate {\n+ match reduced.agent_bindings.get(d) {\n+ Some(u) if u != &principal => {\n+ drop(reduced);\n+ return api_error(\n+ StatusCode::FORBIDDEN,\n+ \"delegate already bound to another user\",\n+ None,\n+ )\n+ .into_response();\n+ }\n+ _ => {}\n }\n- _ => {}\n }\n- let need_agent_bind = reduced.agent_bindings.get(&delegate).is_none();\n+ let need_agent_bind = delegate\n+ .as_ref()\n+ .map(|d| reduced.agent_bindings.get(d).is_none())\n+ .unwrap_or(false);\n drop(reduced);\n \n let mut events_appended: usize = 0;\n \n if need_agent_bind {\n- let ab = Event::AgentBound(AgentBound {\n- ts: now_ms(),\n- agent: delegate.clone(),\n- username: principal.clone(),\n- });\n- if let Err(err) = event_log.append(&ab).await {\n- return api_error(StatusCode::INTERNAL_SERVER_ERROR, format!(\"{err}\"), None);\n- }\n- events_appended += 1;\n- {\n- let mut reduced = reduced_arc.write().await;\n- reduced.apply_event(ab);\n+ if let Some(agent_id) = delegate.clone() {\n+ let ab = Event::AgentBound(AgentBound {\n+ ts: now_ms(),\n+ agent: agent_id,\n+ username: principal.clone(),\n+ });\n+ if let Err(err) = event_log.append(&ab).await {\n+ return api_error(StatusCode::INTERNAL_SERVER_ERROR, format!(\"{err}\"), None);\n+ }\n+ events_appended += 1;\n+ {\n+ let mut reduced = reduced_arc.write().await;\n+ reduced.apply_event(ab);\n+ }\n }\n }\n \n@@ -413,12 +426,18 @@ pub async fn post_check(\n };\n drop(reduced);\n \n- if let Err(msg) = validate_agent_format(&req.delegate) {\n- return api_error(StatusCode::BAD_REQUEST, \"invalid delegate format\", Some(msg)).into_response();\n- }\n- let delegate = canonicalize_agent(&req.delegate);\n+ let delegate: Option = match &req.delegate {\n+ None => None,\n+ Some(s) if s.trim().is_empty() => None,\n+ Some(s) => match parse_agent(s) {\n+ Ok(d) => Some(d),\n+ Err(msg) => {\n+ return api_error(StatusCode::BAD_REQUEST, \"invalid delegate format\", Some(msg)).into_response();\n+ }\n+ },\n+ };\n let thread_id = canonicalize_tag(&req.thread);\n- let principal = canonicalize_username(\"placeholder\");\n+ let principal = \"placeholder\".to_string();\n \n let event = Event::Ingest(Ingest {\n ts: v.ts,\ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex f1d5c139b875c268cc46c3085c332d8de31b092e..f42e907775645166c60aeae2d98c5855223a71be 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -65,7 +65,7 @@ mod tests {\n id: format!(\"test-{ts}\"),\n raw: raw.to_string(),\n principal: \"test\".to_string(),\n- delegate: \"@00000000-0000-0000-0000-000000000000:test:local/test\".to_string(),\n+ delegate: Some(\"00000000-0000-0000-0000-000000000000:test:local/test\".to_string()),\n thread_id: \"t\".to_string(),\n }));\n }\ndiff --git a/server/src/api/rank.rs b/server/src/api/rank.rs\nindex 059095bb512096da5e9699ff9c4b92cb7de7fa1c..f2d348280ec4d70a32044601964cb5dc9382d9d7 100644\n--- a/server/src/api/rank.rs\n+++ b/server/src/api/rank.rs\n@@ -226,7 +226,7 @@ pub async fn get_rank_history(\n let reduced = reduced_arc.read().await;\n let content = reduced.public();\n \n- let item_str = crate::events::canonicalize_item(&q.item);\n+ let item_str = crate::canonical_path::canonicalize_item(&q.item);\n let item = CanonicalItemUrl(item_str.clone());\n \n let entries = content.rank_history.get(&item).cloned().unwrap_or_default();\n@@ -238,15 +238,15 @@ pub async fn get_rank_history(\n .map(|doc| {\n doc.statements.into_iter().filter_map(|s| {\n if let crate::dsl::Stmt::Vote { item1, item2, ratio_left, ratio_right, explanation } = s {\n- let a = crate::events::canonicalize_item(&item1);\n- let b = crate::events::canonicalize_item(&item2);\n+ let a = crate::canonical_path::canonicalize_item(&item1);\n+ let b = crate::canonical_path::canonicalize_item(&item2);\n if a == item_str || b == item_str {\n Some(VoteRow {\n ts: e.ts,\n a: item_path_for_api(&a),\n b: item_path_for_api(&b),\n ratio: format!(\"{}:{}\", ratio_left, ratio_right),\n- actor: reduced.ingests_by_id.get(&e.post_id).map(|ing| format!(\"@{}\", ing.principal)),\n+ actor: reduced.ingests_by_id.get(&e.post_id).map(|ing| ing.principal.clone()),\n body: explanation,\n thread: Some(format!(\"#{}\", e.thread)),\n })\ndiff --git a/server/src/api/search.rs b/server/src/api/search.rs\nindex 8028c3117b9b22460fb9677ca969741f6849d2d0..87621e6e4210a28c7802bb941200788f28518940 100644\n--- a/server/src/api/search.rs\n+++ b/server/src/api/search.rs\n@@ -119,7 +119,7 @@ pub async fn get_search(\n .unwrap_or_else(|| \"#unknown\".to_string());\n scored_posts.push((score, ingest.ts, slug_types::SearchPostHit {\n thread,\n- actor: format!(\"@{}\", ingest.principal),\n+ actor: ingest.principal.clone(),\n snippet: snippet_around(&ingest.raw, &words, 160),\n ts: ingest.ts,\n }));\ndiff --git a/server/src/api/thread.rs b/server/src/api/thread.rs\nindex 576b0b5be2767b0c6cba5e0701e4ffc9f215029d..be6ef446e316fef352a7eef5b35b40583dca4442 100644\n--- a/server/src/api/thread.rs\n+++ b/server/src/api/thread.rs\n@@ -8,9 +8,8 @@ use serde::{Deserialize, Serialize};\n \n use crate::{\n api::helpers::{api_error, now_ms},\n- events::{\n- canonicalize_username, Event, GrantAdded, ThreadCapability, ThreadCreated, ThreadVisibility,\n- },\n+ events::{Event, GrantAdded, ThreadCapability, ThreadCreated, ThreadVisibility},\n+ identity::parse_username,\n state::AppState,\n };\n use super::auth::verify_bearer_principal;\n@@ -150,10 +149,10 @@ pub async fn post_thread_grants(\n return api_error(StatusCode::FORBIDDEN, \"requires Manage capability\", None).into_response();\n }\n \n- let target = canonicalize_username(&req.username);\n- if target.is_empty() {\n- return api_error(StatusCode::BAD_REQUEST, \"invalid username\", None).into_response();\n- }\n+ let target = match parse_username(&req.username) {\n+ Ok(u) => u,\n+ Err(msg) => return api_error(StatusCode::BAD_REQUEST, \"invalid username\", Some(msg)).into_response(),\n+ };\n if !reduced.users_by_provider.values().any(|u| u == &target) {\n return api_error(StatusCode::NOT_FOUND, format!(\"user @{target} not found\"), None).into_response();\n }\ndiff --git a/server/src/canonical_path.rs b/server/src/canonical_path.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..5c0febe883d8b3978a25896ed0d71df8509a8717\n--- /dev/null\n+++ b/server/src/canonical_path.rs\n@@ -0,0 +1,92 @@\n+//! Normalization for thread tags and ontology item URLs (DSL ↔ stored canonical form).\n+//! Not event types — see `events` and `path_types`.\n+\n+/// Thread / public tag: stored without leading `#`, lowercase.\n+pub fn canonicalize_tag(input: &str) -> String {\n+ input.trim().trim_start_matches('#').to_lowercase()\n+}\n+\n+/// Ontology item reference → canonical absolute URL on the slug host.\n+pub fn canonicalize_item(input: &str) -> String {\n+ let s = input.trim();\n+ if s.is_empty() {\n+ return String::new();\n+ }\n+\n+ if let Some(rest) = s.strip_prefix(\"https://\") {\n+ let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n+ let host = host.trim().to_lowercase();\n+ if tail.is_empty() {\n+ return format!(\"https://{}\", host);\n+ } else {\n+ return format!(\"https://{}/{}\", host, tail);\n+ }\n+ }\n+ if let Some(rest) = s.strip_prefix(\"http://\") {\n+ let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n+ let host = host.trim().to_lowercase();\n+ if tail.is_empty() {\n+ return format!(\"http://{}\", host);\n+ } else {\n+ return format!(\"http://{}/{}\", host, tail);\n+ }\n+ }\n+\n+ let is_tilde = s.starts_with(\"~/\");\n+ let rest = s.strip_prefix(\"~/\").or_else(|| s.strip_prefix(\"/\")).unwrap_or(s);\n+\n+ let tail = rest\n+ .split('/')\n+ .filter_map(|seg| {\n+ let t = seg.trim();\n+ if t.is_empty() {\n+ None\n+ } else {\n+ Some(t.to_lowercase())\n+ }\n+ })\n+ .collect::>()\n+ .join(\"/\");\n+\n+ if is_tilde {\n+ format!(\"https://slug.social/~/{}\", tail)\n+ } else if tail.is_empty() {\n+ \"https://slug.social\".to_string()\n+ } else {\n+ format!(\"https://slug.social/{}\", tail)\n+ }\n+}\n+\n+pub fn item_path_segments(input: &str) -> Vec {\n+ let canonical = canonicalize_item(input);\n+ if canonical.is_empty() {\n+ return vec![];\n+ }\n+\n+ if let Some(rest) = canonical.strip_prefix(\"https://\") {\n+ let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n+ let mut out = vec![format!(\"https://{}\", host)];\n+ out.extend(tail.split('/').filter(|s| !s.is_empty()).map(|s| s.to_string()));\n+ return out;\n+ }\n+ if let Some(rest) = canonical.strip_prefix(\"http://\") {\n+ let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n+ let mut out = vec![format!(\"http://{}\", host)];\n+ out.extend(tail.split('/').filter(|s| !s.is_empty()).map(|s| s.to_string()));\n+ return out;\n+ }\n+\n+ canonical\n+ .split('/')\n+ .filter(|s| !s.is_empty())\n+ .map(|s| s.to_string())\n+ .collect()\n+}\n+\n+pub fn item_parent_path(input: &str) -> Option {\n+ let segs = item_path_segments(input);\n+ if segs.len() <= 1 {\n+ return None;\n+ }\n+ Some(segs[..segs.len() - 1].join(\"/\"))\n+}\ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex 7775e59974a521f5fea9361a600802898d05c6ab..26edac7505ce4e67a042a5511113efba5fea4950 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -1,150 +1,5 @@\n use serde::{Deserialize, Serialize};\n \n-/// Canonical identifiers stored without sigils.\n-/// - tags are stored without leading '#'\n-/// - items are stored without leading '/'\n-pub fn canonicalize_tag(input: &str) -> String {\n- input.trim().trim_start_matches('#').to_lowercase()\n-}\n-\n-pub fn canonicalize_item(input: &str) -> String {\n- let s = input.trim();\n- if s.is_empty() {\n- return String::new();\n- }\n-\n- if let Some(rest) = s.strip_prefix(\"https://\") {\n- let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n- let host = host.trim().to_lowercase();\n- if tail.is_empty() {\n- return format!(\"https://{}\", host);\n- } else {\n- return format!(\"https://{}/{}\", host, tail);\n- }\n- }\n- if let Some(rest) = s.strip_prefix(\"http://\") {\n- let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n- let host = host.trim().to_lowercase();\n- if tail.is_empty() {\n- return format!(\"http://{}\", host);\n- } else {\n- return format!(\"http://{}/{}\", host, tail);\n- }\n- }\n-\n- let is_tilde = s.starts_with(\"~/\");\n- let rest = s.strip_prefix(\"~/\").or_else(|| s.strip_prefix(\"/\")).unwrap_or(s);\n-\n- let tail = rest\n- .split('/')\n- .filter_map(|seg| {\n- let t = seg.trim();\n- if t.is_empty() {\n- None\n- } else {\n- Some(t.to_lowercase())\n- }\n- })\n- .collect::>()\n- .join(\"/\");\n-\n- if is_tilde {\n- format!(\"https://slug.social/~/{}\", tail)\n- } else if tail.is_empty() {\n- \"https://slug.social\".to_string()\n- } else {\n- format!(\"https://slug.social/{}\", tail)\n- }\n-}\n-\n-pub fn item_path_segments(input: &str) -> Vec {\n- let canonical = canonicalize_item(input);\n- if canonical.is_empty() {\n- return vec![];\n- }\n-\n- if let Some(rest) = canonical.strip_prefix(\"https://\") {\n- let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n- let mut out = vec![format!(\"https://{}\", host)];\n- out.extend(tail.split('/').filter(|s| !s.is_empty()).map(|s| s.to_string()));\n- return out;\n- }\n- if let Some(rest) = canonical.strip_prefix(\"http://\") {\n- let (host, tail) = rest.split_once('/').map_or((rest, \"\"), |(h, t)| (h, t));\n- let mut out = vec![format!(\"http://{}\", host)];\n- out.extend(tail.split('/').filter(|s| !s.is_empty()).map(|s| s.to_string()));\n- return out;\n- }\n-\n- // Should be unreachable since all canonical items are now URLs\n- canonical\n- .split('/')\n- .filter(|s| !s.is_empty())\n- .map(|s| s.to_string())\n- .collect()\n-}\n-\n-pub fn item_parent_path(input: &str) -> Option {\n- let segs = item_path_segments(input);\n- if segs.len() <= 1 {\n- return None;\n- }\n- Some(segs[..segs.len() - 1].join(\"/\"))\n-}\n-\n-/// Canonical username stored without leading '@'.\n-pub fn canonicalize_username(input: &str) -> String {\n- input.trim().trim_start_matches('@').to_lowercase()\n-}\n-\n-/// Validate username: lowercase alphanumeric + '-' '_' only; length 1-32.\n-pub fn validate_username(username: &str) -> Result<(), String> {\n- let u = canonicalize_username(username);\n- if u.is_empty() || u.len() > 32 {\n- return Err(\"username must be 1-32 characters\".to_string());\n- }\n- if !u\n- .chars()\n- .all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == '-' || c == '_')\n- {\n- return Err(\"username must be lowercase alphanumeric with '-' or '_' only\".to_string());\n- }\n- Ok(())\n-}\n-\n-/// Canonical agent identity stored with single leading '@'.\n-///\n-/// Request/display form is `@@uuid:rig:provider/model` but we store `@uuid:rig:provider/model`.\n-pub fn canonicalize_agent(input: &str) -> String {\n- let s = input.trim();\n- let s = s.strip_prefix(\"@@\").or_else(|| s.strip_prefix('@')).unwrap_or(s);\n- format!(\"@{}\", s.to_lowercase())\n-}\n-\n-/// Validate agent format: @@::\n-pub fn validate_agent_format(agent: &str) -> Result<(), String> {\n- let a = agent.trim();\n- if !a.starts_with(\"@@\") && !a.starts_with('@') {\n- return Err(\"agent must start with @@\".to_string());\n- }\n- let a = a.strip_prefix(\"@@\").or_else(|| a.strip_prefix('@')).unwrap_or(a);\n- let parts: Vec<&str> = a.split(':').collect();\n- if parts.len() != 3 {\n- return Err(\"agent must be @@::\".to_string());\n- }\n- let (uuid_part, rig_part, model_part) = (parts[0], parts[1], parts[2]);\n- if uuid::Uuid::parse_str(uuid_part).is_err() {\n- return Err(\"agent uuid must be a valid UUID v4\".to_string());\n- }\n- if rig_part.trim().is_empty() {\n- return Err(\"agent rig must be non-empty\".to_string());\n- }\n- if !model_part.contains('/') {\n- return Err(\"agent model must be \".to_string());\n- }\n- Ok(())\n-}\n-\n #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]\n #[serde(rename_all = \"snake_case\")]\n pub enum ThreadVisibility {\n@@ -236,10 +91,11 @@ pub struct Ingest {\n pub id: String,\n /// Raw DSL+prose body only (no identity/routing metadata).\n pub raw: String,\n- /// Human principal username (no leading '@').\n+ /// Human principal username (wire and storage: no `@`).\n pub principal: String,\n- /// Delegate agent identity (canonical stored with single leading '@').\n- pub delegate: String,\n+ /// AI delegate id `uuid:rig:model` (wire and storage: no `@`). Omitted when absent.\n+ #[serde(default, skip_serializing_if = \"Option::is_none\")]\n+ pub delegate: Option,\n /// Thread identifier: public tag (e.g. \"languages\") or private id/slug (e.g. \"a7f2k9x/project-review\").\n pub thread_id: String,\n }\n@@ -247,5 +103,3 @@ pub struct Ingest {\n fn generate_id() -> String {\n uuid::Uuid::new_v4().to_string()\n }\n-\n-\ndiff --git a/server/src/html/editor.rs b/server/src/html/editor.rs\nindex 1d2c4be7eef4cc437cacddd0949307895f3ef018..4f206a0a895b47592df7669cd8d2fb4d83286fe7 100644\n--- a/server/src/html/editor.rs\n+++ b/server/src/html/editor.rs\n@@ -33,7 +33,7 @@ pub async fn editor_page() -> impl IntoResponse {\n p class=\"muted\" { \"write DSL, see what happens. nothing is saved.\" }\n div class=\"editor-container\" {\n textarea id=\"editor-input\" rows=\"12\" cols=\"80\"\n- placeholder=\"@your-uuid:rig:provider/model\\n#your-thread\\n\\n~/path/item-a { description }\\n~/path/item-b { description }\\n\\n~/path/item-a 3:1 ~/path/item-b { reasoning }\"\n+ placeholder=\"your-uuid:rig:provider/model\\n#your-thread\\n\\n~/path/item-a { description }\\n~/path/item-b { description }\\n\\n~/path/item-a 3:1 ~/path/item-b { reasoning }\"\n autocomplete=\"off\" autofocus {}\n div id=\"editor-status\" class=\"muted\" { \"type to check…\" }\n div id=\"editor-results\" {}\n@@ -110,7 +110,7 @@ pub async fn editor_check(\n id: uuid::Uuid::new_v4().to_string(),\n raw: form.text.clone(),\n principal: String::new(),\n- delegate: String::new(),\n+ delegate: None,\n thread_id: String::new(),\n });\n let mut simulated = { reduced_arc.read().await.clone() };\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\nindex d40cc6398aaf3b2348d91498b5b3a80ed593e55c..a4e17ddf0064b08dfa221c964ccaa0eb99948b5b 100644\n--- a/server/src/html/forum.rs\n+++ b/server/src/html/forum.rs\n@@ -7,14 +7,14 @@ use serde::Deserialize;\n use maud::{html, Markup};\n \n use crate::{\n- events::canonicalize_tag,\n+ canonical_path::canonicalize_tag,\n reducer::ReducerState,\n state::AppState,\n timeago,\n };\n \n use super::{\n- actor_label, bc_threads, cli_panel, layout, now_ms,\n+ authorship_address, bc_threads, cli_panel, layout, now_ms,\n recency_class, render_linkified_with_embeds,\n };\n \n@@ -260,7 +260,7 @@ pub async fn thread_post_view(\n @let ago = timeago::timeago(now, ing.ts);\n div class=\"ingest-entry\" data-ingest-id=(ing.id) {\n div class=\"ingest-meta muted\" title=(hover) {\n- span class=\"address\" { \"@\" (actor_label(&ing.delegate)) }\n+ span class=\"address\" { (authorship_address(&ing.principal, &ing.delegate)) }\n \" · \"\n (ago)\n }\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex bddd90aa6eb288c0c97bb08f472e2934fd2fe67a..dcd7f0d4a2d7b602026b643c564d212cb084ff9f 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -5,7 +5,7 @@ use axum::{\n use maud::html;\n \n use crate::{\n- events::canonicalize_item,\n+ canonical_path::canonicalize_item,\n path_types::CanonicalItemUrl,\n ranking::{connected_components_from_voted_pairs, ranked_items_subset},\n scope_rank::{build_children_rankings, ChildrenRankings},\n@@ -14,7 +14,7 @@ use crate::{\n };\n \n use super::{\n- actor_label, bc_path, cli_panel, layout, now_ms, ratio_pct, render_linkified_with_embeds,\n+ authorship_address, bc_path, cli_panel, layout, now_ms, ratio_pct, render_linkified_with_embeds,\n breadcrumb_path::OntologyPath,\n };\n \n@@ -204,8 +204,8 @@ fn build_rank_history(\n .map(|doc| {\n doc.statements.into_iter().filter_map(|s| {\n if let crate::dsl::Stmt::Vote { item1, item2, ratio_left, ratio_right, explanation } = s {\n- let a_str = crate::events::canonicalize_item(&item1);\n- let b_str = crate::events::canonicalize_item(&item2);\n+ let a_str = crate::canonical_path::canonicalize_item(&item1);\n+ let b_str = crate::canonical_path::canonicalize_item(&item2);\n if a_str == item || b_str == item {\n Some(crate::reducer::VoteData {\n ts: e.ts,\n@@ -216,9 +216,7 @@ fn build_rank_history(\n principal: reduced.ingests_by_id.get(&e.post_id)\n .map(|ing| ing.principal.clone())\n .unwrap_or_default(),\n- delegate: reduced.ingests_by_id.get(&e.post_id)\n- .map(|ing| ing.delegate.clone())\n- .unwrap_or_default(),\n+ delegate: reduced.ingests_by_id.get(&e.post_id).and_then(|ing| ing.delegate.clone()),\n thread_id: e.thread.clone(),\n })\n } else { None }\n@@ -331,7 +329,7 @@ async fn render_scope_view(state: AppState, path: OntologyPath) -> axum::respons\n @let right_class = if v.b.as_str() == model.item { \"ratio-right current\" } else { \"ratio-right\" };\n div class=\"ont-vote-entry\" {\n div class=\"ont-vote-meta\" title=(hover) {\n- span class=\"address\" { \"@\" (actor_label(&v.delegate)) }\n+ span class=\"address\" { (authorship_address(&v.principal, &v.delegate)) }\n \" · \"\n (ago)\n }\n@@ -482,7 +480,7 @@ mod tests {\n id: format!(\"ing-{ts}\"),\n raw: raw.to_string(),\n principal: \"testuser\".to_string(),\n- delegate: \"@00000000-0000-0000-0000-000000000000:test:local/test\".to_string(),\n+ delegate: Some(\"00000000-0000-0000-0000-000000000000:test:local/test\".to_string()),\n thread_id: String::new(),\n }));\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 8b48a25cce79f0eefc7e29849e1a667cae4c7986..82c5993fabfeaf2ea8b9034bccaef37924100264 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -238,9 +238,9 @@ pub(super) fn bc_threads(thread_tag: Option<&str>) -> Markup {\n }\n }\n \n-/// Input is canonicalized without leading '@' (usually uuid:rig:provider/model).\n-pub(super) fn actor_label(actor: &str) -> String {\n- let a = actor.trim_start_matches('@').trim();\n+/// Short display label for a stored agent id (`uuid:rig:model`, no `@`).\n+pub(super) fn actor_label(agent_naked: &str) -> String {\n+ let a = agent_naked.trim();\n let parts: Vec<&str> = a.split(':').collect();\n if parts.len() >= 3 {\n let rig = parts[1].trim();\n@@ -258,6 +258,13 @@ pub(super) fn actor_label(actor: &str) -> String {\n a.to_string()\n }\n \n+/// HTML attribution only: human `@name`, or agent `@@uuid8:rig:model` when a delegate is present.\n+pub(super) fn authorship_address(principal: &str, delegate: &Option) -> String {\n+ match delegate {\n+ Some(d) => format!(\"@@{}\", actor_label(d)),\n+ None => format!(\"@{}\", principal),\n+ }\n+}\n \n /// Escape HTML special chars for safe injection.\n fn escape_html(s: &str) -> String {\ndiff --git a/server/src/html/search.rs b/server/src/html/search.rs\nindex f56f31546b4870d41e594d0e3ac2a4b50ba831b8..df5cb0a59ff72956f4bc94e53b86ab8337452817 100644\n--- a/server/src/html/search.rs\n+++ b/server/src/html/search.rs\n@@ -11,7 +11,7 @@ use crate::{\n timeago,\n };\n \n-use super::{actor_label, bc_segment, cli_panel, layout, now_ms};\n+use super::{authorship_address, bc_segment, cli_panel, layout, now_ms};\n \n /// Escape HTML special chars for safe injection.\n fn escape_html(s: &str) -> String {\n@@ -44,7 +44,8 @@ struct ThreadRow {\n \n struct PostRow {\n thread: String,\n- actor: String,\n+ /// Pre-formatted attribution string for display (includes `@` / `@@` from `authorship_address`).\n+ actor_display: String,\n text: String,\n ts: i64,\n }\n@@ -151,7 +152,7 @@ fn search(state: &ReducerState, q: &str, limit: usize) -> SearchResults {\n .unwrap_or_else(|| \"unknown\".to_string());\n scored_posts.push((score, PostRow {\n thread,\n- actor: ingest.principal.clone(),\n+ actor_display: authorship_address(&ingest.principal, &ingest.delegate),\n text: ingest.raw.clone(),\n ts: ingest.ts,\n }));\n@@ -321,7 +322,7 @@ fn render_search_results(results: &SearchResults, query: &str) -> Markup {\n li {\n div class=\"search-post-meta muted\" {\n a href=(format!(\"/t/{}\", r.thread)) { \"#\" (r.thread) }\n- \" · \" (actor_label(&r.actor))\n+ \" · \" (r.actor_display)\n \" · \" (timeago::timeago(now, r.ts))\n }\n div class=\"search-snippet\" {\ndiff --git a/server/src/html/tree.rs b/server/src/html/tree.rs\nindex 568a08edbb548291ab6f03b46c79cdcb4b432468..339f69af3b3279918a97b1dced62e4e3e0b528e3 100644\n--- a/server/src/html/tree.rs\n+++ b/server/src/html/tree.rs\n@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};\n use std::collections::BTreeSet;\n \n use crate::{\n- events::canonicalize_item,\n+ canonical_path::canonicalize_item,\n path_types::{CanonicalItemUrl, RelativePath},\n scope_rank::ChildrenRankings,\n state::AppState,\n@@ -702,7 +702,8 @@ pub async fn tree_select(\n mod tests {\n use super::*;\n \n- use crate::events::{canonicalize_item, Event, Ingest};\n+ use crate::canonical_path::canonicalize_item;\n+ use crate::events::{Event, Ingest};\n use crate::reducer::ReducerState;\n \n fn ingest(raw: &str) -> Event {\n@@ -711,7 +712,7 @@ mod tests {\n id: \"test-ingest\".to_string(),\n raw: raw.to_string(),\n principal: \"tester\".to_string(),\n- delegate: String::new(),\n+ delegate: None,\n thread_id: String::new(),\n })\n }\n@@ -789,9 +790,9 @@ mod tests {\n fn reducer_parent_key_for_tilde_items_is_without_trailing_slash() {\n // This is the reducer invariant that the tree view must match.\n let item = canonicalize_item(\"~/alphabet/a\");\n- assert_eq!(crate::events::item_parent_path(&item).unwrap(), \"https://slug.social/~/alphabet\");\n+ assert_eq!(crate::canonical_path::item_parent_path(&item).unwrap(), \"https://slug.social/~/alphabet\");\n let item2 = canonicalize_item(\"~/a\");\n- assert_eq!(crate::events::item_parent_path(&item2).unwrap(), \"https://slug.social/~\");\n+ assert_eq!(crate::canonical_path::item_parent_path(&item2).unwrap(), \"https://slug.social/~\");\n }\n \n #[test]\ndiff --git a/server/src/identity.rs b/server/src/identity.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..ad654ae813f8f6fe6323746e2544250687d3d47f\n--- /dev/null\n+++ b/server/src/identity.rs\n@@ -0,0 +1,66 @@\n+//! Usernames and agent delegate ids. Wire JSON and query params use **stored form only** (no `@` / `@@`).\n+//! The HTTP layer validates here; the reducer does not rewrite identity. For humans, `@name` / `@@agent`\n+//! appear only in HTML (see `html::authorship_address`).\n+\n+/// Parse username from query/body: trim, lowercase. `@` is not allowed (use `tommy`, not `@tommy`).\n+pub fn parse_username(input: &str) -> Result {\n+ let s = input.trim();\n+ if s.is_empty() {\n+ return Err(\"username must not be empty\".to_string());\n+ }\n+ if s.contains('@') {\n+ return Err(\n+ \"username must not contain '@' — use stored form (e.g. `tommy`)\".to_string(),\n+ );\n+ }\n+ let u = s.to_lowercase();\n+ validate_username_naked(&u)?;\n+ Ok(u)\n+}\n+\n+fn validate_username_naked(u: &str) -> Result<(), String> {\n+ if u.len() > 32 {\n+ return Err(\"username must be 1-32 characters\".to_string());\n+ }\n+ if !u\n+ .chars()\n+ .all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == '-' || c == '_')\n+ {\n+ return Err(\"username must be lowercase alphanumeric with '-' or '_' only\".to_string());\n+ }\n+ Ok(())\n+}\n+\n+/// Parse agent id: trim, lowercase. Must be `uuid:rig:provider/model` with no `@`.\n+pub fn parse_agent(input: &str) -> Result {\n+ let s = input.trim();\n+ if s.is_empty() {\n+ return Err(\"agent id must not be empty\".to_string());\n+ }\n+ if s.contains('@') {\n+ return Err(\n+ \"agent id must not contain '@' — use `uuid:rig:provider/model`\".to_string(),\n+ );\n+ }\n+ let a = s.to_lowercase();\n+ validate_agent_naked(&a)?;\n+ Ok(a)\n+}\n+\n+fn validate_agent_naked(a: &str) -> Result<(), String> {\n+ let parts: Vec<&str> = a.split(':').collect();\n+ if parts.len() != 3 {\n+ return Err(\"agent must be ::\".to_string());\n+ }\n+ let (uuid_part, rig_part, model_part) = (parts[0], parts[1], parts[2]);\n+ if uuid::Uuid::parse_str(uuid_part).is_err() {\n+ return Err(\"agent uuid must be a valid UUID v4\".to_string());\n+ }\n+ if rig_part.trim().is_empty() {\n+ return Err(\"agent rig must be non-empty\".to_string());\n+ }\n+ if !model_part.contains('/') {\n+ return Err(\"agent model must be \".to_string());\n+ }\n+ Ok(())\n+}\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 1820b0dd9cd2d0b6ce05789e3225e0d86a3d357a..173fbdd6b3f23c062a200b268d04491d5e030b3f 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -1,10 +1,12 @@\n #[macro_use]\n pub mod paths;\n pub mod api;\n+pub mod canonical_path;\n pub mod dsl;\n pub mod html;\n pub mod event_log;\n pub mod events;\n+pub mod identity;\n pub mod middleware;\n pub mod path_types;\n pub mod ranking;\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex 5a903de4f8309b6c3874e2cd70f2eb5650fd50a8..997597f6659c1ba2092bc5348e393bf7a8fa7ae0 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -14,9 +14,9 @@ use std::fmt;\n \n use serde::{Deserialize, Serialize};\n \n-use crate::events::canonicalize_item;\n+use crate::canonical_path::canonicalize_item;\n \n-/// Canonical item identifier as produced by `events::canonicalize_item`.\n+/// Canonical item identifier as produced by `canonical_path::canonicalize_item`.\n ///\n /// In practice this is usually:\n /// - `https://slug.social/~/...` for ontology items, or\ndiff --git a/server/src/ranking.rs b/server/src/ranking.rs\nindex 70119611473a430113429eafb6d92b2bf96a3eb5..f70da0d076da2ba8f0abb5a4415babae1c2305f9 100644\n--- a/server/src/ranking.rs\n+++ b/server/src/ranking.rs\n@@ -265,7 +265,7 @@ mod tests {\n ratio_right: r,\n body: \"because\".to_string(),\n principal: \"test\".to_string(),\n- delegate: \"@00000000-0000-0000-0000-000000000000:test:local/test\".to_string(),\n+ delegate: Some(\"00000000-0000-0000-0000-000000000000:test:local/test\".to_string()),\n thread_id: \"untagged\".to_string(),\n }\n }\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 9ab063a340e228edaa8967ec35762809fccd5d3a..550bcda1a1068df13908d19484d86ad46d65ddf1 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -2,7 +2,8 @@ use std::collections::{HashMap, HashSet, VecDeque};\n \n use serde::{Deserialize, Serialize};\n \n-use crate::events::{canonicalize_agent, canonicalize_tag, canonicalize_username, Event, Ingest, ThreadCapability};\n+use crate::canonical_path::canonicalize_tag;\n+use crate::events::{Event, Ingest, ThreadCapability};\n use crate::path_types::CanonicalItemUrl;\n \n #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]\n@@ -21,10 +22,10 @@ pub struct VoteData {\n pub ratio_left: i32,\n pub ratio_right: i32,\n pub body: String,\n- /// Human principal username (no leading '@').\n+ /// Human principal username (no `@` in stored events).\n pub principal: String,\n- /// Agent delegate identity (stored with single leading '@').\n- pub delegate: String,\n+ /// AI delegate id, if any (no `@` in stored events).\n+ pub delegate: Option,\n /// Thread id where this vote was cast (public tag or private id/slug).\n pub thread_id: String,\n }\n@@ -99,8 +100,6 @@ impl GroupState {\n pub fn apply_vote(&mut self, mut vote: VoteData) {\n vote.a = CanonicalItemUrl::parse(vote.a.as_str()).unwrap_or(vote.a);\n vote.b = CanonicalItemUrl::parse(vote.b.as_str()).unwrap_or(vote.b);\n- vote.principal = canonicalize_username(&vote.principal);\n- vote.delegate = canonicalize_agent(&vote.delegate);\n vote.thread_id = canonicalize_tag(&vote.thread_id);\n if vote.ratio_left < 0 {\n vote.ratio_left = 0;\n@@ -189,7 +188,7 @@ pub struct ReducerState {\n pub users_by_provider: HashMap<(String, String), String>,\n /// token_id -> (username, salt, token_hash)\n pub tokens_by_id: HashMap,\n- /// agent delegate (canonical '@...') -> username\n+ /// agent id (naked `uuid:rig:model`) -> username\n pub agent_bindings: HashMap,\n \n pub ingests_by_id: HashMap,\n@@ -330,26 +329,27 @@ impl ReducerState {\n pub fn apply_event(&mut self, event: Event) {\n match event {\n Event::UserRegistered(ur) => {\n- let username = canonicalize_username(&ur.username);\n- self.users_by_provider\n- .insert((ur.provider.to_lowercase(), ur.provider_id.clone()), username);\n+ self.users_by_provider.insert(\n+ (ur.provider.to_lowercase(), ur.provider_id.clone()),\n+ ur.username,\n+ );\n }\n Event::TokenIssued(ti) => {\n- let username = canonicalize_username(&ti.username);\n- self.tokens_by_id\n- .insert(ti.token_id.clone(), (username, ti.salt.clone(), ti.token_hash.clone()));\n+ self.tokens_by_id.insert(\n+ ti.token_id.clone(),\n+ (ti.username, ti.salt.clone(), ti.token_hash.clone()),\n+ );\n }\n Event::AgentBound(ab) => {\n- let username = canonicalize_username(&ab.username);\n- let agent = canonicalize_agent(&ab.agent);\n- self.agent_bindings.insert(agent, username);\n+ if ab.agent.is_empty() {\n+ return;\n+ }\n+ self.agent_bindings.insert(ab.agent, ab.username);\n }\n Event::ThreadCreated(tc) => {\n self.threads.entry(tc.thread_id.clone()).or_default().visibility = tc.visibility;\n }\n Event::Ingest(mut ing) => {\n- ing.principal = canonicalize_username(&ing.principal);\n- ing.delegate = canonicalize_agent(&ing.delegate);\n ing.thread_id = canonicalize_tag(&ing.thread_id);\n \n self.ingests_by_id.insert(ing.id.clone(), ing.clone());\n@@ -528,7 +528,7 @@ impl ReducerState {\n let caps = self.grants\n .entry(ga.thread_id)\n .or_default()\n- .entry(canonicalize_username(&ga.username))\n+ .entry(ga.username)\n .or_default();\n for cap in ga.capabilities {\n caps.insert(cap);\n@@ -536,7 +536,7 @@ impl ReducerState {\n }\n Event::GrantRevoked(gr) => {\n if let Some(thread_grants) = self.grants.get_mut(&gr.thread_id) {\n- let username = canonicalize_username(&gr.username);\n+ let username = gr.username;\n if let Some(caps) = thread_grants.get_mut(&username) {\n for cap in &gr.capabilities {\n caps.remove(cap);\ndiff --git a/server/tests/basic.rs b/server/tests/basic.rs\nindex 8d7dd87d327c969ad953ecaa6b021a03e4d1842e..21cacd3049c9f5a307e75eefd5ebfc7bf0097b5d 100644\n--- a/server/tests/basic.rs\n+++ b/server/tests/basic.rs\n@@ -1,6 +1,7 @@\n use slugsocial_server::{\n event_log::EventLog,\n- events::{canonicalize_item, canonicalize_tag, Event, Ingest},\n+ canonical_path::{canonicalize_item, canonicalize_tag},\n+ events::{Event, Ingest},\n ranking::ranked_items,\n reducer::{GroupState, ReducerState},\n };\n@@ -15,7 +16,7 @@ fn ingest_event(ts: i64, raw: &str) -> Event {\n id: format!(\"test-{ts}\"),\n raw: raw.to_string(),\n principal: \"test\".to_string(),\n- delegate: \"@@00000000-0000-0000-0000-000000000000:test:local/test\".to_string(),\n+ delegate: Some(\"00000000-0000-0000-0000-000000000000:test:local/test\".to_string()),\n thread_id: \"t\".to_string(),\n })\n }\n@@ -491,7 +492,7 @@ fn reducer_negative_ratio_clamped_to_zero() {\n ratio_right: -3,\n body: \"negative\".to_string(),\n principal: \"test\".to_string(),\n- delegate: \"@@00000000-0000-0000-0000-000000000000:test:local/test\".to_string(),\n+ delegate: Some(\"00000000-0000-0000-0000-000000000000:test:local/test\".to_string()),\n thread_id: \"t\".to_string(),\n });\n assert_eq!(group.idx_to_item.len(), 2);\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex 24ef464631cd269889b8bb751ef0e90289443e97..eaa25f2c5cc21df3096d9b8f54c060c83207bfd6 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -87,7 +87,7 @@ async fn test_ingest_actor_with_colons_is_detected_and_validated() {\n // Old archive style: agent includes colons but UUID is only a prefix (invalid).\n // We should detect the agent line, then fail with \"invalid agent format\".\n let ingest_payload = serde_json::json!({\n- \"delegate\": \"@@aec1e31c:claudecode:anthropic/claude-sonnet-4.5\",\n+ \"delegate\": \"aec1e31c:claudecode:anthropic/claude-sonnet-4.5\",\n \"thread\": \"t\",\n \"text\": \"~/x {x}\\n\",\n });\n@@ -108,6 +108,26 @@ async fn test_ingest_actor_with_colons_is_detected_and_validated() {\n hint.to_lowercase().contains(\"uuid\"),\n \"hint should mention uuid, got: {hint}\"\n );\n+\n+ let at_payload = serde_json::json!({\n+ \"delegate\": \"@00000000-0000-0000-0000-000000000000:test:local/test\",\n+ \"thread\": \"t\",\n+ \"text\": \"~/x {x}\\n\",\n+ });\n+ let at_resp = client\n+ .post(&format!(\"http://{}/api/v0/ingest\", addr))\n+ .header(\"Authorization\", format!(\"Bearer {}\", test_bearer()))\n+ .json(&at_payload)\n+ .send()\n+ .await\n+ .unwrap();\n+ assert_eq!(at_resp.status(), reqwest::StatusCode::BAD_REQUEST);\n+ let at_body: serde_json::Value = at_resp.json().await.unwrap();\n+ let at_hint = at_body[\"hint\"].as_str().unwrap_or_default();\n+ assert!(\n+ at_hint.contains('@'),\n+ \"hint should reject '@' in delegate, got: {at_hint}\"\n+ );\n }\n \n #[tokio::test]\n@@ -117,7 +137,7 @@ async fn test_vote_endpoint() {\n \n // /api/v0/vote was removed; all votes are submitted via ingest.\n let ingest_payload = serde_json::json!({\n- \"delegate\": \"@@00000000-0000-0000-0000-000000000000:test:local/test\",\n+ \"delegate\": \"00000000-0000-0000-0000-000000000000:test:local/test\",\n \"thread\": \"cli\",\n \"text\": \"~/clap {cli parser}\\n~/argh {cli parser}\\n~/clap 3:1 ~/argh {because clap is more full-featured}\\n\",\n });\n@@ -143,7 +163,7 @@ async fn test_rank_endpoint() {\n \n // Ingest items + vote (vote endpoint removed).\n let ingest_payload = serde_json::json!({\n- \"delegate\": \"@@00000000-0000-0000-0000-000000000000:test:local/test\",\n+ \"delegate\": \"00000000-0000-0000-0000-000000000000:test:local/test\",\n \"thread\": \"langs\",\n \"text\": \"~/rust {systems}\\n~/go {concurrency}\\n~/rust 3:1 ~/go {because i prefer rust for systems work}\\n\",\n });\n@@ -180,7 +200,7 @@ async fn test_check_endpoint_does_not_commit() {\n let client = reqwest::Client::new();\n \n let check_payload = serde_json::json!({\n- \"delegate\": \"@@00000000-0000-0000-0000-000000000000:test:local/test\",\n+ \"delegate\": \"00000000-0000-0000-0000-000000000000:test:local/test\",\n \"thread\": \"t\",\n \"text\": \"~/a {x}\\n~/b {y}\\n~/a 2:1 ~/b {because}\\n\",\n });\n@@ -220,7 +240,7 @@ async fn test_garden_item_pair_matchup_include_threads() {\n \n // Ingest with thread_id metadata so item_threads and vote.thread_id are populated.\n let ingest_payload = serde_json::json!({\n- \"delegate\": \"@@00000000-0000-0000-0000-000000000000:test:local/test\",\n+ \"delegate\": \"00000000-0000-0000-0000-000000000000:test:local/test\",\n \"thread\": \"sorting-hat\",\n \"text\": \"~/sorts/insertion { O(n^2) }\\n~/sorts/mergesort { O(n log n) }\\n~/sorts/insertion 3:1 ~/sorts/mergesort { simpler for small n }\\n\",\n });\n@@ -324,7 +344,7 @@ async fn test_rank_history() {\n // First ingest: rust vs python — two votes on rust in one doc (the multi-vote case).\n ingest(\n serde_json::json!({\n- \"delegate\": \"@@00000000-0000-0000-0000-000000000001:rig:test/model\",\n+ \"delegate\": \"00000000-0000-0000-0000-000000000001:rig:test/model\",\n \"thread\": \"hist-test\",\n \"text\": \"~/hist/rust { systems }\\n~/hist/python { scripting }\\n~/hist/go { concurrency }\\n~/hist/rust 3:1 ~/hist/python { ownership over gc }\\n~/hist/rust 2:1 ~/hist/go { performance over simplicity }\\n\",\n }),\n@@ -354,7 +374,7 @@ async fn test_rank_history() {\n // Second ingest: python beats go — rust not directly touched, so python gets a new entry.\n ingest(\n serde_json::json!({\n- \"delegate\": \"@@00000000-0000-0000-0000-000000000002:rig:test/model\",\n+ \"delegate\": \"00000000-0000-0000-0000-000000000002:rig:test/model\",\n \"thread\": \"hist-test\",\n \"text\": \"~/hist/python 3:1 ~/hist/go { dynamic typing is worth it }\\n\",\n }),\n@@ -404,7 +424,7 @@ async fn pair_returns_connectivity_stats() {\n \n // Ingest 4 items with 1 vote (a vs b), leaving c and d as isolates.\n let doc = serde_json::json!({\n- \"delegate\": \"@@00000000-0000-0000-0000-000000000001:testrig:test/model\",\n+ \"delegate\": \"00000000-0000-0000-0000-000000000001:testrig:test/model\",\n \"thread\": \"connectivity-test\",\n \"text\": \"~/conn/a { item a }\\n~/conn/b { item b }\\n~/conn/c { item c }\\n~/conn/d { item d }\\n~/conn/a 3:1 ~/conn/b { a is better }\\n\",\n });\n@@ -438,7 +458,7 @@ async fn pair_returns_connectivity_stats() {\n \n // Add a vote connecting c to a — should reduce components.\n let doc2 = serde_json::json!({\n- \"delegate\": \"@@00000000-0000-0000-0000-000000000001:testrig:test/model\",\n+ \"delegate\": \"00000000-0000-0000-0000-000000000001:testrig:test/model\",\n \"thread\": \"connectivity-test\",\n \"text\": \"~/conn/c 2:1 ~/conn/a { c beats a }\\n\",\n });\ndiff --git a/test/auth.bb b/test/auth.bb\nindex b54ea509aafd2d5ee85877665982d7fc00cd8b20..611e04f1806ef81d678a91f499597fe55f691dd7 100644\n--- a/test/auth.bb\n+++ b/test/auth.bb\n@@ -155,7 +155,7 @@\n \n (println \"\\nstarting pending session…\")\n (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n- {:agent \"@@00000000-0000-0000-0000-000000000000:bb:local/dev\"})\n+ {:agent \"00000000-0000-0000-0000-000000000000:bb:local/dev\"})\n _ (assert! (= 200 (:status start-resp)) \"pending-session start returns 200\")\n start-json (json/parse-string (:body start-resp) true)]\n (assert! (clojure.string/starts-with? (:session start-json) \"p_\") \"session id has p_ prefix\")\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 962ff01cdc25d6d6977cc9a810c404918c20856d..f72799ae6fe099f48bdf316deee07f15882e9d45 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -187,11 +187,11 @@\n ;; Register two users. The mock google cycles through google-user-alice then google-user-bob.\n (println \"\\nregistering alice…\")\n (let [alice-token (register-user base-url\n- \"@@00000000-0000-0000-0000-000000000001:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n \"alice\")\n _ (println \"registering bob…\")\n bob-token (register-user base-url\n- \"@@00000000-0000-0000-0000-000000000002:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n \"bob\")\n \n ;; Alice creates a private thread.\n@@ -206,14 +206,14 @@\n ;; Alice (owner) can post prose to her own private thread.\n (println \"\\nalice posts prose to her private thread…\")\n (assert! (= 200 (:status (ingest! base-url alice-token thread-id\n- \"@@00000000-0000-0000-0000-000000000001:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n \"Hello from alice.\")))\n \"alice prose post succeeds\")\n \n ;; Bob has no grants at all — should get 403.\n (println \"\\nbob (no grants) tries to post prose…\")\n (assert! (= 403 (:status (ingest! base-url bob-token thread-id\n- \"@@00000000-0000-0000-0000-000000000002:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n \"Hello from bob, unauthorized.\")))\n \"bob without grants gets 403\")\n \n@@ -226,7 +226,7 @@\n \n (println \"\\nbob (View only) tries to post prose…\")\n (assert! (= 403 (:status (ingest! base-url bob-token thread-id\n- \"@@00000000-0000-0000-0000-000000000002:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n \"Hello from bob, view only.\")))\n \"bob with View but no Post gets 403\")\n \n@@ -239,21 +239,21 @@\n \n (println \"\\nbob (View + Post) posts prose…\")\n (assert! (= 200 (:status (ingest! base-url bob-token thread-id\n- \"@@00000000-0000-0000-0000-000000000002:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n \"Hello from bob, now authorised.\")))\n \"bob with View + Post succeeds for prose\")\n \n ;; Alice defines two items and votes on them in the private thread.\n (println \"\\nalice posts items + vote to private thread…\")\n (assert! (= 200 (:status (ingest! base-url alice-token thread-id\n- \"@@00000000-0000-0000-0000-000000000001:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n \"~/fruits/apple { A crisp red apple. }\\n~/fruits/banana { A yellow banana. }\\n~/fruits/apple > ~/fruits/banana { apples are better }\")))\n \"alice vote in private thread succeeds\")\n \n ;; Bob (View + Post, no Vote) tries to vote — should be 403.\n (println \"\\nbob (no Vote) tries to vote…\")\n (assert! (= 403 (:status (ingest! base-url bob-token thread-id\n- \"@@00000000-0000-0000-0000-000000000002:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n \"~/fruits/apple > ~/fruits/banana { bob's take }\")))\n \"bob without Vote gets 403\")\n \n@@ -266,7 +266,7 @@\n \n (println \"\\nbob (View + Post + Vote) votes…\")\n (assert! (= 200 (:status (ingest! base-url bob-token thread-id\n- \"@@00000000-0000-0000-0000-000000000002:test:local/dev\"\n+ \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n \"~/fruits/apple > ~/fruits/banana { bob's take }\")))\n \"bob with Vote succeeds\"))\n \ndiff --git a/test/integration.bb b/test/integration.bb\nindex 93db8f3102b1b3a05f3c4bd2cc9f348072fe54cc..4ff5d625840be3bf5e4162cef107a3cbd45aec4d 100644\n--- a/test/integration.bb\n+++ b/test/integration.bb\n@@ -166,7 +166,7 @@\n \n ;; 3. ingest via CLI (bearer required)\n (println \"\\ningesting .sorter document via CLI…\")\n- (bind ingest1-result (common/run-cli cli-bin base-url [\"ingest\" \"--json\" \"--thread\" \"integration-test\"] :input sorter-doc :extra-env token-env))\n+ (bind ingest1-result (common/run-cli cli-bin base-url [\"ingest\" \"--json\" \"--thread\" \"integration-test\" \"--delegate\" \"00000000-0000-0000-0000-000000000000:cli:local/dev\"] :input sorter-doc :extra-env token-env))\n (assert! (zero? (:exit ingest1-result)) \"cli ingest exits 0\")\n (bind ingest1-resp (json/parse-string (:out ingest1-result) true))\n (assert! (:ok ingest1-resp) \"ingest response ok=true\")\n@@ -237,7 +237,7 @@\n \"#integration-test\"\n \"~/languages/rust 4:1 ~/languages/python { type safety }\"\n \"~/languages/rust 3:1 ~/languages/go { zero-cost abstractions }\"]))\n- (bind hist-ingest (common/run-cli cli-bin base-url [\"ingest\" \"--json\" \"--thread\" \"integration-test\"] :input two-vote-doc :extra-env token-env))\n+ (bind hist-ingest (common/run-cli cli-bin base-url [\"ingest\" \"--json\" \"--thread\" \"integration-test\" \"--delegate\" \"00000000-0000-0000-0000-000000000000:cli:local/dev\"] :input two-vote-doc :extra-env token-env))\n (assert! (zero? (:exit hist-ingest))\n (str \"two-vote ingest exits 0 (err: \" (:err hist-ingest) \")\"))\n \ndiff --git a/test/oauth.bb b/test/oauth.bb\nindex f94583ee0f6fedfc023564ed7ee3a2986adcf660..84679e1a4adbe100dfe7e7d64a2c6270b023d275 100644\n--- a/test/oauth.bb\n+++ b/test/oauth.bb\n@@ -85,11 +85,11 @@\n stop-fn (http/run-server handler {:port port})]\n {:stop-fn stop-fn :port port}))\n \n-(def ^:private default-agent \"@@00000000-0000-0000-0000-000000000000:cli:local/dev\")\n+(def ^:private default-agent \"00000000-0000-0000-0000-000000000000:cli:local/dev\")\n \n (defn fetch-bearer-token!\n \"Simulate browser OAuth + username choice; returns `slug_…` bearer token.\n- Agent must match CLI default `SLUG_DELEGATE` for ingest binding.\"\n+ Ingest `--delegate` must match this agent string for `AgentBound` on first write.\"\n [base-url & {:keys [username agent] :or {username \"intuser\" agent default-agent}}]\n (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n {:agent agent})]\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex a62822a36463c68fde6c5fc1aa9e4273c82ca0c8..92e6d122d573ea225f8fb86c548a81b3454425ad 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -138,7 +138,7 @@ pub struct PostRow {\n /// Chronological index within the thread (0 = oldest).\n pub index: usize,\n pub ts: i64,\n- /// Self-declared actor (`@uuid:rig:model`).\n+ /// Principal username (stored form, no `@`).\n pub actor: String,\n pub body: String,\n pub truncated: bool,\n@@ -186,6 +186,7 @@ pub struct VoteRow {\n pub a: String,\n pub b: String,\n pub ratio: String,\n+ /// Principal username when present (stored form, no `@`).\n pub actor: Option,\n pub body: String,\n /// Thread where this vote was cast (e.g. \"#sorting-hat\").\n@@ -196,6 +197,7 @@ pub struct VoteRow {\n /// Response for the feed endpoint — all ingests since a cutoff, newest first.\n #[derive(Debug, Serialize, Deserialize)]\n pub struct FeedResponse {\n+ /// Principal username this feed is scoped to (stored form, no `@`).\n pub actor: String,\n /// The lower-bound timestamp used (actor's last ingest, ms). None if actor has never posted.\n #[serde(default, skip_serializing_if = \"Option::is_none\")]\n@@ -222,8 +224,9 @@ pub struct FeedPost {\n pub struct IngestRequest {\n /// Thread identifier: public tag (e.g. \"languages\") or private id/slug (e.g. \"a7f2k9x/project-review\").\n pub thread: String,\n- /// Agent delegate identity in request form (e.g. \"@@uuid:rig:provider/model\").\n- pub delegate: String,\n+ /// Delegate id: `uuid:rig:provider/model` (no `@`). Omit for human-only ingests.\n+ #[serde(default, skip_serializing_if = \"Option::is_none\")]\n+ pub delegate: Option,\n /// DSL+prose body only.\n pub text: String,\n }\n@@ -231,7 +234,7 @@ pub struct IngestRequest {\n /// Start a browser-based OAuth login flow for a CLI agent.\n #[derive(Debug, Serialize, Deserialize)]\n pub struct PendingSessionStartRequest {\n- /// Agent delegate identity in request form (e.g. \"@@uuid:rig:provider/model\").\n+ /// Delegate id: `uuid:rig:provider/model` (no `@`).\n pub agent: String,\n }\n \n@@ -255,6 +258,7 @@ pub struct PendingSessionPollResponse {\n \n #[derive(Debug, Serialize, Deserialize)]\n pub struct WhoamiResponse {\n+ /// Username (stored form, no `@`).\n pub user: String,\n pub agents_bound: usize,\n }\n","role":"user"}],"model":"~x-ai/grok-latest"}