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: [b9476669] Remove browser sentinel delegates so multi-user votes work. Shared WEB_BROWSER_AGENT bound on first vote and blocked every later human; browser posts now use no delegate, matching forum UI. Co-authored-by: Cursor Side A — unified diff (full patch): diff --git a/cli/src/main.rs b/cli/src/main.rs index c4f1494df3aedbd8b883aea6249579aa8336abfe..af3e4fee876910a44f6f872b24821bc541a23e20 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -1741,8 +1741,8 @@ async fn run() -> Result<()> { tokio::time::sleep(std::time::Duration::from_millis(poll_interval_ms)).await; let poll: PendingSessionPollResponse = expect_json(client.get(&poll_url).send().await?).await?; - if !poll.agent.trim().is_empty() { - agent_out = Some(poll.agent.clone()); + if let Some(a) = poll.agent.as_deref().map(str::trim).filter(|s| !s.is_empty()) { + agent_out = Some(a.to_string()); } if poll.complete { token_out = poll.token; diff --git a/server/src/api/auth.rs b/server/src/api/auth.rs index 50dc6af908412b16343829eae25154ebf4e19fca..01c02f50c19bcd62c7f1717f9b927f203c3164d0 100644 --- a/server/src/api/auth.rs +++ b/server/src/api/auth.rs @@ -29,18 +29,6 @@ use crate::{ write_cmd::WriteCmd, }; -/// Delegate id for browser users who land via `/join/inv_…` (no CLI agent). -const INVITE_BROWSER_AGENT: &str = "00000000-0000-0000-0000-000000000000:invite:web/join"; - -/// Agent id for `/login` browser OAuth (no CLI); must pass [`parse_agent`]. -pub const WEB_BROWSER_AGENT: &str = "00000000-0000-0000-0000-000000000001:social:web/browser"; - -/// True for well-known browser / human-form sentinel delegates (not real AI agents). -/// HTML attribution should show the human username for these, not `@@uuid:rig:…`. -pub fn is_browser_sentinel_delegate(agent: &str) -> bool { - agent == WEB_BROWSER_AGENT || agent == INVITE_BROWSER_AGENT -} - /// HttpOnly cookie storing the same `slug_*` bearer string the CLI uses. pub const SLUG_SESSION_COOKIE: &str = "slug_session"; @@ -288,7 +276,7 @@ pub async fn get_join_invite( let session = format!("p_{}", uuid::Uuid::new_v4().simple()); let redirect_next = safe_local_redirect(q.next.as_deref().or(q.redirect.as_deref())); let s = PendingSession { - agent: INVITE_BROWSER_AGENT.to_string(), + agent: None, created_ts: now_ms(), provider: None, provider_id: None, @@ -555,7 +543,7 @@ pub async fn post_choose_username( }; let sessions = pending_sessions(&state); - let (provider, provider_id, agent) = { + let (provider, provider_id) = { let sessions_read = sessions.read().await; let Some(s) = sessions_read.get(&form.session) else { return api_error(StatusCode::NOT_FOUND, "unknown session", None).into_response(); @@ -566,14 +554,9 @@ pub async fn post_choose_username( let Some(provider_id) = s.provider_id.clone() else { return js_form_error_fragment(&form.session, "oauth not completed").into_response(); }; - (provider, provider_id, s.agent.clone()) + (provider, provider_id) }; - if let Err(msg) = parse_agent(&agent) { - return js_form_error_fragment(&form.session, &format!("invalid agent format — {msg}")) - .into_response(); - } - let redeem_invite = { let sessions_read = sessions.read().await; sessions_read @@ -643,7 +626,8 @@ pub async fn get_web_login( let redirect_next = safe_local_redirect(q.next.as_deref().or(q.redirect.as_deref())) .or_else(|| Some("/".to_string())); let s = PendingSession { - agent: WEB_BROWSER_AGENT.to_string(), + // Humans sign in via the website with no AI delegate. + agent: None, created_ts: now_ms(), provider: None, provider_id: None, @@ -704,7 +688,7 @@ pub async fn post_pending_session( ); let poll_url = format!("/api/v0/pending-session/{session}"); let s = PendingSession { - agent: agent_naked, + agent: Some(agent_naked), created_ts: now_ms(), provider: None, provider_id: None, diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs index fdff6db0472b36cd7870a4be68574023e0daf120..920e967b47852ea82fa61b84c457ae3582dd9800 100644 --- a/server/src/api/mod.rs +++ b/server/src/api/mod.rs @@ -18,13 +18,11 @@ pub use auth::{ get_choose_username, get_web_login, get_logout, - is_browser_sentinel_delegate, optional_principal, resolve_web_session, session_cookie_header_value, WebSession, SLUG_SESSION_COOKIE, - WEB_BROWSER_AGENT, }; pub use helpers::{ diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index 611956d0a46062b49ce350be176e4be139312ff0..6e56c039a184953cd1d0593c34cf4d5abe41f2a3 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -277,7 +277,7 @@ async fn dispatch_ui_action( &session.bearer, room.clone(), thread_tag.clone(), - Some(crate::api::auth::WEB_BROWSER_AGENT.to_string()), + None, text, ) .await diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 645d54f2e117ba901e02ed958ada6ff69a78ae34..03ad762e88709c77b9d5dd130c48bc96226616a1 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -560,27 +560,28 @@ fn identity_color_css(seed: &str) -> String { format!("hsl({hue}, 62%, 66%)") } -/// Seed for author color: real AI → delegate uuid; human/sentinel → principal username. +/// Seed for author color: AI → delegate uuid; human (no delegate) → principal username. fn authorship_color_seed<'a>(principal: &'a str, delegate: &'a Option) -> &'a str { match delegate { - Some(d) if !crate::api::is_browser_sentinel_delegate(d) => { - d.split(':').next().filter(|s| !s.is_empty()).unwrap_or(d.as_str()) - } - _ => principal, + Some(d) => d + .split(':') + .next() + .filter(|s| !s.is_empty()) + .unwrap_or(d.as_str()), + None => principal, } } -/// Prefer the AI delegate in attribution; fall back to the human username when there is no -/// delegate or the delegate is a browser/human-form sentinel. +/// Prefer the AI delegate in attribution; humans post with no delegate and show `@username`. pub(crate) fn authorship_attr(principal: &str, delegate: &Option) -> AuthorshipAttr { let color = identity_color_css(authorship_color_seed(principal, delegate)); match delegate { - Some(d) if !crate::api::is_browser_sentinel_delegate(d) => AuthorshipAttr { + Some(d) => AuthorshipAttr { label: format!("@@{}", actor_label(d)), author_title: Some(format!("@{principal}")), color, }, - _ => AuthorshipAttr { + None => AuthorshipAttr { label: format!("@{principal}"), author_title: None, color, @@ -933,7 +934,6 @@ pub(super) fn recency_class(now_ms: i64, ts_ms: i64) -> &'static str { #[cfg(test)] mod authorship_tests { use super::*; - use crate::api::WEB_BROWSER_AGENT; #[test] fn human_or_missing_delegate_shows_username() { @@ -943,15 +943,6 @@ mod authorship_tests { assert!(a.color.starts_with("hsl(")); } - #[test] - fn browser_sentinel_delegate_shows_username() { - let d = Some(WEB_BROWSER_AGENT.to_string()); - let a = authorship_attr("alice", &d); - assert_eq!(a.label, "@alice"); - assert_eq!(a.author_title, None); - assert_eq!(authorship_address("alice", &d), "@alice"); - } - #[test] fn real_ai_delegate_shows_short_agent_with_username_hover() { let d = Some( diff --git a/server/src/state.rs b/server/src/state.rs index 648ab5304764a329fcabbbbcd3782b94e3e005a8..8ea84dcf9b1df8f8037e913cdd94e5908e6d5d55 100644 --- a/server/src/state.rs +++ b/server/src/state.rs @@ -21,7 +21,8 @@ pub struct InviteState { #[derive(Debug, Clone)] pub struct PendingSession { - pub agent: String, + /// CLI `identity start` delegate (`uuid:rig:model`). `None` for browser `/login` and `/join`. + pub agent: Option, pub created_ts: i64, pub provider: Option, pub provider_id: Option, diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index 6b1475b773106a2dd3f326475c9fb4cc727f6b4b..714563a8b330e3917d95a54ae29b4de143e3b8a4 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -418,6 +418,99 @@ async fn test_web_login_carries_vote_pair_next_into_pending_session() { let sessions = state.pending_sessions.read().await; let pending = sessions.get(&session).expect("pending session"); assert_eq!(pending.redirect_next.as_deref(), Some(next)); + assert_eq!( + pending.agent, None, + "browser /login must not invent a sentinel delegate" + ); +} + +#[tokio::test] +async fn test_vote_compare_two_users_both_succeed_without_delegate() { + let (addr, _tmp, _log, state, _handle) = create_test_server_with_state().await; + let client = reqwest::Client::new(); + let alice = test_bearer(); + let bob = seed_test_identity(&state, "bob", "bobtok", "bobsecret").await; + + // Define items first (votes require existing item bodies). + let seed = ui_post_ingest_rpc( + "public", + "multi-vote", + "~/multi-a {alpha}\n~/multi-b {beta}\n", + ); + let seed_resp = client + .post(format!("http://{addr}/ui")) + .header("Authorization", format!("Bearer {alice}")) + .form(&[("__rpc__", seed.as_str())]) + .send() + .await + .unwrap(); + assert_eq!(seed_resp.status(), reqwest::StatusCode::OK); + let seed_js = seed_resp.text().await.unwrap(); + assert!( + !seed_js.contains("auth-error"), + "item seed must succeed, got: {seed_js}" + ); + + for (bearer, left, right, explanation) in [ + (&alice, "3", "1", "alice prefers a"), + (&bob, "1", "3", "bob prefers b"), + ] { + let rpc = ui_vote_compare_post_rpc( + "public", + "multi-vote", + "~/multi-a", + "~/multi-b", + left, + right, + explanation, + ); + let resp = client + .post(format!("http://{addr}/ui")) + .header("Authorization", format!("Bearer {bearer}")) + .form(&[("__rpc__", rpc.as_str())]) + .send() + .await + .unwrap(); + assert_eq!(resp.status(), reqwest::StatusCode::OK); + let js = resp.text().await.unwrap(); + assert!( + !js.contains("delegate already bound"), + "human vote must not hit shared-sentinel AgentBound ({explanation}), got: {js}" + ); + assert!( + !js.contains("auth-error"), + "human vote must succeed ({explanation}), got: {js}" + ); + assert!( + js.contains("vote-edge-history-region"), + "vote should morph edge history ({explanation}), got: {js}" + ); + } + + let reduced = state.reduced.read().await; + let human_votes: Vec<_> = reduced + .ingests_ordered + .iter() + .filter_map(|id| reduced.ingests_by_id.get(id)) + .filter(|ing| ing.raw.contains("prefers")) + .collect(); + assert_eq!(human_votes.len(), 2, "expected two vote ingests"); + let mut principals: Vec<&str> = human_votes.iter().map(|i| i.principal.as_str()).collect(); + principals.sort(); + assert_eq!(principals, ["bob", "testuser"]); + for ing in &human_votes { + assert!( + ing.delegate.is_none(), + "browser votes must have no delegate, principal={} delegate={:?}", + ing.principal, + ing.delegate + ); + } + assert!( + reduced.agent_bindings.is_empty(), + "human votes must not create AgentBound entries: {:?}", + reduced.agent_bindings + ); } #[tokio::test] diff --git a/server/tests/support/mod.rs b/server/tests/support/mod.rs index a4320e991763617c1a760efad4b621977e2b74d0..67650520ea8f9f144bfe904347c40329d5db37e8 100644 --- a/server/tests/support/mod.rs +++ b/server/tests/support/mod.rs @@ -72,17 +72,14 @@ pub async fn rpc_batch( response.json().await.unwrap() } -pub async fn seed_test_token(state: &AppState) { - seed_test_identity(state, "testuser", "testtok", "secret").await; -} - -/// Add a distinct principal and bearer to a running integration-test server. +/// Seed a user + bearer into reducer state (not appended to the event log). +/// Returns the `slug__` bearer string. pub async fn seed_test_identity( state: &AppState, username: &str, token_id: &str, secret: &str, -) { +) -> String { let registered = Event::UserRegistered(UserRegistered { ts: 0, username: username.to_string(), @@ -102,6 +99,11 @@ pub async fn seed_test_identity( let mut r = state.reduced.write().await; r.apply_event(registered); r.apply_event(ev); + format!("slug_{token_id}_{secret}") +} + +pub async fn seed_test_token(state: &AppState) { + let _ = seed_test_identity(state, "testuser", "testtok", "secret").await; } pub async fn create_test_server_with_state() -> ( diff --git a/test/oauth.clj b/test/oauth.clj index 3cbf496005e906ad6c579d44ac8c4055ee60d063..6911ac34a55707acda9f9ce091c079964649a252 100644 --- a/test/oauth.clj +++ b/test/oauth.clj @@ -186,8 +186,9 @@ (:token poll-json)))))))) (defn fetch-bearer-token! - "Simulate browser OAuth + username choice; returns `slug_…` bearer token. - Ingest `--delegate` must match this agent string for `AgentBound` on first write." + "Simulate CLI identity OAuth + username choice; returns `slug_…` bearer token. + Pass `:agent` (default local/dev) when the test will CLI-ingest with `--delegate` + so first write can `AgentBound`. Browser UI posts use no delegate." [base-url & {:keys [username agent] :or {username "intuser" agent default-agent}}] (let [token (complete-registration! base-url :username username :agent agent)] (when-not (str/starts-with? token "slug_") diff --git a/types/src/lib.rs b/types/src/lib.rs index cd6f94c60a4e1c3bfbce13bc0404b803f5f57c6d..4d05466c19a2f15f7d600e1d4a206b39984fabc4 100644 --- a/types/src/lib.rs +++ b/types/src/lib.rs @@ -538,7 +538,9 @@ pub struct PendingSessionStartResponse { pub struct PendingSessionPollResponse { pub ok: bool, pub complete: bool, - pub agent: String, + /// Present for CLI identity sessions; omitted for browser `/login` / `/join` (no delegate). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub agent: Option, #[serde(skip_serializing_if = "Option::is_none")] pub user: Option, #[serde(skip_serializing_if = "Option::is_none")] Side B — contributor: tommy-mor Side B — commit message: [07715165] nice Side B — unified diff (full patch): diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index c3c62a76f424010d77a6090c84dd0b82098f573e..da2536112faea313352624cf2ce0ddd0ab3377c1 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -6,7 +6,7 @@ use axum::{ use std::collections::HashMap; use crate::{ - html::{demo_counter_panel, js_string_literal, ranking_panel, JsBuilder}, + html::{js_string_literal, ranking_panel, JsBuilder}, parser::parse_reddit_url, parser_render::parser_panel_morph, state::AppState, @@ -35,13 +35,6 @@ pub async fn post_ui_html( }; match action { - HtmlUiAction::BumpDemoCounter => { - let count = state.bump_demo_counter().await; - let panel = demo_counter_panel(count, state.event_log.path().to_string_lossy().as_ref()); - JsBuilder::new() - .morph_selector("#demo-counter-panel", panel) - .into_response() - } HtmlUiAction::RecordVote { a, b, @@ -54,8 +47,8 @@ pub async fn post_ui_html( { return ui_js_warn(&e).into_response(); } - let mut group = state.group.write().await; - let panel = ranking_panel(&mut group); + let group = state.group.read().await; + let panel = ranking_panel(&group); JsBuilder::new() .morph_selector("#ranking-panel", panel) .into_response() @@ -87,20 +80,6 @@ mod tests { assert!(matches!(err, HtmlUiParseError::MissingRpc)); } - #[test] - fn bump_action_deserializes() { - let template = serde_json::json!({ "action": "bump_demo_counter" }); - let mut form = HashMap::new(); - form.insert( - UI_RPC_FIELD.to_string(), - serde_json::to_string(&template).unwrap(), - ); - assert_eq!( - parse_html_ui_from_form(&form).unwrap(), - HtmlUiAction::BumpDemoCounter - ); - } - #[test] fn record_vote_action_deserializes() { let template = serde_json::json!({ diff --git a/server/src/events.rs b/server/src/events.rs index b969242534e184d4f0a689543a479670b08a18df..eff80aef0257f706d2341f666e63d6a3d921bf6e 100644 --- a/server/src/events.rs +++ b/server/src/events.rs @@ -5,8 +5,6 @@ use serde::{Deserialize, Serialize}; pub enum Event { /// Page view recorded (path → counter in views.json). ViewRecorded { path: String, ts: i64 }, - /// Demo counter bump from `POST /ui` (persisted in the single JSONL log). - DemoCounterBumped { ts: i64, value: u64 }, /// Pairwise comparison vote (replayed into [`crate::reducer::GroupState`] on boot). VoteRecorded { ts: i64, diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 5b1d0b5a887d89e7e80796aa7a6c8ed5baaf2782..d69ed962b5c8625bc83c933b1825f2cc1d0868e2 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -13,7 +13,7 @@ use crate::{ form_template::template_json_compact, parser_action::ParserAction, parser_render::parser_panel, - ranking::ranked_items, + ranking::ranked_items_cached, reducer::GroupState, state::AppState, ui_action::UI_RPC_FIELD, @@ -199,10 +199,8 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) } } -pub fn ranking_panel(group: &mut GroupState) -> Markup { - const MAX_ITERS: usize = 10_000; - const TOL: f64 = 1e-8; - let items = ranked_items(group, MAX_ITERS, TOL); +pub fn ranking_panel(group: &GroupState) -> Markup { + let items = ranked_items_cached(group); html! { section id="ranking-panel" class="demo-panel" { h2 { "Ranking" } @@ -260,35 +258,6 @@ pub fn vote_panel() -> Markup { } -pub fn demo_counter_panel(count: u64, event_log_path: &str) -> Markup { - let rpc = template_json_compact(&serde_json::json!({ "action": "bump_demo_counter" })) - .expect("rpc json"); - html! { - section id="demo-counter-panel" class="demo-panel" { - h1 { "sorter2" } - p class="muted" { - "Pairwise ranking scaffold — votes persist to JSONL and replay on boot." - } - p class="demo-count" { - strong { "Counter: " } - span id="demo-count-value" { (count) } - } - p class="muted small" { - "Event log: " code { (event_log_path) } - } - form method="post" action="/ui" id="demo-bump-form" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc); - button type="submit" class="btn-primary" { "Bump (POST /ui → eval JS)" } - } - p class="muted small" { - "Uses hidden " - code { "__rpc__" } - " JSON + Idiomorph morph — no full page reload." - } - } - } -} - pub async fn home( State(state): State, jar: CookieJar, @@ -297,16 +266,15 @@ pub async fn home( let path = uri.path().to_string(); state.views.increment(path.clone()); let views = state.views.get_views(&path); - let count = *state.demo_counter.read().await; let theme = theme_from_jar(&jar); let theme_next = theme_next_from_uri(&uri); - let mut group = state.group.write().await; + let group = state.group.read().await; let empty_action = ParserAction::suggest(String::new(), None); let body = html! { + h1 { "sorter2" } (parser_panel("", &empty_action)) (vote_panel()) - (ranking_panel(&mut group)) - (demo_counter_panel(count, state.event_log.path().to_string_lossy().as_ref())) + (ranking_panel(&group)) }; layout("sorter2", body, views, theme, &theme_next) } diff --git a/server/src/lib.rs b/server/src/lib.rs index 6716c5b282e7980a7a0f03d63ad8b25eda61cc55..fa423640d598f4ba97a5885d228e78d7b97f7a22 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -9,6 +9,7 @@ pub mod parser_render; pub mod path_types; pub mod ranking; pub mod reducer; +pub mod settlement; pub mod state; pub mod ui_action; pub mod views; diff --git a/server/src/ranking.rs b/server/src/ranking.rs index 89d3280126a8d8f841721ce8cb63ff735d68752a..2d706762792ba9239bb3f1c2e4974a2fde908013 100644 --- a/server/src/ranking.rs +++ b/server/src/ranking.rs @@ -91,6 +91,11 @@ pub fn compute_group_ranking(group: &mut GroupState, max_iters: usize, tol: f64) pub fn ranked_items(group: &mut GroupState, max_iters: usize, tol: f64) -> Vec { compute_group_ranking(group, max_iters, tol); + ranked_items_cached(group) +} + +/// Read cached scores without recomputing (HTTP fast path). +pub fn ranked_items_cached(group: &GroupState) -> Vec { let mut items: Vec = group .idx_to_item .iter() @@ -105,7 +110,12 @@ pub fn ranked_items(group: &mut GroupState, max_iters: usize, tol: f64) -> Vec, max_iters: usize, tol: f64) -> Vec { +pub fn compute_scores_from_edges( + n: usize, + edges: impl Iterator, + max_iters: usize, + tol: f64, +) -> Vec { if n == 0 { return vec![]; } diff --git a/server/src/settlement.rs b/server/src/settlement.rs new file mode 100644 index 0000000000000000000000000000000000000000..1f722ceaea62cda22c28ab71551f259fbf049b81 --- /dev/null +++ b/server/src/settlement.rs @@ -0,0 +1,114 @@ +use std::sync::Arc; + +use tokio::sync::{mpsc, oneshot, RwLock}; + +use crate::{ + event_log::EventLog, + events::Event, + ranking::compute_scores_from_edges, + reducer::{GroupState, VoteData}, +}; + +const MAX_ITERS: usize = 10_000; +const TOL: f64 = 1e-8; + +pub struct SettlementCommand { + pub vote: VoteData, + pub event: Event, + pub reply: oneshot::Sender>, +} + +#[derive(Clone)] +pub struct SettlementClient { + tx: mpsc::Sender, +} + +impl SettlementClient { + pub fn spawn(group: Arc>, event_log: Arc) -> Self { + let (tx, rx) = mpsc::channel(64); + tokio::spawn(settlement_worker(rx, group, event_log)); + Self { tx } + } + + pub async fn record_vote(&self, vote: VoteData, event: Event) -> Result<(), String> { + let (reply, rx) = oneshot::channel(); + self.tx + .send(SettlementCommand { + vote, + event, + reply, + }) + .await + .map_err(|_| "settlement worker stopped".to_string())?; + rx.await + .map_err(|_| "settlement worker stopped".to_string())? + } +} + +async fn settlement_worker( + mut rx: mpsc::Receiver, + group: Arc>, + event_log: Arc, +) { + while let Some(first) = rx.recv().await { + let mut batch = vec![first]; + while let Ok(more) = rx.try_recv() { + batch.push(more); + } + + let mut disk_err: Option = None; + for cmd in &batch { + if let Err(e) = event_log.append(&cmd.event).await { + disk_err = Some(e.to_string()); + break; + } + } + + if let Some(err) = disk_err { + for cmd in batch { + let _ = cmd.reply.send(Err(err.clone())); + } + continue; + } + + let (edges, n) = { + let mut w = group.write().await; + for cmd in &batch { + w.apply_vote(cmd.vote.clone()); + } + (w.edges.clone(), w.idx_to_item.len()) + }; + + let new_scores = compute_scores_from_edges( + n, + edges.iter().map(|(&k, &v)| (k, v)), + MAX_ITERS, + TOL, + ); + + { + let mut w = group.write().await; + w.cached_scores = new_scores; + w.dirty = false; + } + + for cmd in batch { + let _ = cmd.reply.send(Ok(())); + } + } +} + +/// Compute ranking cache from current in-memory edges (startup replay only). +pub fn warm_ranking_cache(group: &mut GroupState) { + if !group.dirty { + return; + } + let n = group.idx_to_item.len(); + group.cached_scores = compute_scores_from_edges( + n, + group.edges.iter().map(|(&k, &v)| (k, v)), + MAX_ITERS, + TOL, + ); + group.dirty = false; +} diff --git a/server/src/state.rs b/server/src/state.rs index 8ec9902e2ecc31cf8208f7ad6365891dc5537eed..1922541a4064c2de1df2d993a461cae783320e05 100644 --- a/server/src/state.rs +++ b/server/src/state.rs @@ -6,6 +6,7 @@ use crate::{ event_log::EventLog, events::Event, reducer::{GroupState, VoteData}, + settlement::{warm_ranking_cache, SettlementClient}, views::ViewStore, }; @@ -38,8 +39,8 @@ pub struct AppState { pub cfg: Arc, pub event_log: Arc, pub views: ViewStore, - pub demo_counter: Arc>, pub group: Arc>, + settlement: SettlementClient, } impl AppState { @@ -48,14 +49,10 @@ impl AppState { let views_path = format!("{}/views.json", cfg.data_dir); let views = ViewStore::new(&views_path); - let mut demo_counter: u64 = 0; let mut group = GroupState::new(); if let Ok((events, _)) = event_log.load_all().await { for ev in events { match ev { - Event::DemoCounterBumped { value, .. } => { - demo_counter = demo_counter.max(value); - } Event::VoteRecorded { ts, a, @@ -74,30 +71,20 @@ impl AppState { } } + warm_ranking_cache(&mut group); + + let group = Arc::new(RwLock::new(group)); + let settlement = SettlementClient::spawn(group.clone(), event_log.clone()); + Self { cfg: Arc::new(cfg), event_log, views, - demo_counter: Arc::new(RwLock::new(demo_counter)), - group: Arc::new(RwLock::new(group)), + group, + settlement, } } - pub async fn bump_demo_counter(&self) -> u64 { - let mut guard = self.demo_counter.write().await; - *guard += 1; - let value = *guard; - drop(guard); - - let ts = crate::html::now_ms(); - let _ = self - .event_log - .append(&Event::DemoCounterBumped { ts, value }) - .await; - - value - } - pub async fn record_vote( &self, a: &str, @@ -109,23 +96,14 @@ impl AppState { let vote = VoteData::from_recorded(ts, a, b, ratio_left, ratio_right) .ok_or_else(|| "invalid vote: need two distinct non-empty items".to_string())?; - { - let mut group = self.group.write().await; - group.apply_vote(vote.clone()); - } - - let _ = self - .event_log - .append(&Event::VoteRecorded { - ts, - a: vote.a.as_str().to_string(), - b: vote.b.as_str().to_string(), - ratio_left: vote.ratio_left, - ratio_right: vote.ratio_right, - }) - .await - .map_err(|e| e.to_string())?; + let event = Event::VoteRecorded { + ts, + a: vote.a.as_str().to_string(), + b: vote.b.as_str().to_string(), + ratio_left: vote.ratio_left, + ratio_right: vote.ratio_right, + }; - Ok(()) + self.settlement.record_vote(vote, event).await } } diff --git a/server/src/ui_action.rs b/server/src/ui_action.rs index 1d488e1ad1d8fd81bd9d016d69255adfe9b22fc8..5d94c84113607b3bcd8d31d03ef5b8e1b87b67a7 100644 --- a/server/src/ui_action.rs +++ b/server/src/ui_action.rs @@ -12,8 +12,6 @@ pub const UI_RPC_FIELD: &str = "__rpc__"; #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[serde(tag = "action", rename_all = "snake_case")] pub enum HtmlUiAction { - /// Demo: morph `#demo-counter-panel` after bumping the persisted counter. - BumpDemoCounter, /// Record a pairwise vote and morph `#ranking-panel`. RecordVote { a: String, @@ -52,18 +50,6 @@ pub fn parse_html_ui_from_form( mod tests { use super::*; - #[test] - fn bump_demo_counter_round_trip() { - let template = serde_json::json!({ "action": "bump_demo_counter" }); - let mut form = HashMap::new(); - form.insert( - UI_RPC_FIELD.to_string(), - serde_json::to_string(&template).unwrap(), - ); - let a = parse_html_ui_from_form(&form).unwrap(); - assert_eq!(a, HtmlUiAction::BumpDemoCounter); - } - #[test] fn record_vote_round_trip_with_form_holes() { let template = serde_json::json!({ diff --git a/server/tests/integration_health.rs b/server/tests/integration_health.rs index 8a58bc14aac68c779e7ce4ffa57d27b3220e9953..1d816e008b9bf629967e3b3c786c41afefc284e3 100644 --- a/server/tests/integration_health.rs +++ b/server/tests/integration_health.rs @@ -38,7 +38,7 @@ async fn healthz_ok() { } #[tokio::test] -async fn home_has_demo_panel() { +async fn home_has_main_panels() { let (addr, _tmp) = start_test_server().await; let client = reqwest::Client::new(); let html = client diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index bee79407dec120699a083f1a75adf9291e207fc7..7ede46d681fefbe25b1d98fc33520a185515eb1c 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -25,33 +25,6 @@ async fn start_test_server() -> (SocketAddr, TempDir) { (addr, tmp) } -#[tokio::test] -async fn post_ui_bump_returns_javascript_morph() { - let (addr, tmp) = start_test_server().await; - let rpc = serde_json::json!({ "action": "bump_demo_counter" }).to_string(); - let mut form = HashMap::new(); - form.insert(UI_RPC_FIELD.to_string(), rpc); - - let client = reqwest::Client::new(); - let body = client - .post(format!("http://{addr}/ui")) - .form(&form) - .send() - .await - .unwrap() - .text() - .await - .unwrap(); - - assert!(body.contains("Idiomorph.morph")); - assert!(body.contains("demo-counter-panel")); - assert!(body.contains("Counter:")); - - let log_path = tmp.path().join("events.jsonl"); - let log = std::fs::read_to_string(log_path).unwrap(); - assert!(log.contains("demo_counter_bumped")); -} - #[tokio::test] async fn post_ui_record_vote_morphs_ranking_and_persists() { let (addr, tmp) = start_test_server().await; @@ -90,8 +63,8 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() { port: 0, }; let state = create_app_state(cfg).await; - let mut group = state.group.write().await; - let ranked = sorter2_server::ranking::ranked_items(&mut group, 10_000, 1e-8); + let group = state.group.read().await; + let ranked = sorter2_server::ranking::ranked_items_cached(&group); assert_eq!(ranked.len(), 2); assert_eq!(ranked[0].item.as_str(), "alpha"); } diff --git a/test/smoke.clj b/test/smoke.clj index b332324743b58baf3fe96d7477353749f137feae..11887c48282088e140d823a88ba616f6325835b3 100644 --- a/test/smoke.clj +++ b/test/smoke.clj @@ -26,7 +26,7 @@ false)))))) (deftest http-smoke-against-running-server - (testing "build, start, healthz, home contains RPC demo" + (testing "build, start, healthz, home contains main panels" (let [root (repo-root) data-dir (.getAbsolutePath (doto (io/file (System/getProperty "java.io.tmpdir") (str "sorter2-smoke-" (System/currentTimeMillis)))