{"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[00be3a29] invite system\n\nSide A — unified diff (full patch):\ndiff --git a/bb.edn b/bb.edn\nindex 50be8232847e672b3f273a2fb25ddd1d12adb7e2..818f850765370d12d58f239e287764fc3649d78b 100644\n--- a/bb.edn\n+++ b/bb.edn\n@@ -47,14 +47,16 @@\n \"RUST_LOG\" \"info\"})})))}\n \n test\n- {:doc \"Full test suite: integration + auth + grants\"\n+ {:doc \"Full test suite: integration + auth + grants + invites\"\n :requires ([test.integration :as integration]\n [test.auth :as auth]\n- [test.grants :as grants])\n+ [test.grants :as grants]\n+ [test.invites :as invites])\n :task (do\n (integration/integration)\n (auth/auth-test)\n- (grants/grants-test))}\n+ (grants/grants-test)\n+ (invites/invites-test))}\n \n perf\n {:doc \"Performance test: concurrent HTTP requests to detect blocking I/O\"\ndiff --git a/cli/src/main.rs b/cli/src/main.rs\nindex e5833b0b93d8e667b94c574ba2b0f8cb758ff3df..8eda9f485bd1f7392f1e34be27176c21e20354eb 100644\n--- a/cli/src/main.rs\n+++ b/cli/src/main.rs\n@@ -105,6 +105,23 @@ enum ScopedCmd {\n #[arg(long)]\n json: bool,\n },\n+\n+ /// Mint a shareable invite link (24h TTL, in-memory until redeemed). Requires Manage on the room.\n+ InviteLink {\n+ /// Comma-separated: view, post, vote, add_item, manage\n+ #[arg(long = \"caps\", value_delimiter = ',')]\n+ caps: Vec,\n+ #[arg(long, default_value_t = 1)]\n+ uses: usize,\n+ #[arg(long)]\n+ json: bool,\n+ },\n+\n+ /// List principals granted access in this room (requires View or Manage)\n+ Audit {\n+ #[arg(long)]\n+ json: bool,\n+ },\n }\n \n #[derive(Subcommand, Debug)]\n@@ -514,17 +531,35 @@ fn print_thread(resp: &ThreadDetailResponse) {\n .duration_since(std::time::UNIX_EPOCH)\n .unwrap_or_default()\n .as_millis() as i64;\n- if resp.total > resp.posts.len() {\n- let end = resp.offset + resp.posts.len();\n- eprintln!(\"# showing {}-{} of {} posts (--offset N --limit N to paginate)\", resp.offset, end.saturating_sub(1), resp.total);\n+ if resp.total > resp.items.len() {\n+ let end = resp.offset + resp.items.len();\n+ eprintln!(\n+ \"# showing {}-{} of {} rows (--offset N --limit N to paginate)\",\n+ resp.offset,\n+ end.saturating_sub(1),\n+ resp.total\n+ );\n }\n- for (i, post) in resp.posts.iter().enumerate() {\n- let timeago = slug_types::timeago::timeago_compact(now_ms, post.ts);\n- let body = &post.body.trim();\n- println!(\"\", post.index, timeago);\n- println!(\"{}\", body);\n- println!(\"\");\n- if i + 1 < resp.posts.len() {\n+ for (i, item) in resp.items.iter().enumerate() {\n+ match item {\n+ ThreadItem::Post {\n+ index,\n+ ts,\n+ body,\n+ ..\n+ } => {\n+ let timeago = slug_types::timeago::timeago_compact(now_ms, *ts);\n+ let body = body.trim();\n+ println!(\"\", index, timeago);\n+ println!(\"{}\", body);\n+ println!(\"\");\n+ }\n+ ThreadItem::System { ts, text } => {\n+ let timeago = slug_types::timeago::timeago_compact(now_ms, *ts);\n+ println!(\"{}\", timeago, text.trim());\n+ }\n+ }\n+ if i + 1 < resp.items.len() {\n println!();\n println!();\n }\n@@ -1036,6 +1071,95 @@ async fn run_scoped(base: &str, room: &str, sub: ScopedCmd) -> Result<()> {\n }\n }\n },\n+ ScopedCmd::InviteLink { caps, uses, json } => {\n+ let caps: Vec = caps\n+ .into_iter()\n+ .flat_map(|s| {\n+ s.split(',')\n+ .map(|p| p.trim().to_lowercase())\n+ .filter(|p| !p.is_empty())\n+ .collect::>()\n+ })\n+ .collect();\n+ if caps.is_empty() {\n+ return Err(anyhow!(\"--caps is required (e.g. --caps view,post,vote)\"));\n+ }\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::RoomMintInvite {\n+ room: room.to_string(),\n+ capabilities: caps,\n+ max_uses: uses,\n+ }],\n+ )\n+ .await?;\n+ match rpc_line_ok(&batch.results[0])? {\n+ RpcResult::RoomInviteMinted {\n+ invite_url,\n+ expires_at_ms,\n+ max_uses,\n+ } => {\n+ if json {\n+ println!(\n+ \"{}\",\n+ serde_json::to_string_pretty(&serde_json::json!({\n+ \"invite_url\": invite_url,\n+ \"expires_at_ms\": expires_at_ms,\n+ \"max_uses\": max_uses,\n+ }))?\n+ );\n+ } else {\n+ println!(\"{invite_url}\");\n+ println!(\"(Expires in 24 hours. Max uses: {max_uses})\");\n+ }\n+ }\n+ _ => return Err(anyhow!(\"unexpected RPC result\")),\n+ }\n+ }\n+ ScopedCmd::Audit { json } => {\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::RoomAudit {\n+ room: room.to_string(),\n+ }],\n+ )\n+ .await?;\n+ match rpc_line_ok(&batch.results[0])? {\n+ RpcResult::RoomAudit(resp) => {\n+ if json {\n+ println!(\"{}\", serde_json::to_string_pretty(&resp)?);\n+ } else {\n+ println!(\"room {}\", resp.room);\n+ if resp.grants.is_empty() {\n+ println!(\"(no grants recorded)\");\n+ } else {\n+ let w_user = resp.grants.iter().map(|g| g.username.len()).max().unwrap_or(0);\n+ for g in &resp.grants {\n+ let caps = g.capabilities.join(\", \");\n+ println!(\"{: return Err(anyhow!(\"unexpected RPC result\")),\n+ }\n+ }\n ScopedCmd::Check { file, json } => {\n let mut text = String::new();\n match file {\ndiff --git a/server/src/api/auth.rs b/server/src/api/auth.rs\nindex 995ce4a61d29b024c399c656134f541ecfd880cf..b45ba39419c84af8bf2333fc9b7d47e98525c45f 100644\n--- a/server/src/api/auth.rs\n+++ b/server/src/api/auth.rs\n@@ -12,12 +12,61 @@ use tokio::sync::RwLock;\n \n use crate::{\n api::helpers::{api_error, now_ms, sha256_hex},\n- events::{Event, TokenIssued, UserRegistered},\n+ events::{Event, GrantAdded, TokenIssued, UserRegistered},\n identity::{parse_agent, parse_username},\n html::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page},\n state::{AppState, PendingSession},\n };\n \n+/// Delegate id for browser users who land via `/join/inv_…` (no CLI agent).\n+const INVITE_BROWSER_AGENT: &str = \"00000000-0000-0000-0000-000000000000:invite:web/join\";\n+\n+async fn apply_invite_redemption(state: &AppState, invite_token: &str, grantee_username: &str) -> Result<(), String> {\n+ let now = now_ms();\n+ let ga = {\n+ let mut invites = state.invites.write().await;\n+ let Some(inv) = invites.get_mut(invite_token) else {\n+ return Err(\"invite not found\".into());\n+ };\n+ if now > inv.expires_at_ms {\n+ invites.remove(invite_token);\n+ return Err(\"invite expired\".into());\n+ }\n+ if inv.current_uses >= inv.max_uses {\n+ return Err(\"invite exhausted\".into());\n+ }\n+ inv.current_uses += 1;\n+ Event::GrantAdded(GrantAdded {\n+ ts: now,\n+ room_id: inv.room_id.clone(),\n+ username: grantee_username.to_string(),\n+ capabilities: inv.capabilities.clone(),\n+ granted_by: inv.inviter.clone(),\n+ })\n+ };\n+\n+ match state.event_log.append(&ga).await {\n+ Ok(()) => {\n+ let mut reduced = state.reduced.write().await;\n+ reduced.apply_event(ga);\n+ let mut invites = state.invites.write().await;\n+ if let Some(inv) = invites.get(invite_token) {\n+ if inv.current_uses >= inv.max_uses {\n+ invites.remove(invite_token);\n+ }\n+ }\n+ Ok(())\n+ }\n+ Err(e) => {\n+ let mut invites = state.invites.write().await;\n+ if let Some(inv) = invites.get_mut(invite_token) {\n+ inv.current_uses = inv.current_uses.saturating_sub(1);\n+ }\n+ Err(format!(\"{e}\"))\n+ }\n+ }\n+}\n+\n fn pending_sessions(state: &AppState) -> Arc>> {\n state.pending_sessions.clone()\n }\n@@ -115,6 +164,42 @@ pub struct AuthLoginQuery {\n pub session: String,\n }\n \n+pub async fn get_join_invite(Path(token): Path, State(state): State) -> impl IntoResponse {\n+ let token = token.trim().to_string();\n+ if token.is_empty() {\n+ return api_error(StatusCode::NOT_FOUND, \"invite invalid or expired\", None).into_response();\n+ }\n+ let now = now_ms();\n+ let valid = {\n+ let invites = state.invites.read().await;\n+ match invites.get(&token) {\n+ None => false,\n+ Some(inv) => now <= inv.expires_at_ms && inv.current_uses < inv.max_uses,\n+ }\n+ };\n+ if !valid {\n+ return api_error(StatusCode::NOT_FOUND, \"invite invalid or expired\", None).into_response();\n+ }\n+\n+ let session = format!(\"p_{}\", uuid::Uuid::new_v4().simple());\n+ let s = PendingSession {\n+ agent: INVITE_BROWSER_AGENT.to_string(),\n+ created_ts: now_ms(),\n+ provider: None,\n+ provider_id: None,\n+ redeem_invite: Some(token),\n+ complete: None,\n+ };\n+ state.pending_sessions.write().await.insert(session.clone(), s);\n+\n+ let public_url = std::env::var(\"SLUG_PUBLIC_URL\").unwrap_or_else(|_| \"http://127.0.0.1:8080\".to_string());\n+ Redirect::temporary(&format!(\n+ \"{public_url}/auth/login?session={}\",\n+ urlencoding::encode(&session)\n+ ))\n+ .into_response()\n+}\n+\n pub async fn get_auth_login(Query(q): Query, State(state): State) -> impl IntoResponse {\n // Redirect to Google auth endpoint.\n let sessions = pending_sessions(&state);\n@@ -205,6 +290,7 @@ pub async fn get_auth_callback(Query(q): Query, State(state):\n s.provider = Some(\"google\".to_string());\n s.provider_id = Some(sub.clone());\n if let Some(username) = existing {\n+ let invite_tok = s.redeem_invite.clone();\n let (bearer, token_event) = issue_token_for_user(&username);\n // append token event\n let ev = Event::TokenIssued(token_event);\n@@ -215,6 +301,11 @@ pub async fn get_auth_callback(Query(q): Query, State(state):\n let mut reduced = reduced_arc.write().await;\n reduced.apply_event(ev);\n }\n+ if let Some(tok) = invite_tok {\n+ if let Err(e) = apply_invite_redemption(&state, &tok, &username).await {\n+ tracing::warn!(error = %e, \"invite redemption skipped after oauth\");\n+ }\n+ }\n s.complete = Some((username, bearer));\n return Redirect::temporary(&format!(\"{public_url}/auth/complete\")).into_response();\n }\n@@ -310,6 +401,16 @@ pub async fn post_choose_username(\n reduced.apply_event(ti_ev.clone());\n }\n \n+ // Redeem invite (if any) before marking the session complete.\n+ if let Some(tok) = {\n+ let sessions_read = sessions.read().await;\n+ sessions_read.get(&form.session).and_then(|s| s.redeem_invite.clone())\n+ } {\n+ if let Err(e) = apply_invite_redemption(&state, &tok, &canon_user).await {\n+ tracing::warn!(error = %e, \"invite redemption skipped after registration\");\n+ }\n+ }\n+\n // Mark complete for polling.\n {\n let mut sessions_write = sessions.write().await;\n@@ -339,6 +440,7 @@ pub async fn post_pending_session(\n created_ts: now_ms(),\n provider: None,\n provider_id: None,\n+ redeem_invite: None,\n complete: None,\n };\n let sessions = pending_sessions(&state);\ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex a1ea432932cdca0e42dc7377f0a25075fd5644c0..cb031aecebad1107dfa2898a98fb6084b28ba6e9 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -4,6 +4,7 @@ mod rpc;\n mod validate;\n \n pub use auth::{\n+ get_join_invite,\n get_pending_session,\n get_whoami,\n post_pending_session,\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 11a76ed7a02aae588edadb7a87a43660f5669d9e..f6bbc3df71909a2da7403cd46fe4ea6ca130c692 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -13,12 +13,14 @@ use slug_types::*;\n use crate::{\n canonical_path::{canonicalize_item, canonicalize_tag},\n dsl,\n- events::{AgentBound, Event, GrantAdded, Ingest, RoomCreated, ThreadCapability, ThreadVisibility},\n+ events::{\n+ AgentBound, Event, GrantAdded, Ingest, RoomCreated, ThreadCapability, ThreadVisibility,\n+ },\n identity::{parse_agent, parse_username},\n path_types::CanonicalItemUrl,\n ranking::{connected_components_from_voted_pairs, ranked_items_subset},\n reducer::{scope_from_room_wire, ReducerState, ScopeId},\n- state::AppState,\n+ state::{AppState, InviteState},\n };\n \n use super::auth::verify_bearer_principal;\n@@ -142,6 +144,27 @@ fn gen_short_id() -> String {\n (0..7).map(|_| ALPHABET[rng.gen_range(0..ALPHABET.len())] as char).collect()\n }\n \n+fn gen_invite_token() -> String {\n+ use rand::Rng;\n+ const ALPHABET: &[u8] = b\"0123456789abcdefghijklmnopqrstuvwxyz\";\n+ let mut rng = rand::thread_rng();\n+ let tail: String = (0..16).map(|_| ALPHABET[rng.gen_range(0..ALPHABET.len())] as char).collect();\n+ format!(\"inv_{tail}\")\n+}\n+\n+const INVITE_TTL_MS: i64 = 86_400_000;\n+\n+fn capability_wire(c: ThreadCapability) -> String {\n+ match c {\n+ ThreadCapability::View => \"view\",\n+ ThreadCapability::Post => \"post\",\n+ ThreadCapability::Vote => \"vote\",\n+ ThreadCapability::AddItem => \"add_item\",\n+ ThreadCapability::Manage => \"manage\",\n+ }\n+ .to_string()\n+}\n+\n fn build_rank_response_for_content(\n content: &crate::reducer::ContentState,\n parent: Option<&str>,\n@@ -512,7 +535,7 @@ fn rpc_forum_thread_detail(\n None => Err((\"post not found\".into(), None)),\n Some((idx, ing)) => Ok(ThreadDetailResponse {\n thread: format!(\"#{}\", tag),\n- posts: vec![PostRow {\n+ items: vec![ThreadItem::Post {\n id: ing.id.clone(),\n index: idx,\n ts: ing.ts,\n@@ -543,7 +566,7 @@ fn rpc_forum_thread_detail(\n \n let total = filtered.len();\n const MAX_BODY: usize = 2000;\n- let posts: Vec = filtered\n+ let items: Vec = filtered\n .into_iter()\n .skip(offset)\n .take(limit)\n@@ -553,7 +576,7 @@ fn rpc_forum_thread_detail(\n } else {\n (ing.raw.clone(), false)\n };\n- PostRow {\n+ ThreadItem::Post {\n id: ing.id.clone(),\n index: idx,\n ts: ing.ts,\n@@ -566,7 +589,7 @@ fn rpc_forum_thread_detail(\n \n Ok(ThreadDetailResponse {\n thread: format!(\"#{}\", tag),\n- posts,\n+ items,\n total,\n offset,\n })\n@@ -1007,7 +1030,7 @@ pub async fn handle_rpc_batch(\n RpcCommand::RoomGrant {\n room,\n username,\n- capability,\n+ capabilities,\n } => {\n let principal = {\n let reduced = state.reduced.read().await;\n@@ -1022,6 +1045,8 @@ pub async fn handle_rpc_batch(\n };\n if !can_manage {\n line_err(\"requires Manage capability\", None)\n+ } else if capabilities.is_empty() {\n+ line_err(\"capabilities must not be empty\", None)\n } else {\n match parse_username(&username) {\n Err(msg) => line_err(\"invalid username\", Some(msg)),\n@@ -1033,14 +1058,18 @@ pub async fn handle_rpc_batch(\n if !user_exists {\n line_err(format!(\"user @{target} not found\"), None)\n } else {\n- match parse_capability(&capability) {\n+ let caps: Result, String> = capabilities\n+ .iter()\n+ .map(|c| parse_capability(c.trim()))\n+ .collect();\n+ match caps {\n Err(msg) => line_err(msg, None),\n- Ok(cap) => {\n+ Ok(caps) => {\n let ga_ev = Event::GrantAdded(GrantAdded {\n ts: now_ms(),\n room_id: room,\n username: target,\n- capabilities: vec![cap],\n+ capabilities: caps,\n granted_by: principal,\n });\n if let Err(e) = state.event_log.append(&ga_ev).await {\n@@ -1059,6 +1088,114 @@ pub async fn handle_rpc_batch(\n }\n }\n }\n+ RpcCommand::RoomMintInvite {\n+ room,\n+ capabilities,\n+ max_uses,\n+ } => {\n+ let principal = {\n+ let reduced = state.reduced.read().await;\n+ verify_bearer_principal(&headers, &*reduced)\n+ };\n+ match principal {\n+ Err((_, m)) => line_err(m, None),\n+ Ok(principal) => {\n+ let can_manage = {\n+ let reduced = state.reduced.read().await;\n+ reduced.user_has_cap(&room, &principal, ThreadCapability::Manage)\n+ };\n+ if !can_manage {\n+ line_err(\"requires Manage capability\", None)\n+ } else if capabilities.is_empty() {\n+ line_err(\"capabilities must not be empty\", None)\n+ } else {\n+ match capabilities\n+ .iter()\n+ .map(|c| parse_capability(c.trim()))\n+ .collect::, String>>()\n+ {\n+ Err(msg) => line_err(msg, None),\n+ Ok(caps) => {\n+ let max_uses = max_uses.max(1).min(100_000);\n+ let now = now_ms();\n+ let expires_at_ms = now + INVITE_TTL_MS;\n+ let token = loop {\n+ let t = gen_invite_token();\n+ let taken = {\n+ let invites = state.invites.read().await;\n+ invites.contains_key(&t)\n+ };\n+ if !taken {\n+ break t;\n+ }\n+ };\n+ let inv = InviteState {\n+ room_id: room.clone(),\n+ capabilities: caps,\n+ expires_at_ms,\n+ max_uses,\n+ current_uses: 0,\n+ inviter: principal,\n+ };\n+ state.invites.write().await.insert(token.clone(), inv);\n+ let public_url = std::env::var(\"SLUG_PUBLIC_URL\")\n+ .unwrap_or_else(|_| \"http://127.0.0.1:8080\".to_string());\n+ let invite_url = format!(\"{public_url}/join/{token}\");\n+ line_ok(RpcResult::RoomInviteMinted {\n+ invite_url,\n+ expires_at_ms: Some(expires_at_ms),\n+ max_uses,\n+ })\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ RpcCommand::RoomAudit { room } => {\n+ let principal = {\n+ let reduced = state.reduced.read().await;\n+ verify_bearer_principal(&headers, &*reduced)\n+ };\n+ match principal {\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+ line_err(\"unknown room\", None)\n+ } else {\n+ let can_audit = reduced.user_has_cap(&room, &principal, ThreadCapability::View)\n+ || reduced.user_has_cap(&room, &principal, ThreadCapability::Manage);\n+ if !can_audit {\n+ line_err(\"requires View or Manage capability\", None)\n+ } else {\n+ let grants: Vec = reduced\n+ .grants\n+ .get(&room)\n+ .map(|m| {\n+ let mut v: Vec = m\n+ .iter()\n+ .map(|(username, caps)| {\n+ let mut c: Vec =\n+ caps.iter().copied().map(capability_wire).collect();\n+ c.sort();\n+ RoomAuditEntry {\n+ username: username.clone(),\n+ capabilities: c,\n+ }\n+ })\n+ .collect();\n+ v.sort_by(|a, b| a.username.cmp(&b.username));\n+ v\n+ })\n+ .unwrap_or_default();\n+ line_ok(RpcResult::RoomAudit(RoomAuditResponse { room, grants }))\n+ }\n+ }\n+ }\n+ }\n+ }\n+ RpcCommand::RoomRevoke { .. } => line_err(\"RoomRevoke is not implemented yet\", None),\n RpcCommand::GetGlobalRank {\n room,\n limit,\ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex 125005d89ade7b22c9b6d997f0ed81781df5e7ec..9e60f2c218f5c871a93e855e415dd984e3a017c5 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -26,6 +26,8 @@ pub enum Event {\n RoomCreated(RoomCreated),\n GrantAdded(GrantAdded),\n GrantRevoked(GrantRevoked),\n+ InviteMinted(InviteMinted),\n+ InviteRedeemed(InviteRedeemed),\n /// Ingest of a DSL+prose body. Identity and routing live in event metadata.\n Ingest(Ingest),\n }\n@@ -82,6 +84,25 @@ pub struct GrantRevoked {\n pub revoked_by: String,\n }\n \n+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n+pub struct InviteMinted {\n+ pub ts: i64,\n+ pub token: String,\n+ pub room_id: String,\n+ pub capabilities: Vec,\n+ pub inviter: String,\n+ pub max_uses: u32,\n+ #[serde(default, skip_serializing_if = \"Option::is_none\")]\n+ pub expires_ts_ms: Option,\n+}\n+\n+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n+pub struct InviteRedeemed {\n+ pub ts: i64,\n+ pub token: String,\n+ pub username: String,\n+}\n+\n #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n pub struct Ingest {\n /// Unix timestamp in milliseconds.\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex d00b56d909e1fabd1d122d054dd02785e13e0bd8..bf2f73d4d0f26a357961e88c52c3b4f72626af81 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -27,6 +27,7 @@ pub fn create_app(state: AppState) -> Router {\n Router::new()\n .route(\"/healthz\", axum::routing::get(|| async { \"ok\" }))\n .route(\"/static/:filename\", axum::routing::get(crate::html::serve_theme_css))\n+ .route(\"/join/:token\", axum::routing::get(api::get_join_invite))\n .route(\"/auth/login\", axum::routing::get(api::get_auth_login))\n .route(\"/auth/callback\", axum::routing::get(api::get_auth_callback))\n .route(\"/auth/complete\", axum::routing::get(api::get_auth_complete))\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 118cb19f4df4a083df2878ca7a1424f3d63de851..5190d0a7ee3d545a786a68fef483322aafdce7f9 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};\n+use crate::events::{Event, Ingest, ThreadCapability, ThreadVisibility};\n use crate::path_types::CanonicalItemUrl;\n \n #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]\n@@ -156,6 +156,41 @@ 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+ pub room_id: String,\n+ pub capabilities: HashSet,\n+ pub inviter: String,\n+ pub uses_remaining: u32,\n+ pub expires_ts_ms: Option,\n+}\n+\n+#[derive(Clone, Debug)]\n+pub enum RoomTimelineKind {\n+ RoomCreated {\n+ owner: String,\n+ slug: String,\n+ visibility: ThreadVisibility,\n+ },\n+ GrantAdded {\n+ username: String,\n+ granted_by: String,\n+ capabilities: Vec,\n+ },\n+ GrantRevoked {\n+ username: String,\n+ revoked_by: String,\n+ capabilities: Vec,\n+ },\n+}\n+\n+#[derive(Clone, Debug)]\n+pub struct RoomTimelineEntry {\n+ pub ts: i64,\n+ pub kind: RoomTimelineKind,\n+}\n+\n #[derive(Debug, Clone)]\n pub struct ForumThreadState {\n pub last_activity_ts: i64,\n@@ -210,6 +245,10 @@ pub struct ReducerState {\n pub ingests_ordered: Vec,\n /// room_id → username → capabilities\n pub grants: HashMap>>,\n+ /// room_id → chronological room admin lines (for thread UI).\n+ pub room_timeline: HashMap>,\n+ /// Invite token → active invite (absent when fully consumed or never minted).\n+ pub invites: HashMap,\n }\n \n impl ReducerState {\n@@ -225,6 +264,20 @@ impl ReducerState {\n .unwrap_or(false)\n }\n \n+ /// Invite link is present, not expired, and has uses left.\n+ pub fn invite_token_active(&self, token: &str, now_ms: i64) -> Option<&ActiveInviteState> {\n+ let inv = self.invites.get(token)?;\n+ if inv.uses_remaining == 0 {\n+ return None;\n+ }\n+ if let Some(exp) = inv.expires_ts_ms {\n+ if now_ms > exp {\n+ return None;\n+ }\n+ }\n+ Some(inv)\n+ }\n+\n pub fn content_for_scope_mut(&mut self, scope: ScopeId) -> &mut ContentState {\n self.content.entry(scope).or_default()\n }\n@@ -356,6 +409,17 @@ impl ReducerState {\n visibility: rc.visibility,\n },\n );\n+ self.room_timeline\n+ .entry(rc.room_id.clone())\n+ .or_default()\n+ .push(RoomTimelineEntry {\n+ ts: rc.ts,\n+ kind: RoomTimelineKind::RoomCreated {\n+ owner: rc.owner.clone(),\n+ slug: rc.slug.clone(),\n+ visibility: rc.visibility,\n+ },\n+ });\n }\n Event::Ingest(mut ing) => {\n ing.thread_tag = canonicalize_tag(&ing.thread_tag);\n@@ -525,18 +589,31 @@ impl ReducerState {\n nav!(self.actor_last_post_ts, keypath(ing.principal.clone()), setval(ing.ts));\n }\n Event::GrantAdded(ga) => {\n+ let room_id = ga.room_id.clone();\n let caps = self.grants\n .entry(ga.room_id)\n .or_default()\n- .entry(ga.username)\n+ .entry(ga.username.clone())\n .or_default();\n- for cap in ga.capabilities {\n+ for cap in ga.capabilities.iter().copied() {\n caps.insert(cap);\n }\n+ self.room_timeline\n+ .entry(room_id)\n+ .or_default()\n+ .push(RoomTimelineEntry {\n+ ts: ga.ts,\n+ kind: RoomTimelineKind::GrantAdded {\n+ username: ga.username.clone(),\n+ granted_by: ga.granted_by.clone(),\n+ capabilities: ga.capabilities.clone(),\n+ },\n+ });\n }\n Event::GrantRevoked(gr) => {\n+ let room_id = gr.room_id.clone();\n if let Some(room_grants) = self.grants.get_mut(&gr.room_id) {\n- let username = gr.username;\n+ let username = gr.username.clone();\n if let Some(caps) = room_grants.get_mut(&username) {\n for cap in &gr.capabilities {\n caps.remove(cap);\n@@ -549,6 +626,37 @@ impl ReducerState {\n self.grants.remove(&gr.room_id);\n }\n }\n+ self.room_timeline\n+ .entry(room_id)\n+ .or_default()\n+ .push(RoomTimelineEntry {\n+ ts: gr.ts,\n+ kind: RoomTimelineKind::GrantRevoked {\n+ username: gr.username.clone(),\n+ revoked_by: gr.revoked_by.clone(),\n+ capabilities: gr.capabilities.clone(),\n+ },\n+ });\n+ }\n+ Event::InviteMinted(im) => {\n+ self.invites.insert(\n+ im.token.clone(),\n+ ActiveInviteState {\n+ room_id: im.room_id.clone(),\n+ capabilities: im.capabilities.iter().copied().collect(),\n+ inviter: im.inviter.clone(),\n+ uses_remaining: im.max_uses,\n+ expires_ts_ms: im.expires_ts_ms,\n+ },\n+ );\n+ }\n+ Event::InviteRedeemed(ir) => {\n+ if let Some(inv) = self.invites.get_mut(&ir.token) {\n+ inv.uses_remaining = inv.uses_remaining.saturating_sub(1);\n+ if inv.uses_remaining == 0 {\n+ self.invites.remove(&ir.token);\n+ }\n+ }\n }\n }\n }\n@@ -570,6 +678,8 @@ impl Default for ReducerState {\n actor_last_post_ts: HashMap::new(),\n ingests_ordered: Vec::new(),\n grants: HashMap::new(),\n+ room_timeline: HashMap::new(),\n+ invites: HashMap::new(),\n }\n }\n }\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex b1ff2330903780cbe0cdf35964cb166eb2423d7d..628fd5921b34ba53ac0ca6b6fd33957ca09129b9 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -1,8 +1,20 @@\n+use std::collections::HashMap;\n use std::sync::Arc;\n \n use tokio::sync::{broadcast, RwLock};\n \n-use crate::{event_log::EventLog, reducer::ReducerState};\n+use crate::{event_log::EventLog, events::ThreadCapability, reducer::ReducerState};\n+\n+/// Ephemeral invite link (24h TTL, in-memory only; not written to the event log).\n+#[derive(Debug, Clone)]\n+pub struct InviteState {\n+ pub room_id: String,\n+ pub capabilities: Vec,\n+ pub expires_at_ms: i64,\n+ pub max_uses: usize,\n+ pub current_uses: usize,\n+ pub inviter: String,\n+}\n \n #[derive(Debug, Clone)]\n pub struct PendingSession {\n@@ -10,6 +22,8 @@ pub struct PendingSession {\n pub created_ts: i64,\n pub provider: Option,\n pub provider_id: Option,\n+ /// When set, successful OAuth completion redeems this invite token and appends [`crate::events::GrantAdded`].\n+ pub redeem_invite: Option,\n pub complete: Option<(String /*username*/, String /*bearer*/ )>,\n }\n \n@@ -42,7 +56,9 @@ pub struct AppState {\n pub cfg: Arc,\n pub event_log: Arc,\n pub reduced: Arc>,\n- pub pending_sessions: Arc>>,\n+ pub pending_sessions: Arc>>,\n+ /// Ephemeral invite tokens (`inv_…`) until expiry or exhaustion.\n+ pub invites: Arc>>,\n /// Broadcast channel for SSE live-streaming. Capacity = 64 events.\n pub stream_tx: broadcast::Sender,\n /// Broadcast channel for web SSE HTML fragments (poem pattern). Capacity = 64.\n@@ -58,7 +74,8 @@ impl AppState {\n cfg: Arc::new(cfg),\n event_log: Arc::new(event_log),\n reduced: Arc::new(RwLock::new(ReducerState::default())),\n- pending_sessions: Arc::new(RwLock::new(std::collections::HashMap::new())),\n+ pending_sessions: Arc::new(RwLock::new(HashMap::new())),\n+ invites: Arc::new(RwLock::new(HashMap::new())),\n stream_tx,\n html_tx,\n }\ndiff --git a/server/src/timeline.rs b/server/src/timeline.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..251158943ab36d3015268e35f6bdd01c3f42ab3b\n--- /dev/null\n+++ b/server/src/timeline.rs\n@@ -0,0 +1,153 @@\n+//! Room admin lines merged into forum thread views.\n+\n+use crate::{\n+ canonical_path::canonicalize_tag,\n+ reducer::{ReducerState, RoomTimelineEntry, RoomTimelineKind},\n+};\n+\n+fn cap_label(c: crate::events::ThreadCapability) -> &'static str {\n+ use crate::events::ThreadCapability::*;\n+ match c {\n+ View => \"view\",\n+ Post => \"post\",\n+ Vote => \"vote\",\n+ AddItem => \"add_item\",\n+ Manage => \"manage\",\n+ }\n+}\n+\n+fn caps_list(caps: &[crate::events::ThreadCapability]) -> String {\n+ let mut v: Vec<_> = caps.iter().map(|c| cap_label(*c)).collect();\n+ v.sort();\n+ v.join(\", \")\n+}\n+\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+ }\n+ RoomTimelineKind::GrantAdded {\n+ username,\n+ granted_by,\n+ capabilities,\n+ } => {\n+ format!(\n+ \"@{granted_by} granted @{} {}\",\n+ username,\n+ caps_list(capabilities)\n+ )\n+ }\n+ RoomTimelineKind::GrantRevoked {\n+ username,\n+ revoked_by,\n+ capabilities,\n+ } => {\n+ format!(\n+ \"@{revoked_by} revoked @{} {}\",\n+ username,\n+ caps_list(capabilities)\n+ )\n+ }\n+ }\n+}\n+\n+#[derive(Clone, Debug)]\n+pub enum MergedThreadRow {\n+ System { ts: i64, text: String },\n+ Post {\n+ index: usize,\n+ id: String,\n+ ts: i64,\n+ principal: String,\n+ raw: String,\n+ },\n+}\n+\n+/// Merge room admin lines with thread ingests for one room + tag. Oldest first.\n+/// `actor_prefix` filters posts only (system lines always included).\n+pub fn merge_thread_rows(\n+ reduced: &ReducerState,\n+ room_wire: &str,\n+ thread_tag: &str,\n+ since: Option,\n+ before: Option,\n+ actor_prefix: &str,\n+) -> Vec {\n+ let scope = crate::reducer::scope_from_room_wire(room_wire);\n+ let tag = canonicalize_tag(thread_tag);\n+ let key = (scope.clone(), tag.clone());\n+\n+ let mut rows: Vec = Vec::new();\n+\n+ if let Some(entries) = reduced.room_timeline.get(room_wire.trim()) {\n+ for e in entries {\n+ if since.map_or(true, |s| e.ts >= s) && before.map_or(true, |b| e.ts < b) {\n+ rows.push(MergedThreadRow::System {\n+ ts: e.ts,\n+ text: format_room_timeline_entry(e),\n+ });\n+ }\n+ }\n+ }\n+\n+ let all_ids: Vec = reduced\n+ .ingests_by_scope_thread\n+ .get(&key)\n+ .map(|q| q.iter().rev().cloned().collect())\n+ .unwrap_or_default();\n+\n+ for (idx, id) in all_ids.into_iter().enumerate() {\n+ let Some(ing) = reduced.ingests_by_id.get(&id) else {\n+ continue;\n+ };\n+ if since.map_or(true, |s| ing.ts >= s) && before.map_or(true, |b| ing.ts < b) {\n+ if !actor_prefix.is_empty()\n+ && !ing\n+ .principal\n+ .to_lowercase()\n+ .starts_with(actor_prefix)\n+ {\n+ continue;\n+ }\n+ rows.push(MergedThreadRow::Post {\n+ index: idx,\n+ id: ing.id.clone(),\n+ ts: ing.ts,\n+ principal: ing.principal.clone(),\n+ raw: ing.raw.clone(),\n+ });\n+ }\n+ }\n+\n+ rows.sort_by(|a, b| {\n+ let ta = match a {\n+ MergedThreadRow::System { ts, .. } | MergedThreadRow::Post { ts, .. } => *ts,\n+ };\n+ let tb = match b {\n+ MergedThreadRow::System { ts, .. } | MergedThreadRow::Post { ts, .. } => *ts,\n+ };\n+ ta.cmp(&tb)\n+ });\n+ rows\n+}\n+\n+/// Public forum thread (`room_wire == \"public\"`): same merge (timeline usually empty).\n+pub fn merge_public_thread_rows(\n+ reduced: &ReducerState,\n+ thread_tag: &str,\n+ since: Option,\n+ before: Option,\n+ actor_prefix: &str,\n+) -> Vec {\n+ merge_thread_rows(reduced, \"public\", thread_tag, since, before, actor_prefix)\n+}\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 10ef0f08ce1c3945e5f1634314e6aebcf6810cd2..4ded5ce92576cdea653cce0ba8a751be4374731a 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -105,7 +105,7 @@\n ;; Alice grants bob View only.\n (println \"\\nalice grants bob View only…\")\n (assert! (rpc-line-ok? (:parsed (rpc-batch! base-url alice-token\n- [{\"RoomGrant\" {\"room\" room-id \"username\" \"bob\" \"capability\" \"view\"}}])))\n+ [{\"RoomGrant\" {\"room\" room-id \"username\" \"bob\" \"capabilities\" [\"view\"]}}])))\n \"grant View RPC ok\")\n \n (println \"\\nbob (View only) tries to post prose…\")\n@@ -117,7 +117,7 @@\n ;; Alice grants bob Post.\n (println \"\\nalice grants bob Post…\")\n (assert! (rpc-line-ok? (:parsed (rpc-batch! base-url alice-token\n- [{\"RoomGrant\" {\"room\" room-id \"username\" \"bob\" \"capability\" \"post\"}}])))\n+ [{\"RoomGrant\" {\"room\" room-id \"username\" \"bob\" \"capabilities\" [\"post\"]}}])))\n \"grant Post RPC ok\")\n \n (println \"\\nbob (View + Post) posts prose…\")\n@@ -143,7 +143,7 @@\n ;; Alice grants bob Vote.\n (println \"\\nalice grants bob Vote…\")\n (assert! (rpc-line-ok? (:parsed (rpc-batch! base-url alice-token\n- [{\"RoomGrant\" {\"room\" room-id \"username\" \"bob\" \"capability\" \"vote\"}}])))\n+ [{\"RoomGrant\" {\"room\" room-id \"username\" \"bob\" \"capabilities\" [\"vote\"]}}])))\n \"grant Vote RPC ok\")\n \n (println \"\\nbob (View + Post + Vote) votes…\")\ndiff --git a/test/invites.bb b/test/invites.bb\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..f72b1e630a6856174cdef11eb977e2f81b16e551\n--- /dev/null\n+++ b/test/invites.bb\n@@ -0,0 +1,150 @@\n+(ns test.invites\n+ \"Ephemeral invite links: mint via RPC, GET /join → pending session + OAuth, redemption → GrantAdded,\n+ RoomAudit, post succeeds, second GET /join returns 404 when max_uses exhausted.\"\n+ (:require [babashka.fs :as fs]\n+ [cheshire.core :as json]\n+ [clojure.string :as str]\n+ [test.common :as common]\n+ [test.oauth :as oauth]))\n+\n+(def ^:private counts (atom {:pass 0 :fail 0}))\n+\n+(defn- assert! [pred msg]\n+ (common/test-assert! counts pred msg))\n+\n+(defn- bearer [token] {\"Authorization\" (str \"Bearer \" token)})\n+\n+(defn- rpc-batch! [base-url token cmds]\n+ (let [resp (oauth/http-post-json (str base-url \"/api/v0/rpc\") cmds :headers (bearer token))]\n+ {:status (:status resp)\n+ :parsed (json/parse-string (:body resp) false)}))\n+\n+(defn- rpc-line-ok? [parsed]\n+ (true? (get-in parsed [\"results\" 0 \"ok\"])))\n+\n+(defn- session-from-login-location [loc]\n+ (when loc\n+ (let [qpart (if (str/includes? loc \"?\")\n+ (-> loc (str/split #\"\\?\" 2) second)\n+ \"\")\n+ qpart (if (str/includes? qpart \"#\")\n+ (-> qpart (str/split #\"#\" 2) first)\n+ qpart)\n+ m (oauth/parse-query qpart)]\n+ (some-> (get m :session) str))))\n+\n+(defn- invite-token-from-url [invite-url]\n+ (second (re-find #\"/join/(inv_[^/?#]+)\" (str invite-url))))\n+\n+(defn- register-user! [base-url session-agent username]\n+ (oauth/complete-registration! base-url\n+ :agent session-agent\n+ :username username\n+ :assert! (fn [pred msg] (assert! pred msg))))\n+\n+(defn- ingest! [base-url token room thread delegate text]\n+ (rpc-batch! base-url token\n+ [{\"Post\" {\"room\" room\n+ \"thread_tag\" thread\n+ \"delegate\" delegate\n+ \"text\" text\n+ \"return_rank_diff\" false}}]))\n+\n+(defn invites-test [& _args]\n+ (println \"\\n━━━ ephemeral invite + audit integration check ━━━\\n\")\n+ (reset! counts {:pass 0 :fail 0})\n+\n+ (println \"building server binary…\")\n+ (common/letlocals\n+ (bind build (common/run-cargo-build-release! [\"slugsocial-server\"]))\n+ (assert! (zero? (:exit build)) \"cargo build succeeds\")\n+ (bind server-bin \"target/release/slugsocial-server\")\n+\n+ (bind tmp-dir (str (fs/create-temp-dir {:prefix \"slug-invites-\"})))\n+ (bind slug-port (common/pick-port))\n+ (bind google-port (common/pick-port))\n+ (bind base-url (str \"http://127.0.0.1:\" slug-port))\n+ (bind google-url (str \"http://127.0.0.1:\" google-port))\n+\n+ (bind !server (atom nil))\n+ (bind !google (atom nil))\n+\n+ (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n+ (try\n+ (println (str \"starting mock google on :\" google-port))\n+ (reset! !google (oauth/start-mock-google google-port\n+ :google-users [\"google-user-alice\" \"google-user-bob\"]))\n+\n+ (println (str \"starting server on :\" slug-port))\n+ (reset! !server (common/start-server server-bin server-env))\n+ (assert! (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n+\n+ (println \"\\nregistering alice…\")\n+ (let [alice-token (register-user! base-url\n+ \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n+ \"alice\")\n+\n+ _ (println \"\\nalice creates private room…\")\n+ create (rpc-batch! base-url alice-token\n+ [{\"RoomCreate\" {\"slug\" \"invite-demo\" \"visibility\" \"private\"}}])\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\"])\n+ _ (assert! (some? room-id) \"room_id present\")\n+\n+ _ (println \"\\nalice mints invite (view,post,vote uses=1)…\")\n+ mint (rpc-batch! base-url alice-token\n+ [{\"RoomMintInvite\" {\"room\" room-id\n+ \"capabilities\" [\"view\" \"post\" \"vote\"]\n+ \"max_uses\" 1}}])\n+ _ (assert! (= 200 (:status mint)) \"mint HTTP 200\")\n+ _ (assert! (rpc-line-ok? (:parsed mint)) \"mint RPC ok\")\n+ invite-url (get-in (:parsed mint) [\"results\" 0 \"result\" \"RoomInviteMinted\" \"invite_url\"])\n+ inv-tok (invite-token-from-url invite-url)\n+ _ (assert! (some? inv-tok) \"invite token parsed from URL\")\n+\n+ _ (println \"\\nGET /join/:token (expect redirect + session)…\")\n+ join-resp (oauth/http-get-no-redirect (str base-url \"/join/\" inv-tok))\n+ _ (assert! (contains? #{302 307} (:status join-resp))\n+ (str \"join returns redirect (got status \" (:status join-resp) \")\"))\n+ sess (session-from-login-location (:location join-resp))\n+ _ (assert! (and (some? sess) (str/starts-with? sess \"p_\")) \"Location carries session=p_…\")\n+\n+ _ (println \"\\nbob completes OAuth via invite session…\")\n+ bob-token (oauth/complete-pending-session! base-url sess \"bob\"\n+ :assert! (fn [pred msg] (assert! pred msg)))\n+\n+ _ (println \"\\nalice runs RoomAudit…\")\n+ audit (rpc-batch! base-url alice-token [{\"RoomAudit\" {\"room\" room-id}}])\n+ _ (assert! (rpc-line-ok? (:parsed audit)) \"audit RPC ok\")\n+ grants (get-in (:parsed audit) [\"results\" 0 \"result\" \"RoomAudit\" \"grants\"])\n+ bob-entry (first (filter #(= \"bob\" (get % \"username\")) grants))\n+ _ (assert! (some? bob-entry) \"audit lists bob\")\n+ bob-caps (set (get bob-entry \"capabilities\"))\n+ _ (assert! (= bob-caps #{\"view\" \"post\" \"vote\"}) \"bob has view, post, vote\")\n+\n+ _ (println \"\\nbob posts prose to private room…\")\n+ _ (assert! (rpc-line-ok? (:parsed (ingest! base-url bob-token room-id \"main\"\n+ \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n+ \"Hello via invite link.\")))\n+ \"bob post succeeds\")\n+\n+ _ (println \"\\nsecond GET /join (invite exhausted → 404)…\")\n+ join2 (oauth/http-get-no-redirect (str base-url \"/join/\" inv-tok))\n+ _ (assert! (= 404 (:status join2)) \"exhausted invite returns 404\")]\n+\n+ (println \"\\ninvite lifecycle OK.\"))\n+\n+ (finally\n+ (when-some [s @!server] (common/kill-server s))\n+ (when-some [g @!google] ((:stop-fn g)))\n+ (fs/delete-tree tmp-dir)))\n+\n+ (bind {pass :pass fail :fail} @counts)\n+ (if (zero? fail)\n+ (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" invite checks passed ━━━\" common/ansi-reset \"\\n\"))\n+ (do (println (str \"\\n\" common/ansi-red \"━━━ \" fail \" invite checks FAILED ━━━\" common/ansi-reset \"\\n\"))\n+ (System/exit 1)))))\n+\n+(when (= *file* (System/getProperty \"babashka.file\"))\n+ (invites-test))\ndiff --git a/test/oauth.bb b/test/oauth.bb\nindex b69459acd17c23c023170d8dd93fe45bb49c8d88..efb3f3e66346ffde81bf9622d75c3a6ec89f8db2 100644\n--- a/test/oauth.bb\n+++ b/test/oauth.bb\n@@ -21,6 +21,21 @@\n resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n \n+(defn http-get-no-redirect\n+ \"GET without following redirects; returns `:location` from the first `Location` header when present.\"\n+ [url & {:keys [headers]}]\n+ (let [client (-> (java.net.http.HttpClient/newBuilder)\n+ (.followRedirects java.net.http.HttpClient$Redirect/NEVER)\n+ (.connectTimeout connect-timeout)\n+ (.build))\n+ b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n+ (doseq [[k v] (or headers {})]\n+ (.header b k v))\n+ (let [req (-> b (.timeout request-timeout) (.GET) (.build))\n+ resp (.send client req (java.net.http.HttpResponse$BodyHandlers/ofString))\n+ loc (first (get (.map (.headers resp)) \"location\"))]\n+ {:status (.statusCode resp) :body (.body resp) :location loc})))\n+\n (defn http-post-json [url data & {:keys [headers]}]\n (let [body (json/generate-string data)\n b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n@@ -50,6 +65,35 @@\n resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n \n+(defn complete-pending-session!\n+ \"Finish OAuth for an existing pending session id (e.g. created by `GET /join/inv_…`). Returns bearer token.\"\n+ [base-url session-id username & {:keys [assert!]}]\n+ (let [check! (fn [pred msg resp]\n+ (if assert!\n+ (assert! pred msg)\n+ (when-not pred\n+ (throw (ex-info msg {:resp resp})))))]\n+ (let [enc (java.net.URLEncoder/encode session-id \"UTF-8\")\n+ login-url (str base-url \"/auth/login?session=\" enc)\n+ login-get (http-get login-url)]\n+ (check! (= 200 (:status login-get))\n+ (str \"oauth redirect chain for session \" session-id)\n+ login-get)\n+ (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n+ {:session session-id :username username})]\n+ (check! (= 200 (:status choose))\n+ (str \"choose-username for \" username \" returns 200\")\n+ choose)\n+ (let [poll (http-get (str base-url \"/api/v0/pending-session/\" session-id))]\n+ (check! (= 200 (:status poll))\n+ (str \"pending-session poll returns 200\")\n+ poll)\n+ (let [poll-json (json/parse-string (:body poll) true)]\n+ (check! (:complete poll-json)\n+ (str \"pending session complete for \" username)\n+ poll)\n+ (:token poll-json)))))))\n+\n (defn parse-query [s]\n (into {}\n (for [part (str/split (or s \"\") #\"&\")\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex a715fe5639f4a3a7bfedcc706b5fb312b98c9ac5..98c66a00fd27803ef6f75b5ac478ff2eb762d771 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -123,13 +123,32 @@ pub struct PathDetailResponse {\n #[derive(Debug, Serialize, Deserialize)]\n pub struct ThreadDetailResponse {\n pub thread: String,\n- pub posts: Vec,\n- /// Total posts in this thread.\n+ /// Chronological page: prose posts and room system lines, oldest first within the window.\n+ pub items: Vec,\n+ /// Total rows (posts + system lines) in this thread after filters.\n pub total: usize,\n- /// Chronological offset of the first post in this page.\n+ /// Offset into the merged chronological list.\n pub offset: usize,\n }\n \n+/// One row in a thread timeline: a normal post or a room system line.\n+#[derive(Debug, Serialize, Deserialize)]\n+#[serde(tag = \"kind\", rename_all = \"snake_case\")]\n+pub enum ThreadItem {\n+ Post {\n+ id: String,\n+ index: usize,\n+ ts: i64,\n+ actor: String,\n+ body: String,\n+ truncated: bool,\n+ },\n+ System {\n+ ts: i64,\n+ text: String,\n+ },\n+}\n+\n /// One post in a thread. Full body, no snippet.\n #[derive(Debug, Serialize, Deserialize)]\n pub struct PostRow {\n@@ -224,6 +243,23 @@ pub struct FeedPost {\n // RPC batch API (`POST /api/v0/rpc`)\n // ---------------------------------------------------------------------------\n \n+fn default_invite_max_uses() -> usize {\n+ 1\n+}\n+\n+/// One principal's capabilities in a private room (from [`RpcCommand::RoomAudit`]).\n+#[derive(Debug, Serialize, Deserialize)]\n+pub struct RoomAuditEntry {\n+ pub username: String,\n+ pub capabilities: Vec,\n+}\n+\n+#[derive(Debug, Serialize, Deserialize)]\n+pub struct RoomAuditResponse {\n+ pub room: String,\n+ pub grants: Vec,\n+}\n+\n #[derive(Debug, Serialize, Deserialize)]\n #[serde(transparent)]\n pub struct RpcBatch(pub Vec);\n@@ -287,10 +323,27 @@ pub enum RpcCommand {\n visibility: Option,\n },\n RoomGrant {\n+ room: String,\n+ username: String,\n+ /// Capability names: `view`, `post`, `vote`, `add_item`, `manage`.\n+ capabilities: Vec,\n+ },\n+ RoomRevoke {\n room: String,\n username: String,\n capability: String,\n },\n+ /// Mint a shareable invite link (24h TTL, stored in memory only until redeemed or expiry).\n+ RoomMintInvite {\n+ room: String,\n+ capabilities: Vec,\n+ #[serde(default = \"default_invite_max_uses\")]\n+ max_uses: usize,\n+ },\n+ /// List principals granted access in a room (requires View or Manage).\n+ RoomAudit {\n+ room: String,\n+ },\n GetGlobalRank {\n room: String,\n #[serde(default)]\n@@ -361,6 +414,13 @@ pub enum RpcResult {\n RoomCreated {\n room_id: String,\n },\n+ RoomInviteMinted {\n+ invite_url: String,\n+ #[serde(default, skip_serializing_if = \"Option::is_none\")]\n+ expires_at_ms: Option,\n+ max_uses: usize,\n+ },\n+ RoomAudit(RoomAuditResponse),\n GrantOk {},\n GlobalRank(GlobalRankResponse),\n Pair(PairResponse),\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[15e1037a] url stuff\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/url_rules/graph.rs b/server/src/url_rules/graph.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..f7ac0f9a551a1727cb2f9294778c283b9885b147\n--- /dev/null\n+++ b/server/src/url_rules/graph.rs\n@@ -0,0 +1,831 @@\n+//! Semantic URL graph: DFA traversal on host + path, query in context, generic fallback.\n+\n+use std::collections::HashMap;\n+use std::sync::OnceLock;\n+\n+use url::Url;\n+\n+use super::graph_builder::GraphBuilder;\n+use super::parse::{normalize_match_host, strip_tracking_query, UrlParts};\n+\n+#[derive(Debug, Clone, Default)]\n+pub struct Context {\n+ pub vars: HashMap,\n+ pub query: HashMap,\n+}\n+\n+pub type CanonicalFn = fn(&Context) -> Option;\n+\n+#[derive(Clone, Copy)]\n+pub enum EdgePattern {\n+ Literal(&'static str),\n+ Variable(&'static str),\n+ /// Absorb any trailing segment without leaving this node (e.g. post title slug).\n+ AbsorbAny,\n+ /// Absorb segment when `cond(seg)` (e.g. subreddit listing suffix).\n+ AbsorbIf(fn(&str) -> bool),\n+}\n+\n+pub struct Edge {\n+ pub pattern: EdgePattern,\n+ pub target: &'static str,\n+}\n+\n+pub struct Node {\n+ pub edges: Vec,\n+ pub canonical: CanonicalFn,\n+ pub parent: Option<&'static str>,\n+}\n+\n+impl Node {\n+ pub(crate) fn empty() -> Self {\n+ Self {\n+ edges: Vec::new(),\n+ canonical: |_| None,\n+ parent: None,\n+ }\n+ }\n+}\n+\n+pub struct Graph {\n+ pub nodes: HashMap<&'static str, Node>,\n+}\n+\n+static GRAPH: OnceLock = OnceLock::new();\n+\n+pub fn graph() -> &'static Graph {\n+ GRAPH.get_or_init(build_graph)\n+}\n+\n+impl Graph {\n+ pub fn resolve_canonical(&self, parts: &UrlParts) -> Option {\n+ let mut query = parts.query.clone();\n+ strip_tracking_query(&mut query);\n+ let mut ctx = Context {\n+ vars: HashMap::new(),\n+ query,\n+ };\n+\n+ if let Some(node_id) = self.traverse(parts, &mut ctx) {\n+ if let Some(canon) = (self.nodes.get(node_id)?.canonical)(&ctx) {\n+ return Some(canon);\n+ }\n+ }\n+ Some(generic_canonical(parts))\n+ }\n+\n+ pub fn breadcrumbs(&self, parts: &UrlParts) -> Vec {\n+ let mut query = parts.query.clone();\n+ strip_tracking_query(&mut query);\n+ let mut ctx = Context {\n+ vars: HashMap::new(),\n+ query,\n+ };\n+\n+ if let Some(mut node_id) = self.traverse(parts, &mut ctx) {\n+ let mut paths = Vec::new();\n+ loop {\n+ let node = match self.nodes.get(node_id) {\n+ Some(n) => n,\n+ None => break,\n+ };\n+ if let Some(url) = (node.canonical)(&ctx) {\n+ if paths.last() != Some(&url) {\n+ paths.push(url);\n+ }\n+ }\n+ match node.parent {\n+ Some(p) => node_id = p,\n+ None => break,\n+ }\n+ }\n+ paths.reverse();\n+ if !paths.is_empty() {\n+ return paths;\n+ }\n+ }\n+ generic_breadcrumbs(parts)\n+ }\n+\n+ fn traverse(&self, parts: &UrlParts, ctx: &mut Context) -> Option<&'static str> {\n+ let host = parts.match_host();\n+ let mut node_id = match host.as_str() {\n+ \"reddit.com\" => \"reddit_root\",\n+ \"youtube.com\" => \"youtube_root\",\n+ \"youtu.be\" => \"youtu_be_entry\",\n+ _ => return None,\n+ };\n+\n+ let segs: Vec<&str> = parts.path_segments.iter().map(String::as_str).collect();\n+ let mut i = 0;\n+ while i < segs.len() {\n+ let seg = segs[i];\n+ match self.follow_edge(node_id, seg, ctx) {\n+ Ok(next) => {\n+ node_id = next;\n+ i += 1;\n+ }\n+ Err(()) => {\n+ if self.try_absorb(node_id, seg) {\n+ i += 1;\n+ continue;\n+ }\n+ return None;\n+ }\n+ }\n+ }\n+ Some(node_id)\n+ }\n+\n+ fn follow_edge(\n+ &self,\n+ node_id: &'static str,\n+ seg: &str,\n+ ctx: &mut Context,\n+ ) -> Result<&'static str, ()> {\n+ let node = self.nodes.get(node_id).ok_or(())?;\n+ for edge in &node.edges {\n+ match edge.pattern {\n+ EdgePattern::Literal(lit) if lit == seg => return Ok(edge.target),\n+ EdgePattern::Variable(name) => {\n+ ctx.vars.insert(name.to_string(), seg.to_string());\n+ return Ok(edge.target);\n+ }\n+ EdgePattern::AbsorbAny\n+ | EdgePattern::AbsorbIf(_)\n+ | EdgePattern::Literal(_)\n+ | EdgePattern::Variable(_) => {}\n+ }\n+ }\n+ Err(())\n+ }\n+\n+ fn try_absorb(&self, node_id: &'static str, seg: &str) -> bool {\n+ let node = match self.nodes.get(node_id) {\n+ Some(n) => n,\n+ None => return false,\n+ };\n+ for edge in &node.edges {\n+ match edge.pattern {\n+ EdgePattern::AbsorbAny => return true,\n+ EdgePattern::AbsorbIf(cond) if cond(seg) => return true,\n+ EdgePattern::AbsorbIf(_) | EdgePattern::Literal(_) | EdgePattern::Variable(_) => {}\n+ }\n+ }\n+ false\n+ }\n+\n+ /// Test hook: terminal graph node and captured context after traversal.\n+ #[cfg(test)]\n+ pub fn traverse_terminal(&self, parts: &UrlParts) -> Option<(&'static str, Context)> {\n+ let mut query = parts.query.clone();\n+ strip_tracking_query(&mut query);\n+ let mut ctx = Context {\n+ vars: HashMap::new(),\n+ query,\n+ };\n+ let node = self.traverse(parts, &mut ctx)?;\n+ Some((node, ctx))\n+ }\n+}\n+\n+fn is_reddit_listing_suffix(seg: &str) -> bool {\n+ matches!(seg, \"hot\" | \"top\" | \"new\" | \"rising\" | \"controversial\")\n+}\n+\n+/// Percent-encode a path or query fragment so `&`, `?`, etc. cannot break URL structure.\n+fn enc(s: &str) -> String {\n+ urlencoding::encode(s).into_owned()\n+}\n+\n+// --- Canonical formatters ---\n+\n+fn canon_reddit_root(_: &Context) -> Option {\n+ Some(\"https://reddit.com\".to_string())\n+}\n+\n+fn canon_reddit_r_hub(_: &Context) -> Option {\n+ Some(\"https://reddit.com/r\".to_string())\n+}\n+\n+fn canon_reddit_subreddit(ctx: &Context) -> Option {\n+ let sub = ctx.vars.get(\"subreddit\")?;\n+ Some(format!(\n+ \"https://reddit.com/r/{}\",\n+ enc(&sub.to_ascii_lowercase())\n+ ))\n+}\n+\n+fn canon_reddit_post(ctx: &Context) -> Option {\n+ let sub = ctx.vars.get(\"subreddit\")?.to_ascii_lowercase();\n+ let id = ctx.vars.get(\"post_id\")?;\n+ Some(format!(\n+ \"https://reddit.com/r/{}/comments/{}\",\n+ enc(&sub),\n+ enc(id)\n+ ))\n+}\n+\n+fn canon_youtube_root(_: &Context) -> Option {\n+ Some(\"https://youtube.com\".to_string())\n+}\n+\n+fn canon_youtube_watch(ctx: &Context) -> Option {\n+ let v = ctx\n+ .query\n+ .get(\"v\")\n+ .or_else(|| ctx.vars.get(\"video_id\"))?;\n+ Some(format!(\"https://youtube.com/watch?v={}\", enc(v)))\n+}\n+\n+fn canon_youtu_be(ctx: &Context) -> Option {\n+ let v = ctx.vars.get(\"vid_id\")?;\n+ Some(format!(\"https://youtube.com/watch?v={}\", enc(v)))\n+}\n+\n+pub fn build_graph() -> Graph {\n+ GraphBuilder::new()\n+ .node(\"reddit_root\")\n+ .canonical(canon_reddit_root)\n+ .edge(EdgePattern::Literal(\"r\"), \"reddit_r_hub\")\n+ .node(\"reddit_r_hub\")\n+ .parent(\"reddit_root\")\n+ .canonical(canon_reddit_r_hub)\n+ .edge(EdgePattern::Variable(\"subreddit\"), \"reddit_subreddit\")\n+ .node(\"reddit_subreddit\")\n+ .parent(\"reddit_r_hub\")\n+ .canonical(canon_reddit_subreddit)\n+ .edge(\n+ EdgePattern::AbsorbIf(is_reddit_listing_suffix),\n+ \"reddit_subreddit\",\n+ )\n+ .edge(EdgePattern::Literal(\"comments\"), \"reddit_comments_gate\")\n+ .node(\"reddit_comments_gate\")\n+ .parent(\"reddit_subreddit\")\n+ .canonical(canon_reddit_subreddit)\n+ .edge(EdgePattern::Variable(\"post_id\"), \"reddit_post\")\n+ .node(\"reddit_post\")\n+ .parent(\"reddit_subreddit\")\n+ .canonical(canon_reddit_post)\n+ .edge(EdgePattern::AbsorbAny, \"reddit_post\")\n+ .node(\"youtube_root\")\n+ .canonical(canon_youtube_root)\n+ .edge(EdgePattern::Literal(\"watch\"), \"youtube_watch\")\n+ .edge(EdgePattern::Literal(\"shorts\"), \"youtube_shorts_gate\")\n+ .node(\"youtube_watch\")\n+ .parent(\"youtube_root\")\n+ .canonical(canon_youtube_watch)\n+ .node(\"youtube_shorts_gate\")\n+ .parent(\"youtube_root\")\n+ .canonical(canon_youtube_root)\n+ .edge(EdgePattern::Variable(\"video_id\"), \"youtube_watch\")\n+ .node(\"youtu_be_entry\")\n+ .canonical(canon_youtube_root)\n+ .edge(EdgePattern::Variable(\"vid_id\"), \"youtu_be_video\")\n+ .node(\"youtu_be_video\")\n+ .parent(\"youtube_root\")\n+ .canonical(canon_youtu_be)\n+ .build()\n+}\n+\n+// --- Generic internet fallback ---\n+\n+pub fn generic_canonical(parts: &UrlParts) -> String {\n+ let host = normalize_match_host(&parts.host);\n+ let path_segments: Vec = parts.path_segments.clone();\n+ let mut query = parts.query.clone();\n+ strip_tracking_query(&mut query);\n+\n+ let mut url = if path_segments.is_empty() {\n+ Url::parse(&format!(\"https://{host}\"))\n+ .unwrap_or_else(|_| Url::parse(\"https://invalid\").unwrap())\n+ } else {\n+ let path = format!(\"/{}\", path_segments.join(\"/\"));\n+ Url::parse(&format!(\"https://{host}{path}\"))\n+ .unwrap_or_else(|_| Url::parse(\"https://invalid\").unwrap())\n+ };\n+\n+ if !query.is_empty() {\n+ let mut pairs: Vec<_> = query.iter().collect();\n+ pairs.sort_by(|a, b| a.0.cmp(b.0));\n+ url.query_pairs_mut().clear();\n+ for (k, v) in pairs {\n+ url.query_pairs_mut().append_pair(k, v);\n+ }\n+ }\n+\n+ let mut s = url.to_string();\n+ if path_segments.is_empty() {\n+ s = s.trim_end_matches('/').to_string();\n+ }\n+ s\n+}\n+\n+pub fn generic_breadcrumbs(parts: &UrlParts) -> Vec {\n+ let host = normalize_match_host(&parts.host);\n+ let n = parts.path_segments.len();\n+ let mut out = Vec::new();\n+\n+ let base = generic_canonical(&UrlParts {\n+ scheme: \"https\".to_string(),\n+ host: host.clone(),\n+ path_segments: vec![],\n+ query: HashMap::new(),\n+ });\n+ out.push(base);\n+\n+ for i in 0..n {\n+ let segs: Vec = parts.path_segments[..=i].to_vec();\n+ let url = generic_canonical(&UrlParts {\n+ scheme: \"https\".to_string(),\n+ host: host.clone(),\n+ path_segments: segs,\n+ query: HashMap::new(),\n+ });\n+ if out.last() != Some(&url) {\n+ out.push(url);\n+ }\n+ }\n+ out\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+ use crate::url_rules::parse::test_parts;\n+\n+ fn g() -> &'static Graph {\n+ graph()\n+ }\n+\n+ fn canon(parts: &UrlParts) -> String {\n+ g().resolve_canonical(parts).unwrap()\n+ }\n+\n+ fn crumbs(parts: &UrlParts) -> Vec {\n+ g().breadcrumbs(parts)\n+ }\n+\n+ fn terminal(parts: &UrlParts) -> Option<&'static str> {\n+ g().traverse_terminal(parts).map(|(n, _)| n)\n+ }\n+\n+ fn vars(parts: &UrlParts) -> HashMap {\n+ g().traverse_terminal(parts)\n+ .map(|(_, c)| c.vars)\n+ .unwrap_or_default()\n+ }\n+\n+ #[test]\n+ fn youtu_be_malicious_segment_encoded_not_injected() {\n+ let p = test_parts(\"youtu.be\", &[\"abc&t=1\"], &[]);\n+ assert_eq!(canon(&p), \"https://youtube.com/watch?v=abc%26t%3D1\");\n+ assert!(!canon(&p).contains(\"abc&t=1\"));\n+ }\n+\n+ #[test]\n+ fn youtube_query_v_encoded() {\n+ let p = test_parts(\"youtube.com\", &[\"watch\"], &[(\"v\", \"a&b=c\")]);\n+ assert_eq!(canon(&p), \"https://youtube.com/watch?v=a%26b%3Dc\");\n+ }\n+\n+ #[test]\n+ fn absorb_patterns_live_on_edges_not_in_engine() {\n+ let g = build_graph();\n+ let sub = g.nodes.get(\"reddit_subreddit\").unwrap();\n+ assert!(sub\n+ .edges\n+ .iter()\n+ .any(|e| matches!(e.pattern, EdgePattern::AbsorbIf(_))));\n+ let post = g.nodes.get(\"reddit_post\").unwrap();\n+ assert!(post\n+ .edges\n+ .iter()\n+ .any(|e| matches!(e.pattern, EdgePattern::AbsorbAny)));\n+ }\n+\n+ #[test]\n+ fn builder_rejects_missing_parent() {\n+ let result = std::panic::catch_unwind(|| {\n+ GraphBuilder::new()\n+ .node(\"orphan\")\n+ .parent(\"nonexistent_parent\")\n+ .build();\n+ });\n+ assert!(result.is_err());\n+ }\n+\n+ #[test]\n+ fn generic_canonical_forces_https_and_strips_www() {\n+ let p = test_parts(\"www.example.com\", &[\"blog\", \"post\"], &[]);\n+ assert_eq!(canon(&p), \"https://example.com/blog/post\");\n+ }\n+\n+ #[test]\n+ fn generic_canonical_sorts_query_keys() {\n+ let p = test_parts(\"example.com\", &[\"search\"], &[(\"q\", \"rust\"), (\"page\", \"2\")]);\n+ assert_eq!(canon(&p), \"https://example.com/search?page=2&q=rust\");\n+ }\n+\n+ #[test]\n+ fn generic_canonical_strips_tracking_from_query() {\n+ let p = test_parts(\n+ \"news.ycombinator.com\",\n+ &[\"item\"],\n+ &[(\"id\", \"1\"), (\"utm_medium\", \"social\")],\n+ );\n+ assert_eq!(canon(&p), \"https://news.ycombinator.com/item?id=1\");\n+ }\n+\n+ #[test]\n+ fn generic_breadcrumbs_cumulative_path() {\n+ let p = test_parts(\"paulgraham.com\", &[\"articles\", \"lisp.html\"], &[]);\n+ assert_eq!(\n+ crumbs(&p),\n+ vec![\n+ \"https://paulgraham.com\",\n+ \"https://paulgraham.com/articles\",\n+ \"https://paulgraham.com/articles/lisp.html\"\n+ ]\n+ );\n+ }\n+\n+ #[test]\n+ fn generic_breadcrumbs_domain_only() {\n+ let p = test_parts(\"example.com\", &[], &[]);\n+ assert_eq!(crumbs(&p), vec![\"https://example.com\"]);\n+ }\n+\n+ #[test]\n+ fn unknown_host_uses_generic_not_graph() {\n+ let p = test_parts(\"hackernews.com\", &[\"item\", \"123\"], &[]);\n+ assert_eq!(terminal(&p), None);\n+ assert_eq!(canon(&p), \"https://hackernews.com/item/123\");\n+ }\n+\n+ #[test]\n+ fn traverse_captures_subreddit_variable() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"Rust\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"reddit_subreddit\"));\n+ assert_eq!(vars(&p).get(\"subreddit\").map(String::as_str), Some(\"Rust\"));\n+ }\n+\n+ #[test]\n+ fn traverse_captures_post_id() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"aww\", \"comments\", \"abc123\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"reddit_post\"));\n+ assert_eq!(vars(&p).get(\"post_id\").map(String::as_str), Some(\"abc123\"));\n+ }\n+\n+ #[test]\n+ fn traverse_absorbs_listing_suffix_stays_on_subreddit() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"rust\", \"hot\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"reddit_subreddit\"));\n+ assert_eq!(canon(&p), \"https://reddit.com/r/rust\");\n+ }\n+\n+ #[test]\n+ fn traverse_absorbs_all_listing_suffixes() {\n+ for suffix in [\"hot\", \"top\", \"new\", \"rising\", \"controversial\"] {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"test\", suffix], &[]);\n+ assert_eq!(terminal(&p), Some(\"reddit_subreddit\"), \"suffix {suffix}\");\n+ assert_eq!(canon(&p), \"https://reddit.com/r/test\", \"suffix {suffix}\");\n+ }\n+ }\n+\n+ #[test]\n+ fn traverse_absorbs_post_title_slug() {\n+ let p = test_parts(\n+ \"reddit.com\",\n+ &[\"r\", \"rust\", \"comments\", \"aaa\", \"my_great_post_title\"],\n+ &[],\n+ );\n+ assert_eq!(terminal(&p), Some(\"reddit_post\"));\n+ assert_eq!(canon(&p), \"https://reddit.com/r/rust/comments/aaa\");\n+ }\n+\n+ #[test]\n+ fn traverse_unknown_segment_falls_back_to_generic() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"rust\", \"wiki\", \"faq\"], &[]);\n+ assert_eq!(terminal(&p), None);\n+ assert_eq!(canon(&p), \"https://reddit.com/r/rust/wiki/faq\");\n+ }\n+\n+ #[test]\n+ fn traverse_youtube_watch_requires_v_in_query() {\n+ let p = test_parts(\"youtube.com\", &[\"watch\"], &[(\"v\", \"xyz\")]);\n+ assert_eq!(terminal(&p), Some(\"youtube_watch\"));\n+ }\n+\n+ #[test]\n+ fn traverse_youtu_be_captures_vid_id() {\n+ let p = test_parts(\"youtu.be\", &[\"dQw4w9WgXcQ\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"youtu_be_video\"));\n+ assert_eq!(vars(&p).get(\"vid_id\").map(String::as_str), Some(\"dQw4w9WgXcQ\"));\n+ }\n+\n+ #[test]\n+ fn traverse_shorts_sets_video_id_var() {\n+ let p = test_parts(\"youtube.com\", &[\"shorts\", \"abc99\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"youtube_watch\"));\n+ assert_eq!(vars(&p).get(\"video_id\").map(String::as_str), Some(\"abc99\"));\n+ }\n+\n+ #[test]\n+ fn reddit_domain_canonical() {\n+ let p = test_parts(\"reddit.com\", &[], &[]);\n+ assert_eq!(canon(&p), \"https://reddit.com\");\n+ }\n+\n+ #[test]\n+ fn reddit_r_hub_canonical() {\n+ let p = test_parts(\"reddit.com\", &[\"r\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"reddit_r_hub\"));\n+ assert_eq!(canon(&p), \"https://reddit.com/r\");\n+ }\n+\n+ #[test]\n+ fn reddit_subreddit_lowercases_name() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"AmITheAsshole\"], &[]);\n+ assert_eq!(canon(&p), \"https://reddit.com/r/amitheasshole\");\n+ }\n+\n+ #[test]\n+ fn reddit_host_aliases_old_new_www() {\n+ for host in [\"old.reddit.com\", \"new.reddit.com\", \"www.reddit.com\"] {\n+ let p = test_parts(host, &[\"r\", \"rust\"], &[]);\n+ assert_eq!(canon(&p), \"https://reddit.com/r/rust\", \"host {host}\");\n+ }\n+ }\n+\n+ #[test]\n+ fn reddit_post_strips_slug_and_query() {\n+ let p = test_parts(\n+ \"old.reddit.com\",\n+ &[\"r\", \"Rust\", \"comments\", \"1abc\", \"title_slug_here\"],\n+ &[(\"sort\", \"new\")],\n+ );\n+ assert_eq!(canon(&p), \"https://reddit.com/r/rust/comments/1abc\");\n+ }\n+\n+ #[test]\n+ fn reddit_post_multiple_slugs_absorbed() {\n+ let p = test_parts(\n+ \"reddit.com\",\n+ &[\"r\", \"x\", \"comments\", \"id1\", \"slug1\", \"extra\"],\n+ &[],\n+ );\n+ assert_eq!(canon(&p), \"https://reddit.com/r/x/comments/id1\");\n+ }\n+\n+ #[test]\n+ fn reddit_listing_with_query_only() {\n+ let p = test_parts(\"www.reddit.com\", &[\"r\", \"programming\"], &[(\"sort\", \"top\")]);\n+ assert_eq!(canon(&p), \"https://reddit.com/r/programming\");\n+ }\n+\n+ #[test]\n+ fn reddit_subreddit_breadcrumbs_include_r_hub() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"movies\"], &[]);\n+ assert_eq!(\n+ crumbs(&p),\n+ vec![\n+ \"https://reddit.com\",\n+ \"https://reddit.com/r\",\n+ \"https://reddit.com/r/movies\"\n+ ]\n+ );\n+ }\n+\n+ #[test]\n+ fn reddit_post_breadcrumbs_skip_comments_node() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"aww\", \"comments\", \"1trnvdl\"], &[]);\n+ let c = crumbs(&p);\n+ assert!(!c.iter().any(|u| u.ends_with(\"/comments\")));\n+ assert_eq!(\n+ c.last().map(String::as_str),\n+ Some(\"https://reddit.com/r/aww/comments/1trnvdl\")\n+ );\n+ assert!(c.contains(&\"https://reddit.com/r/aww\".to_string()));\n+ }\n+\n+ #[test]\n+ fn reddit_post_parent_is_subreddit_not_comments() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"aww\", \"comments\", \"1trnvdl\"], &[]);\n+ let c = crumbs(&p);\n+ let parent = c.get(c.len() - 2).unwrap();\n+ assert_eq!(parent, \"https://reddit.com/r/aww\");\n+ }\n+\n+ #[test]\n+ fn reddit_domain_parent_is_none_in_breadcrumb_chain() {\n+ let p = test_parts(\"reddit.com\", &[], &[]);\n+ assert_eq!(crumbs(&p), vec![\"https://reddit.com\"]);\n+ }\n+\n+ #[test]\n+ fn youtube_watch_canonical_uses_v_only() {\n+ let p = test_parts(\"youtube.com\", &[\"watch\"], &[(\"v\", \"abc\"), (\"t\", \"99\")]);\n+ assert_eq!(canon(&p), \"https://youtube.com/watch?v=abc\");\n+ }\n+\n+ #[test]\n+ fn youtube_query_order_independent() {\n+ let a = test_parts(\"youtube.com\", &[\"watch\"], &[(\"v\", \"abc\"), (\"t\", \"4\")]);\n+ let b = test_parts(\"youtube.com\", &[\"watch\"], &[(\"t\", \"4\"), (\"v\", \"abc\")]);\n+ assert_eq!(canon(&a), canon(&b));\n+ }\n+\n+ #[test]\n+ fn youtube_host_aliases() {\n+ for host in [\"www.youtube.com\", \"m.youtube.com\"] {\n+ let p = test_parts(host, &[\"watch\"], &[(\"v\", \"x\")]);\n+ assert_eq!(canon(&p), \"https://youtube.com/watch?v=x\", \"host {host}\");\n+ }\n+ }\n+\n+ #[test]\n+ fn youtube_shorts_canonical_matches_watch() {\n+ let shorts = test_parts(\"youtube.com\", &[\"shorts\", \"vid123\"], &[]);\n+ let watch = test_parts(\"youtube.com\", &[\"watch\"], &[(\"v\", \"vid123\")]);\n+ assert_eq!(canon(&shorts), canon(&watch));\n+ assert_eq!(canon(&shorts), \"https://youtube.com/watch?v=vid123\");\n+ }\n+\n+ #[test]\n+ fn youtu_be_matches_youtube_watch() {\n+ let be = test_parts(\"youtu.be\", &[\"dQw4w9WgXcQ\"], &[]);\n+ let watch = test_parts(\"youtube.com\", &[\"watch\"], &[(\"v\", \"dQw4w9WgXcQ\")]);\n+ assert_eq!(canon(&be), canon(&watch));\n+ }\n+\n+ #[test]\n+ fn youtube_breadcrumbs_domain_then_watch() {\n+ let p = test_parts(\"youtube.com\", &[\"watch\"], &[(\"v\", \"abc\")]);\n+ assert_eq!(\n+ crumbs(&p),\n+ vec![\"https://youtube.com\", \"https://youtube.com/watch?v=abc\"]\n+ );\n+ }\n+\n+ #[test]\n+ fn youtu_be_breadcrumbs_include_youtube_domain() {\n+ let p = test_parts(\"youtu.be\", &[\"abc\"], &[]);\n+ let c = crumbs(&p);\n+ assert_eq!(c.first().map(String::as_str), Some(\"https://youtube.com\"));\n+ assert_eq!(\n+ c.last().map(String::as_str),\n+ Some(\"https://youtube.com/watch?v=abc\")\n+ );\n+ }\n+\n+ #[test]\n+ fn parsed_urls_match_hand_built_parts() {\n+ let raw = \"https://www.reddit.com/r/rust/comments/aaa/title/?utm=x\";\n+ let parsed = UrlParts::parse(raw).unwrap();\n+ let hand = test_parts(\n+ \"www.reddit.com\",\n+ &[\"r\", \"rust\", \"comments\", \"aaa\", \"title\"],\n+ &[(\"utm\", \"x\")],\n+ );\n+ assert_eq!(canon(&parsed), canon(&hand));\n+ }\n+\n+ #[test]\n+ fn equivalence_cluster_youtube_formats() {\n+ let urls = [\n+ \"https://youtu.be/abc123\",\n+ \"https://www.youtube.com/watch?v=abc123\",\n+ \"https://youtube.com/watch?v=abc123&t=1\",\n+ \"https://m.youtube.com/watch?t=1&v=abc123\",\n+ ];\n+ let canonical: Vec<_> = urls\n+ .iter()\n+ .map(|u| canon(&UrlParts::parse(u).unwrap()))\n+ .collect();\n+ assert!(canonical.iter().all(|c| *c == \"https://youtube.com/watch?v=abc123\"));\n+ }\n+\n+ #[test]\n+ fn equivalence_cluster_reddit_post_formats() {\n+ let urls = [\n+ \"https://old.reddit.com/r/Rust/comments/aaa/slug/\",\n+ \"reddit.com/r/rust/comments/aaa/other_slug\",\n+ \"https://reddit.com/r/RUST/comments/aaa\",\n+ ];\n+ let canonical: Vec<_> = urls\n+ .iter()\n+ .map(|u| canon(&UrlParts::parse(u).unwrap()))\n+ .collect();\n+ assert!(\n+ canonical\n+ .iter()\n+ .all(|c| *c == \"https://reddit.com/r/rust/comments/aaa\")\n+ );\n+ }\n+\n+ #[test]\n+ fn graph_nodes_all_have_valid_parent_links() {\n+ let g = build_graph();\n+ for (id, node) in &g.nodes {\n+ if let Some(parent) = node.parent {\n+ assert!(g.nodes.contains_key(parent), \"node {id} parent {parent}\");\n+ }\n+ }\n+ }\n+\n+ #[test]\n+ fn graph_terminal_canonical_always_succeeds_for_reddit_paths() {\n+ let cases: &[(&[&str], &str)] = &[\n+ (&[\"r\", \"rust\"], \"https://reddit.com/r/rust\"),\n+ (\n+ &[\"r\", \"rust\", \"comments\", \"x\"],\n+ \"https://reddit.com/r/rust/comments/x\",\n+ ),\n+ ];\n+ for (segs, want) in cases {\n+ let p = test_parts(\"reddit.com\", segs, &[]);\n+ assert_eq!(canon(&p), *want);\n+ }\n+ }\n+\n+ #[test]\n+ fn breadcrumb_parent_walk_matches_parent_url_semantics() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"aww\", \"comments\", \"id1\"], &[]);\n+ let c = crumbs(&p);\n+ assert_eq!(c.len(), 4);\n+ assert_eq!(\n+ c.get(c.len() - 2).map(String::as_str),\n+ Some(\"https://reddit.com/r/aww\")\n+ );\n+ }\n+\n+ #[test]\n+ fn youtube_watch_without_v_falls_back_to_generic() {\n+ let p = test_parts(\"youtube.com\", &[\"watch\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"youtube_watch\"));\n+ assert_eq!(canon(&p), \"https://youtube.com/watch\");\n+ }\n+\n+ #[test]\n+ fn reddit_only_comments_path_stops_at_gate() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"rust\", \"comments\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"reddit_comments_gate\"));\n+ assert_eq!(canon(&p), \"https://reddit.com/r/rust\");\n+ }\n+\n+ #[test]\n+ fn generic_deep_path_many_segments() {\n+ let segs: Vec<&str> = (0..10)\n+ .map(|i| match i {\n+ 0 => \"a\",\n+ 1 => \"b\",\n+ 2 => \"c\",\n+ 3 => \"d\",\n+ 4 => \"e\",\n+ 5 => \"f\",\n+ 6 => \"g\",\n+ 7 => \"h\",\n+ 8 => \"i\",\n+ _ => \"j\",\n+ })\n+ .collect();\n+ let p = test_parts(\"site.com\", &segs, &[]);\n+ assert_eq!(crumbs(&p).len(), 11);\n+ }\n+\n+ #[test]\n+ fn traverse_literal_r_required_for_subreddit() {\n+ let p = test_parts(\"reddit.com\", &[\"rust\"], &[]);\n+ assert_eq!(terminal(&p), None);\n+ }\n+\n+ #[test]\n+ fn http_scheme_upgraded_via_generic_fallback_host() {\n+ let parsed = UrlParts::parse(\"http://example.com/page\").unwrap();\n+ assert_eq!(canon(&parsed), \"https://example.com/page\");\n+ }\n+\n+ #[test]\n+ fn each_graph_node_canonical_is_invokable() {\n+ let g = build_graph();\n+ let empty = Context::default();\n+ for (id, node) in &g.nodes {\n+ let _ = (node.canonical)(&empty);\n+ let _ = id;\n+ }\n+ }\n+\n+ #[test]\n+ fn reddit_double_listing_suffix_both_absorbed() {\n+ let p = test_parts(\"reddit.com\", &[\"r\", \"rust\", \"hot\", \"new\"], &[]);\n+ assert_eq!(terminal(&p), Some(\"reddit_subreddit\"));\n+ assert_eq!(canon(&p), \"https://reddit.com/r/rust\");\n+ }\n+\n+ #[test]\n+ fn youtu_be_empty_path_stays_at_entry() {\n+ let p = test_parts(\"youtu.be\", &[], &[]);\n+ assert_eq!(terminal(&p), Some(\"youtu_be_entry\"));\n+ }\n+}\ndiff --git a/server/src/url_rules/graph_builder.rs b/server/src/url_rules/graph_builder.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..243204ad5ca514fff459057956080cacb5bf38e2\n--- /dev/null\n+++ b/server/src/url_rules/graph_builder.rs\n@@ -0,0 +1,73 @@\n+//! Declarative construction of the URL graph with build-time link validation.\n+\n+use std::collections::HashMap;\n+\n+use super::graph::{CanonicalFn, Edge, EdgePattern, Graph, Node};\n+\n+pub struct GraphBuilder {\n+ nodes: HashMap<&'static str, Node>,\n+ current: Option<&'static str>,\n+}\n+\n+impl GraphBuilder {\n+ pub fn new() -> Self {\n+ Self {\n+ nodes: HashMap::new(),\n+ current: None,\n+ }\n+ }\n+\n+ pub fn node(mut self, id: &'static str) -> Self {\n+ self.nodes.entry(id).or_insert_with(Node::empty);\n+ self.current = Some(id);\n+ self\n+ }\n+\n+ pub fn canonical(mut self, f: CanonicalFn) -> Self {\n+ let id = self.current.expect(\"canonical() without node()\");\n+ self.nodes.get_mut(id).expect(\"node missing\").canonical = f;\n+ self\n+ }\n+\n+ pub fn parent(mut self, parent_id: &'static str) -> Self {\n+ let id = self.current.expect(\"parent() without node()\");\n+ self.nodes.get_mut(id).expect(\"node missing\").parent = Some(parent_id);\n+ self\n+ }\n+\n+ pub fn edge(mut self, pattern: EdgePattern, target: &'static str) -> Self {\n+ let id = self.current.expect(\"edge() without node()\");\n+ self.nodes\n+ .get_mut(id)\n+ .expect(\"node missing\")\n+ .edges\n+ .push(Edge { pattern, target });\n+ self\n+ }\n+\n+ pub fn build(self) -> Graph {\n+ for (id, node) in &self.nodes {\n+ if let Some(parent) = node.parent {\n+ assert!(\n+ self.nodes.contains_key(parent),\n+ \"node {id}: parent {parent} does not exist\"\n+ );\n+ }\n+ for edge in &node.edges {\n+ if !matches!(\n+ edge.pattern,\n+ EdgePattern::AbsorbAny | EdgePattern::AbsorbIf(_)\n+ ) {\n+ assert!(\n+ self.nodes.contains_key(edge.target),\n+ \"node {id}: edge target {} does not exist\",\n+ edge.target\n+ );\n+ }\n+ }\n+ }\n+ Graph {\n+ nodes: self.nodes,\n+ }\n+ }\n+}\ndiff --git a/server/src/url_rules/mod.rs b/server/src/url_rules/mod.rs\nindex 9e1445346ce77a49dd6a7e7713bf9c57aef353cc..ba4ac662acc7bd4d50ee34613eb7eb6fccbfb17b 100644\n--- a/server/src/url_rules/mod.rs\n+++ b/server/src/url_rules/mod.rs\n@@ -1,6 +1,7 @@\n //! URL canonicalization and hierarchy via a semantic graph (DFA + generic fallback).\n \n mod graph;\n+mod graph_builder;\n mod parse;\n mod registry;\n \ndiff --git a/server/src/url_rules/parse.rs b/server/src/url_rules/parse.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..19d0c82feb718817168b8b445fcbfa39cf6aa6ba\n--- /dev/null\n+++ b/server/src/url_rules/parse.rs\n@@ -0,0 +1,169 @@\n+//! Parse raw strings into host, path segments, and query (order-independent).\n+\n+use std::collections::HashMap;\n+\n+use url::Url;\n+\n+#[derive(Debug, Clone)]\n+pub struct UrlParts {\n+ pub scheme: String,\n+ pub host: String,\n+ pub path_segments: Vec,\n+ pub query: HashMap,\n+}\n+\n+impl UrlParts {\n+ pub fn parse(raw: &str) -> Option {\n+ let trimmed = raw.trim();\n+ if trimmed.is_empty() {\n+ return None;\n+ }\n+\n+ let with_scheme = if trimmed.contains(\"://\") {\n+ trimmed.to_string()\n+ } else if trimmed.starts_with(\"r/\") || trimmed.starts_with(\"/r/\") {\n+ let rest = trimmed.trim_start_matches('/').trim_start_matches(\"r/\");\n+ format!(\"https://reddit.com/r/{rest}\")\n+ } else if trimmed.contains('.') && !trimmed.starts_with('/') {\n+ format!(\"https://{trimmed}\")\n+ } else {\n+ trimmed.to_string()\n+ };\n+\n+ let url = Url::parse(&with_scheme).ok()?;\n+ let host = url.host_str()?.to_string();\n+ let path_segments: Vec = url\n+ .path_segments()\n+ .map(|segs| segs.filter(|s| !s.is_empty()).map(str::to_string).collect())\n+ .unwrap_or_default();\n+\n+ let mut query = HashMap::new();\n+ for (k, v) in url.query_pairs() {\n+ query.insert(k.into_owned(), v.into_owned());\n+ }\n+\n+ Some(Self {\n+ scheme: url.scheme().to_string(),\n+ path_segments,\n+ query,\n+ host,\n+ })\n+ }\n+\n+ /// Host normalized for graph entry matching (lowercase, aliases).\n+ pub fn match_host(&self) -> String {\n+ normalize_match_host(&self.host)\n+ }\n+}\n+\n+pub fn normalize_match_host(host: &str) -> String {\n+ let h = host\n+ .strip_prefix(\"www.\")\n+ .unwrap_or(host)\n+ .to_ascii_lowercase();\n+ match h.as_str() {\n+ \"old.reddit.com\" | \"new.reddit.com\" => \"reddit.com\".to_string(),\n+ \"m.youtube.com\" => \"youtube.com\".to_string(),\n+ _ => h,\n+ }\n+}\n+\n+pub fn strip_tracking_query(query: &mut HashMap) {\n+ query.retain(|k, _| {\n+ let lower = k.to_ascii_lowercase();\n+ !(lower.starts_with(\"utm_\")\n+ || matches!(\n+ lower.as_str(),\n+ \"fbclid\" | \"gclid\" | \"ref\" | \"ref_src\" | \"ref_source\" | \"mc_cid\" | \"mc_eid\"\n+ ))\n+ });\n+}\n+\n+#[cfg(test)]\n+pub(crate) fn test_parts(host: &str, segs: &[&str], query: &[(&str, &str)]) -> UrlParts {\n+ UrlParts {\n+ scheme: \"https\".to_string(),\n+ host: host.to_string(),\n+ path_segments: segs.iter().map(|s| (*s).to_string()).collect(),\n+ query: query\n+ .iter()\n+ .map(|(k, v)| (k.to_string(), v.to_string()))\n+ .collect(),\n+ }\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+\n+ #[test]\n+ fn parse_full_url_splits_host_path_query() {\n+ let p = UrlParts::parse(\"https://www.youtube.com/watch?v=abc&t=4\").unwrap();\n+ assert_eq!(p.host, \"www.youtube.com\");\n+ assert_eq!(p.path_segments, vec![\"watch\"]);\n+ assert_eq!(p.query.get(\"v\").map(String::as_str), Some(\"abc\"));\n+ assert_eq!(p.query.get(\"t\").map(String::as_str), Some(\"4\"));\n+ }\n+\n+ #[test]\n+ fn parse_r_shortcut_expands_to_reddit() {\n+ let p = UrlParts::parse(\"r/rust\").unwrap();\n+ assert_eq!(p.match_host(), \"reddit.com\");\n+ assert_eq!(p.path_segments, vec![\"r\", \"rust\"]);\n+ }\n+\n+ #[test]\n+ fn parse_slash_r_shortcut() {\n+ let p = UrlParts::parse(\"/r/aww\").unwrap();\n+ assert_eq!(p.path_segments, vec![\"r\", \"aww\"]);\n+ }\n+\n+ #[test]\n+ fn parse_schemeless_host_path() {\n+ let p = UrlParts::parse(\"reddit.com/r/rust/comments/aaa/slug\").unwrap();\n+ assert_eq!(p.match_host(), \"reddit.com\");\n+ assert_eq!(\n+ p.path_segments,\n+ vec![\"r\", \"rust\", \"comments\", \"aaa\", \"slug\"]\n+ );\n+ }\n+\n+ #[test]\n+ fn parse_empty_returns_none() {\n+ assert!(UrlParts::parse(\"\").is_none());\n+ assert!(UrlParts::parse(\" \").is_none());\n+ }\n+\n+ #[test]\n+ fn normalize_match_host_reddit_aliases() {\n+ assert_eq!(normalize_match_host(\"old.reddit.com\"), \"reddit.com\");\n+ assert_eq!(normalize_match_host(\"NEW.reddit.com\"), \"reddit.com\");\n+ assert_eq!(normalize_match_host(\"www.reddit.com\"), \"reddit.com\");\n+ }\n+\n+ #[test]\n+ fn normalize_match_host_youtube_aliases() {\n+ assert_eq!(normalize_match_host(\"m.youtube.com\"), \"youtube.com\");\n+ assert_eq!(normalize_match_host(\"www.youtube.com\"), \"youtube.com\");\n+ }\n+\n+ #[test]\n+ fn strip_tracking_query_removes_known_params() {\n+ let mut q = HashMap::from([\n+ (\"v\".into(), \"1\".into()),\n+ (\"utm_source\".into(), \"x\".into()),\n+ (\"fbclid\".into(), \"y\".into()),\n+ (\"ref\".into(), \"z\".into()),\n+ ]);\n+ strip_tracking_query(&mut q);\n+ assert_eq!(q.len(), 1);\n+ assert_eq!(q.get(\"v\").map(String::as_str), Some(\"1\"));\n+ }\n+\n+ #[test]\n+ fn strip_tracking_query_utm_prefix() {\n+ let mut q = HashMap::from([(\"utm_campaign\".into(), \"email\".into())]);\n+ strip_tracking_query(&mut q);\n+ assert!(q.is_empty());\n+ }\n+}\ndiff --git a/server/src/url_rules/registry_tests.rs b/server/src/url_rules/registry_tests.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..7b76b550f808f590e011469fdae02adf603b43d2\n--- /dev/null\n+++ b/server/src/url_rules/registry_tests.rs\n@@ -0,0 +1,195 @@\n+//! End-to-end tests for the public registry API (`canonicalize_raw`, breadcrumbs, parent).\n+\n+use super::registry::{\n+ canonicalize_raw, looks_like_url, navigable_breadcrumbs, parent_url, resolve_id,\n+};\n+\n+fn canon(raw: &str) -> String {\n+ canonicalize_raw(raw).unwrap().canonical\n+}\n+\n+#[test]\n+fn looks_like_url_positive_cases() {\n+ for raw in [\n+ \"https://reddit.com/r/rust\",\n+ \"r/rust\",\n+ \"/r/aww\",\n+ \"reddit.com/r/x\",\n+ \"www.example.com/path\",\n+ \"youtu.be/abc\",\n+ ] {\n+ assert!(looks_like_url(raw), \"{raw}\");\n+ }\n+}\n+\n+#[test]\n+fn looks_like_url_negative_cases() {\n+ for raw in [\"alpha\", \"beta\", \"\", \"hello world\", \"no-dots\"] {\n+ assert!(!looks_like_url(raw), \"{raw}\");\n+ }\n+}\n+\n+#[test]\n+fn resolve_id_matches_canonicalize_raw() {\n+ let raw = \"https://youtu.be/xyz\";\n+ assert_eq!(\n+ resolve_id(raw).as_deref(),\n+ Some(canon(raw).as_str())\n+ );\n+}\n+\n+#[test]\n+fn canonicalize_empty_returns_none() {\n+ assert!(canonicalize_raw(\"\").is_none());\n+}\n+\n+#[test]\n+fn alias_when_slug_stripped() {\n+ let r = canonicalize_raw(\n+ \"https://reddit.com/r/rust/comments/aaa/very_long_title_slug\",\n+ )\n+ .unwrap();\n+ assert_eq!(r.canonical, \"https://reddit.com/r/rust/comments/aaa\");\n+ assert!(r.alias_of.is_some());\n+}\n+\n+#[test]\n+fn alias_none_when_already_canonical() {\n+ let raw = \"https://reddit.com/r/rust\";\n+ let r = canonicalize_raw(raw).unwrap();\n+ assert_eq!(r.canonical, raw);\n+ assert!(r.alias_of.is_none());\n+}\n+\n+#[test]\n+fn parent_url_subreddit_under_r_hub() {\n+ assert_eq!(\n+ parent_url(\"https://reddit.com/r/movies\").as_deref(),\n+ Some(\"https://reddit.com/r\")\n+ );\n+}\n+\n+#[test]\n+fn parent_url_domain_has_none() {\n+ assert_eq!(parent_url(\"https://reddit.com\").as_deref(), None);\n+}\n+\n+#[test]\n+fn parent_url_generic_site() {\n+ assert_eq!(\n+ parent_url(\"https://example.com/a/b\").as_deref(),\n+ Some(\"https://example.com/a\")\n+ );\n+}\n+\n+#[test]\n+fn breadcrumbs_from_canonical_string_roundtrip() {\n+ let id = \"https://reddit.com/r/golang/comments/abc123\";\n+ let crumbs = navigable_breadcrumbs(id);\n+ assert_eq!(crumbs.last().map(String::as_str), Some(id));\n+}\n+\n+// --- Table: Reddit raw URLs → canonical ---\n+\n+#[test]\n+fn reddit_canonical_matrix() {\n+ let cases: &[(&str, &str)] = &[\n+ (\"r/rust\", \"https://reddit.com/r/rust\"),\n+ (\"/r/aww\", \"https://reddit.com/r/aww\"),\n+ (\"https://reddit.com/r/rust\", \"https://reddit.com/r/rust\"),\n+ (\n+ \"https://www.reddit.com/r/programming/new\",\n+ \"https://reddit.com/r/programming\",\n+ ),\n+ (\n+ \"https://old.reddit.com/r/test/comments/xyz/slug/\",\n+ \"https://reddit.com/r/test/comments/xyz\",\n+ ),\n+ (\n+ \"reddit.com/r/Movies/comments/abc/Title_Case_Slug\",\n+ \"https://reddit.com/r/movies/comments/abc\",\n+ ),\n+ ];\n+ for (raw, want) in cases {\n+ assert_eq!(canon(raw), *want, \"raw={raw}\");\n+ }\n+}\n+\n+// --- Table: YouTube raw URLs → canonical ---\n+\n+#[test]\n+fn youtube_canonical_matrix() {\n+ let cases: &[(&str, &str)] = &[\n+ (\n+ \"https://youtube.com/watch?v=abc\",\n+ \"https://youtube.com/watch?v=abc\",\n+ ),\n+ (\n+ \"https://www.youtube.com/watch?v=abc&t=1&feature=share\",\n+ \"https://youtube.com/watch?v=abc\",\n+ ),\n+ (\"https://youtu.be/abc\", \"https://youtube.com/watch?v=abc\"),\n+ (\n+ \"https://youtube.com/shorts/abc\",\n+ \"https://youtube.com/watch?v=abc\",\n+ ),\n+ ];\n+ for (raw, want) in cases {\n+ assert_eq!(canon(raw), *want, \"raw={raw}\");\n+ }\n+}\n+\n+// --- Table: generic sites ---\n+\n+#[test]\n+fn generic_canonical_matrix() {\n+ let cases: &[(&str, &str)] = &[\n+ (\n+ \"https://news.ycombinator.com/item?id=38472\",\n+ \"https://news.ycombinator.com/item?id=38472\",\n+ ),\n+ (\n+ \"https://www.github.com/rust-lang/rust/issues/1?utm_source=x\",\n+ \"https://github.com/rust-lang/rust/issues/1\",\n+ ),\n+ (\"https://example.com\", \"https://example.com\"),\n+ ];\n+ for (raw, want) in cases {\n+ assert_eq!(canon(raw), *want, \"raw={raw}\");\n+ }\n+}\n+\n+// --- Phantom /comments/ regression (sorter2-specific) ---\n+\n+#[test]\n+fn phantom_comments_not_in_breadcrumbs_for_post() {\n+ let crumbs = navigable_breadcrumbs(\"https://reddit.com/r/rust/comments/aaa\");\n+ assert!(!crumbs.iter().any(|c| c.ends_with(\"/comments\")));\n+}\n+\n+#[test]\n+fn phantom_comments_not_sibling_of_subreddit_in_breadcrumb_chain() {\n+ let crumbs = navigable_breadcrumbs(\"https://reddit.com/r/rust/comments/aaa\");\n+ let subs: Vec<_> = crumbs\n+ .iter()\n+ .filter(|c| c.contains(\"/r/rust\") && !c.contains(\"/comments/\"))\n+ .collect();\n+ assert_eq!(subs, vec![\"https://reddit.com/r/rust\"]);\n+}\n+\n+// --- Distinct items must stay distinct ---\n+\n+#[test]\n+fn different_posts_different_canonical() {\n+ let a = canon(\"https://reddit.com/r/rust/comments/aaa\");\n+ let b = canon(\"https://reddit.com/r/rust/comments/bbb\");\n+ assert_ne!(a, b);\n+}\n+\n+#[test]\n+fn different_subreddits_different_canonical() {\n+ assert_ne!(\n+ canon(\"https://reddit.com/r/rust\"),\n+ canon(\"https://reddit.com/r/golang\")\n+ );\n+}\n","role":"user"}],"model":"~x-ai/grok-latest"}