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:
[88577c56] reconfigure

Side A — unified diff (full patch):
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index c4ab9d65c7b3cd42a5b4d093ba429993c101e9a8..82b2aa51d21ada1d0d849d3ddfc3a81e4241d861 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -9,7 +9,9 @@ use crate::{
     html::{js_string_literal, ranking_panel, JsBuilder},
     parser::parse_reddit_url,
     parser_render::navigate_panel,
-    state::AppState,
+    path_types::ItemId,
+    reddit::ensure_partial_tree,
+    state::{parse_item_param, AppState},
     ui_action::{parse_html_ui_from_form, HtmlUiAction},
 };
 
@@ -25,6 +27,10 @@ fn ui_js_warn(msg: &str) -> Response {
         .unwrap()
 }
 
+fn parent_from_scope(scope: &str) -> ItemId {
+    parse_item_param(scope)
+}
+
 pub async fn post_ui_html(
     State(state): State<AppState>,
     Form(form): Form<HashMap<String, String>>,
@@ -42,24 +48,36 @@ pub async fn post_ui_html(
             ratio_right,
             scope,
         } => {
+            let parent = parent_from_scope(&scope);
             if let Err(e) = state
-                .record_vote(&scope, &a, &b, ratio_left, ratio_right)
+                .record_vote(&parent, &a, &b, ratio_left, ratio_right)
                 .await
             {
                 return ui_js_warn(&e).into_response();
             }
-            let scope = crate::state::normalize_scope(&scope);
-            let groups = state.groups.read().await;
+            let tree = state.tree.read().await;
             let empty = crate::reducer::GroupState::new();
-            let group = groups.get(&scope).unwrap_or(&empty);
-            let panel = ranking_panel(&scope, group);
+            let group = tree
+                .get(&parent)
+                .map(|n| &n.local_ranking)
+                .unwrap_or(&empty);
+            let panel = ranking_panel(&parent, group);
             JsBuilder::new()
                 .morph_selector("#ranking-panel", panel)
                 .into_response()
         }
         HtmlUiAction::ParseQuery { query } => match parse_reddit_url(&query) {
-            Ok(subreddit) => {
-                let dest = format!("/?sub={subreddit}");
+            Ok(item) => {
+                {
+                    let mut tree = state.tree.write().await;
+                    ensure_partial_tree(&mut tree, &item);
+                }
+                let _ = state.ensure_node(&item).await;
+                let dest = if item.is_root() {
+                    "/".to_string()
+                } else {
+                    format!("/?item={}", item.as_str())
+                };
                 JsBuilder::new()
                     .raw(&format!(
                         "window.location.href={};",
diff --git a/server/src/events.rs b/server/src/events.rs
index a862370fc840ffe02184a11c578e18239cc9474d..ed5be6b13b9d46e838831d6ce0f96f569b401730 100644
--- a/server/src/events.rs
+++ b/server/src/events.rs
@@ -5,8 +5,8 @@ use serde::{Deserialize, Serialize};
 pub enum Event {
     /// Page view recorded (path → counter in views.json).
     ViewRecorded { path: String, ts: i64 },
-    /// Pairwise comparison vote (replayed into the scope's [`crate::reducer::GroupState`] on boot).
-    /// `scope` is the ranking subject (e.g. a subreddit); empty string is the default/global scope.
+    /// Pairwise comparison vote (replayed into the parent node's [`crate::reducer::GroupState`] on boot).
+    /// `scope` is the parent [`crate::path_types::ItemId`] string; empty string is the tree root.
     VoteRecorded {
         ts: i64,
         a: String,
@@ -16,4 +16,6 @@ pub enum Event {
         #[serde(default)]
         scope: String,
     },
+    /// Register a node path in the fractal tree (no external fetch).
+    NodeEnsured { id: String },
 }
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index 9650d333d29c4ac94ceb407aee3ee00399c7f40b..c973cb718ac74b95570dabea76e24459417790b9 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -12,9 +12,10 @@ use serde::Deserialize;
 use crate::{
     form_template::template_json_compact,
     parser_render::navigate_panel,
+    path_types::ItemId,
     ranking::{top_bottom, RankedItem},
-    reducer::GroupState,
-    state::{normalize_scope, AppState},
+    reducer::{GroupState, NodeState},
+    state::{parse_item_param, AppState},
     ui_action::UI_RPC_FIELD,
 };
 
@@ -216,6 +217,48 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)
     }
 }
 
+fn item_href(id: &ItemId) -> String {
+    if id.is_root() {
+        "/".to_string()
+    } else {
+        format!("/?item={}", id.as_str())
+    }
+}
+
+fn segment_label(seg: &str) -> &str {
+    seg
+}
+
+/// Generic breadcrumb trail from an [`ItemId`] path.
+pub fn breadcrumb_path(item: &ItemId) -> Markup {
+    html! {
+        nav class="breadcrumbs" aria-label="Breadcrumb" {
+            a href="/" { "Internet" }
+            @for path in item.breadcrumb_paths() {
+                @let seg = path.segments().last().map_or("", |v| *v);
+                span class="separator" { " / " }
+                a href=(item_href(&path)) { (segment_label(seg)) }
+            }
+        }
+    }
+}
+
+fn entity_panel(node: &NodeState) -> Markup {
+    html! {
+        @if let Some(data) = &node.data {
+            section id="entity-panel" class="demo-panel entity-card" {
+                h2 { (data.title) }
+                @if let Some(author) = &data.author {
+                    p class="muted small" { "by " (author) }
+                }
+                @if let Some(body) = &data.body_html {
+                    div class="entity-body" { (maud::PreEscaped(body)) }
+                }
+            }
+        }
+    }
+}
+
 fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
     html! {
         @if !items.is_empty() {
@@ -224,7 +267,9 @@ fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
                 @for (i, r) in items.iter().enumerate() {
                     li {
                         span class="rank-num" { (start_rank + i) ". " }
-                        strong { (r.item.as_str()) }
+                        a href=(item_href(&r.item)) {
+                            strong { (display_label(&r.item)) }
+                        }
                         span class="muted" {
                             " — "
                             ({ format!("{:.1}%", r.score * 100.0) })
@@ -236,23 +281,30 @@ fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
     }
 }
 
-pub fn ranking_panel(scope: &str, group: &GroupState) -> Markup {
+fn display_label(id: &ItemId) -> String {
+    id.segments()
+        .last()
+        .map_or("Internet", |v| *v)
+        .to_string()
+}
+
+pub fn ranking_panel(item: &ItemId, group: &GroupState) -> Markup {
     let total = group.idx_to_item.len();
     let (top, bottom) = top_bottom(group, 8);
     html! {
         section id="ranking-panel" class="demo-panel" {
             h2 {
                 "Ranking"
-                @if !scope.is_empty() {
-                    " — " span class="scope-name" { "r/" (scope) }
+                @if !item.is_root() {
+                    " — " span class="scope-name" { (item.as_str()) }
                 }
             }
             @if total == 0 {
                 p class="muted" {
-                    @if scope.is_empty() {
+                    @if item.is_root() {
                         "No votes yet — compare two items below."
                     } @else {
-                        "No votes yet for r/" (scope) " — compare two items below to start the ranking."
+                        "No votes yet for " (item.as_str()) " — compare two items below to start the ranking."
                     }
                 }
             } @else {
@@ -266,7 +318,8 @@ pub fn ranking_panel(scope: &str, group: &GroupState) -> Markup {
     }
 }
 
-pub fn vote_panel(scope: &str) -> Markup {
+pub fn vote_panel(parent: &ItemId) -> Markup {
+    let parent_str = parent.as_str();
     let rpc = template_json_compact(&serde_json::json!({
         "action": "record_vote",
         "a": {"$form": "item_a"},
@@ -280,16 +333,17 @@ pub fn vote_panel(scope: &str) -> Markup {
         section id="vote-panel" class="demo-panel" {
             h2 { "Compare" }
             p class="muted small" {
-                @if scope.is_empty() {
+                @if parent.is_root() {
                     "Left item wins at 2:1. Votes append to the JSONL log and update rank centrality."
                 } @else {
-                    "Ranking " span class="scope-name" { "r/" (scope) }
+                    "Ranking children of "
+                    span class="scope-name" { (parent_str) }
                     ". Left item wins at 2:1; each vote updates this ranking."
                 }
             }
             form method="post" action="/ui" id="vote-form" {
                 input type="hidden" name=(UI_RPC_FIELD) value=(rpc);
-                input type="hidden" name="scope" value=(scope);
+                input type="hidden" name="scope" value=(parent_str);
                 div class="vote-fields" {
                     label {
                         "Left (wins) "
@@ -329,17 +383,30 @@ pub async fn home(
     let views = state.views.get_views(&path);
     let theme = theme_from_jar(&jar);
     let theme_next = theme_next_from_uri(&uri);
-    let scope = normalize_scope(&query_param(&uri, "sub").unwrap_or_default());
 
-    let groups = state.groups.read().await;
-    let empty = GroupState::new();
-    let group = groups.get(&scope).unwrap_or(&empty);
+    let item_raw = query_param(&uri, "item")
+        .or_else(|| query_param(&uri, "sub").map(|sub| {
+            if sub.is_empty() {
+                String::new()
+            } else {
+                format!("reddit.com/r/{sub}")
+            }
+        }))
+        .unwrap_or_default();
+    let item = parse_item_param(&item_raw);
+
+    let tree = state.tree.read().await;
+    let empty_node = NodeState::default();
+    let node = tree.get(&item).unwrap_or(&empty_node);
+    let group = &node.local_ranking;
 
     let body = html! {
         h1 { "sorter2" }
+        (breadcrumb_path(&item))
         (navigate_panel("", None))
-        (vote_panel(&scope))
-        (ranking_panel(&scope, group))
+        (entity_panel(node))
+        (vote_panel(&item))
+        (ranking_panel(&item, group))
     };
     layout("sorter2", body, views, theme, &theme_next)
 }
diff --git a/server/src/journal.rs b/server/src/journal.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b02ca025683621470ffdf8cd85cf9b85c56d024d
--- /dev/null
+++ b/server/src/journal.rs
@@ -0,0 +1,89 @@
+use std::sync::Arc;
+
+use tokio::sync::{mpsc, oneshot, RwLock};
+
+use crate::{
+    event_log::EventLog,
+    events::Event,
+    path_types::ItemId,
+    reducer::{GlobalTree, VoteData},
+};
+
+pub struct JournalCommand {
+    pub parent: ItemId,
+    pub vote: VoteData,
+    pub event: Event,
+    pub reply: oneshot::Sender<Result<(), String>>,
+}
+
+#[derive(Clone)]
+pub struct JournalClient {
+    tx: mpsc::Sender<JournalCommand>,
+}
+
+impl JournalClient {
+    pub fn spawn(tree: Arc<RwLock<GlobalTree>>, event_log: Arc<EventLog>) -> Self {
+        let (tx, rx) = mpsc::channel(64);
+        tokio::spawn(journal_worker(rx, tree, event_log));
+        Self { tx }
+    }
+
+    pub async fn record_vote(
+        &self,
+        parent: ItemId,
+        vote: VoteData,
+        event: Event,
+    ) -> Result<(), String> {
+        let (reply, rx) = oneshot::channel();
+        self.tx
+            .send(JournalCommand {
+                parent,
+                vote,
+                event,
+                reply,
+            })
+            .await
+            .map_err(|_| "journal worker stopped".to_string())?;
+        rx.await
+            .map_err(|_| "journal worker stopped".to_string())?
+    }
+}
+
+async fn journal_worker(
+    mut rx: mpsc::Receiver<JournalCommand>,
+    tree: Arc<RwLock<GlobalTree>>,
+    event_log: Arc<EventLog>,
+) {
+    while let Some(first) = rx.recv().await {
+        let mut batch = vec![first];
+        while let Ok(more) = rx.try_recv() {
+            batch.push(more);
+        }
+
+        let mut disk_err: Option<String> = None;
+        for cmd in &batch {
+            if let Err(e) = event_log.append(&cmd.event).await {
+                disk_err = Some(e.to_string());
+                break;
+            }
+        }
+
+        if let Some(err) = disk_err {
+            for cmd in batch {
+                let _ = cmd.reply.send(Err(err.clone()));
+            }
+            continue;
+        }
+
+        {
+            let mut w = tree.write().await;
+            for cmd in &batch {
+                w.apply_vote(&cmd.parent, cmd.vote.clone());
+            }
+        }
+
+        for cmd in batch {
+            let _ = cmd.reply.send(Ok(()));
+        }
+    }
+}
diff --git a/server/src/lib.rs b/server/src/lib.rs
index de8bca48cbf689cad22337883e7791966e7c4919..14e7cfbc38feb5d07aff859b64bce6e2ec45cf91 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -7,8 +7,9 @@ pub mod parser;
 pub mod parser_render;
 pub mod path_types;
 pub mod ranking;
+pub mod reddit;
 pub mod reducer;
-pub mod settlement;
+pub mod journal;
 pub mod state;
 pub mod ui_action;
 pub mod views;
diff --git a/server/src/parser.rs b/server/src/parser.rs
index 50571a59f0d3ece1e2538f88e00ef46ec40ea545..51aa0e0f982546aab68bd5e1ca0cb726e88b3f50 100644
--- a/server/src/parser.rs
+++ b/server/src/parser.rs
@@ -1,47 +1,18 @@
-//! Extract a subreddit name from a pasted Reddit URL or path.
+//! Extract a canonical [`crate::path_types::ItemId`] from a pasted Reddit URL or path.
 
-pub fn parse_reddit_url(query: &str) -> Result<String, String> {
+use crate::path_types::ItemId;
+
+pub fn parse_reddit_url(query: &str) -> Result<ItemId, String> {
     let q = query.trim();
     if q.is_empty() {
         return Err("Paste a Reddit URL or r/subreddit path".into());
     }
 
-    if let Some(sub) = subreddit_after_prefix(q, "r/") {
-        return Ok(sub);
-    }
-
-    if let Some(sub) = subreddit_from_path_segment(q, "/r/") {
-        return Ok(sub);
+    if let Some(id) = ItemId::from_url(q) {
+        return Ok(id);
     }
 
-    Err("Could not find a subreddit in that URL".into())
-}
-
-fn subreddit_after_prefix(text: &str, prefix: &str) -> Option<String> {
-    let rest = text.strip_prefix(prefix)?;
-    let sub = rest.split(['/', '?', '#']).next()?.trim();
-    valid_subreddit(sub)
-}
-
-fn subreddit_from_path_segment(text: &str, needle: &str) -> Option<String> {
-    let idx = text.find(needle)?;
-    let rest = &text[idx + needle.len()..];
-    let sub = rest.split(['/', '?', '#']).next()?.trim();
-    valid_subreddit(sub)
-}
-
-fn valid_subreddit(name: &str) -> Option<String> {
-    if name.is_empty() {
-        return None;
-    }
-    if name
-        .chars()
-        .all(|c| c.is_ascii_alphanumeric() || c == '_')
-    {
-        Some(name.to_ascii_lowercase())
-    } else {
-        None
-    }
+    Err("Could not parse that Reddit URL".into())
 }
 
 #[cfg(test)]
@@ -50,34 +21,37 @@ mod tests {
 
     #[test]
     fn parses_short_path() {
-        assert_eq!(parse_reddit_url("r/rust").unwrap(), "rust");
-    }
-
-    #[test]
-    fn parses_path_with_trailing_slash() {
-        assert_eq!(parse_reddit_url("r/rust/").unwrap(), "rust");
+        assert_eq!(
+            parse_reddit_url("r/rust").unwrap().as_str(),
+            "reddit.com/r/rust"
+        );
     }
 
     #[test]
     fn parses_full_url() {
         assert_eq!(
-            parse_reddit_url("https://www.reddit.com/r/programming/hot").unwrap(),
-            "programming"
+            parse_reddit_url("https://www.reddit.com/r/programming/hot")
+                .unwrap()
+                .as_str(),
+            "reddit.com/r/programming"
         );
     }
 
     #[test]
-    fn parses_url_without_scheme() {
+    fn parses_post_url() {
+        let id = parse_reddit_url(
+            "https://old.reddit.com/r/AmItheAsshole/comments/1trnvdl/aita_for_cancelling/",
+        )
+        .unwrap();
         assert_eq!(
-            parse_reddit_url("reddit.com/r/AskReddit").unwrap(),
-            "askreddit"
+            id.as_str(),
+            "reddit.com/r/amitheasshole/comments/1trnvdl"
         );
     }
 
     #[test]
     fn rejects_empty() {
         assert!(parse_reddit_url("").is_err());
-        assert!(parse_reddit_url("   ").is_err());
     }
 
     #[test]
diff --git a/server/src/parser_render.rs b/server/src/parser_render.rs
index f2341afe21476b689a536137798d97277211a962..acf2e7403f4238291677ef0c79d5766302ea78cf 100644
--- a/server/src/parser_render.rs
+++ b/server/src/parser_render.rs
@@ -21,7 +21,7 @@ pub fn navigate_panel(query: &str, error: Option<&str>) -> Markup {
             p class="muted small" {
                 "Paste a Reddit URL or "
                 code { "r/subreddit" }
-                " path, then click Go to rank that subreddit."
+                " path. Breadcrumb links drill down the tree; rankings apply to each node's children."
             }
             form method="post" action="/ui" id="parser-form" {
                 textarea
diff --git a/server/src/path_types.rs b/server/src/path_types.rs
index 1cdc96a25b1954f11aaf955203e2b9907b578366..b5c41444f7bcd4d8d289ed3af464bc3f14d0df99 100644
--- a/server/src/path_types.rs
+++ b/server/src/path_types.rs
@@ -1,11 +1,13 @@
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
-/// Stable item key for votes and rankings (opaque string for now).
-#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+/// Canonical hierarchical identity for any URL/path in the fractal tree.
+#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default)]
 pub struct ItemId(String);
 
 impl ItemId {
+    /// Parse an already-canonical path (no URL normalization). Empty string is invalid here;
+    /// use [`Self::root`] for the tree root.
     pub fn parse(s: &str) -> Option<Self> {
         let t = s.trim();
         if t.is_empty() {
@@ -14,13 +16,170 @@ impl ItemId {
         Some(Self(t.to_string()))
     }
 
+    /// Build an opaque item key (legacy demo votes, non-URL items).
     pub fn opaque(s: impl Into<String>) -> Self {
         Self(s.into())
     }
 
+    /// Root of the internet tree (empty path).
+    pub fn root() -> Self {
+        Self(String::new())
+    }
+
+    pub fn is_root(&self) -> bool {
+        self.0.is_empty()
+    }
+
     pub fn as_str(&self) -> &str {
         &self.0
     }
+
+    /// Creates a canonical ID from a raw URL or path. Normalizes domains and
+    /// trims tracking query params.
+    pub fn from_url(raw_url: &str) -> Option<Self> {
+        Self::canonicalize(raw_url).map(Self)
+    }
+
+    /// Map legacy scope keys (`""`, `"rust"`) to fractal parent nodes.
+    pub fn from_legacy_scope(raw: &str) -> Self {
+        let s = raw.trim();
+        if s.is_empty() {
+            return Self::root();
+        }
+        Self(format!("reddit.com/r/{s}"))
+    }
+
+    /// Extract the parent, e.g. `reddit.com/r/aww/comments/1trnvdl` →
+    /// `reddit.com/r/aww`.
+    pub fn parent(&self) -> Option<Self> {
+        if self.0.is_empty() {
+            return None;
+        }
+
+        let parts: Vec<&str> = self.0.trim_end_matches('/').split('/').collect();
+        if parts.len() <= 1 {
+            return None;
+        }
+
+        if self.0.contains("/comments/") {
+            return Some(Self(parts[..parts.len().saturating_sub(2)].join("/")));
+        }
+
+        Some(Self(parts[..parts.len() - 1].join("/")))
+    }
+
+    pub fn segments(&self) -> Vec<&str> {
+        self.0.split('/').filter(|s| !s.is_empty()).collect()
+    }
+
+    /// Cumulative paths for breadcrumb rendering, e.g.
+    /// `reddit.com/r/movies` → `["reddit.com", "reddit.com/r", "reddit.com/r/movies"]`.
+    pub fn breadcrumb_paths(&self) -> Vec<ItemId> {
+        let segs = self.segments();
+        let mut paths = Vec::with_capacity(segs.len());
+        let mut current = String::new();
+        for seg in segs {
+            if current.is_empty() {
+                current = seg.to_string();
+            } else {
+                current.push('/');
+                current.push_str(seg);
+            }
+            paths.push(ItemId(current.clone()));
+        }
+        paths
+    }
+
+    fn canonicalize(raw: &str) -> Option<String> {
+        let s = raw.trim();
+        if s.is_empty() {
+            return None;
+        }
+
+        let owned = if let Some(rest) = s.strip_prefix("r/") {
+            format!("reddit.com/r/{rest}")
+        } else if let Some(rest) = s.strip_prefix("/r/") {
+            format!("reddit.com/r/{rest}")
+        } else {
+            s.to_string()
+        };
+
+        let (host_path, _query) = split_query(&owned);
+        let host_path = host_path.trim_end_matches('/');
+
+        let path = if host_path.contains("://") {
+            parse_url_host_path(host_path)?
+        } else if host_path.starts_with("reddit.com") || host_path.starts_with("www.reddit.com") {
+            normalize_reddit_host_path(host_path)
+        } else if host_path.contains('/') {
+            host_path.to_string()
+        } else {
+            return None;
+        };
+
+        Some(normalize_reddit_path(&path))
+    }
+}
+
+fn split_query(s: &str) -> (&str, Option<&str>) {
+    if let Some((path, q)) = s.split_once('?') {
+        (path, Some(q))
+    } else {
+        (s, None)
+    }
+}
+
+fn parse_url_host_path(url: &str) -> Option<String> {
+    let rest = url
+        .strip_prefix("https://")
+        .or_else(|| url.strip_prefix("http://"))
+        .unwrap_or(url);
+    let (host, path) = rest.split_once('/').unwrap_or((rest, ""));
+    let host = normalize_host(host);
+    if path.is_empty() {
+        Some(host)
+    } else {
+        Some(format!("{host}/{path}"))
+    }
+}
+
+fn normalize_host(host: &str) -> String {
+    let h = host
+        .strip_prefix("www.")
+        .unwrap_or(host)
+        .to_ascii_lowercase();
+    if h == "old.reddit.com" || h == "new.reddit.com" || h == "reddit.com" {
+        "reddit.com".to_string()
+    } else {
+        h
+    }
+}
+
+fn normalize_reddit_host_path(s: &str) -> String {
+    let (host, path) = s.split_once('/').unwrap_or((s, ""));
+    let host = normalize_host(host);
+    if path.is_empty() {
+        host
+    } else {
+        format!("{host}/{path}")
+    }
+}
+
+/// Lowercase subreddit segment, drop listing suffixes, drop title slug after post id.
+fn normalize_reddit_path(path: &str) -> String {
+    let mut parts: Vec<String> = path.split('/').map(str::to_string).collect();
+    if parts.len() >= 3 && parts[1] == "r" {
+        parts[2] = parts[2].to_ascii_lowercase();
+    }
+    if let Some(i) = parts.iter().position(|p| p == "comments") {
+        if parts.len() > i + 2 {
+            parts.truncate(i + 2);
+        }
+    } else if parts.len() > 3 && parts.get(1).map(|s| s.as_str()) == Some("r") {
+        // reddit.com/r/{sub}/hot → reddit.com/r/{sub}
+        parts.truncate(3);
+    }
+    parts.join("/")
 }
 
 impl fmt::Display for ItemId {
@@ -28,3 +187,69 @@ impl fmt::Display for ItemId {
         f.write_str(&self.0)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn from_url_normalizes_reddit_domains() {
+        let id = ItemId::from_url(
+            "https://old.reddit.com/r/AmItheAsshole/comments/1trnvdl/aita_for_cancelling/",
+        )
+        .unwrap();
+        assert_eq!(
+            id.as_str(),
+            "reddit.com/r/amitheasshole/comments/1trnvdl"
+        );
+    }
+
+    #[test]
+    fn from_url_strips_query() {
+        let id = ItemId::from_url("https://www.reddit.com/r/rust/?sort=top").unwrap();
+        assert_eq!(id.as_str(), "reddit.com/r/rust");
+    }
+
+    #[test]
+    fn from_url_short_path() {
+        assert_eq!(
+            ItemId::from_url("r/rust").unwrap().as_str(),
+            "reddit.com/r/rust"
+        );
+    }
+
+    #[test]
+    fn parent_of_post_is_subreddit() {
+        let id = ItemId::parse("reddit.com/r/aww/comments/1trnvdl").unwrap();
+        assert_eq!(
+            id.parent().unwrap().as_str(),
+            "reddit.com/r/aww"
+        );
+    }
+
+    #[test]
+    fn parent_of_subreddit_is_r_segment() {
+        let id = ItemId::parse("reddit.com/r/movies").unwrap();
+        assert_eq!(id.parent().unwrap().as_str(), "reddit.com/r");
+    }
+
+    #[test]
+    fn breadcrumb_paths() {
+        let id = ItemId::parse("reddit.com/r/movies").unwrap();
+        let crumbs = id.breadcrumb_paths();
+        let paths: Vec<_> = crumbs.iter().map(|p| p.as_str()).collect();
+        assert_eq!(
+            paths,
+            vec!["reddit.com", "reddit.com/r", "reddit.com/r/movies"]
+        );
+    }
+
+    #[test]
+    fn legacy_scope_maps_to_reddit_sub() {
+        assert_eq!(
+            ItemId::from_legacy_scope("rust").as_str(),
+            "reddit.com/r/rust"
+        );
+        assert!(ItemId::from_legacy_scope("").is_root());
+    }
+}
diff --git a/server/src/reddit.rs b/server/src/reddit.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d203dca09245daf869b3aa942898447700ae69fb
--- /dev/null
+++ b/server/src/reddit.rs
@@ -0,0 +1,21 @@
+//! Reddit API import (async, decoupled from UI request path).
+
+use crate::{
+    path_types::ItemId,
+    reducer::{EntityData, GlobalTree},
+};
+
+/// Bootstrap blank nodes along a URL path so breadcrumbs and voting work before fetch.
+pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) {
+    tree.ensure_path(id);
+}
+
+/// Placeholder for Reddit JSON import. Returns entity data when implemented.
+pub async fn fetch_reddit_entity(_id: &ItemId) -> Option<EntityData> {
+    None
+}
+
+/// Apply fetched entity data to a node (called from async worker).
+pub fn apply_entity(tree: &mut GlobalTree, id: &ItemId, data: EntityData) {
+    tree.set_entity_data(id, data);
+}
diff --git a/server/src/reducer.rs b/server/src/reducer.rs
index 8d28353e1f2a67e71b7d17a2041a0988150f3245..077f700bf00ddefe18ffd004bb5288bdc7c4adaf 100644
--- a/server/src/reducer.rs
+++ b/server/src/reducer.rs
@@ -115,6 +115,96 @@ impl GroupState {
     }
 }
 
+/// Structured data imported from Reddit or elsewhere.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct EntityData {
+    pub title: String,
+    pub author: Option<String>,
+    pub body_html: Option<String>,
+    pub thumb_url: Option<String>,
+}
+
+/// One node in the fractal tree: entity + ranked children.
+#[derive(Debug, Clone, Default)]
+pub struct NodeState {
+    pub id: ItemId,
+    pub data: Option<EntityData>,
+    pub children: HashSet<ItemId>,
+    pub local_ranking: GroupState,
+}
+
+impl NodeState {
+    fn new(id: ItemId) -> Self {
+        Self {
+            id,
+            ..Default::default()
+        }
+    }
+}
+
+/// Global fractal graph: every URL is both an item and a ranking scope for its children.
+#[derive(Default)]
+pub struct GlobalTree {
+    pub nodes: HashMap<ItemId, NodeState>,
+}
+
+impl GlobalTree {
+    pub fn new() -> Self {
+        let mut tree = Self::default();
+        tree.ensure_node(&ItemId::root());
+        tree
+    }
+
+    pub fn ensure_node(&mut self, id: &ItemId) -> &mut NodeState {
+        if !self.nodes.contains_key(id) {
+            self.nodes.insert(id.clone(), NodeState::new(id.clone()));
+        }
+        self.nodes.get_mut(id).expect("node just inserted")
+    }
+
+    /// Register a node and wire parent→child links along the canonical path.
+    pub fn ensure_path(&mut self, id: &ItemId) {
+        if id.is_root() {
+            self.ensure_node(id);
+            return;
+        }
+        self.ensure_node(&ItemId::root());
+        for path in id.breadcrumb_paths() {
+            self.ensure_node(&path);
+            if let Some(parent) = path.parent() {
+                self.ensure_node(&parent);
+                if let Some(p) = self.nodes.get_mut(&parent) {
+                    p.children.insert(path.clone());
+                }
+            } else if let Some(r) = self.nodes.get_mut(&ItemId::root()) {
+                r.children.insert(path.clone());
+            }
+        }
+    }
+
+    pub fn get(&self, id: &ItemId) -> Option<&NodeState> {
+        self.nodes.get(id)
+    }
+
+    pub fn apply_vote(&mut self, parent: &ItemId, vote: VoteData) {
+        self.ensure_path(parent);
+        self.ensure_path(&vote.a);
+        self.ensure_path(&vote.b);
+        if let Some(node) = self.nodes.get_mut(parent) {
+            node.children.insert(vote.a.clone());
+            node.children.insert(vote.b.clone());
+            node.local_ranking.apply_vote(vote);
+        }
+    }
+
+    pub fn set_entity_data(&mut self, id: &ItemId, data: EntityData) {
+        self.ensure_path(id);
+        if let Some(node) = self.nodes.get_mut(id) {
+            node.data = Some(data);
+        }
+    }
+}
+
 #[cfg(test)]
 mod from_recorded_tests {
     use super::*;
@@ -125,7 +215,20 @@ mod from_recorded_tests {
     }
 
     #[test]
-    fn rejects_empty() {
+    fn rejects_empty_pair() {
         assert!(VoteData::from_recorded(1, "", "b", 2, 1).is_none());
     }
+
+    #[test]
+    fn ensure_path_wires_children() {
+        let mut tree = GlobalTree::new();
+        let id = ItemId::parse("reddit.com/r/rust").unwrap();
+        tree.ensure_path(&id);
+        let root = tree.get(&ItemId::root()).unwrap();
+        assert!(root.children.contains(&ItemId::parse("reddit.com").unwrap()));
+        let reddit = tree.get(&ItemId::parse("reddit.com").unwrap()).unwrap();
+        assert!(reddit.children.contains(&ItemId::parse("reddit.com/r").unwrap()));
+        let sub = tree.get(&id).unwrap();
+        assert_eq!(sub.id, id);
+    }
 }
diff --git a/server/src/settlement.rs b/server/src/settlement.rs
deleted file mode 100644
index 7a44495512b7f788239b8aeefbbd0a83656eeac6..0000000000000000000000000000000000000000
--- a/server/src/settlement.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use tokio::sync::{mpsc, oneshot, RwLock};
-
-use crate::{
-    event_log::EventLog,
-    events::Event,
-    reducer::{GroupState, VoteData},
-};
-
-/// Per-scope ranking state, keyed by scope (e.g. subreddit; "" is the default scope).
-pub type GroupMap = HashMap<String, GroupState>;
-
-pub struct SettlementCommand {
-    pub scope: String,
-    pub vote: VoteData,
-    pub event: Event,
-    pub reply: oneshot::Sender<Result<(), String>>,
-}
-
-#[derive(Clone)]
-pub struct SettlementClient {
-    tx: mpsc::Sender<SettlementCommand>,
-}
-
-impl SettlementClient {
-    pub fn spawn(groups: Arc<RwLock<GroupMap>>, event_log: Arc<EventLog>) -> Self {
-        let (tx, rx) = mpsc::channel(64);
-        tokio::spawn(settlement_worker(rx, groups, event_log));
-        Self { tx }
-    }
-
-    pub async fn record_vote(
-        &self,
-        scope: String,
-        vote: VoteData,
-        event: Event,
-    ) -> Result<(), String> {
-        let (reply, rx) = oneshot::channel();
-        self.tx
-            .send(SettlementCommand {
-                scope,
-                vote,
-                event,
-                reply,
-            })
-            .await
-            .map_err(|_| "settlement worker stopped".to_string())?;
-        rx.await
-            .map_err(|_| "settlement worker stopped".to_string())?
-    }
-}
-
-async fn settlement_worker(
-    mut rx: mpsc::Receiver<SettlementCommand>,
-    groups: Arc<RwLock<GroupMap>>,
-    event_log: Arc<EventLog>,
-) {
-    while let Some(first) = rx.recv().await {
-        let mut batch = vec![first];
-        while let Ok(more) = rx.try_recv() {
-            batch.push(more);
-        }
-
-        let mut disk_err: Option<String> = None;
-        for cmd in &batch {
-            if let Err(e) = event_log.append(&cmd.event).await {
-                disk_err = Some(e.to_string());
-                break;
-            }
-        }
-
-        if let Some(err) = disk_err {
-            for cmd in batch {
-                let _ = cmd.reply.send(Err(err.clone()));
-            }
-            continue;
-        }
-
-        {
-            let mut w = groups.write().await;
-            for cmd in &batch {
-                w.entry(cmd.scope.clone())
-                    .or_default()
-                    .apply_vote(cmd.vote.clone());
-            }
-        }
-
-        for cmd in batch {
-            let _ = cmd.reply.send(Ok(()));
-        }
-    }
-}
diff --git a/server/src/state.rs b/server/src/state.rs
index 2d9e5226057f8615897aac48bce947643a230fb4..cc1722f5a5bf4d415f2327ea585c488a15a75592 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use std::sync::Arc;
 
 use tokio::sync::RwLock;
@@ -6,14 +5,22 @@ use tokio::sync::RwLock;
 use crate::{
     event_log::EventLog,
     events::Event,
-    reducer::VoteData,
-    settlement::{GroupMap, SettlementClient},
+    path_types::ItemId,
+    reducer::{GlobalTree, VoteData},
+    journal::JournalClient,
     views::ViewStore,
 };
 
-/// Normalize a raw ranking subject into a scope key: strip an optional `r/`
-/// prefix, keep only `[a-z0-9_]`, lowercase, and cap the length. Empty string
-/// is the default/global scope.
+/// Parse `?item=` query value into a canonical node id.
+pub fn parse_item_param(raw: &str) -> ItemId {
+    let s = raw.trim();
+    if s.is_empty() {
+        return ItemId::root();
+    }
+    ItemId::from_url(s).or_else(|| ItemId::parse(s)).unwrap_or_else(|| ItemId::opaque(s))
+}
+
+/// Legacy: normalize raw ranking subject into a scope key for old event replay.
 pub fn normalize_scope(raw: &str) -> String {
     let s = raw.trim();
     let s = s
@@ -27,6 +34,14 @@ pub fn normalize_scope(raw: &str) -> String {
         .collect()
 }
 
+fn parent_from_event_scope(scope: &str) -> ItemId {
+    if scope.contains('/') {
+        ItemId::parse(scope).unwrap_or_else(|| ItemId::from_legacy_scope(scope))
+    } else {
+        ItemId::from_legacy_scope(scope)
+    }
+}
+
 #[derive(Clone)]
 pub struct AppConfig {
     pub data_dir: String,
@@ -56,8 +71,8 @@ pub struct AppState {
     pub cfg: Arc<AppConfig>,
     pub event_log: Arc<EventLog>,
     pub views: ViewStore,
-    pub groups: Arc<RwLock<GroupMap>>,
-    settlement: SettlementClient,
+    pub tree: Arc<RwLock<GlobalTree>>,
+    journal: JournalClient,
 }
 
 impl AppState {
@@ -66,7 +81,7 @@ impl AppState {
         let views_path = format!("{}/views.json", cfg.data_dir);
         let views = ViewStore::new(&views_path);
 
-        let mut groups: GroupMap = HashMap::new();
+        let mut tree = GlobalTree::new();
         if let Ok((events, _)) = event_log.load_all().await {
             for ev in events {
                 match ev {
@@ -81,29 +96,45 @@ impl AppState {
                         if let Some(vote) =
                             VoteData::from_recorded(ts, &a, &b, ratio_left, ratio_right)
                         {
-                            groups.entry(scope).or_default().apply_vote(vote);
+                            let parent = parent_from_event_scope(&scope);
+                            tree.apply_vote(&parent, vote);
                         }
                     }
                     Event::ViewRecorded { .. } => {}
+                    Event::NodeEnsured { id } => {
+                        if let Some(parsed) = ItemId::parse(&id).or_else(|| ItemId::from_url(&id)) {
+                            tree.ensure_path(&parsed);
+                        }
+                    }
                 }
             }
         }
 
-        let groups = Arc::new(RwLock::new(groups));
-        let settlement = SettlementClient::spawn(groups.clone(), event_log.clone());
+        let tree = Arc::new(RwLock::new(tree));
+        let journal = JournalClient::spawn(tree.clone(), event_log.clone());
 
         Self {
             cfg: Arc::new(cfg),
             event_log,
             views,
-            groups,
-            settlement,
+            tree,
+            journal,
         }
     }
 
+    pub async fn ensure_node(&self, id: &ItemId) -> Result<(), String> {
+        let event = Event::NodeEnsured {
+            id: id.as_str().to_string(),
+        };
+        self.event_log.append(&event).await.map_err(|e| e.to_string())?;
+        let mut w = self.tree.write().await;
+        w.ensure_path(id);
+        Ok(())
+    }
+
     pub async fn record_vote(
         &self,
-        scope: &str,
+        parent: &ItemId,
         a: &str,
         b: &str,
         ratio_left: i32,
@@ -113,23 +144,24 @@ impl AppState {
         let vote = VoteData::from_recorded(ts, a, b, ratio_left, ratio_right)
             .ok_or_else(|| "invalid vote: need two distinct non-empty items".to_string())?;
 
-        let scope = normalize_scope(scope);
         let event = Event::VoteRecorded {
             ts,
             a: vote.a.as_str().to_string(),
             b: vote.b.as_str().to_string(),
             ratio_left: vote.ratio_left,
             ratio_right: vote.ratio_right,
-            scope: scope.clone(),
+            scope: parent.as_str().to_string(),
         };
 
-        self.settlement.record_vote(scope, vote, event).await
+        self.journal
+            .record_vote(parent.clone(), vote, event)
+            .await
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::normalize_scope;
+    use super::{normalize_scope, parse_item_param};
 
     #[test]
     fn normalize_scope_strips_prefix_and_lowercases() {
@@ -138,4 +170,15 @@ mod tests {
         assert_eq!(normalize_scope("r/web_dev!!"), "web_dev");
         assert_eq!(normalize_scope(""), "");
     }
+
+    #[test]
+    fn parse_item_param_from_url() {
+        let id = parse_item_param("https://reddit.com/r/rust");
+        assert_eq!(id.as_str(), "reddit.com/r/rust");
+    }
+
+    #[test]
+    fn parse_item_param_empty_is_root() {
+        assert!(parse_item_param("").is_root());
+    }
 }
diff --git a/server/src/ui_action.rs b/server/src/ui_action.rs
index 0e030b3448b8e45acbe49d2de47ea26372445c54..d798874d1d94c0dfee59ec1ff703f9ee6ef432c0 100644
--- a/server/src/ui_action.rs
+++ b/server/src/ui_action.rs
@@ -18,7 +18,7 @@ pub enum HtmlUiAction {
         b: String,
         ratio_left: i32,
         ratio_right: i32,
-        /// Ranking subject (e.g. a subreddit). Empty string = default/global scope.
+        /// Parent node [`ItemId`] string; empty = tree root.
         #[serde(default)]
         scope: String,
     },
diff --git a/server/static/theme_default.css b/server/static/theme_default.css
index 6ad0ac712bbc840bedee60f613794de9385fbbd1..1bf8ac7a25207336c019f93cd4119bd0e06229f0 100644
--- a/server/static/theme_default.css
+++ b/server/static/theme_default.css
@@ -137,6 +137,38 @@ code {
   margin-top: 0.5rem;
 }
 
+.breadcrumbs {
+  font-size: 0.875rem;
+  margin-bottom: 1rem;
+  color: var(--muted);
+}
+
+.breadcrumbs a {
+  color: var(--accent);
+  text-decoration: none;
+}
+
+.breadcrumbs a:hover {
+  text-decoration: underline;
+}
+
+.breadcrumbs .separator {
+  color: var(--muted);
+}
+
+.rank-list a {
+  color: var(--accent);
+  text-decoration: none;
+}
+
+.rank-list a:hover {
+  text-decoration: underline;
+}
+
+.entity-card h2 {
+  margin-top: 0;
+}
+
 .scope-name {
   color: var(--accent);
   font-weight: 600;
diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs
index afeeee24e32f2d7f1d852ca96ac799fac8bce665..f7ac9c26bf9f9277ad5f5708603224c095165fb8 100644
--- a/server/tests/integration_ui.rs
+++ b/server/tests/integration_ui.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::net::SocketAddr;
 
 use axum::Router;
-use sorter2_server::{create_app, create_app_state, state::AppConfig, ui_action::UI_RPC_FIELD};
+use sorter2_server::{create_app, create_app_state, path_types::ItemId, state::AppConfig, ui_action::UI_RPC_FIELD};
 use tempfile::TempDir;
 use tokio::net::TcpListener;
 
@@ -63,9 +63,9 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() {
         port: 0,
     };
     let state = create_app_state(cfg).await;
-    let groups = state.groups.read().await;
-    let group = groups.get("").expect("default scope group after replay");
-    let ranked = sorter2_server::ranking::ranked_items(group);
+    let tree = state.tree.read().await;
+    let root = tree.get(&ItemId::root()).expect("root node after replay");
+    let ranked = sorter2_server::ranking::ranked_items(&root.local_ranking);
     assert_eq!(ranked.len(), 2);
     assert_eq!(ranked[0].item.as_str(), "alpha");
 }
@@ -93,5 +93,5 @@ async fn post_ui_parse_query_redirects_to_subreddit() {
         .unwrap();
 
     assert!(body.contains("window.location.href"));
-    assert!(body.contains("/?sub=rust"));
+    assert!(body.contains("/?item=reddit.com/r/rust"));
 }


Side B — contributor: tommy-mor
Side B — commit message:
[7caef802] room ui wired up again

Side B — unified diff (full patch):
diff --git a/Cargo.lock b/Cargo.lock
index e31485f28717993a13e1c4caf7be15b43a97573e..8be6ff8677700ce0a56d4a53b221e25c2bb70507 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -158,6 +158,7 @@ dependencies = [
  "axum",
  "axum-core",
  "bytes",
+ "cookie",
  "fastrand",
  "futures-util",
  "http",
@@ -300,6 +301,17 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
diff --git a/plan2.md b/plan2.md
new file mode 100644
index 0000000000000000000000000000000000000000..1587cbe558eb0a98fbce78566bf5f93b18100e54
--- /dev/null
+++ b/plan2.md
@@ -0,0 +1,190 @@
+This is a phenomenal synthesis. You stripped away the exact parts of `evaleval` that don't scale to a multi-tenant web application (string-splicing `eval` and in-memory nonce OCAP tracking) and kept the parts that make development lightning fast (embedded declarative payloads, single endpoint routing, and Javascript AST responses). 
+
+You are entirely right about the **AST substitution in Rust**. Walking a `serde_json::Value` tree to find `{"$form": "field_name"}` and swapping the node for a String isn't a hack—in Rust, it’s just a completely standard recursive enum visitor. 
+
+Let’s lock in this exact architecture. It is cohesive, secure, and incredibly ergonomic.
+
+Here is what the code actually looks like to execute this vision.
+
+---
+
+### 1. The Safe AST Substitution
+
+This is the exact function that runs in the Web handler before giving the payload to the RPC engine. Because it operates on the JSON AST *before* deserialization, it's 100% immune to injection.
+
+```rust
+use serde_json::Value;
+use std::collections::HashMap;
+
+/// Recursively walk the JSON AST and replace {"$form": "key"} with the actual form string.
+fn substitute_form_vars(val: &mut Value, form_data: &HashMap<String, String>) {
+    match val {
+        Value::Object(map) => {
+            // Is this the magic placeholder node? {"$form": "input_name"}
+            if map.len() == 1 && map.contains_key("$form") {
+                if let Some(field_name) = map.get("$form").and_then(|v| v.as_str()) {
+                    let submitted_text = form_data.get(field_name).map(|s| s.as_str()).unwrap_or("");
+                    *val = Value::String(submitted_text.to_string());
+                    return;
+                }
+            }
+            // Otherwise, keep walking the object
+            for v in map.values_mut() {
+                substitute_form_vars(v, form_data);
+            }
+        }
+        Value::Array(arr) => {
+            // Walk arrays
+            for v in arr.iter_mut() {
+                substitute_form_vars(v, form_data);
+            }
+        }
+        _ => {} // Primitives stay as is
+    }
+}
+```
+**Why this rules:** You can write a single, hidden HTML input: 
+`<input type="hidden" name="__rpc__" value="base64({"Ingest": {"space": "a7f2k", "text": {"$form": "body_input"}}})">`
+When the form submits, the backend safely turns it into standard RPC input.
+
+---
+
+### 2. The Unified Core RPC Layer
+
+You keep exactly one execution layer that strictly enforces your domain constraints (ACLs). Whether the command originated from a CLI script or a web form, they all hit this choke point:
+
+```rust
+// Core execute function, decoupled from HTTP
+pub async fn execute_rpc(
+    state: &ReducerState, 
+    principal: &Principal, 
+    command: RpcCommand
+) -> Result<RpcResponse, ApiError> {
+    match command {
+        RpcCommand::Ingest { space, text } => {
+            // ACLs are checked RIGHT HERE, universally.
+            if !state.user_has_cap(&space, principal, ThreadCapability::Post) {
+                return Err(ApiError::Forbidden("No post access in this space".to_string()));
+            }
+            // Do the write, apply events...
+            Ok(RpcResponse::IngestOk { ... })
+        }
+        // ...
+    }
+}
+```
+
+---
+
+### 3. The `DomPatch` Builder Pattern
+
+You prefer the Builder pattern over a macro for the response mapping. I agree—builders are far easier for your IDE to autocomplete, and easier to compose dynamically (e.g., iterating over a list of items to append).
+
+```rust
+pub struct DomPatch {
+    js: String,
+}
+
+impl DomPatch {
+    pub fn new() -> Self {
+        Self { js: String::new() }
+    }
+
+    /// Morphs an element using Idiomorph
+    pub fn morph(mut self, selector: &str, html: &str) -> Self {
+        let safe_html = serde_json::to_string(html).expect("string escaping failed");
+        self.js.push_str(&format!(
+            "Idiomorph.morph(document.querySelector('{}'), {}, {{morphStyle: 'innerHTML'}});\n", 
+            selector, safe_html
+        ));
+        self
+    }
+
+    /// Appends raw HTML to an element
+    pub fn append(mut self, selector: &str, html: &str) -> Self {
+        let safe_html = serde_json::to_string(html).unwrap();
+        self.js.push_str(&format!(
+            "document.querySelector('{}')?.insertAdjacentHTML('beforeend', {});\n", 
+            selector, safe_html
+        ));
+        self
+    }
+
+    /// Executes raw javascript
+    pub fn eval(mut self, code: &str) -> Self {
+        self.js.push_str(code);
+        self.js.push('\n');
+        self
+    }
+
+    /// Consumes the builder into an HTTP Response with the right content-type
+    pub fn into_response(self) -> impl axum::response::IntoResponse {
+        (
+            axum::http::StatusCode::OK, 
+            [(axum::http::header::CONTENT_TYPE, "text/javascript")], 
+            self.js
+        )
+    }
+}
+```
+
+---
+
+### 4. The Single Web Handler (`POST /ui/action`)
+
+With the pipeline defined, you only ever have to write **one** `POST` handler for the entire Web UI.
+
+```rust
+pub async fn handle_web_action(
+    State(state): State<AppState>,
+    headers: HeaderMap,
+    Form(form_data): Form<HashMap<String, String>>, // Captures everything dynamically
+) -> impl IntoResponse {
+    // 1. Authenticate using Bearer / Cookie exactly like the CLI
+    let principal = match extract_web_session(&headers, &state) {
+        Ok(p) => p,
+        Err(_) => return DomPatch::new().eval("window.location = '/auth/login';").into_response(),
+    };
+
+    // 2. Decode the Base64 JSON
+    let b64 = form_data.get("__rpc__").expect("Missing RPC payload in form");
+    let decoded = base64::decode(b64).expect("Bad b64");
+    let mut json_ast: Value = serde_json::from_slice(&decoded).expect("Bad JSON");
+
+    // 3. Do AST Substitution!
+    substitute_form_vars(&mut json_ast, &form_data);
+
+    // 4. Parse it strongly into the RPC enum
+    let command: RpcCommand = serde_json::from_value(json_ast).expect("Invalid RpcCommand");
+
+    // 5. Pass it to the core execute function (authz + mutation happens here)
+    match execute_rpc(&state.reduced.read().await, &principal, command).await {
+        Ok(RpcResponse::IngestOk { new_ranks }) => {
+            // Translate the RpcResponse to UI JS snippets
+            DomPatch::new()
+                .morph("#rank-container", &render_ranking(&new_ranks))
+                .eval("document.getElementById('ingest-form').reset();")
+                .into_response()
+        }
+        Ok(_) => DomPatch::new().eval("console.log('Action complete');").into_response(),
+        Err(e) => {
+            // Reconcile errors
+            DomPatch::new()
+                .morph("#error-banner", &format!("<div class='error'>{}</div>", e.message()))
+                .into_response()
+        }
+    }
+}
+```
+
+### The Verdict on the Grand Architecture
+
+By combining:
+1. The **Domain-Driven Asymmetry** (Spaces contain Gardens & Threads)
+2. The **Core RPC Logic** (1 executor, `Vec<RpcCommand>`, strict ACL checks)
+3. The **Single Web Form Controller** (b64 embedded, `substitute_form_vars()`)
+4. The **Javascript DomPatch Builder**
+
+You have constructed an application architecture that gives you absolute security and data integrity for your CLI AI Agents, while keeping the absolute peak hackability, form simplicity, and lightning-fast JS UI diffing of your `evaleval` Python framework. 
+
+I'm sold. It is clean, it is uniquely fitted to the mechanics of Rust (`serde`, `enums`), and it solves the URL routing fatigue problem beautifully. This is the exact way to build `slug.social` v2.
\ No newline at end of file
diff --git a/server/Cargo.toml b/server/Cargo.toml
index d527f86532c2856e29f9c6265e54c7235fdf0a8c..18c45777d662b71dc309e1daa4ddb2944da9759d 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 
 [dependencies]
 axum = { version = "0.7", features = ["macros"] }
-axum-extra = { version = "0.9", features = ["query"] }
+axum-extra = { version = "0.9", features = ["query", "cookie"] }
 bytes = "1.11.1"  # pin: RUSTSEC-2026-0007
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "signal", "fs", "io-util"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
diff --git a/server/src/api/auth.rs b/server/src/api/auth.rs
index b45ba39419c84af8bf2333fc9b7d47e98525c45f..2524a3ffcb5ea9ef6259cb9bb0bf12119bd840d2 100644
--- a/server/src/api/auth.rs
+++ b/server/src/api/auth.rs
@@ -1,9 +1,11 @@
 use axum::{
+    body::Body,
     extract::{Path, Query, State},
-    http::{HeaderMap, StatusCode},
-    response::{IntoResponse, Redirect},
+    http::{header, HeaderMap, HeaderValue, StatusCode},
+    response::{IntoResponse, Redirect, Response},
     Form, Json,
 };
+use axum_extra::extract::cookie::CookieJar;
 use base64::Engine;
 use serde::Deserialize;
 use slug_types::{PendingSessionPollResponse, PendingSessionStartRequest, PendingSessionStartResponse, WhoamiResponse};
@@ -13,14 +15,47 @@ use tokio::sync::RwLock;
 use crate::{
     api::helpers::{api_error, now_ms, sha256_hex},
     events::{Event, GrantAdded, TokenIssued, UserRegistered},
-    identity::{parse_agent, parse_username},
     html::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page},
+    identity::{parse_agent, parse_username},
+    reducer::ReducerState,
     state::{AppState, PendingSession},
 };
 
 /// 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`].
+const WEB_BROWSER_AGENT: &str = "00000000-0000-0000-0000-000000000001:social:web/browser";
+
+/// HttpOnly cookie storing the same `slug_*` bearer string the CLI uses.
+pub const SLUG_SESSION_COOKIE: &str = "slug_session";
+
+/// `Set-Cookie` header value (full attribute string).
+pub fn session_cookie_header_value(bearer: &str) -> HeaderValue {
+    let s = format!(
+        "{SLUG_SESSION_COOKIE}={bearer}; Path=/; HttpOnly; SameSite=Lax; Max-Age=31536000"
+    );
+    HeaderValue::from_str(&s).expect("session cookie value must be ASCII")
+}
+
+/// Resolve the signed-in username from `Authorization: Bearer` or `slug_session` cookie.
+pub fn optional_principal(headers: &HeaderMap, jar: &CookieJar, reduced: &ReducerState) -> Option<String> {
+    if let Ok(u) = verify_bearer_principal(headers, reduced) {
+        return Some(u);
+    }
+    let c = jar.get(SLUG_SESSION_COOKIE)?;
+    verify_token(reduced, c.value()).ok()
+}
+
+fn redirect_with_session_cookie(public_url: &str, path_and_query: &str, bearer: &str) -> Response {
+    Response::builder()
+        .status(StatusCode::TEMPORARY_REDIRECT)
+        .header(header::LOCATION, format!("{public_url}{path_and_query}"))
+        .header(header::SET_COOKIE, session_cookie_header_value(bearer))
+        .body(Body::empty())
+        .unwrap()
+}
+
 async fn apply_invite_redemption(state: &AppState, invite_token: &str, grantee_username: &str) -> Result<(), String> {
     let now = now_ms();
     let ga = {
@@ -306,8 +341,9 @@ pub async fn get_auth_callback(Query(q): Query<AuthCallbackQuery>, State(state):
                     tracing::warn!(error = %e, "invite redemption skipped after oauth");
                 }
             }
+            let cookie_bearer = bearer.clone();
             s.complete = Some((username, bearer));
-            return Redirect::temporary(&format!("{public_url}/auth/complete")).into_response();
+            return redirect_with_session_cookie(&public_url, "/", &cookie_bearer).into_response();
         }
     }
 
@@ -418,7 +454,47 @@ pub async fn post_choose_username(
         s.complete = Some((canon_user.clone(), bearer.clone()));
     }
 
-    auth_signed_in_fragment().into_response()
+    Response::builder()
+        .status(StatusCode::OK)
+        .header(header::CONTENT_TYPE, "text/html; charset=utf-8")
+        .header(header::SET_COOKIE, session_cookie_header_value(&bearer))
+        .body(Body::from(auth_signed_in_fragment().into_string()))
+        .unwrap()
+        .into_response()
+}
+
+/// Start a browser-only OAuth flow (no CLI polling). Sets session cookie on success.
+pub async fn get_web_login(State(state): State<AppState>) -> impl IntoResponse {
+    let session = format!("p_{}", uuid::Uuid::new_v4().simple());
+    let s = PendingSession {
+        agent: WEB_BROWSER_AGENT.to_string(),
+        created_ts: now_ms(),
+        provider: None,
+        provider_id: None,
+        redeem_invite: None,
+        complete: None,
+    };
+    state.pending_sessions.write().await.insert(session.clone(), s);
+    let public_url = std::env::var("SLUG_PUBLIC_URL").unwrap_or_else(|_| "http://127.0.0.1:8080".to_string());
+    Redirect::temporary(&format!(
+        "{public_url}/auth/login?session={}",
+        urlencoding::encode(&session)
+    ))
+    .into_response()
+}
+
+pub async fn get_logout() -> impl IntoResponse {
+    let clear = format!("{SLUG_SESSION_COOKIE}=; Path=/; HttpOnly; SameSite=Lax; Max-Age=0");
+    Response::builder()
+        .status(StatusCode::TEMPORARY_REDIRECT)
+        .header(header::LOCATION, "/")
+        .header(
+            header::SET_COOKIE,
+            HeaderValue::from_str(&clear).expect("static cookie clears"),
+        )
+        .body(Body::empty())
+        .unwrap()
+        .into_response()
 }
 
 pub async fn post_pending_session(
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index cb031aecebad1107dfa2898a98fb6084b28ba6e9..5320345a33bbb7b5ab769696a31f70347d019c3e 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -1,7 +1,9 @@
 mod auth;
 mod helpers;
 mod rpc;
+mod stream;
 mod validate;
+mod web_post;
 
 pub use auth::{
     get_join_invite,
@@ -13,6 +15,11 @@ pub use auth::{
     get_auth_callback,
     get_auth_complete,
     get_choose_username,
+    get_web_login,
+    get_logout,
+    optional_principal,
+    session_cookie_header_value,
+    SLUG_SESSION_COOKIE,
 };
 
 pub use helpers::{
@@ -23,8 +30,12 @@ pub use helpers::{
 
 pub use rpc::handle_rpc_batch;
 
+pub use stream::{get_html_stream, get_stream};
+
 pub use validate::{normalize_room_and_thread, validate_ingest_document, ValidatedIngest};
 
+pub use web_post::post_web_ingest;
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs
index 7d384e938a526bdf6aa04d1bf21a54d3fcb57d7e..231bf7381cf804144efd0521970b72dd8ffd4213 100644
--- a/server/src/api/rpc.rs
+++ b/server/src/api/rpc.rs
@@ -407,6 +407,22 @@ async fn rpc_post(
     })
 }
 
+/// Post forum content using a raw bearer token (CLI `Authorization` header or browser session cookie).
+pub async fn rpc_post_with_bearer(
+    state: &AppState,
+    bearer_token: &str,
+    room: String,
+    thread_tag: String,
+    text: String,
+) -> Result<RpcResult, RpcErr> {
+    use axum::http::{header, HeaderMap, HeaderValue};
+    let mut headers = HeaderMap::new();
+    let hv = HeaderValue::from_str(&format!("Bearer {bearer_token}"))
+        .map_err(|_| ("invalid session token".into(), None))?;
+    headers.insert(header::AUTHORIZATION, hv);
+    rpc_post(state, &headers, room, thread_tag, None, text, false).await
+}
+
 async fn rpc_check(
     state: &AppState,
     _room: String,
diff --git a/server/src/api/web_post.rs b/server/src/api/web_post.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d7a5780c02281a60d29f27d17b291d6df5580606
--- /dev/null
+++ b/server/src/api/web_post.rs
@@ -0,0 +1,107 @@
+use axum::{
+    extract::State,
+    http::{HeaderMap, StatusCode},
+    response::{Html, IntoResponse, Redirect},
+    Form,
+};
+use axum_extra::extract::cookie::CookieJar;
+use serde::Deserialize;
+use slug_types::RpcResult;
+
+use crate::{
+    api::{
+        auth::{optional_principal, SLUG_SESSION_COOKIE},
+        rpc::rpc_post_with_bearer,
+    },
+    canonical_path::canonicalize_tag,
+    html::layout,
+    state::AppState,
+};
+
+#[derive(Debug, Deserialize)]
+pub struct WebPostForm {
+    pub room: String,
+    pub thread_tag: String,
+    pub text: String,
+}
+
+fn post_redirect_location(room: &str, thread_tag: &str) -> String {
+    let tag = canonicalize_tag(thread_tag);
+    if room.trim() == "public" {
+        format!("/t/{tag}")
+    } else {
+        let room = room.trim();
+        let Some((a, b)) = room.split_once('/') else {
+            return "/".to_string();
+        };
+        format!("/r/{a}/{b}/{tag}")
+    }
+}
+
+pub async fn post_web_ingest(
+    State(state): State<AppState>,
+    headers: HeaderMap,
+    jar: CookieJar,
+    Form(form): Form<WebPostForm>,
+) -> impl IntoResponse {
+    let reduced = state.reduced.read().await;
+    let Some(username) = optional_principal(&headers, &jar, &reduced) else {
+        drop(reduced);
+        return Redirect::temporary("/login").into_response();
+    };
+
+    let bearer = headers
+        .get(axum::http::header::AUTHORIZATION)
+        .and_then(|v| v.to_str().ok())
+        .and_then(|s| s.strip_prefix("Bearer ").map(|t| t.trim().to_string()))
+        .or_else(|| jar.get(SLUG_SESSION_COOKIE).map(|c| c.value().to_string()));
+
+    drop(reduced);
+
+    let Some(bearer) = bearer else {
+        return Redirect::temporary("/login").into_response();
+    };
+
+    let room = form.room.trim().to_string();
+    let thread_tag = form.thread_tag.trim().to_string();
+    let text = form.text.clone();
+
+    if text.trim().is_empty() {
+        return error_page(
+            "empty post",
+            "Write something in the text area (DSL / prose).",
+            &username,
+        )
+        .into_response();
+    }
+
+    match rpc_post_with_bearer(&state, &bearer, room.clone(), thread_tag.clone(), text).await {
+        Ok(RpcResult::PostOk { .. }) => {
+            Redirect::to(&post_redirect_location(&room, &thread_tag)).into_response()
+        }
+        Ok(_) => error_page("unexpected response", "Post did not return PostOk.", &username).into_response(),
+        Err((msg, hint)) => error_page(
+            &msg,
+            hint.as_deref().unwrap_or(""),
+            &username,
+        )
+        .into_response(),
+    }
+}
+
+fn error_page(title: &str, detail: &str, user: &str) -> impl IntoResponse {
+    use maud::html;
+    let body = html! {
+        nav class="breadcrumb" {
+            a href="/" { "slug.social" }
+        }
+        h1 { "could not post" }
+        p { (title) }
+        @if !detail.is_empty() {
+            pre class="muted" { (detail) }
+        }
+        p class="muted" { "signed in as @" (user) " · " a href="/" { "home" } }
+    };
+    let page = layout("post error — slug.social", "view-thread", body, None);
+    (StatusCode::BAD_REQUEST, Html(page.into_string()))
+}
diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs
index 228a120065dbacd8a308ba6e8bfc6ab111877c4b..8dfcd6b23a18e1571c4f0b3b60c865fa8f576f2f 100644
--- a/server/src/html/forum.rs
+++ b/server/src/html/forum.rs
@@ -1,21 +1,24 @@
 use axum::{
     extract::{Path, Query, State},
-    http::{header, StatusCode},
+    http::{header, HeaderMap, StatusCode},
     response::{Html, IntoResponse, Response},
 };
-use serde::Deserialize;
+use axum_extra::extract::cookie::CookieJar;
 use maud::{html, Markup};
+use serde::Deserialize;
 
 use crate::{
+    api::optional_principal,
     canonical_path::canonicalize_tag,
+    events::ThreadCapability,
     reducer::{ReducerState, ScopeId},
     state::AppState,
     timeago,
 };
 
 use super::{
-    authorship_address, bc_threads, cli_panel, layout, now_ms,
-    recency_class, render_linkified_with_embeds,
+    authorship_address, bc_segment, bc_threads, cli_panel, layout, now_ms, recency_class,
+    render_linkified_with_embeds,
 };
 
 #[derive(Clone)]
@@ -26,17 +29,72 @@ struct ThreadRow {
     ingests: usize,
 }
 
-/// Collect thread rows from reducer state (unsorted).
-fn collect_thread_rows(reduced: &ReducerState, now: i64) -> Vec<ThreadRow> {
+/// URL prefix for thread pages: public `/t/…` or room `/r/{short}/{slug}/…`.
+#[derive(Clone)]
+pub struct ThreadNav {
+    pub room_wire: String,
+    scope: ScopeId,
+    path_prefix: String,
+}
+
+impl ThreadNav {
+    pub fn public() -> Self {
+        Self {
+            room_wire: "public".into(),
+            scope: ScopeId::Public,
+            path_prefix: "/t".into(),
+        }
+    }
+
+    /// `room_id` wire form `shortid/slug`.
+    pub fn from_room_id(room_id: &str) -> Option<Self> {
+        let (short, slug) = room_id.split_once('/')?;
+        if short.is_empty() || slug.is_empty() {
+            return None;
+        }
+        Some(Self {
+            room_wire: room_id.to_string(),
+            scope: ScopeId::Room(room_id.to_string()),
+            path_prefix: format!("/r/{short}/{slug}"),
+        })
+    }
+
+    fn scope(&self) -> ScopeId {
+        self.scope.clone()
+    }
+
+    fn thread_url(&self, tag: &str) -> String {
+        format!("{}/{}", self.path_prefix, tag)
+    }
+
+    fn thread_page_url(&self, tag: &str, offset: usize) -> String {
+        let base = self.thread_url(tag);
+        if offset == 0 {
+            base
+        } else {
+            format!("{base}?offset={offset}")
+        }
+    }
+
+    fn post_url(&self, tag: &str, idx: usize) -> String {
+        format!("{}/{}/{}", self.path_prefix, tag, idx)
+    }
+
+    fn expand_url(&self, tag: &str, idx: usize) -> String {
+        format!("{}/{}/{}/expand", self.path_prefix, tag, idx)
+    }
+}
+
+fn collect_thread_rows_for_scope(reduced: &ReducerState, scope: &ScopeId, now: i64) -> Vec<ThreadRow> {
     let _ = now;
     reduced
         .forum_threads
         .iter()
-        .filter(|((scope, _), _)| scope == &ScopeId::Public)
+        .filter(|((s, _), _)| s == scope)
         .map(|((_, tag), thread)| {
             let ingests = reduced
                 .ingests_by_scope_thread
-                .get(&(ScopeId::Public, tag.clone()))
+                .get(&(scope.clone(), tag.clone()))
                 .map(|q| q.len())
                 .unwrap_or(0);
             ThreadRow {
@@ -49,16 +107,46 @@ fn collect_thread_rows(reduced: &ReducerState, now: i64) -> Vec<ThreadRow> {
         .collect()
 }
 
-/// Render the thread feed div (id="thread-feed"). Used by both index() and SSE broadcast.
-fn render_thread_feed(rows: &[ThreadRow], now: i64) -> Markup {
+fn rooms_for_user(reduced: &ReducerState, username: &str) -> Vec<String> {
+    let mut v: Vec<String> = reduced
+        .grants
+        .iter()
+        .filter(|(rid, m)| reduced.rooms.contains(*rid) && m.contains_key(username))
+        .map(|(rid, _)| rid.clone())
+        .collect();
+    v.sort();
+    v
+}
+
+fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {
+    if !reduced.rooms.contains(room_id) {
+        return false;
+    }
+    let Some(u) = username else {
+        return false;
+    };
+    reduced.user_has_cap(room_id, u, ThreadCapability::View)
+        || reduced.user_has_cap(room_id, u, ThreadCapability::Post)
+        || reduced.user_has_cap(room_id, u, ThreadCapability::Manage)
+}
+
+fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {
+    reduced.user_has_cap(room_id, username, ThreadCapability::Post)
+}
+
+/// `feed_id` is e.g. `thread-feed` (public bump list, SSE) or `room-thread-feed`.
+fn render_thread_feed(nav: Option<&ThreadNav>, feed_id: &str, rows: &[ThreadRow], now: i64) -> Markup {
     html! {
-        div id="thread-feed" {
+        div id=(feed_id) {
             @if rows.is_empty() {
                 p class="muted" { "no threads yet" }
             } @else {
                 ul class="thread-feed" {
                     @for r in rows {
-                        @let thread_href = format!("/t/{}", r.tag);
+                        @let thread_href = nav
+                            .as_ref()
+                            .map(|n| n.thread_url(&r.tag))
+                            .unwrap_or_else(|| format!("/t/{}", r.tag));
                         @let hover = timeago::rfc3339_utc(r.last_ts);
                         @let ago = timeago::timeago(now, r.last_ts);
                         @let age_cls = recency_class(now, r.last_ts);
@@ -83,36 +171,148 @@ fn render_thread_feed(rows: &[ThreadRow], now: i64) -> Markup {
     }
 }
 
+fn auth_strip(
+    headers: &HeaderMap,
+    jar: &CookieJar,
+    reduced: &ReducerState,
+) -> Markup {
+    match optional_principal(headers, jar, reduced) {
+        Some(u) => html! {
+            p class="muted auth-strip" {
+                "@" (u)
+                " · "
+                a href="/logout" { "log out" }
+            }
+        },
+        None => html! {
+            p class="muted auth-strip" {
+                a href="/login" { "log in" }
+            }
+        },
+    }
+}
+
+fn bc_room(nav: &ThreadNav, room_slug: &str, thread_tag: Option<&str>) -> Markup {
+    html! {
+        a href="/" { "slug.social" }
+        @if let Some(t) = thread_tag {
+            (bc_segment(
+                &format!("r / {room_slug}"),
+                &nav.path_prefix,
+                false,
+            ))
+            (bc_segment(&format!("#{t}"), &nav.thread_url(t), true))
+        } @else {
+            (bc_segment(
+                &format!("r / {room_slug}"),
+                &nav.path_prefix,
+                true,
+            ))
+        }
+    }
+}
+
+fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup {
+    if !show {
+        return html! {};
+    }
+    html! {
+        section class="compose" {
+            h3 { "reply" }
+            p class="muted" { "Uses the same ingest DSL as the CLI. You must be logged in." }
+            form method="POST" action="/post" {
+                input type="hidden" name="room" value=(nav.room_wire.clone());
+                input type="hidden" name="thread_tag" value=(thread_tag);
+                textarea name="text" rows="8" cols="80" placeholder="prose or ~/items and votes…" {}
+                p {
+                    button type="submit" { "post" }
+                }
+            }
+        }
+    }
+}
+
+fn new_thread_form_public(show: bool) -> Markup {
+    if !show {
+        return html! {};
+    }
+    html! {
+        section class="compose" {
+            h3 { "new public thread" }
+            p class="muted" { "Set thread tag and body. Example: start with a title line or use the CLI-shaped DSL." }
+            form method="POST" action="/post" {
+                input type="hidden" name="room" value="public";
+                label for="new-thread-tag" { "thread tag" }
+                input type="text" id="new-thread-tag" name="thread_tag" pattern="[a-z0-9_\\-]{1,64}" placeholder="my-topic";
+                label for="new-thread-text" { "text" }
+                textarea id="new-thread-text" name="text" rows="6" placeholder="#my-topic\n\nYour first post…" {}
+                p { button type="submit" { "create / post" } }
+            }
+        }
+    }
+}
 
-/// Returns the current thread feed HTML fragment for SSE broadcast.
-/// selector: `#thread-feed`
+/// Returns the current public thread feed HTML fragment for SSE (`#thread-feed`).
 pub async fn thread_feed_html(state: &AppState) -> String {
     let now = now_ms();
+    let nav = ThreadNav::public();
     let mut rows = {
         let reduced = state.reduced.read().await;
-        collect_thread_rows(&reduced, now)
+        collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now)
     };
     rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));
-    render_thread_feed(&rows, now).into_string()
+    render_thread_feed(Some(&nav), "thread-feed", &rows, now).into_string()
 }
 
-pub async fn index(State(state): State<AppState>) -> impl IntoResponse {
+/// Home: private rooms (signed-in), then public bump-ordered threads.
+pub async fn home(
+    State(state): State<AppState>,
+    headers: HeaderMap,
+    jar: CookieJar,
+) -> impl IntoResponse {
     let now = now_ms();
-    let mut rows: Vec<ThreadRow> = {
-        let reduced = state.reduced.read().await;
-        collect_thread_rows(&reduced, now)
-    };
-    // Bump order: most recently active first.
-    rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));
+    let reduced = state.reduced.read().await;
+    let user = optional_principal(&headers, &jar, &reduced);
+    let room_ids = user
+        .as_ref()
+        .map(|u| rooms_for_user(&reduced, u))
+        .unwrap_or_default();
+    let mut public_rows = collect_thread_rows_for_scope(&reduced, &ScopeId::Public, now);
+    drop(reduced);
+    public_rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));
+
+    let nav = ThreadNav::public();
+    let reduced_read = state.reduced.read().await;
+    let strip = auth_strip(&headers, &jar, &reduced_read);
+    let show_forms = user.is_some();
+    drop(reduced_read);
 
     let page = layout(
         "slug.social",
         "view-thread",
         html! {
+            (strip)
             nav class="breadcrumb" { (bc_threads(None)) }
+            @if !room_ids.is_empty() {
+                h2 { "your rooms" }
+                ul class="thread-feed" {
+                    @for rid in &room_ids {
+                        @if let Some(nav_r) = ThreadNav::from_room_id(rid) {
+                            @let slug = if let Some((_, s)) = rid.split_once('/') { s } else { rid.as_str() };
+                            li {
+                                a href=(nav_r.path_prefix) {
+                                    (slug)
+                                    span class="muted" { " · " (rid) }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            h2 { "public threads" }
             p class="muted" { "dark = time-ordered · light = vote-ranked" }
-            h2 { "threads" }
-            (render_thread_feed(&rows, now))
+            (render_thread_feed(Some(&nav), "thread-feed", &public_rows, now))
+            (new_thread_form_public(show_forms))
             (cli_panel("npx slugsocial forum"))
         },
         None,
@@ -127,9 +327,13 @@ pub struct ThreadViewQuery {
 
 const PAGE_SIZE: usize = 10;
 
-fn render_thread_paginator(tag: &str, offset: usize, total: usize, top: bool) -> Markup {
+fn render_thread_paginator(nav: &ThreadNav, tag: &str, offset: usize, total: usize, top: bool) -> Markup {
     let newer_offset = offset.checked_add(PAGE_SIZE).filter(|&o| o < total);
-    let older_offset = if offset > 0 { Some(offset.saturating_sub(PAGE_SIZE)) } else { None };
+    let older_offset = if offset > 0 {
+        Some(offset.saturating_sub(PAGE_SIZE))
+    } else {
+        None
+    };
     let latest_offset = total.saturating_sub(PAGE_SIZE);
     let on_latest = offset >= latest_offset;
     let (id, scroll_href, scroll_label) = if top {
@@ -141,7 +345,7 @@ fn render_thread_paginator(tag: &str, offset: usize, total: usize, top: bool) ->
         div class="thread-paginator" id=(id) {
             a href=(scroll_href) class="post-nav-btn" { (scroll_label) }
             @if let Some(o) = older_offset {
-                a href=(format!("/t/{tag}?offset={o}")) class="post-nav-btn" { "← older" }
+                a href=(nav.thread_page_url(tag, o)) class="post-nav-btn" { "← older" }
             } @else {
                 span class="post-nav-btn disabled" { "← older" }
             }
@@ -149,37 +353,38 @@ fn render_thread_paginator(tag: &str, offset: usize, total: usize, top: bool) ->
                 (offset + 1) "–" (total.min(offset + PAGE_SIZE)) " / " (total)
             }
             @if let Some(o) = newer_offset {
-                a href=(format!("/t/{tag}?offset={o}")) class="post-nav-btn" { "newer →" }
+                a href=(nav.thread_page_url(tag, o)) class="post-nav-btn" { "newer →" }
             } @else {
                 span class="post-nav-btn disabled" { "newer →" }
             }
             @if !on_latest {
-                a href=(format!("/t/{tag}?offset={latest_offset}")) class="post-nav-btn" { "latest" }
+                a href=(nav.thread_page_url(tag, latest_offset)) class="post-nav-btn" { "latest" }
             }
         }
     }
 }
 
-/// Thread view — `/t/:tag` — dark, paginated.
-pub async fn thread_view(
-    State(state): State<AppState>,
-    Path(tag): Path<String>,
-    Query(q): Query<ThreadViewQuery>,
+async fn thread_view_inner(
+    state: AppState,
+    tag: String,
+    q: ThreadViewQuery,
+    nav: ThreadNav,
+    headers: HeaderMap,
+    jar: CookieJar,
 ) -> impl IntoResponse {
     let tag = canonicalize_tag(&tag);
+    let scope = nav.scope();
 
-    // Newest-first queue → chronological for the page.
     let all_ids: Vec<String> = {
         let reduced = state.reduced.read().await;
         reduced
             .ingests_by_scope_thread
-            .get(&(ScopeId::Public, tag.clone()))
+            .get(&(scope.clone(), tag.clone()))
             .map(|q| q.iter().rev().cloned().collect())
             .unwrap_or_default()
     };
 
     let total = all_ids.len();
-    // Default: first page (oldest posts first, like a book).
     let offset = q.offset.unwrap_or(0);
     let page_ids: Vec<String> = all_ids.into_iter().skip(offset).take(PAGE_SIZE).collect();
 
@@ -189,18 +394,49 @@ pub async fn thread_view(
             .iter()
             .filter_map(|id| reduced.ingests_by_id.get(id).cloned())
             .collect::<Vec<_>>();
-        let subtitle: Option<String> = None;
-        (ingests, subtitle)
+        (ingests, None::<String>)
+    };
+
+    let reduced = state.reduced.read().await;
+    let user = optional_principal(&headers, &jar, &reduced);
+    let sc = nav.scope();
+    let show_compose = match &sc {
+        ScopeId::Public => user.is_some(),
+        ScopeId::Room(rid) => user
+            .as_ref()
+            .map(|u| user_can_post_room(&reduced, rid, u))
+            .unwrap_or(false),
     };
+    let strip = auth_strip(&headers, &jar, &reduced);
+    drop(reduced);
 
     let now = now_ms();
-    let paginator_top = render_thread_paginator(&tag, offset, total, true);
-    let paginator_bot = render_thread_paginator(&tag, offset, total, false);
+    let paginator_top = render_thread_paginator(&nav, &tag, offset, total, true);
+    let paginator_bot = render_thread_paginator(&nav, &tag, offset, total, false);
+
+    let bc: Markup = match &sc {
+        ScopeId::Public => bc_threads(Some(&tag)),
+        ScopeId::Room(rid) => {
+            let slug = if let Some((_, s)) = rid.split_once('/') {
+                s
+            } else {
+                rid.as_str()
+            };
+            bc_room(&nav, slug, Some(&tag))
+        }
+    };
+
+    let cli = match &sc {
+        ScopeId::Public => format!("npx slugsocial forum {tag}"),
+        ScopeId::Room(r) => format!("npx slugsocial private {r} forum {tag}"),
+    };
+
     let page = layout(
         &format!("#{tag}"),
         "view-thread",
         html! {
-            nav class="breadcrumb" { (bc_threads(Some(&tag))) }
+            (strip)
+            nav class="breadcrumb" { (bc) }
             h2 { "#" (tag) @if let Some(sub) = &subtitle { ": " (sub) } }
             p class="muted" { "top=oldest · bottom=newest" }
             @if display_ingests.is_empty() {
@@ -209,7 +445,7 @@ pub async fn thread_view(
                 (paginator_top)
                 @for (i, ing) in display_ingests.iter().enumerate() {
                     @let post_idx = offset + i;
-                    @let post_href = format!("/t/{tag}/{post_idx}");
+                    @let post_href = nav.post_url(&tag, post_idx);
                     @let hover = timeago::rfc3339_utc(ing.ts);
                     @let ago = timeago::timeago(now, ing.ts);
                     @let truncated = ing.raw.len() > 2000;
@@ -222,8 +458,9 @@ pub async fn thread_view(
                         }
                         (render_linkified_with_embeds(display_body))
                         @if truncated {
+                            @let exp = nav.expand_url(&tag, post_idx);
                             a href="#" class="show-full-link"
-                              onclick=(format!("fetch('/t/{tag}/{post_idx}/expand').then(r=>r.text()).then(eval);return false")) {
+                              onclick=(format!("fetch('{exp}').then(r=>r.text()).then(eval);return false")) {
                                 "[show full post]"
                             }
                         }
@@ -231,34 +468,171 @@ pub async fn thread_view(
                 }
                 (paginator_bot)
             }
-            (cli_panel(&format!("npx slugsocial forum {tag}")))
+            (compose_form(&nav, &tag, show_compose))
+            (cli_panel(&cli))
         },
         None,
     );
     Html(page.into_string()).into_response()
 }
 
-/// Single-post view — `/t/:tag/:index` — shows one ingest at full length.
-pub async fn thread_post_view(
+/// Thread view — `/t/:tag`
+pub async fn thread_view(
     State(state): State<AppState>,
-    Path((tag, index_str)): Path<(String, String)>,
+    Path(tag): Path<String>,
+    Query(q): Query<ThreadViewQuery>,
+    headers: HeaderMap,
+    jar: CookieJar,
 ) -> impl IntoResponse {
-    let tag = canonicalize_tag(&tag);
+    thread_view_inner(state, tag, q, ThreadNav::public(), headers, jar).await
+}
+
+/// Room thread — `/r/:short/:slug/:tag`
+pub async fn room_thread_view(
+    State(state): State<AppState>,
+    Path((room_short, room_slug, tag)): Path<(String, String, String)>,
+    Query(q): Query<ThreadViewQuery>,
+    headers: HeaderMap,
+    jar: CookieJar,
+) -> impl IntoResponse {
+    let room_id = format!("{room_short}/{room_slug}");
+    let reduced = state.reduced.read().await;
+    let user = optional_principal(&headers, &jar, &reduced);
+    if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
+        drop(reduced);
+        return room_forbidden_page().into_response();
+    }
+    drop(reduced);
+    let Some(nav) = ThreadNav::from_room_id(&room_id) else {
+        return (StatusCode::NOT_FOUND, "bad room path").into_response();
+    };
+    thread_view_inner(state, tag, q, nav, headers, jar)
+        .await
+        .into_response()
+}
+
+fn room_forbidden_page() -> impl IntoResponse {
+    let body = html! {
+        nav class="breadcrumb" { a href="/" { "slug.social" } }
+        h1 { "private room" }
+        p { "Log in with an account that has been granted access to this room." }
+        p { a href="/login" { "log in" } " · " a href="/" { "home" } }
+    };
+    let page = layout("private room — slug.social", "view-thread", body, None);
+    (StatusCode::FORBIDDEN, Html(page.into_string()))
+}
+
+/// Private room index — `/r/:short/:slug`
+pub async fn room_page(
+    State(state): State<AppState>,
+    Path((room_short, room_slug)): Path<(String, String)>,
+    headers: HeaderMap,
+    jar: CookieJar,
+) -> impl IntoResponse {
+    let room_id = format!("{room_short}/{room_slug}");
     let now = now_ms();
+    let reduced = state.reduced.read().await;
+    if !reduced.rooms.contains(&room_id) {
+        drop(reduced);
+        return (StatusCode::NOT_FOUND, "room not found").into_response();
+    }
+    let user = optional_principal(&headers, &jar, &reduced);
+    if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
+        drop(reduced);
+        return room_forbidden_page().into_response();
+    }
+    let scope = ScopeId::Room(room_id.clone());
+    let mut rows = collect_thread_rows_for_scope(&reduced, &scope, now);
+    let strip = auth_strip(&headers, &jar, &reduced);
+    let show_new = user
+        .as_ref()
+        .map(|u| user_can_post_room(&reduced, &room_id, u))
+        .unwrap_or(false);
+    drop(reduced);
+    rows.sort_by(|a, b| b.last_ts.cmp(&a.last_ts));
+
+    let Some(nav) = ThreadNav::from_room_id(&room_id) else {
+        return (StatusCode::NOT_FOUND, "room not found").into_response();
+    };
+    let slug_display = room_slug.as_str();
+    let cli = format!("npx slugsocial private {room_id} forum");
+
+    let page = layout(
+        &format!("room {slug_display} — slug.social"),
+        "view-thread",
+        html! {
+            (strip)
+            nav class="breadcrumb" { (bc_room(&nav, slug_display, None)) }
+            h2 { (slug_display) }
+            p class="muted" { (room_id) }
+            h3 { "threads" }
+            (render_thread_feed(Some(&nav), "room-thread-feed", &rows, now))
+            @if show_new {
+                (new_thread_form_for_room(&nav, show_new))
+            }
+            (cli_panel(&cli))
+        },
+        None,
+    );
+    Html(page.into_string()).into_response()
+}
+
+fn new_thread_form_for_room(nav: &ThreadNav, show: bool) -> Markup {
+    if !show {
+        return html! {};
+    }
+    html! {
+        section class="compose" {
+            h3 { "new thread in this room" }
+            form method="POST" action="/post" {
+                input type="hidden" name="room" value=(nav.room_wire.clone());
+                label for="room-new-tag" { "thread tag" }
+                input type="text" id="room-new-tag" name="thread_tag" pattern="[a-z0-9_\\-]{1,64}" required;
+                textarea name="text" rows="6" placeholder="First post body…" required {}
+                p { button type="submit" { "post" } }
+            }
+        }
+    }
+}
+
+async fn thread_post_view_inner(
+    state: AppState,
+    tag: String,
+    index_str: String,
+    nav: ThreadNav,
+) -> impl IntoResponse {
+    let tag = canonicalize_tag(&tag);
     let index: usize = index_str.parse().unwrap_or(0);
+    let scope = nav.scope();
+    let now = now_ms();
     let (ing, subtitle) = {
         let reduced = state.reduced.read().await;
-        let ing = reduced.ingests_by_scope_thread.get(&(ScopeId::Public, tag.clone()))
+        let ing = reduced
+            .ingests_by_scope_thread
+            .get(&(scope.clone(), tag.clone()))
             .and_then(|q| q.iter().rev().nth(index))
             .and_then(|id| reduced.ingests_by_id.get(id).cloned());
-        let subtitle: Option<String> = None;
-        (ing, subtitle)
+        (ing, None::<String>)
     };
+
+    let sc = nav.scope();
+    let bc: Markup = match &sc {
+        ScopeId::Public => bc_threads(Some(&tag)),
+        ScopeId::Room(rid) => {
+            let slug = if let Some((_, s)) = rid.split_once('/') {
+                s
+            } else {
+                rid.as_str()
+            };
+            bc_room(&nav, slug, Some(&tag))
+        }
+    };
+
     let page = layout(
         &format!("#{tag} / post #{index}"),
         "view-thread",
         html! {
-            nav class="breadcrumb" { (bc_threads(Some(&tag))) }
+            nav class="breadcrumb" { (bc) }
             h2 { "#" (tag) @if let Some(sub) = &subtitle { ": " (sub) } " / post #" (index) }
             @if let Some(ing) = ing {
                 @let hover = timeago::rfc3339_utc(ing.ts);
@@ -280,21 +654,51 @@ pub async fn thread_post_view(
     Html(page.into_string()).into_response()
 }
 
-/// Inline expand handler — `/t/:tag/:id/expand`
-/// Returns a JS snippet that morphs the truncated post into its full version.
-pub async fn thread_post_expand(
+pub async fn thread_post_view(
     State(state): State<AppState>,
     Path((tag, index_str)): Path<(String, String)>,
+) -> impl IntoResponse {
+    thread_post_view_inner(state, tag, index_str, ThreadNav::public()).await
+}
+
+pub async fn room_thread_post_view(
+    State(state): State<AppState>,
+    Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,
+    headers: HeaderMap,
+    jar: CookieJar,
+) -> impl IntoResponse {
+    let room_id = format!("{room_short}/{room_slug}");
+    let reduced = state.reduced.read().await;
+    let user = optional_principal(&headers, &jar, &reduced);
+    if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
+        drop(reduced);
+        return room_forbidden_page().into_response();
+    }
+    drop(reduced);
+    let Some(nav) = ThreadNav::from_room_id(&room_id) else {
+        return (StatusCode::NOT_FOUND, "bad room path").into_response();
+    };
+    thread_post_view_inner(state, tag, index_str, nav)
+        .await
+        .into_response()
+}
+
+async fn thread_post_expand_inner(
+    state: AppState,
+    tag: String,
+    index_str: String,
+    nav: ThreadNav,
 ) -> impl IntoResponse {
     let tag = canonicalize_tag(&tag);
     let index: usize = index_str.parse().unwrap_or(0);
     let now = now_ms();
+    let scope = nav.scope();
 
     let ing = {
         let reduced = state.reduced.read().await;
         reduced
             .ingests_by_scope_thread
-            .get(&(ScopeId::Public, tag.clone()))
+            .get(&(scope.clone(), tag.clone()))
             .and_then(|q| q.iter().rev().nth(index))
             .and_then(|id| reduced.ingests_by_id.get(id).cloned())
     };
@@ -303,7 +707,7 @@ pub async fn thread_post_expand(
         return (StatusCode::NOT_FOUND, "post not found").into_response();
     };
 
-    let post_href = format!("/t/{tag}/{index}");
+    let post_href = nav.post_url(&tag, index);
     let hover = timeago::rfc3339_utc(ing.ts);
     let ago = timeago::timeago(now, ing.ts);
 
@@ -319,7 +723,6 @@ pub async fn thread_post_expand(
     };
 
     let full_html_str = full_html.into_string();
-    // Escape backticks and backslashes for JS template literal
     let escaped = full_html_str
         .replace('\\', "\\\\")
         .replace('`', "\\`")
@@ -334,7 +737,36 @@ pub async fn thread_post_expand(
     Response::builder()
         .status(StatusCode::OK)
         .header(header::CONTENT_TYPE, "text/javascript; charset=utf-8")
-        .body(js)
+        .body(axum::body::Body::from(js))
         .unwrap()
         .into_response()
 }
+
+pub async fn thread_post_expand(
+    State(state): State<AppState>,
+    Path((tag, index_str)): Path<(String, String)>,
+) -> impl IntoResponse {
+    thread_post_expand_inner(state, tag, index_str, ThreadNav::public()).await
+}
+
+pub async fn room_thread_post_expand(
+    State(state): State<AppState>,
+    Path((room_short, room_slug, tag, index_str)): Path<(String, String, String, String)>,
+    headers: HeaderMap,
+    jar: CookieJar,
+) -> impl IntoResponse {
+    let room_id = format!("{room_short}/{room_slug}");
+    let reduced = state.reduced.read().await;
+    let user = optional_principal(&headers, &jar, &reduced);
+    if !user_can_view_room(&reduced, &room_id, user.as_deref()) {
+        drop(reduced);
+        return (StatusCode::FORBIDDEN, "forbidden").into_response();
+    }
+    drop(reduced);
+    let Some(nav) = ThreadNav::from_room_id(&room_id) else {
+        return (StatusCode::NOT_FOUND, "not found").into_response();
+    };
+    thread_post_expand_inner(state, tag, index_str, nav)
+        .await
+        .into_response()
+}
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index 9c5af9654c7010d2cdb100e4cf63ba63e77c8c57..26e86124aae7cd878c92e1dc927e19d9fd2feaba 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -16,7 +16,10 @@ use breadcrumb_path::OntologyPath;
 
 pub use auth::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page};
 pub use editor::{editor_check, editor_page};
-pub use forum::{index, thread_feed_html, thread_post_expand, thread_post_view, thread_view};
+pub use forum::{
+    home, room_page, room_thread_post_expand, room_thread_post_view, room_thread_view, thread_feed_html,
+    thread_post_expand, thread_post_view, thread_view,
+};
 pub use garden::{garden_index, ontology_path};
 pub use search::{search_page, search_results_fragment};
 
diff --git a/server/src/lib.rs b/server/src/lib.rs
index bf2f73d4d0f26a357961e88c52c3b4f72626af81..b074cc31b94f23d1d566513392d7da3c02653c97 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -16,7 +16,7 @@ pub mod state;
 pub mod timeago;
 
 use axum::Router;
-use axum::routing::post;
+use axum::routing::{get, post};
 use tower_http::trace::TraceLayer;
 
 use crate::state::AppState;
@@ -25,17 +25,48 @@ pub use reducer::ReducerState;
 
 pub fn create_app(state: AppState) -> Router {
     Router::new()
-        .route("/healthz", axum::routing::get(|| async { "ok" }))
-        .route("/static/:filename", axum::routing::get(crate::html::serve_theme_css))
-        .route("/join/:token", axum::routing::get(api::get_join_invite))
-        .route("/auth/login", axum::routing::get(api::get_auth_login))
-        .route("/auth/callback", axum::routing::get(api::get_auth_callback))
-        .route("/auth/complete", axum::routing::get(api::get_auth_complete))
-        .route("/auth/choose-username", axum::routing::get(api::get_choose_username))
-        .route("/auth/choose-username", axum::routing::post(api::post_choose_username))
-        .route("/api/v0/pending-session", axum::routing::post(api::post_pending_session))
-        .route("/api/v0/pending-session/:id", axum::routing::get(api::get_pending_session))
-        .route("/api/v0/whoami", axum::routing::get(api::get_whoami))
+        .route("/healthz", get(|| async { "ok" }))
+        .route("/static/:filename", get(crate::html::serve_theme_css))
+        .route("/", get(crate::html::home))
+        .route("/login", get(api::get_web_login))
+        .route("/logout", get(api::get_logout))
+        .route("/post", post(api::post_web_ingest))
+        .route("/sse", get(api::get_html_stream))
+        .route("/stream", get(api::get_stream))
+        .route("/search", get(crate::html::search_page))
+        .route("/search/results", get(crate::html::search_results_fragment))
+        .route("/try", get(crate::html::editor_page))
+        .route("/try/check", post(crate::html::editor_check))
+        .route("/~", get(crate::html::garden_index))
+        .route("/~/*path", get(crate::html::ontology_path))
+        .route(
+            "/t/:tag/:index/expand",
+            get(crate::html::thread_post_expand),
+        )
+        .route("/t/:tag/:index", get(crate::html::thread_post_view))
+        .route("/t/:tag", get(crate::html::thread_view))
+        .route(
+            "/r/:room_short/:room_slug/:thread_tag/:index/expand",
+            get(crate::html::room_thread_post_expand),
+        )
+        .route(
+            "/r/:room_short/:room_slug/:thread_tag/:index",
+            get(crate::html::room_thread_post_view),
+        )
+        .route(
+            "/r/:room_short/:room_slug/:thread_tag",
+            get(crate::html::room_thread_view),
+        )
+        .route("/r/:room_short/:room_slug", get(crate::html::room_page))
+        .route("/join/:token", get(api::get_join_invite))
+        .route("/auth/login", get(api::get_auth_login))
+        .route("/auth/callback", get(api::get_auth_callback))
+        .route("/auth/complete", get(api::get_auth_complete))
+        .route("/auth/choose-username", get(api::get_choose_username))
+        .route("/auth/choose-username", post(api::post_choose_username))
+        .route("/api/v0/pending-session", post(api::post_pending_session))
+        .route("/api/v0/pending-session/:id", get(api::get_pending_session))
+        .route("/api/v0/whoami", get(api::get_whoami))
         .route("/api/v0/rpc", post(api::handle_rpc_batch))
         .with_state(state)
         .layer(TraceLayer::new_for_http())