{"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[880eb778] Harden auth: fail-closed votes, mock OAuth gate, Secure cookies.\n\nAlso show the current alias in the top nav and pin durable by rev.\n\nCo-authored-by: Cursor <cursoragent@cursor.com>\n\nSide A — unified diff (full patch):\ndiff --git a/AGENTS.md b/AGENTS.md\nindex babb889d6fbfb1fa7176c9e6b7544ae17b61dd2e..6e0fd8ebb65d665c9c1438e3275971d62b98fd95 100644\n--- a/AGENTS.md\n+++ b/AGENTS.md\n@@ -10,11 +10,11 @@ Single Rust web app **`sorter2-server`**: pairwise voting, rank-centrality ranki\n \n - **Bootstrap script**: `./scripts/cursor-env-install.sh` (also run via `.cursor/environment.json` on Cloud Agent boot) installs Playwright Chromium, Babashka, bbin, `clj-paren-repair`, and warms the RocksDB build.\n - **Rust 1.88+** is required (`rust-toolchain.toml`). The Cloud Dockerfile and `cursor-env-install.sh` install **rustup** 1.88.0 first so `cargo` works while Playwright/Clojure bootstrap continues. Do not rely on `/usr/local/cargo` (often missing or stale).\n-- **RocksDB / `durable`**: Ubuntu’s default `c++` is often **clang** without libc++ headers. Set **`CXX=g++`** and **`RUSTFLAGS=\"-C linker=g++\"`** (or `CC=gcc`) before `cargo build` / `cargo test` — both are set in the bootstrap script and `.cursor/environment.json`.\n+- **RocksDB / `durable`**: `durable` is an external git dependency (`tommy-mor/durable`, pinned by rev in `server/Cargo.toml`). Ubuntu’s default `c++` is often **clang** without libc++ headers. Set **`CXX=g++`** and **`RUSTFLAGS=\"-C linker=g++\"`** (or `CC=gcc`) before `cargo build` / `cargo test` — both are set in the bootstrap script and `.cursor/environment.json`.\n - **System packages** for builds: `build-essential`, `g++`, `clang`, `libclang-dev`, `pkg-config`, `libssl-dev`, `openjdk-21-jre-headless` (for `reqwest` / OpenSSL, `librocksdb-sys`, `zstd-sys` / bindgen, and **bbin** / Clojure JVM). The bootstrap sets **`JAVA_HOME`** when Java is present.\n - **Clojure CLI 1.12.0.1530** (used in CI): install from https://clojure.org/guides/install_clojure — needed for `./scripts/clj-test.sh` / Kaocha tests.\n - **Babashka / bbin / clj-paren-repair**: installed by `cursor-env-install.sh` into `~/.local/bin` (bb tasks in `bb.edn`, delimiter repair for Clojure edits).\n-- **Playwright** (Spel browser tests in `test/vote_compare.clj`): Chromium via `clojure -M -e \"(com.microsoft.playwright.CLI/main ...)\"` — run once after clone or use the bootstrap script.\n+- **Playwright** (Spel browser tests in `test/vote_compare.clj` / `test/auth_login.clj`): Chromium via `clojure -M -e \"(com.microsoft.playwright.CLI/main ...)\"` — run once after clone or use the bootstrap script.\n \n ### Commands (see also `TEST.sh`)\n \n@@ -34,13 +34,17 @@ Environment variables (defaults in `server/src/state.rs`):\n - `PORT` — default `8080`\n - `SORTER2_DATA_DIR` — default `./data` (created on startup)\n - `SORTER2_EVENT_LOG` — default `{data_dir}/events.jsonl`\n+- `SORTER2_BASE_URL` — public origin (also drives Secure cookies when `https://`)\n+- `GITHUB_CLIENT_ID` / `GITHUB_CLIENT_SECRET` — GitHub OAuth (optional; login disabled if unset)\n+- `SORTER2_ALLOW_MOCK_OAUTH=1` — allow `mock_user` on `/auth/github` (tests only)\n \n Health check: `GET /healthz` → `ok`.\n \n-Core UI flow: `POST /ui` with form field `__rpc__` (JSON). Example vote:\n+Core UI flow: `POST /ui` with form field `__rpc__` (JSON). Votes require a session cookie (sign in via `/login`). Example vote:\n \n ```bash\n curl -sf -X POST http://127.0.0.1:8080/ui \\\n+  --cookie \"sorter2_session=...\" \\\n   --data-urlencode '__rpc__={\"action\":\"record_vote\",\"a\":\"alpha\",\"b\":\"beta\",\"ratio_left\":2,\"ratio_right\":1}'\n ```\n \ndiff --git a/Cargo.lock b/Cargo.lock\nindex aa02997ad85777195f135bfd9456bcee0fc9a590..1f8690f3e486d099577a32c2ece48caf57ea7160 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -414,7 +414,7 @@ dependencies = [\n [[package]]\n name = \"durable\"\n version = \"0.2.0\"\n-source = \"git+https://github.com/tommy-mor/durable.git?branch=main#a6c14eaa809693140eea0c22b07ef24d8e74adaf\"\n+source = \"git+https://github.com/tommy-mor/durable.git?rev=a6c14eaa809693140eea0c22b07ef24d8e74adaf#a6c14eaa809693140eea0c22b07ef24d8e74adaf\"\n dependencies = [\n  \"ciborium\",\n  \"durable-derive\",\n@@ -426,7 +426,7 @@ dependencies = [\n [[package]]\n name = \"durable-derive\"\n version = \"0.2.0\"\n-source = \"git+https://github.com/tommy-mor/durable.git?branch=main#a6c14eaa809693140eea0c22b07ef24d8e74adaf\"\n+source = \"git+https://github.com/tommy-mor/durable.git?rev=a6c14eaa809693140eea0c22b07ef24d8e74adaf#a6c14eaa809693140eea0c22b07ef24d8e74adaf\"\n dependencies = [\n  \"proc-macro2\",\n  \"quote\",\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex dfa39beddecfa37dcdeaa602cb30f4b547528fbb..bd88687fb0ba47d68f2c08eb5e11d0e08b7c4398 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -25,7 +25,7 @@ futures-util = { version = \"0.3\", default-features = false, features = [\"std\"] }\n rand = \"0.8\"\n urlencoding = \"2\"\n url = \"2\"\n-durable = { git = \"https://github.com/tommy-mor/durable.git\", branch = \"main\" }\n+durable = { git = \"https://github.com/tommy-mor/durable.git\", rev = \"a6c14eaa809693140eea0c22b07ef24d8e74adaf\" }\n \n [dev-dependencies]\n reqwest = { version = \"0.12\", features = [\"json\"] }\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex b86581b1f337650564274254d840e8a75b49524d..9da62ffbed07eb28729aa3160bf33b07ce0d7945 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -71,10 +71,16 @@ pub async fn post_ui_html(\n                 return resp;\n             }\n             let parent = parent_from_scope(&scope);\n-            let actor = resolve_vote_actor(\n+            let actor = match resolve_vote_actor(\n                 state.projection_store.db(),\n                 session_id_from_jar(&jar).as_deref(),\n-            );\n+            ) {\n+                Ok(actor) => actor,\n+                Err(_) => {\n+                    return vote_auth_redirect(&state, &jar)\n+                        .unwrap_or_else(|| login_redirect_js().into_response());\n+                }\n+            };\n             if let Err(e) = state\n                 .record_vote(&parent, &a, &b, ratio_left, ratio_right, &actor)\n                 .await\ndiff --git a/server/src/auth/config.rs b/server/src/auth/config.rs\nindex a1f042c655bf3e5234eeb87a7d889f64592807fb..a5976af9a52ea207b35ae87bd1fe927c47a477ca 100644\n--- a/server/src/auth/config.rs\n+++ b/server/src/auth/config.rs\n@@ -1,9 +1,42 @@\n pub const AUTH_RETURN_COOKIE: &str = \"sorter2_auth_return\";\n \n+/// Allow `mock_user` on `/auth/github` (test harness only).\n+pub fn mock_oauth_allowed() -> bool {\n+    matches!(\n+        std::env::var(\"SORTER2_ALLOW_MOCK_OAUTH\").as_deref(),\n+        Ok(\"1\") | Ok(\"true\") | Ok(\"TRUE\")\n+    )\n+}\n+\n+/// Set the Secure flag on auth cookies when serving over HTTPS.\n+pub fn cookies_secure() -> bool {\n+    std::env::var(\"SORTER2_BASE_URL\")\n+        .map(|u| u.starts_with(\"https://\"))\n+        .unwrap_or(false)\n+}\n+\n pub fn sanitize_return_to(raw: &str) -> String {\n     let s = raw.trim();\n-    if s.is_empty() || !s.starts_with('/') || s.starts_with(\"//\") {\n+    if s.is_empty() || !s.starts_with('/') || s.starts_with(\"//\") || s.starts_with(\"/\\\\\") {\n+        return \"/\".to_string();\n+    }\n+    // Reject scheme-relative and protocol-smuggling forms.\n+    if s.contains(\"://\") || s.contains('\\\\') {\n         return \"/\".to_string();\n     }\n     s.to_string()\n }\n+\n+#[cfg(test)]\n+mod tests {\n+    use super::*;\n+\n+    #[test]\n+    fn sanitize_return_to_blocks_open_redirects() {\n+        assert_eq!(sanitize_return_to(\"\"), \"/\");\n+        assert_eq!(sanitize_return_to(\"//evil.com\"), \"/\");\n+        assert_eq!(sanitize_return_to(\"/\\\\evil.com\"), \"/\");\n+        assert_eq!(sanitize_return_to(\"https://evil.com\"), \"/\");\n+        assert_eq!(sanitize_return_to(\"/vote?parent=x\"), \"/vote?parent=x\");\n+    }\n+}\ndiff --git a/server/src/auth/mod.rs b/server/src/auth/mod.rs\nindex 5ed535ba199fa736f0048c32623b14c3b1e5de2d..d4a85ef52c15dc35148e4c743f0d646cbbdb056d 100644\n--- a/server/src/auth/mod.rs\n+++ b/server/src/auth/mod.rs\n@@ -26,7 +26,7 @@ use crate::{\n     ui_action::UI_RPC_FIELD,\n };\n \n-pub use session::{resolve_vote_actor, session_id_from_jar, VoteActor};\n+pub use session::{nav_pseudonym, resolve_vote_actor, session_id_from_jar, VoteActor};\n \n pub fn base_url_from_env(port: u16) -> String {\n     std::env::var(\"SORTER2_BASE_URL\")\n@@ -168,6 +168,10 @@ pub async fn login_page(\n         \"login · sorter2\",\n         login_body(session.as_ref(), &aliases, &providers),\n         state.views.get_views(\"/login\"),\n+        session\n+            .as_ref()\n+            .filter(|s| !s.pseudonym.trim().is_empty())\n+            .map(|s| s.pseudonym.as_str()),\n     );\n     (jar, Html(markup.into_string())).into_response()\n }\n@@ -222,6 +226,7 @@ pub async fn alias_page(\n             \"choose alias · sorter2\",\n             body,\n             state.views.get_views(\"/login/alias\"),\n+            None,\n         )\n         .into_string(),\n     )\n@@ -237,7 +242,12 @@ pub async fn github_start(\n         .ok_or(StatusCode::SERVICE_UNAVAILABLE)?;\n     let return_to = return_from_query_or_jar(&jar, query.return_to.as_deref());\n     let state_token = session::new_oauth_state();\n-    let url = oauth::authorize_url(&cfg, &state_token, query.mock_user.as_deref());\n+    let mock_user = if config::mock_oauth_allowed() {\n+        query.mock_user.as_deref()\n+    } else {\n+        None\n+    };\n+    let url = oauth::authorize_url(&cfg, &state_token, mock_user);\n     let jar = jar\n         .add(session::oauth_state_cookie_value(&state_token))\n         .add(session::auth_return_cookie_value(&return_to));\ndiff --git a/server/src/auth/session.rs b/server/src/auth/session.rs\nindex 09659240b9455c6fca12db5652e1d31cf8c2acfc..41df030ded3abcafc0ab3887ab769adf103f9aa0 100644\n--- a/server/src/auth/session.rs\n+++ b/server/src/auth/session.rs\n@@ -5,7 +5,7 @@ use durable::{Db, Durability};\n use rand::Rng;\n \n use crate::{\n-    auth::config::AUTH_RETURN_COOKIE,\n+    auth::config::{self, AUTH_RETURN_COOKIE},\n     fetch::now_ms,\n     identity::{DEFAULT_ACTOR_UUID, DEFAULT_PSEUDONYM},\n     storage_dto::{SessionDataV1, SESSION_DATA_VERSION},\n@@ -37,6 +37,7 @@ pub struct VoteActor {\n }\n \n impl VoteActor {\n+    /// Test / bench helper: seed votes as the default pseudonym without a session.\n     pub fn anon() -> Self {\n         Self {\n             pseudonym: DEFAULT_PSEUDONYM.to_string(),\n@@ -70,20 +71,51 @@ fn hex_encode(bytes: &[u8]) -> String {\n     bytes.iter().map(|b| format!(\"{b:02x}\")).collect()\n }\n \n-pub fn resolve_vote_actor(db: &Db, session_id: Option<&str>) -> VoteActor {\n-    let Some(session_id) = session_id else {\n-        return VoteActor::anon();\n-    };\n-    let Ok(Some(session)) = load_session(db, session_id) else {\n-        return VoteActor::anon();\n-    };\n-    if session.expires_at <= now_ms() {\n-        return VoteActor::anon();\n+fn build_cookie(name: &'static str, value: String) -> Cookie<'static> {\n+    let mut builder = Cookie::build((name, value))\n+        .http_only(true)\n+        .same_site(SameSite::Lax)\n+        .path(\"/\");\n+    if config::cookies_secure() {\n+        builder = builder.secure(true);\n+    }\n+    builder.build()\n+}\n+\n+fn clear_cookie(name: &'static str) -> Cookie<'static> {\n+    let mut builder = Cookie::build((name, \"\"))\n+        .http_only(true)\n+        .same_site(SameSite::Lax)\n+        .path(\"/\")\n+        .removal();\n+    if config::cookies_secure() {\n+        builder = builder.secure(true);\n+    }\n+    builder.build()\n+}\n+\n+/// Resolve the vote actor from a live session. Fail-closed: never falls back to anon.\n+pub fn resolve_vote_actor(db: &Db, session_id: Option<&str>) -> Result<VoteActor, &'static str> {\n+    let session_id = session_id.ok_or(\"sign in to vote\")?;\n+    let session = load_valid_session(db, session_id).ok_or(\"session expired\")?;\n+    if !session_has_pseudonym(&session) {\n+        return Err(\"choose an alias first\");\n     }\n     let trust_weight = user_trust_weight(db, &session.uuid).unwrap_or(1.0);\n-    VoteActor {\n+    Ok(VoteActor {\n         pseudonym: session.current_pseudonym,\n         trust_weight,\n+    })\n+}\n+\n+/// Display name for the top nav, if any session is active.\n+pub fn nav_pseudonym(db: &Db, jar: &CookieJar) -> Option<String> {\n+    let session_id = session_id_from_jar(jar)?;\n+    let session = load_valid_session(db, &session_id)?;\n+    if session_has_pseudonym(&session) {\n+        Some(session.current_pseudonym)\n+    } else {\n+        None\n     }\n }\n \n@@ -151,54 +183,27 @@ pub fn destroy_session(db: &Db, session_id: &str) -> Result<(), String> {\n }\n \n pub fn session_cookie_value(session_id: &str) -> Cookie<'static> {\n-    Cookie::build((SESSION_COOKIE, session_id.to_string()))\n-        .http_only(true)\n-        .same_site(SameSite::Lax)\n-        .path(\"/\")\n-        .build()\n+    build_cookie(SESSION_COOKIE, session_id.to_string())\n }\n \n pub fn clear_session_cookie() -> Cookie<'static> {\n-    Cookie::build((SESSION_COOKIE, \"\"))\n-        .http_only(true)\n-        .same_site(SameSite::Lax)\n-        .path(\"/\")\n-        .removal()\n-        .build()\n+    clear_cookie(SESSION_COOKIE)\n }\n \n pub fn oauth_state_cookie_value(state: &str) -> Cookie<'static> {\n-    Cookie::build((OAUTH_STATE_COOKIE, state.to_string()))\n-        .http_only(true)\n-        .same_site(SameSite::Lax)\n-        .path(\"/\")\n-        .build()\n+    build_cookie(OAUTH_STATE_COOKIE, state.to_string())\n }\n \n pub fn clear_oauth_state_cookie() -> Cookie<'static> {\n-    Cookie::build((OAUTH_STATE_COOKIE, \"\"))\n-        .http_only(true)\n-        .same_site(SameSite::Lax)\n-        .path(\"/\")\n-        .removal()\n-        .build()\n+    clear_cookie(OAUTH_STATE_COOKIE)\n }\n \n pub fn auth_return_cookie_value(return_to: &str) -> Cookie<'static> {\n-    Cookie::build((AUTH_RETURN_COOKIE, return_to.to_string()))\n-        .http_only(true)\n-        .same_site(SameSite::Lax)\n-        .path(\"/\")\n-        .build()\n+    build_cookie(AUTH_RETURN_COOKIE, return_to.to_string())\n }\n \n pub fn clear_auth_return_cookie() -> Cookie<'static> {\n-    Cookie::build((AUTH_RETURN_COOKIE, \"\"))\n-        .http_only(true)\n-        .same_site(SameSite::Lax)\n-        .path(\"/\")\n-        .removal()\n-        .build()\n+    clear_cookie(AUTH_RETURN_COOKIE)\n }\n \n pub fn auth_return_from_jar(jar: &CookieJar) -> Option<String> {\n@@ -213,28 +218,35 @@ pub fn oauth_state_from_jar(jar: &CookieJar) -> Option<String> {\n     jar.get(OAUTH_STATE_COOKIE).map(|c| c.value().to_string())\n }\n \n-pub fn actor_uuid_for_vote(db: &Db, session_id: Option<&str>) -> String {\n-    let Some(session_id) = session_id else {\n-        return DEFAULT_ACTOR_UUID.to_string();\n-    };\n-    load_session(db, session_id)\n-        .ok()\n-        .flatten()\n-        .filter(|s| s.expires_at > now_ms())\n-        .map(|s| s.uuid)\n-        .unwrap_or_else(|| DEFAULT_ACTOR_UUID.to_string())\n-}\n-\n #[cfg(test)]\n mod tests {\n     use super::*;\n \n     #[test]\n-    fn missing_session_falls_back_to_anon() {\n+    fn missing_session_is_error() {\n+        let dir = tempfile::tempdir().unwrap();\n+        let db = Db::open(dir.path()).unwrap();\n+        assert_eq!(resolve_vote_actor(&db, None).unwrap_err(), \"sign in to vote\");\n+    }\n+\n+    #[test]\n+    fn session_without_pseudonym_is_error() {\n+        let dir = tempfile::tempdir().unwrap();\n+        let db = Db::open(dir.path()).unwrap();\n+        let (id, _) = create_session(&db, DEFAULT_ACTOR_UUID, \"\").unwrap();\n+        assert_eq!(\n+            resolve_vote_actor(&db, Some(&id)).unwrap_err(),\n+            \"choose an alias first\"\n+        );\n+    }\n+\n+    #[test]\n+    fn session_with_pseudonym_resolves() {\n         let dir = tempfile::tempdir().unwrap();\n         let db = Db::open(dir.path()).unwrap();\n-        let actor = resolve_vote_actor(&db, None);\n-        assert_eq!(actor.pseudonym, DEFAULT_PSEUDONYM);\n+        let (id, _) = create_session(&db, DEFAULT_ACTOR_UUID, \"alice\").unwrap();\n+        let actor = resolve_vote_actor(&db, Some(&id)).unwrap();\n+        assert_eq!(actor.pseudonym, \"alice\");\n         assert_eq!(actor.trust_weight, 1.0);\n     }\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 46d18b87f1313bf0aeb29955d18f291961057509..3cc3d7bdf55b5cb5d009600f4ade1fcd201a410b 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -4,11 +4,13 @@ use axum::{\n     http::{header, StatusCode, Uri},\n     response::{IntoResponse, Response},\n };\n+use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup, DOCTYPE};\n \n use std::collections::HashSet;\n \n use crate::{\n+    auth::nav_pseudonym,\n     fetch::html::entity_section,\n     form_template::template_json_compact,\n     path_types::ItemId,\n@@ -126,7 +128,7 @@ pub fn now_ms() -> i64 {\n     t.as_millis() as i64\n }\n \n-pub(crate) fn layout(title: &str, body: Markup, views: u64) -> Markup {\n+pub(crate) fn layout(title: &str, body: Markup, views: u64, nav_user: Option<&str>) -> Markup {\n     let ver = asset_version();\n     let css_href = format!(\"/static/sorter.css?v={ver}\");\n     let js_src = format!(\"/static/sorter_ui.js?v={ver}\");\n@@ -145,7 +147,15 @@ pub(crate) fn layout(title: &str, body: Markup, views: u64) -> Markup {\n                     span class=\"view-meta muted\" { (views) \" views\" }\n                 }\n                 nav class=\"top-nav\" {\n-                    a href=\"/login\" { \"login\" }\n+                    @if let Some(name) = nav_user {\n+                        span class=\"top-nav-user\" data-testid=\"nav-user\" { (name) }\n+                        a href=\"/login\" { \"account\" }\n+                        form class=\"top-nav-logout\" method=\"post\" action=\"/auth/logout\" data-navigate=\"full\" {\n+                            button type=\"submit\" data-testid=\"nav-logout\" { \"log out\" }\n+                        }\n+                    } @else {\n+                        a href=\"/login\" data-testid=\"nav-login\" { \"login\" }\n+                    }\n                 }\n                 div id=\"errors\" {}\n                 (body)\n@@ -481,10 +491,11 @@ pub fn input_panel(query: &str, error: Option<&str>) -> Markup {\n     }\n }\n \n-async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n+async fn item_page(state: AppState, uri: Uri, item: ItemId, jar: CookieJar) -> Markup {\n     let path = uri.path().to_string();\n     state.views.increment(path.clone());\n     let views = state.views.get_views(&path);\n+    let nav_user = nav_pseudonym(state.projection_store.db(), &jar);\n \n     let tree = state\n         .scope_tree(&item)\n@@ -513,16 +524,24 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n             (ranking_panel(&item, node, &tree))\n         }\n     };\n-    layout(\"sorter2\", body, views)\n+    layout(\"sorter2\", body, views, nav_user.as_deref())\n }\n \n-pub async fn home(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {\n-    item_page(state, uri, ItemId::root()).await\n+pub async fn home(\n+    State(state): State<AppState>,\n+    jar: CookieJar,\n+    uri: Uri,\n+) -> impl IntoResponse {\n+    item_page(state, uri, ItemId::root(), jar).await\n }\n \n-pub async fn browse(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {\n+pub async fn browse(\n+    State(state): State<AppState>,\n+    jar: CookieJar,\n+    uri: Uri,\n+) -> impl IntoResponse {\n     let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n-    item_page(state, uri, item).await\n+    item_page(state, uri, item, jar).await\n }\n \n #[cfg(test)]\ndiff --git a/server/src/html/vote.rs b/server/src/html/vote.rs\nindex 3aa00c417c89a9cab3417c650b50ed7c73f08e20..cadbec188b17a48a63b269c0e2fa2ea8ffedd7ed 100644\n--- a/server/src/html/vote.rs\n+++ b/server/src/html/vote.rs\n@@ -4,11 +4,13 @@ use axum::{\n     extract::{Query, State},\n     response::{Html, IntoResponse},\n };\n+use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup};\n use serde::Deserialize;\n use std::collections::HashSet;\n \n use crate::{\n+    auth::nav_pseudonym,\n     fetch::html::entity_section,\n     form_template::template_json_compact,\n     html::{ranking_panel_with_highlights, scope_theme_style, JsBuilder},\n@@ -262,6 +264,7 @@ fn suggest_next(\n \n pub async fn vote_page(\n     State(state): State<AppState>,\n+    jar: CookieJar,\n     Query(q): Query<VoteQuery>,\n ) -> impl IntoResponse {\n     let parent = parse_item_param(&q.parent);\n@@ -329,8 +332,9 @@ pub async fn vote_page(\n     let path = format!(\"/vote?parent={}\", urlencoding::encode(parent.as_str()));\n     state.views.increment(path.clone());\n     let views = state.views.get_views(&path);\n+    let nav_user = nav_pseudonym(state.projection_store.db(), &jar);\n \n-    Html(layout(&title, body, views).into_string()).into_response()\n+    Html(layout(&title, body, views, nav_user.as_deref()).into_string()).into_response()\n }\n \n #[cfg(test)]\ndiff --git a/server/static/sorter.css b/server/static/sorter.css\nindex e66a1e6c1acc473c8ff1ddb1e16e75a82d33741c..257280b6b490c65222e580a325b77351cac6cc6b 100644\n--- a/server/static/sorter.css\n+++ b/server/static/sorter.css\n@@ -34,6 +34,47 @@ body {\n   font-size: 0.75rem;\n }\n \n+.top-nav {\n+  display: flex;\n+  align-items: center;\n+  justify-content: flex-end;\n+  gap: 0.75rem;\n+  padding: 0.5rem 1rem;\n+  font-size: 0.875rem;\n+}\n+\n+.top-nav a {\n+  color: var(--muted);\n+  text-decoration: none;\n+}\n+\n+.top-nav a:hover {\n+  color: var(--fg);\n+}\n+\n+.top-nav-user {\n+  color: var(--fg);\n+  font-weight: 600;\n+}\n+\n+.top-nav-logout {\n+  display: inline;\n+  margin: 0;\n+}\n+\n+.top-nav-logout button {\n+  background: none;\n+  border: none;\n+  padding: 0;\n+  color: var(--muted);\n+  font: inherit;\n+  cursor: pointer;\n+}\n+\n+.top-nav-logout button:hover {\n+  color: var(--fg);\n+}\n+\n .btn-primary {\n   background: var(--accent);\n   color: var(--accent-fg, #0f1115);\ndiff --git a/test/support/harness.clj b/test/support/harness.clj\nindex 3f05951f418258642dcacb4a10ccccc8bfbe8748..4505ece5aa193e826ca61c52f1467d252080d66b 100644\n--- a/test/support/harness.clj\n+++ b/test/support/harness.clj\n@@ -43,6 +43,7 @@\n          \"SORTER2_VIEWS_LOG\" (str data-dir \"/views.jsonl\")\n          \"PORT\" (str app-port)\n          \"SORTER2_BASE_URL\" (str \"http://127.0.0.1:\" app-port)\n+         \"SORTER2_ALLOW_MOCK_OAUTH\" \"1\"\n          \"GITHUB_CLIENT_ID\" \"test-client\"\n          \"GITHUB_CLIENT_SECRET\" \"test-secret\"\n          \"GITHUB_OAUTH_BASE\" (str \"http://127.0.0.1:\" oauth-port)\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[40b975bf] nice\n\nSide B — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 266e876bb7ccbe788beb1d5bd53ad5b45ee5825b..2cea973082716e761ef6f5dd5886acc08ff9aac0 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -222,6 +222,12 @@ dependencies = [\n  \"syn\",\n ]\n \n+[[package]]\n+name = \"dotenvy\"\n+version = \"0.15.7\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b\"\n+\n [[package]]\n name = \"encoding_rs\"\n version = \"0.8.35\"\n@@ -1238,6 +1244,7 @@ version = \"0.0.1\"\n dependencies = [\n  \"axum\",\n  \"axum-extra\",\n+ \"dotenvy\",\n  \"maud\",\n  \"reqwest\",\n  \"serde\",\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex 4677fedcb45292eebebe7e9cf6ce2f5738f18ddf..bd600138b613bd0f546bdec217a5334cdcb20aa5 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -17,6 +17,7 @@ tower-http = { version = \"0.5\", features = [\"trace\"] }\n tracing = \"0.1\"\n tracing-subscriber = { version = \"0.3\", features = [\"env-filter\"] }\n reqwest = { version = \"0.12\", features = [\"json\"] }\n+dotenvy = \"0.15\"\n \n [dev-dependencies]\n reqwest = { version = \"0.12\", features = [\"json\"] }\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex d2024bd4582bcc8482b461b2ba4fedbd8bff7c66..b33a84e8bb5e817b26592868d88090e6d664d950 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -6,7 +6,7 @@ use axum::{\n use std::collections::HashMap;\n \n use crate::{\n-    html::{input_panel, js_string_literal, ranking_panel, JsBuilder},\n+    html::{entity_section, input_panel, js_string_literal, ranking_panel, JsBuilder},\n     parser::parse_reddit_url,\n     path_types::ItemId,\n     reddit::ensure_partial_tree,\n@@ -87,6 +87,20 @@ pub async fn post_ui_html(\n                     .into_response()\n             }\n         },\n+        HtmlUiAction::FetchEntity { item } => {\n+            let id = parse_item_param(&item);\n+            if id.is_root() {\n+                return ui_js_warn(\"nothing to fetch for the root\").into_response();\n+            }\n+            state.queue_entity_fetch(id.clone());\n+            let tree = state.tree.read().await;\n+            let empty = crate::reducer::NodeState::default();\n+            let node = tree.get(&id).unwrap_or(&empty);\n+            let panel = entity_section(&id, node, true);\n+            JsBuilder::new()\n+                .morph_selector(\"#entity-section\", panel)\n+                .into_response()\n+        },\n     }\n }\n \ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex ed5be6b13b9d46e838831d6ce0f96f569b401730..07ce24b5e56cf72b0b442c3c3241efbf6c3b006a 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -1,4 +1,5 @@\n use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n \n #[derive(Debug, Clone, Serialize, Deserialize)]\n #[serde(tag = \"type\", rename_all = \"snake_case\")]\n@@ -18,4 +19,10 @@ pub enum Event {\n     },\n     /// Register a node path in the fractal tree (no external fetch).\n     NodeEnsured { id: String },\n+    /// Full upstream API payload for a node (domain-specific view derived at replay/render time).\n+    EntityImported {\n+        id: String,\n+        ts: i64,\n+        payload: Value,\n+    },\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex df6505021d9f446c2b453e20e3eb3cf696a111f9..caf1309c8d93b47104499c57f9cc35ee7631fbb9 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -10,6 +10,7 @@ use crate::{\n     form_template::template_json_compact,\n     path_types::ItemId,\n     ranking::{top_bottom, RankedItem},\n+    reddit::is_fetchable,\n     reducer::{GroupState, NodeState},\n     state::AppState,\n     ui_action::UI_RPC_FIELD,\n@@ -151,7 +152,7 @@ pub fn breadcrumb_path(item: &ItemId) -> Markup {\n fn entity_panel(node: &NodeState) -> Markup {\n     html! {\n         @if let Some(data) = &node.data {\n-            section id=\"entity-panel\" class=\"demo-panel entity-card\" {\n+            div id=\"entity-panel\" class=\"entity-card\" {\n                 h2 { (data.title) }\n                 @if let Some(author) = &data.author {\n                     p class=\"muted small\" { \"by \" (author) }\n@@ -164,6 +165,42 @@ fn entity_panel(node: &NodeState) -> Markup {\n     }\n }\n \n+/// Reddit/API import control — only shown on fetchable pages; never auto-fires.\n+pub fn fetch_entity_panel(item: &ItemId, has_data: bool, fetching: bool) -> Markup {\n+    if !is_fetchable(item) {\n+        return html! {};\n+    }\n+    let label = if fetching {\n+        \"Fetching…\"\n+    } else if has_data {\n+        \"Fetch more\"\n+    } else {\n+        \"Fetch from Reddit\"\n+    };\n+    let rpc = template_json_compact(&serde_json::json!({\n+        \"action\": \"fetch_entity\",\n+        \"item\": item.as_str(),\n+    }))\n+    .expect(\"fetch_entity rpc template\");\n+    html! {\n+        form method=\"post\" action=\"/ui\" id=\"fetch-entity-form\" class=\"fetch-entity-form\" {\n+            input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc);\n+            button type=\"submit\" class=\"btn-secondary\" disabled=(fetching) { (label) }\n+        }\n+    }\n+}\n+\n+/// Entity card + explicit fetch control (morphed as `#entity-section`).\n+pub fn entity_section(item: &ItemId, node: &NodeState, fetching: bool) -> Markup {\n+    let has_data = node.data.is_some();\n+    html! {\n+        section id=\"entity-section\" class=\"demo-panel\" {\n+            (entity_panel(node))\n+            (fetch_entity_panel(item, has_data, fetching))\n+        }\n+    }\n+}\n+\n fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {\n     html! {\n         @if !items.is_empty() {\n@@ -260,7 +297,7 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n         h1 { \"sorter\" }\n         (input_panel(\"\", None))\n         (breadcrumb_path(&item))\n-        (entity_panel(node))\n+        (entity_section(&item, node, false))\n         (ranking_panel(&item, group))\n     };\n     layout(\"sorter2\", body, views)\n@@ -272,16 +309,5 @@ pub async fn home(State(state): State<AppState>, uri: Uri) -> impl IntoResponse\n \n pub async fn browse(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {\n     let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n-    if item.as_str().starts_with(\"reddit.com\") {\n-        let needs_fetch = {\n-            let tree = state.tree.read().await;\n-            tree.get(&item)\n-                .map(|n| n.data.is_none())\n-                .unwrap_or(true)\n-        };\n-        if needs_fetch {\n-            state.reddit.request_fetch(item.clone());\n-        }\n-    }\n     item_page(state, uri, item).await\n }\ndiff --git a/server/src/main.rs b/server/src/main.rs\nindex c22ec6c9f5358e5ec99fb83210dc351938505a93..1f0cddc39302b35b0cd6a6219f44c9d59202facf 100644\n--- a/server/src/main.rs\n+++ b/server/src/main.rs\n@@ -2,6 +2,10 @@ use sorter2_server::state::AppConfig;\n \n #[tokio::main]\n async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n+    if std::env::var(\"SORTER2_SKIP_DOTENV\").is_err() {\n+        let _ = dotenvy::dotenv();\n+    }\n+\n     tracing_subscriber::fmt()\n         .with_env_filter(\n             tracing_subscriber::EnvFilter::try_from_default_env()\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex 90053ad03b1d7c8e94f325dd4ee64c2b4f7da900..ff0f01e57b18af878eb5be3efc47204a7673589d 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -6,11 +6,15 @@ use std::time::{Duration, Instant};\n \n use reqwest::{header, Client, StatusCode};\n use serde::Deserialize;\n+use serde_json::Value;\n use tokio::sync::{mpsc, RwLock};\n \n use crate::{\n+    event_log::EventLog,\n+    events::Event,\n+    html::now_ms,\n     path_types::ItemId,\n-    reducer::{EntityData, GlobalTree},\n+    reducer::GlobalTree,\n };\n \n /// Bootstrap blank nodes along a URL path so breadcrumbs and voting work before fetch.\n@@ -20,6 +24,8 @@ pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) {\n \n pub struct RedditCommand {\n     pub id: ItemId,\n+    /// User-initiated fetch bypasses the in-memory \"recently fetched\" cache.\n+    pub force: bool,\n }\n \n #[derive(Clone)]\n@@ -33,19 +39,31 @@ struct RedditCredentials {\n     client_secret: String,\n }\n \n+#[derive(Clone)]\n+pub struct RedditApiConfig {\n+    pub api_base: String,\n+    pub oauth_base: String,\n+    pub user_agent: String,\n+    creds: Option<RedditCredentials>,\n+}\n+\n struct OAuthToken {\n     access_token: String,\n     expires_at: Instant,\n }\n \n impl RedditBroker {\n-    pub fn spawn(tree: Arc<RwLock<GlobalTree>>, user_agent: &str) -> Self {\n+    pub fn spawn(\n+        tree: Arc<RwLock<GlobalTree>>,\n+        event_log: Arc<EventLog>,\n+        config: RedditApiConfig,\n+    ) -> Self {\n         let (tx, rx) = mpsc::channel(100);\n \n         let mut headers = header::HeaderMap::new();\n         headers.insert(\n             header::USER_AGENT,\n-            header::HeaderValue::from_str(user_agent).expect(\"valid user agent\"),\n+            header::HeaderValue::from_str(&config.user_agent).expect(\"valid user agent\"),\n         );\n \n         let client = Client::builder()\n@@ -54,22 +72,38 @@ impl RedditBroker {\n             .build()\n             .expect(\"reqwest client\");\n \n-        let creds = RedditCredentials::from_env();\n-        tokio::spawn(reddit_worker(rx, tree, client, creds));\n+        tokio::spawn(reddit_worker(rx, tree, event_log, client, config));\n \n         Self { tx }\n     }\n \n-    /// Fire-and-forget: queue a fetch; worker updates the tree when done.\n-    pub fn request_fetch(&self, id: ItemId) {\n-        let _ = self.tx.try_send(RedditCommand { id });\n+    /// Queue a fetch; drops when the channel is full (backpressure).\n+    pub fn request_fetch(&self, id: ItemId, force: bool) {\n+        let _ = self.tx.try_send(RedditCommand { id, force });\n+    }\n+}\n+\n+impl RedditApiConfig {\n+    pub fn from_env() -> Self {\n+        Self {\n+            api_base: reddit_api_base(),\n+            oauth_base: reddit_oauth_base(),\n+            user_agent: default_user_agent(),\n+            creds: RedditCredentials::from_env(),\n+        }\n     }\n }\n \n impl RedditCredentials {\n+    /// Reddit's OAuth docs call these \"client id\" and \"client secret\"; the app\n+    /// registration UI often labels them \"app id\" / \"app secret\" — same values.\n     fn from_env() -> Option<Self> {\n-        let client_id = std::env::var(\"REDDIT_CLIENT_ID\").ok()?;\n-        let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\").ok()?;\n+        let client_id = std::env::var(\"REDDIT_CLIENT_ID\")\n+            .or_else(|_| std::env::var(\"REDDIT_APP_ID\"))\n+            .ok()?;\n+        let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\")\n+            .or_else(|_| std::env::var(\"REDDIT_APP_SECRET\"))\n+            .ok()?;\n         if client_id.is_empty() || client_secret.is_empty() {\n             return None;\n         }\n@@ -80,29 +114,63 @@ impl RedditCredentials {\n     }\n }\n \n+pub fn reddit_api_base() -> String {\n+    std::env::var(\"REDDIT_API_BASE\").unwrap_or_else(|_| \"https://www.reddit.com\".into())\n+}\n+\n+pub fn reddit_oauth_base() -> String {\n+    std::env::var(\"REDDIT_OAUTH_BASE\").unwrap_or_else(|_| \"https://www.reddit.com\".into())\n+}\n+\n pub fn default_user_agent() -> String {\n     std::env::var(\"REDDIT_USER_AGENT\").unwrap_or_else(|_| {\n         \"web:sorter2.social:v0.0.1 (by /u/sorter2)\".to_string()\n     })\n }\n \n+/// True when this node can be loaded from the Reddit JSON API.\n+pub fn is_fetchable(id: &ItemId) -> bool {\n+    !map_item_to_reddit_api(id, \"https://example.com\").is_empty()\n+}\n+\n+/// Derive UI-facing fields from a stored payload (Reddit-specific when under reddit.com).\n+pub fn entity_view_from_payload(id: &ItemId, payload: &Value) -> Option<crate::reducer::EntityData> {\n+    if id.as_str().starts_with(\"reddit.com\") {\n+        return parse_reddit_view(id, payload);\n+    }\n+    None\n+}\n+\n+/// Apply a full API payload to the in-memory tree (view derived for known domains).\n+pub fn apply_entity_import(tree: &mut GlobalTree, id: &ItemId, payload: Value) {\n+    let view = entity_view_from_payload(id, &payload);\n+    tree.apply_entity_raw(id, payload, view);\n+}\n+\n async fn reddit_worker(\n     mut rx: mpsc::Receiver<RedditCommand>,\n     tree: Arc<RwLock<GlobalTree>>,\n+    event_log: Arc<EventLog>,\n     client: Client,\n-    creds: Option<RedditCredentials>,\n+    config: RedditApiConfig,\n ) {\n     let mut in_flight = HashSet::new();\n     let mut recently_fetched: HashMap<ItemId, Instant> = HashMap::new();\n     let mut current_delay = Duration::from_secs(1);\n     let mut oauth: Option<OAuthToken> = None;\n     let cache_ttl = Duration::from_secs(300);\n+    let creds = config.creds.clone();\n+    let api_base = config.api_base.clone();\n+    let oauth_base = config.oauth_base.clone();\n \n     while let Some(cmd) = rx.recv().await {\n         let now = Instant::now();\n         recently_fetched.retain(|_, t| now.duration_since(*t) < cache_ttl);\n \n-        if in_flight.contains(&cmd.id) || recently_fetched.contains_key(&cmd.id) {\n+        if in_flight.contains(&cmd.id) {\n+            continue;\n+        }\n+        if !cmd.force && recently_fetched.contains_key(&cmd.id) {\n             continue;\n         }\n \n@@ -112,18 +180,26 @@ async fn reddit_worker(\n         tokio::time::sleep(current_delay).await;\n \n         if let Some(c) = &creds {\n-            oauth = ensure_oauth_token(&client, c, oauth.take()).await;\n+            oauth = ensure_oauth_token(&client, &oauth_base, c, oauth.take()).await;\n         }\n \n         let token = oauth.as_ref().map(|t| t.access_token.as_str());\n-        let use_oauth = token.is_some();\n \n-        match do_fetch(&client, &fetch_id, use_oauth, token).await {\n-            Ok(FetchOutcome::Entity(data)) => {\n-                let mut w = tree.write().await;\n-                w.set_entity_data(&fetch_id, data);\n-                recently_fetched.insert(fetch_id.clone(), Instant::now());\n-                current_delay = Duration::from_millis(600);\n+        match do_fetch(&client, &api_base, &fetch_id, token).await {\n+            Ok(FetchOutcome::Payload(payload)) => {\n+                let ts = now_ms();\n+                let event = Event::EntityImported {\n+                    id: fetch_id.as_str().to_string(),\n+                    ts,\n+                    payload: payload.clone(),\n+                };\n+                if let Err(e) = event_log.append(&event).await {\n+                    tracing::warn!(\"event log append failed for {}: {}\", fetch_id, e);\n+                } else {\n+                    apply_entity_import(&mut *tree.write().await, &fetch_id, payload);\n+                    recently_fetched.insert(fetch_id.clone(), Instant::now());\n+                    current_delay = Duration::from_millis(600);\n+                }\n             }\n             Ok(FetchOutcome::NotFound) => {\n                 recently_fetched.insert(fetch_id.clone(), Instant::now());\n@@ -149,13 +225,14 @@ async fn reddit_worker(\n }\n \n enum FetchOutcome {\n-    Entity(EntityData),\n+    Payload(Value),\n     NotFound,\n     RateLimited { reset_secs: u64 },\n }\n \n async fn ensure_oauth_token(\n     client: &Client,\n+    oauth_base: &str,\n     creds: &RedditCredentials,\n     existing: Option<OAuthToken>,\n ) -> Option<OAuthToken> {\n@@ -165,8 +242,13 @@ async fn ensure_oauth_token(\n         }\n     }\n \n+    let url = format!(\n+        \"{}/api/v1/access_token\",\n+        oauth_base.trim_end_matches('/')\n+    );\n+\n     let resp = client\n-        .post(\"https://www.reddit.com/api/v1/access_token\")\n+        .post(&url)\n         .basic_auth(&creds.client_id, Some(&creds.client_secret))\n         .form(&[(\"grant_type\", \"client_credentials\")])\n         .send()\n@@ -207,11 +289,11 @@ async fn ensure_oauth_token(\n \n async fn do_fetch(\n     client: &Client,\n+    api_base: &str,\n     id: &ItemId,\n-    use_oauth: bool,\n     bearer: Option<&str>,\n ) -> Result<FetchOutcome, String> {\n-    let url = map_item_to_reddit_api(id, use_oauth);\n+    let url = map_item_to_reddit_api(id, api_base);\n     if url.is_empty() {\n         return Ok(FetchOutcome::NotFound);\n     }\n@@ -241,10 +323,8 @@ async fn do_fetch(\n         return Ok(FetchOutcome::RateLimited { reset_secs: reset });\n     }\n \n-    let bytes = resp.bytes().await.map_err(|e| e.to_string())?;\n-    Ok(parse_reddit_json(id, &bytes)\n-        .map(FetchOutcome::Entity)\n-        .unwrap_or(FetchOutcome::NotFound))\n+    let payload: Value = resp.json().await.map_err(|e| e.to_string())?;\n+    Ok(FetchOutcome::Payload(payload))\n }\n \n fn rate_limit_remaining(resp: &reqwest::Response) -> Option<u64> {\n@@ -264,18 +344,14 @@ fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 {\n         .unwrap_or(5)\n }\n \n-/// Map canonical item id to Reddit JSON API URL.\n-pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n+/// Map canonical item id to a Reddit JSON API URL under `api_base`.\n+pub fn map_item_to_reddit_api(id: &ItemId, api_base: &str) -> String {\n     let path = id.as_str();\n     if !path.starts_with(\"reddit.com/\") && path != \"reddit.com\" {\n         return String::new();\n     }\n \n-    let base = if oauth {\n-        \"https://oauth.reddit.com\"\n-    } else {\n-        \"https://www.reddit.com\"\n-    };\n+    let base = api_base.trim_end_matches('/');\n \n     let segments: Vec<&str> = path.split('/').collect();\n \n@@ -293,18 +369,17 @@ pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n     String::new()\n }\n \n-fn parse_reddit_json(id: &ItemId, bytes: &[u8]) -> Option<EntityData> {\n-    let v: serde_json::Value = serde_json::from_slice(bytes).ok()?;\n+fn parse_reddit_view(id: &ItemId, v: &Value) -> Option<crate::reducer::EntityData> {\n     let segments: Vec<&str> = id.as_str().split('/').collect();\n \n     if segments.iter().any(|&p| p == \"comments\") {\n-        parse_post_listing(&v)\n+        parse_post_listing(v)\n     } else {\n-        parse_subreddit_about(&v)\n+        parse_subreddit_about(v)\n     }\n }\n \n-fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n+fn parse_subreddit_about(v: &Value) -> Option<crate::reducer::EntityData> {\n     let data = v.get(\"data\")?;\n     let title = data\n         .get(\"title\")\n@@ -323,7 +398,7 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n         .filter(|s| !s.is_empty())\n         .map(|s| s.to_string());\n \n-    Some(EntityData {\n+    Some(crate::reducer::EntityData {\n         title,\n         author: None,\n         body_html,\n@@ -331,10 +406,9 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n     })\n }\n \n-fn parse_post_listing(v: &serde_json::Value) -> Option<EntityData> {\n+fn parse_post_listing(v: &Value) -> Option<crate::reducer::EntityData> {\n     let listing = v.as_array()?.first()?;\n-    let child = listing\n-        .pointer(\"/data/children/0/data\")?;\n+    let child = listing.pointer(\"/data/children/0/data\")?;\n     let title = child.get(\"title\")?.as_str()?.to_string();\n     let author = child\n         .get(\"author\")\n@@ -352,7 +426,7 @@ fn parse_post_listing(v: &serde_json::Value) -> Option<EntityData> {\n         .filter(|s| s.starts_with(\"http\"))\n         .map(|s| s.to_string());\n \n-    Some(EntityData {\n+    Some(crate::reducer::EntityData {\n         title,\n         author,\n         body_html,\n@@ -368,48 +442,51 @@ mod tests {\n     fn map_subreddit_about_url() {\n         let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n         assert_eq!(\n-            map_item_to_reddit_api(&id, false),\n+            map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n             \"https://www.reddit.com/r/rust/about.json?raw_json=1\"\n         );\n         assert_eq!(\n-            map_item_to_reddit_api(&id, true),\n-            \"https://oauth.reddit.com/r/rust/about.json?raw_json=1\"\n+            map_item_to_reddit_api(&id, \"http://127.0.0.1:9999\"),\n+            \"http://127.0.0.1:9999/r/rust/about.json?raw_json=1\"\n         );\n     }\n \n     #[test]\n     fn map_post_url() {\n-        let id =\n-            ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n+        let id = ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n         assert_eq!(\n-            map_item_to_reddit_api(&id, false),\n+            map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n             \"https://www.reddit.com/r/amitheasshole/comments/1trnvdl.json?raw_json=1\"\n         );\n     }\n \n     #[test]\n-    fn map_non_reddit_empty() {\n-        let id = ItemId::opaque(\"example.com/foo\");\n-        assert!(map_item_to_reddit_api(&id, false).is_empty());\n+    fn is_fetchable_reddit_sub() {\n+        let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+        assert!(is_fetchable(&id));\n+        assert!(!is_fetchable(&ItemId::opaque(\"example.com/x\")));\n     }\n \n     #[test]\n     fn parse_subreddit_fixture() {\n-        let json = r#\"{\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\",\"public_description\":\"systems\"}}\"#;\n-        let entity = parse_reddit_json(\n+        let json = include_str!(\"../../test/fixtures/reddit/r_rust_about.json\");\n+        let v: Value = serde_json::from_str(json).unwrap();\n+        let entity = entity_view_from_payload(\n             &ItemId::parse(\"reddit.com/r/rust\").unwrap(),\n-            json.as_bytes(),\n+            &v,\n         )\n         .unwrap();\n-        assert_eq!(entity.title, \"Rust\");\n+        assert_eq!(entity.title, \"The Rust Programming Language\");\n+        assert!(entity.body_html.as_ref().is_some_and(|b| b.contains(\"Rust\")));\n     }\n \n     #[test]\n     fn parse_post_fixture() {\n         let json = r#\"[{\"kind\":\"Listing\",\"data\":{\"children\":[{\"kind\":\"t3\",\"data\":{\"title\":\"AITA\",\"author\":\"op\",\"selftext_html\":\"&lt;p&gt;hi&lt;/p&gt;\",\"thumbnail\":\"https://b.thumbs.redditmedia.com/x.jpg\"}}]}}]\"#;\n-        let entity = parse_reddit_json(\n+        let v: Value = serde_json::from_str(json).unwrap();\n+        let entity = entity_view_from_payload(\n             &ItemId::parse(\"reddit.com/r/x/comments/abc\").unwrap(),\n-            json.as_bytes(),\n+            &v,\n         )\n         .unwrap();\n         assert_eq!(entity.title, \"AITA\");\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 077f700bf00ddefe18ffd004bb5288bdc7c4adaf..60db81a562e3590775012573225a76ba82a14563 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -1,6 +1,7 @@\n use std::collections::{HashMap, HashSet, VecDeque};\n \n use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n \n use crate::path_types::ItemId;\n \n@@ -128,6 +129,9 @@ pub struct EntityData {\n #[derive(Debug, Clone, Default)]\n pub struct NodeState {\n     pub id: ItemId,\n+    /// Full imported API JSON (persisted in the event log).\n+    pub entity_raw: Option<Value>,\n+    /// Domain-specific view derived from `entity_raw` (e.g. Reddit title/author).\n     pub data: Option<EntityData>,\n     pub children: HashSet<ItemId>,\n     pub local_ranking: GroupState,\n@@ -197,10 +201,11 @@ impl GlobalTree {\n         }\n     }\n \n-    pub fn set_entity_data(&mut self, id: &ItemId, data: EntityData) {\n+    pub fn apply_entity_raw(&mut self, id: &ItemId, payload: Value, view: Option<EntityData>) {\n         self.ensure_path(id);\n         if let Some(node) = self.nodes.get_mut(id) {\n-            node.data = Some(data);\n+            node.entity_raw = Some(payload);\n+            node.data = view;\n         }\n     }\n }\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 8c03aa60c15aee803a534439400b69935b1a3d84..d71d1079a8f486cdab15795384aef0b81b32544d 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -7,7 +7,7 @@ use crate::{\n     events::Event,\n     journal::JournalClient,\n     path_types::ItemId,\n-    reddit::{default_user_agent, RedditBroker},\n+    reddit::{apply_entity_import, RedditApiConfig, RedditBroker},\n     reducer::{GlobalTree, VoteData},\n     views::ViewStore,\n };\n@@ -108,13 +108,18 @@ impl AppState {\n                             tree.ensure_path(&parsed);\n                         }\n                     }\n+                    Event::EntityImported { id, payload, .. } => {\n+                        if let Some(parsed) = ItemId::parse(&id).or_else(|| ItemId::from_url(&id)) {\n+                            apply_entity_import(&mut tree, &parsed, payload);\n+                        }\n+                    }\n                 }\n             }\n         }\n \n         let tree = Arc::new(RwLock::new(tree));\n         let journal = JournalClient::spawn(tree.clone(), event_log.clone());\n-        let reddit = RedditBroker::spawn(tree.clone(), &default_user_agent());\n+        let reddit = RedditBroker::spawn(tree.clone(), event_log.clone(), RedditApiConfig::from_env());\n \n         Self {\n             cfg: Arc::new(cfg),\n@@ -135,10 +140,14 @@ impl AppState {\n             let mut w = self.tree.write().await;\n             w.ensure_path(id);\n         }\n-        self.reddit.request_fetch(id.clone());\n         Ok(())\n     }\n \n+    /// User-initiated Reddit/API import (via \"Fetch more\" — never on paste or navigate).\n+    pub fn queue_entity_fetch(&self, id: ItemId) {\n+        self.reddit.request_fetch(id, true);\n+    }\n+\n     pub async fn record_vote(\n         &self,\n         parent: &ItemId,\n@@ -169,6 +178,44 @@ impl AppState {\n #[cfg(test)]\n mod tests {\n     use super::{normalize_scope, parse_item_param};\n+    use crate::{\n+        event_log::EventLog,\n+        events::Event,\n+        path_types::ItemId,\n+        reddit::apply_entity_import,\n+        reducer::GlobalTree,\n+    };\n+    use serde_json::json;\n+\n+    #[tokio::test]\n+    async fn replay_entity_imported_restores_view() {\n+        let tmp = tempfile::tempdir().unwrap();\n+        let log_path = tmp.path().join(\"events.jsonl\");\n+        let log = EventLog::new(log_path.to_string_lossy().into_owned());\n+        let payload = json!({\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\"}});\n+        log.append(&Event::EntityImported {\n+            id: \"reddit.com/r/rust\".into(),\n+            ts: 1,\n+            payload: payload.clone(),\n+        })\n+        .await\n+        .unwrap();\n+\n+        let mut tree = GlobalTree::new();\n+        let (events, _) = log.load_all().await.unwrap();\n+        for ev in events {\n+            if let Event::EntityImported { id, payload, .. } = ev {\n+                let parsed = ItemId::parse(&id).unwrap();\n+                apply_entity_import(&mut tree, &parsed, payload);\n+            }\n+        }\n+        let node = tree.get(&ItemId::parse(\"reddit.com/r/rust\").unwrap()).unwrap();\n+        assert_eq!(node.data.as_ref().unwrap().title, \"Rust\");\n+        assert_eq!(\n+            node.entity_raw.as_ref().unwrap()[\"data\"][\"display_name\"],\n+            \"rust\"\n+        );\n+    }\n \n     #[test]\n     fn normalize_scope_strips_prefix_and_lowercases() {\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex d798874d1d94c0dfee59ec1ff703f9ee6ef432c0..3d6a49a2a3fb950752827efe1f5a049308f09baf 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -26,6 +26,10 @@ pub enum HtmlUiAction {\n     ParseQuery {\n         query: String,\n     },\n+    /// Fetch upstream entity data for the current page (explicit user action only).\n+    FetchEntity {\n+        item: String,\n+    },\n }\n \n #[derive(Debug, Error)]\ndiff --git a/server/static/sorter.css b/server/static/sorter.css\nindex 36f68d415cea33c8562d5d02c0c9d4c5b225a782..1f9f5158414902d43a380dd899232c70d8cf5d63 100644\n--- a/server/static/sorter.css\n+++ b/server/static/sorter.css\n@@ -52,6 +52,25 @@ body {\n   filter: brightness(1.1);\n }\n \n+.btn-secondary {\n+  background: transparent;\n+  color: var(--accent);\n+  border: 1px solid var(--border);\n+  padding: 0.4rem 0.85rem;\n+  font-size: 0.9rem;\n+  cursor: pointer;\n+  margin-top: 0.75rem;\n+}\n+\n+.btn-secondary:disabled {\n+  opacity: 0.6;\n+  cursor: wait;\n+}\n+\n+.fetch-entity-form {\n+  margin-top: 0.5rem;\n+}\n+\n code {\n   font-size: 0.85em;\n   background: var(--bg);\ndiff --git a/test/fixtures/reddit/r_rust_about.json b/test/fixtures/reddit/r_rust_about.json\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..bb7fd74ab00d63356d9b672a775996ed155b984d\n--- /dev/null\n+++ b/test/fixtures/reddit/r_rust_about.json\n@@ -0,0 +1,21 @@\n+{\n+  \"kind\": \"t5\",\n+  \"data\": {\n+    \"user_flair_background_color\": null,\n+    \"submit_text_html\": null,\n+    \"banner_img\": \"\",\n+    \"user_is_banned\": null,\n+    \"wiki_enabled\": true,\n+    \"show_media\": true,\n+    \"id\": \"2qh0i\",\n+    \"display_name\": \"rust\",\n+    \"title\": \"The Rust Programming Language\",\n+    \"public_description\": \"A place for all things related to the Rust programming language.\",\n+    \"public_description_html\": \"&lt;!-- SC_OFF --&gt;&lt;div class=\\\"md\\\"&gt;&lt;p&gt;A place for all things related to the Rust programming language.&lt;/p&gt;\\n&lt;/div&gt;&lt;!-- SC_ON --&gt;\",\n+    \"icon_img\": \"https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png\",\n+    \"community_icon\": \"https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png\",\n+    \"subscribers\": 350000,\n+    \"active_user_count\": 1200,\n+    \"over18\": false\n+  }\n+}\ndiff --git a/test/reddit_import.clj b/test/reddit_import.clj\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..54edaedeef08718c8f184d6aa468d8e6415068c7\n--- /dev/null\n+++ b/test/reddit_import.clj\n@@ -0,0 +1,116 @@\n+(ns test.reddit-import\n+  (:require [babashka.process :as process]\n+            [clojure.java.io :as io]\n+            [clojure.string :as str]\n+            [clojure.test :refer [deftest is testing]])\n+  (:import [com.sun.net.httpserver HttpServer HttpHandler HttpExchange]\n+           [java.net InetSocketAddress]))\n+\n+(defn- repo-root []\n+  (.getCanonicalPath (io/file (System/getProperty \"user.dir\"))))\n+\n+(defn- pick-port []\n+  (with-open [s (java.net.ServerSocket. 0)]\n+    (.getLocalPort s)))\n+\n+(defn- start-mock-reddit [port fixtures-dir]\n+  (let [fixture (io/file fixtures-dir \"r_rust_about.json\")\n+        body (.getBytes (slurp fixture) \"UTF-8\")\n+        server (HttpServer/create (InetSocketAddress. \"127.0.0.1\" port) 0)\n+        handler\n+        (proxy [HttpHandler] []\n+          (handle [^HttpExchange exchange]\n+            (.sendResponseHeaders exchange 200 (alength body))\n+            (let [out (.getResponseBody exchange)]\n+              (.write out body)\n+              (.close out))))]\n+    (.createContext server \"/\" handler)\n+    (.setExecutor server nil)\n+    (.start server)\n+    (fn stop []\n+      (.stop server 0))))\n+\n+(defn- wait-health [base-url ms]\n+  (let [deadline (+ (System/currentTimeMillis) ms)\n+        url (str base-url \"/healthz\")]\n+    (loop []\n+      (let [resp (try\n+                   (process/shell {:out :string :err :string}\n+                                  \"curl\" \"-sf\" url)\n+                   (catch Exception _ nil))]\n+        (if (and resp (zero? (:exit resp)) (= \"ok\" (str/trim (:out resp \"\"))))\n+          true\n+          (if (< (System/currentTimeMillis) deadline)\n+            (do (Thread/sleep 200) (recur))\n+            false))))))\n+\n+(defn- curl-post-ui [base rpc-json]\n+  (process/shell {:out :string :err :string}\n+                 \"curl\" \"-sf\" \"-X\" \"POST\" (str base \"/ui\")\n+                 \"--data-urlencode\" (str \"__rpc__=\" rpc-json)))\n+\n+(defn- wait-event-log [path ms]\n+  (let [deadline (+ (System/currentTimeMillis) ms)]\n+    (loop []\n+      (if (.exists (io/file path))\n+        true\n+        (if (< (System/currentTimeMillis) deadline)\n+          (do (Thread/sleep 200) (recur))\n+          false)))))\n+\n+(deftest reddit-fetch-via-mock-api\n+  (testing \"Fetch more queues import; event log stores full payload; page shows title\"\n+    (let [root (repo-root)\n+          fixtures (str root \"/test/fixtures/reddit\")\n+          data-dir (.getAbsolutePath\n+                    (doto (io/file (System/getProperty \"java.io.tmpdir\")\n+                                   (str \"sorter2-reddit-\" (System/currentTimeMillis)))\n+                      (.mkdirs)))\n+          reddit-port (pick-port)\n+          app-port (pick-port)\n+          reddit-base (str \"http://127.0.0.1:\" reddit-port)\n+          app-base (str \"http://127.0.0.1:\" app-port)\n+          bin (str root \"/target/release/sorter2-server\")\n+          stop-mock (start-mock-reddit reddit-port fixtures)]\n+      (try\n+        (is (zero? (:exit (process/shell {:dir root}\n+                                         \"cargo\" \"build\" \"--release\" \"--package\" \"sorter2-server\")))\n+            \"release build succeeds\")\n+        (let [proc (process/process {:dir root\n+                                     :env (into (into {} (System/getenv))\n+                                                {\"SORTER2_SKIP_DOTENV\" \"1\"\n+                                                 \"SORTER2_DATA_DIR\" data-dir\n+                                                 \"SORTER2_EVENT_LOG\" (str data-dir \"/events.jsonl\")\n+                                                 \"PORT\" (str app-port)\n+                                                 \"REDDIT_API_BASE\" reddit-base\n+                                                 \"REDDIT_OAUTH_BASE\" reddit-base\n+                                                 \"REDDIT_CLIENT_ID\" \"\"\n+                                                 \"REDDIT_CLIENT_SECRET\" \"\"\n+                                                 \"REDDIT_APP_ID\" \"\"\n+                                                 \"REDDIT_APP_SECRET\" \"\"})\n+                                     :out :string\n+                                     :err :string}\n+                                    bin)]\n+          (try\n+            (is (wait-health app-base 20000) \"app healthz\")\n+            (let [browse-url (str app-base \"/~/https://reddit.com/r/rust\")\n+                  before (:out (process/shell {:out :string :err :string}\n+                                              \"curl\" \"-sf\" browse-url))]\n+              (is (str/includes? before \"Fetch from Reddit\"))\n+              (is (not (str/includes? before \"The Rust Programming Language\")))\n+              (let [rpc \"{\\\"action\\\":\\\"fetch_entity\\\",\\\"item\\\":\\\"reddit.com/r/rust\\\"}\"\n+                    post (curl-post-ui app-base rpc)\n+                    log-path (str data-dir \"/events.jsonl\")]\n+                (is (zero? (:exit post)) \"fetch_entity POST succeeds\")\n+                (is (wait-event-log log-path 10000) \"event log written\")\n+                (let [after (:out (process/shell {:out :string :err :string}\n+                                                 \"curl\" \"-sf\" browse-url))\n+                      log (slurp (io/file log-path))]\n+                  (is (str/includes? after \"The Rust Programming Language\"))\n+                  (is (str/includes? log \"\\\"type\\\":\\\"entity_imported\\\"\"))\n+                  (is (str/includes? log \"\\\"subscribers\\\":350000\"))\n+                  (is (str/includes? log \"\\\"display_name\\\":\\\"rust\\\"\")))))\n+            (finally\n+              (process/destroy proc))))\n+        (finally\n+          (stop-mock))))))\n","role":"user"}],"model":"openai/gpt-chat-latest"}