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: [8d5328d3] -theme Side A — unified diff (full patch): diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index 82b2aa51d21ada1d0d849d3ddfc3a81e4241d861..e74e42e0f0ffc4224f5ef5421b486a5f35434999 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -73,11 +73,7 @@ pub async fn post_ui_html( ensure_partial_tree(&mut tree, &item); } let _ = state.ensure_node(&item).await; - let dest = if item.is_root() { - "/".to_string() - } else { - format!("/?item={}", item.as_str()) - }; + let dest = item.browse_href(); JsBuilder::new() .raw(&format!( "window.location.href={};", diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index c973cb718ac74b95570dabea76e24459417790b9..a8353c6de0cd6d268219e552b7ca1ba4e3000585 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -1,13 +1,10 @@ use axum::{ body::Body, extract::{Path, State}, - http::{header, HeaderValue, StatusCode, Uri}, + http::{header, StatusCode, Uri}, response::{IntoResponse, Response}, - Form, }; -use axum_extra::extract::cookie::CookieJar; use maud::{html, Markup, DOCTYPE}; -use serde::Deserialize; use crate::{ form_template::template_json_compact, @@ -15,96 +12,25 @@ use crate::{ path_types::ItemId, ranking::{top_bottom, RankedItem}, reducer::{GroupState, NodeState}, - state::{parse_item_param, AppState}, + state::AppState, ui_action::UI_RPC_FIELD, }; -const THEME_DEFAULT_CSS: &str = include_str!("../../static/theme_default.css"); -const THEME_RETRO_CSS: &str = include_str!("../../static/theme_retro.css"); +const SORTER_CSS: &str = include_str!("../../static/sorter.css"); const SORTER_UI_JS: &str = include_str!("../../static/sorter_ui.js"); -pub const SORTER_THEME_COOKIE: &str = "sorter-theme"; - -pub fn normalize_theme(raw: &str) -> &'static str { - match raw { - "retro" => "retro", - _ => "default", - } -} - -pub fn theme_from_jar(jar: &CookieJar) -> &'static str { - jar.get(SORTER_THEME_COOKIE) - .map(|c| normalize_theme(c.value())) - .unwrap_or("default") -} - -pub fn theme_next_from_uri(uri: &Uri) -> String { - uri.path_and_query() - .map(|pq| pq.as_str().to_string()) - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| "/".to_string()) -} - -pub fn theme_cookie_header_value(theme: &str) -> HeaderValue { - let t = normalize_theme(theme); - let s = format!("{SORTER_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000"); - HeaderValue::from_str(&s).expect("theme cookie must be ASCII") -} - -fn sanitize_theme_next(next: Option<&str>) -> String { - let s = next.unwrap_or("/").trim(); - if s.starts_with('/') && !s.starts_with("//") && s.len() < 8192 { - s.to_string() - } else { - "/".to_string() - } -} - -#[derive(Debug, Deserialize)] -pub struct ThemeForm { - theme: String, - next: Option, -} - -pub async fn post_theme(Form(form): Form) -> impl IntoResponse { - let theme = normalize_theme(&form.theme); - let next = sanitize_theme_next(form.next.as_deref()); - let loc = - HeaderValue::try_from(next.as_str()).unwrap_or_else(|_| HeaderValue::from_static("/")); - Response::builder() - .status(StatusCode::SEE_OTHER) - .header(header::LOCATION, loc) - .header(header::SET_COOKIE, theme_cookie_header_value(theme)) - .body(Body::empty()) - .expect("theme redirect response") -} - pub async fn serve_static(Path(filename): Path) -> impl IntoResponse { - if filename == "sorter_ui.js" { - return Response::builder() - .status(StatusCode::OK) - .header(header::CONTENT_TYPE, "text/javascript; charset=utf-8") - .header(header::CACHE_CONTROL, "public, max-age=3600") - .body(SORTER_UI_JS.to_string()) - .unwrap() - .into_response(); - } - - let theme = filename - .strip_prefix("theme_") - .and_then(|s| s.strip_suffix(".css")); - - let css = match theme { - Some("default") => THEME_DEFAULT_CSS, - Some("retro") => THEME_RETRO_CSS, + let (content_type, body) = match filename.as_str() { + "sorter.css" => ("text/css; charset=utf-8", SORTER_CSS), + "sorter_ui.js" => ("text/javascript; charset=utf-8", SORTER_UI_JS), _ => return (StatusCode::NOT_FOUND, "static file not found").into_response(), }; Response::builder() .status(StatusCode::OK) - .header(header::CONTENT_TYPE, "text/css; charset=utf-8") + .header(header::CONTENT_TYPE, content_type) .header(header::CACHE_CONTROL, "public, max-age=3600") - .body(css.to_string()) + .body(body.to_string()) .unwrap() .into_response() } @@ -162,8 +88,7 @@ fn asset_version() -> &'static str { V.get_or_init(|| { use std::hash::{Hash, Hasher}; let mut h = std::collections::hash_map::DefaultHasher::new(); - THEME_DEFAULT_CSS.hash(&mut h); - THEME_RETRO_CSS.hash(&mut h); + SORTER_CSS.hash(&mut h); SORTER_UI_JS.hash(&mut h); format!("{:x}", h.finish()) }) @@ -176,9 +101,9 @@ pub fn now_ms() -> i64 { t.as_millis() as i64 } -fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) -> Markup { +fn layout(title: &str, body: Markup, views: u64) -> Markup { let ver = asset_version(); - let css_href = format!("/static/theme_{theme}.css?v={ver}"); + let css_href = format!("/static/sorter.css?v={ver}"); let js_src = format!("/static/sorter_ui.js?v={ver}"); html! { (DOCTYPE) @@ -187,7 +112,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) meta charset="utf-8"; meta name="viewport" content="width=device-width, initial-scale=1"; title { (title) } - link rel="stylesheet" href=(css_href) id="theme-stylesheet"; + link rel="stylesheet" href=(css_href); script src="https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js" {} } body class="home" { @@ -196,21 +121,6 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) } div id="errors" {} (body) - div id="controls" { - a href="https://github.com/sortersocial/sorter2" id="src-link" { "src" } - form id="sorter-theme-form" method="post" action="/theme" data-navigate="full" { - input type="hidden" name="next" value=(theme_next); - select id="theme-select" name="theme" onchange="this.form.submit()" aria-label="Theme" { - @for (val, label) in [("default", "default"), ("retro", "retro")] { - @if theme == val { - option value=(val) selected { (label) } - } @else { - option value=(val) { (label) } - } - } - } - } - } script src=(js_src) {} } } @@ -218,11 +128,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) } fn item_href(id: &ItemId) -> String { - if id.is_root() { - "/".to_string() - } else { - format!("/?item={}", id.as_str()) - } + id.browse_href() } fn segment_label(seg: &str) -> &str { @@ -361,39 +267,10 @@ pub fn vote_panel(parent: &ItemId) -> Markup { } -fn query_param(uri: &Uri, key: &str) -> Option { - let q = uri.query()?; - q.split('&').find_map(|pair| { - let mut it = pair.splitn(2, '='); - if it.next()? == key { - Some(it.next().unwrap_or("").to_string()) - } else { - None - } - }) -} - -pub async fn home( - State(state): State, - jar: CookieJar, - uri: Uri, -) -> impl IntoResponse { +async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup { let path = uri.path().to_string(); state.views.increment(path.clone()); let views = state.views.get_views(&path); - let theme = theme_from_jar(&jar); - let theme_next = theme_next_from_uri(&uri); - - let item_raw = query_param(&uri, "item") - .or_else(|| query_param(&uri, "sub").map(|sub| { - if sub.is_empty() { - String::new() - } else { - format!("reddit.com/r/{sub}") - } - })) - .unwrap_or_default(); - let item = parse_item_param(&item_raw); let tree = state.tree.read().await; let empty_node = NodeState::default(); @@ -408,5 +285,14 @@ pub async fn home( (vote_panel(&item)) (ranking_panel(&item, group)) }; - layout("sorter2", body, views, theme, &theme_next) + layout("sorter2", body, views) +} + +pub async fn home(State(state): State, uri: Uri) -> impl IntoResponse { + item_page(state, uri, ItemId::root()).await +} + +pub async fn browse(State(state): State, uri: Uri) -> impl IntoResponse { + let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root()); + item_page(state, uri, item).await } diff --git a/server/src/lib.rs b/server/src/lib.rs index 14e7cfbc38feb5d07aff859b64bce6e2ec45cf91..cd56743192919cf4dcea539b3d8873a21fb7e72b 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -30,9 +30,9 @@ pub fn create_app(state: AppState) -> Router { Router::new() .route("/healthz", get(|| async { "ok" })) .route("/static/:filename", get(crate::html::serve_static)) + .route("/~/*item_path", get(crate::html::browse)) .route("/", get(crate::html::home)) .route("/ui", post(crate::api::ui_html::post_ui_html)) - .route("/theme", post(crate::html::post_theme)) .with_state(state) .layer(TraceLayer::new_for_http()) } diff --git a/server/src/path_types.rs b/server/src/path_types.rs index b5c41444f7bcd4d8d289ed3af464bc3f14d0df99..12dce9888f5cd4e1a0974d12d6468368d0f775b9 100644 --- a/server/src/path_types.rs +++ b/server/src/path_types.rs @@ -90,6 +90,50 @@ impl ItemId { paths } + /// Full URL for the browser location bar after `/~/`. + pub fn to_browse_url(&self) -> String { + if self.is_root() { + return String::new(); + } + if self.as_str().contains("://") { + return self.as_str().to_string(); + } + if self + .segments() + .first() + .is_some_and(|s| s.contains('.')) + { + format!("https://{}", self.as_str()) + } else { + self.as_str().to_string() + } + } + + /// App route, e.g. `/~/https://reddit.com/r/rust`. + pub fn browse_href(&self) -> String { + if self.is_root() { + "/".to_string() + } else { + format!("/~/{}", self.to_browse_url()) + } + } + + /// Parse the tail after `/~/` in a request path. + pub fn from_browse_tail(tail: &str) -> ItemId { + let raw = normalize_browse_tail(tail); + if raw.is_empty() { + return ItemId::root(); + } + ItemId::from_url(&raw) + .or_else(|| ItemId::parse(&raw)) + .unwrap_or_else(|| ItemId::opaque(raw)) + } + + pub fn from_browse_uri(path: &str) -> Option { + path.strip_prefix("/~/") + .map(ItemId::from_browse_tail) + } + fn canonicalize(raw: &str) -> Option { let s = raw.trim(); if s.is_empty() { @@ -155,6 +199,21 @@ fn normalize_host(host: &str) -> String { } } +fn normalize_browse_tail(tail: &str) -> String { + let t = tail.trim(); + if t.is_empty() { + return String::new(); + } + // Some HTTP stacks collapse `https://` → `https:/` inside a path segment. + if t.starts_with("https:/") && !t.starts_with("https://") { + return format!("https://{}", &t[7..]); + } + if t.starts_with("http:/") && !t.starts_with("http://") { + return format!("http://{}", &t[6..]); + } + t.to_string() +} + fn normalize_reddit_host_path(s: &str) -> String { let (host, path) = s.split_once('/').unwrap_or((s, "")); let host = normalize_host(host); @@ -252,4 +311,22 @@ mod tests { ); assert!(ItemId::from_legacy_scope("").is_root()); } + + #[test] + fn browse_href_wraps_canonical_path() { + let id = ItemId::parse("reddit.com/r/rust").unwrap(); + assert_eq!(id.browse_href(), "/~/https://reddit.com/r/rust"); + } + + #[test] + fn from_browse_tail_parses_full_url() { + let id = ItemId::from_browse_tail("https://reddit.com/r/AmITheAsshole"); + assert_eq!(id.as_str(), "reddit.com/r/amitheasshole"); + } + + #[test] + fn from_browse_uri_strips_prefix() { + let id = ItemId::from_browse_uri("/~/https://reddit.com/r/rust").unwrap(); + assert_eq!(id.as_str(), "reddit.com/r/rust"); + } } diff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js index 9c475d8e076ba527aaf7a25c177d0d651bd46ca9..d9b016f197547f37ca4b2bcdd7ee6b673d0fb3f0 100644 --- a/server/static/sorter_ui.js +++ b/server/static/sorter_ui.js @@ -24,7 +24,6 @@ var f = e.target; if (!f || f.tagName !== 'FORM') return; if ((f.method || 'get').toLowerCase() !== 'post') return; - if (f.id === 'sorter-theme-form') return; if (f.getAttribute('data-navigate') === 'full') return; e.preventDefault(); await postUiForm(f); diff --git a/server/static/theme_default.css b/server/static/theme_default.css deleted file mode 100644 index 1bf8ac7a25207336c019f93cd4119bd0e06229f0..0000000000000000000000000000000000000000 --- a/server/static/theme_default.css +++ /dev/null @@ -1,186 +0,0 @@ -:root { - --bg: #0f1115; - --fg: #e8eaed; - --muted: #9aa0a6; - --accent: #7cacf8; - --panel: #1a1d24; - --border: #2a2f3a; -} - -* { - box-sizing: border-box; -} - -body { - margin: 0; - font-family: system-ui, -apple-system, sans-serif; - background: var(--bg); - color: var(--fg); - line-height: 1.5; -} - -.muted { - color: var(--muted); -} - -.small { - font-size: 0.875rem; -} - -.view-meta { - position: fixed; - top: 0.5rem; - right: 0.5rem; - font-size: 0.75rem; -} - -#controls { - position: fixed; - bottom: 0; - left: 0; - right: 0; - display: flex; - gap: 1rem; - align-items: center; - padding: 0.75rem 1rem; - background: var(--panel); - border-top: 1px solid var(--border); - font-size: 0.875rem; -} - -#controls a { - color: var(--accent); -} - -.demo-panel { - max-width: 40rem; - margin: 4rem auto 6rem; - padding: 2rem; - background: var(--panel); - border: 1px solid var(--border); - border-radius: 8px; -} - -.demo-panel h1 { - margin-top: 0; -} - -.btn-primary { - background: var(--accent); - color: #0f1115; - border: none; - padding: 0.5rem 1rem; - border-radius: 4px; - font-size: 1rem; - cursor: pointer; -} - -.btn-primary:hover { - filter: brightness(1.1); -} - -code { - font-size: 0.85em; - background: var(--bg); - padding: 0.1em 0.35em; - border-radius: 3px; -} - -.vote-fields { - display: flex; - flex-direction: column; - gap: 0.75rem; - margin-bottom: 1rem; -} - -.vote-fields label { - display: flex; - flex-direction: column; - gap: 0.25rem; -} - -.vote-fields input { - padding: 0.4rem 0.5rem; - border: 1px solid var(--border); - border-radius: 4px; - background: var(--bg); - color: var(--fg); -} - -.rank-list { - margin: 0; - padding-left: 0; - list-style: none; -} - -.rank-list li { - margin-bottom: 0.35rem; -} - -.rank-num { - color: var(--muted); -} - -#parser-input { - width: 100%; - padding: 0.5rem; - border: 1px solid var(--border); - border-radius: 4px; - background: var(--bg); - color: var(--fg); - font-size: 1rem; - font-family: inherit; - resize: vertical; -} - -#parser-form .btn-primary { - margin-top: 0.5rem; -} - -.breadcrumbs { - font-size: 0.875rem; - margin-bottom: 1rem; - color: var(--muted); -} - -.breadcrumbs a { - color: var(--accent); - text-decoration: none; -} - -.breadcrumbs a:hover { - text-decoration: underline; -} - -.breadcrumbs .separator { - color: var(--muted); -} - -.rank-list a { - color: var(--accent); - text-decoration: none; -} - -.rank-list a:hover { - text-decoration: underline; -} - -.entity-card h2 { - margin-top: 0; -} - -.scope-name { - color: var(--accent); - font-weight: 600; -} - -.rank-heading { - margin: 0.75rem 0 0.25rem; - text-transform: uppercase; - letter-spacing: 0.04em; -} - -.rank-gap { - text-align: center; - margin: 0.25rem 0; -} diff --git a/server/static/theme_retro.css b/server/static/theme_retro.css deleted file mode 100644 index ceee99494b873a6e658857be97f02ee739db85e9..0000000000000000000000000000000000000000 --- a/server/static/theme_retro.css +++ /dev/null @@ -1,5 +0,0 @@ -@import url("/static/theme_default.css"); - -:root { - --accent: #f4a261; -} diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index f7ac9c26bf9f9277ad5f5708603224c095165fb8..df7d9ab357531c5146d0b326c149fdaa6b531a4a 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -70,6 +70,22 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() { assert_eq!(ranked[0].item.as_str(), "alpha"); } +#[tokio::test] +async fn browse_url_renders_subreddit_page() { + let (addr, _tmp) = start_test_server().await; + let client = reqwest::Client::new(); + let html = client + .get(format!("http://{addr}/~/https://reddit.com/r/rust")) + .send() + .await + .unwrap() + .text() + .await + .unwrap(); + assert!(html.contains("ranking-panel")); + assert!(html.contains("/~/https://reddit.com/r/rust")); +} + #[tokio::test] async fn post_ui_parse_query_redirects_to_subreddit() { let (addr, _tmp) = start_test_server().await; @@ -93,5 +109,5 @@ async fn post_ui_parse_query_redirects_to_subreddit() { .unwrap(); assert!(body.contains("window.location.href")); - assert!(body.contains("/?item=reddit.com/r/rust")); + assert!(body.contains("/~/https://reddit.com/r/rust")); } Side B — contributor: tommy-mor Side B — commit message: [bda5f8aa] Remove legacy evidence projection; Evidence envelopes only. Epoch and commit pages no longer invent history from bare GitDiscovery rows. Production ledger will be wiped to re-emit under the current schema. Co-authored-by: Cursor Side B — unified diff (full patch): diff --git a/constitution.py b/constitution.py index 4dd5b9dfbba231d46289c490f91b1dd5b1018bcf..26ba130e885e0e69fb7874ca5c3f07f42100a150 100644 --- a/constitution.py +++ b/constitution.py @@ -210,10 +210,10 @@ class Emission: distributions: dict # author -> amount str ranking: dict # author -> score str models_used: list - discovery_snapshot_id: str = "" # empty only for pre-discovery ledger history - evidence_schema_version: int = 1 - ranking_run_id: str = "" - ranking_event_id: str = "" + discovery_snapshot_id: str + evidence_schema_version: int + ranking_run_id: str + ranking_event_id: str @event @@ -502,26 +502,6 @@ def _epochs_in_ledger() -> list[int]: return sorted(epochs) -def _legacy_commit_row(commit_id: str) -> tuple[GitDiscovery | None, dict | None]: - for discovery in store.read(): - if not isinstance(discovery, GitDiscovery): - continue - for commit in discovery.commits: - if commit_id_for_oid(commit["oid"]) == commit_id: - return discovery, commit - return None, None - - -def _legacy_observation(commit_id: str) -> tuple[GitDiscovery | None, dict | None]: - for discovery in store.read(): - if not isinstance(discovery, GitDiscovery): - continue - for obs in discovery.observations: - if commit_id_for_oid(obs["oid"]) == commit_id: - return discovery, obs - return None, None - - def build_pairwise_prompt(side_a: dict, side_b: dict) -> str: return f"""You are ranking contributions to an open source project. Compare these two sides (each may be one or more commits). Decide which side contributed more. @@ -2040,7 +2020,7 @@ def _strip_heavy_fields(obj: dict) -> dict: @app.get("/api/ledger") async def get_ledger(offset: int = 0, limit: int = 100, full: int = 0): - """List of ledger dicts (backward-compatible). Heavy blobs stripped unless full=1.""" + """List of ledger dicts. Heavy blobs stripped unless full=1.""" limit = max(1, min(limit, 500)) rows = [] for e in store.read()[offset:offset + limit]: @@ -2274,23 +2254,25 @@ async def epochs_index(): epochs = _epochs_in_ledger() rows = [] for epoch in epochs: - discovery = _discovery_for_epoch(epoch) emission = _emission_for_epoch(epoch) - evidence_n = sum( - 1 for e in evidence_by_kind() if e.epoch == epoch + evidence_n = sum(1 for e in evidence_by_kind() if e.epoch == epoch) + disc = next( + ( + e for e in evidence_by_kind("git.discovery_completed") + if e.epoch == epoch + ), + None, ) detail = [] - if discovery: + if disc: detail.append( - f"{len(discovery.commits)} eligible / " - f"{len(discovery.observations)} observed" + f"{disc.payload.get('eligible_count', 0)} eligible / " + f"{disc.payload.get('observation_count', 0)} observed" ) if emission: detail.append(f"emitted {emission.total_emitted}") if evidence_n: detail.append(f"{evidence_n} evidence events") - elif discovery or emission: - detail.append("legacy (no Evidence envelopes)") rows.append(["li", _a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}"), " — ", @@ -2307,37 +2289,37 @@ async def epochs_index(): @app.get("/epochs/{epoch}") async def epoch_detail(epoch: int): - discovery = _discovery_for_epoch(epoch) emission = _emission_for_epoch(epoch) evidence_rows = [e for e in evidence_by_kind() if e.epoch == epoch] + if not evidence_rows and emission is None: + return _evidence_page(f"epoch {epoch}", [ + _evidence_nav(), + ["h1", f"epoch {epoch}"], + ["p.note", "No evidence for this epoch."], + ]) + commit_evs = [e for e in evidence_rows if e.kind == "git.commit"] comparison_evs = [e for e in evidence_rows if e.kind == "comparison.input"] judgment_evs = [e for e in evidence_rows if e.kind == "llm.judgment"] + discovery_ev = next( + (e for e in evidence_rows if e.kind == "git.discovery_completed"), None + ) ranking_started = next( (e for e in evidence_rows if e.kind == "ranking.started"), None ) ranking_completed = next( (e for e in evidence_rows if e.kind == "ranking.completed"), None ) - legacy = not evidence_rows and (discovery is not None or emission is not None) - - commit_links: list[tuple[str, str]] = [] - if commit_evs: - for e in commit_evs: - cid = e.payload.get("commit_id") or "" - label = ( - f"{e.payload.get('oid', cid)[:24]} " - f"({e.payload.get('contributor', '?')})" - ) - commit_links.append((label, _evidence_path("commit", cid))) - elif discovery: - for c in discovery.commits: - cid = commit_id_for_oid(c["oid"]) - commit_links.append(( - f"{c['oid'][:24]} ({c.get('contributor', '?')})", - _evidence_path("commit", cid), - )) + commit_links = [ + ( + f"{e.payload.get('oid', e.payload.get('commit_id', ''))[:24]} " + f"({e.payload.get('contributor', '?')})", + _evidence_path("commit", e.payload["commit_id"]), + ) + for e in commit_evs + if e.payload.get("commit_id") + ] comparison_links = [ ( e.payload.get("summary") or e.payload.get("comparison_id", e.event_id), @@ -2360,16 +2342,13 @@ async def epoch_detail(epoch: int): ] excluded = [] - if discovery: - for obs in discovery.observations: + if discovery_ev: + for obs in discovery_ev.payload.get("observations") or []: if obs.get("eligible"): continue oid = obs.get("oid", "?") reason = obs.get("exclusion_reason") or "excluded" - excluded.append(["li", - f"{oid[:28]} — {reason} — ", - ["span.note", "legacy evidence unavailable"], - ]) + excluded.append(["li", f"{oid[:28]} — {reason}"]) ranking_nodes: list = [] if ranking_completed: @@ -2388,21 +2367,10 @@ async def epoch_detail(epoch: int): indent=2, sort_keys=True, )], ] - elif emission: - if legacy and len(emission.ranking or {}) <= 1: - ranking_nodes.append(["p.note", - "Single-contributor epoch — no LLM judgments." - ]) - ranking_nodes.extend([ - ["p", "Projected from Emission (no ranking Evidence event)."], - ["pre.blob", json.dumps(emission.ranking, indent=2, sort_keys=True)], - ]) + elif ranking_started: + ranking_nodes = [["p.note", f"Ranking started: {ranking_started.event_id}"]] else: - ranking_nodes = [["p.note", "No ranking recorded."]] - if ranking_started and not ranking_completed: - ranking_nodes.insert(0, ["p.note", - f"Ranking started: {ranking_started.event_id}" - ]) + ranking_nodes = [["p.note", "No ranking evidence."]] if emission: emission_node = _dl_rows([ @@ -2411,44 +2379,41 @@ async def epoch_detail(epoch: int): ("pool_after", emission.pool_after), ("discovery_snapshot_id", emission.discovery_snapshot_id), ("ranking_run_id", emission.ranking_run_id or None), + ("ranking_event_id", emission.ranking_event_id or None), ("models_used", ", ".join(emission.models_used or [])), ("distributions", json.dumps(emission.distributions, sort_keys=True)), ]) else: emission_node = ["p.note", "No emission for this epoch."] - single_contributor = False - if discovery: - single_contributor = len({c.get("contributor") for c in discovery.commits}) <= 1 - elif emission: - single_contributor = len(emission.ranking or {}) <= 1 + contributors = { + e.payload.get("contributor") + for e in commit_evs + if e.payload.get("contributor") + } + no_comparisons_note = "No comparisons." + if len(contributors) <= 1: + no_comparisons_note += " Single-contributor — no LLM judgments." body = [ _evidence_nav(), ["div.eyebrow", f"epoch {epoch}"], ["h1", f"epoch {epoch}"], ] - if legacy: - body.append(["p.note", - "Legacy epoch: projected from GitDiscovery/Emission without Evidence " - "envelopes. Eligible commits use discovery patches; discarded observation " - "metadata is marked legacy evidence unavailable. Single-contributor " - "epochs have no LLM judgments." - ]) - if discovery: + if discovery_ev: body.extend([ ["h2", "discovery"], _dl_rows([ - ("snapshot_id", discovery.snapshot_id), - ("config_digest", discovery.config_digest), - ("initial_snapshot", discovery.initial_snapshot), - ("observations", len(discovery.observations)), - ("eligible", len(discovery.commits)), + ("snapshot_id", discovery_ev.payload.get("snapshot_id")), + ("config_digest", discovery_ev.payload.get("config_digest")), + ("observations", discovery_ev.payload.get("observation_count")), + ("eligible", discovery_ev.payload.get("eligible_count")), + ("event", _a( + _evidence_path("event", discovery_ev.event_id), + discovery_ev.event_id, + )), ]), ]) - no_comparisons_note = "No comparisons." - if single_contributor: - no_comparisons_note += " Single-contributor — no LLM judgments." body.extend([ ["h2", "commits"], _link_list(commit_links), @@ -2471,92 +2436,42 @@ async def epoch_detail(epoch: int): @app.get("/commits/{commit_id}") async def commit_detail(commit_id: str): ev = find_evidence_payload("git.commit", "commit_id", commit_id) - discovery, legacy_row = (None, None) if not ev: - discovery, legacy_row = _legacy_commit_row(commit_id) - if not ev and not legacy_row: - discovery, obs = _legacy_observation(commit_id) - if obs is not None: - epoch = discovery.epoch if discovery else "?" - return _evidence_page(f"commit {commit_id[:24]}", [ - _evidence_nav( - _a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}") - ), - ["div.eyebrow", "commit"], - ["h1", commit_id], - ["p.note", "legacy evidence unavailable"], - _dl_rows([ - ("oid", obs.get("oid")), - ("eligible", obs.get("eligible")), - ("exclusion_reason", obs.get("exclusion_reason")), - ("epoch", str(epoch)), - ]), - ]) return _evidence_page("commit not found", [ _evidence_nav(), ["h1", "commit not found"], ["p", commit_id], ]) - if ev: - p = ev.payload - epoch = ev.epoch - oid = p.get("oid", "") - contributor = p.get("contributor", "") - message = _blob_text(p.get("message")) - patch = _blob_text(p.get("patch")) - meta = _dl_rows([ + p = ev.payload + epoch = ev.epoch + return _evidence_page(f"commit {commit_id[:24]}", [ + _evidence_nav(_a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}")), + ["div.eyebrow", "commit"], + ["h1", commit_id], + _dl_rows([ ("commit_id", commit_id), - ("oid", oid), - ("contributor", contributor), + ("oid", p.get("oid", "")), + ("contributor", p.get("contributor", "")), ("patch_sha256", p.get("patch_sha256")), ("patch_identity", p.get("patch_identity")), ("committer_timestamp_ms", p.get("committer_timestamp_ms")), ("evidence_event", _a(_evidence_path("event", ev.event_id), ev.event_id)), ("epoch", _a(_evidence_path("epoch", str(epoch)), str(epoch))), - ]) - legacy_note = None - else: - assert legacy_row is not None and discovery is not None - epoch = discovery.epoch - oid = legacy_row.get("oid", "") - contributor = legacy_row.get("contributor", "") - message = legacy_row.get("message") or "" - patch = legacy_row.get("patch") or "" - meta = _dl_rows([ - ("commit_id", commit_id), - ("oid", oid), - ("contributor", contributor), - ("patch_sha256", legacy_row.get("patch_sha256")), - ("patch_identity", legacy_row.get("patch_identity")), - ("committer_timestamp_ms", legacy_row.get("committer_timestamp_ms")), - ("epoch", _a(_evidence_path("epoch", str(epoch)), str(epoch))), - ("source", "legacy GitDiscovery projection"), - ]) - legacy_note = ["p.note", "Projected from GitDiscovery — Evidence envelope absent."] - return _evidence_page(f"commit {commit_id[:24]}", [ - _evidence_nav(_a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}")), - ["div.eyebrow", "commit"], - ["h1", commit_id], - *([legacy_note] if legacy_note else []), - meta, + ]), ["p", _a(f"/commits/{commit_id}/patch", "download patch")], ["h2", "message"], - _pre_blob(message), + _pre_blob(_blob_text(p.get("message"))), ["h2", "patch"], - _pre_blob(patch), + _pre_blob(_blob_text(p.get("patch"))), ]) @app.get("/commits/{commit_id}/patch") async def commit_patch_download(commit_id: str): ev = find_evidence_payload("git.commit", "commit_id", commit_id) - if ev: - raw = _decode_blob(ev.payload.get("patch")) or _blob_text(ev.payload.get("patch")).encode() - else: - _, row = _legacy_commit_row(commit_id) - if not row: - return PlainTextResponse("not found", status_code=404) - raw = (row.get("patch") or "").encode("utf-8") + if not ev: + return PlainTextResponse("not found", status_code=404) + raw = _decode_blob(ev.payload.get("patch")) or _blob_text(ev.payload.get("patch")).encode() return Response( content=raw, media_type="text/plain; charset=utf-8", @@ -3226,7 +3141,9 @@ async def watch(): ["div.controls", ["button#play", {"type": "button", "disabled": "true"}, "▶ Play live feed"], ["button#pause", {"type": "button"}, "Ⅱ Pause feed"], - ["span.note", "Pause stops local updates; the constitutional process continues."], + ["span.note", + "Play/pause only affect this browser feed — they do not run or stop emission. " + "The server emits at each epoch boundary; status above is that process."], ], ], ["section.panel", diff --git a/tests/integration.clj b/tests/integration.clj index 204b0fedfbad57846205cb140c4ed9406b5f8e0e..11140e95a8cd86768a661a30e6b29a3ddfc95fcc 100644 --- a/tests/integration.clj +++ b/tests/integration.clj @@ -247,7 +247,10 @@ :decay_rate "0.003253356063468" :distributions {"alice" "381.4282558872" "bob" "190.7141279436"} :ranking {"alice" "0.6666" "bob" "0.3334"} - :models_used ["mock/chat-v1" "mock/chat-v2"]}] + :models_used ["mock/chat-v1" "mock/chat-v2"] + :evidence_schema_version 2 + :ranking_run_id "seed-rank" + :ranking_event_id "seed-rank-ev"}] (spit path (str (json/generate-string entry) "\n")))) ;; --------------------------------------------------------------------------- diff --git a/tests/test_evidence.py b/tests/test_evidence.py index 76adcd343eec3a65dec58fda93b068356fb1adcd..7cb74fd7fb1bcd0ab17d2cbe2e6ca7e61e164221 100644 --- a/tests/test_evidence.py +++ b/tests/test_evidence.py @@ -1,4 +1,4 @@ -"""HTML evidence graph: byte fidelity, resume, legacy projection, private ack.""" +"""HTML evidence graph: byte fidelity, resume, and Evidence-only pages.""" from __future__ import annotations @@ -86,55 +86,10 @@ def test_html_evidence_pages_escape_and_link(evidence_store): assert patch_resp.headers["content-disposition"].startswith("attachment") -def test_legacy_epoch_projects_from_gitdiscovery_without_evidence(evidence_store): - oid = "sha1:" + "b" * 40 - discovery = c.GitDiscovery( - schema_version=1, - epoch=3, - snapshot_id="legacy-snap", - timestamp_ms=1, - config_digest="d", - initial_snapshot=True, - configuration={"repositories": [], "contributors": {}}, - repositories=[], - observations=[{ - "oid": oid, - "eligible": False, - "exclusion_reason": "before_genesis", - "first_sources": [], - }, { - "oid": "sha1:" + "c" * 40, - "eligible": True, - "exclusion_reason": None, - "first_sources": [], - }], - commits=[{ - "oid": "sha1:" + "c" * 40, - "contributor": "tommy-mor", - "message": "eligible", - "patch": "diff --git a/x b/x\n", - }], - ) - emission = c.Emission( - epoch=3, - timestamp_ms=2, - pool_before="1", - total_emitted="0.1", - pool_after="0.9", - decay_rate="0.1", - distributions={"tommy-mor": "0.1"}, - ranking={"tommy-mor": "1"}, - models_used=[], - discovery_snapshot_id="legacy-snap", - ) - asyncio.run(c.store.append(discovery)) - asyncio.run(c.store.append(emission)) - html = asyncio.run(c.epoch_detail(3)).body.decode() - assert "legacy" in html.lower() - assert "Single-contributor" in html or "no LLM" in html - excluded_id = c.commit_id_for_oid(oid) - excluded_html = asyncio.run(c.commit_detail(excluded_id)).body.decode() - assert "legacy evidence unavailable" in excluded_html.lower() +def test_commit_without_evidence_is_not_found(evidence_store): + html = asyncio.run(c.commit_detail("c_missing")).body.decode() + assert "commit not found" in html + assert "legacy" not in html.lower() def test_ranking_resume_skips_duplicate_provider_calls(evidence_store, monkeypatch): @@ -202,6 +157,10 @@ def test_epochs_index_lists_epochs(evidence_store): distributions={}, ranking={}, models_used=[], + discovery_snapshot_id="snap", + evidence_schema_version=c.EVIDENCE_SCHEMA_VERSION, + ranking_run_id="r", + ranking_event_id="e", ))) html = asyncio.run(c.epochs_index()).body.decode() assert "/epochs/3" in html