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