{"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[4e327784] deploy live constitution dashboard\n\nExpose auditable progress and event streaming, configure the production roots and runtime, and make tested main-branch commits the deployment authority.\n\nCo-authored-by: Cursor \n\nSide B — unified diff (full patch):\ndiff --git a/.dockerignore b/.dockerignore\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..c9d63a722beba0a0297fc853089332c460ab78dd\n--- /dev/null\n+++ b/.dockerignore\n@@ -0,0 +1,7 @@\n+.git\n+.venv\n+.hypothesis\n+__pycache__\n+tests\n+*.json\n+*.bsp\ndiff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..76dcdf82d53177c1e47d86b23a54523239d232a6\n--- /dev/null\n+++ b/.github/workflows/deploy.yml\n@@ -0,0 +1,49 @@\n+name: Test and deploy\n+\n+on:\n+ push:\n+ branches: [main]\n+\n+concurrency:\n+ group: production\n+ cancel-in-progress: false\n+\n+permissions:\n+ contents: read\n+\n+jobs:\n+ test:\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions/checkout@v4\n+\n+ - uses: astral-sh/setup-uv@v6\n+ with:\n+ enable-cache: true\n+\n+ - name: Run Python tests\n+ run: uv run pytest -q\n+\n+ - name: Install Babashka\n+ run: |\n+ curl -fsSL https://raw.githubusercontent.com/babashka/babashka/master/install \\\n+ | sudo bash -s -- --dir /usr/local/bin\n+\n+ - name: Run process integration tests\n+ run: bb TEST.sh\n+\n+ deploy:\n+ needs: test\n+ runs-on: ubuntu-latest\n+ environment:\n+ name: production\n+ url: https://token.slug.social\n+ steps:\n+ - uses: actions/checkout@v4\n+\n+ - uses: superfly/flyctl-actions/setup-flyctl@master\n+\n+ - name: Deploy to Fly\n+ run: flyctl deploy --remote-only\n+ env:\n+ FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}\ndiff --git a/Dockerfile b/Dockerfile\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..c9a5c00782371c19ad5ab5c58cf6f5a8ffec0141\n--- /dev/null\n+++ b/Dockerfile\n@@ -0,0 +1,17 @@\n+FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim\n+\n+RUN apt-get update \\\n+ && apt-get install -y --no-install-recommends git ca-certificates \\\n+ && rm -rf /var/lib/apt/lists/*\n+\n+WORKDIR /app\n+COPY pyproject.toml uv.lock ./\n+RUN uv sync --frozen --no-install-project\n+\n+COPY constitution.py ./\n+\n+ENV PATH=\"/app/.venv/bin:${PATH}\" \\\n+ PYTHONUNBUFFERED=\"1\"\n+\n+EXPOSE 8080\n+CMD [\"python\", \"constitution.py\"]\ndiff --git a/constitution.py b/constitution.py\nindex 4bee9f83663ab7fb36db95129b92b64b4ef57258..a58257e1881b21d1d6fa8e68a3faa222e4f661ef 100644\n--- a/constitution.py\n+++ b/constitution.py\n@@ -24,12 +24,12 @@ A daily GitHub Action backs up the JSONL ledger to the same repo.\n Run: uv run constitution.py\n \"\"\"\n \n-from decimal import Decimal, getcontext\n+from decimal import Decimal, getcontext, DefaultContext\n from datetime import datetime, timezone\n from fastapi import FastAPI, Request, Response\n from fastapi.responses import PlainTextResponse, HTMLResponse\n from starlette.middleware.sessions import SessionMiddleware\n-import json, time, os, asyncio, httpx, pathlib, subprocess, hashlib, re, fcntl\n+import json, time, os, asyncio, httpx, pathlib, subprocess, hashlib, re, fcntl, base64\n import sympy as sp # type: ignore[reportMissingImports]\n from tenacity import retry, retry_if_exception, stop_after_attempt, wait_exponential\n from evaleval import (\n@@ -37,6 +37,7 @@ from evaleval import (\n exec_event, One, Two, Three, Selector, MORPH, PREPEND,\n )\n \n+DefaultContext.prec = 50\n getcontext().prec = 50\n \n app = FastAPI()\n@@ -129,14 +130,47 @@ OPENROUTER_BASE_URL = os.environ.get(\"OPENROUTER_BASE_URL\", \"https://openrouter.\n # using the exact same source; their normalized values are committed to every\n # discovery event.\n DEFAULT_REPOSITORIES = [\n+ {\n+ \"id\": \"constitution\",\n+ \"url\": \"https://github.com/sortersocial/constitution.git\",\n+ \"refs\": [\"refs/heads/**\"],\n+ },\n {\n \"id\": \"slug\",\n- \"url\": \"https://github.com/tommy-mor/slug.git\",\n+ \"url\": \"https://github.com/sortersocial/slug.git\",\n+ \"refs\": [\"refs/heads/**\"],\n+ },\n+ {\n+ \"id\": \"sorter\",\n+ \"url\": \"https://github.com/sorterisntonline/sorter.git\",\n+ \"refs\": [\"refs/heads/**\"],\n+ },\n+ {\n+ \"id\": \"sorter2\",\n+ \"url\": \"https://github.com/sortersocial/sorter2.git\",\n+ \"refs\": [\"refs/heads/**\"],\n+ },\n+ {\n+ \"id\": \"sorter-oldest\",\n+ \"url\": \"https://github.com/tommy-mor/sorter.git\",\n \"refs\": [\"refs/heads/**\"],\n },\n ]\n DEFAULT_CONTRIBUTORS = {\n \"tommy-mor\": [\"thmorriss@gmail.com\"],\n+ \"christopher-whitman\": [\n+ \"chris@cwwhitman.com\",\n+ \"7566903+cwwhitman@users.noreply.github.com\",\n+ ],\n+ \"jake-chvatal\": [\n+ \"jake+github@uln.industries\",\n+ \"jakechvatal@gmail.com\",\n+ \"jake@isnt.online\",\n+ ],\n+ \"lara\": [\"me@lara.lv\"],\n+ \"nat-reid\": [\"nathanielreid@gmail.com\"],\n+ \"zod\": [\"jason.p.mcel@gmail.com\", \"me@zod.tf\"],\n+ \"jovan\": [\"jovan@slug.social\", \"jovan@getcivicai.com\"],\n }\n \n REPOSITORIES = json.loads(\n@@ -147,6 +181,7 @@ CONTRIBUTORS = json.loads(\n )\n GIT_MIRROR_DIR = pathlib.Path(os.environ.get(\"GIT_MIRROR_DIR\", \"/data/git\"))\n GIT_TIMEOUT_SECONDS = int(os.environ.get(\"GIT_TIMEOUT_SECONDS\", \"120\"))\n+GITHUB_TOKEN = os.environ.get(\"GITHUB_TOKEN\", \"\")\n \n # Council model IDs: slug.social garden rank under this parent (bodies = OpenRouter URLs), then top-up from OpenRouter list.\n SLUG_SOCIAL_BASE_URL = os.environ.get(\"SLUG_SOCIAL_BASE_URL\", \"https://slug.social\").rstrip(\"/\")\n@@ -661,20 +696,30 @@ def _git(repo: pathlib.Path | None, *args: str, input_bytes: bytes | None = None\n if repo is not None:\n command += [\"-C\", str(repo)]\n command += list(args)\n+ git_env = {\n+ **os.environ,\n+ \"GIT_CONFIG_NOSYSTEM\": \"1\",\n+ \"GIT_CONFIG_GLOBAL\": os.devnull,\n+ \"GIT_NO_REPLACE_OBJECTS\": \"1\",\n+ \"LC_ALL\": \"C\",\n+ \"TZ\": \"UTC\",\n+ }\n+ if GITHUB_TOKEN:\n+ credential = base64.b64encode(\n+ f\"x-access-token:{GITHUB_TOKEN}\".encode()\n+ ).decode()\n+ git_env.update({\n+ \"GIT_CONFIG_COUNT\": \"1\",\n+ \"GIT_CONFIG_KEY_0\": \"http.https://github.com/.extraHeader\",\n+ \"GIT_CONFIG_VALUE_0\": f\"Authorization: Basic {credential}\",\n+ })\n try:\n result = subprocess.run(\n command,\n input=input_bytes,\n stdout=subprocess.PIPE,\n stderr=subprocess.PIPE,\n- env={\n- **os.environ,\n- \"GIT_CONFIG_NOSYSTEM\": \"1\",\n- \"GIT_CONFIG_GLOBAL\": os.devnull,\n- \"GIT_NO_REPLACE_OBJECTS\": \"1\",\n- \"LC_ALL\": \"C\",\n- \"TZ\": \"UTC\",\n- },\n+ env=git_env,\n timeout=GIT_TIMEOUT_SECONDS,\n check=False,\n )\n@@ -844,9 +889,15 @@ def _build_discovery(epoch_n: int, boundary_ms: int, events: list) -> GitDiscove\n canonical_location = min(\n locations[qualified_oid], key=lambda x: (x[0], x[1])\n )\n+ # One commit may be reachable from dozens of refs in the same mirror.\n+ # Verify its object once per repository, not once per source ref.\n+ object_locations = {\n+ (str(m), raw_oid): (m, raw_oid)\n+ for _, _, m, raw_oid in locations[qualified_oid]\n+ }\n object_hashes = {\n hashlib.sha256(_git(m, \"cat-file\", \"commit\", raw_oid)).hexdigest()\n- for _, _, m, raw_oid in locations[qualified_oid]\n+ for m, raw_oid in object_locations.values()\n }\n if len(object_hashes) != 1:\n raise RuntimeError(f\"conflicting Git objects share OID {qualified_oid}\")\n@@ -994,11 +1045,55 @@ async def discover_repositories(epoch_n: int, boundary_ms: int) -> GitDiscovery:\n \n \n SSE_CLIENTS = []\n+AUDIT_HISTORY = []\n+AUDIT_SEQUENCE = 0\n+PROCESS_STATE = {\n+ \"running\": False,\n+ \"phase\": \"idle\",\n+ \"progress\": 100,\n+ \"message\": \"Waiting for the next epoch\",\n+}\n+\n+\n+def _sse_event(event_name: str, payload: dict) -> str:\n+ return (\n+ f\"event: {event_name}\\n\"\n+ f\"data: {json.dumps(payload, separators=(',', ':'))}\\n\\n\"\n+ )\n+\n+\n+async def broadcast_audit(\n+ kind: str,\n+ message: str,\n+ *,\n+ progress: int | None = None,\n+ phase: str | None = None,\n+) -> dict:\n+ global AUDIT_SEQUENCE\n+ AUDIT_SEQUENCE += 1\n+ if progress is not None:\n+ PROCESS_STATE[\"progress\"] = max(0, min(100, int(progress)))\n+ if phase is not None:\n+ PROCESS_STATE[\"phase\"] = phase\n+ PROCESS_STATE[\"message\"] = message\n+ payload = {\n+ \"id\": AUDIT_SEQUENCE,\n+ \"timestamp_ms\": int(time.time() * 1000),\n+ \"kind\": kind,\n+ \"message\": message,\n+ **PROCESS_STATE,\n+ }\n+ AUDIT_HISTORY.append(payload)\n+ del AUDIT_HISTORY[:-200]\n+ wire = _sse_event(\"audit\", payload)\n+ for queue in list(SSE_CLIENTS):\n+ await queue.put(wire)\n+ return payload\n \n \n async def broadcast_js(js: str):\n \"\"\"Send a JS snippet to all connected SSE clients.\"\"\"\n- for queue in SSE_CLIENTS:\n+ for queue in list(SSE_CLIENTS):\n await queue.put(js)\n \n \n@@ -1006,10 +1101,29 @@ async def rank_commits(commits: list[dict]):\n if not commits:\n return {}, []\n \n- models = await fetch_top_models(n=3)\n contributors = sorted(set(c[\"contributor\"] for c in commits))\n- if len(contributors) > 1 and not models:\n+ if len(contributors) == 1:\n+ await broadcast_audit(\n+ \"ranking\",\n+ f\"Only {contributors[0]} is eligible; rank is 1.0\",\n+ progress=90,\n+ phase=\"finalizing\",\n+ )\n+ return {contributors[0]: Decimal(\"1\")}, []\n+ if not (OPENROUTER_API_KEY or \"\").strip():\n+ raise RuntimeError(\n+ \"OPENROUTER_API_KEY is required when multiple contributors need ranking\"\n+ )\n+\n+ models = await fetch_top_models(n=3)\n+ if not models:\n raise RuntimeError(\"no council models available for contributor ranking\")\n+ await broadcast_audit(\n+ \"council\",\n+ f\"Council selected: {', '.join(models)}\",\n+ progress=35,\n+ phase=\"ranking\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-council\", f\"Council: {', '.join(models)} — {len(commits)} commits\"]\n ]))\n@@ -1035,6 +1149,11 @@ async def rank_commits(commits: list[dict]):\n \n async def compare_fn(i, j):\n a1, a2 = authors[i], authors[j]\n+ await broadcast_audit(\n+ \"comparison\",\n+ f\"Comparing {a1} with {a2}\",\n+ phase=\"ranking\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-status\")][MORPH][\n [\"div#emission-status\", f\"Comparing {a1} vs {a2}…\"]\n ]))\n@@ -1050,6 +1169,11 @@ async def rank_commits(commits: list[dict]):\n if winner_weight <= 0 or loser_weight <= 0:\n raise ValueError(\"ratio weights must be positive\")\n results.append((w, l, winner_weight, loser_weight))\n+ await broadcast_audit(\n+ \"vote\",\n+ f\"{model}: {authors[w]} over {authors[l]} ({result['ratio']})\",\n+ phase=\"ranking\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-vote\",\n [\"span.model\", model], \" — \",\n@@ -1059,6 +1183,11 @@ async def rank_commits(commits: list[dict]):\n ]\n ]))\n except Exception as e:\n+ await broadcast_audit(\n+ \"error\",\n+ f\"{model} failed: {e}\",\n+ phase=\"error\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-error\", f\"⚠ {model}: {e}\"]\n ]))\n@@ -1068,8 +1197,13 @@ async def rank_commits(commits: list[dict]):\n async def progress_fn(ev):\n if ev[\"phase\"] == \"spanning_tree\":\n label = f\"Spanning tree: {ev['step']}/{ev['total']}\"\n+ percent = 35 + round(35 * ev[\"step\"] / max(ev[\"total\"], 1))\n else:\n label = f\"Zip pass {ev['pass']}: {ev['step']}/{ev['total']}\"\n+ percent = 70 + round(20 * ev[\"step\"] / max(ev[\"total\"], 1))\n+ await broadcast_audit(\n+ \"progress\", label, progress=percent, phase=\"ranking\"\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-status\")][MORPH][\n [\"div#emission-status\", label]\n ]))\n@@ -1083,6 +1217,12 @@ async def rank_commits(commits: list[dict]):\n scores = rank_centrality(pairs)\n ranking = {authors[i]: Decimal(str(scores[i])) for i in range(len(authors))}\n ranking_rows = sorted(ranking.items(), key=lambda x: x[1], reverse=True)\n+ await broadcast_audit(\n+ \"ranking\",\n+ \"Ranking: \" + \", \".join(f\"{a} {s:.4f}\" for a, s in ranking_rows),\n+ progress=90,\n+ phase=\"finalizing\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-ranking\",\n [\"b\", \"Ranking: \"],\n@@ -1104,11 +1244,33 @@ def pool_remaining(events: list) -> Decimal:\n \n \n async def run_emission(epoch_n, boundary_ms):\n+ PROCESS_STATE[\"running\"] = True\n+ await broadcast_audit(\n+ \"start\",\n+ f\"Epoch {epoch_n} emission started\",\n+ progress=2,\n+ phase=\"starting\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-start\", f\"⚡ Epoch {epoch_n} emission started\"]\n ]))\n \n+ await broadcast_audit(\n+ \"discovery\",\n+ \"Fetching configured repositories and snapshotting refs\",\n+ progress=8,\n+ phase=\"discovery\",\n+ )\n discovery = await discover_repositories(epoch_n, boundary_ms)\n+ await broadcast_audit(\n+ \"discovery\",\n+ (\n+ f\"Discovered {len(discovery.observations)} new commits; \"\n+ f\"{len(discovery.commits)} are eligible\"\n+ ),\n+ progress=30,\n+ phase=\"discovery\",\n+ )\n ranking, models = await rank_commits(discovery.commits)\n \n def make_emission(events):\n@@ -1146,6 +1308,13 @@ async def run_emission(epoch_n, boundary_ms):\n \n entry = await store.atomic(make_emission)\n if entry:\n+ PROCESS_STATE[\"running\"] = False\n+ await broadcast_audit(\n+ \"complete\",\n+ f\"Epoch {entry.epoch} complete; emitted {entry.total_emitted} SLG\",\n+ progress=100,\n+ phase=\"idle\",\n+ )\n await broadcast_js(exec_event(Three[Selector(\"#emission-log\")][PREPEND][\n [\"div.log-amount\",\n f\"Pool {entry.pool_before} → emit {entry.total_emitted} → {entry.pool_after}\"]\n@@ -1189,13 +1358,24 @@ async def distribute_usdc(holdings, treasury_balance):\n async def epoch_loop():\n while True:\n epoch_n, current_start, next_boundary = current_epoch()\n+ processed = {e.epoch for e in store.read() if isinstance(e, Emission)}\n+ if epoch_n >= 0 and epoch_n not in processed:\n+ try:\n+ await run_emission(epoch_n, current_start)\n+ except Exception as exc:\n+ PROCESS_STATE[\"running\"] = False\n+ await broadcast_audit(\n+ \"error\",\n+ f\"Epoch {epoch_n} failed: {exc}; retrying in 60 seconds\",\n+ phase=\"error\",\n+ )\n+ print(f\"epoch {epoch_n} emission failed: {exc}\", flush=True)\n+ await asyncio.sleep(60)\n+ continue\n+\n now = int(time.time() * 1000)\n wait_ms = next_boundary - now\n-\n if wait_ms <= 0:\n- processed = {e.epoch for e in store.read() if isinstance(e, Emission)}\n- if epoch_n not in processed and epoch_n >= 0:\n- await run_emission(epoch_n, current_start)\n await asyncio.sleep(60)\n elif wait_ms < 86_400_000:\n await broadcast_js(exec_event(Three[Selector(\"#emission-status\")][MORPH][\n@@ -1243,6 +1423,36 @@ async def get_ranking():\n return {\"ranking\": latest.ranking, \"epoch\": latest.epoch}\n \n \n+@app.get(\"/api/status\")\n+async def get_status():\n+ events = store.read()\n+ discoveries = [e for e in events if isinstance(e, GitDiscovery)]\n+ emissions = [e for e in events if isinstance(e, Emission)]\n+ return {\n+ **PROCESS_STATE,\n+ \"epoch\": current_epoch()[0],\n+ \"openrouter_configured\": bool((OPENROUTER_API_KEY or \"\").strip()),\n+ \"sse_clients\": len(SSE_CLIENTS),\n+ \"latest_discovery\": (\n+ {\n+ \"epoch\": discoveries[-1].epoch,\n+ \"snapshot_id\": discoveries[-1].snapshot_id,\n+ \"observations\": len(discoveries[-1].observations),\n+ \"eligible_commits\": len(discoveries[-1].commits),\n+ }\n+ if discoveries else None\n+ ),\n+ \"latest_emission\": (\n+ {\n+ \"epoch\": emissions[-1].epoch,\n+ \"total_emitted\": emissions[-1].total_emitted,\n+ \"ranking\": emissions[-1].ranking,\n+ }\n+ if emissions else None\n+ ),\n+ }\n+\n+\n @app.get(\"/api/contributor/{github_username}\")\n async def get_contributor(github_username: str):\n history = [\n@@ -1306,13 +1516,6 @@ async def test_emit():\n \n # ===========================================================================\n # §9. SSE — live audit stream of the pairwise voting process\n-#\n-# TODO: the /sse emission audit page needs a real SSE-driven UI. votes arrive\n-# incrementally during rank_commits(), and the client should show a live\n-# progress bar and per-vote results as they stream in. this requires a\n-# dedicated page that connects to /sse and updates the DOM on each event\n-# (council, comparing, vote, ranking, emission_complete). defer until we\n-# have playwright tests to cover it — the incremental rendering is fiddly.\n # ===========================================================================\n \n @app.get(\"/sse\")\n@@ -1322,6 +1525,13 @@ async def sse_stream(request: Request):\n \n async def generate():\n try:\n+ yield _sse_event(\"audit\", {\n+ \"id\": AUDIT_SEQUENCE,\n+ \"timestamp_ms\": int(time.time() * 1000),\n+ \"kind\": \"connection\",\n+ \"message\": f\"Connected to epoch {current_epoch()[0]}\",\n+ **PROCESS_STATE,\n+ })\n yield exec_event(Three[Selector(\"#emission-status\")][MORPH][\n [\"div#emission-status\", f\"Connected — epoch {current_epoch()[0]}\"]\n ])\n@@ -1334,10 +1544,15 @@ async def sse_stream(request: Request):\n except asyncio.TimeoutError:\n yield \": keepalive\\n\\n\"\n finally:\n- SSE_CLIENTS.remove(queue)\n+ if queue in SSE_CLIENTS:\n+ SSE_CLIENTS.remove(queue)\n \n from starlette.responses import StreamingResponse\n- return StreamingResponse(generate(), media_type=\"text/event-stream\")\n+ return StreamingResponse(\n+ generate(),\n+ media_type=\"text/event-stream\",\n+ headers={\"Cache-Control\": \"no-cache\", \"X-Accel-Buffering\": \"no\"},\n+ )\n \n \n # ===========================================================================\n@@ -1359,6 +1574,7 @@ def _page(title: str, body: list) -> HTMLResponse:\n [\"meta\", {\"charset\": \"utf-8\"}],\n [\"meta\", {\"name\": \"viewport\", \"content\": \"width=device-width, initial-scale=1\"}],\n [\"title\", title],\n+ [\"style\", RawContent(_WATCH_CSS)],\n ],\n [\"body\",\n body,\n@@ -1367,6 +1583,387 @@ def _page(title: str, body: list) -> HTMLResponse:\n ]))\n \n \n+_WATCH_CSS = \"\"\"\n+/* ================================================================\n+ ZIGGURAT — bevel-first dark theme\n+ --spread (0→1) controls bevel depth. 0 = flat. 1 = full relief.\n+ Light source: top-left. Shadow: bottom-right.\n+ Platforms nest. Each level is raised. Nothing is rounded.\n+ ================================================================ */\n+\n+:root {\n+ color-scheme: dark;\n+ --spread: 1;\n+\n+ --g0: #080808;\n+ --g1: #131313;\n+ --g2: #1c1c1c;\n+ --g3: #252525;\n+ --g4: #2e2e2e;\n+ --g5: #383838;\n+\n+ --hi: #5e5e5e;\n+ --lo: #050505;\n+ --bv: calc(var(--spread) * 4px + 1px);\n+ --bv-lg: calc(var(--spread) * 6px + 2px);\n+\n+ --signal: #f0f0f0;\n+ --prose: #c2c2c2;\n+ --ui: #888;\n+ --meta: #4a4a4a;\n+ --link: #8899ee;\n+ --code-fg: #c8dda0;\n+\n+ --font-prose: \"Iowan Old Style\", \"Palatino Linotype\", Palatino, \"Book Antiqua\", Georgia, serif;\n+ --font-ui: system-ui, -apple-system, sans-serif;\n+ --font-code: ui-monospace, \"Cascadia Code\", \"SF Mono\", Menlo, monospace;\n+}\n+\n+*, *::before, *::after { box-sizing: border-box; }\n+html, body { margin: 0; padding: 0; }\n+\n+body {\n+ background: var(--g0);\n+ color: var(--prose);\n+ font-family: var(--font-ui);\n+ font-size: 14px;\n+ line-height: 1.6;\n+ margin: 0 auto;\n+ max-width: 560px;\n+ min-height: 100vh;\n+ padding: 0 16px 48px;\n+}\n+main { width: 100%; padding: 18px 0 48px; }\n+\n+h1, h2, h3 {\n+ color: var(--signal);\n+ font-size: 11px;\n+ font-weight: bold;\n+ letter-spacing: 0.12em;\n+ margin: 14px 0 6px;\n+ text-transform: uppercase;\n+}\n+a { color: var(--link); text-decoration: none; }\n+a:hover { color: var(--signal); }\n+.eyebrow {\n+ background: var(--g2);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ color: var(--ui);\n+ font-size: 11px;\n+ letter-spacing: 0.12em;\n+ padding: 4px 10px;\n+ text-transform: uppercase;\n+ width: fit-content;\n+}\n+\n+/* Every dashboard section is a raised platform. */\n+.panel {\n+ background: var(--g2);\n+ border: var(--bv-lg) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ margin: 8px 0;\n+ padding: 10px;\n+ width: 100%;\n+}\n+.status-row {\n+ align-items: center;\n+ display: flex;\n+ flex-wrap: wrap;\n+ gap: 8px;\n+ justify-content: space-between;\n+}\n+#process-status { color: var(--signal); font-family: var(--font-code); font-weight: bold; }\n+.badge {\n+ align-items: center;\n+ background: var(--g3);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ color: var(--ui);\n+ display: inline-flex;\n+ font-size: 11px;\n+ gap: 7px;\n+ padding: 3px 8px;\n+}\n+.dot { background: var(--meta); height: 8px; width: 8px; }\n+.live .dot { background: #7acc7a; }\n+.warn .dot { background: #cc9955; }\n+\n+/* The progress track is inset; its signal is raised inside it. */\n+.progress-shell {\n+ background: var(--g1);\n+ border: var(--bv-lg) solid;\n+ border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n+ height: 58px;\n+ margin: 14px 0 10px;\n+ overflow: hidden;\n+ position: relative;\n+}\n+#progress-fill {\n+ background: var(--link);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ height: 100%;\n+ transition: width .35s steps(8, end);\n+ width: 0;\n+}\n+#progress-label {\n+ color: var(--signal);\n+ display: grid;\n+ font-family: var(--font-code);\n+ font-size: 18px;\n+ font-weight: bold;\n+ inset: 0;\n+ place-items: center;\n+ position: absolute;\n+ text-shadow: 1px 1px var(--lo);\n+}\n+\n+.controls { align-items: center; display: flex; flex-wrap: wrap; gap: 8px; }\n+button {\n+ background: var(--g5);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ color: var(--signal);\n+ cursor: pointer;\n+ font: inherit;\n+ font-size: 12px;\n+ padding: 4px 10px;\n+}\n+button:hover { background: #404040; }\n+button:active {\n+ background: var(--g4);\n+ border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n+ transform: translate(1px, 1px);\n+}\n+button:disabled { cursor: default; opacity: .4; }\n+.note { color: var(--meta); font-size: 11px; margin: 4px 0; }\n+\n+.feed-head { align-items: baseline; display: flex; justify-content: space-between; }\n+#audit-feed {\n+ background: var(--g1);\n+ border: var(--bv) solid;\n+ border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n+ display: flex;\n+ flex-direction: column;\n+ gap: 5px;\n+ margin-top: 8px;\n+ padding: 6px;\n+}\n+.event {\n+ background: var(--g3);\n+ border: var(--bv) solid;\n+ border-color: var(--hi) var(--lo) var(--lo) var(--hi);\n+ display: grid;\n+ gap: 6px;\n+ grid-template-columns: 82px 88px 1fr;\n+ padding: 5px 8px;\n+}\n+.event[data-kind=\"error\"] { border-left-color: #cc5555; }\n+.event[data-kind=\"complete\"], .event[data-kind=\"ranking\"] { border-left-color: #7acc7a; }\n+.event[data-kind=\"vote\"] { border-left-color: var(--link); }\n+.event time, .event-kind { color: var(--meta); font-family: var(--font-code); font-size: 10px; }\n+.event-kind { text-transform: uppercase; }\n+.event-message { color: var(--prose); font-family: var(--font-prose); }\n+\n+code {\n+ background: var(--g1);\n+ border: 2px solid;\n+ border-color: var(--lo) var(--hi) var(--hi) var(--lo);\n+ color: var(--code-fg);\n+ font-family: var(--font-code);\n+ font-size: 12px;\n+ padding: 1px 4px;\n+}\n+\n+@media (max-width: 520px) {\n+ .event { grid-template-columns: 72px 1fr; }\n+ .event-message { grid-column: 1 / -1; }\n+}\n+\"\"\"\n+\n+\n+def _watch_initial_state() -> dict:\n+ events = store.read()\n+ feed = []\n+ for event_ in events[-40:]:\n+ if isinstance(event_, GitDiscovery):\n+ feed.append({\n+ \"id\": f\"discovery-{event_.snapshot_id}\",\n+ \"timestamp_ms\": event_.timestamp_ms,\n+ \"kind\": \"discovery\",\n+ \"message\": (\n+ f\"Epoch {event_.epoch}: observed {len(event_.observations)} commits; \"\n+ f\"{len(event_.commits)} eligible\"\n+ ),\n+ })\n+ elif isinstance(event_, Emission):\n+ feed.append({\n+ \"id\": f\"emission-{event_.epoch}\",\n+ \"timestamp_ms\": event_.timestamp_ms,\n+ \"kind\": \"complete\",\n+ \"message\": (\n+ f\"Epoch {event_.epoch}: emitted {event_.total_emitted} SLG; \"\n+ f\"ranking {event_.ranking}\"\n+ ),\n+ })\n+ feed.extend(AUDIT_HISTORY)\n+ return {\n+ \"process\": dict(PROCESS_STATE),\n+ \"openrouter_configured\": bool((OPENROUTER_API_KEY or \"\").strip()),\n+ \"epoch\": current_epoch()[0],\n+ \"feed\": feed[-200:],\n+ }\n+\n+\n+_WATCH_JS = \"\"\"\n+const initial = __INITIAL__;\n+const feed = document.querySelector('#audit-feed');\n+const processStatus = document.querySelector('#process-status');\n+const connection = document.querySelector('#connection-status');\n+const fill = document.querySelector('#progress-fill');\n+const progressLabel = document.querySelector('#progress-label');\n+const play = document.querySelector('#play');\n+const pause = document.querySelector('#pause');\n+const seen = new Set();\n+let source = null;\n+\n+function setProgress(value) {\n+ const n = Math.max(0, Math.min(100, Number(value ?? 0)));\n+ fill.style.width = `${n}%`;\n+ progressLabel.textContent = `${Math.round(n)}%`;\n+ document.querySelector('.progress-shell').setAttribute('aria-valuenow', String(n));\n+}\n+\n+function addEvent(event) {\n+ const id = String(event.id);\n+ if (seen.has(id)) return;\n+ seen.add(id);\n+ const row = document.createElement('div');\n+ row.className = 'event';\n+ row.dataset.kind = event.kind || 'event';\n+ const when = document.createElement('time');\n+ when.dateTime = new Date(event.timestamp_ms).toISOString();\n+ when.textContent = new Date(event.timestamp_ms).toLocaleTimeString();\n+ const kind = document.createElement('span');\n+ kind.className = 'event-kind';\n+ kind.textContent = event.kind || 'event';\n+ const message = document.createElement('span');\n+ message.className = 'event-message';\n+ message.textContent = event.message;\n+ row.append(when, kind, message);\n+ feed.prepend(row);\n+ while (feed.children.length > 200) feed.lastElementChild.remove();\n+}\n+\n+function applyState(event) {\n+ processStatus.textContent = event.message || 'Waiting for the next epoch';\n+ setProgress(event.progress);\n+ if (event.kind !== 'connection') addEvent(event);\n+}\n+\n+function connect() {\n+ if (source) return;\n+ source = new EventSource('/sse');\n+ connection.classList.remove('warn');\n+ connection.classList.add('live');\n+ connection.querySelector('span:last-child').textContent = 'connecting';\n+ play.disabled = true;\n+ pause.disabled = false;\n+ source.onopen = () => {\n+ connection.querySelector('span:last-child').textContent = 'live';\n+ };\n+ source.addEventListener('audit', event => applyState(JSON.parse(event.data)));\n+ source.onerror = () => {\n+ connection.classList.remove('live');\n+ connection.classList.add('warn');\n+ connection.querySelector('span:last-child').textContent = 'reconnecting';\n+ };\n+}\n+\n+function disconnect() {\n+ if (source) source.close();\n+ source = null;\n+ connection.classList.remove('live');\n+ connection.classList.add('warn');\n+ connection.querySelector('span:last-child').textContent = 'paused locally';\n+ play.disabled = false;\n+ pause.disabled = true;\n+}\n+\n+play.addEventListener('click', connect);\n+pause.addEventListener('click', disconnect);\n+initial.feed.forEach(addEvent);\n+processStatus.textContent = initial.process.message;\n+setProgress(initial.process.progress);\n+connect();\n+\"\"\"\n+\n+\n+@app.get(\"/watch\")\n+async def watch():\n+ initial = json.dumps(\n+ _watch_initial_state(), separators=(\",\", \":\")\n+ ).replace(\" 0\")\n \n- ;; 9. SSE connects and sends initial event\n+ ;; 9. watch UI exposes progress, controls, readiness, and live SSE\n+ (println \"\\nchecking /watch UI…\")\n+ (bind watch-html (slurp (str base-url \"/watch\")))\n+ (assert! (str/includes? watch-html \"role=\\\"progressbar\\\"\")\n+ \"watch page has progress bar\")\n+ (assert! (str/includes? watch-html \"id=\\\"play\\\"\")\n+ \"watch page has play control\")\n+ (assert! (str/includes? watch-html \"id=\\\"pause\\\"\")\n+ \"watch page has pause control\")\n+ (assert! (str/includes? watch-html \"OpenRouter configured\")\n+ \"watch page reports council readiness\")\n+ (bind status-resp (get-json base-url \"/api/status\"))\n+ (assert! (true? (:openrouter_configured status-resp))\n+ \"status API reports OpenRouter configuration\")\n+\n+ ;; 10. SSE connects and sends initial event\n (println \"\\nchecking /sse initial event…\")\n (bind sse-events (read-sse-events (str base-url \"/sse\") 1 5000))\n (assert! (= 1 (count sse-events)) \"received 1 SSE event\")\n (assert! (not (str/blank? (first sse-events)))\n \"initial SSE event contains executable audit data\")\n \n- ;; 10. POST /test/emit — full ranking pipeline hits mocks\n+ ;; 11. POST /test/emit — full ranking pipeline hits mocks\n (println \"\\ntriggering /test/emit (epoch 1)…\")\n (bind emit-resp (post-json! base-url \"/test/emit\"))\n (assert! (= \"emission\" (:type emit-resp)) \"emit response type is emission\")\n@@ -503,7 +518,7 @@\n (bind rank-after (get-json base-url \"/api/ranking\"))\n (assert! (= 1 (:epoch rank-after)) \"latest ranking is epoch 1\")\n \n- ;; 11. kill and restart — prove replay determinism\n+ ;; 12. kill and restart — prove replay determinism\n (println \"\\nkilling server for replay test…\")\n (.destroyForcibly (:proc server))\n (deref server)\ndiff --git a/tests/test_git_discovery.py b/tests/test_git_discovery.py\nindex 0dd31bc42a19bc8c59842dc61f193c595c474659..5a9e167e16ad2ffb25988af85820f6f19e8910cd 100644\n--- a/tests/test_git_discovery.py\n+++ b/tests/test_git_discovery.py\n@@ -393,7 +393,9 @@ def test_empty_epoch_records_zero_emission_without_burning_pool(\n monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n \n async def discover(_epoch, _boundary):\n- return SimpleNamespace(commits=[], snapshot_id=\"empty-snapshot\")\n+ return SimpleNamespace(\n+ observations=[], commits=[], snapshot_id=\"empty-snapshot\"\n+ )\n \n async def rank(_commits):\n return {}, []\n@@ -412,7 +414,11 @@ def test_emission_distribution_sums_exactly_to_total(\n monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n \n async def discover(_epoch, _boundary):\n- return SimpleNamespace(commits=[{\"x\": 1}], snapshot_id=\"ranked-snapshot\")\n+ return SimpleNamespace(\n+ observations=[{\"x\": 1}],\n+ commits=[{\"x\": 1}],\n+ snapshot_id=\"ranked-snapshot\",\n+ )\n \n async def rank(_commits):\n return {\n@@ -454,6 +460,7 @@ def test_any_council_failure_aborts_ranking(monkeypatch):\n \n monkeypatch.setattr(c, \"fetch_top_models\", models)\n monkeypatch.setattr(c, \"llm_pairwise_compare\", compare)\n+ monkeypatch.setattr(c, \"OPENROUTER_API_KEY\", \"test-key\")\n commits = [\n {\n \"contributor\": contributor,\n@@ -465,3 +472,54 @@ def test_any_council_failure_aborts_ranking(monkeypatch):\n ]\n with pytest.raises(RuntimeError, match=\"council model failed\"):\n asyncio.run(c.rank_commits(commits))\n+\n+\n+def test_contested_ranking_requires_openrouter_key(monkeypatch):\n+ monkeypatch.setattr(c, \"OPENROUTER_API_KEY\", \"\")\n+ commits = [\n+ {\n+ \"contributor\": contributor,\n+ \"oid\": \"sha1:\" + char * 40,\n+ \"message\": contributor,\n+ \"patch\": \"patch\",\n+ }\n+ for contributor, char in [(\"alice\", \"a\"), (\"bob\", \"b\")]\n+ ]\n+ with pytest.raises(RuntimeError, match=\"OPENROUTER_API_KEY\"):\n+ asyncio.run(c.rank_commits(commits))\n+\n+\n+def test_watch_page_has_live_controls_progress_and_key_warning(\n+ discovery_config, monkeypatch\n+):\n+ monkeypatch.setattr(c, \"store\", c.JsonlStore(discovery_config / \"ledger.jsonl\"))\n+ monkeypatch.setattr(c, \"OPENROUTER_API_KEY\", \"\")\n+ monkeypatch.setattr(c, \"current_epoch\", lambda: (3, 0, 1))\n+ response = asyncio.run(c.watch())\n+ html = response.body.decode()\n+ assert 'role=\"progressbar\"' in html\n+ assert 'id=\"play\"' in html\n+ assert 'id=\"pause\"' in html\n+ assert \"new EventSource('/sse')\" in html\n+ assert \"OpenRouter key missing\" in html\n+\n+\n+def test_audit_events_are_json_sse_and_update_process_state(monkeypatch):\n+ clients = []\n+ history = []\n+ monkeypatch.setattr(c, \"SSE_CLIENTS\", clients)\n+ monkeypatch.setattr(c, \"AUDIT_HISTORY\", history)\n+ queue = asyncio.Queue()\n+ clients.append(queue)\n+\n+ async def emit():\n+ event = await c.broadcast_audit(\n+ \"progress\", \"halfway\", progress=50, phase=\"ranking\"\n+ )\n+ return event, await queue.get()\n+\n+ event, wire = asyncio.run(emit())\n+ assert event[\"progress\"] == 50\n+ assert event[\"phase\"] == \"ranking\"\n+ assert wire.startswith(\"event: audit\\ndata: {\")\n+ assert '\"message\":\"halfway\"' in wire\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}