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: [36e92cf2] Fix /vote/compare page: attribution, fallback, swap button, and route rename. - Pass WEB_BROWSER_AGENT as delegate_opt out-of-band (not in DSL body text) - Error instead of falling back to all items when sibling pool < 2 - Remove pointless "swap sides" button - Rename route /vote/compare → /vote Co-Authored-By: Claude Sonnet 4.6 Side A — unified diff (full patch): diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs index 0b7070a2b7289e5c40778c8d062bd4150285a8df..8e3d8e34922ddaaa89ea699edd99402bd40fdb1b 100644 --- a/server/src/api/rpc.rs +++ b/server/src/api/rpc.rs @@ -281,6 +281,7 @@ pub async fn rpc_post_with_bearer( bearer_token: &str, room: String, thread_tag: String, + delegate_opt: Option, text: String, ) -> Result { use axum::http::{header, HeaderMap, HeaderValue}; @@ -288,7 +289,7 @@ pub async fn rpc_post_with_bearer( let hv = HeaderValue::from_str(&format!("Bearer {bearer_token}")) .map_err(|_| ("invalid session token".into(), None))?; headers.insert(header::AUTHORIZATION, hv); - rpc_post(state, &headers, room, thread_tag, None, text, false).await + rpc_post(state, &headers, room, thread_tag, delegate_opt, text, false).await } async fn rpc_check( diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index a13a94767d8905adc09e31effff838e166781b6c..5faa642451d69555cb391974beb0ad22c9355c8c 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -118,6 +118,7 @@ async fn dispatch_ui_action( &session.bearer, room.clone(), thread_tag.clone(), + None, text, ) .await @@ -246,8 +247,7 @@ async fn dispatch_ui_action( } let text = format!( - "@{}\n{{\n{}\n}}\n{} {}:{} {}\n", - crate::api::auth::WEB_BROWSER_AGENT, + "{{\n{}\n}}\n{} {}:{} {}\n", exp, left_id.as_str(), rl, @@ -260,6 +260,7 @@ async fn dispatch_ui_action( &session.bearer, room.clone(), thread_tag.clone(), + Some(crate::api::auth::WEB_BROWSER_AGENT.to_string()), text, ) .await diff --git a/server/src/html/forum/nav.rs b/server/src/html/forum/nav.rs index d33dc50f0b89a5ed7730c3bca204a67f6309388f..ae67f550a4bdf0bbeff58384c29a715015b64bd5 100644 --- a/server/src/html/forum/nav.rs +++ b/server/src/html/forum/nav.rs @@ -85,7 +85,7 @@ impl ThreadNav { format!("{}/{}/{}", self.thread_path_prefix, tag, idx) } - /// Empty for public; `/r/:seg` for room — prefix for routes like `/vote/compare`. + /// Empty for public; `/r/:seg` for room — prefix for routes like `/vote`. pub(crate) fn room_path_prefix_for_vote_compare(&self) -> String { match &self.scope { ScopeId::Public => String::new(), diff --git a/server/src/html/garden/vote.rs b/server/src/html/garden/vote.rs index bdb4008c29ba49d7dc97b1cd2c32d9cdfce1ca04..1d7fc8aa7436bfa9c1186dfd940a8d751ab7e088 100644 --- a/server/src/html/garden/vote.rs +++ b/server/src/html/garden/vote.rs @@ -208,7 +208,7 @@ pub(crate) async fn vote_compare_post_success_js( state: &AppState, nav: &ThreadNav, _room_wire: &str, - thread_tag: &str, + _thread_tag: &str, left: &ItemId, right: &ItemId, _post_id: &str, @@ -218,8 +218,7 @@ pub(crate) async fn vote_compare_post_success_js( let content = content_for_garden_view(&reduced, &nav.scope()); let edge_history = vote_edge_history_markup(content, left, right); let next_pair = suggest_next_vote_pair(content, left, right); - let nav_markup = - vote_compare_nav_markup(nav, next_pair.as_ref(), left, right, Some(thread_tag)); + let nav_markup = vote_compare_nav_markup(nav, next_pair.as_ref()); drop(reduced); JsBuilder::new() .morph_inner_selector("#vote-edge-history-region", edge_history) @@ -236,7 +235,7 @@ pub(super) fn vote_compare_href( let left_q = urlencoding::encode(left.as_str()); let right_q = urlencoding::encode(right.as_str()); let base = format!( - "{}/vote/compare?left={}&right={}", + "{}/vote?left={}&right={}", nav.room_path_prefix_for_vote_compare(), left_q, right_q @@ -251,12 +250,8 @@ pub(super) fn vote_compare_href( fn vote_compare_nav_markup( nav: &ThreadNav, next_pair: Option<&(ItemId, ItemId)>, - left: &ItemId, - right: &ItemId, - thread_override: Option<&str>, ) -> maud::Markup { let next_pair_href = next_pair.map(|(nl, nr)| vote_compare_href(nav, nl, nr, None)); - let swap_pair_href = vote_compare_href(nav, right, left, thread_override); html! { div class="vote-compare-nav" { @if let Some(href) = &next_pair_href { @@ -264,7 +259,6 @@ fn vote_compare_nav_markup( } @else { span class="vote-compare-next is-disabled" { "no next pair" } } - a class="vote-compare-next" href=(swap_pair_href) { "swap sides" } } } } @@ -274,7 +268,7 @@ pub(super) fn suggest_next_vote_pair( current_left: &ItemId, current_right: &ItemId, ) -> Option<(ItemId, ItemId)> { - let mut pool: Vec = if current_left.parent().as_ref().map(|p| p.as_str()) + let pool: Vec = if current_left.parent().as_ref().map(|p| p.as_str()) == current_right.parent().as_ref().map(|p| p.as_str()) { current_left @@ -291,7 +285,7 @@ pub(super) fn suggest_next_vote_pair( Vec::new() }; if pool.len() < 2 { - pool = content.items.iter().cloned().collect(); + return None; } suggest_next_pair_in_pool( &content.ranking_group, @@ -334,7 +328,7 @@ pub struct VoteCompareQuery { pub thread: Option, } -/// Public pairwise vote UI — `/vote/compare?left=&right=&thread=`. +/// Public pairwise vote UI — `/vote?left=&right=&thread=`. pub async fn vote_compare_page( State(state): State, Query(q): Query, @@ -426,7 +420,7 @@ async fn vote_compare_inner( let next_path = uri .path_and_query() .map(|pq| pq.as_str().to_string()) - .unwrap_or_else(|| "/vote/compare".into()); + .unwrap_or_else(|| "/vote".into()); let rpc_json = template_json_compact(&json!({ "action": "vote_compare_post", @@ -462,7 +456,7 @@ async fn vote_compare_inner( Some(&item_bodies_for_cards), )) } - (vote_compare_nav_markup(&nav, next_pair.as_ref(), &left, &right, q.thread.as_deref())) + (vote_compare_nav_markup(&nav, next_pair.as_ref())) div id="vote-edge-history-region" { (edge_history) } diff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs index c7b643c8dde37dd1e3001f5ff716fe4f79d24c5e..dd5294202569454acf9f41b458718700bbf96f39 100644 --- a/server/src/html/ui_action.rs +++ b/server/src/html/ui_action.rs @@ -38,7 +38,7 @@ pub enum HtmlUiAction { #[serde(default)] form_id: Option, }, - /// Post a pairwise vote from `/vote/compare` (browser compose). + /// Post a pairwise vote from `/vote` (browser compose). VoteComparePost { room: String, thread_tag: String, diff --git a/server/src/lib.rs b/server/src/lib.rs index ad8e31099c807fb5844acb16cd5086a2f19327a7..e102e73ec167fa35dcc22d4ec8c6f40202982429 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -82,9 +82,9 @@ pub fn create_app(state: AppState) -> Router { .route("/u/:username", get(crate::html::user_profile_page)) .route("/try", get(crate::html::editor_page)) .route("/try/check", post(crate::html::editor_check)) - .route("/vote/compare", get(crate::html::vote_compare_page)) + .route("/vote", get(crate::html::vote_compare_page)) .route( - "/r/:room_key/vote/compare", + "/r/:room_key/vote", get(crate::html::room_vote_compare_page), ) .route("/~", get(crate::html::garden_index)) diff --git a/server/tests/integration_html.rs b/server/tests/integration_html.rs index a25a456c7cafd74a69e65e0c2e8ed2bfb2e27498..b3e31376737b2d5aabb739f408984a1f5ae0c974 100644 --- a/server/tests/integration_html.rs +++ b/server/tests/integration_html.rs @@ -52,12 +52,12 @@ async fn test_view_counts_increment_and_display() { .normalized_storage() .to_storage_string(); let vote_q_right_first = format!( - "/vote/compare?right={}&left={}", + "/vote?right={}&left={}", urlencoding::encode(&right), urlencoding::encode(&left) ); let vote_q_left_first = format!( - "/vote/compare?left={}&right={}", + "/vote?left={}&right={}", urlencoding::encode(&left), urlencoding::encode(&right) ); @@ -148,7 +148,7 @@ https://github.com/ghvotehi/a/issues/10 {\n\ .normalized_storage() .to_storage_string(); let q = format!( - "/vote/compare?left={}&right={}", + "/vote?left={}&right={}", urlencoding::encode(&left), urlencoding::encode(&right) ); diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index 091afd922d28f48ab36aa9b9084aa825036d1f74..23db7b5672418d5bb0ab7529e05ef1f89e59062a 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -110,7 +110,7 @@ async fn test_choose_username_carries_redirect_next() { .expect("pending session must exist"); pending.provider = Some("google".to_string()); pending.provider_id = Some("google-user-redirect".to_string()); - pending.redirect_next = Some("/vote/compare?left=%7E%2Fa&right=%7E%2Fb".to_string()); + pending.redirect_next = Some("/vote?left=%7E%2Fa&right=%7E%2Fb".to_string()); } let choose = client @@ -122,7 +122,7 @@ async fn test_choose_username_carries_redirect_next() { assert_eq!(choose.status(), reqwest::StatusCode::OK); let body = choose.text().await.unwrap(); - assert!(body.contains("window.location = \"/vote/compare?left=%7E%2Fa&right=%7E%2Fb\"")); + assert!(body.contains("window.location = \"/vote?left=%7E%2Fa&right=%7E%2Fb\"")); } #[tokio::test] diff --git a/test/browser_vote_compare.clj b/test/browser_vote_compare.clj index 7cd1e467fdd8a4480df1be2afd78adb45b9cdc6d..a98e144756421e1fa5064db6a9fc0dd8b08471c7 100644 --- a/test/browser_vote_compare.clj +++ b/test/browser_vote_compare.clj @@ -66,7 +66,7 @@ :headers {"Authorization" (str "Bearer " alice-token)}) post-json (json/parse-string (:body post-resp) false) _ (is (true? (get-in post-json ["results" 0 "ok"])) "seed items + edge vote via rpc") - cmp-url (str base-url "/vote/compare?left=" (enc left-url) "&right=" (enc third-url))] + cmp-url (str base-url "/vote?left=" (enc left-url) "&right=" (enc third-url))] (core/with-playwright [pw] (core/with-browser [browser (core/launch-chromium pw {:headless true :channel "chrome"})] (core/with-context [ctx (core/new-context browser)] Side B — contributor: tommy-mor Side B — commit message: [6b6eb0c3] Auth form: poem JS morphs form innerHTML on response; no redirect - post_choose_username returns HTML fragments instead of redirects: success → auth_signed_in_fragment ("you're signed in — return to your agent") error → choose_username_error_fragment (form re-rendered with error inline) - Poem JS now reads response body; if non-empty, morphs form innerHTML with it (existing ingest forms return empty body, so they're unaffected) - auth.rs: keep full layout() with poem JS — revert to single layout - auth-success CSS class added to both themes Co-Authored-By: Claude Sonnet 4.6 (1M context) Side B — unified diff (full patch): diff --git a/server/src/api/auth.rs b/server/src/api/auth.rs index c1194f79fd89fb47fe6b425b494a0ffa667abb2d..cb0faa29b834931e2c2b2f5c174c875e2e2e9346 100644 --- a/server/src/api/auth.rs +++ b/server/src/api/auth.rs @@ -16,7 +16,7 @@ use crate::{ canonicalize_username, validate_agent_format, validate_username, Event, TokenIssued, UserRegistered, }, - html::{auth_complete_page, choose_username_page}, + html::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page}, state::{AppState, PendingSession}, }; @@ -274,8 +274,6 @@ pub async fn post_choose_username( return api_error(StatusCode::BAD_REQUEST, "invalid agent format", Some(msg)).into_response(); } - let public_url = std::env::var("SLUG_PUBLIC_URL").unwrap_or_else(|_| "http://127.0.0.1:8080".to_string()); - let reduced_arc = state.reduced.clone(); let reduced = reduced_arc.read().await; let provider_key = (provider.to_lowercase(), provider_id.clone()); @@ -284,11 +282,7 @@ pub async fn post_choose_username( } if reduced.users_by_provider.values().any(|u| u == &canonicalize_username(&form.username)) { drop(reduced); - return Redirect::to(&format!( - "{public_url}/auth/choose-username?session={}&error={}", - urlencoding::encode(&form.session), - urlencoding::encode("that username is taken — try another"), - )).into_response(); + return choose_username_error_fragment(&form.session, "that username is taken — try another").into_response(); } drop(reduced); @@ -324,7 +318,7 @@ pub async fn post_choose_username( s.complete = Some((canon_user.clone(), bearer.clone())); } - Redirect::to(&format!("{public_url}/auth/complete")).into_response() + auth_signed_in_fragment().into_response() } pub async fn post_pending_session( diff --git a/server/src/html/auth.rs b/server/src/html/auth.rs index 40b1ef30a6c1d4063aa2d8e9c93df8972df4b27c..0a14bdbfb66c65d1bd09993ffd4a7bb6f2fe041e 100644 --- a/server/src/html/auth.rs +++ b/server/src/html/auth.rs @@ -1,20 +1,25 @@ -use maud::{html, Markup, DOCTYPE}; +use maud::{html, Markup}; -/// Minimal layout for auth pages — no JS interceptor, real form navigation works. -fn auth_layout(title: &str, body: Markup) -> Markup { +fn form_inner(session: &str, error: Option<&str>) -> Markup { html! { - (DOCTYPE) - html { - head { - meta charset="utf-8"; - meta name="viewport" content="width=device-width, initial-scale=1"; - title { (title) } - link rel="stylesheet" href="/static/theme_default.css"; - } - body class="view-auth" { - (body) - } + input type="hidden" name="session" value=(session); + label for="username" { "username" } + input + type="text" + id="username" + name="username" + placeholder="e.g. alice" + pattern="[a-z0-9_\\-]{1,32}" + maxlength="32" + autocomplete="off" + autofocus; + p.auth-hint { + "lowercase · alphanumeric · hyphens · underscores · max 32" } + @if let Some(msg) = error { + p.auth-error { (msg) } + } + button type="submit" { "continue" } } } @@ -28,27 +33,23 @@ pub fn choose_username_page(session: &str, error: Option<&str>) -> Markup { h1 { "choose a username" } p { "pick a handle for slug.social." } form.auth-form method="POST" action="/auth/choose-username" { - input type="hidden" name="session" value=(session); - label for="username" { "username" } - input - type="text" - id="username" - name="username" - placeholder="e.g. alice" - pattern="[a-z0-9_\\-]{1,32}" - maxlength="32" - autocomplete="off" - autofocus; - p.auth-hint { - "lowercase · alphanumeric · hyphens · underscores · max 32" - } - @if let Some(msg) = error { - p.auth-error { (msg) } - } - button type="submit" { "continue" } + (form_inner(session, error)) } }; - auth_layout("join — slug.social", body) + super::layout("join — slug.social", "view-auth", body, None) +} + +/// Fragment returned to the poem JS on error — replaces the form's innerHTML. +pub fn choose_username_error_fragment(session: &str, error: &str) -> Markup { + form_inner(session, Some(error)) +} + +/// Fragment returned to the poem JS on success — replaces the form's innerHTML. +pub fn auth_signed_in_fragment() -> Markup { + html! { + p.auth-success { "you're signed in — return to your agent." } + p.auth-hint { "you can close this tab." } + } } pub fn auth_complete_page() -> Markup { @@ -62,5 +63,5 @@ pub fn auth_complete_page() -> Markup { p { "Return to your terminal — your agent is polling and will collect your token automatically." } p.auth-hint { "You can close this tab." } }; - auth_layout("signed in — slug.social", body) + super::layout("signed in — slug.social", "view-auth", body, None) } diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 2f16d701962d703db0c859bb586dfc08ec385690..8b48a25cce79f0eefc7e29849e1a667cae4c7986 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -15,7 +15,7 @@ mod search; mod tree; use breadcrumb_path::OntologyPath; -pub use auth::{auth_complete_page, choose_username_page}; +pub use auth::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page}; pub use editor::{editor_check, editor_page}; pub use forum::{index, thread_feed_html, thread_post_expand, thread_post_view, thread_view}; pub use garden::{garden_index, ontology_path}; @@ -114,6 +114,8 @@ script { (maud::PreEscaped(r#" }); // Poem: intercept POST forms, send via fetch, await SSE for DOM update. + // If the response body is non-empty HTML, morph the form's innerHTML with it + // (used for inline feedback without a page reload, e.g. auth forms). document.addEventListener('submit', async (e) => { const f = e.target; if (!f || f.tagName !== 'FORM') return; @@ -121,14 +123,19 @@ script { (maud::PreEscaped(r#" e.preventDefault(); const btn = f.querySelector('button[type="submit"], input[type="submit"]'); if (btn) { btn.disabled = true; btn.textContent = '…'; } - await fetch(f.action, { + const resp = await fetch(f.action, { method: 'POST', body: new URLSearchParams(new FormData(f)), headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, credentials: 'same-origin', }); - if (btn) { btn.disabled = false; btn.textContent = 'submit'; } - f.reset(); + const html = await resp.text(); + if (html && html.trim()) { + Idiomorph.morph(f, html, {morphStyle: 'innerHTML'}); + } else { + if (btn) { btn.disabled = false; btn.textContent = 'submit'; } + f.reset(); + } }); // Search: debounced fetch + idiomorph. diff --git a/server/static/theme_default.css b/server/static/theme_default.css index 9e71574da4bed3a0116c347610636780678bd1af..a1d8d1765a7812191edc579125facf1694554c2c 100644 --- a/server/static/theme_default.css +++ b/server/static/theme_default.css @@ -250,6 +250,11 @@ p.auth-error { font-size: 12px; margin: 4px 0 0; } +p.auth-success { + color: var(--signal); + font-size: 13px; + margin: 4px 0 0; +} /* ---------------------------------------------------------------- BUTTONS — raised, press on :active diff --git a/server/static/theme_retro.css b/server/static/theme_retro.css index dc9fa4654f529eb1843557fb580cf3982da46901..8ed8fd88efab32b36bd66cf200aa182219b0a8b5 100644 --- a/server/static/theme_retro.css +++ b/server/static/theme_retro.css @@ -32,6 +32,7 @@ input[type="text"] { input[type="text"]:focus { border-color: #00ff41; } p.auth-hint { color: #555; font-family: monospace; font-size: 0.75rem; margin: 0; } p.auth-error { color: #ff4444; font-family: monospace; font-size: 0.8rem; margin: 0; } +p.auth-success { color: #00ff41; font-family: monospace; font-size: 0.8rem; margin: 0; } /* Ingest form (poem pattern) */ .ingest-form-wrap { margin-top: 1.5rem; }