You are a constitutional council ranking individual git commits for ownership allocation.

Compare these two commits. Decide which contributed more lasting value to the project.

Judge substance, not spectacle:
- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.
- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.
- Do not favor a side merely because its patch is longer or noisier.
- Weight what the change does for the project, not the contributor's name.

Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."}
The explanation must cite concrete differences in the patches (1-3 sentences).

Side A — contributor: tommy-mor
Side A — commit message:
[b9476669] Remove browser sentinel delegates so multi-user votes work.

Shared WEB_BROWSER_AGENT bound on first vote and blocked every later human; browser posts now use no delegate, matching forum UI.

Co-authored-by: Cursor <cursoragent@cursor.com>

Side A — unified diff (full patch):
diff --git a/cli/src/main.rs b/cli/src/main.rs
index c4f1494df3aedbd8b883aea6249579aa8336abfe..af3e4fee876910a44f6f872b24821bc541a23e20 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -1741,8 +1741,8 @@ async fn run() -> Result<()> {
                     tokio::time::sleep(std::time::Duration::from_millis(poll_interval_ms)).await;
                     let poll: PendingSessionPollResponse =
                         expect_json(client.get(&poll_url).send().await?).await?;
-                    if !poll.agent.trim().is_empty() {
-                        agent_out = Some(poll.agent.clone());
+                    if let Some(a) = poll.agent.as_deref().map(str::trim).filter(|s| !s.is_empty()) {
+                        agent_out = Some(a.to_string());
                     }
                     if poll.complete {
                         token_out = poll.token;
diff --git a/server/src/api/auth.rs b/server/src/api/auth.rs
index 50dc6af908412b16343829eae25154ebf4e19fca..01c02f50c19bcd62c7f1717f9b927f203c3164d0 100644
--- a/server/src/api/auth.rs
+++ b/server/src/api/auth.rs
@@ -29,18 +29,6 @@ use crate::{
     write_cmd::WriteCmd,
 };
 
-/// Delegate id for browser users who land via `/join/inv_…` (no CLI agent).
-const INVITE_BROWSER_AGENT: &str = "00000000-0000-0000-0000-000000000000:invite:web/join";
-
-/// Agent id for `/login` browser OAuth (no CLI); must pass [`parse_agent`].
-pub const WEB_BROWSER_AGENT: &str = "00000000-0000-0000-0000-000000000001:social:web/browser";
-
-/// True for well-known browser / human-form sentinel delegates (not real AI agents).
-/// HTML attribution should show the human username for these, not `@@uuid:rig:…`.
-pub fn is_browser_sentinel_delegate(agent: &str) -> bool {
-    agent == WEB_BROWSER_AGENT || agent == INVITE_BROWSER_AGENT
-}
-
 /// HttpOnly cookie storing the same `slug_*` bearer string the CLI uses.
 pub const SLUG_SESSION_COOKIE: &str = "slug_session";
 
@@ -288,7 +276,7 @@ pub async fn get_join_invite(
     let session = format!("p_{}", uuid::Uuid::new_v4().simple());
     let redirect_next = safe_local_redirect(q.next.as_deref().or(q.redirect.as_deref()));
     let s = PendingSession {
-        agent: INVITE_BROWSER_AGENT.to_string(),
+        agent: None,
         created_ts: now_ms(),
         provider: None,
         provider_id: None,
@@ -555,7 +543,7 @@ pub async fn post_choose_username(
     };
 
     let sessions = pending_sessions(&state);
-    let (provider, provider_id, agent) = {
+    let (provider, provider_id) = {
         let sessions_read = sessions.read().await;
         let Some(s) = sessions_read.get(&form.session) else {
             return api_error(StatusCode::NOT_FOUND, "unknown session", None).into_response();
@@ -566,14 +554,9 @@ pub async fn post_choose_username(
         let Some(provider_id) = s.provider_id.clone() else {
             return js_form_error_fragment(&form.session, "oauth not completed").into_response();
         };
-        (provider, provider_id, s.agent.clone())
+        (provider, provider_id)
     };
 
-    if let Err(msg) = parse_agent(&agent) {
-        return js_form_error_fragment(&form.session, &format!("invalid agent format — {msg}"))
-            .into_response();
-    }
-
     let redeem_invite = {
         let sessions_read = sessions.read().await;
         sessions_read
@@ -643,7 +626,8 @@ pub async fn get_web_login(
     let redirect_next = safe_local_redirect(q.next.as_deref().or(q.redirect.as_deref()))
         .or_else(|| Some("/".to_string()));
     let s = PendingSession {
-        agent: WEB_BROWSER_AGENT.to_string(),
+        // Humans sign in via the website with no AI delegate.
+        agent: None,
         created_ts: now_ms(),
         provider: None,
         provider_id: None,
@@ -704,7 +688,7 @@ pub async fn post_pending_session(
     );
     let poll_url = format!("/api/v0/pending-session/{session}");
     let s = PendingSession {
-        agent: agent_naked,
+        agent: Some(agent_naked),
         created_ts: now_ms(),
         provider: None,
         provider_id: None,
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index fdff6db0472b36cd7870a4be68574023e0daf120..920e967b47852ea82fa61b84c457ae3582dd9800 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -18,13 +18,11 @@ pub use auth::{
     get_choose_username,
     get_web_login,
     get_logout,
-    is_browser_sentinel_delegate,
     optional_principal,
     resolve_web_session,
     session_cookie_header_value,
     WebSession,
     SLUG_SESSION_COOKIE,
-    WEB_BROWSER_AGENT,
 };
 
 pub use helpers::{
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index 611956d0a46062b49ce350be176e4be139312ff0..6e56c039a184953cd1d0593c34cf4d5abe41f2a3 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -277,7 +277,7 @@ async fn dispatch_ui_action(
                 &session.bearer,
                 room.clone(),
                 thread_tag.clone(),
-                Some(crate::api::auth::WEB_BROWSER_AGENT.to_string()),
+                None,
                 text,
             )
             .await
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index 645d54f2e117ba901e02ed958ada6ff69a78ae34..03ad762e88709c77b9d5dd130c48bc96226616a1 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -560,27 +560,28 @@ fn identity_color_css(seed: &str) -> String {
     format!("hsl({hue}, 62%, 66%)")
 }
 
-/// Seed for author color: real AI → delegate uuid; human/sentinel → principal username.
+/// Seed for author color: AI → delegate uuid; human (no delegate) → principal username.
 fn authorship_color_seed<'a>(principal: &'a str, delegate: &'a Option<String>) -> &'a str {
     match delegate {
-        Some(d) if !crate::api::is_browser_sentinel_delegate(d) => {
-            d.split(':').next().filter(|s| !s.is_empty()).unwrap_or(d.as_str())
-        }
-        _ => principal,
+        Some(d) => d
+            .split(':')
+            .next()
+            .filter(|s| !s.is_empty())
+            .unwrap_or(d.as_str()),
+        None => principal,
     }
 }
 
-/// Prefer the AI delegate in attribution; fall back to the human username when there is no
-/// delegate or the delegate is a browser/human-form sentinel.
+/// Prefer the AI delegate in attribution; humans post with no delegate and show `@username`.
 pub(crate) fn authorship_attr(principal: &str, delegate: &Option<String>) -> AuthorshipAttr {
     let color = identity_color_css(authorship_color_seed(principal, delegate));
     match delegate {
-        Some(d) if !crate::api::is_browser_sentinel_delegate(d) => AuthorshipAttr {
+        Some(d) => AuthorshipAttr {
             label: format!("@@{}", actor_label(d)),
             author_title: Some(format!("@{principal}")),
             color,
         },
-        _ => AuthorshipAttr {
+        None => AuthorshipAttr {
             label: format!("@{principal}"),
             author_title: None,
             color,
@@ -933,7 +934,6 @@ pub(super) fn recency_class(now_ms: i64, ts_ms: i64) -> &'static str {
 #[cfg(test)]
 mod authorship_tests {
     use super::*;
-    use crate::api::WEB_BROWSER_AGENT;
 
     #[test]
     fn human_or_missing_delegate_shows_username() {
@@ -943,15 +943,6 @@ mod authorship_tests {
         assert!(a.color.starts_with("hsl("));
     }
 
-    #[test]
-    fn browser_sentinel_delegate_shows_username() {
-        let d = Some(WEB_BROWSER_AGENT.to_string());
-        let a = authorship_attr("alice", &d);
-        assert_eq!(a.label, "@alice");
-        assert_eq!(a.author_title, None);
-        assert_eq!(authorship_address("alice", &d), "@alice");
-    }
-
     #[test]
     fn real_ai_delegate_shows_short_agent_with_username_hover() {
         let d = Some(
diff --git a/server/src/state.rs b/server/src/state.rs
index 648ab5304764a329fcabbbbcd3782b94e3e005a8..8ea84dcf9b1df8f8037e913cdd94e5908e6d5d55 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -21,7 +21,8 @@ pub struct InviteState {
 
 #[derive(Debug, Clone)]
 pub struct PendingSession {
-    pub agent: String,
+    /// CLI `identity start` delegate (`uuid:rig:model`). `None` for browser `/login` and `/join`.
+    pub agent: Option<String>,
     pub created_ts: i64,
     pub provider: Option<String>,
     pub provider_id: Option<String>,
diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs
index 6b1475b773106a2dd3f326475c9fb4cc727f6b4b..714563a8b330e3917d95a54ae29b4de143e3b8a4 100644
--- a/server/tests/integration_ui.rs
+++ b/server/tests/integration_ui.rs
@@ -418,6 +418,99 @@ async fn test_web_login_carries_vote_pair_next_into_pending_session() {
     let sessions = state.pending_sessions.read().await;
     let pending = sessions.get(&session).expect("pending session");
     assert_eq!(pending.redirect_next.as_deref(), Some(next));
+    assert_eq!(
+        pending.agent, None,
+        "browser /login must not invent a sentinel delegate"
+    );
+}
+
+#[tokio::test]
+async fn test_vote_compare_two_users_both_succeed_without_delegate() {
+    let (addr, _tmp, _log, state, _handle) = create_test_server_with_state().await;
+    let client = reqwest::Client::new();
+    let alice = test_bearer();
+    let bob = seed_test_identity(&state, "bob", "bobtok", "bobsecret").await;
+
+    // Define items first (votes require existing item bodies).
+    let seed = ui_post_ingest_rpc(
+        "public",
+        "multi-vote",
+        "~/multi-a {alpha}\n~/multi-b {beta}\n",
+    );
+    let seed_resp = client
+        .post(format!("http://{addr}/ui"))
+        .header("Authorization", format!("Bearer {alice}"))
+        .form(&[("__rpc__", seed.as_str())])
+        .send()
+        .await
+        .unwrap();
+    assert_eq!(seed_resp.status(), reqwest::StatusCode::OK);
+    let seed_js = seed_resp.text().await.unwrap();
+    assert!(
+        !seed_js.contains("auth-error"),
+        "item seed must succeed, got: {seed_js}"
+    );
+
+    for (bearer, left, right, explanation) in [
+        (&alice, "3", "1", "alice prefers a"),
+        (&bob, "1", "3", "bob prefers b"),
+    ] {
+        let rpc = ui_vote_compare_post_rpc(
+            "public",
+            "multi-vote",
+            "~/multi-a",
+            "~/multi-b",
+            left,
+            right,
+            explanation,
+        );
+        let resp = client
+            .post(format!("http://{addr}/ui"))
+            .header("Authorization", format!("Bearer {bearer}"))
+            .form(&[("__rpc__", rpc.as_str())])
+            .send()
+            .await
+            .unwrap();
+        assert_eq!(resp.status(), reqwest::StatusCode::OK);
+        let js = resp.text().await.unwrap();
+        assert!(
+            !js.contains("delegate already bound"),
+            "human vote must not hit shared-sentinel AgentBound ({explanation}), got: {js}"
+        );
+        assert!(
+            !js.contains("auth-error"),
+            "human vote must succeed ({explanation}), got: {js}"
+        );
+        assert!(
+            js.contains("vote-edge-history-region"),
+            "vote should morph edge history ({explanation}), got: {js}"
+        );
+    }
+
+    let reduced = state.reduced.read().await;
+    let human_votes: Vec<_> = reduced
+        .ingests_ordered
+        .iter()
+        .filter_map(|id| reduced.ingests_by_id.get(id))
+        .filter(|ing| ing.raw.contains("prefers"))
+        .collect();
+    assert_eq!(human_votes.len(), 2, "expected two vote ingests");
+    let mut principals: Vec<&str> = human_votes.iter().map(|i| i.principal.as_str()).collect();
+    principals.sort();
+    assert_eq!(principals, ["bob", "testuser"]);
+    for ing in &human_votes {
+        assert!(
+            ing.delegate.is_none(),
+            "browser votes must have no delegate, principal={} delegate={:?}",
+            ing.principal,
+            ing.delegate
+        );
+    }
+    assert!(
+        reduced.agent_bindings.is_empty(),
+        "human votes must not create AgentBound entries: {:?}",
+        reduced.agent_bindings
+    );
 }
 
 #[tokio::test]
diff --git a/server/tests/support/mod.rs b/server/tests/support/mod.rs
index a4320e991763617c1a760efad4b621977e2b74d0..67650520ea8f9f144bfe904347c40329d5db37e8 100644
--- a/server/tests/support/mod.rs
+++ b/server/tests/support/mod.rs
@@ -72,17 +72,14 @@ pub async fn rpc_batch(
     response.json().await.unwrap()
 }
 
-pub async fn seed_test_token(state: &AppState) {
-    seed_test_identity(state, "testuser", "testtok", "secret").await;
-}
-
-/// Add a distinct principal and bearer to a running integration-test server.
+/// Seed a user + bearer into reducer state (not appended to the event log).
+/// Returns the `slug_<token_id>_<secret>` bearer string.
 pub async fn seed_test_identity(
     state: &AppState,
     username: &str,
     token_id: &str,
     secret: &str,
-) {
+) -> String {
     let registered = Event::UserRegistered(UserRegistered {
         ts: 0,
         username: username.to_string(),
@@ -102,6 +99,11 @@ pub async fn seed_test_identity(
     let mut r = state.reduced.write().await;
     r.apply_event(registered);
     r.apply_event(ev);
+    format!("slug_{token_id}_{secret}")
+}
+
+pub async fn seed_test_token(state: &AppState) {
+    let _ = seed_test_identity(state, "testuser", "testtok", "secret").await;
 }
 
 pub async fn create_test_server_with_state() -> (
diff --git a/test/oauth.clj b/test/oauth.clj
index 3cbf496005e906ad6c579d44ac8c4055ee60d063..6911ac34a55707acda9f9ce091c079964649a252 100644
--- a/test/oauth.clj
+++ b/test/oauth.clj
@@ -186,8 +186,9 @@
               (:token poll-json))))))))
 
 (defn fetch-bearer-token!
-  "Simulate browser OAuth + username choice; returns `slug_…` bearer token.
-   Ingest `--delegate` must match this agent string for `AgentBound` on first write."
+  "Simulate CLI identity OAuth + username choice; returns `slug_…` bearer token.
+   Pass `:agent` (default local/dev) when the test will CLI-ingest with `--delegate`
+   so first write can `AgentBound`. Browser UI posts use no delegate."
   [base-url & {:keys [username agent] :or {username "intuser" agent default-agent}}]
   (let [token (complete-registration! base-url :username username :agent agent)]
     (when-not (str/starts-with? token "slug_")
diff --git a/types/src/lib.rs b/types/src/lib.rs
index cd6f94c60a4e1c3bfbce13bc0404b803f5f57c6d..4d05466c19a2f15f7d600e1d4a206b39984fabc4 100644
--- a/types/src/lib.rs
+++ b/types/src/lib.rs
@@ -538,7 +538,9 @@ pub struct PendingSessionStartResponse {
 pub struct PendingSessionPollResponse {
     pub ok: bool,
     pub complete: bool,
-    pub agent: String,
+    /// Present for CLI identity sessions; omitted for browser `/login` / `/join` (no delegate).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub agent: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub user: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]


Side B — contributor: tommy-mor
Side B — commit message:
[40b975bf] nice

Side B — unified diff (full patch):
diff --git a/Cargo.lock b/Cargo.lock
index 266e876bb7ccbe788beb1d5bd53ad5b45ee5825b..2cea973082716e761ef6f5dd5886acc08ff9aac0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -222,6 +222,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -1238,6 +1244,7 @@ version = "0.0.1"
 dependencies = [
  "axum",
  "axum-extra",
+ "dotenvy",
  "maud",
  "reqwest",
  "serde",
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 4677fedcb45292eebebe7e9cf6ce2f5738f18ddf..bd600138b613bd0f546bdec217a5334cdcb20aa5 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -17,6 +17,7 @@ tower-http = { version = "0.5", features = ["trace"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 reqwest = { version = "0.12", features = ["json"] }
+dotenvy = "0.15"
 
 [dev-dependencies]
 reqwest = { version = "0.12", features = ["json"] }
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index d2024bd4582bcc8482b461b2ba4fedbd8bff7c66..b33a84e8bb5e817b26592868d88090e6d664d950 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -6,7 +6,7 @@ use axum::{
 use std::collections::HashMap;
 
 use crate::{
-    html::{input_panel, js_string_literal, ranking_panel, JsBuilder},
+    html::{entity_section, input_panel, js_string_literal, ranking_panel, JsBuilder},
     parser::parse_reddit_url,
     path_types::ItemId,
     reddit::ensure_partial_tree,
@@ -87,6 +87,20 @@ pub async fn post_ui_html(
                     .into_response()
             }
         },
+        HtmlUiAction::FetchEntity { item } => {
+            let id = parse_item_param(&item);
+            if id.is_root() {
+                return ui_js_warn("nothing to fetch for the root").into_response();
+            }
+            state.queue_entity_fetch(id.clone());
+            let tree = state.tree.read().await;
+            let empty = crate::reducer::NodeState::default();
+            let node = tree.get(&id).unwrap_or(&empty);
+            let panel = entity_section(&id, node, true);
+            JsBuilder::new()
+                .morph_selector("#entity-section", panel)
+                .into_response()
+        },
     }
 }
 
diff --git a/server/src/events.rs b/server/src/events.rs
index ed5be6b13b9d46e838831d6ce0f96f569b401730..07ce24b5e56cf72b0b442c3c3241efbf6c3b006a 100644
--- a/server/src/events.rs
+++ b/server/src/events.rs
@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
@@ -18,4 +19,10 @@ pub enum Event {
     },
     /// Register a node path in the fractal tree (no external fetch).
     NodeEnsured { id: String },
+    /// Full upstream API payload for a node (domain-specific view derived at replay/render time).
+    EntityImported {
+        id: String,
+        ts: i64,
+        payload: Value,
+    },
 }
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index df6505021d9f446c2b453e20e3eb3cf696a111f9..caf1309c8d93b47104499c57f9cc35ee7631fbb9 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -10,6 +10,7 @@ use crate::{
     form_template::template_json_compact,
     path_types::ItemId,
     ranking::{top_bottom, RankedItem},
+    reddit::is_fetchable,
     reducer::{GroupState, NodeState},
     state::AppState,
     ui_action::UI_RPC_FIELD,
@@ -151,7 +152,7 @@ pub fn breadcrumb_path(item: &ItemId) -> Markup {
 fn entity_panel(node: &NodeState) -> Markup {
     html! {
         @if let Some(data) = &node.data {
-            section id="entity-panel" class="demo-panel entity-card" {
+            div id="entity-panel" class="entity-card" {
                 h2 { (data.title) }
                 @if let Some(author) = &data.author {
                     p class="muted small" { "by " (author) }
@@ -164,6 +165,42 @@ fn entity_panel(node: &NodeState) -> Markup {
     }
 }
 
+/// Reddit/API import control — only shown on fetchable pages; never auto-fires.
+pub fn fetch_entity_panel(item: &ItemId, has_data: bool, fetching: bool) -> Markup {
+    if !is_fetchable(item) {
+        return html! {};
+    }
+    let label = if fetching {
+        "Fetching…"
+    } else if has_data {
+        "Fetch more"
+    } else {
+        "Fetch from Reddit"
+    };
+    let rpc = template_json_compact(&serde_json::json!({
+        "action": "fetch_entity",
+        "item": item.as_str(),
+    }))
+    .expect("fetch_entity rpc template");
+    html! {
+        form method="post" action="/ui" id="fetch-entity-form" class="fetch-entity-form" {
+            input type="hidden" name=(UI_RPC_FIELD) value=(rpc);
+            button type="submit" class="btn-secondary" disabled=(fetching) { (label) }
+        }
+    }
+}
+
+/// Entity card + explicit fetch control (morphed as `#entity-section`).
+pub fn entity_section(item: &ItemId, node: &NodeState, fetching: bool) -> Markup {
+    let has_data = node.data.is_some();
+    html! {
+        section id="entity-section" class="demo-panel" {
+            (entity_panel(node))
+            (fetch_entity_panel(item, has_data, fetching))
+        }
+    }
+}
+
 fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
     html! {
         @if !items.is_empty() {
@@ -260,7 +297,7 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {
         h1 { "sorter" }
         (input_panel("", None))
         (breadcrumb_path(&item))
-        (entity_panel(node))
+        (entity_section(&item, node, false))
         (ranking_panel(&item, group))
     };
     layout("sorter2", body, views)
@@ -272,16 +309,5 @@ pub async fn home(State(state): State<AppState>, uri: Uri) -> impl IntoResponse
 
 pub async fn browse(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {
     let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());
-    if item.as_str().starts_with("reddit.com") {
-        let needs_fetch = {
-            let tree = state.tree.read().await;
-            tree.get(&item)
-                .map(|n| n.data.is_none())
-                .unwrap_or(true)
-        };
-        if needs_fetch {
-            state.reddit.request_fetch(item.clone());
-        }
-    }
     item_page(state, uri, item).await
 }
diff --git a/server/src/main.rs b/server/src/main.rs
index c22ec6c9f5358e5ec99fb83210dc351938505a93..1f0cddc39302b35b0cd6a6219f44c9d59202facf 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -2,6 +2,10 @@ use sorter2_server::state::AppConfig;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    if std::env::var("SORTER2_SKIP_DOTENV").is_err() {
+        let _ = dotenvy::dotenv();
+    }
+
     tracing_subscriber::fmt()
         .with_env_filter(
             tracing_subscriber::EnvFilter::try_from_default_env()
diff --git a/server/src/reddit.rs b/server/src/reddit.rs
index 90053ad03b1d7c8e94f325dd4ee64c2b4f7da900..ff0f01e57b18af878eb5be3efc47204a7673589d 100644
--- a/server/src/reddit.rs
+++ b/server/src/reddit.rs
@@ -6,11 +6,15 @@ use std::time::{Duration, Instant};
 
 use reqwest::{header, Client, StatusCode};
 use serde::Deserialize;
+use serde_json::Value;
 use tokio::sync::{mpsc, RwLock};
 
 use crate::{
+    event_log::EventLog,
+    events::Event,
+    html::now_ms,
     path_types::ItemId,
-    reducer::{EntityData, GlobalTree},
+    reducer::GlobalTree,
 };
 
 /// Bootstrap blank nodes along a URL path so breadcrumbs and voting work before fetch.
@@ -20,6 +24,8 @@ pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) {
 
 pub struct RedditCommand {
     pub id: ItemId,
+    /// User-initiated fetch bypasses the in-memory "recently fetched" cache.
+    pub force: bool,
 }
 
 #[derive(Clone)]
@@ -33,19 +39,31 @@ struct RedditCredentials {
     client_secret: String,
 }
 
+#[derive(Clone)]
+pub struct RedditApiConfig {
+    pub api_base: String,
+    pub oauth_base: String,
+    pub user_agent: String,
+    creds: Option<RedditCredentials>,
+}
+
 struct OAuthToken {
     access_token: String,
     expires_at: Instant,
 }
 
 impl RedditBroker {
-    pub fn spawn(tree: Arc<RwLock<GlobalTree>>, user_agent: &str) -> Self {
+    pub fn spawn(
+        tree: Arc<RwLock<GlobalTree>>,
+        event_log: Arc<EventLog>,
+        config: RedditApiConfig,
+    ) -> Self {
         let (tx, rx) = mpsc::channel(100);
 
         let mut headers = header::HeaderMap::new();
         headers.insert(
             header::USER_AGENT,
-            header::HeaderValue::from_str(user_agent).expect("valid user agent"),
+            header::HeaderValue::from_str(&config.user_agent).expect("valid user agent"),
         );
 
         let client = Client::builder()
@@ -54,22 +72,38 @@ impl RedditBroker {
             .build()
             .expect("reqwest client");
 
-        let creds = RedditCredentials::from_env();
-        tokio::spawn(reddit_worker(rx, tree, client, creds));
+        tokio::spawn(reddit_worker(rx, tree, event_log, client, config));
 
         Self { tx }
     }
 
-    /// Fire-and-forget: queue a fetch; worker updates the tree when done.
-    pub fn request_fetch(&self, id: ItemId) {
-        let _ = self.tx.try_send(RedditCommand { id });
+    /// Queue a fetch; drops when the channel is full (backpressure).
+    pub fn request_fetch(&self, id: ItemId, force: bool) {
+        let _ = self.tx.try_send(RedditCommand { id, force });
+    }
+}
+
+impl RedditApiConfig {
+    pub fn from_env() -> Self {
+        Self {
+            api_base: reddit_api_base(),
+            oauth_base: reddit_oauth_base(),
+            user_agent: default_user_agent(),
+            creds: RedditCredentials::from_env(),
+        }
     }
 }
 
 impl RedditCredentials {
+    /// Reddit's OAuth docs call these "client id" and "client secret"; the app
+    /// registration UI often labels them "app id" / "app secret" — same values.
     fn from_env() -> Option<Self> {
-        let client_id = std::env::var("REDDIT_CLIENT_ID").ok()?;
-        let client_secret = std::env::var("REDDIT_CLIENT_SECRET").ok()?;
+        let client_id = std::env::var("REDDIT_CLIENT_ID")
+            .or_else(|_| std::env::var("REDDIT_APP_ID"))
+            .ok()?;
+        let client_secret = std::env::var("REDDIT_CLIENT_SECRET")
+            .or_else(|_| std::env::var("REDDIT_APP_SECRET"))
+            .ok()?;
         if client_id.is_empty() || client_secret.is_empty() {
             return None;
         }
@@ -80,29 +114,63 @@ impl RedditCredentials {
     }
 }
 
+pub fn reddit_api_base() -> String {
+    std::env::var("REDDIT_API_BASE").unwrap_or_else(|_| "https://www.reddit.com".into())
+}
+
+pub fn reddit_oauth_base() -> String {
+    std::env::var("REDDIT_OAUTH_BASE").unwrap_or_else(|_| "https://www.reddit.com".into())
+}
+
 pub fn default_user_agent() -> String {
     std::env::var("REDDIT_USER_AGENT").unwrap_or_else(|_| {
         "web:sorter2.social:v0.0.1 (by /u/sorter2)".to_string()
     })
 }
 
+/// True when this node can be loaded from the Reddit JSON API.
+pub fn is_fetchable(id: &ItemId) -> bool {
+    !map_item_to_reddit_api(id, "https://example.com").is_empty()
+}
+
+/// Derive UI-facing fields from a stored payload (Reddit-specific when under reddit.com).
+pub fn entity_view_from_payload(id: &ItemId, payload: &Value) -> Option<crate::reducer::EntityData> {
+    if id.as_str().starts_with("reddit.com") {
+        return parse_reddit_view(id, payload);
+    }
+    None
+}
+
+/// Apply a full API payload to the in-memory tree (view derived for known domains).
+pub fn apply_entity_import(tree: &mut GlobalTree, id: &ItemId, payload: Value) {
+    let view = entity_view_from_payload(id, &payload);
+    tree.apply_entity_raw(id, payload, view);
+}
+
 async fn reddit_worker(
     mut rx: mpsc::Receiver<RedditCommand>,
     tree: Arc<RwLock<GlobalTree>>,
+    event_log: Arc<EventLog>,
     client: Client,
-    creds: Option<RedditCredentials>,
+    config: RedditApiConfig,
 ) {
     let mut in_flight = HashSet::new();
     let mut recently_fetched: HashMap<ItemId, Instant> = HashMap::new();
     let mut current_delay = Duration::from_secs(1);
     let mut oauth: Option<OAuthToken> = None;
     let cache_ttl = Duration::from_secs(300);
+    let creds = config.creds.clone();
+    let api_base = config.api_base.clone();
+    let oauth_base = config.oauth_base.clone();
 
     while let Some(cmd) = rx.recv().await {
         let now = Instant::now();
         recently_fetched.retain(|_, t| now.duration_since(*t) < cache_ttl);
 
-        if in_flight.contains(&cmd.id) || recently_fetched.contains_key(&cmd.id) {
+        if in_flight.contains(&cmd.id) {
+            continue;
+        }
+        if !cmd.force && recently_fetched.contains_key(&cmd.id) {
             continue;
         }
 
@@ -112,18 +180,26 @@ async fn reddit_worker(
         tokio::time::sleep(current_delay).await;
 
         if let Some(c) = &creds {
-            oauth = ensure_oauth_token(&client, c, oauth.take()).await;
+            oauth = ensure_oauth_token(&client, &oauth_base, c, oauth.take()).await;
         }
 
         let token = oauth.as_ref().map(|t| t.access_token.as_str());
-        let use_oauth = token.is_some();
 
-        match do_fetch(&client, &fetch_id, use_oauth, token).await {
-            Ok(FetchOutcome::Entity(data)) => {
-                let mut w = tree.write().await;
-                w.set_entity_data(&fetch_id, data);
-                recently_fetched.insert(fetch_id.clone(), Instant::now());
-                current_delay = Duration::from_millis(600);
+        match do_fetch(&client, &api_base, &fetch_id, token).await {
+            Ok(FetchOutcome::Payload(payload)) => {
+                let ts = now_ms();
+                let event = Event::EntityImported {
+                    id: fetch_id.as_str().to_string(),
+                    ts,
+                    payload: payload.clone(),
+                };
+                if let Err(e) = event_log.append(&event).await {
+                    tracing::warn!("event log append failed for {}: {}", fetch_id, e);
+                } else {
+                    apply_entity_import(&mut *tree.write().await, &fetch_id, payload);
+                    recently_fetched.insert(fetch_id.clone(), Instant::now());
+                    current_delay = Duration::from_millis(600);
+                }
             }
             Ok(FetchOutcome::NotFound) => {
                 recently_fetched.insert(fetch_id.clone(), Instant::now());
@@ -149,13 +225,14 @@ async fn reddit_worker(
 }
 
 enum FetchOutcome {
-    Entity(EntityData),
+    Payload(Value),
     NotFound,
     RateLimited { reset_secs: u64 },
 }
 
 async fn ensure_oauth_token(
     client: &Client,
+    oauth_base: &str,
     creds: &RedditCredentials,
     existing: Option<OAuthToken>,
 ) -> Option<OAuthToken> {
@@ -165,8 +242,13 @@ async fn ensure_oauth_token(
         }
     }
 
+    let url = format!(
+        "{}/api/v1/access_token",
+        oauth_base.trim_end_matches('/')
+    );
+
     let resp = client
-        .post("https://www.reddit.com/api/v1/access_token")
+        .post(&url)
         .basic_auth(&creds.client_id, Some(&creds.client_secret))
         .form(&[("grant_type", "client_credentials")])
         .send()
@@ -207,11 +289,11 @@ async fn ensure_oauth_token(
 
 async fn do_fetch(
     client: &Client,
+    api_base: &str,
     id: &ItemId,
-    use_oauth: bool,
     bearer: Option<&str>,
 ) -> Result<FetchOutcome, String> {
-    let url = map_item_to_reddit_api(id, use_oauth);
+    let url = map_item_to_reddit_api(id, api_base);
     if url.is_empty() {
         return Ok(FetchOutcome::NotFound);
     }
@@ -241,10 +323,8 @@ async fn do_fetch(
         return Ok(FetchOutcome::RateLimited { reset_secs: reset });
     }
 
-    let bytes = resp.bytes().await.map_err(|e| e.to_string())?;
-    Ok(parse_reddit_json(id, &bytes)
-        .map(FetchOutcome::Entity)
-        .unwrap_or(FetchOutcome::NotFound))
+    let payload: Value = resp.json().await.map_err(|e| e.to_string())?;
+    Ok(FetchOutcome::Payload(payload))
 }
 
 fn rate_limit_remaining(resp: &reqwest::Response) -> Option<u64> {
@@ -264,18 +344,14 @@ fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 {
         .unwrap_or(5)
 }
 
-/// Map canonical item id to Reddit JSON API URL.
-pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {
+/// Map canonical item id to a Reddit JSON API URL under `api_base`.
+pub fn map_item_to_reddit_api(id: &ItemId, api_base: &str) -> String {
     let path = id.as_str();
     if !path.starts_with("reddit.com/") && path != "reddit.com" {
         return String::new();
     }
 
-    let base = if oauth {
-        "https://oauth.reddit.com"
-    } else {
-        "https://www.reddit.com"
-    };
+    let base = api_base.trim_end_matches('/');
 
     let segments: Vec<&str> = path.split('/').collect();
 
@@ -293,18 +369,17 @@ pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {
     String::new()
 }
 
-fn parse_reddit_json(id: &ItemId, bytes: &[u8]) -> Option<EntityData> {
-    let v: serde_json::Value = serde_json::from_slice(bytes).ok()?;
+fn parse_reddit_view(id: &ItemId, v: &Value) -> Option<crate::reducer::EntityData> {
     let segments: Vec<&str> = id.as_str().split('/').collect();
 
     if segments.iter().any(|&p| p == "comments") {
-        parse_post_listing(&v)
+        parse_post_listing(v)
     } else {
-        parse_subreddit_about(&v)
+        parse_subreddit_about(v)
     }
 }
 
-fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {
+fn parse_subreddit_about(v: &Value) -> Option<crate::reducer::EntityData> {
     let data = v.get("data")?;
     let title = data
         .get("title")
@@ -323,7 +398,7 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {
         .filter(|s| !s.is_empty())
         .map(|s| s.to_string());
 
-    Some(EntityData {
+    Some(crate::reducer::EntityData {
         title,
         author: None,
         body_html,
@@ -331,10 +406,9 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {
     })
 }
 
-fn parse_post_listing(v: &serde_json::Value) -> Option<EntityData> {
+fn parse_post_listing(v: &Value) -> Option<crate::reducer::EntityData> {
     let listing = v.as_array()?.first()?;
-    let child = listing
-        .pointer("/data/children/0/data")?;
+    let child = listing.pointer("/data/children/0/data")?;
     let title = child.get("title")?.as_str()?.to_string();
     let author = child
         .get("author")
@@ -352,7 +426,7 @@ fn parse_post_listing(v: &serde_json::Value) -> Option<EntityData> {
         .filter(|s| s.starts_with("http"))
         .map(|s| s.to_string());
 
-    Some(EntityData {
+    Some(crate::reducer::EntityData {
         title,
         author,
         body_html,
@@ -368,48 +442,51 @@ mod tests {
     fn map_subreddit_about_url() {
         let id = ItemId::parse("reddit.com/r/rust").unwrap();
         assert_eq!(
-            map_item_to_reddit_api(&id, false),
+            map_item_to_reddit_api(&id, "https://www.reddit.com"),
             "https://www.reddit.com/r/rust/about.json?raw_json=1"
         );
         assert_eq!(
-            map_item_to_reddit_api(&id, true),
-            "https://oauth.reddit.com/r/rust/about.json?raw_json=1"
+            map_item_to_reddit_api(&id, "http://127.0.0.1:9999"),
+            "http://127.0.0.1:9999/r/rust/about.json?raw_json=1"
         );
     }
 
     #[test]
     fn map_post_url() {
-        let id =
-            ItemId::parse("reddit.com/r/amitheasshole/comments/1trnvdl").unwrap();
+        let id = ItemId::parse("reddit.com/r/amitheasshole/comments/1trnvdl").unwrap();
         assert_eq!(
-            map_item_to_reddit_api(&id, false),
+            map_item_to_reddit_api(&id, "https://www.reddit.com"),
             "https://www.reddit.com/r/amitheasshole/comments/1trnvdl.json?raw_json=1"
         );
     }
 
     #[test]
-    fn map_non_reddit_empty() {
-        let id = ItemId::opaque("example.com/foo");
-        assert!(map_item_to_reddit_api(&id, false).is_empty());
+    fn is_fetchable_reddit_sub() {
+        let id = ItemId::parse("reddit.com/r/rust").unwrap();
+        assert!(is_fetchable(&id));
+        assert!(!is_fetchable(&ItemId::opaque("example.com/x")));
     }
 
     #[test]
     fn parse_subreddit_fixture() {
-        let json = r#"{"kind":"t5","data":{"title":"Rust","display_name":"rust","public_description":"systems"}}"#;
-        let entity = parse_reddit_json(
+        let json = include_str!("../../test/fixtures/reddit/r_rust_about.json");
+        let v: Value = serde_json::from_str(json).unwrap();
+        let entity = entity_view_from_payload(
             &ItemId::parse("reddit.com/r/rust").unwrap(),
-            json.as_bytes(),
+            &v,
         )
         .unwrap();
-        assert_eq!(entity.title, "Rust");
+        assert_eq!(entity.title, "The Rust Programming Language");
+        assert!(entity.body_html.as_ref().is_some_and(|b| b.contains("Rust")));
     }
 
     #[test]
     fn parse_post_fixture() {
         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"}}]}}]"#;
-        let entity = parse_reddit_json(
+        let v: Value = serde_json::from_str(json).unwrap();
+        let entity = entity_view_from_payload(
             &ItemId::parse("reddit.com/r/x/comments/abc").unwrap(),
-            json.as_bytes(),
+            &v,
         )
         .unwrap();
         assert_eq!(entity.title, "AITA");
diff --git a/server/src/reducer.rs b/server/src/reducer.rs
index 077f700bf00ddefe18ffd004bb5288bdc7c4adaf..60db81a562e3590775012573225a76ba82a14563 100644
--- a/server/src/reducer.rs
+++ b/server/src/reducer.rs
@@ -1,6 +1,7 @@
 use std::collections::{HashMap, HashSet, VecDeque};
 
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 
 use crate::path_types::ItemId;
 
@@ -128,6 +129,9 @@ pub struct EntityData {
 #[derive(Debug, Clone, Default)]
 pub struct NodeState {
     pub id: ItemId,
+    /// Full imported API JSON (persisted in the event log).
+    pub entity_raw: Option<Value>,
+    /// Domain-specific view derived from `entity_raw` (e.g. Reddit title/author).
     pub data: Option<EntityData>,
     pub children: HashSet<ItemId>,
     pub local_ranking: GroupState,
@@ -197,10 +201,11 @@ impl GlobalTree {
         }
     }
 
-    pub fn set_entity_data(&mut self, id: &ItemId, data: EntityData) {
+    pub fn apply_entity_raw(&mut self, id: &ItemId, payload: Value, view: Option<EntityData>) {
         self.ensure_path(id);
         if let Some(node) = self.nodes.get_mut(id) {
-            node.data = Some(data);
+            node.entity_raw = Some(payload);
+            node.data = view;
         }
     }
 }
diff --git a/server/src/state.rs b/server/src/state.rs
index 8c03aa60c15aee803a534439400b69935b1a3d84..d71d1079a8f486cdab15795384aef0b81b32544d 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -7,7 +7,7 @@ use crate::{
     events::Event,
     journal::JournalClient,
     path_types::ItemId,
-    reddit::{default_user_agent, RedditBroker},
+    reddit::{apply_entity_import, RedditApiConfig, RedditBroker},
     reducer::{GlobalTree, VoteData},
     views::ViewStore,
 };
@@ -108,13 +108,18 @@ impl AppState {
                             tree.ensure_path(&parsed);
                         }
                     }
+                    Event::EntityImported { id, payload, .. } => {
+                        if let Some(parsed) = ItemId::parse(&id).or_else(|| ItemId::from_url(&id)) {
+                            apply_entity_import(&mut tree, &parsed, payload);
+                        }
+                    }
                 }
             }
         }
 
         let tree = Arc::new(RwLock::new(tree));
         let journal = JournalClient::spawn(tree.clone(), event_log.clone());
-        let reddit = RedditBroker::spawn(tree.clone(), &default_user_agent());
+        let reddit = RedditBroker::spawn(tree.clone(), event_log.clone(), RedditApiConfig::from_env());
 
         Self {
             cfg: Arc::new(cfg),
@@ -135,10 +140,14 @@ impl AppState {
             let mut w = self.tree.write().await;
             w.ensure_path(id);
         }
-        self.reddit.request_fetch(id.clone());
         Ok(())
     }
 
+    /// User-initiated Reddit/API import (via "Fetch more" — never on paste or navigate).
+    pub fn queue_entity_fetch(&self, id: ItemId) {
+        self.reddit.request_fetch(id, true);
+    }
+
     pub async fn record_vote(
         &self,
         parent: &ItemId,
@@ -169,6 +178,44 @@ impl AppState {
 #[cfg(test)]
 mod tests {
     use super::{normalize_scope, parse_item_param};
+    use crate::{
+        event_log::EventLog,
+        events::Event,
+        path_types::ItemId,
+        reddit::apply_entity_import,
+        reducer::GlobalTree,
+    };
+    use serde_json::json;
+
+    #[tokio::test]
+    async fn replay_entity_imported_restores_view() {
+        let tmp = tempfile::tempdir().unwrap();
+        let log_path = tmp.path().join("events.jsonl");
+        let log = EventLog::new(log_path.to_string_lossy().into_owned());
+        let payload = json!({"kind":"t5","data":{"title":"Rust","display_name":"rust"}});
+        log.append(&Event::EntityImported {
+            id: "reddit.com/r/rust".into(),
+            ts: 1,
+            payload: payload.clone(),
+        })
+        .await
+        .unwrap();
+
+        let mut tree = GlobalTree::new();
+        let (events, _) = log.load_all().await.unwrap();
+        for ev in events {
+            if let Event::EntityImported { id, payload, .. } = ev {
+                let parsed = ItemId::parse(&id).unwrap();
+                apply_entity_import(&mut tree, &parsed, payload);
+            }
+        }
+        let node = tree.get(&ItemId::parse("reddit.com/r/rust").unwrap()).unwrap();
+        assert_eq!(node.data.as_ref().unwrap().title, "Rust");
+        assert_eq!(
+            node.entity_raw.as_ref().unwrap()["data"]["display_name"],
+            "rust"
+        );
+    }
 
     #[test]
     fn normalize_scope_strips_prefix_and_lowercases() {
diff --git a/server/src/ui_action.rs b/server/src/ui_action.rs
index d798874d1d94c0dfee59ec1ff703f9ee6ef432c0..3d6a49a2a3fb950752827efe1f5a049308f09baf 100644
--- a/server/src/ui_action.rs
+++ b/server/src/ui_action.rs
@@ -26,6 +26,10 @@ pub enum HtmlUiAction {
     ParseQuery {
         query: String,
     },
+    /// Fetch upstream entity data for the current page (explicit user action only).
+    FetchEntity {
+        item: String,
+    },
 }
 
 #[derive(Debug, Error)]
diff --git a/server/static/sorter.css b/server/static/sorter.css
index 36f68d415cea33c8562d5d02c0c9d4c5b225a782..1f9f5158414902d43a380dd899232c70d8cf5d63 100644
--- a/server/static/sorter.css
+++ b/server/static/sorter.css
@@ -52,6 +52,25 @@ body {
   filter: brightness(1.1);
 }
 
+.btn-secondary {
+  background: transparent;
+  color: var(--accent);
+  border: 1px solid var(--border);
+  padding: 0.4rem 0.85rem;
+  font-size: 0.9rem;
+  cursor: pointer;
+  margin-top: 0.75rem;
+}
+
+.btn-secondary:disabled {
+  opacity: 0.6;
+  cursor: wait;
+}
+
+.fetch-entity-form {
+  margin-top: 0.5rem;
+}
+
 code {
   font-size: 0.85em;
   background: var(--bg);
diff --git a/test/fixtures/reddit/r_rust_about.json b/test/fixtures/reddit/r_rust_about.json
new file mode 100644
index 0000000000000000000000000000000000000000..bb7fd74ab00d63356d9b672a775996ed155b984d
--- /dev/null
+++ b/test/fixtures/reddit/r_rust_about.json
@@ -0,0 +1,21 @@
+{
+  "kind": "t5",
+  "data": {
+    "user_flair_background_color": null,
+    "submit_text_html": null,
+    "banner_img": "",
+    "user_is_banned": null,
+    "wiki_enabled": true,
+    "show_media": true,
+    "id": "2qh0i",
+    "display_name": "rust",
+    "title": "The Rust Programming Language",
+    "public_description": "A place for all things related to the Rust programming language.",
+    "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;",
+    "icon_img": "https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png",
+    "community_icon": "https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png",
+    "subscribers": 350000,
+    "active_user_count": 1200,
+    "over18": false
+  }
+}
diff --git a/test/reddit_import.clj b/test/reddit_import.clj
new file mode 100644
index 0000000000000000000000000000000000000000..54edaedeef08718c8f184d6aa468d8e6415068c7
--- /dev/null
+++ b/test/reddit_import.clj
@@ -0,0 +1,116 @@
+(ns test.reddit-import
+  (:require [babashka.process :as process]
+            [clojure.java.io :as io]
+            [clojure.string :as str]
+            [clojure.test :refer [deftest is testing]])
+  (:import [com.sun.net.httpserver HttpServer HttpHandler HttpExchange]
+           [java.net InetSocketAddress]))
+
+(defn- repo-root []
+  (.getCanonicalPath (io/file (System/getProperty "user.dir"))))
+
+(defn- pick-port []
+  (with-open [s (java.net.ServerSocket. 0)]
+    (.getLocalPort s)))
+
+(defn- start-mock-reddit [port fixtures-dir]
+  (let [fixture (io/file fixtures-dir "r_rust_about.json")
+        body (.getBytes (slurp fixture) "UTF-8")
+        server (HttpServer/create (InetSocketAddress. "127.0.0.1" port) 0)
+        handler
+        (proxy [HttpHandler] []
+          (handle [^HttpExchange exchange]
+            (.sendResponseHeaders exchange 200 (alength body))
+            (let [out (.getResponseBody exchange)]
+              (.write out body)
+              (.close out))))]
+    (.createContext server "/" handler)
+    (.setExecutor server nil)
+    (.start server)
+    (fn stop []
+      (.stop server 0))))
+
+(defn- wait-health [base-url ms]
+  (let [deadline (+ (System/currentTimeMillis) ms)
+        url (str base-url "/healthz")]
+    (loop []
+      (let [resp (try
+                   (process/shell {:out :string :err :string}
+                                  "curl" "-sf" url)
+                   (catch Exception _ nil))]
+        (if (and resp (zero? (:exit resp)) (= "ok" (str/trim (:out resp ""))))
+          true
+          (if (< (System/currentTimeMillis) deadline)
+            (do (Thread/sleep 200) (recur))
+            false))))))
+
+(defn- curl-post-ui [base rpc-json]
+  (process/shell {:out :string :err :string}
+                 "curl" "-sf" "-X" "POST" (str base "/ui")
+                 "--data-urlencode" (str "__rpc__=" rpc-json)))
+
+(defn- wait-event-log [path ms]
+  (let [deadline (+ (System/currentTimeMillis) ms)]
+    (loop []
+      (if (.exists (io/file path))
+        true
+        (if (< (System/currentTimeMillis) deadline)
+          (do (Thread/sleep 200) (recur))
+          false)))))
+
+(deftest reddit-fetch-via-mock-api
+  (testing "Fetch more queues import; event log stores full payload; page shows title"
+    (let [root (repo-root)
+          fixtures (str root "/test/fixtures/reddit")
+          data-dir (.getAbsolutePath
+                    (doto (io/file (System/getProperty "java.io.tmpdir")
+                                   (str "sorter2-reddit-" (System/currentTimeMillis)))
+                      (.mkdirs)))
+          reddit-port (pick-port)
+          app-port (pick-port)
+          reddit-base (str "http://127.0.0.1:" reddit-port)
+          app-base (str "http://127.0.0.1:" app-port)
+          bin (str root "/target/release/sorter2-server")
+          stop-mock (start-mock-reddit reddit-port fixtures)]
+      (try
+        (is (zero? (:exit (process/shell {:dir root}
+                                         "cargo" "build" "--release" "--package" "sorter2-server")))
+            "release build succeeds")
+        (let [proc (process/process {:dir root
+                                     :env (into (into {} (System/getenv))
+                                                {"SORTER2_SKIP_DOTENV" "1"
+                                                 "SORTER2_DATA_DIR" data-dir
+                                                 "SORTER2_EVENT_LOG" (str data-dir "/events.jsonl")
+                                                 "PORT" (str app-port)
+                                                 "REDDIT_API_BASE" reddit-base
+                                                 "REDDIT_OAUTH_BASE" reddit-base
+                                                 "REDDIT_CLIENT_ID" ""
+                                                 "REDDIT_CLIENT_SECRET" ""
+                                                 "REDDIT_APP_ID" ""
+                                                 "REDDIT_APP_SECRET" ""})
+                                     :out :string
+                                     :err :string}
+                                    bin)]
+          (try
+            (is (wait-health app-base 20000) "app healthz")
+            (let [browse-url (str app-base "/~/https://reddit.com/r/rust")
+                  before (:out (process/shell {:out :string :err :string}
+                                              "curl" "-sf" browse-url))]
+              (is (str/includes? before "Fetch from Reddit"))
+              (is (not (str/includes? before "The Rust Programming Language")))
+              (let [rpc "{\"action\":\"fetch_entity\",\"item\":\"reddit.com/r/rust\"}"
+                    post (curl-post-ui app-base rpc)
+                    log-path (str data-dir "/events.jsonl")]
+                (is (zero? (:exit post)) "fetch_entity POST succeeds")
+                (is (wait-event-log log-path 10000) "event log written")
+                (let [after (:out (process/shell {:out :string :err :string}
+                                                 "curl" "-sf" browse-url))
+                      log (slurp (io/file log-path))]
+                  (is (str/includes? after "The Rust Programming Language"))
+                  (is (str/includes? log "\"type\":\"entity_imported\""))
+                  (is (str/includes? log "\"subscribers\":350000"))
+                  (is (str/includes? log "\"display_name\":\"rust\"")))))
+            (finally
+              (process/destroy proc))))
+        (finally
+          (stop-mock))))))