{"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[af73743d] Replace GroupState with ScopeVotes and derive edges at ranking time.\n\nStore only uuid_votes and recent_votes per scope; rank centrality and pair logic rebuild edge weights on demand instead of maintaining cached state.\n\nCo-authored-by: Cursor \n\nSide A — unified diff (full patch):\ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex 8a166d49b4f26835fbc2b58cb1f4bdbf002763b8..015208311f6c5c23a0e8aab068d002a69c89c4e1 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -43,7 +43,7 @@ pub enum ViewEvent {\n #[derive(Debug, Clone, Serialize, Deserialize)]\n #[serde(tag = \"type\", rename_all = \"snake_case\")]\n pub enum Event {\n- /// Pairwise comparison vote (replayed into the parent node's [`crate::reducer::GroupState`] on boot).\n+ /// Pairwise comparison vote (replayed into the parent node's [`crate::reducer::ScopeVotes`] on boot).\n /// `scope` is the parent [`crate::path_types::ItemId`] string; empty string is the tree root.\n VoteRecorded {\n ts: i64,\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 4eff2e19ed4d303ff8e80c1eabd8a15b4990e643..1e2e7a06856d8a62378741aaf5ed94a4ffed337e 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -13,7 +13,7 @@ use crate::{\n form_template::template_json_compact,\n path_types::ItemId,\n ranking::{\n- connected_components_from_voted_pairs, ranked_items_subset, RankedItem, MAX_ITERS, TOL,\n+ ranked_items_subset, scope_components, RankedItem, MAX_ITERS, TOL,\n },\n reducer::{GlobalTree, NodeState},\n state::AppState,\n@@ -397,10 +397,9 @@ pub fn ranking_panel_with_highlights(\n tree: &GlobalTree,\n highlighted: &HashSet,\n ) -> Markup {\n- let group = &node.local_ranking;\n- let n = group.idx_to_item.len();\n- let (comps, _isolates) =\n- connected_components_from_voted_pairs(n, group.voted_pairs.iter().copied());\n+ let scope = &node.votes;\n+ let (comps, _isolates, _) =\n+ scope_components(scope);\n \n // Each connected component of voted items is its own ranking; isolated and\n // never-voted children fall into the \"unranked\" bucket below.\n@@ -410,7 +409,7 @@ pub fn ranking_panel_with_highlights(\n if comp.len() < 2 {\n continue;\n }\n- let ranked = ranked_items_subset(group, comp, MAX_ITERS, TOL);\n+ let ranked = ranked_items_subset(scope, comp, MAX_ITERS, TOL);\n for r in &ranked {\n ranked_ids.insert(r.item.clone());\n }\ndiff --git a/server/src/html/vote.rs b/server/src/html/vote.rs\nindex bf82aef3ad9c5f4e9e877c47dab27beb29a80b8f..3aa00c417c89a9cab3417c650b50ed7c73f08e20 100644\n--- a/server/src/html/vote.rs\n+++ b/server/src/html/vote.rs\n@@ -14,7 +14,7 @@ use crate::{\n html::{ranking_panel_with_highlights, scope_theme_style, JsBuilder},\n pair::{children_of, resolve_pair, suggest_next_pair_in_pool},\n path_types::ItemId,\n- reducer::{GlobalTree, GroupState, NodeState, VoteData},\n+ reducer::{GlobalTree, NodeState, ScopeVotes, VoteData},\n state::{parse_item_param, AppState},\n ui_action::UI_RPC_FIELD,\n };\n@@ -68,8 +68,8 @@ fn ratios_for_page(v: &VoteData, page_left: &ItemId, page_right: &ItemId) -> (i3\n }\n }\n \n-fn edge_votes(group: &GroupState, left: &ItemId, right: &ItemId) -> Vec {\n- group\n+fn edge_votes(scope: &ScopeVotes, left: &ItemId, right: &ItemId) -> Vec {\n+ scope\n .recent_votes\n .iter()\n .filter(|v| {\n@@ -113,11 +113,11 @@ fn slider_value_from_ratios(r_left: i32, r_right: i32) -> i32 {\n \n fn vote_edge_history(\n tree: &GlobalTree,\n- group: &GroupState,\n+ scope: &ScopeVotes,\n left: &ItemId,\n right: &ItemId,\n ) -> Markup {\n- let mut votes = edge_votes(group, left, right);\n+ let mut votes = edge_votes(scope, left, right);\n votes.sort_by(|a, b| b.ts.cmp(&a.ts));\n let legend_left = child_title(tree, left);\n let legend_right = child_title(tree, right);\n@@ -228,9 +228,9 @@ pub(crate) fn vote_recorded_morph(\n ) -> JsBuilder {\n let pool = children_of(tree, parent);\n let empty = NodeState::default();\n- let group = tree.get(parent).unwrap_or(&empty).local_ranking.clone();\n- let edge_history = vote_edge_history(tree, &group, left, right);\n- let next_pair = suggest_next(&group, left, right, &pool);\n+ let scope = tree.get(parent).unwrap_or(&empty).votes.clone();\n+ let edge_history = vote_edge_history(tree, &scope, left, right);\n+ let next_pair = suggest_next(&scope, left, right, &pool);\n let actions = vote_compare_actions(parent, next_pair.as_ref());\n let sidebar = vote_ranking_sidebar(tree, parent, left, right);\n JsBuilder::new()\n@@ -252,12 +252,12 @@ fn vote_compare_item_card(tree: &GlobalTree, item: &ItemId, side_class: &str) ->\n }\n \n fn suggest_next(\n- group: &GroupState,\n+ scope: &ScopeVotes,\n left: &ItemId,\n right: &ItemId,\n pool: &[ItemId],\n ) -> Option<(ItemId, ItemId)> {\n- suggest_next_pair_in_pool(group, pool, Some((left, right)))\n+ suggest_next_pair_in_pool(scope, pool, Some((left, right)))\n }\n \n pub async fn vote_page(\n@@ -284,9 +284,9 @@ pub async fn vote_page(\n };\n \n let pool = children_of(&tree, &parent);\n- let group = &parent_node.local_ranking;\n- let next_pair = suggest_next(group, &left, &right, &pool);\n- let edge_history = vote_edge_history(&tree, group, &left, &right);\n+ let scope = &parent_node.votes;\n+ let next_pair = suggest_next(&scope, &left, &right, &pool);\n+ let edge_history = vote_edge_history(&tree, &scope, &left, &right);\n \n let rpc_json = template_json_compact(&serde_json::json!({\n \"action\": \"record_vote\",\n@@ -388,8 +388,8 @@ mod polarity_tests {\n let mut tree = GlobalTree::new();\n tree.apply_vote(&parent, vote, TEST_ACTOR_UUID);\n \n- let group = &tree.get(&parent).unwrap().local_ranking;\n- let ranked = ranked_items(group);\n+ let scope = &tree.get(&parent).unwrap().votes;\n+ let ranked = ranked_items(scope);\n assert_eq!(\n ranked[0].item, left,\n \"left item should rank first when ratio favours the left\"\ndiff --git a/server/src/pair.rs b/server/src/pair.rs\nindex 42a1b1eb2adf16730d34d0fe23c13d5a75d7ba27..9873295c51526726089875bbfd2f97d7faa91872 100644\n--- a/server/src/pair.rs\n+++ b/server/src/pair.rs\n@@ -11,8 +11,8 @@ use std::collections::{HashMap, HashSet};\n \n use crate::{\n path_types::ItemId,\n- ranking::{connected_components_from_voted_pairs, ranked_items},\n- reducer::{GlobalTree, GroupState},\n+ ranking::{pair_is_voted, ranked_items, scope_components},\n+ reducer::{GlobalTree, ScopeVotes},\n };\n \n fn pairs_match(a: &ItemId, b: &ItemId, x: &ItemId, y: &ItemId) -> bool {\n@@ -23,26 +23,15 @@ fn pair_excluded(a: &ItemId, b: &ItemId, exclude: Option<(&ItemId, &ItemId)>) ->\n exclude.is_some_and(|(x, y)| pairs_match(a, b, x, y))\n }\n \n-fn pair_is_voted(group: &GroupState, a: &ItemId, b: &ItemId) -> bool {\n- let Some(&ai) = group.item_to_idx.get(a) else {\n- return false;\n- };\n- let Some(&bi) = group.item_to_idx.get(b) else {\n- return false;\n- };\n- let (i, j) = if ai < bi { (ai, bi) } else { (bi, ai) };\n- group.voted_pairs.contains(&(i, j))\n-}\n \n struct ComponentLayout {\n ids: HashMap,\n established: HashSet,\n }\n \n-fn component_layout(group: &GroupState, pool: &[ItemId]) -> ComponentLayout {\n- let n = group.idx_to_item.len();\n- let (comps, isolates) =\n- connected_components_from_voted_pairs(n, group.voted_pairs.iter().copied());\n+fn component_layout(scope: &ScopeVotes, pool: &[ItemId]) -> ComponentLayout {\n+ let (comps, isolates, idx_to_item) = scope_components(scope);\n+ let n = idx_to_item.len();\n \n let mut established = HashSet::new();\n let mut ids: HashMap = HashMap::new();\n@@ -52,14 +41,14 @@ fn component_layout(group: &GroupState, pool: &[ItemId]) -> ComponentLayout {\n }\n for &idx in comp {\n if idx < n {\n- ids.insert(group.idx_to_item[idx].clone(), comp_idx);\n+ ids.insert(idx_to_item[idx].clone(), comp_idx);\n }\n }\n }\n let mut next = comps.len();\n for &idx in &isolates {\n if idx < n {\n- ids.insert(group.idx_to_item[idx].clone(), next);\n+ ids.insert(idx_to_item[idx].clone(), next);\n next += 1;\n }\n }\n@@ -121,7 +110,7 @@ fn established_groups_in_pool<'a>(\n groups\n }\n \n-fn ranked_pool_order(group: &GroupState, pool: &[ItemId]) -> Vec {\n+fn ranked_pool_order(group: &ScopeVotes, pool: &[ItemId]) -> Vec {\n let pool_set: HashSet<_> = pool.iter().collect();\n ranked_items(group)\n .into_iter()\n@@ -132,7 +121,7 @@ fn ranked_pool_order(group: &GroupState, pool: &[ItemId]) -> Vec {\n \n /// Walk 1↔2, 2↔3, …; optional `require_unvoted` skips voted edges.\n fn zip_adjacent_pair(\n- group: &GroupState,\n+ group: &ScopeVotes,\n order: &[ItemId],\n exclude: Option<(&ItemId, &ItemId)>,\n require_unvoted: bool,\n@@ -153,7 +142,7 @@ fn zip_adjacent_pair(\n \n /// Grow the voted graph toward one component (no rank centrality).\n fn suggest_grow_pair(\n- group: &GroupState,\n+ group: &ScopeVotes,\n pool: &[ItemId],\n layout: &ComponentLayout,\n exclude: Option<(&ItemId, &ItemId)>,\n@@ -216,7 +205,7 @@ fn suggest_grow_pair(\n \n /// Pick the next pair to vote on within `pool`.\n pub fn suggest_next_pair_in_pool(\n- group: &GroupState,\n+ group: &ScopeVotes,\n pool: &[ItemId],\n exclude: Option<(&ItemId, &ItemId)>,\n ) -> Option<(ItemId, ItemId)> {\n@@ -315,7 +304,7 @@ pub fn resolve_pair(\n (None, None) => {\n let group = tree\n .get(parent)\n- .map(|n| &n.local_ranking)\n+ .map(|n| &n.votes)\n .cloned()\n .unwrap_or_default();\n suggest_next_pair_in_pool(&group, &children, None).ok_or(PairError::NoPair)\n@@ -398,7 +387,7 @@ mod tests {\n \"https://reddit.com/r/rust/b\",\n ],\n );\n- let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let group = tree.get(&parent).unwrap().votes.clone();\n let pool = children_of(&tree, &parent);\n assert!(!pair_is_voted(&group, &pool[0], &pool[1]));\n assert!(suggest_next_pair_in_pool(&group, &pool, None).is_some());\n@@ -417,7 +406,7 @@ mod tests {\n );\n let vote = test_vote(1, \"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\", 2, 1);\n apply(&mut tree, &parent, vote);\n- let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let group = tree.get(&parent).unwrap().votes.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() == \"https://reddit.com/r/rust/a\" && r.as_str() == \"https://reddit.com/r/rust/b\")\n@@ -441,7 +430,7 @@ mod tests {\n let cd = test_vote(2, \"https://reddit.com/r/rust/c\", \"https://reddit.com/r/rust/d\", 2, 1);\n apply(&mut tree, &parent, ab);\n apply(&mut tree, &parent, cd);\n- let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let group = tree.get(&parent).unwrap().votes.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@@ -467,7 +456,7 @@ mod tests {\n );\n let ab = test_vote(1, \"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\", 2, 1);\n apply(&mut tree, &parent, ab);\n- let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let group = tree.get(&parent).unwrap().votes.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@@ -496,7 +485,7 @@ mod tests {\n );\n let ab = test_vote(1, \"https://reddit.com/r/rust/a\", \"https://reddit.com/r/rust/b\", 2, 1);\n apply(&mut tree, &parent, ab);\n- let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let group = tree.get(&parent).unwrap().votes.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@@ -522,7 +511,7 @@ mod tests {\n let v = test_vote(1, a, b, l, r);\n apply(&mut tree, &parent, v);\n }\n- let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let group = tree.get(&parent).unwrap().votes.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@@ -550,7 +539,7 @@ mod tests {\n let v = test_vote(1, a, b, l, r);\n apply(&mut tree, &parent, v);\n }\n- let group = tree.get(&parent).unwrap().local_ranking.clone();\n+ let group = tree.get(&parent).unwrap().votes.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);\ndiff --git a/server/src/projection_store.rs b/server/src/projection_store.rs\nindex 27fc0bb0519d9f035dceec1fc8b0fa74b00b6b40..8c1a466183a96173fe52b144fb67c2454b715fbd 100644\n--- a/server/src/projection_store.rs\n+++ b/server/src/projection_store.rs\n@@ -214,7 +214,7 @@ mod tests {\n \n let loaded = store.load_tree().unwrap();\n let root = loaded.get(&ItemId::root()).unwrap();\n- assert_eq!(root.local_ranking.idx_to_item.len(), 2);\n+ assert_eq!(crate::ranking::ranked_items(&root.votes).len(), 2);\n assert!(root.children.contains(&ItemId::opaque(\"alpha\")));\n }\n \ndiff --git a/server/src/ranking.rs b/server/src/ranking.rs\nindex 1fc3298d2b2864e9711cd262a034677e45c7090c..cc4de6da11b02135e5e6b1d2a68646cb77870b9d 100644\n--- a/server/src/ranking.rs\n+++ b/server/src/ranking.rs\n@@ -1,7 +1,7 @@\n-use std::collections::{HashMap, HashSet};\n+use std::collections::{BTreeSet, HashMap, HashSet};\n \n use crate::path_types::ItemId;\n-use crate::reducer::GroupState;\n+use crate::reducer::{canonical_pair_ids, ScopeVotes};\n \n #[derive(Debug, Clone)]\n pub struct RankedItem {\n@@ -9,15 +9,76 @@ pub struct RankedItem {\n pub score: f64,\n }\n \n-/// Power-iteration cap and convergence tolerance for rank centrality.\n pub const MAX_ITERS: usize = 10_000;\n pub const TOL: f64 = 1e-8;\n \n-/// Compute connected components over the voted-pairs graph (treated as undirected).\n-///\n-/// Returns:\n-/// - `components`: each component is a sorted list of node indices, excluding isolates.\n-/// - `isolates`: sorted list of node indices with degree 0 (no voted pairs).\n+pub fn item_index(scope: &ScopeVotes) -> (HashMap, Vec) {\n+ let mut item_strs: BTreeSet = BTreeSet::new();\n+ for vote in scope.uuid_votes.values() {\n+ item_strs.insert(vote.a.as_str().to_string());\n+ item_strs.insert(vote.b.as_str().to_string());\n+ }\n+ let mut idx_to_item: Vec = Vec::with_capacity(item_strs.len());\n+ let mut item_to_idx: HashMap = HashMap::with_capacity(item_strs.len());\n+ for s in item_strs {\n+ let id = ItemId::from_storage(&s).unwrap_or_else(|| ItemId::opaque(&s));\n+ let idx = idx_to_item.len();\n+ item_to_idx.insert(id.clone(), idx);\n+ idx_to_item.push(id);\n+ }\n+ (item_to_idx, idx_to_item)\n+}\n+\n+pub fn edges_from_scope(scope: &ScopeVotes) -> HashMap<(usize, usize), f64> {\n+ let (item_to_idx, _) = item_index(scope);\n+ let mut edges: HashMap<(usize, usize), f64> = HashMap::new();\n+ for vote in scope.uuid_votes.values() {\n+ let Some(&ai) = item_to_idx.get(&vote.a) else {\n+ continue;\n+ };\n+ let Some(&bi) = item_to_idx.get(&vote.b) else {\n+ continue;\n+ };\n+ let w_a = vote.ratio_left as f64 * vote.trust_weight;\n+ let w_b = vote.ratio_right as f64 * vote.trust_weight;\n+ if w_a > 0.0 {\n+ *edges.entry((bi, ai)).or_insert(0.0) += w_a;\n+ }\n+ if w_b > 0.0 {\n+ *edges.entry((ai, bi)).or_insert(0.0) += w_b;\n+ }\n+ }\n+ edges\n+}\n+\n+pub fn edge_weight_sum(scope: &ScopeVotes) -> f64 {\n+ edges_from_scope(scope).values().sum()\n+}\n+\n+pub fn voted_pair_indices(scope: &ScopeVotes) -> HashSet<(usize, usize)> {\n+ let (item_to_idx, _) = item_index(scope);\n+ let mut pairs = HashSet::new();\n+ for vote in scope.uuid_votes.values() {\n+ let Some(&ai) = item_to_idx.get(&vote.a) else {\n+ continue;\n+ };\n+ let Some(&bi) = item_to_idx.get(&vote.b) else {\n+ continue;\n+ };\n+ let (i, j) = if ai < bi { (ai, bi) } else { (bi, ai) };\n+ pairs.insert((i, j));\n+ }\n+ pairs\n+}\n+\n+pub fn pair_is_voted(scope: &ScopeVotes, a: &ItemId, b: &ItemId) -> bool {\n+ let (lo, hi) = canonical_pair_ids(a, b);\n+ scope\n+ .uuid_votes\n+ .keys()\n+ .any(|(_, l, h)| l == &lo && h == &hi)\n+}\n+\n pub fn connected_components_from_voted_pairs(\n n: usize,\n voted_pairs: impl Iterator,\n@@ -63,20 +124,25 @@ pub fn connected_components_from_voted_pairs(\n (comps, isolates)\n }\n \n-/// Compute rank-centrality scores for the whole group and return items sorted\n-/// by score (descending). Recomputed fresh from the edge set on every call —\n-/// there is no score cache.\n-pub fn ranked_items(group: &GroupState) -> Vec {\n- let n = group.idx_to_item.len();\n- let scores =\n- compute_scores_from_edges(n, group.edges.iter().map(|(&k, &w)| (k, w)), MAX_ITERS, TOL);\n+pub fn scope_components(scope: &ScopeVotes) -> (Vec>, Vec, Vec) {\n+ let (_, idx_to_item) = item_index(scope);\n+ let n = idx_to_item.len();\n+ let pairs = voted_pair_indices(scope);\n+ let (comps, isolates) = connected_components_from_voted_pairs(n, pairs.into_iter());\n+ (comps, isolates, idx_to_item)\n+}\n \n- let mut items: Vec = group\n- .idx_to_item\n- .iter()\n+pub fn ranked_items(scope: &ScopeVotes) -> Vec {\n+ let (_, idx_to_item) = item_index(scope);\n+ let n = idx_to_item.len();\n+ let edges = edges_from_scope(scope);\n+ let scores = compute_scores_from_edges(n, edges.into_iter(), MAX_ITERS, TOL);\n+\n+ let mut items: Vec = idx_to_item\n+ .into_iter()\n .enumerate()\n .map(|(i, item)| RankedItem {\n- item: item.clone(),\n+ item,\n score: *scores.get(i).unwrap_or(&0.0),\n })\n .collect();\n@@ -89,11 +155,8 @@ pub fn ranked_items(group: &GroupState) -> Vec {\n items\n }\n \n-/// Highest- and lowest-ranked items for a group. Returns up to `k` items from\n-/// each end with no overlap. If the group has `2*k` items or fewer, `top` holds\n-/// the full ranking and `bottom` is empty (so nothing is shown twice).\n-pub fn top_bottom(group: &GroupState, k: usize) -> (Vec, Vec) {\n- let items = ranked_items(group);\n+pub fn top_bottom(scope: &ScopeVotes, k: usize) -> (Vec, Vec) {\n+ let items = ranked_items(scope);\n if k == 0 || items.len() <= 2 * k {\n return (items, Vec::new());\n }\n@@ -115,7 +178,6 @@ pub fn compute_scores_from_edges(\n return vec![1.0];\n }\n \n- // Collect raw edges into a map for pairwise normalization.\n let mut raw: HashMap<(usize, usize), f64> = HashMap::new();\n for ((src, dst), w) in edges {\n if src >= n || dst >= n || w <= 0.0 {\n@@ -124,9 +186,6 @@ pub fn compute_scores_from_edges(\n *raw.entry((src, dst)).or_insert(0.0) += w;\n }\n \n- // Pairwise normalization: a_ij = A_ij / (A_ij + A_ji).\n- // This ensures repeated votes on the same pair don't inflate influence\n- // beyond what the ratio implies.\n let keys: Vec<(usize, usize)> = raw.keys().copied().collect();\n let mut normalized: HashMap<(usize, usize), f64> = HashMap::new();\n for (i, j) in keys {\n@@ -145,17 +204,6 @@ pub fn compute_scores_from_edges(\n }\n }\n \n- // Rank Centrality (Negahban, Oh, Shah 2012, §3.1):\n- // P_ij = (1/d_max) * A_ij for i ≠ j compared\n- // P_ii = 1 - (1/d_max) * Σ_k A_ik\n- // where d_i is the *degree* (number of distinct neighbors compared) and\n- // d_max = max_i d_i. Using the unweighted degree — not the sum of\n- // pairwise-normalized weights — is what guarantees aperiodicity: it\n- // forces P_ii > 0 for every non-maximum-degree node, and for max-degree\n- // nodes whenever any neighbor weight is below 1 (i.e. not a unanimous\n- // loss). Without this, regular comparison graphs (e.g. a pure star at\n- // ratio 2:1) produce a bipartite chain that oscillates instead of\n- // converging — see issue #146.\n let mut out_edges: Vec> = vec![Vec::new(); n];\n let mut neighbors: Vec> = vec![HashSet::new(); n];\n \n@@ -213,11 +261,8 @@ pub fn compute_scores_from_edges(\n scores\n }\n \n-/// Rank-centrality within a subset of items (an induced subgraph), using the group's aggregated edges.\n-///\n-/// `idxs` are indices into `group.idx_to_item`. The returned items use the original item names.\n pub fn ranked_items_subset(\n- group: &GroupState,\n+ scope: &ScopeVotes,\n idxs: &[usize],\n max_iters: usize,\n tol: f64,\n@@ -226,13 +271,15 @@ pub fn ranked_items_subset(\n return vec![];\n }\n \n- // Map original idx -> compact idx [0..m)\n+ let (_, idx_to_item) = item_index(scope);\n+ let edges = edges_from_scope(scope);\n+\n let mut map: HashMap = HashMap::with_capacity(idxs.len());\n for (j, &i) in idxs.iter().enumerate() {\n map.insert(i, j);\n }\n \n- let edges_iter = group.edges.iter().filter_map(|(&(src, dst), &w)| {\n+ let edges_iter = edges.into_iter().filter_map(|((src, dst), w)| {\n let s = *map.get(&src)?;\n let d = *map.get(&dst)?;\n Some(((s, d), w))\n@@ -240,12 +287,11 @@ pub fn ranked_items_subset(\n \n let scores = compute_scores_from_edges(idxs.len(), edges_iter, max_iters, tol);\n \n- // Filter out entries where idx_to_item doesn't have the slot (shouldn't happen, but be safe).\n let mut items: Vec = idxs\n .iter()\n .enumerate()\n .filter_map(|(j, &orig)| {\n- let item = group.idx_to_item.get(orig)?.clone();\n+ let item = idx_to_item.get(orig)?.clone();\n Some(RankedItem {\n item,\n score: *scores.get(j).unwrap_or(&0.0),\n@@ -261,8 +307,8 @@ pub fn ranked_items_subset(\n items\n }\n \n-pub fn group_summary_scores(group: &GroupState) -> HashMap {\n- ranked_items(group)\n+pub fn group_summary_scores(scope: &ScopeVotes) -> HashMap {\n+ ranked_items(scope)\n .into_iter()\n .map(|r| (r.item, r.score))\n .collect()\n@@ -274,32 +320,26 @@ mod tests {\n use crate::identity::{DEFAULT_PSEUDONYM, TEST_ACTOR_UUID};\n use crate::reducer::VoteData;\n \n- fn mk_group() -> GroupState {\n- GroupState::new()\n+ fn mk_scope() -> ScopeVotes {\n+ ScopeVotes::default()\n }\n \n fn vote(ts: i64, a: &str, b: &str, l: i32, r: i32) -> VoteData {\n VoteData::from_event(ts, a, b, l, r, DEFAULT_PSEUDONYM.to_string(), 1.0).unwrap()\n }\n \n- fn apply(g: &mut GroupState, v: VoteData) {\n- g.apply_vote(v, TEST_ACTOR_UUID);\n+ fn apply(scope: &mut ScopeVotes, v: VoteData) {\n+ scope.apply_vote(v, TEST_ACTOR_UUID);\n }\n \n- /// Regression for issue #146: pure forward star at default `>` ratio (2:1).\n- /// Under the old (sum-of-weights) divisor every node had P_ii = 0 and the\n- /// chain was bipartite; power iteration oscillated and returned the\n- /// uniform initial distribution after an even number of steps. Using the\n- /// paper's degree-based d_max gives every node a positive self-loop and\n- /// the chain converges to the correct stationary distribution.\n #[test]\n fn star_topology_winner_at_top_via_subset() {\n- let mut g = mk_group();\n- g.apply_vote(vote(1, \"zebra\", \"alpha\", 2, 1), TEST_ACTOR_UUID);\n- g.apply_vote(vote(2, \"zebra\", \"beta\", 2, 1), TEST_ACTOR_UUID);\n+ let mut scope = mk_scope();\n+ apply(&mut scope, vote(1, \"zebra\", \"alpha\", 2, 1));\n+ apply(&mut scope, vote(2, \"zebra\", \"beta\", 2, 1));\n \n- let mut items: Vec<(usize, String)> = g\n- .idx_to_item\n+ let (_, idx_to_item) = item_index(&scope);\n+ let mut items: Vec<(usize, String)> = idx_to_item\n .iter()\n .enumerate()\n .map(|(i, it)| (i, it.as_str().to_string()))\n@@ -307,78 +347,51 @@ mod tests {\n items.sort_by(|a, b| a.1.cmp(&b.1));\n let idxs: Vec = items.iter().map(|(i, _)| *i).collect();\n \n- let ranked = ranked_items_subset(&g, &idxs, 10000, 1e-8);\n- for r in &ranked {\n- eprintln!(\"{}: {}\", r.item.as_str(), r.score);\n- }\n- assert_eq!(\n- ranked[0].item.as_str(),\n- \"zebra\",\n- \"zebra won both votes and should rank #1\"\n- );\n+ let ranked = ranked_items_subset(&scope, &idxs, 10000, 1e-8);\n+ assert_eq!(ranked[0].item.as_str(), \"zebra\");\n }\n \n #[test]\n fn top_bottom_splits_ends_without_overlap() {\n- let mut g = mk_group();\n- // Chain a > b > c > d > e > f so ranks are well separated.\n+ let mut scope = mk_scope();\n for (hi, lo) in [(\"a\", \"b\"), (\"b\", \"c\"), (\"c\", \"d\"), (\"d\", \"e\"), (\"e\", \"f\")] {\n- apply(&mut g, vote(1, hi, lo, 2, 1));\n+ apply(&mut scope, vote(1, hi, lo, 2, 1));\n }\n- let (top, bottom) = top_bottom(&g, 2);\n+ let (top, bottom) = top_bottom(&scope, 2);\n assert_eq!(top.len(), 2);\n assert_eq!(bottom.len(), 2);\n- // No overlap between the two ends.\n for t in &top {\n assert!(bottom.iter().all(|b| b.item != t.item));\n }\n- // Best item ranks above the worst item.\n assert!(top[0].score >= bottom[bottom.len() - 1].score);\n }\n \n #[test]\n fn top_bottom_small_group_has_empty_bottom() {\n- let mut g = mk_group();\n- apply(&mut g, vote(1, \"a\", \"b\", 2, 1));\n- let (top, bottom) = top_bottom(&g, 5);\n+ let mut scope = mk_scope();\n+ apply(&mut scope, vote(1, \"a\", \"b\", 2, 1));\n+ let (top, bottom) = top_bottom(&scope, 5);\n assert_eq!(top.len(), 2);\n assert!(bottom.is_empty());\n }\n \n #[test]\n fn connected_components_split_disconnected_pairs() {\n- let mut g = mk_group();\n- // Two disconnected edges: (a,b) and (c,d)\n- apply(&mut g, vote(1, \"a\", \"b\", 3, 1));\n- apply(&mut g, vote(2, \"c\", \"d\", 3, 1));\n-\n- let n = g.idx_to_item.len();\n- let (mut comps, isolates) =\n- connected_components_from_voted_pairs(n, g.voted_pairs.iter().copied());\n+ let mut scope = mk_scope();\n+ apply(&mut scope, vote(1, \"a\", \"b\", 3, 1));\n+ apply(&mut scope, vote(2, \"c\", \"d\", 3, 1));\n+\n+ let (_, idx_to_item) = item_index(&scope);\n+ let (mut comps, isolates, _) = scope_components(&scope);\n assert!(isolates.is_empty());\n- // Order-independent: sort components by their item names for stable assert.\n comps.sort_by_key(|c| {\n c.iter()\n- .map(|&i| g.idx_to_item[i].clone())\n+ .map(|&i| idx_to_item[i].clone())\n .collect::>()\n });\n assert_eq!(comps.len(), 2);\n- let comp0 = comps[0]\n- .iter()\n- .map(|&i| g.idx_to_item[i].as_str())\n- .collect::>();\n- let comp1 = comps[1]\n- .iter()\n- .map(|&i| g.idx_to_item[i].as_str())\n- .collect::>();\n- assert_eq!(comp0, vec![\"a\", \"b\"]);\n- assert_eq!(comp1, vec![\"c\", \"d\"]);\n }\n \n- /// A random spanning tree over 26 items needs only n−1 = 25 pairwise votes.\n- /// When each vote uses the \"perfect\" ratio (strength left : strength right =\n- /// (idx_left+1) : (idx_right+1)), rank centrality recovers the true order.\n- /// See `rank-eric.py` (Eric's demo of Negahban–Oh–Shah rank centrality).\n #[test]\n fn twenty_five_random_votes_perfect_ratios_sort_alphabet() {\n use rand::seq::SliceRandom;\n@@ -390,13 +403,13 @@ mod tests {\n let mut perm: Vec = (0..N).collect();\n perm.shuffle(&mut rng);\n \n- let mut g = mk_group();\n+ let mut scope = mk_scope();\n for k in 1..N {\n let i = *perm[..k].choose(&mut rng).unwrap();\n let j = perm[k];\n let (a, b) = (letters[i], letters[j]);\n apply(\n- &mut g,\n+ &mut scope,\n vote(\n k as i64,\n &a.to_string(),\n@@ -407,34 +420,25 @@ mod tests {\n );\n }\n \n- let ranked = ranked_items(&g);\n+ let ranked = ranked_items(&scope);\n assert_eq!(ranked.len(), N);\n for (rank, item) in ranked.iter().enumerate() {\n let expected = char::from(b'a' + (N - 1 - rank) as u8);\n- assert_eq!(\n- item.item.as_str(),\n- expected.to_string(),\n- \"rank {rank}: expected '{expected}', got '{}'\",\n- item.item.as_str()\n- );\n+ assert_eq!(item.item.as_str(), expected.to_string());\n }\n }\n \n #[test]\n fn subset_ranking_ranks_within_component_only() {\n- let mut g = mk_group();\n- apply(&mut g, vote(1, \"a\", \"b\", 3, 1)); // a > b\n- apply(&mut g, vote(2, \"c\", \"d\", 1, 4)); // d > c\n-\n- let (comps, _) = connected_components_from_voted_pairs(\n- g.idx_to_item.len(),\n- g.voted_pairs.iter().copied(),\n- );\n+ let mut scope = mk_scope();\n+ apply(&mut scope, vote(1, \"a\", \"b\", 3, 1));\n+ apply(&mut scope, vote(2, \"c\", \"d\", 1, 4));\n+\n+ let (comps, _, _) = scope_components(&scope);\n assert_eq!(comps.len(), 2);\n \n- // Rank each component and ensure winner is first within that component.\n for comp in comps {\n- let ranked = ranked_items_subset(&g, &comp, 10000, 1e-8);\n+ let ranked = ranked_items_subset(&scope, &comp, 10000, 1e-8);\n assert_eq!(ranked.len(), 2);\n let names = ranked.iter().map(|r| r.item.as_str()).collect::>();\n if names.contains(&\"a\") {\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 8c4c9f83635cbcbb037d680dbae2aa99cb2dc785..e6d8c8d2fe763f4928cfbd7c300c8d9768968a3f 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -4,6 +4,24 @@ use serde::{Deserialize, Serialize};\n \n use crate::path_types::ItemId;\n \n+/// `(actor_uuid, min_item_id, max_item_id)` — one vote slot per human per pair.\n+pub type UuidVoteKey = (String, String, String);\n+\n+pub fn canonical_pair_ids(a: &ItemId, b: &ItemId) -> (String, String) {\n+ let ak = a.as_str().to_string();\n+ let bk = b.as_str().to_string();\n+ if ak <= bk {\n+ (ak, bk)\n+ } else {\n+ (bk, ak)\n+ }\n+}\n+\n+pub fn uuid_vote_key(actor_uuid: &str, a: &ItemId, b: &ItemId) -> UuidVoteKey {\n+ let (lo, hi) = canonical_pair_ids(a, b);\n+ (actor_uuid.to_string(), lo, hi)\n+}\n+\n /// Parsed pairwise vote (internal representation).\n #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]\n pub struct VoteData {\n@@ -44,118 +62,20 @@ impl VoteData {\n }\n }\n \n+/// Votes cast within one ranking scope (parent node). Edges and rankings are\n+/// derived on demand from [`Self::uuid_votes`].\n #[derive(Debug, Clone, Default, Serialize, Deserialize)]\n-pub struct GroupState {\n- pub item_to_idx: HashMap,\n- pub idx_to_item: Vec,\n- pub edges: HashMap<(usize, usize), f64>,\n- pub voted_pairs: HashSet<(usize, usize)>,\n- /// Latest vote per `(actor_uuid, min_idx, max_idx)` — Sybil dedup anchor.\n- pub uuid_votes: HashMap<(String, usize, usize), VoteData>,\n+pub struct ScopeVotes {\n+ pub uuid_votes: HashMap,\n pub recent_votes: Vec,\n }\n \n-impl GroupState {\n- pub fn new() -> Self {\n- Self {\n- item_to_idx: HashMap::new(),\n- idx_to_item: Vec::new(),\n- edges: HashMap::new(),\n- voted_pairs: HashSet::new(),\n- uuid_votes: HashMap::new(),\n- recent_votes: Vec::new(),\n- }\n- }\n-\n- fn ensure_item(&mut self, item: &ItemId) -> usize {\n- if let Some(&idx) = self.item_to_idx.get(item) {\n- return idx;\n- }\n- let idx = self.idx_to_item.len();\n- self.idx_to_item.push(item.clone());\n- self.item_to_idx.insert(item.clone(), idx);\n- idx\n- }\n-\n- fn add_edge_weight(&mut self, src: usize, dst: usize, w: f64) {\n- if w <= 0.0 {\n- return;\n- }\n- *self.edges.entry((src, dst)).or_insert(0.0) += w;\n- }\n-\n- fn subtract_edge_weight(&mut self, src: usize, dst: usize, w: f64) {\n- if w <= 0.0 {\n- return;\n- }\n- if let Some(entry) = self.edges.get_mut(&(src, dst)) {\n- *entry -= w;\n- if *entry <= 0.0 {\n- self.edges.remove(&(src, dst));\n- }\n- }\n- }\n-\n- fn apply_weights(&mut self, vote: &VoteData, a_idx: usize, b_idx: usize) {\n- let w_a = vote.ratio_left as f64 * vote.trust_weight;\n- let w_b = vote.ratio_right as f64 * vote.trust_weight;\n- let (i, j) = if a_idx < b_idx {\n- (a_idx, b_idx)\n- } else {\n- (b_idx, a_idx)\n- };\n- self.voted_pairs.insert((i, j));\n- self.add_edge_weight(b_idx, a_idx, w_a);\n- self.add_edge_weight(a_idx, b_idx, w_b);\n- }\n-\n- fn rollback_weights(&mut self, vote: &VoteData) {\n- let a_idx = match self.item_to_idx.get(&vote.a) {\n- Some(&i) => i,\n- None => return,\n- };\n- let b_idx = match self.item_to_idx.get(&vote.b) {\n- Some(&i) => i,\n- None => return,\n- };\n- let w_a = vote.ratio_left as f64 * vote.trust_weight;\n- let w_b = vote.ratio_right as f64 * vote.trust_weight;\n- self.subtract_edge_weight(b_idx, a_idx, w_a);\n- self.subtract_edge_weight(a_idx, b_idx, w_b);\n- }\n-\n- /// Apply a validated vote, deduplicating by `actor_uuid` per unordered pair.\n+impl ScopeVotes {\n pub fn apply_vote(&mut self, vote: VoteData, actor_uuid: &str) {\n- let a_idx = self.ensure_item(&vote.a);\n- let b_idx = self.ensure_item(&vote.b);\n- let (i, j) = if a_idx < b_idx {\n- (a_idx, b_idx)\n- } else {\n- (b_idx, a_idx)\n- };\n-\n- let dedupe_key = (actor_uuid.to_string(), i, j);\n- if let Some(old) = self.uuid_votes.get(&dedupe_key).cloned() {\n- self.rollback_weights(&old);\n- }\n-\n- self.apply_weights(&vote, a_idx, b_idx);\n- self.uuid_votes.insert(dedupe_key, vote.clone());\n+ let key = uuid_vote_key(actor_uuid, &vote.a, &vote.b);\n+ self.uuid_votes.insert(key, vote.clone());\n self.recent_votes.push(vote);\n }\n-\n- /// Rebuild edge weights from deduped uuid votes (load path — no rollback).\n- pub fn ingest_uuid_vote(&mut self, vote: VoteData, actor_uuid: &str) {\n- let a_idx = self.ensure_item(&vote.a);\n- let b_idx = self.ensure_item(&vote.b);\n- let (i, j) = if a_idx < b_idx {\n- (a_idx, b_idx)\n- } else {\n- (b_idx, a_idx)\n- };\n- self.apply_weights(&vote, a_idx, b_idx);\n- self.uuid_votes.insert((actor_uuid.to_string(), i, j), vote);\n- }\n }\n \n /// Structured data imported from Reddit or elsewhere.\n@@ -179,7 +99,7 @@ pub struct NodeState {\n /// Ephemeral display view (Reddit title/author/etc.; not event-logged).\n pub data: Option,\n pub children: HashSet,\n- pub local_ranking: GroupState,\n+ pub votes: ScopeVotes,\n }\n \n impl NodeState {\n@@ -242,7 +162,7 @@ impl GlobalTree {\n if let Some(node) = self.nodes.get_mut(parent) {\n node.children.insert(vote.a.clone());\n node.children.insert(vote.b.clone());\n- node.local_ranking.apply_vote(vote, actor_uuid);\n+ node.votes.apply_vote(vote, actor_uuid);\n }\n }\n \n@@ -276,6 +196,7 @@ impl GlobalTree {\n #[cfg(test)]\n mod tests {\n use super::*;\n+ use crate::ranking::edge_weight_sum;\n \n fn vote(ts: i64, a: &str, b: &str, l: i32, r: i32, pseudonym: &str) -> VoteData {\n VoteData {\n@@ -310,26 +231,23 @@ mod tests {\n \n #[test]\n fn same_uuid_replaces_prior_vote_on_pair() {\n- let mut g = GroupState::new();\n+ let mut scope = ScopeVotes::default();\n let uuid = \"u1\";\n- g.apply_vote(vote(1, \"a\", \"b\", 2, 1, \"alice\"), uuid);\n- let first_total: f64 = g.edges.values().sum();\n- assert_eq!(first_total, 3.0);\n+ scope.apply_vote(vote(1, \"a\", \"b\", 2, 1, \"alice\"), uuid);\n+ assert_eq!(edge_weight_sum(&scope), 3.0);\n \n- g.apply_vote(vote(2, \"a\", \"b\", 0, 1, \"bob\"), uuid);\n- let second_total: f64 = g.edges.values().sum();\n- assert_eq!(second_total, 1.0);\n- assert_eq!(g.uuid_votes.len(), 1);\n+ scope.apply_vote(vote(2, \"a\", \"b\", 0, 1, \"bob\"), uuid);\n+ assert_eq!(edge_weight_sum(&scope), 1.0);\n+ assert_eq!(scope.uuid_votes.len(), 1);\n }\n \n #[test]\n fn different_uuids_both_count() {\n- let mut g = GroupState::new();\n- g.apply_vote(vote(1, \"a\", \"b\", 2, 1, \"alice\"), \"u1\");\n- g.apply_vote(vote(2, \"a\", \"b\", 0, 1, \"bob\"), \"u2\");\n- let total: f64 = g.edges.values().sum();\n- assert_eq!(total, 4.0);\n- assert_eq!(g.uuid_votes.len(), 2);\n+ let mut scope = ScopeVotes::default();\n+ scope.apply_vote(vote(1, \"a\", \"b\", 2, 1, \"alice\"), \"u1\");\n+ scope.apply_vote(vote(2, \"a\", \"b\", 0, 1, \"bob\"), \"u2\");\n+ assert_eq!(edge_weight_sum(&scope), 4.0);\n+ assert_eq!(scope.uuid_votes.len(), 2);\n }\n \n #[test]\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 8dabc93e95c39cbe18d69596dee79683b384ef86..dcb82ff4beeaac8f0820de0e0131ca1f6bd81dcc 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -269,7 +269,7 @@ mod tests {\n use super::{normalize_scope, parse_item_param, AppConfig, AppState};\n use crate::{\n event_log::EventLog, events::Event, path_types::ItemId, projection_apply,\n- projection_store::ProjectionStore, reducer::EntityData,\n+ projection_store::ProjectionStore, ranking::edge_weight_sum, reducer::EntityData,\n };\n \n fn event_record(seq: u64, event: Event) -> crate::events::EventRecord {\n@@ -442,7 +442,7 @@ mod tests {\n assert_eq!(projection_store.last_applied_event_count().unwrap(), 1);\n let first = projection_store.scope_tree(&ItemId::root()).unwrap();\n let first_root = first.get(&ItemId::root()).unwrap();\n- let first_edge_total: f64 = first_root.local_ranking.edges.values().sum();\n+ let first_edge_total = edge_weight_sum(&first_root.votes);\n assert_eq!(first_edge_total, 3.0);\n \n super::catch_up_projection(&log, &projection_store)\n@@ -451,7 +451,7 @@ mod tests {\n assert_eq!(projection_store.last_applied_event_count().unwrap(), 1);\n let second = projection_store.scope_tree(&ItemId::root()).unwrap();\n let second_root = second.get(&ItemId::root()).unwrap();\n- let second_edge_total: f64 = second_root.local_ranking.edges.values().sum();\n+ let second_edge_total = edge_weight_sum(&second_root.votes);\n assert_eq!(second_edge_total, first_edge_total);\n }\n \n@@ -529,9 +529,8 @@ mod tests {\n let root = projected.get(&ItemId::root()).unwrap();\n assert!(root.children.contains(&ItemId::parse(\"alpha\").unwrap()));\n assert!(root.children.contains(&ItemId::parse(\"beta\").unwrap()));\n- assert_eq!(root.local_ranking.idx_to_item.len(), 2);\n- let edge_total: f64 = root.local_ranking.edges.values().sum();\n- assert_eq!(edge_total, 3.0);\n+ assert_eq!(crate::ranking::ranked_items(&root.votes).len(), 2);\n+ assert_eq!(edge_weight_sum(&root.votes), 3.0);\n }\n \n #[tokio::test]\n@@ -620,7 +619,7 @@ mod tests {\n let root = tree.get(&ItemId::root()).unwrap();\n assert!(root.children.contains(&ItemId::parse(\"beta\").unwrap()));\n assert!(root.children.contains(&ItemId::parse(\"gamma\").unwrap()));\n- assert_eq!(root.local_ranking.idx_to_item.len(), 3);\n+ assert_eq!(crate::ranking::ranked_items(&root.votes).len(), 3);\n }\n \n #[test]\ndiff --git a/server/src/storage_schema.rs b/server/src/storage_schema.rs\nindex 67c9f4ab2e1865f8da81b6735dd2a05b87e5e366..fe2671b876f3df77fdfd402dbc845ff1eb3512cd 100644\n--- a/server/src/storage_schema.rs\n+++ b/server/src/storage_schema.rs\n@@ -3,86 +3,53 @@\n //!\n //! Votes are stored as deduped `uuid_votes` entries plus an append-only\n //! `recent_votes` audit list. Edge weights for rank centrality are derived\n-//! from `uuid_votes` on read, not incrementally merged in RocksDB.\n+//! from `uuid_votes` on read, not stored in RocksDB.\n \n-use std::collections::{HashSet};\n+use std::collections::HashSet;\n \n use durable::{Batch, Db, Durable, Leaf, List, Map};\n \n use crate::{\n path_types::ItemId,\n- reducer::{EntityData, GroupState, NodeState, VoteData},\n+ reducer::{EntityData, NodeState, ScopeVotes, VoteData, UuidVoteKey, uuid_vote_key},\n storage_dto::{\n decode_entity_data, decode_vote, encode_entity_data, encode_vote, parse_stored_id,\n StoredEntityDataV1, StoredVoteV1,\n },\n };\n \n-/// `(actor_uuid, min_item_id, max_item_id)` — one vote slot per human per pair.\n-pub type UuidVoteKey = (String, String, String);\n-\n /// One node in the fractal tree, exploded into precisely-updatable collections.\n #[derive(Durable)]\n #[allow(dead_code)]\n pub struct NodeSchema {\n- /// Presence marker (a node \"exists\" once ensured/voted/imported).\n pub present: Leaf,\n- /// Domain-specific derived view (Reddit title/author/…); absent => None.\n pub data: Leaf,\n- /// Child ids (a set; value is always `true`).\n pub children: Map>,\n- /// Latest vote per actor per unordered pair; edges are derived from this on read.\n pub uuid_votes: Map>,\n- /// Recent votes, append-only oldest-first (cap applied on read).\n pub recent_votes: List>,\n- /// When ephemeral Reddit display content was last fetched (ms); absent after eviction.\n pub fetched_at: Leaf,\n }\n \n-/// The single database root: nodes, identity maps, view counts, and metadata.\n #[derive(Durable)]\n #[allow(dead_code)]\n pub struct Store {\n pub nodes: Map,\n- /// Global pseudonym → actor UUID (Sybil dedup anchor).\n pub pseudonyms: Map>,\n pub proj_meta: Map>,\n pub view_counts: Map>,\n pub view_meta: Map>,\n }\n \n-/// Max recent votes returned when loading a node (query-time cap only).\n pub const RECENT_VOTES_CAP: u64 = 200;\n \n fn id_key(id: &ItemId) -> String {\n id.as_str().to_string()\n }\n \n-fn pair_keys(a: &ItemId, b: &ItemId) -> (String, String) {\n- let ak = id_key(a);\n- let bk = id_key(b);\n- if ak <= bk {\n- (ak, bk)\n- } else {\n- (bk, ak)\n- }\n-}\n-\n-pub fn uuid_vote_key(actor_uuid: &str, a: &ItemId, b: &ItemId) -> UuidVoteKey {\n- let (lo, hi) = pair_keys(a, b);\n- (actor_uuid.to_string(), lo, hi)\n-}\n-\n-/// Path to a node by id.\n pub fn node(id: &ItemId) -> durable::Path {\n Store::root().nodes().key(&id_key(id))\n }\n \n-// ---------------------------------------------------------------------------\n-// Reconstruction (durable -> in-memory)\n-// ---------------------------------------------------------------------------\n-\n-/// Reconstruct a node's in-memory state, or `None` if the node does not exist.\n pub fn load_node_state(db: &Db, id: &ItemId) -> durable::Result> {\n let np = node(id);\n let present = np.present().get(db)?.unwrap_or(false);\n@@ -100,47 +67,39 @@ pub fn load_node_state(db: &Db, id: &ItemId) -> durable::Result) -> durable::Result {\n- let mut group = GroupState::new();\n+fn load_scope_votes(db: &Db, np: &durable::Path) -> durable::Result {\n+ let mut votes = ScopeVotes::default();\n \n for (key, stored) in np.uuid_votes().iter(db)? {\n- let (actor_uuid, _lo, _hi) = key;\n let vote = decode_vote(stored).map_err(durable::Error::Deserialize)?;\n- group.ingest_uuid_vote(vote, &actor_uuid);\n+ votes.uuid_votes.insert(key, vote);\n }\n \n let stored = np.recent_votes().iter(db)?;\n let cap = RECENT_VOTES_CAP as usize;\n let start = stored.len().saturating_sub(cap);\n- group.recent_votes = stored[start..]\n+ votes.recent_votes = stored[start..]\n .iter()\n .map(|s| decode_vote(s.clone()).map_err(durable::Error::Deserialize))\n .collect::, _>>()?;\n \n- Ok(group)\n+ Ok(votes)\n }\n \n fn parse_storage_id(s: &str) -> durable::Result {\n parse_stored_id(s).map_err(durable::Error::Deserialize)\n }\n \n-// ---------------------------------------------------------------------------\n-// Write helpers (event -> reified point updates on a batch)\n-// ---------------------------------------------------------------------------\n-\n-/// Wire a node and its ancestors into the tree exactly like\n-/// [`crate::reducer::GlobalTree::ensure_path`]: set presence and parent→child\n-/// links along the canonical breadcrumb path.\n pub fn ensure_path_writes(batch: &mut Batch, id: &ItemId) {\n let root = ItemId::root();\n batch.write(node(&root).present().set(&true));\n@@ -161,7 +120,6 @@ pub fn ensure_path_writes(batch: &mut Batch, id: &ItemId) {\n }\n }\n \n-/// Reified writes for a validated vote under `parent`.\n pub fn vote_writes(\n batch: &mut Batch,\n parent: &ItemId,\n@@ -182,14 +140,12 @@ pub fn vote_writes(\n Ok(())\n }\n \n-/// Reified writes for ephemeral Reddit display content (not event-logged).\n pub fn entity_content_writes(batch: &mut Batch, id: &ItemId, view: &EntityData, fetched_at: i64) {\n ensure_path_writes(batch, id);\n batch.write(node(id).data().set(&encode_entity_data(view)));\n batch.write(node(id).fetched_at().set(&fetched_at));\n }\n \n-/// Clear cached display content for one node (structure/votes are untouched).\n pub fn entity_content_clear_writes(batch: &mut Batch, id: &ItemId) {\n batch.write(node(id).data().delete());\n batch.write(node(id).fetched_at().delete());\n@@ -199,6 +155,7 @@ pub fn entity_content_clear_writes(batch: &mut Batch, id: &ItemId) {\n mod tests {\n use super::*;\n use crate::identity::{seed_default_pseudonym, DEFAULT_ACTOR_UUID, DEFAULT_PSEUDONYM};\n+ use crate::ranking::edge_weight_sum;\n \n fn sample_vote(ts: i64, a: &str, b: &str, l: i32, r: i32) -> VoteData {\n VoteData {\n@@ -213,7 +170,7 @@ mod tests {\n }\n \n #[test]\n- fn vote_roundtrip_reconstructs_group_state() {\n+ fn vote_roundtrip_reconstructs_ranking() {\n let dir = tempfile::tempdir().unwrap();\n let db = Db::open(dir.path()).unwrap();\n seed_default_pseudonym(&db).unwrap();\n@@ -225,11 +182,8 @@ mod tests {\n batch.commit().unwrap();\n \n let node_state = load_node_state(&db, &parent).unwrap().unwrap();\n- let g = &node_state.local_ranking;\n- assert_eq!(g.idx_to_item.len(), 2);\n- let edge_total: f64 = g.edges.values().sum();\n- assert_eq!(edge_total, 3.0);\n- assert_eq!(g.recent_votes.len(), 1);\n+ assert_eq!(edge_weight_sum(&node_state.votes), 3.0);\n+ assert_eq!(node_state.votes.recent_votes.len(), 1);\n assert!(node_state.children.contains(&ItemId::opaque(\"alpha\")));\n assert!(node_state.children.contains(&ItemId::opaque(\"beta\")));\n }\n@@ -263,10 +217,9 @@ mod tests {\n .unwrap();\n batch.commit().unwrap();\n \n- let g = &load_node_state(&db, &parent).unwrap().unwrap().local_ranking;\n- let edge_total: f64 = g.edges.values().sum();\n- assert_eq!(edge_total, 1.0);\n- assert_eq!(g.uuid_votes.len(), 1);\n+ let votes = &load_node_state(&db, &parent).unwrap().unwrap().votes;\n+ assert_eq!(edge_weight_sum(votes), 1.0);\n+ assert_eq!(votes.uuid_votes.len(), 1);\n }\n \n #[test]\n@@ -293,15 +246,8 @@ mod tests {\n );\n \n let node_state = load_node_state(&db, &parent).unwrap().unwrap();\n- assert_eq!(node_state.local_ranking.recent_votes.len(), RECENT_VOTES_CAP as usize);\n- assert_eq!(\n- node_state\n- .local_ranking\n- .recent_votes\n- .first()\n- .map(|v| v.ts),\n- Some(10)\n- );\n+ assert_eq!(node_state.votes.recent_votes.len(), RECENT_VOTES_CAP as usize);\n+ assert_eq!(node_state.votes.recent_votes.first().map(|v| v.ts), Some(10));\n }\n \n #[test]\ndiff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs\nindex cc7a16d756673b95ba336f2d6130eaf40908cc60..40e4cfe1eec36dad29a075fb01aefb4dffd856d0 100644\n--- a/server/tests/integration_ui.rs\n+++ b/server/tests/integration_ui.rs\n@@ -132,7 +132,7 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() {\n let state = create_app_state(cfg).await;\n let tree = state.scope_tree(&ItemId::root()).unwrap();\n let root = tree.get(&ItemId::root()).expect(\"root node after replay\");\n- let ranked = sorter2_server::ranking::ranked_items(&root.local_ranking);\n+ let ranked = sorter2_server::ranking::ranked_items(&root.votes);\n assert_eq!(ranked.len(), 2);\n assert_eq!(ranked[0].item.as_str(), \"alpha\");\n }\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[b32c92f2] consolidated shared functions in tests (composer 2 fast)\n\nSide B — unified diff (full patch):\ndiff --git a/test/auth.bb b/test/auth.bb\nindex a67cc1de763434176d2f68e419dd37a8cd328395..78cffc875ffe83f512bca253f4a7489227311da4 100644\n--- a/test/auth.bb\n+++ b/test/auth.bb\n@@ -3,113 +3,14 @@\n (:require [babashka.process :as p]\n [babashka.fs :as fs]\n [cheshire.core :as json]\n- [org.httpkit.server :as http]\n- [test.common :as common]))\n+ [clojure.string :as str]\n+ [test.common :as common]\n+ [test.oauth :as oauth]))\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n- (swap! counts update :pass inc)\n- (println (str ansi-green \" ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n- (swap! counts update :fail inc)\n- (println (str ansi-red \" ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n- (if pred\n- (pass msg)\n- (do (fail msg)\n- (throw (ex-info (str \"FAIL: \" msg) {})))))\n-\n-(defn- http-client []\n- (-> (java.net.http.HttpClient/newBuilder)\n- (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n- (.build)))\n-\n-(defn- http-get [url & {:keys [headers]}]\n- (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n- (doseq [[k v] (or headers {})]\n- (.header b k v))\n- (let [req (-> b (.GET) (.build))\n- resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n- {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- http-post-json [url data & {:keys [headers]}]\n- (let [body (json/generate-string data)\n- b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n- (.header b \"Content-Type\" \"application/json\")\n- (doseq [[k v] (or headers {})]\n- (.header b k v))\n- (let [req (-> b\n- (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n- (.build))\n- resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n- {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- http-post-form [url form]\n- (let [pairs (->> form\n- (map (fn [[k v]]\n- (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n- \"=\"\n- (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n- (clojure.string/join \"&\"))\n- b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n- (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n- (let [req (-> b\n- (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n- (.build))\n- resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n- {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- parse-query [s]\n- (into {}\n- (for [part (clojure.string/split (or s \"\") #\"&\")\n- :when (not (clojure.string/blank? part))]\n- (let [[k v] (clojure.string/split part #\"=\" 2)]\n- [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n- (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n-\n-(defn- b64url [s]\n- (-> (java.util.Base64/getUrlEncoder)\n- (.withoutPadding)\n- (.encodeToString (.getBytes s \"UTF-8\"))))\n-\n-(defn- make-id-token [sub]\n- (str (b64url \"{\\\"alg\\\":\\\"RS256\\\",\\\"typ\\\":\\\"JWT\\\"}\")\n- \".\"\n- (b64url (json/generate-string {:sub sub}))\n- \".fakesig\"))\n-\n-(defn- start-mock-google [port]\n- (let [google-users [\"google-user-1\" \"google-user-2\"]\n- !call-count (atom 0)\n- handler\n- (fn [req]\n- (cond\n- (and (= :get (:request-method req))\n- (= \"/o/oauth2/v2/auth\" (:uri req)))\n- (let [q (parse-query (:query-string req))\n- redirect-uri (:redirect_uri q)\n- state (:state q)\n- loc (str redirect-uri \"?code=mockcode&state=\" state)]\n- {:status 302 :headers {\"Location\" loc} :body \"\"})\n-\n- (and (= :post (:request-method req))\n- (= \"/token\" (:uri req)))\n- (let [n (swap! !call-count inc)\n- sub (nth google-users (mod (dec n) (count google-users)))]\n- {:status 200\n- :headers {\"Content-Type\" \"application/json\"}\n- :body (json/generate-string {:id_token (make-id-token sub)})})\n-\n- :else\n- {:status 404 :body \"not found\"}))\n- stop-fn (http/run-server handler {:port port})]\n- {:stop-fn stop-fn :port port}))\n+ (common/test-assert! counts pred msg))\n \n (defn auth-test [& _args]\n (println \"\\n━━━ auth v3 integration check ━━━\\n\")\n@@ -117,8 +18,7 @@\n \n (println \"building server + CLI binaries…\")\n (common/letlocals\n- (bind build @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\" \"-p\" \"slugsocial\"]\n- {:inherit true :env common/base-env}))\n+ (bind build (common/run-cargo-build-release! [\"slugsocial-server\" \"slugsocial\"]))\n (assert! (zero? (:exit build)) \"cargo build succeeds\")\n (bind server-bin \"target/release/slugsocial-server\")\n (bind cli-bin \"target/release/slugsocial\")\n@@ -134,19 +34,10 @@\n (bind !server (atom nil))\n (bind !google (atom nil))\n \n- (bind server-env (merge common/base-env\n- {\"SLUG_DATA_DIR\" tmp-dir\n- \"SLUG_KEYS\" \"test:test\"\n- \"PORT\" (str slug-port)\n- \"RUST_LOG\" \"warn\"\n- \"SLUG_PUBLIC_URL\" base-url\n- \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n- \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n- \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n- \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+ (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n (try\n (println (str \"\\nstarting mock google on :\" google-port))\n- (reset! !google (start-mock-google google-port))\n+ (reset! !google (oauth/start-mock-google google-port :google-users [\"google-user-1\" \"google-user-2\"]))\n (assert! (some? (:stop-fn @!google)) \"mock google started\")\n \n (println (str \"starting server on :\" slug-port))\n@@ -154,34 +45,33 @@\n (assert! (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n \n (println \"\\nstarting pending session…\")\n- (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n- {:agent \"00000000-0000-0000-0000-000000000000:bb:local/dev\"})\n+ (let [start-resp (oauth/http-post-json (str base-url \"/api/v0/pending-session\")\n+ {:agent \"00000000-0000-0000-0000-000000000000:bb:local/dev\"})\n _ (assert! (= 200 (:status start-resp)) \"pending-session start returns 200\")\n start-json (json/parse-string (:body start-resp) true)]\n- (assert! (clojure.string/starts-with? (:session start-json) \"p_\") \"session id has p_ prefix\")\n- (assert! (clojure.string/includes? (:login_url start-json) \"/auth/login\") \"login_url provided\")\n+ (assert! (str/starts-with? (:session start-json) \"p_\") \"session id has p_ prefix\")\n+ (assert! (str/includes? (:login_url start-json) \"/auth/login\") \"login_url provided\")\n \n (println \"\\nsimulating browser oauth redirects…\")\n- ;; This will follow redirects: /auth/login -> mock google -> /auth/callback -> /auth/choose-username\n- (let [login-get (http-get (:login_url start-json))]\n+ (let [login-get (oauth/http-get (:login_url start-json))]\n (assert! (= 200 (:status login-get)) \"choose-username page reachable after oauth callback\"))\n \n (println \"\\nchoosing username…\")\n- (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n- {:session (:session start-json) :username \"bbuser\"})]\n+ (let [choose (oauth/http-post-form (str base-url \"/auth/choose-username\")\n+ {:session (:session start-json) :username \"bbuser\"})]\n (assert! (= 200 (:status choose)) \"choose-username POST returns 200\"))\n \n (println \"\\npolling pending session…\")\n- (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n+ (let [poll (oauth/http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n (assert! (= 200 (:status poll)) \"pending-session poll returns 200\")\n (let [poll-json (json/parse-string (:body poll) true)]\n (assert! (:complete poll-json) \"pending session complete=true\")\n (assert! (= \"bbuser\" (:user poll-json)) \"poll returns stored username bbuser\")\n- (assert! (clojure.string/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n+ (assert! (str/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n \n (println \"\\nwhoami…\")\n- (let [who (http-get (str base-url \"/api/v0/whoami\")\n- :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n+ (let [who (oauth/http-get (str base-url \"/api/v0/whoami\")\n+ :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n (assert! (= 200 (:status who)) \"whoami returns 200\")\n (let [who-json (json/parse-string (:body who) true)]\n (assert! (= \"bbuser\" (:user who-json)) \"whoami user is bbuser (stored form)\"))))))\n@@ -195,11 +85,11 @@\n (str \"identity start exits 0 (stderr: \" (:err start-proc) \")\"))\n (let [start-cli (json/parse-string (:out start-proc) true)]\n (assert! (= \"present_oauth_url_to_user\" (:phase start-cli)) \"identity start --json phase\")\n- (assert! (clojure.string/starts-with? (:session start-cli) \"p_\") \"CLI start session id\")\n- (let [login-get (http-get (:login_url start-cli))]\n+ (assert! (str/starts-with? (:session start-cli) \"p_\") \"CLI start session id\")\n+ (let [login-get (oauth/http-get (:login_url start-cli))]\n (assert! (= 200 (:status login-get)) \"CLI login_url redirect chain succeeds\"))\n- (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n- {:session (:session start-cli) :username \"cliuser\"})]\n+ (let [choose (oauth/http-post-form (str base-url \"/auth/choose-username\")\n+ {:session (:session start-cli) :username \"cliuser\"})]\n (assert! (= 200 (:status choose)) \"choose-username for cliuser\"))\n (let [poll-proc @(p/process [cli-bin \"identity\" \"poll\" (:session start-cli)\n \"--poll-interval-ms\" \"100\" \"--max-wait-secs\" \"30\" \"--json\"]\n@@ -209,10 +99,10 @@\n (let [poll-cli (json/parse-string (:out poll-proc) true)]\n (assert! (= \"complete\" (:phase poll-cli)) \"identity poll --json phase\")\n (assert! (= \"cliuser\" (:user poll-cli)) \"CLI poll user (stored form)\")\n- (assert! (clojure.string/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n+ (assert! (str/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n (let [token-path (str cli-home \"/.config/slugsocial/token\")]\n (assert! (fs/exists? token-path) \"token written under isolated HOME\")\n- (assert! (= (clojure.string/trim (slurp token-path)) (:token poll-cli))\n+ (assert! (= (str/trim (slurp token-path)) (:token poll-cli))\n \"token file matches poll JSON\"))\n (let [who-proc @(p/process [cli-bin \"whoami\" \"--json\"]\n {:out :string :err :string :env cli-env})]\n@@ -227,5 +117,4 @@\n (fs/delete-tree tmp-dir)))\n \n (bind {pass :pass} @counts)\n- (println (str \"\\n\" ansi-green \"━━━ \" pass \" auth checks passed ━━━\" ansi-reset \"\\n\"))))\n-\n+ (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" auth checks passed ━━━\" common/ansi-reset \"\\n\"))))\ndiff --git a/test/common.bb b/test/common.bb\nindex 4ed450377cdbb020f5ff164a812dfbbfc23c0f47..0b855ea5fc6cc513df065a221a28eae6e0848edc 100644\n--- a/test/common.bb\n+++ b/test/common.bb\n@@ -1,6 +1,7 @@\n (ns test.common\n \"Shared utilities for slug test rigs: port allocation, server lifecycle,\n- environment helpers, CLI runner, and the letlocals macro.\"\n+ environment helpers, CLI runner, test harness (ANSI + pass/fail counts),\n+ standard server env for bb suites, and the letlocals macro.\"\n (:require [babashka.process :as p]\n [clojure.string :as str]\n [babashka.fs :as fs]))\n@@ -43,6 +44,42 @@\n env\n (assoc env \"PATH\" (str cargo-home \":\" (get env \"PATH\" \"\")))))))\n \n+;; ---------------------------------------------------------------------------\n+;; test harness (ANSI + counters)\n+;; ---------------------------------------------------------------------------\n+\n+(def ansi-green \"\\033[32m\")\n+(def ansi-red \"\\033[31m\")\n+(def ansi-reset \"\\033[0m\")\n+\n+(defn test-pass! [counts-atom msg]\n+ (swap! counts-atom update :pass inc)\n+ (println (str ansi-green \" ✓ \" ansi-reset msg)))\n+\n+(defn test-fail! [counts-atom msg]\n+ (swap! counts-atom update :fail inc)\n+ (println (str ansi-red \" ✗ \" ansi-reset msg)))\n+\n+(defn test-assert! [counts-atom pred msg]\n+ (if pred\n+ (test-pass! counts-atom msg)\n+ (do (test-fail! counts-atom msg)\n+ (throw (ex-info (str \"FAIL: \" msg) {})))))\n+\n+(defn slug-server-env\n+ \"Env map for `slugsocial-server` in bb integration tests (mock Google URLs, data dir, keys).\"\n+ [tmp-dir base-url google-base-url slug-port]\n+ (merge base-env\n+ {\"SLUG_DATA_DIR\" tmp-dir\n+ \"SLUG_KEYS\" \"test:test\"\n+ \"PORT\" (str slug-port)\n+ \"RUST_LOG\" \"warn\"\n+ \"SLUG_PUBLIC_URL\" base-url\n+ \"SLUG_GOOGLE_AUTH_URL\" (str google-base-url \"/o/oauth2/v2/auth\")\n+ \"SLUG_GOOGLE_TOKEN_URL\" (str google-base-url \"/token\")\n+ \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n+ \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+\n (defn cargo-bin\n \"Resolve cargo, preferring ~/.cargo/bin if not on PATH.\"\n []\n@@ -50,6 +87,13 @@\n (str cargo-home \"/cargo\")\n \"cargo\"))\n \n+(defn run-cargo-build-release!\n+ \"`cargo build --release` for each package name in `packages` (e.g. [\\\"slugsocial-server\\\"]).\"\n+ [packages]\n+ @(p/process (into [(cargo-bin) \"build\" \"--release\"]\n+ (mapcat (fn [p] [\"-p\" p]) packages))\n+ {:inherit true :env base-env}))\n+\n ;; ---------------------------------------------------------------------------\n ;; port / server utilities\n ;; ---------------------------------------------------------------------------\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 793ba216f2de76a77eb20a76d08403db07ff411b..10ef0f08ce1c3945e5f1634314e6aebcf6810cd2 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -7,145 +7,20 @@\n - user with View + Post -> ok=true for prose\n - user with View + Post but no Vote -> ok=false for vote\n - user with View + Post + Vote -> ok=true for vote\"\n- (:require [babashka.process :as p]\n- [babashka.fs :as fs]\n+ (:require [babashka.fs :as fs]\n [cheshire.core :as json]\n- [org.httpkit.server :as http]\n- [test.common :as common]))\n+ [test.common :as common]\n+ [test.oauth :as oauth]))\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n- (swap! counts update :pass inc)\n- (println (str ansi-green \" ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n- (swap! counts update :fail inc)\n- (println (str ansi-red \" ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n- (if pred\n- (pass msg)\n- (do (fail msg)\n- (throw (ex-info (str \"FAIL: \" msg) {})))))\n-\n-(defn- http-client []\n- (-> (java.net.http.HttpClient/newBuilder)\n- (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n- (.connectTimeout (java.time.Duration/ofSeconds 15))\n- (.build)))\n-\n-(defn- http-get [url & {:keys [headers]}]\n- (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n- (doseq [[k v] (or headers {})]\n- (.header b k v))\n- (let [req (-> b (.timeout (java.time.Duration/ofSeconds 60)) (.GET) (.build))\n- resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n- {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- http-post-json [url data & {:keys [headers]}]\n- (let [body (json/generate-string data)\n- b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n- (.header b \"Content-Type\" \"application/json\")\n- (doseq [[k v] (or headers {})]\n- (.header b k v))\n- (let [req (-> b\n- (.timeout (java.time.Duration/ofSeconds 60))\n- (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n- (.build))\n- resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n- {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- http-post-form [url form]\n- (let [pairs (->> form\n- (map (fn [[k v]]\n- (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n- \"=\"\n- (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n- (clojure.string/join \"&\"))\n- b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n- (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n- (let [req (-> b\n- (.timeout (java.time.Duration/ofSeconds 60))\n- (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n- (.build))\n- resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n- {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- parse-query [s]\n- (into {}\n- (for [part (clojure.string/split (or s \"\") #\"&\")\n- :when (not (clojure.string/blank? part))]\n- (let [[k v] (clojure.string/split part #\"=\" 2)]\n- [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n- (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n-\n-(defn- b64url [s]\n- (-> (java.util.Base64/getUrlEncoder)\n- (.withoutPadding)\n- (.encodeToString (.getBytes s \"UTF-8\"))))\n-\n-(defn- make-id-token [sub]\n- (str (b64url \"{\\\"alg\\\":\\\"RS256\\\",\\\"typ\\\":\\\"JWT\\\"}\")\n- \".\"\n- (b64url (json/generate-string {:sub sub}))\n- \".fakesig\"))\n-\n-;; Stateful mock: each /token call returns the next user in the list.\n-;; This lets us register two distinct users in one test run.\n-(defn- start-mock-google [port]\n- (let [google-users [\"google-user-alice\" \"google-user-bob\"]\n- !call-count (atom 0)\n- handler\n- (fn [req]\n- (cond\n- (and (= :get (:request-method req))\n- (= \"/o/oauth2/v2/auth\" (:uri req)))\n- (let [q (parse-query (:query-string req))\n- redirect-uri (:redirect_uri q)\n- state (:state q)\n- loc (str redirect-uri \"?code=mockcode&state=\" state)]\n- {:status 302 :headers {\"Location\" loc} :body \"\"})\n-\n- (and (= :post (:request-method req))\n- (= \"/token\" (:uri req)))\n- (let [n (swap! !call-count inc)\n- sub (nth google-users (mod (dec n) (count google-users)))]\n- {:status 200\n- :headers {\"Content-Type\" \"application/json\"}\n- :body (json/generate-string {:id_token (make-id-token sub)})})\n-\n- :else\n- {:status 404 :body \"not found\"}))\n- stop-fn (http/run-server handler {:port port})]\n- {:stop-fn stop-fn :port port}))\n-\n-(defn- register-user\n- \"Walk the full OAuth flow for one user. Returns the bearer token.\"\n- [base-url session-agent username]\n- (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n- {:agent session-agent})\n- _ (assert! (= 200 (:status start-resp))\n- (str \"pending-session for \" username \" returns 200\"))\n- start-json (json/parse-string (:body start-resp) true)\n- _login (http-get (:login_url start-json))\n- _choose (http-post-form (str base-url \"/auth/choose-username\")\n- {:session (:session start-json) :username username})\n- _ (assert! (= 200 (:status _choose))\n- (str \"choose-username for \" username \" returns 200\"))\n- poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))\n- poll-json (json/parse-string (:body poll) true)\n- _ (assert! (:complete poll-json)\n- (str \"pending session complete for \" username))]\n- (:token poll-json)))\n+ (common/test-assert! counts pred msg))\n \n (defn- bearer [token] {\"Authorization\" (str \"Bearer \" token)})\n \n (defn- rpc-batch! [base-url token cmds]\n- (let [resp (http-post-json (str base-url \"/api/v0/rpc\") cmds :headers (bearer token))]\n+ (let [resp (oauth/http-post-json (str base-url \"/api/v0/rpc\") cmds :headers (bearer token))]\n {:status (:status resp)\n :parsed (json/parse-string (:body resp) false)}))\n \n@@ -160,14 +35,19 @@\n \"text\" text\n \"return_rank_diff\" false}}]))\n \n+(defn- register-user! [base-url session-agent username]\n+ (oauth/complete-registration! base-url\n+ :agent session-agent\n+ :username username\n+ :assert! (fn [pred msg] (assert! pred msg))))\n+\n (defn grants-test [& _args]\n (println \"\\n━━━ grants enforcement integration check ━━━\\n\")\n (reset! counts {:pass 0 :fail 0})\n \n (println \"building server binary…\")\n (common/letlocals\n- (bind build @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\"]\n- {:inherit true :env common/base-env}))\n+ (bind build (common/run-cargo-build-release! [\"slugsocial-server\"]))\n (assert! (zero? (:exit build)) \"cargo build succeeds\")\n (bind server-bin \"target/release/slugsocial-server\")\n \n@@ -180,33 +60,24 @@\n (bind !server (atom nil))\n (bind !google (atom nil))\n \n- (bind server-env (merge common/base-env\n- {\"SLUG_DATA_DIR\" tmp-dir\n- \"SLUG_KEYS\" \"test:test\"\n- \"PORT\" (str slug-port)\n- \"RUST_LOG\" \"warn\"\n- \"SLUG_PUBLIC_URL\" base-url\n- \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n- \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n- \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n- \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+ (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n (try\n (println (str \"starting mock google on :\" google-port))\n- (reset! !google (start-mock-google google-port))\n+ (reset! !google (oauth/start-mock-google google-port\n+ :google-users [\"google-user-alice\" \"google-user-bob\"]))\n \n (println (str \"starting server on :\" slug-port))\n (reset! !server (common/start-server server-bin server-env))\n (assert! (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n \n- ;; Register two users. The mock google cycles through google-user-alice then google-user-bob.\n (println \"\\nregistering alice…\")\n- (let [alice-token (register-user base-url\n- \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n- \"alice\")\n+ (let [alice-token (register-user! base-url\n+ \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n+ \"alice\")\n _ (println \"registering bob…\")\n- bob-token (register-user base-url\n- \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n- \"bob\")\n+ bob-token (register-user! base-url\n+ \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n+ \"bob\")\n \n ;; Alice creates a private room.\n _ (println \"\\nalice creates private room…\")\n@@ -288,6 +159,6 @@\n \n (bind {pass :pass fail :fail} @counts)\n (if (zero? fail)\n- (println (str \"\\n\" ansi-green \"━━━ \" pass \" grant checks passed ━━━\" ansi-reset \"\\n\"))\n- (do (println (str \"\\n\" ansi-red \"━━━ \" fail \" grant checks FAILED ━━━\" ansi-reset \"\\n\"))\n+ (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" grant checks passed ━━━\" common/ansi-reset \"\\n\"))\n+ (do (println (str \"\\n\" common/ansi-red \"━━━ \" fail \" grant checks FAILED ━━━\" common/ansi-reset \"\\n\"))\n (System/exit 1)))))\ndiff --git a/test/integration.bb b/test/integration.bb\nindex 07c9851e5e112f644556a847302d00b5e0f6acb4..c9af7afb3942ffb509a7d053b903c36cdbf1691b 100644\n--- a/test/integration.bb\n+++ b/test/integration.bb\n@@ -2,8 +2,7 @@\n \"End-to-end integration check: DSL → CLI → HTTP → JSONL → materialized view → CLI query.\n Boots a server, ingests via CLI, queries back, kills server, restarts from\n the same JSONL, and queries again to prove replay determinism.\"\n- (:require [babashka.process :as p]\n- [clojure.string :as str]\n+ (:require [clojure.string :as str]\n [babashka.fs :as fs]\n [cheshire.core :as json]\n [test.common :as common]\n@@ -13,25 +12,10 @@\n ;; helpers\n ;; ---------------------------------------------------------------------------\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n-\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n- (swap! counts update :pass inc)\n- (println (str ansi-green \" ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n- (swap! counts update :fail inc)\n- (println (str ansi-red \" ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n- (if pred\n- (pass msg)\n- (do (fail msg)\n- (throw (ex-info (str \"FAIL: \" msg) {})))))\n+ (common/test-assert! counts pred msg))\n \n ;; ---------------------------------------------------------------------------\n ;; letlocals unit tests\n@@ -102,8 +86,7 @@\n (println \"\\nbuilding binaries…\")\n (common/letlocals\n ;; 1. build\n- (bind build @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\" \"-p\" \"slugsocial\"]\n- {:inherit true :env common/base-env}))\n+ (bind build (common/run-cargo-build-release! [\"slugsocial-server\" \"slugsocial\"]))\n (assert! (zero? (:exit build)) \"cargo build succeeds\")\n \n (bind server-bin \"target/release/slugsocial-server\")\n@@ -120,16 +103,7 @@\n (bind !server (atom nil))\n (bind !server2 (atom nil))\n (bind !google (atom nil))\n- (bind server-env (merge common/base-env\n- {\"SLUG_DATA_DIR\" tmp-dir\n- \"SLUG_KEYS\" \"test:test\"\n- \"PORT\" (str port)\n- \"RUST_LOG\" \"warn\"\n- \"SLUG_PUBLIC_URL\" base-url\n- \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n- \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n- \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n- \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+ (bind server-env (common/slug-server-env tmp-dir base-url google-url port))\n \n (try\n (common/letlocals\n@@ -291,4 +265,4 @@\n (fs/delete-tree tmp-dir)))\n \n (bind {pass :pass} @counts)\n- (println (str \"\\n\" ansi-green \"━━━ \" pass \" checks passed ━━━\" ansi-reset \"\\n\"))))\n+ (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" checks passed ━━━\" common/ansi-reset \"\\n\"))))\ndiff --git a/test/oauth.bb b/test/oauth.bb\nindex 84679e1a4adbe100dfe7e7d64a2c6270b023d275..b69459acd17c23c023170d8dd93fe45bb49c8d88 100644\n--- a/test/oauth.bb\n+++ b/test/oauth.bb\n@@ -1,18 +1,23 @@\n (ns test.oauth\n \"Shared Babashka HTTP helpers + mock Google OAuth + token handoff for integration tests.\"\n (:require [cheshire.core :as json]\n+ [clojure.string :as str]\n [org.httpkit.server :as http]))\n \n+(def ^:private connect-timeout (java.time.Duration/ofSeconds 15))\n+(def ^:private request-timeout (java.time.Duration/ofSeconds 60))\n+\n (defn http-client []\n (-> (java.net.http.HttpClient/newBuilder)\n (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n+ (.connectTimeout connect-timeout)\n (.build)))\n \n (defn http-get [url & {:keys [headers]}]\n (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n (doseq [[k v] (or headers {})]\n (.header b k v))\n- (let [req (-> b (.GET) (.build))\n+ (let [req (-> b (.timeout request-timeout) (.GET) (.build))\n resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n \n@@ -23,6 +28,7 @@\n (doseq [[k v] (or headers {})]\n (.header b k v))\n (let [req (-> b\n+ (.timeout request-timeout)\n (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n (.build))\n resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -34,10 +40,11 @@\n (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n \"=\"\n (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n- (clojure.string/join \"&\"))\n+ (str/join \"&\"))\n b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n (let [req (-> b\n+ (.timeout request-timeout)\n (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n (.build))\n resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -45,9 +52,9 @@\n \n (defn parse-query [s]\n (into {}\n- (for [part (clojure.string/split (or s \"\") #\"&\")\n- :when (not (clojure.string/blank? part))]\n- (let [[k v] (clojure.string/split part #\"=\" 2)]\n+ (for [part (str/split (or s \"\") #\"&\")\n+ :when (not (str/blank? part))]\n+ (let [[k v] (str/split part #\"=\" 2)]\n [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n \n@@ -62,8 +69,14 @@\n (b64url (json/generate-string {:sub sub}))\n \".fakesig\"))\n \n-(defn start-mock-google [port]\n- (let [handler\n+(defn start-mock-google\n+ \"Minimal Google OAuth stub. With multiple `google-users`, each `/token` call returns the next\n+ `sub` in order (wraps), so several registrations get distinct Google identities.\"\n+ [port & {:keys [google-users] :or {google-users [\"google-user-1\"]}}]\n+ (let [users (vec google-users)\n+ multi? (> (count users) 1)\n+ !call-count (when multi? (atom 0))\n+ handler\n (fn [req]\n (cond\n (and (= :get (:request-method req))\n@@ -76,9 +89,13 @@\n \n (and (= :post (:request-method req))\n (= \"/token\" (:uri req)))\n- {:status 200\n- :headers {\"Content-Type\" \"application/json\"}\n- :body (json/generate-string {:id_token (make-id-token \"google-user-1\")})}\n+ (let [sub (if multi?\n+ (let [n (swap! !call-count inc)]\n+ (nth users (mod (dec n) (count users))))\n+ (first users))]\n+ {:status 200\n+ :headers {\"Content-Type\" \"application/json\"}\n+ :body (json/generate-string {:id_token (make-id-token sub)})})\n \n :else\n {:status 404 :body \"not found\"}))\n@@ -87,28 +104,46 @@\n \n (def ^:private default-agent \"00000000-0000-0000-0000-000000000000:cli:local/dev\")\n \n+(defn complete-registration!\n+ \"Run pending-session → login redirect → choose-username → poll; return bearer token string.\n+ With `assert!`, use `(fn [pred msg] …)` for test-style checks; without it, throw `ex-info` on failure.\"\n+ [base-url & {:keys [username agent assert!]\n+ :or {username \"user\" agent default-agent}}]\n+ (let [check! (fn [pred msg resp]\n+ (if assert!\n+ (assert! pred msg)\n+ (when-not pred\n+ (throw (ex-info msg {:resp resp})))))]\n+ (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n+ {:agent agent})]\n+ (check! (= 200 (:status start-resp))\n+ (str \"pending-session for \" username \" returns 200\")\n+ start-resp)\n+ (let [start-json (json/parse-string (:body start-resp) true)\n+ login-get (http-get (:login_url start-json))]\n+ (check! (= 200 (:status login-get))\n+ (str \"login redirect chain for \" username)\n+ login-get)\n+ (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n+ {:session (:session start-json) :username username})]\n+ (check! (= 200 (:status choose))\n+ (str \"choose-username for \" username \" returns 200\")\n+ choose)\n+ (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n+ (check! (= 200 (:status poll))\n+ (str \"pending-session poll for \" username \" returns 200\")\n+ poll)\n+ (let [poll-json (json/parse-string (:body poll) true)]\n+ (check! (:complete poll-json)\n+ (str \"pending session complete for \" username)\n+ poll)\n+ (:token poll-json))))))))\n+\n (defn fetch-bearer-token!\n \"Simulate browser OAuth + username choice; returns `slug_…` bearer token.\n Ingest `--delegate` must match this agent string for `AgentBound` on first write.\"\n [base-url & {:keys [username agent] :or {username \"intuser\" agent default-agent}}]\n- (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n- {:agent agent})]\n- (when-not (= 200 (:status start-resp))\n- (throw (ex-info \"pending-session start failed\" {:resp start-resp})))\n- (let [start-json (json/parse-string (:body start-resp) true)\n- login-get (http-get (:login_url start-json))]\n- (when-not (= 200 (:status login-get))\n- (throw (ex-info \"login redirect chain failed\" {:resp login-get})))\n- (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n- {:session (:session start-json) :username username})]\n- (when-not (= 200 (:status choose))\n- (throw (ex-info \"choose-username failed\" {:resp choose})))\n- (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n- (when-not (= 200 (:status poll))\n- (throw (ex-info \"pending-session poll failed\" {:resp poll})))\n- (let [poll-json (json/parse-string (:body poll) true)]\n- (when-not (:complete poll-json)\n- (throw (ex-info \"pending session not complete\" {:poll poll-json})))\n- (when-not (clojure.string/starts-with? (:token poll-json) \"slug_\")\n- (throw (ex-info \"bad token in poll response\" {:poll poll-json})))\n- (:token poll-json)))))))\n+ (let [token (complete-registration! base-url :username username :agent agent)]\n+ (when-not (str/starts-with? token \"slug_\")\n+ (throw (ex-info \"bad token in poll response\" {:token token})))\n+ token))\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}