{"messages":[{"content":"You are a constitutional council ranking individual git commits for ownership allocation.\n\nCompare these two commits. Decide which contributed more lasting value to the project.\n\nJudge substance, not spectacle:\n- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.\n- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.\n- Do not favor a side merely because its patch is longer or noisier.\n- Weight what the change does for the project, not the contributor's name.\n\nReturn ONLY a JSON object: {\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}\nThe explanation must cite concrete differences in the patches (1-3 sentences).\n\nSide A — contributor: tommy-mor\nSide A — commit message:\n[62d18183] room create path\n\nSide A — unified diff (full patch):\ndiff --git a/cli/GUIDE.sorter b/cli/GUIDE.sorter\nindex dcb06a46045564f8f6f6acffbda6f88644d453cc..9828cba4d9c17b7cce3de597d8724609b2b2adbe 100644\n--- a/cli/GUIDE.sorter\n+++ b/cli/GUIDE.sorter\n@@ -128,7 +128,7 @@ This means participation is collaborative by default. When you receive a compari\n ~/intro/scoping {\n Scoped by room:\n public … Shared site (room id \"public\").\n- private … Private room (e.g. abc12xy/my-project from RoomCreate over RPC).\n+ private … Private room (create with `npx slugsocial room create ` after OAuth — prints e.g. abc12xy/my-project).\n \n Writes from the CLI are only via forum post: the forum channel tag is the first argument after post (no #). Humans post through the website; CLI requires --delegate (agent identity).\n \n@@ -144,7 +144,7 @@ Examples:\n \n Garden and check do not take a forum tag on the command line the same way; check is a dry-run against public garden semantics.\n \n-Global (no room prefix): identity, whoami, feed, search, healthz.\n+Global (no room prefix): room, identity, whoami, feed, search, healthz.\n }\n \n ~/intro/example-session {\n@@ -152,6 +152,10 @@ Global (no room prefix): identity, whoami, feed, search, healthz.\n npx slugsocial identity start --rig claudecode --model anthropic/claude-sonnet-4.5\n # Poll until signed in; keep the printed uuid:rig:model for --delegate (do not publish to shared memory).\n \n+# Private room (optional): creates shortid/slug you pass to `private …`\n+# npx slugsocial room create austin\n+# npx slugsocial private invite-link --caps view,post,vote --uses 5\n+\n # Get sibling items to compare (path: no ~ in CLI; shell expands ~ to home)\n npx slugsocial public garden pair languages\n \n@@ -192,8 +196,12 @@ forum post --delegate DELEGATE [FILE] Post a .sorter doc (stdin if no\n \n check [FILE] Validate without submitting (public garden dry-run)\n \n+invite-link --caps view,post[,…] [--uses N] Mint shareable /join/… link (private rooms; Manage required)\n+audit [--json] List principals + capabilities (private rooms; View or Manage)\n+\n Global (no public/private prefix):\n \n+room create Create a private room (bearer required); prints ROOM_ID for `private …` (use `public …` for the shared site, not a room)\n identity start --rig --model New delegate id + OAuth pending session\n identity poll Complete OAuth; saves bearer token\n \ndiff --git a/cli/src/main.rs b/cli/src/main.rs\nindex 8eda9f485bd1f7392f1e34be27176c21e20354eb..5b1a5845e90bfea9bd9a1e1af5744e97e566b5ae 100644\n--- a/cli/src/main.rs\n+++ b/cli/src/main.rs\n@@ -140,6 +140,12 @@ enum Command {\n sub: ScopedCmd,\n },\n \n+ /// Private rooms: create (requires signed-in CLI token from `identity …`)\n+ Room {\n+ #[command(subcommand)]\n+ sub: RoomCmd,\n+ },\n+\n /// Show all activity since you last posted (global feed)\n ///\n /// Returns all ingests since this actor's last ingest, newest first.\n@@ -203,6 +209,18 @@ enum Command {\n },\n }\n \n+#[derive(Subcommand, Debug)]\n+enum RoomCmd {\n+ /// Create a private room; prints `shortid/slug` for `private …` (public site is `public …`, not a room)\n+ Create {\n+ /// Room slug (lowercase letters, digits, hyphens; 1–64 chars), e.g. `austin` or `my-project`\n+ #[arg(value_name = \"SLUG\")]\n+ slug: String,\n+ #[arg(long)]\n+ json: bool,\n+ },\n+}\n+\n #[derive(Subcommand, Debug)]\n enum IdentityCmd {\n /// Create agent delegate + pending session; output OAuth URL (exit immediately — do not poll here)\n@@ -1252,6 +1270,43 @@ async fn main() -> Result<()> {\n match cmd {\n Command::Public { sub } => run_scoped(base, \"public\", sub).await?,\n Command::Private { room, sub } => run_scoped(base, &room, sub).await?,\n+ Command::Room { sub } => match sub {\n+ RoomCmd::Create { slug, json } => {\n+ let client = http_client()?;\n+ let bearer = effective_bearer().ok_or_else(|| {\n+ anyhow!(\n+ \"no bearer token: run `slugsocial identity start --rig --model ` \\\n+ then `slugsocial identity poll `, or set SLUG_BEARER_TOKEN / ~/.config/slugsocial/token\"\n+ )\n+ })?;\n+ let batch = send_rpc(\n+ &client,\n+ base,\n+ Some(&bearer),\n+ vec![RpcCommand::RoomCreate { slug }],\n+ )\n+ .await?;\n+ match rpc_line_ok(&batch.results[0])? {\n+ RpcResult::RoomCreated { room_id } => {\n+ if json {\n+ println!(\n+ \"{}\",\n+ serde_json::to_string_pretty(&serde_json::json!({\n+ \"ok\": true,\n+ \"room_id\": room_id,\n+ }))?\n+ );\n+ } else {\n+ println!(\"{room_id}\");\n+ println!();\n+ println!(\"Next: npx slugsocial private {room_id} forum post --delegate '…' …\");\n+ println!(\" npx slugsocial private {room_id} invite-link --caps view,post,vote\");\n+ }\n+ }\n+ _ => return Err(anyhow!(\"unexpected RPC result\")),\n+ }\n+ }\n+ },\n \n Command::Healthz { json } => {\n let client = http_client()?;\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex f6bbc3df71909a2da7403cd46fe4ea6ca130c692..7d384e938a526bdf6aa04d1bf21a54d3fcb57d7e 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -14,7 +14,7 @@ use crate::{\n canonical_path::{canonicalize_item, canonicalize_tag},\n dsl,\n events::{\n- AgentBound, Event, GrantAdded, Ingest, RoomCreated, ThreadCapability, ThreadVisibility,\n+ AgentBound, Event, GrantAdded, Ingest, RoomCreated, ThreadCapability,\n },\n identity::{parse_agent, parse_username},\n path_types::CanonicalItemUrl,\n@@ -270,7 +270,7 @@ async fn rpc_post(\n let scope = scope_from_room_wire(&room_key);\n \n let is_private = !matches!(scope, ScopeId::Public);\n- if is_private && !reduced.rooms.contains_key(&room_key) {\n+ if is_private && !reduced.rooms.contains(&room_key) {\n drop(reduced);\n return Err((\"unknown room\".into(), Some(format!(\"room `{}` does not exist\", room_key))));\n }\n@@ -958,7 +958,7 @@ pub async fn handle_rpc_batch(\n let reduced = state.reduced.read().await;\n line_ok(RpcResult::ForumThreads(rpc_list_forum_threads(&reduced, &room)))\n }\n- RpcCommand::RoomCreate { slug, visibility } => {\n+ RpcCommand::RoomCreate { slug } => {\n // Scope the first read so its guard drops before any nested `read().await` / `write().await`.\n // A guard from `match verify(..., &*state.reduced.read().await)` would otherwise live for the\n // whole `match` and deadlock here (tokio::sync::RwLock is not reentrant).\n@@ -975,53 +975,42 @@ pub async fn handle_rpc_batch(\n } else if !slug.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') {\n line_err(\"slug must be lowercase alphanumeric with hyphens\", None)\n } else {\n- match visibility.as_deref().unwrap_or(\"private\") {\n- \"private\" | \"public\" => {\n- let vis = if visibility.as_deref() == Some(\"public\") {\n- ThreadVisibility::Public\n- } else {\n- ThreadVisibility::Private\n- };\n- let short_id = loop {\n- let id = gen_short_id();\n- if !state.reduced.read().await.rooms.contains_key(&format!(\"{id}/{slug}\")) {\n- break id;\n- }\n- };\n- let room_id = format!(\"{short_id}/{slug}\");\n- let ts = now_ms();\n- let tc_ev = Event::RoomCreated(RoomCreated {\n- ts,\n- room_id: room_id.clone(),\n- slug: slug.clone(),\n- owner: principal.clone(),\n- visibility: vis,\n- });\n- let ga_ev = Event::GrantAdded(GrantAdded {\n- ts,\n- room_id: room_id.clone(),\n- username: principal.clone(),\n- capabilities: vec![\n- ThreadCapability::View,\n- ThreadCapability::Post,\n- ThreadCapability::Vote,\n- ThreadCapability::AddItem,\n- ThreadCapability::Manage,\n- ],\n- granted_by: principal.clone(),\n- });\n- if let Err(e) = state.event_log.append(&tc_ev).await {\n- line_err(format!(\"{e}\"), None)\n- } else if let Err(e) = state.event_log.append(&ga_ev).await {\n- line_err(format!(\"{e}\"), None)\n- } else {\n- let mut r = state.reduced.write().await;\n- r.apply_event(tc_ev);\n- r.apply_event(ga_ev);\n- line_ok(RpcResult::RoomCreated { room_id })\n- }\n+ let short_id = loop {\n+ let id = gen_short_id();\n+ if !state.reduced.read().await.rooms.contains(&format!(\"{id}/{slug}\")) {\n+ break id;\n }\n- other => line_err(format!(\"unknown visibility: {other}\"), None),\n+ };\n+ let room_id = format!(\"{short_id}/{slug}\");\n+ let ts = now_ms();\n+ let tc_ev = Event::RoomCreated(RoomCreated {\n+ ts,\n+ room_id: room_id.clone(),\n+ slug: slug.clone(),\n+ owner: principal.clone(),\n+ });\n+ let ga_ev = Event::GrantAdded(GrantAdded {\n+ ts,\n+ room_id: room_id.clone(),\n+ username: principal.clone(),\n+ capabilities: vec![\n+ ThreadCapability::View,\n+ ThreadCapability::Post,\n+ ThreadCapability::Vote,\n+ ThreadCapability::AddItem,\n+ ThreadCapability::Manage,\n+ ],\n+ granted_by: principal.clone(),\n+ });\n+ if let Err(e) = state.event_log.append(&tc_ev).await {\n+ line_err(format!(\"{e}\"), None)\n+ } else if let Err(e) = state.event_log.append(&ga_ev).await {\n+ line_err(format!(\"{e}\"), None)\n+ } else {\n+ let mut r = state.reduced.write().await;\n+ r.apply_event(tc_ev);\n+ r.apply_event(ga_ev);\n+ line_ok(RpcResult::RoomCreated { room_id })\n }\n }\n }\n@@ -1161,7 +1150,7 @@ pub async fn handle_rpc_batch(\n Err((_, m)) => line_err(m, None),\n Ok(principal) => {\n let reduced = state.reduced.read().await;\n- if !reduced.rooms.contains_key(&room) {\n+ if !reduced.rooms.contains(&room) {\n line_err(\"unknown room\", None)\n } else {\n let can_audit = reduced.user_has_cap(&room, &principal, ThreadCapability::View)\ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex 9e60f2c218f5c871a93e855e415dd984e3a017c5..b4ffed95ead228b9cb37ce50953b13efb958a73d 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -1,12 +1,5 @@\n use serde::{Deserialize, Serialize};\n \n-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]\n-#[serde(rename_all = \"snake_case\")]\n-pub enum ThreadVisibility {\n- Public,\n- Private,\n-}\n-\n #[derive(Debug, Clone, Copy, Hash, Serialize, Deserialize, PartialEq, Eq)]\n #[serde(rename_all = \"snake_case\")]\n pub enum ThreadCapability {\n@@ -57,13 +50,13 @@ pub struct AgentBound {\n pub username: String,\n }\n \n+/// Private space keyed as `shortid/slug`.\n #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n pub struct RoomCreated {\n pub ts: i64,\n pub room_id: String,\n pub slug: String,\n pub owner: String,\n- pub visibility: ThreadVisibility,\n }\n \n #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\ndiff --git a/server/src/html/search.rs b/server/src/html/search.rs\nindex 9353cf229fbbd2cfbab5b89ba63ebe192042c91f..694220a038b335f19ac33cb3fb33c74a625bcc51 100644\n--- a/server/src/html/search.rs\n+++ b/server/src/html/search.rs\n@@ -113,7 +113,7 @@ fn search(state: &ReducerState, q: &str, limit: usize) -> SearchResults {\n }\n }\n \n- // Search threads (public room only in HTML)\n+ // Search threads (shared site scope only — `room` wire `public`)\n for ((scope, tag), thread_state) in &state.forum_threads {\n if scope != &ScopeId::Public {\n continue;\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 5190d0a7ee3d545a786a68fef483322aafdce7f9..e06445fa4441771cda0d3474bedccf6f19a36b5f 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet, VecDeque};\n use serde::{Deserialize, Serialize};\n \n use crate::canonical_path::canonicalize_tag;\n-use crate::events::{Event, Ingest, ThreadCapability, ThreadVisibility};\n+use crate::events::{Event, Ingest, ThreadCapability};\n use crate::path_types::CanonicalItemUrl;\n \n #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]\n@@ -151,11 +151,6 @@ pub struct RankHistoryEntry {\n pub post_id: String,\n }\n \n-#[derive(Debug, Clone)]\n-pub struct RoomState {\n- pub visibility: crate::events::ThreadVisibility,\n-}\n-\n /// Durable invite link state (from [`crate::events::InviteMinted`] / [`crate::events::InviteRedeemed`]).\n #[derive(Debug, Clone)]\n pub struct ActiveInviteState {\n@@ -171,7 +166,6 @@ pub enum RoomTimelineKind {\n RoomCreated {\n owner: String,\n slug: String,\n- visibility: ThreadVisibility,\n },\n GrantAdded {\n username: String,\n@@ -235,8 +229,8 @@ pub struct ReducerState {\n pub ingests_by_id: HashMap,\n /// (scope, thread_tag) → ingest ids, newest first.\n pub ingests_by_scope_thread: HashMap<(ScopeId, String), VecDeque>,\n- /// Private (or public) room registry: room_id → visibility from [`RoomCreated`].\n- pub rooms: HashMap,\n+ /// Private room ids (`shortid/slug`) known from [`RoomCreated`].\n+ pub rooms: HashSet,\n /// (scope, thread_tag) → last activity.\n pub forum_threads: HashMap<(ScopeId, String), ForumThreadState>,\n pub actor_last_post_ts: HashMap,\n@@ -403,12 +397,7 @@ impl ReducerState {\n self.agent_bindings.insert(ab.agent, ab.username);\n }\n Event::RoomCreated(rc) => {\n- self.rooms.insert(\n- rc.room_id.clone(),\n- RoomState {\n- visibility: rc.visibility,\n- },\n- );\n+ self.rooms.insert(rc.room_id.clone());\n self.room_timeline\n .entry(rc.room_id.clone())\n .or_default()\n@@ -417,7 +406,6 @@ impl ReducerState {\n kind: RoomTimelineKind::RoomCreated {\n owner: rc.owner.clone(),\n slug: rc.slug.clone(),\n- visibility: rc.visibility,\n },\n });\n }\n@@ -673,7 +661,7 @@ impl Default for ReducerState {\n agent_bindings: HashMap::new(),\n ingests_by_id: HashMap::new(),\n ingests_by_scope_thread: HashMap::new(),\n- rooms: HashMap::new(),\n+ rooms: HashSet::new(),\n forum_threads: HashMap::new(),\n actor_last_post_ts: HashMap::new(),\n ingests_ordered: Vec::new(),\ndiff --git a/server/src/timeline.rs b/server/src/timeline.rs\nindex 251158943ab36d3015268e35f6bdd01c3f42ab3b..265ca4ae9946ecd29a7d1d4ec791de8465ce658e 100644\n--- a/server/src/timeline.rs\n+++ b/server/src/timeline.rs\n@@ -25,16 +25,8 @@ fn caps_list(caps: &[crate::events::ThreadCapability]) -> String {\n /// Human-readable system line for the thread feed.\n pub fn format_room_timeline_entry(e: &RoomTimelineEntry) -> String {\n match &e.kind {\n- RoomTimelineKind::RoomCreated {\n- owner,\n- slug,\n- visibility,\n- } => {\n- let vis = match visibility {\n- crate::events::ThreadVisibility::Public => \"public\",\n- crate::events::ThreadVisibility::Private => \"private\",\n- };\n- format!(\"@{owner} created room #{slug} ({vis})\")\n+ RoomTimelineKind::RoomCreated { owner, slug } => {\n+ format!(\"@{owner} created room #{slug}\")\n }\n RoomTimelineKind::GrantAdded {\n username,\n@@ -141,7 +133,7 @@ pub fn merge_thread_rows(\n rows\n }\n \n-/// Public forum thread (`room_wire == \"public\"`): same merge (timeline usually empty).\n+/// Shared-site thread view (`room_wire == \"public\"` on the wire). Same merge as private rooms; private-room timeline is unused here.\n pub fn merge_public_thread_rows(\n reduced: &ReducerState,\n thread_tag: &str,\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex b930120da09fe7d307f0411b84fb639fb8bd0b15..139fdda27d2276e3b30116816495648970d24c5f 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -96,11 +96,11 @@ async fn test_healthz() {\n }\n \n #[tokio::test]\n-async fn test_room_create_private_rpc() {\n+async fn test_room_create_rpc() {\n let (addr, _tmp, _log, _handle) = create_test_server().await;\n let client = reqwest::Client::new();\n let batch = serde_json::json!([{\n- \"RoomCreate\": { \"slug\": \"secret-project\", \"visibility\": \"private\" }\n+ \"RoomCreate\": { \"slug\": \"secret-project\" }\n }]);\n let body = rpc_batch(&client, addr, Some(&test_bearer()), batch).await;\n let line = &body[\"results\"][0];\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 4ded5ce92576cdea653cce0ba8a751be4374731a..697e7d91545dd3ee96efde07fc8c3cf90f1a8056 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -82,7 +82,7 @@\n ;; Alice creates a private room.\n _ (println \"\\nalice creates private room…\")\n create (rpc-batch! base-url alice-token\n- [{\"RoomCreate\" {\"slug\" \"secret-project\" \"visibility\" \"private\"}}])\n+ [{\"RoomCreate\" {\"slug\" \"secret-project\"}}])\n _ (assert! (= 200 (:status create)) \"room create HTTP 200\")\n _ (assert! (rpc-line-ok? (:parsed create)) \"room create RPC ok\")\n room-id (get-in (:parsed create) [\"results\" 0 \"result\" \"RoomCreated\" \"room_id\"])\ndiff --git a/test/invites.bb b/test/invites.bb\nindex f72b1e630a6856174cdef11eb977e2f81b16e551..ca0fd6c858400671452c4ec59c490d05101dd0e4 100644\n--- a/test/invites.bb\n+++ b/test/invites.bb\n@@ -86,7 +86,7 @@\n \n _ (println \"\\nalice creates private room…\")\n create (rpc-batch! base-url alice-token\n- [{\"RoomCreate\" {\"slug\" \"invite-demo\" \"visibility\" \"private\"}}])\n+ [{\"RoomCreate\" {\"slug\" \"invite-demo\"}}])\n _ (assert! (= 200 (:status create)) \"room create HTTP 200\")\n _ (assert! (rpc-line-ok? (:parsed create)) \"room create RPC ok\")\n room-id (get-in (:parsed create) [\"results\" 0 \"result\" \"RoomCreated\" \"room_id\"])\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex 98c66a00fd27803ef6f75b5ac478ff2eb762d771..bb8586f1734f77d95598a9294bdb0de2d55bf715 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -319,8 +319,6 @@ pub enum RpcCommand {\n },\n RoomCreate {\n slug: String,\n- #[serde(default, skip_serializing_if = \"Option::is_none\")]\n- visibility: Option,\n },\n RoomGrant {\n room: String,\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[8d5328d3] -theme\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex 82b2aa51d21ada1d0d849d3ddfc3a81e4241d861..e74e42e0f0ffc4224f5ef5421b486a5f35434999 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -73,11 +73,7 @@ pub async fn post_ui_html(\n ensure_partial_tree(&mut tree, &item);\n }\n let _ = state.ensure_node(&item).await;\n- let dest = if item.is_root() {\n- \"/\".to_string()\n- } else {\n- format!(\"/?item={}\", item.as_str())\n- };\n+ let dest = item.browse_href();\n JsBuilder::new()\n .raw(&format!(\n \"window.location.href={};\",\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex c973cb718ac74b95570dabea76e24459417790b9..a8353c6de0cd6d268219e552b7ca1ba4e3000585 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -1,13 +1,10 @@\n use axum::{\n body::Body,\n extract::{Path, State},\n- http::{header, HeaderValue, StatusCode, Uri},\n+ http::{header, StatusCode, Uri},\n response::{IntoResponse, Response},\n- Form,\n };\n-use axum_extra::extract::cookie::CookieJar;\n use maud::{html, Markup, DOCTYPE};\n-use serde::Deserialize;\n \n use crate::{\n form_template::template_json_compact,\n@@ -15,96 +12,25 @@ use crate::{\n path_types::ItemId,\n ranking::{top_bottom, RankedItem},\n reducer::{GroupState, NodeState},\n- state::{parse_item_param, AppState},\n+ state::AppState,\n ui_action::UI_RPC_FIELD,\n };\n \n-const THEME_DEFAULT_CSS: &str = include_str!(\"../../static/theme_default.css\");\n-const THEME_RETRO_CSS: &str = include_str!(\"../../static/theme_retro.css\");\n+const SORTER_CSS: &str = include_str!(\"../../static/sorter.css\");\n const SORTER_UI_JS: &str = include_str!(\"../../static/sorter_ui.js\");\n \n-pub const SORTER_THEME_COOKIE: &str = \"sorter-theme\";\n-\n-pub fn normalize_theme(raw: &str) -> &'static str {\n- match raw {\n- \"retro\" => \"retro\",\n- _ => \"default\",\n- }\n-}\n-\n-pub fn theme_from_jar(jar: &CookieJar) -> &'static str {\n- jar.get(SORTER_THEME_COOKIE)\n- .map(|c| normalize_theme(c.value()))\n- .unwrap_or(\"default\")\n-}\n-\n-pub fn theme_next_from_uri(uri: &Uri) -> String {\n- uri.path_and_query()\n- .map(|pq| pq.as_str().to_string())\n- .filter(|s| !s.is_empty())\n- .unwrap_or_else(|| \"/\".to_string())\n-}\n-\n-pub fn theme_cookie_header_value(theme: &str) -> HeaderValue {\n- let t = normalize_theme(theme);\n- let s = format!(\"{SORTER_THEME_COOKIE}={t}; Path=/; SameSite=Lax; Max-Age=31536000\");\n- HeaderValue::from_str(&s).expect(\"theme cookie must be ASCII\")\n-}\n-\n-fn sanitize_theme_next(next: Option<&str>) -> String {\n- let s = next.unwrap_or(\"/\").trim();\n- if s.starts_with('/') && !s.starts_with(\"//\") && s.len() < 8192 {\n- s.to_string()\n- } else {\n- \"/\".to_string()\n- }\n-}\n-\n-#[derive(Debug, Deserialize)]\n-pub struct ThemeForm {\n- theme: String,\n- next: Option,\n-}\n-\n-pub async fn post_theme(Form(form): Form) -> impl IntoResponse {\n- let theme = normalize_theme(&form.theme);\n- let next = sanitize_theme_next(form.next.as_deref());\n- let loc =\n- HeaderValue::try_from(next.as_str()).unwrap_or_else(|_| HeaderValue::from_static(\"/\"));\n- Response::builder()\n- .status(StatusCode::SEE_OTHER)\n- .header(header::LOCATION, loc)\n- .header(header::SET_COOKIE, theme_cookie_header_value(theme))\n- .body(Body::empty())\n- .expect(\"theme redirect response\")\n-}\n-\n pub async fn serve_static(Path(filename): Path) -> impl IntoResponse {\n- if filename == \"sorter_ui.js\" {\n- return Response::builder()\n- .status(StatusCode::OK)\n- .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n- .header(header::CACHE_CONTROL, \"public, max-age=3600\")\n- .body(SORTER_UI_JS.to_string())\n- .unwrap()\n- .into_response();\n- }\n-\n- let theme = filename\n- .strip_prefix(\"theme_\")\n- .and_then(|s| s.strip_suffix(\".css\"));\n-\n- let css = match theme {\n- Some(\"default\") => THEME_DEFAULT_CSS,\n- Some(\"retro\") => THEME_RETRO_CSS,\n+ let (content_type, body) = match filename.as_str() {\n+ \"sorter.css\" => (\"text/css; charset=utf-8\", SORTER_CSS),\n+ \"sorter_ui.js\" => (\"text/javascript; charset=utf-8\", SORTER_UI_JS),\n _ => return (StatusCode::NOT_FOUND, \"static file not found\").into_response(),\n };\n \n Response::builder()\n .status(StatusCode::OK)\n- .header(header::CONTENT_TYPE, \"text/css; charset=utf-8\")\n+ .header(header::CONTENT_TYPE, content_type)\n .header(header::CACHE_CONTROL, \"public, max-age=3600\")\n- .body(css.to_string())\n+ .body(body.to_string())\n .unwrap()\n .into_response()\n }\n@@ -162,8 +88,7 @@ fn asset_version() -> &'static str {\n V.get_or_init(|| {\n use std::hash::{Hash, Hasher};\n let mut h = std::collections::hash_map::DefaultHasher::new();\n- THEME_DEFAULT_CSS.hash(&mut h);\n- THEME_RETRO_CSS.hash(&mut h);\n+ SORTER_CSS.hash(&mut h);\n SORTER_UI_JS.hash(&mut h);\n format!(\"{:x}\", h.finish())\n })\n@@ -176,9 +101,9 @@ pub fn now_ms() -> i64 {\n t.as_millis() as i64\n }\n \n-fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str) -> Markup {\n+fn layout(title: &str, body: Markup, views: u64) -> Markup {\n let ver = asset_version();\n- let css_href = format!(\"/static/theme_{theme}.css?v={ver}\");\n+ let css_href = format!(\"/static/sorter.css?v={ver}\");\n let js_src = format!(\"/static/sorter_ui.js?v={ver}\");\n html! {\n (DOCTYPE)\n@@ -187,7 +112,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n meta charset=\"utf-8\";\n meta name=\"viewport\" content=\"width=device-width, initial-scale=1\";\n title { (title) }\n- link rel=\"stylesheet\" href=(css_href) id=\"theme-stylesheet\";\n+ link rel=\"stylesheet\" href=(css_href);\n script src=\"https://unpkg.com/idiomorph@0.3.0/dist/idiomorph.min.js\" {}\n }\n body class=\"home\" {\n@@ -196,21 +121,6 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n }\n div id=\"errors\" {}\n (body)\n- div id=\"controls\" {\n- a href=\"https://github.com/sortersocial/sorter2\" id=\"src-link\" { \"src\" }\n- form id=\"sorter-theme-form\" method=\"post\" action=\"/theme\" data-navigate=\"full\" {\n- input type=\"hidden\" name=\"next\" value=(theme_next);\n- select id=\"theme-select\" name=\"theme\" onchange=\"this.form.submit()\" aria-label=\"Theme\" {\n- @for (val, label) in [(\"default\", \"default\"), (\"retro\", \"retro\")] {\n- @if theme == val {\n- option value=(val) selected { (label) }\n- } @else {\n- option value=(val) { (label) }\n- }\n- }\n- }\n- }\n- }\n script src=(js_src) {}\n }\n }\n@@ -218,11 +128,7 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n }\n \n fn item_href(id: &ItemId) -> String {\n- if id.is_root() {\n- \"/\".to_string()\n- } else {\n- format!(\"/?item={}\", id.as_str())\n- }\n+ id.browse_href()\n }\n \n fn segment_label(seg: &str) -> &str {\n@@ -361,39 +267,10 @@ pub fn vote_panel(parent: &ItemId) -> Markup {\n }\n \n \n-fn query_param(uri: &Uri, key: &str) -> Option {\n- let q = uri.query()?;\n- q.split('&').find_map(|pair| {\n- let mut it = pair.splitn(2, '=');\n- if it.next()? == key {\n- Some(it.next().unwrap_or(\"\").to_string())\n- } else {\n- None\n- }\n- })\n-}\n-\n-pub async fn home(\n- State(state): State,\n- jar: CookieJar,\n- uri: Uri,\n-) -> impl IntoResponse {\n+async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n let path = uri.path().to_string();\n state.views.increment(path.clone());\n let views = state.views.get_views(&path);\n- let theme = theme_from_jar(&jar);\n- let theme_next = theme_next_from_uri(&uri);\n-\n- let item_raw = query_param(&uri, \"item\")\n- .or_else(|| query_param(&uri, \"sub\").map(|sub| {\n- if sub.is_empty() {\n- String::new()\n- } else {\n- format!(\"reddit.com/r/{sub}\")\n- }\n- }))\n- .unwrap_or_default();\n- let item = parse_item_param(&item_raw);\n \n let tree = state.tree.read().await;\n let empty_node = NodeState::default();\n@@ -408,5 +285,14 @@ pub async fn home(\n (vote_panel(&item))\n (ranking_panel(&item, group))\n };\n- layout(\"sorter2\", body, views, theme, &theme_next)\n+ layout(\"sorter2\", body, views)\n+}\n+\n+pub async fn home(State(state): State, uri: Uri) -> impl IntoResponse {\n+ item_page(state, uri, ItemId::root()).await\n+}\n+\n+pub async fn browse(State(state): State, uri: Uri) -> impl IntoResponse {\n+ let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n+ item_page(state, uri, item).await\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 14e7cfbc38feb5d07aff859b64bce6e2ec45cf91..cd56743192919cf4dcea539b3d8873a21fb7e72b 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -30,9 +30,9 @@ pub fn create_app(state: AppState) -> Router {\n Router::new()\n .route(\"/healthz\", get(|| async { \"ok\" }))\n .route(\"/static/:filename\", get(crate::html::serve_static))\n+ .route(\"/~/*item_path\", get(crate::html::browse))\n .route(\"/\", get(crate::html::home))\n .route(\"/ui\", post(crate::api::ui_html::post_ui_html))\n- .route(\"/theme\", post(crate::html::post_theme))\n .with_state(state)\n .layer(TraceLayer::new_for_http())\n }\ndiff --git a/server/src/path_types.rs b/server/src/path_types.rs\nindex b5c41444f7bcd4d8d289ed3af464bc3f14d0df99..12dce9888f5cd4e1a0974d12d6468368d0f775b9 100644\n--- a/server/src/path_types.rs\n+++ b/server/src/path_types.rs\n@@ -90,6 +90,50 @@ impl ItemId {\n paths\n }\n \n+ /// Full URL for the browser location bar after `/~/`.\n+ pub fn to_browse_url(&self) -> String {\n+ if self.is_root() {\n+ return String::new();\n+ }\n+ if self.as_str().contains(\"://\") {\n+ return self.as_str().to_string();\n+ }\n+ if self\n+ .segments()\n+ .first()\n+ .is_some_and(|s| s.contains('.'))\n+ {\n+ format!(\"https://{}\", self.as_str())\n+ } else {\n+ self.as_str().to_string()\n+ }\n+ }\n+\n+ /// App route, e.g. `/~/https://reddit.com/r/rust`.\n+ pub fn browse_href(&self) -> String {\n+ if self.is_root() {\n+ \"/\".to_string()\n+ } else {\n+ format!(\"/~/{}\", self.to_browse_url())\n+ }\n+ }\n+\n+ /// Parse the tail after `/~/` in a request path.\n+ pub fn from_browse_tail(tail: &str) -> ItemId {\n+ let raw = normalize_browse_tail(tail);\n+ if raw.is_empty() {\n+ return ItemId::root();\n+ }\n+ ItemId::from_url(&raw)\n+ .or_else(|| ItemId::parse(&raw))\n+ .unwrap_or_else(|| ItemId::opaque(raw))\n+ }\n+\n+ pub fn from_browse_uri(path: &str) -> Option {\n+ path.strip_prefix(\"/~/\")\n+ .map(ItemId::from_browse_tail)\n+ }\n+\n fn canonicalize(raw: &str) -> Option {\n let s = raw.trim();\n if s.is_empty() {\n@@ -155,6 +199,21 @@ fn normalize_host(host: &str) -> String {\n }\n }\n \n+fn normalize_browse_tail(tail: &str) -> String {\n+ let t = tail.trim();\n+ if t.is_empty() {\n+ return String::new();\n+ }\n+ // Some HTTP stacks collapse `https://` → `https:/` inside a path segment.\n+ if t.starts_with(\"https:/\") && !t.starts_with(\"https://\") {\n+ return format!(\"https://{}\", &t[7..]);\n+ }\n+ if t.starts_with(\"http:/\") && !t.starts_with(\"http://\") {\n+ return format!(\"http://{}\", &t[6..]);\n+ }\n+ t.to_string()\n+}\n+\n fn normalize_reddit_host_path(s: &str) -> String {\n let (host, path) = s.split_once('/').unwrap_or((s, \"\"));\n let host = normalize_host(host);\n@@ -252,4 +311,22 @@ mod tests {\n );\n assert!(ItemId::from_legacy_scope(\"\").is_root());\n }\n+\n+ #[test]\n+ fn browse_href_wraps_canonical_path() {\n+ let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+ assert_eq!(id.browse_href(), \"/~/https://reddit.com/r/rust\");\n+ }\n+\n+ #[test]\n+ fn from_browse_tail_parses_full_url() {\n+ let id = ItemId::from_browse_tail(\"https://reddit.com/r/AmITheAsshole\");\n+ assert_eq!(id.as_str(), \"reddit.com/r/amitheasshole\");\n+ }\n+\n+ #[test]\n+ fn from_browse_uri_strips_prefix() {\n+ let id = ItemId::from_browse_uri(\"/~/https://reddit.com/r/rust\").unwrap();\n+ assert_eq!(id.as_str(), \"reddit.com/r/rust\");\n+ }\n }\ndiff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js\nindex 9c475d8e076ba527aaf7a25c177d0d651bd46ca9..d9b016f197547f37ca4b2bcdd7ee6b673d0fb3f0 100644\n--- a/server/static/sorter_ui.js\n+++ b/server/static/sorter_ui.js\n@@ -24,7 +24,6 @@\n var f = e.target;\n if (!f || f.tagName !== 'FORM') return;\n if ((f.method || 'get').toLowerCase() !== 'post') return;\n- if (f.id === 'sorter-theme-form') return;\n if (f.getAttribute('data-navigate') === 'full') return;\n e.preventDefault();\n await postUiForm(f);\ndiff --git a/server/static/theme_default.css b/server/static/theme_default.css\ndeleted file mode 100644\nindex 1bf8ac7a25207336c019f93cd4119bd0e06229f0..0000000000000000000000000000000000000000\n--- a/server/static/theme_default.css\n+++ /dev/null\n@@ -1,186 +0,0 @@\n-:root {\n- --bg: #0f1115;\n- --fg: #e8eaed;\n- --muted: #9aa0a6;\n- --accent: #7cacf8;\n- --panel: #1a1d24;\n- --border: #2a2f3a;\n-}\n-\n-* {\n- box-sizing: border-box;\n-}\n-\n-body {\n- margin: 0;\n- font-family: system-ui, -apple-system, sans-serif;\n- background: var(--bg);\n- color: var(--fg);\n- line-height: 1.5;\n-}\n-\n-.muted {\n- color: var(--muted);\n-}\n-\n-.small {\n- font-size: 0.875rem;\n-}\n-\n-.view-meta {\n- position: fixed;\n- top: 0.5rem;\n- right: 0.5rem;\n- font-size: 0.75rem;\n-}\n-\n-#controls {\n- position: fixed;\n- bottom: 0;\n- left: 0;\n- right: 0;\n- display: flex;\n- gap: 1rem;\n- align-items: center;\n- padding: 0.75rem 1rem;\n- background: var(--panel);\n- border-top: 1px solid var(--border);\n- font-size: 0.875rem;\n-}\n-\n-#controls a {\n- color: var(--accent);\n-}\n-\n-.demo-panel {\n- max-width: 40rem;\n- margin: 4rem auto 6rem;\n- padding: 2rem;\n- background: var(--panel);\n- border: 1px solid var(--border);\n- border-radius: 8px;\n-}\n-\n-.demo-panel h1 {\n- margin-top: 0;\n-}\n-\n-.btn-primary {\n- background: var(--accent);\n- color: #0f1115;\n- border: none;\n- padding: 0.5rem 1rem;\n- border-radius: 4px;\n- font-size: 1rem;\n- cursor: pointer;\n-}\n-\n-.btn-primary:hover {\n- filter: brightness(1.1);\n-}\n-\n-code {\n- font-size: 0.85em;\n- background: var(--bg);\n- padding: 0.1em 0.35em;\n- border-radius: 3px;\n-}\n-\n-.vote-fields {\n- display: flex;\n- flex-direction: column;\n- gap: 0.75rem;\n- margin-bottom: 1rem;\n-}\n-\n-.vote-fields label {\n- display: flex;\n- flex-direction: column;\n- gap: 0.25rem;\n-}\n-\n-.vote-fields input {\n- padding: 0.4rem 0.5rem;\n- border: 1px solid var(--border);\n- border-radius: 4px;\n- background: var(--bg);\n- color: var(--fg);\n-}\n-\n-.rank-list {\n- margin: 0;\n- padding-left: 0;\n- list-style: none;\n-}\n-\n-.rank-list li {\n- margin-bottom: 0.35rem;\n-}\n-\n-.rank-num {\n- color: var(--muted);\n-}\n-\n-#parser-input {\n- width: 100%;\n- padding: 0.5rem;\n- border: 1px solid var(--border);\n- border-radius: 4px;\n- background: var(--bg);\n- color: var(--fg);\n- font-size: 1rem;\n- font-family: inherit;\n- resize: vertical;\n-}\n-\n-#parser-form .btn-primary {\n- margin-top: 0.5rem;\n-}\n-\n-.breadcrumbs {\n- font-size: 0.875rem;\n- margin-bottom: 1rem;\n- color: var(--muted);\n-}\n-\n-.breadcrumbs a {\n- color: var(--accent);\n- text-decoration: none;\n-}\n-\n-.breadcrumbs a:hover {\n- text-decoration: underline;\n-}\n-\n-.breadcrumbs .separator {\n- color: var(--muted);\n-}\n-\n-.rank-list a {\n- color: var(--accent);\n- text-decoration: none;\n-}\n-\n-.rank-list a:hover {\n- text-decoration: underline;\n-}\n-\n-.entity-card h2 {\n- margin-top: 0;\n-}\n-\n-.scope-name {\n- color: var(--accent);\n- font-weight: 600;\n-}\n-\n-.rank-heading {\n- margin: 0.75rem 0 0.25rem;\n- text-transform: uppercase;\n- letter-spacing: 0.04em;\n-}\n-\n-.rank-gap {\n- text-align: center;\n- margin: 0.25rem 0;\n-}\ndiff --git a/server/static/theme_retro.css b/server/static/theme_retro.css\ndeleted file mode 100644\nindex ceee99494b873a6e658857be97f02ee739db85e9..0000000000000000000000000000000000000000\n--- a/server/static/theme_retro.css\n+++ /dev/null\n@@ -1,5 +0,0 @@\n-@import url(\"/static/theme_default.css\");\n-\n-:root {\n- --accent: #f4a261;\n-}\ndiff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs\nindex f7ac9c26bf9f9277ad5f5708603224c095165fb8..df7d9ab357531c5146d0b326c149fdaa6b531a4a 100644\n--- a/server/tests/integration_ui.rs\n+++ b/server/tests/integration_ui.rs\n@@ -70,6 +70,22 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() {\n assert_eq!(ranked[0].item.as_str(), \"alpha\");\n }\n \n+#[tokio::test]\n+async fn browse_url_renders_subreddit_page() {\n+ let (addr, _tmp) = start_test_server().await;\n+ let client = reqwest::Client::new();\n+ let html = client\n+ .get(format!(\"http://{addr}/~/https://reddit.com/r/rust\"))\n+ .send()\n+ .await\n+ .unwrap()\n+ .text()\n+ .await\n+ .unwrap();\n+ assert!(html.contains(\"ranking-panel\"));\n+ assert!(html.contains(\"/~/https://reddit.com/r/rust\"));\n+}\n+\n #[tokio::test]\n async fn post_ui_parse_query_redirects_to_subreddit() {\n let (addr, _tmp) = start_test_server().await;\n@@ -93,5 +109,5 @@ async fn post_ui_parse_query_redirects_to_subreddit() {\n .unwrap();\n \n assert!(body.contains(\"window.location.href\"));\n- assert!(body.contains(\"/?item=reddit.com/r/rust\"));\n+ assert!(body.contains(\"/~/https://reddit.com/r/rust\"));\n }\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}