You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [c59951f5] fixed canonical item paths business Side A — unified diff (full patch): diff --git a/server/src/html/breadcrumb_path.rs b/server/src/html/breadcrumb_path.rs index 12ad2c84faf2fbb693015d4552e45b5c54d587b9..c8a3937923161a6ff248bd77e87eff0dc6fe9ab0 100644 --- a/server/src/html/breadcrumb_path.rs +++ b/server/src/html/breadcrumb_path.rs @@ -1,4 +1,4 @@ -use crate::path_types::CanonicalItemUrl; +use crate::path_types::{tilde_http_path_to_canonical, CanonicalItemUrl}; /// Semantic view of an ontology path for rendering and routing decisions. pub(super) struct OntologyPath { @@ -11,16 +11,7 @@ impl OntologyPath { /// Path is the `*path` segment from `/~/*path` (e.g. `topic/a`). Always treat it as under `~/` /// so it canonicalizes to `https://slug.social/~/…`, not the non-tilde site path. pub(super) fn from_input(path: &str) -> Self { - let p = path.trim_start_matches('/'); - let raw = if p.starts_with("http://") || p.starts_with("https://") { - p.to_string() - } else if p.is_empty() { - "~/".to_string() - } else { - format!("~/{}", p) - }; - let canonical = CanonicalItemUrl::parse(&raw) - .unwrap_or_else(|| CanonicalItemUrl::parse("~/").unwrap()); + let canonical = tilde_http_path_to_canonical(path); Self::from_canonical(canonical) } @@ -37,7 +28,7 @@ impl OntologyPath { } pub(super) fn root() -> Self { - Self::from_canonical(CanonicalItemUrl::parse("~/").unwrap()) + Self::from_canonical(CanonicalItemUrl::ontology_root()) } pub(super) fn is_root(&self) -> bool { diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index d58d9b46f575eb6b7e4971086b07dda75ca2f645..319feb15a6b68d2b5df98b4289fedbc9bdd048d3 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -459,6 +459,8 @@ struct ItemPageViewModel { item: String, body: Option, sibling_rank: Option, + /// False at the tilde ontology root (`~/`): sibling-rank footnote does not apply. + item_has_parent: bool, child_rankings: ChildrenRankings, rank_history: Vec, /// Forum threads that mention or vote on this item. @@ -470,11 +472,12 @@ fn build_sibling_rank( scope: &ScopeId, item: &CanonicalItemUrl, ) -> Option { + let item = item.clone().normalized_storage(); let content = reduced .content_for_scope(scope) .unwrap_or_else(|| reduced.public()); let group = &content.ranking_group; - let parent = item.parent()?; + let parent = item.parent()?.normalized_storage(); let siblings: Vec = content .item_children .get(&parent) @@ -492,7 +495,7 @@ fn build_sibling_rank( if scoped_idxs.is_empty() { return None; } - let current_idx = *group.item_to_idx.get(item)?; + let current_idx = *group.item_to_idx.get(&item)?; if !scoped_idxs.contains(¤t_idx) { return None; } @@ -520,7 +523,7 @@ fn build_sibling_rank( .filter_map(|li| local_to_global.get(*li).copied()) .collect(); let ranked = ranked_items_subset(group, &comp_global, 10000, 1e-8); - let position = ranked.iter().position(|r| &r.item == item)? + 1; + let position = ranked.iter().position(|r| r.item == item)? + 1; Some(SiblingRank { position, component_size: ranked.len(), @@ -597,7 +600,9 @@ fn build_item_page_view_model( .content_for_scope(scope) .unwrap_or_else(|| reduced.public()); let item_key = CanonicalItemUrl::parse(item) - .unwrap_or_else(|| CanonicalItemUrl::parse("~/").unwrap()); + .unwrap_or_else(|| CanonicalItemUrl::parse("~/").unwrap()) + .normalized_storage(); + let item_has_parent = item_key.parent().is_some(); let child_rankings = build_children_rankings(content, &item_key); let rank_history = build_rank_history(reduced, scope, item_key.as_str()); @@ -617,6 +622,7 @@ fn build_item_page_view_model( .cloned() .or_else(|| reduced.public().item_bodies.get(&item_key).cloned()), sibling_rank: build_sibling_rank(reduced, scope, &item_key), + item_has_parent, child_rankings, rank_history, threads, @@ -652,7 +658,7 @@ async fn render_scope_view( (format!("#{} of {}", rank.position, rank.component_size)) } span class="muted" { (format!("({} siblings)", rank.sibling_total)) } - } @else { + } @else if model.item_has_parent { span class="muted" { "unranked among siblings" } } } @@ -815,6 +821,18 @@ mod tests { })); } + fn apply_ingest_room(state: &mut ReducerState, ts: i64, room_id: &str, raw: &str) { + state.apply_event(Event::Ingest(Ingest { + ts, + id: format!("ing-{ts}"), + raw: raw.to_string(), + principal: "testuser".to_string(), + delegate: Some("00000000-0000-0000-0000-000000000000:test:local/test".to_string()), + room_id: room_id.to_string(), + thread_tag: String::new(), + })); + } + #[test] fn item_page_model_includes_body_and_unranked_without_votes() { let mut reduced = ReducerState::default(); @@ -885,4 +903,85 @@ mod tests { || model.child_rankings.unranked_items.contains(&CanonicalItemUrl("https://slug.social/~/topic/kid2".to_string())) ); } + + #[test] + fn item_page_room_scope_root_lists_top_level_children() { + let mut reduced = ReducerState::default(); + apply_ingest_room( + &mut reduced, + 1, + "9ab12cd/my-room", + "@00000000-0000-0000-0000-000000000000:test:local/test\n~/t1 {a}\n~/t2 {b}\n", + ); + use crate::path_types::CanonicalItemUrl; + let root = CanonicalItemUrl::ontology_root(); + let model = build_item_page_view_model( + &reduced, + &ScopeId::Room("9ab12cd/my-room".to_string()), + root.as_str(), + ); + assert!(!model.item_has_parent); + assert_eq!(model.child_rankings.unranked_items.len(), 2); + let set: std::collections::HashSet<&str> = model + .child_rankings + .unranked_items + .iter() + .map(|u| u.as_str()) + .collect(); + assert!(set.contains("https://slug.social/~/t1")); + assert!(set.contains("https://slug.social/~/t2")); + } + + /// Top-level `~/a` vs `~/b` votes form one ranked component under the ontology root. + #[test] + fn item_page_room_scope_root_shows_ranked_child_group() { + let mut reduced = ReducerState::default(); + apply_ingest_room( + &mut reduced, + 1, + "9ab12cd/my-room", + "@00000000-0000-0000-0000-000000000000:test:local/test\n\ + ~/a {a}\n~/b {b}\n~/a 2:1 ~/b {because}\n", + ); + use crate::path_types::CanonicalItemUrl; + let root = CanonicalItemUrl::ontology_root(); + let model = build_item_page_view_model( + &reduced, + &ScopeId::Room("9ab12cd/my-room".to_string()), + root.as_str(), + ); + assert_eq!(model.child_rankings.component_rankings.len(), 1); + assert_eq!(model.child_rankings.component_rankings[0].pairs, 1); + let names: Vec<&str> = model.child_rankings.component_rankings[0] + .ranked + .iter() + .map(|r| r.item.as_str()) + .collect(); + assert_eq!( + names, + vec!["https://slug.social/~/a", "https://slug.social/~/b"] + ); + assert!(model.child_rankings.unranked_items.is_empty()); + } + + /// Legacy `https://slug.social/~/` spelling still resolves children under the real root key. + #[test] + fn item_page_model_normalizes_legacy_tilde_root_storage_url() { + let mut reduced = ReducerState::default(); + apply_ingest( + &mut reduced, + 1, + "@00000000-0000-0000-0000-000000000000:test:local/test\n~/x {x}\n", + ); + let model = build_item_page_view_model( + &reduced, + &ScopeId::Public, + "https://slug.social/~/", + ); + assert_eq!(model.child_rankings.unranked_items.len(), 1); + assert_eq!( + model.child_rankings.unranked_items[0].as_str(), + "https://slug.social/~/x" + ); + } } diff --git a/server/src/path_types.rs b/server/src/path_types.rs index 4c8075bbd488f1b9a5eda9e03ced83f6238c6d5e..361a9d446c9043cbdea5f060db2e8633c2fd9bf9 100644 --- a/server/src/path_types.rs +++ b/server/src/path_types.rs @@ -1,3 +1,5 @@ //! Re-exports — implementations live in `slug-types` (`paths` module). -pub use slug_types::paths::{CanonicalItemUrl, RelativePath, TildePath}; +pub use slug_types::paths::{ + tilde_http_path_to_canonical, CanonicalItemUrl, RelativePath, TildeHttpPathTail, TildePath, +}; diff --git a/server/src/scope_rank.rs b/server/src/scope_rank.rs index dc640848232b7e79142bfeeea3003c9023f84854..d656b2f0a0a3623ca6b234b746beaaca8ae6017d 100644 --- a/server/src/scope_rank.rs +++ b/server/src/scope_rank.rs @@ -149,9 +149,10 @@ pub fn build_rankings_for_item_set(content: &ContentState, items_in_scope: &[Can /// Build connected-component rankings for direct children of parent_scope. /// Matches the HTML garden view: multiple components, isolates, no-vote items. pub fn build_children_rankings(content: &ContentState, parent: &CanonicalItemUrl) -> ChildrenRankings { + let parent = parent.clone().normalized_storage(); let items: Vec = content .item_children - .get(parent) + .get(&parent) .map(|s| s.iter().cloned().collect()) .unwrap_or_default(); build_rankings_for_item_set(content, &items) diff --git a/server/tests/integration.rs b/server/tests/integration.rs index f9c218378f6a173e56ae1cec797b3c492986eac0..d4c5bfe9c6f1c71dc61878bd8c5e729b1b7c69ef 100644 --- a/server/tests/integration.rs +++ b/server/tests/integration.rs @@ -704,6 +704,62 @@ async fn test_private_room_post_links_use_private_garden_routes() { assert!(garden_body.contains(&format!("/r/{room_short}/{room_slug}/t/garden-thread"))); } +#[tokio::test] +async fn test_private_room_garden_root_lists_top_level_tilde_children() { + let (addr, _tmp, _log, _handle) = create_test_server().await; + let client = reqwest::Client::builder() + .redirect(reqwest::redirect::Policy::none()) + .build() + .unwrap(); + let bearer = test_bearer(); + + let create = rpc_batch( + &client, + addr, + Some(&bearer), + serde_json::json!([{ + "RoomCreate": { "slug": "garden-root-list" } + }]), + ) + .await; + let room_id = create["results"][0]["result"]["RoomCreated"]["room_id"] + .as_str() + .unwrap() + .to_string(); + let (room_short, room_slug) = room_id.split_once('/').unwrap(); + + let rpc = ui_post_ingest_rpc( + &room_id, + "ing", + "~/test1 {wow}\n~/test2 {wow2}\n~/test1 2:1 ~/test2 {because}\n", + ); + let post = client + .post(format!("http://{addr}/ui")) + .header("Authorization", format!("Bearer {bearer}")) + .form(&[("__rpc__", rpc.as_str())]) + .send() + .await + .unwrap(); + assert_eq!(post.status(), reqwest::StatusCode::OK); + + let root_page = client + .get(format!("http://{addr}/r/{room_short}/{room_slug}/~")) + .header("Authorization", format!("Bearer {bearer}")) + .send() + .await + .unwrap(); + assert!(root_page.status().is_success()); + let body = root_page.text().await.unwrap(); + assert!( + body.contains("ranked child groups"), + "expected garden child panel: {}", + body.len() + ); + assert!(body.contains("~/test1")); + assert!(body.contains("~/test2")); + assert!(body.contains("ordering 1")); +} + #[tokio::test] async fn test_post_check_returns_targeted_js_error_for_missing_thread_tag() { let (addr, _tmp, _log, _handle) = create_test_server().await; diff --git a/test/browser_public_garden.clj b/test/browser_public_garden.clj new file mode 100644 index 0000000000000000000000000000000000000000..7bea08e1cf2c8f5b1a94b0640a46e9ba5607b19b --- /dev/null +++ b/test/browser_public_garden.clj @@ -0,0 +1,100 @@ +(ns test.browser-public-garden + "Regression: ingest ontology items in the public room via RPC, then open /~ in the browser + and assert ranked + unranked paths appear (HTML garden index — not JSON API)." + (:require [babashka.fs :as fs] + [cheshire.core :as json] + [clojure.string :as str] + [clojure.test :refer [deftest is]] + [com.blockether.spel.core :as core] + [com.blockether.spel.locator :as locator] + [com.blockether.spel.page :as page] + [test.common :as common] + [test.oauth :as oauth])) + +(defn- wait-for-text [pg selector expected timeout-ms] + (let [deadline (+ (System/currentTimeMillis) timeout-ms)] + (loop [] + (let [text (locator/text-content (page/locator pg selector))] + (if (and (string? text) (str/includes? text expected)) + true + (if (< (System/currentTimeMillis) deadline) + (do (Thread/sleep 200) (recur)) + false)))))) + +(defn public-garden-flow! [] + (println "\n━━━ browser public room garden index (RPC seed + GET /~) ━━━\n") + + (common/letlocals + (bind build (common/run-cargo-build-release! ["slugsocial-server"])) + (is (zero? (:exit build)) "cargo build succeeds") + (bind server-bin "target/release/slugsocial-server") + + (bind tmp-dir (str (fs/create-temp-dir {:prefix "slug-browser-pub-garden-"}))) + (bind slug-port (common/pick-port)) + (bind google-port (common/pick-port)) + (bind base-url (str "http://127.0.0.1:" slug-port)) + (bind google-url (str "http://127.0.0.1:" google-port)) + + (bind !server (atom nil)) + (bind !google (atom nil)) + (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port)) + (try + (reset! !google (oauth/start-mock-google google-port + :google-users ["google-user-alice"])) + (reset! !server (common/start-server server-bin server-env)) + (is (common/wait-for-server base-url 10000) "server responds to /healthz") + + (let [alice-token (oauth/fetch-bearer-token! base-url :username "alice") + thread-tag "browser-pub-garden" + ;; Ranked pair at root + one isolate so both panels are exercised. + raw (str "# " thread-tag "\n\n" + "~/br-pub-a {alpha}\n" + "~/br-pub-b {beta}\n" + "~/br-pub-c {gamma}\n" + "~/br-pub-a 2:1 ~/br-pub-b {browser regression vote}\n") + post-resp (oauth/http-post-json + (str base-url "/api/v0/rpc") + [{"Post" {"room" "public" + "thread_tag" thread-tag + "text" raw + "return_rank_diff" false}}] + :headers {"Authorization" (str "Bearer " alice-token)}) + post-json (json/parse-string (:body post-resp) false) + _ (is (true? (get-in post-json ["results" 0 "ok"])) "seed public post via rpc") + rank-resp (oauth/http-post-json + (str base-url "/api/v0/rpc") + [{"GetGardenRank" {"room" "public" + "parent_path" "~" + "depth" 1}}]) + rank-json (json/parse-string (:body rank-resp) false) + _ (is (true? (get-in rank-json ["results" 0 "ok"])) "GetGardenRank ok") + comps (get-in rank-json ["results" 0 "result" "GardenRank" "components"]) + _ (is (pos? (count comps)) "rank API reports at least one component")] + (core/with-playwright [pw] + (core/with-browser [browser (core/launch-chromium pw {:headless true :channel "chrome"})] + (core/with-context [ctx (core/new-context browser)] + (core/with-page [pg (core/new-page-from-context ctx)] + (page/navigate pg (str base-url "/login")) + (is (wait-for-text pg "body" "@alice" 15000) "alice session after login") + (page/navigate pg (str base-url "/~")) + (is (wait-for-text pg "body" "paths" 15000) "public garden index shows paths heading") + (is (wait-for-text pg "body" "ordering" 10000) + "ranked child group meta visible") + (is (wait-for-text pg "body" "~/br-pub-a" 10000) "ranked list shows ~/br-pub-a") + (is (wait-for-text pg "body" "~/br-pub-b" 10000) "ranked list shows ~/br-pub-b") + (is (wait-for-text pg "body" "unranked" 10000) "unranked section present") + (is (wait-for-text pg "body" "~/br-pub-c" 10000) + "unranked list shows ~/br-pub-c")))))) + + (finally + (when-some [s @!server] (common/kill-server s)) + (when-some [g @!google] ((:stop-fn g))) + (fs/delete-tree tmp-dir))) + + nil)) + +(defn public-garden-browser-test [& _args] + (public-garden-flow!)) + +(deftest browser-public-garden-index-check + (public-garden-flow!)) diff --git a/tests.edn b/tests.edn index 56fdfa4f29383ad305fd8068783e4efe2ed334a0..6e96432ba766461b4233c75dc48db2633483e5e0 100644 --- a/tests.edn +++ b/tests.edn @@ -16,7 +16,8 @@ :ns-patterns ["^test\\.browser-sse$" "^test\\.browser-ui-morph$" "^test\\.browser-post-redact$" - "^test\\.browser-room-delete$"] + "^test\\.browser-room-delete$" + "^test\\.browser-public-garden$"] :kaocha.filter/skip-meta [:skip] :parallel? false}] :plugins [:kaocha.plugin/junit-xml] diff --git a/types/src/lib.rs b/types/src/lib.rs index 8cea90238ef6207d65ecdb2903b8958fafb213d2..edbb923e4d7d41ad82dfc254c3bd697562383527 100644 --- a/types/src/lib.rs +++ b/types/src/lib.rs @@ -4,8 +4,9 @@ pub mod paths; pub mod timeago; pub use paths::{ - canonicalize_item, canonicalize_tag, item_parent_path, item_path_segments, CanonicalItemUrl, - ForumThreadUrl, GardenItemUrl, RelativePath, TildeOntologyPath, TildePath, + canonicalize_item, canonicalize_tag, item_parent_path, item_path_segments, normalize_slug_ontology_storage_url, + CanonicalItemUrl, ForumThreadUrl, GardenItemUrl, RelativePath, SLUG_TILDE_ONTOLOGY_ROOT, + TildeHttpPathTail, TildeOntologyPath, TildePath, tilde_http_path_to_canonical, }; /// Max characters returned for a garden item body unless `full=true` / `--full` (API + CLI). diff --git a/types/src/paths.rs b/types/src/paths.rs index 668323ed777f360f2838a0dfe6eae68905d1183b..8971f599a7ebcf399f60c306d35ee28d0f581194 100644 --- a/types/src/paths.rs +++ b/types/src/paths.rs @@ -1,5 +1,13 @@ //! Canonical paths, storage ids, and JSON href newtypes. All normalization and //! room-aware URL rules for items live here. +//! +//! ## String kinds (parse in this module only) +//! +//! - **[`canonicalize_item`] / [`CanonicalItemUrl`]** — graph storage key and DSL form; tilde +//! ontology root is always [`SLUG_TILDE_ONTOLOGY_ROOT`] (no `…/~/` trailing slash only). +//! - **[`TildeHttpPathTail`]** — capture from `GET /~/*path` or `…/r/…/~/…` (the `*path` segment). +//! - **`-/…` wire form** — external items; see [`canonicalize_item`] dash branch. +//! - **[`GardenItemUrl`], [`ForumThreadUrl`]** — JSON / browser href surfaces. use std::borrow::Borrow; use std::fmt; @@ -7,6 +15,23 @@ use std::ops::Deref; use serde::{Deserialize, Serialize}; +// --------------------------------------------------------------------------- +// Slug tilde ontology (single storage form for `~/`) +// --------------------------------------------------------------------------- + +/// Canonical absolute URL for the tilde ontology **root** (`~/` in UI). Used as the +/// `item_children` parent key for top-level items and must match [`CanonicalItemUrl::ontology_root`]. +pub const SLUG_TILDE_ONTOLOGY_ROOT: &str = "https://slug.social/~"; + +/// Collapse legacy or parser variants of the ontology root to [`SLUG_TILDE_ONTOLOGY_ROOT`]. +pub fn normalize_slug_ontology_storage_url(s: &str) -> String { + if s == "https://slug.social/~/" { + SLUG_TILDE_ONTOLOGY_ROOT.to_string() + } else { + s.to_string() + } +} + // --------------------------------------------------------------------------- // Normalization (moved from server `canonical_path`) // --------------------------------------------------------------------------- @@ -89,6 +114,9 @@ pub fn canonicalize_item(input: &str) -> String { .join("/"); if is_tilde { + if tail.is_empty() { + return SLUG_TILDE_ONTOLOGY_ROOT.to_string(); + } format!("https://slug.social/~/{}", tail) } else if tail.is_empty() { "https://slug.social".to_string() @@ -173,7 +201,7 @@ impl CanonicalItemUrl { if c.is_empty() { None } else { - Some(Self(c)) + Some(Self(normalize_slug_ontology_storage_url(&c))) } } @@ -181,8 +209,19 @@ impl CanonicalItemUrl { &self.0 } + /// Collapses legacy slug ontology root spellings so [`HashMap`] keys match the reducer graph. + pub fn normalized_storage(self) -> Self { + Self(normalize_slug_ontology_storage_url(self.as_str())) + } + pub fn tilde_tail(&self) -> Option<&str> { - self.0.strip_prefix("https://slug.social/~/") + if let Some(tail) = self.0.strip_prefix("https://slug.social/~/") { + return Some(tail); + } + if self.0 == SLUG_TILDE_ONTOLOGY_ROOT || self.0 == "https://slug.social/~/" { + return Some(""); + } + None } pub fn last_segment(&self) -> &str { @@ -193,7 +232,7 @@ impl CanonicalItemUrl { } pub fn ontology_root() -> Self { - Self("https://slug.social/~".to_string()) + Self(SLUG_TILDE_ONTOLOGY_ROOT.to_string()) } pub fn parent(&self) -> Option { @@ -234,9 +273,13 @@ impl CanonicalItemUrl { /// `-/` representation for external `https://…` items, `~/…` for slug ontology, else unchanged. pub fn display_path(&self) -> String { - if let Some(tail) = self.0.strip_prefix("https://slug.social/~/") { - format!("~/{}", tail) - } else if let Some(tail) = self.0.strip_prefix("https://") { + if let Some(tail) = self.tilde_tail() { + if tail.is_empty() { + return "~/".to_string(); + } + return format!("~/{}", tail); + } + if let Some(tail) = self.0.strip_prefix("https://") { if tail.starts_with("slug.social") { self.0.clone() } else { @@ -276,6 +319,37 @@ impl CanonicalItemUrl { } } +/// HTTP route capture: path segment after `~/` in `GET /~/*path` or `…/r/…/~/…` (empty = ontology root). +#[derive(Debug, Clone, PartialEq, Eq, Hash)] +pub struct TildeHttpPathTail(pub String); + +impl TildeHttpPathTail { + pub fn new(path_segment: &str) -> Self { + Self(path_segment.trim_start_matches('/').to_string()) + } + + pub fn as_str(&self) -> &str { + &self.0 + } + + pub fn to_canonical(&self) -> CanonicalItemUrl { + tilde_http_path_to_canonical(self.as_str()) + } +} + +/// Map the router's tilde tail (e.g. `topic/a`, or empty for root) to a [`CanonicalItemUrl`]. +pub fn tilde_http_path_to_canonical(path_segment: &str) -> CanonicalItemUrl { + let p = path_segment.trim_start_matches('/'); + let raw = if p.starts_with("http://") || p.starts_with("https://") { + p.to_string() + } else if p.is_empty() { + "~/".to_string() + } else { + format!("~/{}", p) + }; + CanonicalItemUrl::parse(&raw).unwrap_or_else(|| CanonicalItemUrl::ontology_root()) +} + impl fmt::Display for CanonicalItemUrl { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { self.0.fmt(f) @@ -557,6 +631,44 @@ mod tests { fn canonical_parent_root_is_none() { let root = CanonicalItemUrl::parse("~/").unwrap(); assert!(root.parent().is_none()); + assert_eq!(root.as_str(), SLUG_TILDE_ONTOLOGY_ROOT); + assert_eq!(root, CanonicalItemUrl::ontology_root()); + } + + #[test] + fn tilde_ontology_root_unifies_forms() { + assert_eq!(canonicalize_item("~/"), SLUG_TILDE_ONTOLOGY_ROOT); + assert_eq!( + normalize_slug_ontology_storage_url("https://slug.social/~/"), + SLUG_TILDE_ONTOLOGY_ROOT.to_string() + ); + assert_eq!( + CanonicalItemUrl::parse("https://slug.social/~/") + .unwrap() + .as_str(), + SLUG_TILDE_ONTOLOGY_ROOT + ); + let legacy = CanonicalItemUrl("https://slug.social/~/".to_string()); + assert_eq!(legacy.normalized_storage().as_str(), SLUG_TILDE_ONTOLOGY_ROOT); + } + + #[test] + fn tilde_http_path_tail_maps_router_segment() { + assert_eq!( + TildeHttpPathTail::new("").to_canonical(), + CanonicalItemUrl::ontology_root() + ); + assert_eq!( + tilde_http_path_to_canonical("topic/x").as_str(), + "https://slug.social/~/topic/x" + ); + } + + #[test] + fn display_path_slug_ontology_root() { + let r = CanonicalItemUrl::ontology_root(); + assert_eq!(r.display_path(), "~/"); + assert_eq!(r.tilde_tail(), Some("")); } #[test] Side B — contributor: tommy-mor Side B — commit message: [c7ef287e] Rank every eligible commit with the LLM council. Stop short-circuiting on a single contributor; pairwise-sort commits, roll scores up for emission payouts, and surface commit rankings on epoch pages. Co-authored-by: Cursor Side B — unified diff (full patch): diff --git a/constitution.py b/constitution.py index 26ba130e885e0e69fb7874ca5c3f07f42100a150..71fc46b4c9a4d7a9ea7bf319860b0db1acc4a673 100644 --- a/constitution.py +++ b/constitution.py @@ -503,20 +503,22 @@ def _epochs_in_ledger() -> list[int]: def build_pairwise_prompt(side_a: dict, side_b: dict) -> str: - return f"""You are ranking contributions to an open source project. -Compare these two sides (each may be one or more commits). Decide which side contributed more. + return f"""You are ranking individual git commits to an open source project. +Compare these two commits. Decide which commit contributed more. Return ONLY a JSON object: {{"winner": "A" or "B", "ratio": "N:M", "explanation": "..."}} -Side A — commit messages: +Side A — contributor: {side_a.get('contributor', '?')} +Side A — commit message: {side_a['message']} -Side A — unified diffs (full patches): +Side A — unified diff (full patch): {side_a['diff']} -Side B — commit messages: +Side B — contributor: {side_b.get('contributor', '?')} +Side B — commit message: {side_b['message']} -Side B — unified diffs (full patches): +Side B — unified diff (full patch): {side_b['diff']}""" @@ -1518,16 +1520,28 @@ async def broadcast_js(js: str): await queue.put(js) -def _author_side_for_llm(author: str, author_commits: dict) -> dict: - cs = author_commits[author] +def _commit_side_for_llm(row: dict) -> dict: + oid = row["oid"] + short = oid.split(":", 1)[1][:8] if ":" in oid else oid[:8] return { - "message": "\n".join(f"[{c['sha']}] {c['message']}" for c in cs), - "diff": "\n\n".join(f"=== {c['sha']} ===\n{c['diff']}" for c in cs), - "commit_ids": [c["commit_id"] for c in cs], - "contributor": author, + "message": f"[{short}] {row['message']}", + "diff": row["patch"] or "", + "commit_id": commit_id_for_oid(oid), + "contributor": row["contributor"], + "oid": oid, } +def _rollup_contributor_scores( + ordered: list[dict], commit_scores: list[Decimal] +) -> dict[str, Decimal]: + totals: dict[str, Decimal] = {} + for row, score in zip(ordered, commit_scores): + contributor = row["contributor"] + totals[contributor] = totals.get(contributor, Decimal("0")) + score + return totals + + def _find_judgment(comparison_id: str, model_id: str) -> dict | None: for e in evidence_by_kind("llm.judgment"): p = e.payload @@ -1546,101 +1560,106 @@ def _find_ranking_models(ranking_run_id: str) -> list[str] | None: async def rank_commits(commits: list[dict], *, epoch: int = -1): + """Pairwise-rank every eligible commit; roll scores up to contributors.""" if not commits: return {}, [], {"ranking_run_id": "", "ranking_event_id": ""} - commit_ids = sorted(commit_id_for_oid(row["oid"]) for row in commits) + ordered = sorted(commits, key=lambda r: r["oid"]) + commit_ids = [commit_id_for_oid(row["oid"]) for row in ordered] ranking_run_id = _content_id("rank", { "epoch": epoch, - "commit_ids": commit_ids, + "commit_ids": sorted(commit_ids), }) - contributors = sorted(set(c["contributor"] for c in commits)) + contributors = sorted({c["contributor"] for c in ordered}) - if len(contributors) == 1: + # Nothing to compare: a single commit (not a single contributor). + if len(ordered) == 1: await append_evidence(epoch, "ranking.started", { "ranking_run_id": ranking_run_id, "commit_ids": commit_ids, "contributors": contributors, "models": [], - "summary": f"ranking epoch {epoch}: single contributor", + "summary": f"ranking epoch {epoch}: single commit", }) - ranking = {contributors[0]: Decimal("1")} + commit_ranking = {commit_ids[0]: "1"} + contributor_ranking = {ordered[0]["contributor"]: Decimal("1")} completed = await append_evidence(epoch, "ranking.completed", { "ranking_run_id": ranking_run_id, "models": [], - "ranking": {contributors[0]: "1"}, + "commit_ranking": commit_ranking, + "contributor_ranking": {ordered[0]["contributor"]: "1"}, + "ranking": {ordered[0]["contributor"]: "1"}, "judgment_ids": [], - "summary": f"Only {contributors[0]} is eligible; rank is 1.0", + "summary": f"Only one eligible commit; {ordered[0]['contributor']} rank 1.0", }) await broadcast_audit( "ranking", - f"Only {contributors[0]} is eligible; rank is 1.0", + f"Only one eligible commit; {ordered[0]['contributor']} rank 1.0", progress=90, phase="finalizing", evidence_event_id=completed.event_id, evidence_url=_evidence_url("event", completed.event_id), links={"epoch": _evidence_url("epoch", str(epoch))}, ) - return ranking, [], { + return contributor_ranking, [], { "ranking_run_id": ranking_run_id, "ranking_event_id": completed.event_id, } if not (OPENROUTER_API_KEY or "").strip(): raise RuntimeError( - "OPENROUTER_API_KEY is required when multiple contributors need ranking" + "OPENROUTER_API_KEY is required when multiple commits need ranking" ) models = _find_ranking_models(ranking_run_id) if models is None: models = await fetch_top_models(n=3) if not models: - raise RuntimeError("no council models available for contributor ranking") + raise RuntimeError("no council models available for commit ranking") await append_evidence(epoch, "ranking.started", { "ranking_run_id": ranking_run_id, "commit_ids": commit_ids, "contributors": contributors, "models": models, - "summary": f"Council selected: {', '.join(models)}", + "summary": ( + f"Council selected: {', '.join(models)} — " + f"{len(ordered)} commits" + ), }) await broadcast_audit( "council", - f"Council selected: {', '.join(models)}", + f"Council selected: {', '.join(models)} — ranking {len(ordered)} commits", progress=35, phase="ranking", ) await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][ - ["div.log-council", f"Council: {', '.join(models)} — {len(commits)} commits"] + ["div.log-council", + f"Council: {', '.join(models)} — {len(ordered)} commits"] ])) - authors = contributors - author_commits = {a: [] for a in authors} - for row in sorted(commits, key=lambda r: r["oid"]): - author_commits[row["contributor"]].append({ - "message": row["message"], - "sha": row["oid"].split(":", 1)[1][:8], - "diff": row["patch"], - "commit_id": commit_id_for_oid(row["oid"]), - }) - + sides = [_commit_side_for_llm(row) for row in ordered] judgment_ids: list[str] = [] async def compare_fn(i, j): - a1, a2 = authors[i], authors[j] - side_a = _author_side_for_llm(a1, author_commits) - side_b = _author_side_for_llm(a2, author_commits) + side_a, side_b = sides[i], sides[j] + label_a = f"{side_a['commit_id'][:16]} ({side_a['contributor']})" + label_b = f"{side_b['commit_id'][:16]} ({side_b['contributor']})" prompt = build_pairwise_prompt(side_a, side_b) comparison_material = { "ranking_run_id": ranking_run_id, "side_a": { - "contributor": a1, - "commit_ids": side_a["commit_ids"], + "contributor": side_a["contributor"], + "commit_id": side_a["commit_id"], + "commit_ids": [side_a["commit_id"]], + "oid": side_a["oid"], "message": _bytes_blob(side_a["message"]), "diff": _bytes_blob(side_a["diff"]), }, "side_b": { - "contributor": a2, - "commit_ids": side_b["commit_ids"], + "contributor": side_b["contributor"], + "commit_id": side_b["commit_id"], + "commit_ids": [side_b["commit_id"]], + "oid": side_b["oid"], "message": _bytes_blob(side_b["message"]), "diff": _bytes_blob(side_b["diff"]), }, @@ -1650,22 +1669,24 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1): comparison_material = { **comparison_material, "comparison_id": comparison_id, - "summary": f"Comparing {a1} with {a2}", + "summary": f"Comparing {label_a} with {label_b}", } cmp_ev = await append_evidence(epoch, "comparison.input", comparison_material) await broadcast_audit( "comparison", - f"Comparing {a1} with {a2}", + f"Comparing commits {label_a} vs {label_b}", phase="ranking", evidence_event_id=cmp_ev.event_id, evidence_url=_evidence_url("comparison", comparison_id), links={ "comparison": _evidence_url("comparison", comparison_id), + "commit_a": _evidence_url("commit", side_a["commit_id"]), + "commit_b": _evidence_url("commit", side_b["commit_id"]), "epoch": _evidence_url("epoch", str(epoch)), }, ) await broadcast_js(exec_event(Three[Selector("#emission-status")][MORPH][ - ["div#emission-status", f"Comparing {a1} vs {a2}…"] + ["div#emission-status", f"Comparing {label_a} vs {label_b}…"] ])) results = [] for model in models: @@ -1697,9 +1718,15 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1): jud_id = (existing or _find_judgment(comparison_id, model) or {}).get( "judgment_id" ) + win_label = ( + f"{sides[w]['commit_id'][:16]} ({sides[w]['contributor']})" + ) + lose_label = ( + f"{sides[l]['commit_id'][:16]} ({sides[l]['contributor']})" + ) await broadcast_audit( "vote", - f"{model}: {authors[w]} over {authors[l]} ({result['ratio']})", + f"{model}: {win_label} over {lose_label} ({result['ratio']})", phase="ranking", evidence_url=( _evidence_url("judgment", jud_id) if jud_id else None @@ -1714,8 +1741,8 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1): await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][ ["div.log-vote", ["span.model", model], " — ", - ["span.winner", authors[w]], f" beat ", - ["span.loser", authors[l]], f" ({result['ratio']}) ", + ["span.winner", win_label], f" beat ", + ["span.loser", lose_label], f" ({result['ratio']}) ", ["span.explanation", result["explanation"]], ] ])) @@ -1745,24 +1772,46 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1): ["div#emission-status", label] ])) - pairs = await pairwise_rank(len(authors), compare_fn, progress_fn) + pairs = await pairwise_rank(len(ordered), compare_fn, progress_fn) if not pairs: - ranking = {authors[0]: Decimal("1")} if authors else {} + commit_score_list = [Decimal("1")] else: scores = rank_centrality(pairs) - ranking = {authors[i]: Decimal(str(scores[i])) for i in range(len(authors))} - ranking_rows = sorted(ranking.items(), key=lambda x: x[1], reverse=True) + commit_score_list = [Decimal(str(scores[i])) for i in range(len(ordered))] + + commit_ranking = { + commit_ids[i]: str(commit_score_list[i]) for i in range(len(ordered)) + } + contributor_totals = _rollup_contributor_scores(ordered, commit_score_list) + contrib_rows = sorted( + contributor_totals.items(), key=lambda x: x[1], reverse=True + ) + commit_rows = sorted( + ((commit_ids[i], commit_score_list[i], ordered[i]["contributor"]) + for i in range(len(ordered))), + key=lambda x: x[1], + reverse=True, + ) completed = await append_evidence(epoch, "ranking.completed", { "ranking_run_id": ranking_run_id, "models": models, - "ranking": {a: str(s) for a, s in ranking_rows}, + "commit_ranking": commit_ranking, + "contributor_ranking": {a: str(s) for a, s in contrib_rows}, + "ranking": {a: str(s) for a, s in contrib_rows}, "judgment_ids": judgment_ids, - "summary": "Ranking: " + ", ".join(f"{a} {s:.4f}" for a, s in ranking_rows), + "summary": ( + "Commit ranking: " + + ", ".join( + f"{cid[:16]}={float(s):.4f}" for cid, s, _ in commit_rows[:12] + ) + + ("…" if len(commit_rows) > 12 else "") + ), }) await broadcast_audit( "ranking", - "Ranking: " + ", ".join(f"{a} {s:.4f}" for a, s in ranking_rows), + "Contributor rollup: " + + ", ".join(f"{a} {s:.4f}" for a, s in contrib_rows), progress=90, phase="finalizing", evidence_event_id=completed.event_id, @@ -1772,10 +1821,10 @@ async def rank_commits(commits: list[dict], *, epoch: int = -1): await broadcast_js(exec_event(Three[Selector("#emission-log")][PREPEND][ ["div.log-ranking", ["b", "Ranking: "], - *[["span.rank-entry", f"{a} {float(s):.3f} "] for a, s in ranking_rows], + *[["span.rank-entry", f"{a} {float(s):.3f} "] for a, s in contrib_rows], ] ])) - return ranking, models, { + return contributor_totals, models, { "ranking_run_id": ranking_run_id, "ranking_event_id": completed.event_id, } @@ -2352,6 +2401,23 @@ async def epoch_detail(epoch: int): ranking_nodes: list = [] if ranking_completed: + commit_ranking = ranking_completed.payload.get("commit_ranking") or {} + contrib_ranking = ( + ranking_completed.payload.get("contributor_ranking") + or ranking_completed.payload.get("ranking") + or {} + ) + commit_rank_links = [ + ( + f"{cid[:20]} = {score}", + _evidence_path("commit", cid), + ) + for cid, score in sorted( + commit_ranking.items(), + key=lambda kv: Decimal(str(kv[1])), + reverse=True, + ) + ] ranking_nodes = [ ["p", ranking_completed.payload.get("summary") or "ranking completed"], _dl_rows([ @@ -2362,10 +2428,10 @@ async def epoch_detail(epoch: int): ranking_completed.event_id, )), ]), - ["pre.blob", json.dumps( - ranking_completed.payload.get("ranking") or {}, - indent=2, sort_keys=True, - )], + ["h3", "commit ranking"], + _link_list(commit_rank_links) if commit_rank_links else ["p.note", "(none)"], + ["h3", "contributor rollup"], + ["pre.blob", json.dumps(contrib_ranking, indent=2, sort_keys=True)], ] elif ranking_started: ranking_nodes = [["p.note", f"Ranking started: {ranking_started.event_id}"]] @@ -2386,14 +2452,9 @@ async def epoch_detail(epoch: int): else: emission_node = ["p.note", "No emission for this epoch."] - contributors = { - e.payload.get("contributor") - for e in commit_evs - if e.payload.get("contributor") - } no_comparisons_note = "No comparisons." - if len(contributors) <= 1: - no_comparisons_note += " Single-contributor — no LLM judgments." + if len(commit_evs) <= 1: + no_comparisons_note += " Fewer than two eligible commits — nothing to pairwise-rank." body = [ _evidence_nav(), @@ -2511,9 +2572,14 @@ async def comparison_detail(comparison_id: str): j.payload.get("summary") or jid, _evidence_path("judgment", jid), )) - commit_links = [] - for cid in (side_a.get("commit_ids") or []) + (side_b.get("commit_ids") or []): - commit_links.append((cid, _evidence_path("commit", cid))) + commit_ids = [] + for side in (side_a, side_b): + cid = side.get("commit_id") + if cid: + commit_ids.append(cid) + else: + commit_ids.extend(side.get("commit_ids") or []) + commit_links = [(cid, _evidence_path("commit", cid)) for cid in commit_ids] return _evidence_page(f"comparison {comparison_id[:24]}", [ _evidence_nav(_a(_evidence_path("epoch", str(ev.epoch)), f"epoch {ev.epoch}")), ["div.eyebrow", "comparison"], @@ -2522,8 +2588,8 @@ async def comparison_detail(comparison_id: str): ("summary", p.get("summary")), ("ranking_run_id", p.get("ranking_run_id")), ("evidence_event", _a(_evidence_path("event", ev.event_id), ev.event_id)), - ("side_a", side_a.get("contributor")), - ("side_b", side_b.get("contributor")), + ("side_a", f"{side_a.get('commit_id', '?')} ({side_a.get('contributor', '?')})"), + ("side_b", f"{side_b.get('commit_id', '?')} ({side_b.get('contributor', '?')})"), ]), ["p", _a(f"/comparisons/{comparison_id}/prompt", "download prompt")], ["h2", "commits"], @@ -2534,12 +2600,12 @@ async def comparison_detail(comparison_id: str): _link_list(judgment_links), ["h2", "prompt"], _pre_blob(_blob_text(p.get("prompt"))), - ["h2", f"side A — {side_a.get('contributor', '?')}"], + ["h2", f"side A — {side_a.get('commit_id', side_a.get('contributor', '?'))}"], ["h3", "message"], _pre_blob(_blob_text(side_a.get("message"))), ["h3", "diff"], _pre_blob(_blob_text(side_a.get("diff"))), - ["h2", f"side B — {side_b.get('contributor', '?')}"], + ["h2", f"side B — {side_b.get('commit_id', side_b.get('contributor', '?'))}"], ["h3", "message"], _pre_blob(_blob_text(side_b.get("message"))), ["h3", "diff"], @@ -3156,9 +3222,9 @@ async def watch(): ], ["p.note", ( - "Pairwise council voting is ready." + "Pairwise council ranks every eligible commit." if key_ok else - "Single-contributor epochs can finalize, but contested rankings require OPENROUTER_API_KEY." + "Epochs with two or more eligible commits require OPENROUTER_API_KEY." ) ], ], diff --git a/tests/integration.clj b/tests/integration.clj index 11140e95a8cd86768a661a30e6b29a3ddfc95fcc..39b2476cb5ddf80733769f61343c81ba7287a974 100644 --- a/tests/integration.clj +++ b/tests/integration.clj @@ -507,7 +507,7 @@ (bind or-state @(:state or-mock)) (assert! (pos? (:model-requests or-state)) "OpenRouter /models was called") - (assert! (>= (:compare-requests or-state) 3) "at least 3 pairwise LLM calls (2 authors × 3 models)") + (assert! (>= (:compare-requests or-state) 3) "at least 3 pairwise LLM calls (2 commits × 3 models)") (bind ledger2 (get-json base-url "/api/ledger")) (assert! (>= (count ledger2) 3) @@ -543,6 +543,8 @@ "epoch page links comparisons") (assert! (str/includes? epoch-html "/judgments/") "epoch page links judgments") + (assert! (str/includes? epoch-html "commit ranking") + "epoch page shows per-commit ranking") (bind commit-href (second (re-find #"/commits/(c_[a-f0-9]+)" epoch-html))) (assert! (some? commit-href) "found a commit id on epoch page") diff --git a/tests/test_git_discovery.py b/tests/test_git_discovery.py index 00d26bfa85737b178c8822804e278211974e0efe..0f002a58bd9a122d41c5a85e32c16ed2b4404d2f 100644 --- a/tests/test_git_discovery.py +++ b/tests/test_git_discovery.py @@ -434,7 +434,7 @@ def test_emission_distribution_sums_exactly_to_total( assert entry.discovery_snapshot_id == "ranked-snapshot" -def test_single_contributor_ranking_is_total_and_uses_no_pairwise_votes( +def test_single_commit_ranking_skips_pairwise( discovery_config, monkeypatch, ): monkeypatch.setattr(c, "store", c.JsonlStore(discovery_config / "ledger.jsonl")) @@ -454,6 +454,65 @@ def test_single_contributor_ranking_is_total_and_uses_no_pairwise_votes( assert info["ranking_event_id"] +def test_same_contributor_multiple_commits_runs_pairwise( + discovery_config, monkeypatch, +): + monkeypatch.setattr(c, "store", c.JsonlStore(discovery_config / "ledger.jsonl")) + calls = {"n": 0} + + async def models(n=3): + return ["m1", "m2", "m3"] + + async def compare(model_id, side_a, side_b, **kwargs): + calls["n"] += 1 + assert "commit_id" in side_a and "commit_id" in side_b + if kwargs.get("persist"): + attempt_id = c.attempt_id_for(kwargs["comparison_id"], model_id, 1) + await c.append_evidence(kwargs["epoch"], "llm.judgment", { + "judgment_id": c.judgment_id_for({ + "attempt_id": attempt_id, + "comparison_id": kwargs["comparison_id"], + "model_id": model_id, + "winner": "A", + "ratio": "2:1", + "explanation": "ok", + }), + "attempt_id": attempt_id, + "comparison_id": kwargs["comparison_id"], + "model_id": model_id, + "winner": "A", + "ratio": "2:1", + "explanation": "ok", + "summary": "ok", + }) + return {"winner": "A", "ratio": "2:1", "explanation": "ok"} + + monkeypatch.setattr(c, "fetch_top_models", models) + monkeypatch.setattr(c, "llm_pairwise_compare", compare) + monkeypatch.setattr(c, "OPENROUTER_API_KEY", "test-key") + commits = [ + { + "contributor": "alice", + "oid": "sha1:" + char * 40, + "message": f"msg-{char}", + "patch": f"patch-{char}", + } + for char in ("a", "b", "c") + ] + ranking, used, info = asyncio.run(c.rank_commits(commits, epoch=0)) + assert set(ranking) == {"alice"} + assert ranking["alice"] > 0 + assert used == ["m1", "m2", "m3"] + assert calls["n"] >= 3 + completed = next( + e for e in c.store.read() + if isinstance(e, c.Evidence) and e.kind == "ranking.completed" + ) + assert len(completed.payload["commit_ranking"]) == 3 + assert "alice" in completed.payload["contributor_ranking"] + assert info["ranking_event_id"] + + def test_any_council_failure_aborts_ranking(discovery_config, monkeypatch): monkeypatch.setattr(c, "store", c.JsonlStore(discovery_config / "ledger.jsonl")) @@ -479,16 +538,16 @@ def test_any_council_failure_aborts_ranking(discovery_config, monkeypatch): asyncio.run(c.rank_commits(commits, epoch=0)) -def test_contested_ranking_requires_openrouter_key(monkeypatch): +def test_multi_commit_ranking_requires_openrouter_key(monkeypatch): monkeypatch.setattr(c, "OPENROUTER_API_KEY", "") commits = [ { - "contributor": contributor, + "contributor": "alice", "oid": "sha1:" + char * 40, - "message": contributor, + "message": char, "patch": "patch", } - for contributor, char in [("alice", "a"), ("bob", "b")] + for char in ("a", "b") ] with pytest.raises(RuntimeError, match="OPENROUTER_API_KEY"): asyncio.run(c.rank_commits(commits))