{"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[c99adc26] refactor forum into files\n\nSide A — unified diff (full patch):\ndiff --git a/bb.edn b/bb.edn\nindex 4680e82d4227057d2eea6041dc5647beb759131d..ce0f6fcd45a67ead3295b90db2a301e9b304f3da 100644\n--- a/bb.edn\n+++ b/bb.edn\n@@ -51,6 +51,11 @@\n :requires ([test.walkthrough-fixture :as walkthrough-fixture])\n :task (walkthrough-fixture/run-fixture)}\n \n+ sample-fixture\n+ {:doc \"macOS: run `sample` on process(es) listening on the fixture TCP port (default 8080). Usage: bb sample-fixture [PORT] [DURATION_SEC] [OUT_DIR]\"\n+ :requires ([scripts.sample-fixture :as sample-fixture])\n+ :task (apply sample-fixture/-main *command-line-args*)}\n+\n perf\n {:doc \"Performance test: concurrent HTTP requests to detect blocking I/O\"\n :requires ([scripts.perf :as perf])\ndiff --git a/scripts/sample_fixture.bb b/scripts/sample_fixture.bb\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..ac2368623c5043ba6e027afef6b5b37d392767b0\n--- /dev/null\n+++ b/scripts/sample_fixture.bb\n@@ -0,0 +1,70 @@\n+(ns scripts.sample-fixture\n+ \"Find process(es) listening on the fixture port (default 8080) and run macOS `sample`.\"\n+ (:require [babashka.fs :as fs]\n+ [babashka.process :as p]\n+ [clojure.string :as str]))\n+\n+(defn- usage []\n+ (println \"Usage: bb sample-fixture [PORT] [DURATION_SEC] [OUT_DIR]\")\n+ (println \"\")\n+ (println \" Finds PIDs bound to TCP LISTEN on PORT (default 8080), then runs\")\n+ (println \" `sample` for each PID. OUT_DIR defaults to the current directory.\")\n+ (println \"\")\n+ (println \" Example: bb sample-fixture\")\n+ (println \" bb sample-fixture 8080 10\")\n+ (println \" bb sample-fixture 8080 5 /tmp\")\n+ (println \"\")\n+ (println \" Requires macOS (the `sample` tool).\"))\n+\n+(defn- parse-long* [s]\n+ (try (Long/parseLong s)\n+ (catch NumberFormatException _ nil)))\n+\n+(defn- listen-pids [port]\n+ (let [spec (str \"TCP:\" port)\n+ {:keys [out exit]}\n+ @(p/process [\"lsof\" \"-nP\" (str \"-i\" spec) \"-sTCP:LISTEN\" \"-t\"]\n+ {:out :string :err :string})]\n+ (when (zero? exit)\n+ (->> (str/split-lines out)\n+ (map str/trim)\n+ (remove str/blank?)\n+ (distinct)\n+ vec))))\n+\n+(defn- sample-bin []\n+ (or (fs/which \"sample\")\n+ (throw (ex-info \"macOS `sample` not found on PATH\" {}))))\n+\n+(defn- run-sample! [sample duration-sec pid out-file]\n+ (println (str \"sampling PID \" pid \" for \" duration-sec \"s → \" out-file))\n+ (let [{:keys [exit err]} @(p/process [sample (str pid) (str duration-sec) \"-file\" out-file]\n+ {:out :inherit :err :inherit})]\n+ (when-not (zero? exit)\n+ (binding [*out* *err*]\n+ (println \"sample failed:\" err))\n+ (System/exit exit))))\n+\n+(defn -main [& args]\n+ (when (some #{\"-h\" \"--help\" \"help\"} args)\n+ (usage)\n+ (System/exit 0))\n+ (let [port (or (some-> (first args) parse-long*) 8080)\n+ duration-sec (or (some-> (second args) parse-long*) 5)\n+ out-dir (or (nth args 2 nil) \".\")\n+ pids (listen-pids port)]\n+ (when (or (nil? pids) (empty? pids))\n+ (binding [*out* *err*]\n+ (println (str \"No process listening on TCP \" port \" (LISTEN). Is `bb fixture` running?\")))\n+ (System/exit 1))\n+ (when-not (fs/exists? out-dir)\n+ (binding [*out* *err*]\n+ (println \"Output directory does not exist:\" out-dir))\n+ (System/exit 1))\n+ (let [sample (sample-bin)\n+ ts (str (System/currentTimeMillis))]\n+ (println (str \"port \" port \" → PIDs \" (str/join \", \" pids)))\n+ (doseq [pid pids]\n+ (let [out-file (str (fs/path out-dir) \"/slug-sample-\" port \"-\" pid \"-\" ts \".txt\")]\n+ (run-sample! sample duration-sec pid (str out-file))))\n+ (println \"done.\"))))\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\nindex a55fc1f79d03719eb74b216865b2c15199c48ea7..5ad8dfc84dd735d589432e2c613ff687a75f2e61 100644\n--- a/server/src/html/forum.rs\n+++ b/server/src/html/forum.rs\n@@ -380,22 +380,6 @@ fn room_members_inner(members: &[RoomMemberRow]) -> Markup {\n }\n }\n \n-pub(crate) fn set_room_members_expanded_rpc(room_wire: &str, expanded: bool) -> String {\n- template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {\n- room_wire: room_wire.to_string(),\n- expanded,\n- })\n- .expect(\"static json\")\n-}\n-\n-pub(crate) fn set_room_new_thread_compose_expanded_rpc(nav: &ThreadNav, expanded: bool) -> String {\n- template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {\n- room_wire: nav.room_wire.clone(),\n- expanded,\n- })\n- .expect(\"static json\")\n-}\n-\n /// Fragment for `#room-members-section` — expand/collapse is server-driven via `POST /ui`.\n pub(crate) fn room_members_section_markup(\n reduced: &ReducerState,\n@@ -406,13 +390,14 @@ pub(crate) fn room_members_section_markup(\n if members.is_empty() {\n return html! {};\n }\n- let rpc_open = set_room_members_expanded_rpc(room_id, true);\n- let rpc_close = set_room_members_expanded_rpc(room_id, false);\n html! {\n div id=\"room-members-section\" {\n @if members_expanded {\n form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc_close);\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {\n+ room_wire: room_id.to_string(),\n+ expanded: false,\n+ }).expect(\"static json\"));\n button type=\"submit\" class=\"form-toggle\" aria-expanded=\"true\" {\n \"hide members & permissions\"\n }\n@@ -422,7 +407,10 @@ pub(crate) fn room_members_section_markup(\n }\n } @else {\n form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc_open);\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {\n+ room_wire: room_id.to_string(),\n+ expanded: true,\n+ }).expect(\"static json\"));\n button type=\"submit\" class=\"form-toggle\" aria-expanded=\"false\" {\n \"members & permissions\"\n }\n@@ -514,28 +502,24 @@ fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup {\n if !show {\n return html! {};\n }\n- let rpc_post = template_json_compact(&json!({\n- \"action\": \"post_ingest\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": thread_tag,\n- \"text\": {\"$form\": \"text\"},\n- \"error_target\": \"thread-compose-errors\",\n- \"form_id\": \"thread-compose-form\",\n- }))\n- .unwrap();\n- let rpc_check = template_json_compact(&json!({\n- \"action\": \"check_ingest\",\n- \"room\": nav.room_wire,\n- \"thread_tag\": thread_tag,\n- \"text\": {\"$form\": \"text\"},\n- \"error_target\": \"thread-compose-errors\",\n- \"form_id\": \"thread-compose-form\",\n- }))\n- .unwrap();\n html! {\n section class=\"compose\" id=\"thread-compose\" {\n- form id=\"thread-compose-form\" method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(rpc_check) {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc_post);\n+ form id=\"thread-compose-form\" method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(template_json_compact(&json!({\n+ \"action\": \"check_ingest\",\n+ \"room\": nav.room_wire,\n+ \"thread_tag\": thread_tag,\n+ \"text\": {\"$form\": \"text\"},\n+ \"error_target\": \"thread-compose-errors\",\n+ \"form_id\": \"thread-compose-form\",\n+ })).unwrap()) {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n+ \"action\": \"post_ingest\",\n+ \"room\": nav.room_wire,\n+ \"thread_tag\": thread_tag,\n+ \"text\": {\"$form\": \"text\"},\n+ \"error_target\": \"thread-compose-errors\",\n+ \"form_id\": \"thread-compose-form\",\n+ })).unwrap());\n textarea name=\"text\" rows=\"5\" cols=\"80\" placeholder=\"prose or ~/items and votes…\" {}\n p {\n button type=\"submit\" { \"post\" }\n@@ -712,7 +696,7 @@ pub async fn home(\n p class=\"muted\" { \"dark = time-ordered · light = vote-ranked\" }\n div class=\"thread-feed-toolbar\" {\n form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(expand_public_new_thread_rpc_value());\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect(\"static json\"));\n button type=\"submit\" class=\"section-add-btn\" { \"+\" }\n }\n }\n@@ -1002,14 +986,15 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool)\n if !show {\n return html! {};\n }\n- let rpc_open = set_room_new_thread_compose_expanded_rpc(nav, true);\n- let rpc_close = set_room_new_thread_compose_expanded_rpc(nav, false);\n // Single root for Idiomorph when morphing `#room-new-thread-ui-slot` (expanded has form + section).\n html! {\n div class=\"room-new-thread-slot-inner\" {\n @if compose_expanded {\n form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc_close);\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {\n+ room_wire: nav.room_wire.clone(),\n+ expanded: false,\n+ }).expect(\"static json\"));\n button type=\"submit\" class=\"form-toggle\" aria-expanded=\"true\" {\n \"-\"\n }\n@@ -1039,7 +1024,10 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool)\n }\n } @else {\n form method=\"POST\" action=\"/ui\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc_open);\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {\n+ room_wire: nav.room_wire.clone(),\n+ expanded: true,\n+ }).expect(\"static json\"));\n button type=\"submit\" class=\"form-toggle\" aria-expanded=\"false\" {\n \"+\"\n }\n@@ -1049,10 +1037,6 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool)\n }\n }\n \n-pub(crate) fn expand_public_new_thread_rpc_value() -> String {\n- template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect(\"static json\")\n-}\n-\n pub(crate) fn login_to_post_hint_markup() -> Markup {\n html! {\n p class=\"muted\" { \"log in to post\" }\ndiff --git a/server/src/html/forum/access.rs b/server/src/html/forum/access.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..f9f7139b63442a6ef3a927b77a72805f15feec3f\n--- /dev/null\n+++ b/server/src/html/forum/access.rs\n@@ -0,0 +1,16 @@\n+use crate::events::ThreadCapability;\n+use crate::reducer::ReducerState;\n+\n+pub(crate) fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool {\n+ if !reduced.rooms.contains(room_id) {\n+ return false;\n+ }\n+ let Some(u) = username else {\n+ return false;\n+ };\n+ reduced.user_has_cap(room_id, u, ThreadCapability::View)\n+}\n+\n+pub(crate) fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool {\n+ reduced.user_has_cap(room_id, username, ThreadCapability::Post)\n+}\ndiff --git a/server/src/html/forum/ingest.rs b/server/src/html/forum/ingest.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..c045046a005db4f8f4d1dc7ea74aaaba45e0f3f4\n--- /dev/null\n+++ b/server/src/html/forum/ingest.rs\n@@ -0,0 +1,171 @@\n+use crate::canonical_path::canonicalize_tag;\n+use crate::form_template::template_json_compact;\n+use crate::reducer::{scope_from_room_wire, ReducerState};\n+use maud::{html, Markup};\n+use serde_json::json;\n+\n+use crate::html::js_string_literal;\n+use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD};\n+use crate::html::{profile_href, render_linkified_with_embeds_in_scope, timeago};\n+\n+use super::nav::ThreadNav;\n+\n+/// `POST /ui` + `__rpc__` from an inline link (`onclick`); same-origin credentials as other morph actions.\n+pub(super) fn thread_ui_fetch_onclick(rpc_compact_json: &str) -> String {\n+ format!(\n+ \"fetch('/ui',{{method:'POST',headers:{{'Content-Type':'application/x-www-form-urlencoded'}},body:new URLSearchParams({{__rpc__:{}}}).toString(),credentials:'same-origin'}}).then(r=>r.text()).then(eval);return false\",\n+ js_string_literal(rpc_compact_json)\n+ )\n+}\n+\n+pub(super) fn thread_nav_for_ingest(ing: &crate::events::Ingest) -> Option {\n+ let room = ing.room_id.trim();\n+ if room.is_empty() || room == \"public\" {\n+ Some(ThreadNav::public())\n+ } else {\n+ ThreadNav::from_room_id(room)\n+ }\n+}\n+\n+pub(super) fn thread_post_index_in_scope(reduced: &ReducerState, ing: &crate::events::Ingest) -> Option {\n+ let scope = scope_from_room_wire(&ing.room_id);\n+ let tag = canonicalize_tag(&ing.thread_tag);\n+ reduced\n+ .ingests_by_scope_thread\n+ .get(&(scope, tag))\n+ .and_then(|q| q.iter().rev().position(|id| id == &ing.id))\n+}\n+\n+fn post_header_meta(\n+ nav: &ThreadNav,\n+ tag: &str,\n+ post_idx: usize,\n+ principal: &str,\n+ ts: i64,\n+ now: i64,\n+) -> Markup {\n+ let post_href = nav.post_url(tag, post_idx);\n+ let profile = profile_href(principal);\n+ let hover = timeago::rfc3339_utc(ts);\n+ let ago = timeago::timeago(now, ts);\n+ html! {\n+ div class=\"ingest-meta muted\" title=(hover) {\n+ a href=(post_href) class=\"post-num\" { \"#\" (post_idx) }\n+ \" \"\n+ a href=(profile) class=\"post-author\" { \"@\" (principal) }\n+ \" · \"\n+ (ago)\n+ }\n+ }\n+}\n+\n+pub(super) fn post_header_row(\n+ nav: &ThreadNav,\n+ tag: &str,\n+ post_idx: usize,\n+ ing: &crate::events::Ingest,\n+ _viewer: Option<&str>,\n+ now: i64,\n+ show_delete: bool,\n+) -> Markup {\n+ let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now);\n+ html! {\n+ div class=\"ingest-header-row\" {\n+ (meta)\n+ @if show_delete {\n+ form class=\"post-delete-form\" method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::RedactPost { post_id: ing.id.clone() }).unwrap());\n+ button type=\"submit\" class=\"post-delete-btn\" { \"delete\" }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+pub(super) fn redacted_header_row(\n+ nav: &ThreadNav,\n+ tag: &str,\n+ post_idx: usize,\n+ ing: &crate::events::Ingest,\n+ now: i64,\n+ expanded: bool,\n+) -> Markup {\n+ let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now);\n+ let rpc_expand = template_json_compact(&json!({\n+ \"action\": \"expand_redacted_post\",\n+ \"room\": nav.room_wire,\n+ \"thread_tag\": tag,\n+ \"post_index\": post_idx,\n+ }))\n+ .unwrap();\n+ let rpc_collapse = template_json_compact(&json!({\n+ \"action\": \"collapse_redacted_post\",\n+ \"room\": nav.room_wire,\n+ \"thread_tag\": tag,\n+ \"post_index\": post_idx,\n+ }))\n+ .unwrap();\n+ let onclick_expand = thread_ui_fetch_onclick(&rpc_expand);\n+ let onclick_collapse = thread_ui_fetch_onclick(&rpc_collapse);\n+ html! {\n+ div class=\"ingest-header-row ingest-tombstone-row\" {\n+ (meta)\n+ span class=\"post-tombstone-inline muted\" {\n+ \"deleted · \"\n+ @if expanded {\n+ a href=\"#\" class=\"hide-deleted-link\"\n+ onclick=(onclick_collapse) {\n+ \"[hide deleted content]\"\n+ }\n+ } @else {\n+ a href=\"#\" class=\"show-deleted-link\"\n+ onclick=(onclick_expand) {\n+ \"[show deleted content]\"\n+ }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+pub(super) fn ingest_entry_markup(\n+ nav: &ThreadNav,\n+ tag: &str,\n+ post_idx: usize,\n+ ing: &crate::events::Ingest,\n+ viewer: Option<&str>,\n+ now: i64,\n+ reduced: &ReducerState,\n+) -> Markup {\n+ let redacted = reduced.redacted_posts.contains(&ing.id);\n+ let show_delete = viewer == Some(ing.principal.as_str()) && !redacted;\n+ if redacted {\n+ html! {\n+ div class=\"ingest-entry ingest-redacted\" data-ingest-id=(ing.id) {\n+ (redacted_header_row(nav, tag, post_idx, ing, now, false))\n+ }\n+ }\n+ } else {\n+ let truncated = ing.raw.len() > 2000;\n+ let display_body = if truncated { &ing.raw[..2000] } else { &ing.raw[..] };\n+ html! {\n+ div class=\"ingest-entry\" data-ingest-id=(ing.id) {\n+ (post_header_row(nav, tag, post_idx, ing, viewer, now, show_delete))\n+ (render_linkified_with_embeds_in_scope(display_body, nav.garden_root_url()))\n+ @if truncated {\n+ @let rpc_full = template_json_compact(&json!({\n+ \"action\": \"expand_post_full\",\n+ \"room\": nav.room_wire,\n+ \"thread_tag\": tag,\n+ \"post_index\": post_idx,\n+ })).unwrap();\n+ @let onclick_full = thread_ui_fetch_onclick(&rpc_full);\n+ a href=\"#\" class=\"show-full-link\"\n+ onclick=(onclick_full) {\n+ \"[show full post]\"\n+ }\n+ }\n+ }\n+ }\n+ }\n+}\ndiff --git a/server/src/html/forum/nav.rs b/server/src/html/forum/nav.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..f5d437f2b1c6a0b727f1540d83774ba4e440f0b1\n--- /dev/null\n+++ b/server/src/html/forum/nav.rs\n@@ -0,0 +1,78 @@\n+use crate::canonical_path::canonicalize_item;\n+use crate::reducer::ScopeId;\n+\n+/// URL helpers for public `/t/…` and private room threads `/r/{short}/{slug}/t/…`.\n+#[derive(Clone)]\n+pub struct ThreadNav {\n+ pub room_wire: String,\n+ scope: ScopeId,\n+ room_path: String,\n+ thread_path_prefix: String,\n+ garden_path_prefix: String,\n+}\n+\n+impl ThreadNav {\n+ pub(crate) fn public() -> Self {\n+ Self {\n+ room_wire: \"public\".into(),\n+ scope: ScopeId::Public,\n+ room_path: \"/t\".into(),\n+ thread_path_prefix: \"/t\".into(),\n+ garden_path_prefix: \"/~\".into(),\n+ }\n+ }\n+\n+ /// `room_id` wire form `shortid/slug`.\n+ pub(crate) fn from_room_id(room_id: &str) -> Option {\n+ let (short, slug) = room_id.split_once('/')?;\n+ if short.is_empty() || slug.is_empty() {\n+ return None;\n+ }\n+ Some(Self {\n+ room_wire: room_id.to_string(),\n+ scope: ScopeId::Room(room_id.to_string()),\n+ room_path: format!(\"/r/{short}/{slug}\"),\n+ thread_path_prefix: format!(\"/r/{short}/{slug}/t\"),\n+ garden_path_prefix: format!(\"/r/{short}/{slug}/~\"),\n+ })\n+ }\n+\n+ pub(crate) fn scope(&self) -> ScopeId {\n+ self.scope.clone()\n+ }\n+\n+ pub(crate) fn room_url(&self) -> &str {\n+ &self.room_path\n+ }\n+\n+ pub(crate) fn thread_url(&self, tag: &str) -> String {\n+ format!(\"{}/{}\", self.thread_path_prefix, tag)\n+ }\n+\n+ pub(crate) fn garden_root_url(&self) -> &str {\n+ &self.garden_path_prefix\n+ }\n+\n+ pub(crate) fn garden_item_url(&self, item: &str) -> String {\n+ if let Some(tail) = crate::path_types::CanonicalItemUrl::parse(item)\n+ .and_then(|c| c.tilde_tail().map(str::to_owned))\n+ {\n+ format!(\"{}/{}\", self.garden_path_prefix, tail)\n+ } else {\n+ format!(\"{}/{}\", self.garden_path_prefix, canonicalize_item(item))\n+ }\n+ }\n+\n+ pub(crate) fn thread_page_url(&self, tag: &str, offset: usize) -> String {\n+ let base = self.thread_url(tag);\n+ if offset == 0 {\n+ base\n+ } else {\n+ format!(\"{base}?offset={offset}\")\n+ }\n+ }\n+\n+ pub(crate) fn post_url(&self, tag: &str, idx: usize) -> String {\n+ format!(\"{}/{}/{}\", self.thread_path_prefix, tag, idx)\n+ }\n+}\ndiff --git a/server/src/html/forum/new_thread.rs b/server/src/html/forum/new_thread.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..b2d24b8ab3ec7eee0edd16bed8ee6605e49bf408\n--- /dev/null\n+++ b/server/src/html/forum/new_thread.rs\n@@ -0,0 +1,157 @@\n+use crate::form_template::template_json_compact;\n+use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD};\n+use maud::{html, Markup};\n+use serde_json::json;\n+\n+use super::nav::ThreadNav;\n+\n+struct NewThreadIds {\n+ compose_section_id: &'static str,\n+ errors_id: &'static str,\n+ form_id: &'static str,\n+ tag_input_id: &'static str,\n+ text_input_id: Option<&'static str>,\n+}\n+\n+const PUBLIC_IDS: NewThreadIds = NewThreadIds {\n+ compose_section_id: \"public-new-thread-compose\",\n+ errors_id: \"public-new-thread-errors\",\n+ form_id: \"public-new-thread-form\",\n+ tag_input_id: \"new-thread-tag\",\n+ text_input_id: Some(\"new-thread-text\"),\n+};\n+\n+const ROOM_IDS: NewThreadIds = NewThreadIds {\n+ compose_section_id: \"room-new-thread-compose\",\n+ errors_id: \"room-new-thread-errors\",\n+ form_id: \"room-new-thread-form\",\n+ tag_input_id: \"room-new-tag\",\n+ text_input_id: None,\n+};\n+\n+#[derive(Clone, Copy)]\n+enum NewThreadComposeKind {\n+ /// Home page: no client-side check RPC; post template omits `error_target` / `form_id`.\n+ Public,\n+ /// Room page: `check_ingest` + error targets on post (matches thread compose).\n+ Room,\n+}\n+\n+/// Shared `
` for creating a thread + first post.\n+fn new_thread_compose_section(room_wire: &str, ids: &NewThreadIds, kind: NewThreadComposeKind) -> Markup {\n+ let client_check = matches!(kind, NewThreadComposeKind::Room);\n+ let (tag_placeholder, text_placeholder, submit_label) = match kind {\n+ NewThreadComposeKind::Public => (\n+ \"thread-title-slug-here\",\n+ \"Hello threadgoers!! Behold my new thread!\",\n+ \"create thread / make first post\",\n+ ),\n+ NewThreadComposeKind::Room => (\n+ \"thread-topic-slug-here\",\n+ \"First post body…\",\n+ \"post\",\n+ ),\n+ };\n+\n+ html! {\n+ section class=\"compose\" id=(ids.compose_section_id) {\n+ div id=(ids.errors_id) {}\n+ @if client_check {\n+ form id=(ids.form_id) method=\"POST\" action=\"/ui\" data-check-action=\"/ui\" data-check-rpc=(template_json_compact(&json!({\n+ \"action\": \"check_ingest\",\n+ \"room\": room_wire,\n+ \"thread_tag\": {\"$form\": \"thread_tag\"},\n+ \"text\": {\"$form\": \"text\"},\n+ \"error_target\": ids.errors_id,\n+ \"form_id\": ids.form_id,\n+ })).unwrap()) {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n+ \"action\": \"post_ingest\",\n+ \"room\": room_wire,\n+ \"thread_tag\": {\"$form\": \"thread_tag\"},\n+ \"text\": {\"$form\": \"text\"},\n+ \"error_target\": ids.errors_id,\n+ \"form_id\": ids.form_id,\n+ })).unwrap());\n+ input type=\"text\" id=(ids.tag_input_id) name=\"thread_tag\" pattern=\"[a-z0-9_\\\\-]{1,64}\" required placeholder=(tag_placeholder);\n+ @if let Some(tid) = ids.text_input_id {\n+ textarea id=(tid) name=\"text\" rows=\"4\" placeholder=(text_placeholder) required {}\n+ } @else {\n+ textarea name=\"text\" rows=\"4\" placeholder=(text_placeholder) required {}\n+ }\n+ p { button type=\"submit\" { (submit_label) } }\n+ }\n+ } @else {\n+ form id=(ids.form_id) method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({\n+ \"action\": \"post_ingest\",\n+ \"room\": room_wire,\n+ \"thread_tag\": {\"$form\": \"thread_tag\"},\n+ \"text\": {\"$form\": \"text\"},\n+ })).unwrap());\n+ input type=\"text\" id=(ids.tag_input_id) name=\"thread_tag\" pattern=\"[a-z0-9_\\\\-]{1,64}\" placeholder=(tag_placeholder);\n+ @if let Some(tid) = ids.text_input_id {\n+ textarea id=(tid) name=\"text\" rows=\"4\" placeholder=(text_placeholder) {}\n+ } @else {\n+ textarea name=\"text\" rows=\"4\" placeholder=(text_placeholder) {}\n+ }\n+ p { button type=\"submit\" { (submit_label) } }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+fn new_thread_form_public(show: bool) -> Markup {\n+ if !show {\n+ return html! {};\n+ }\n+ new_thread_compose_section(\"public\", &PUBLIC_IDS, NewThreadComposeKind::Public)\n+}\n+\n+fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) -> Markup {\n+ if !show {\n+ return html! {};\n+ }\n+ // Single root for Idiomorph when morphing `#room-new-thread-ui-slot` (expanded has form + section).\n+ html! {\n+ div class=\"room-new-thread-slot-inner\" {\n+ @if compose_expanded {\n+ form method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {\n+ room_wire: nav.room_wire.clone(),\n+ expanded: false,\n+ }).expect(\"static json\"));\n+ button type=\"submit\" class=\"form-toggle\" aria-expanded=\"true\" {\n+ \"-\"\n+ }\n+ }\n+ (new_thread_compose_section(&nav.room_wire, &ROOM_IDS, NewThreadComposeKind::Room))\n+ } @else {\n+ form method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded {\n+ room_wire: nav.room_wire.clone(),\n+ expanded: true,\n+ }).expect(\"static json\"));\n+ button type=\"submit\" class=\"form-toggle\" aria-expanded=\"false\" {\n+ \"+\"\n+ }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+pub(crate) fn login_to_post_hint_markup() -> Markup {\n+ html! {\n+ p class=\"muted\" { \"log in to post\" }\n+ }\n+}\n+\n+pub(crate) fn fragment_public_new_thread_form(show: bool) -> Markup {\n+ new_thread_form_public(show)\n+}\n+\n+pub(crate) fn fragment_room_new_thread_form(nav: &ThreadNav, show: bool, compose_expanded: bool) -> Markup {\n+ new_thread_form_for_room(nav, show, compose_expanded)\n+}\ndiff --git a/server/src/html/forum/room_members.rs b/server/src/html/forum/room_members.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..bc13d3eb8030f00799c90c47e689a876168f522c\n--- /dev/null\n+++ b/server/src/html/forum/room_members.rs\n@@ -0,0 +1,108 @@\n+use crate::events::ThreadCapability;\n+use crate::form_template::template_json_compact;\n+use crate::reducer::ReducerState;\n+use maud::{html, Markup};\n+\n+use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD};\n+\n+#[derive(Clone)]\n+pub(super) struct RoomMemberRow {\n+ pub(super) username: String,\n+ pub(super) capabilities: Vec<&'static str>,\n+}\n+\n+fn capability_label(cap: ThreadCapability) -> &'static str {\n+ match cap {\n+ ThreadCapability::View => \"view\",\n+ ThreadCapability::Post => \"post\",\n+ ThreadCapability::Vote => \"vote\",\n+ ThreadCapability::AddItem => \"add_item\",\n+ ThreadCapability::Manage => \"manage\",\n+ }\n+}\n+\n+fn room_members_for_room(reduced: &ReducerState, room_id: &str) -> Vec {\n+ let mut rows: Vec = reduced\n+ .grants\n+ .get(room_id)\n+ .into_iter()\n+ .flat_map(|members| members.iter())\n+ .map(|(username, caps)| {\n+ let mut ordered = Vec::new();\n+ for cap in [\n+ ThreadCapability::View,\n+ ThreadCapability::Post,\n+ ThreadCapability::Vote,\n+ ThreadCapability::AddItem,\n+ ThreadCapability::Manage,\n+ ] {\n+ if caps.contains(&cap) {\n+ ordered.push(capability_label(cap));\n+ }\n+ }\n+ RoomMemberRow {\n+ username: username.clone(),\n+ capabilities: ordered,\n+ }\n+ })\n+ .collect();\n+ rows.sort_by(|a, b| a.username.cmp(&b.username));\n+ rows\n+}\n+\n+fn room_members_inner(members: &[RoomMemberRow]) -> Markup {\n+ html! {\n+ h3 { \"members\" }\n+ ul class=\"room-members\" {\n+ @for member in members {\n+ li {\n+ span class=\"room-member-name\" { \"@\" (member.username) }\n+ span class=\"muted\" {\n+ \" · \"\n+ (member.capabilities.join(\", \"))\n+ }\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+/// Fragment for `#room-members-section` — expand/collapse is server-driven via `POST /ui`.\n+pub(crate) fn room_members_section_markup(\n+ reduced: &ReducerState,\n+ room_id: &str,\n+ members_expanded: bool,\n+) -> Markup {\n+ let members = room_members_for_room(reduced, room_id);\n+ if members.is_empty() {\n+ return html! {};\n+ }\n+ html! {\n+ div id=\"room-members-section\" {\n+ @if members_expanded {\n+ form method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {\n+ room_wire: room_id.to_string(),\n+ expanded: false,\n+ }).expect(\"static json\"));\n+ button type=\"submit\" class=\"form-toggle\" aria-expanded=\"true\" {\n+ \"hide members & permissions\"\n+ }\n+ }\n+ section class=\"room-members-panel\" {\n+ (room_members_inner(&members))\n+ }\n+ } @else {\n+ form method=\"POST\" action=\"/ui\" {\n+ input type=\"hidden\" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded {\n+ room_wire: room_id.to_string(),\n+ expanded: true,\n+ }).expect(\"static json\"));\n+ button type=\"submit\" class=\"form-toggle\" aria-expanded=\"false\" {\n+ \"members & permissions\"\n+ }\n+ }\n+ }\n+ }\n+ }\n+}\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[cdeb4072] tree nixed\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 82c5993fabfeaf2ea8b9034bccaef37924100264..9c5af9654c7010d2cdb100e4cf63ba63e77c8c57 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -12,7 +12,6 @@ mod editor;\n mod forum;\n mod garden;\n mod search;\n-mod tree;\n use breadcrumb_path::OntologyPath;\n \n pub use auth::{auth_complete_page, auth_signed_in_fragment, choose_username_error_fragment, choose_username_page};\n@@ -20,7 +19,6 @@ pub use editor::{editor_check, editor_page};\n pub use forum::{index, thread_feed_html, thread_post_expand, thread_post_view, thread_view};\n pub use garden::{garden_index, ontology_path};\n pub use search::{search_page, search_results_fragment};\n-pub use tree::{tree_path, tree_root, tree_select, tree_toggle};\n \n // Embed CSS files at compile time\n const THEME_DEFAULT_CSS: &str = include_str!(\"../../static/theme_default.css\");\ndiff --git a/server/src/html/tree.rs b/server/src/html/tree.rs\ndeleted file mode 100644\nindex 6aed7db08682f088df3d52d0358b8dc954e9e1df..0000000000000000000000000000000000000000\n--- a/server/src/html/tree.rs\n+++ /dev/null\n@@ -1,819 +0,0 @@\n-use axum::{\n- extract::{Path, State},\n- http::{header, StatusCode},\n- response::{Html, IntoResponse, Response},\n- Form,\n-};\n-use axum::response::Redirect;\n-use axum_extra::extract::Query;\n-use base64::engine::general_purpose::URL_SAFE_NO_PAD;\n-use base64::Engine as _;\n-use maud::{html, Markup};\n-use serde::{Deserialize, Serialize};\n-use std::collections::BTreeSet;\n-\n-use crate::{\n- canonical_path::canonicalize_item,\n- path_types::{CanonicalItemUrl, RelativePath},\n- scope_rank::ChildrenRankings,\n- state::AppState,\n-};\n-\n-// Convenience alias used throughout this module.\n-type CanonSet = BTreeSet;\n-\n-use super::{layout, render_linkified_with_embeds};\n-\n-/// Query-state for the expandable tree UI.\n-#[derive(Debug, Clone, Default, Deserialize)]\n-pub struct TreeQuery {\n- /// Opaque state blob (base64url postcard).\n- #[serde(default)]\n- pub s: Option,\n-}\n-\n-#[derive(Debug, Clone, Serialize, Deserialize)]\n-struct TreeStateV1 {\n- v: u8,\n- #[serde(default)]\n- open: Vec,\n- #[serde(default)]\n- selected: Option,\n-}\n-\n-// Note: TreeStateV1/V2 intentionally use raw `String` / `Vec` because\n-// they are wire-format structs serialised with postcard. All semantic types\n-// (`CanonicalItemUrl`, `RelativePath`) are used in the in-memory\n-// `DecodedTreeState` and in every function that works with live data.\n-\n-#[derive(Debug, Clone, Serialize, Deserialize)]\n-enum SelectedRefV2 {\n- /// Index into the expanded open list.\n- I(u32),\n-}\n-\n-#[derive(Debug, Clone, Serialize, Deserialize)]\n-struct TreeStateV2 {\n- v: u8,\n- /// Common prefix shared by open paths (and optionally selected), ending on a `/` boundary.\n- #[serde(default)]\n- base: String,\n- /// Each entry is a relative path suffix (joined with `base`).\n- #[serde(default)]\n- open_suffixes: Vec,\n- #[serde(default)]\n- selected: Option,\n-}\n-\n-#[derive(Debug, Clone)]\n-struct DecodedTreeState {\n- open: CanonSet,\n- selected: Option,\n-}\n-\n-fn common_base_boundary(paths: &[String]) -> String {\n- if paths.is_empty() {\n- return String::new();\n- }\n- let mut prefix = paths[0].as_str();\n- for p in &paths[1..] {\n- let mut i = 0usize;\n- let bytes_a = prefix.as_bytes();\n- let bytes_b = p.as_bytes();\n- let n = bytes_a.len().min(bytes_b.len());\n- while i < n && bytes_a[i] == bytes_b[i] {\n- i += 1;\n- }\n- prefix = &prefix[..i];\n- if prefix.is_empty() {\n- break;\n- }\n- }\n- // Snap to last '/' boundary (include the slash).\n- match prefix.rfind('/') {\n- None => String::new(),\n- Some(idx) => prefix[..=idx].to_string(),\n- }\n-}\n-\n-fn canon_root(root: &str) -> Option {\n- CanonicalItemUrl::parse(root)\n-}\n-\n-fn canon_to_relative(root: &CanonicalItemUrl, item: &str) -> Option {\n- // Only support ontology items under the same root.\n- let root_str = root.as_str();\n- let item_can = canonicalize_item(item);\n- if item_can.is_empty() {\n- return None;\n- }\n- // Root must be ontology (`https://slug.social/~/...`)\n- root.tilde_tail()?;\n- if item_can == root_str {\n- return RelativePath::new(\"\");\n- }\n- let prefix = if root_str.ends_with('/') {\n- root_str.to_string()\n- } else {\n- format!(\"{}/\", root_str)\n- };\n- if !item_can.starts_with(&prefix) {\n- return None;\n- }\n- let suffix = &item_can[prefix.len()..];\n- RelativePath::new(suffix)\n-}\n-\n-fn relative_to_canon(root: &CanonicalItemUrl, rel: &RelativePath) -> Option {\n- rel.join_under_ontology_root(root)\n-}\n-\n-fn encode_state_blob_v2(\n- root: &str,\n- open: &CanonSet,\n- selected: Option<&CanonicalItemUrl>,\n-) -> String {\n- let Some(root_can) = canon_root(root) else {\n- return String::new();\n- };\n-\n- // Convert to sorted relative paths (strings for wire encoding).\n- let mut rels: Vec = open\n- .iter()\n- .filter_map(|it| canon_to_relative(&root_can, it.as_str()).map(|r| r.0.clone()))\n- .collect();\n- rels.sort();\n- rels.dedup();\n-\n- let sel_rel: Option = selected\n- .and_then(|s| canon_to_relative(&root_can, s.as_str()))\n- .map(|r| r.0.clone());\n-\n- // In v2 we enforce: selected ∈ open. This allows selected to be encoded as an index only.\n- if let Some(sr) = &sel_rel {\n- rels.push(sr.clone());\n- rels.sort();\n- rels.dedup();\n- }\n-\n- // base dedupe over open rels + selection (if present)\n- let mut base_inputs = rels.clone();\n- if let Some(sr) = &sel_rel {\n- base_inputs.push(sr.clone());\n- }\n- let base = common_base_boundary(&base_inputs);\n-\n- let open_suffixes: Vec = rels\n- .iter()\n- .map(|r| r.strip_prefix(&base).unwrap_or(r).to_string())\n- .collect();\n-\n- let selected_ref: Option = sel_rel.and_then(|full| {\n- rels.iter()\n- .position(|r| r == &full)\n- .map(|idx| SelectedRefV2::I(idx as u32))\n- });\n-\n- let st = TreeStateV2 {\n- v: 2,\n- base,\n- open_suffixes,\n- selected: selected_ref,\n- };\n- let bytes = postcard::to_allocvec(&st).unwrap_or_default();\n- URL_SAFE_NO_PAD.encode(bytes)\n-}\n-\n-fn decode_state_blob_any(root: &str, s: &str) -> Option {\n- let root_can = canon_root(root)?;\n- let bytes = URL_SAFE_NO_PAD.decode(s).ok()?;\n- // Try v2 first.\n- if let Ok(st2) = postcard::from_bytes::(&bytes) {\n- if st2.v == 2 {\n- let mut open: CanonSet = BTreeSet::new();\n- for suf in st2.open_suffixes {\n- let full_rel = format!(\"{}{}\", st2.base, suf);\n- if let Some(rp) = RelativePath::new(&full_rel) {\n- if let Some(c) = relative_to_canon(&root_can, &rp) {\n- open.insert(c);\n- }\n- }\n- }\n- let selected: Option = match st2.selected {\n- None => None,\n- Some(SelectedRefV2::I(i)) => {\n- let idx = i as usize;\n- // Index into the sorted open set (BTreeSet iteration is sorted).\n- open.iter().nth(idx).cloned()\n- }\n- // v2 always encodes selected as an index; no string fallback\n- };\n- return Some(DecodedTreeState { open, selected });\n- }\n- }\n- // Fallback v1 (stored canonical-ish strings).\n- let st1: TreeStateV1 = postcard::from_bytes(&bytes).ok()?;\n- if st1.v != 1 {\n- return None;\n- }\n- let open: CanonSet = st1\n- .open\n- .into_iter()\n- .filter_map(|s| CanonicalItemUrl::parse(&canonicalize_item(&s)))\n- .collect();\n- let selected = st1\n- .selected\n- .as_ref()\n- .and_then(|s| CanonicalItemUrl::parse(&canonicalize_item(s)));\n- Some(DecodedTreeState { open, selected })\n-}\n-\n-fn baseline_state_blob() -> String {\n- // Root doesn't affect empty state; V2 encodes open=[], selected=None.\n- // We still build it via V2 encoder for forward-compat.\n- encode_state_blob_v2(\"https://slug.social/~/\", &CanonSet::new(), None)\n-}\n-\n-fn href_for(root: &str, open: &CanonSet, selected: Option<&CanonicalItemUrl>) -> String {\n- let blob = encode_state_blob_v2(root, open, selected);\n- let base = format!(\"/tree/{}\", root.trim_start_matches(\"https://slug.social/~/\"))\n- .trim_end_matches('/')\n- .to_string();\n- format!(\"{base}?s={blob}\")\n-}\n-\n-fn tree_root_from_path(path: Option<&str>) -> String {\n- // Interpret /tree and /tree/*path as `~/...` under slug.social.\n- // Empty path => \"~/\"\n- match path {\n- None => canonicalize_item(\"~/\"),\n- Some(p) if p.trim().is_empty() => canonicalize_item(\"~/\"),\n- Some(p) => canonicalize_item(&format!(\"~/{}\", p.trim_start_matches('/'))),\n- }\n-}\n-\n-fn ranked_children_public(\n- reduced: &crate::reducer::ReducerState,\n- parent: &str,\n-) -> Vec {\n- // Reducer parent keys are derived from `item_parent_path`, which uses\n- // item_children uses \"https://slug.social/~\" (no trailing slash) as the root\n- // parent key. Use ontology_root() for the root case, or parse the given parent.\n- let parent_can = if parent.trim_end_matches('/') == \"https://slug.social/~\" || parent == \"https://slug.social/~/\" {\n- CanonicalItemUrl::ontology_root()\n- } else {\n- CanonicalItemUrl::parse(parent.trim_end_matches('/'))\n- .unwrap_or_else(CanonicalItemUrl::ontology_root)\n- };\n- let rankings: ChildrenRankings =\n- crate::scope_rank::build_children_rankings(reduced.public(), &parent_can);\n- let mut out: Vec = Vec::new();\n- let mut seen: std::collections::HashSet = std::collections::HashSet::new();\n-\n- for comp in rankings.component_rankings {\n- for r in comp.ranked {\n- seen.insert(r.item.clone());\n- out.push(r.item);\n- }\n- }\n- for it in rankings.unranked_items {\n- seen.insert(it.clone());\n- out.push(it);\n- }\n-\n- // Also surface phantom intermediate nodes: keys of item_children that are\n- // direct children of parent but were never explicitly ingested as items\n- // (so they don't appear in any ranking). Example: ~/languages exists only as\n- // a parent of ~/languages/rust etc., never ranked at the root level.\n- let phantom_parent_prefix = format!(\"{}/\", parent_can.as_str());\n- for key in reduced.public().item_children.keys() {\n- let key_str = key.as_str();\n- if !key_str.starts_with(&phantom_parent_prefix) {\n- continue;\n- }\n- // Must be a direct child: no further '/' after the prefix.\n- let tail = &key_str[phantom_parent_prefix.len()..];\n- if tail.contains('/') {\n- continue;\n- }\n- if seen.contains(key) {\n- continue;\n- }\n- seen.insert(key.clone());\n- out.push(key.clone());\n- }\n-\n- out\n-}\n-\n-fn node_id(path: &str) -> String {\n- // Stable DOM id derived from canonical path.\n- let mut h: u64 = 1469598103934665603; // FNV-1a 64-bit offset basis\n- for b in path.as_bytes() {\n- h ^= *b as u64;\n- h = h.wrapping_mul(1099511628211);\n- }\n- format!(\"node-{:016x}\", h)\n-}\n-\n-fn render_tree_node(\n- reduced: &crate::reducer::ReducerState,\n- path: &CanonicalItemUrl,\n- root: &str,\n- open: &CanonSet,\n- selected: Option<&CanonicalItemUrl>,\n-) -> Markup {\n- let path_str = path.as_str();\n- let id = node_id(path_str);\n- let is_open = open.contains(path);\n- let is_selected = selected == Some(path);\n-\n- let children: Vec = if is_open {\n- ranked_children_public(reduced, path_str)\n- } else {\n- vec![]\n- };\n-\n- let label = path.last_segment().to_string();\n- let has_children = reduced\n- .public()\n- .item_children\n- .get(path_str)\n- .map(|s| !s.is_empty())\n- .unwrap_or(false);\n-\n- let row_cls = if is_selected { \"tree-row selected\" } else { \"tree-row\" };\n- let twist = if has_children {\n- if is_open { \"▾\" } else { \"▸\" }\n- } else {\n- \" \"\n- };\n-\n- let state_blob = encode_state_blob_v2(root, open, selected);\n-\n- html! {\n- // Children are nested inside the li so the bevel border on .tree-children\n- // is the only structural indicator of depth — no explicit padding math.\n- li id=(id) class=(row_cls) {\n- @if has_children {\n- form method=\"post\" action=\"/tree/toggle\" class=\"tree-toggle-form\" {\n- input type=\"hidden\" name=\"root\" value=(root);\n- input type=\"hidden\" name=\"target\" value=(path_str);\n- input type=\"hidden\" name=\"s\" value=(state_blob);\n- button type=\"submit\" class=\"tree-twist\" title=\"toggle\" { (twist) }\n- }\n- } @else {\n- span class=\"tree-twist\" { (twist) }\n- }\n-\n- form method=\"post\" action=\"/tree/select\" class=\"tree-select-form\" {\n- input type=\"hidden\" name=\"root\" value=(root);\n- input type=\"hidden\" name=\"target\" value=(path_str);\n- input type=\"hidden\" name=\"s\" value=(state_blob);\n- button type=\"submit\" class=\"tree-label\" { code { (label) } }\n- }\n-\n- @if is_open && !children.is_empty() {\n- ul class=\"tree-children\" {\n- @for child in &children {\n- (render_tree_node(reduced, child, root, open, selected))\n- }\n- }\n- }\n- }\n- }\n-}\n-\n-fn render_tree_pane(\n- reduced: &crate::reducer::ReducerState,\n- root: &str,\n- open: &CanonSet,\n- selected: Option<&CanonicalItemUrl>,\n-) -> Markup {\n- let roots: Vec = ranked_children_public(reduced, root);\n- html! {\n- div id=\"tree-pane\" {\n- div class=\"muted\" { \"tree: \" code { \"~/\" (root.strip_prefix(\"https://slug.social/~/\").unwrap_or(\"\")) } }\n- ul class=\"tree-list\" {\n- @for r in roots {\n- (render_tree_node(reduced, &r, root, open, selected))\n- }\n- }\n- }\n- }\n-}\n-\n-fn render_detail_pane(\n- reduced: &crate::reducer::ReducerState,\n- selected: Option<&CanonicalItemUrl>,\n-) -> Markup {\n- let Some(sel) = selected else {\n- return html! {\n- div id=\"detail-pane\" {\n- p class=\"muted\" { \"select a node\" }\n- }\n- };\n- };\n- let sel_str = sel.as_str();\n- let body = reduced.public().item_bodies.get(sel).cloned();\n- html! {\n- div id=\"detail-pane\" {\n- h3 { \"selected\" }\n- p { code { (sel_str) } }\n- @if let Some(b) = body {\n- (render_linkified_with_embeds(&b))\n- } @else {\n- p class=\"muted\" { \"no body yet\" }\n- }\n- }\n- }\n-}\n-\n-fn tree_page_js() -> String {\n- // Intercept all tree forms (toggle + select) ourselves so we can eval() the JS\n- // response. We call stopPropagation() to prevent the global layout POST handler\n- // from also firing (it discards the response body and rewrites button text).\n- r#\"\n-(function() {\n- async function treePost(action, formData, btn) {\n- try {\n- if (btn) btn.disabled = true;\n- const r = await fetch(action, {\n- method: 'POST',\n- body: new URLSearchParams(formData),\n- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n- credentials: 'same-origin',\n- });\n- const js = await r.text();\n- eval(js);\n- } finally {\n- if (btn) btn.disabled = false;\n- }\n- }\n-\n- function interceptTreeForms() {\n- document.querySelectorAll('form.tree-toggle-form, form.tree-select-form').forEach((f) => {\n- if (f.__tree_bound) return;\n- f.__tree_bound = true;\n- f.addEventListener('submit', (e) => {\n- e.preventDefault();\n- e.stopPropagation();\n- const btn = f.querySelector('button[type=\"submit\"]');\n- treePost(f.action, new FormData(f), btn);\n- });\n- });\n- }\n-\n- interceptTreeForms();\n- const mo = new MutationObserver(() => interceptTreeForms());\n- mo.observe(document.body, { subtree: true, childList: true });\n-})();\n-\"#\n- .to_string()\n-}\n-\n-pub async fn tree_root(\n- State(state): State,\n- Query(q): Query,\n-) -> impl IntoResponse {\n- tree_render(State(state), Path(\"\".to_string()), Query(q)).await\n-}\n-\n-pub async fn tree_path(\n- State(state): State,\n- Path(path): Path,\n- Query(q): Query,\n-) -> impl IntoResponse {\n- tree_render(State(state), Path(path), Query(q)).await\n-}\n-\n-async fn tree_render(\n- State(state): State,\n- Path(path): Path,\n- Query(q): Query,\n-) -> axum::response::Response {\n- let root = tree_root_from_path(Some(&path));\n- if path.trim().is_empty() {\n- // /tree maps to \"~/\"\n- }\n-\n- let blob = match q.s.as_deref().map(str::trim) {\n- None | Some(\"\") => {\n- let base = format!(\"/tree/{}\", root.trim_start_matches(\"https://slug.social/~/\"))\n- .trim_end_matches('/')\n- .to_string();\n- let loc = format!(\"{base}?s={}\", baseline_state_blob());\n- // Use 302; good enough for browser refresh/share flows here.\n- return Redirect::temporary(&loc).into_response();\n- }\n- Some(s) => s,\n- };\n- let Some(decoded) = decode_state_blob_any(&root, blob) else {\n- return (StatusCode::BAD_REQUEST, \"invalid state blob\").into_response();\n- };\n- let open = decoded.open;\n- let selected = decoded.selected;\n-\n- let reduced = state.reduced.read().await;\n- let tree = render_tree_pane(&reduced, &root, &open, selected.as_ref());\n- let detail = render_detail_pane(&reduced, selected.as_ref());\n-\n- let page = layout(\n- \"tree — slug.social\",\n- \"view-tree\",\n- html! {\n- style { (maud::PreEscaped(r#\"\n- .tree-shell { padding: 14px; padding-right: calc(360px + 18px); }\n- .tree-list, .tree-children { list-style: none; margin: 0; padding: 0; }\n- .tree-children {\n- margin-left: 10px;\n- margin-top: 2px;\n- padding-left: 10px;\n- }\n- .tree-row { display: flex; align-items: baseline; flex-wrap: wrap; gap: 4px; min-height: 22px; padding: 1px 0; }\n- .tree-row.selected > .tree-select-form > .tree-label code { background: rgba(255,255,255,0.07); border-radius: 2px; }\n- .tree-twist {\n- font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n- background: transparent; border: 0; padding: 0 2px; cursor: pointer; color: inherit; flex-shrink: 0;\n- }\n- .tree-label {\n- background: transparent; border: 0; padding: 0; cursor: pointer;\n- color: inherit; text-align: left; font: inherit;\n- }\n- .tree-label code { font-size: 12px; }\n- .tree-toggle-form, .tree-select-form { display: inline; margin: 0; }\n- #detail-pane {\n- position: fixed; top: 0; right: 0; width: 360px; height: 100vh;\n- overflow-y: auto; border-left: 1px solid rgba(128,128,128,0.2);\n- padding: 14px; box-sizing: border-box; z-index: 10;\n- }\n- #detail-pane pre { white-space: pre-wrap; }\n- \"#)) }\n- h2 { \"tree\" }\n- p class=\"muted\" {\n- \"state is fully encoded in \"\n- code { \"?s=...\" }\n- }\n- div class=\"tree-shell\" {\n- (tree)\n- (detail)\n- }\n- script { (maud::PreEscaped(tree_page_js())) }\n- },\n- None,\n- );\n-\n- Html(page.into_string()).into_response()\n-}\n-\n-#[derive(Debug, Deserialize)]\n-pub struct ToggleForm {\n- pub root: String,\n- pub target: String,\n- #[serde(default)]\n- pub s: Option,\n-}\n-\n-/// POST /tree/toggle\n-/// Returns JS that morphs the tree pane and updates the URL.\n-pub async fn tree_toggle(\n- State(state): State,\n- Form(f): Form,\n-) -> impl IntoResponse {\n- let root = canonicalize_item(&f.root);\n- let target = canonicalize_item(&f.target);\n-\n- if root.is_empty() || target.is_empty() {\n- return (StatusCode::BAD_REQUEST, \"missing root/target\").into_response();\n- }\n-\n- let Some(ref blob) = f.s else {\n- return (StatusCode::BAD_REQUEST, \"missing state\").into_response();\n- };\n- let Some(decoded) = decode_state_blob_any(&root, blob) else {\n- return (StatusCode::BAD_REQUEST, \"invalid state\").into_response();\n- };\n- let target_can = match CanonicalItemUrl::parse(&target) {\n- Some(c) => c,\n- None => return (StatusCode::BAD_REQUEST, \"invalid target\").into_response(),\n- };\n- let mut open: CanonSet = decoded.open;\n-\n- if open.contains(&target_can) {\n- open.remove(&target_can);\n- } else {\n- open.insert(target_can.clone());\n- }\n-\n- let selected: Option = decoded\n- .selected\n- .or(Some(target_can));\n-\n- let reduced = state.reduced.read().await;\n- let new_tree_html = render_tree_pane(&reduced, &root, &open, selected.as_ref()).into_string();\n- let new_detail_html = render_detail_pane(&reduced, selected.as_ref()).into_string();\n- drop(reduced);\n-\n- let next_url = href_for(&root, &open, selected.as_ref());\n-\n- // Escape for template literal\n- let esc = |s: String| s.replace('\\\\', \"\\\\\\\\\").replace('`', \"\\\\`\").replace(\"${\", \"\\\\${\");\n- let tree_esc = esc(new_tree_html);\n- let detail_esc = esc(new_detail_html);\n- let url_esc = next_url.replace('\\\\', \"\\\\\\\\\").replace('`', \"\\\\`\").replace(\"'\", \"\\\\'\");\n-\n- let js = format!(\n- \"Idiomorph.morph(document.getElementById('tree-pane'), `{tree_esc}`);\\\n- Idiomorph.morph(document.getElementById('detail-pane'), `{detail_esc}`);\\\n- history.replaceState(null, '', '{url_esc}');\"\n- );\n-\n- Response::builder()\n- .status(StatusCode::OK)\n- .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n- .body(js)\n- .unwrap()\n- .into_response()\n-}\n-\n-#[derive(Debug, Deserialize)]\n-pub struct SelectForm {\n- pub root: String,\n- pub target: String,\n- #[serde(default)]\n- pub s: Option,\n-}\n-\n-/// POST /tree/select\n-/// Changes `selected` to `target` without altering the open set.\n-/// Returns JS that morphs both panes and updates the browser URL.\n-pub async fn tree_select(\n- State(state): State,\n- Form(f): Form,\n-) -> impl IntoResponse {\n- let root = canonicalize_item(&f.root);\n- let target = canonicalize_item(&f.target);\n-\n- if root.is_empty() || target.is_empty() {\n- return (StatusCode::BAD_REQUEST, \"missing root/target\").into_response();\n- }\n- let target_can = match CanonicalItemUrl::parse(&target) {\n- Some(c) => c,\n- None => return (StatusCode::BAD_REQUEST, \"invalid target\").into_response(),\n- };\n-\n- // Preserve the existing open set; only selection changes.\n- let open: CanonSet = f\n- .s\n- .as_deref()\n- .and_then(|blob| decode_state_blob_any(&root, blob))\n- .map(|d| d.open)\n- .unwrap_or_default();\n-\n- let selected = Some(target_can);\n-\n- let reduced = state.reduced.read().await;\n- let new_tree_html = render_tree_pane(&reduced, &root, &open, selected.as_ref()).into_string();\n- let new_detail_html = render_detail_pane(&reduced, selected.as_ref()).into_string();\n- drop(reduced);\n-\n- let next_url = href_for(&root, &open, selected.as_ref());\n-\n- let esc = |s: String| s.replace('\\\\', \"\\\\\\\\\").replace('`', \"\\\\`\").replace(\"${\", \"\\\\${\");\n- let tree_esc = esc(new_tree_html);\n- let detail_esc = esc(new_detail_html);\n- let url_esc = next_url.replace('\\\\', \"\\\\\\\\\").replace('`', \"\\\\`\").replace(\"'\", \"\\\\'\");\n-\n- let js = format!(\n- \"Idiomorph.morph(document.getElementById('tree-pane'), `{tree_esc}`);\\\n- Idiomorph.morph(document.getElementById('detail-pane'), `{detail_esc}`);\\\n- history.replaceState(null, '', '{url_esc}');\"\n- );\n-\n- Response::builder()\n- .status(StatusCode::OK)\n- .header(header::CONTENT_TYPE, \"text/javascript; charset=utf-8\")\n- .body(js)\n- .unwrap()\n- .into_response()\n-}\n-\n-#[cfg(test)]\n-mod tests {\n- use super::*;\n-\n- use crate::canonical_path::canonicalize_item;\n- use crate::events::{Event, Ingest};\n- use crate::reducer::ReducerState;\n-\n- fn ingest(raw: &str) -> Event {\n- Event::Ingest(Ingest {\n- ts: 1,\n- id: \"test-ingest\".to_string(),\n- raw: raw.to_string(),\n- principal: \"tester\".to_string(),\n- delegate: None,\n- room_id: \"public\".to_string(),\n- thread_tag: String::new(),\n- })\n- }\n-\n- fn reduced_with_items(raw: &str) -> ReducerState {\n- let mut r = ReducerState::default();\n- r.apply_event(ingest(raw));\n- r\n- }\n-\n- #[test]\n- fn common_base_boundary_snaps_to_slash_boundary() {\n- let paths = vec![\n- \"alphabet/a\".to_string(),\n- \"alphabet/b\".to_string(),\n- \"alphabet/c/d\".to_string(),\n- ];\n- assert_eq!(common_base_boundary(&paths), \"alphabet/\".to_string());\n- }\n-\n- #[test]\n- fn tree_root_from_path_canonicalizes_ontology_root() {\n- assert_eq!(tree_root_from_path(None), \"https://slug.social/~/\".to_string());\n- assert_eq!(\n- tree_root_from_path(Some(\"alphabet\")),\n- \"https://slug.social/~/alphabet\".to_string()\n- );\n- assert_eq!(\n- tree_root_from_path(Some(\"/alphabet/\")),\n- \"https://slug.social/~/alphabet\".to_string()\n- );\n- }\n-\n- #[test]\n- fn canon_relative_roundtrip_under_root() {\n- let root = CanonicalItemUrl::parse(\"https://slug.social/~/alphabet\").unwrap();\n- let item = \"https://slug.social/~/alphabet/a/b\";\n- let rel = canon_to_relative(&root, item).unwrap();\n- assert_eq!(rel.0, \"a/b\".to_string());\n- let back = relative_to_canon(&root, &rel).unwrap();\n- assert_eq!(back.as_str(), item);\n- }\n-\n- #[test]\n- fn encode_decode_state_blob_v2_roundtrips() {\n- let root = \"https://slug.social/~/alphabet\";\n- let mut open: CanonSet = BTreeSet::new();\n- open.insert(CanonicalItemUrl::parse(\"https://slug.social/~/alphabet/a\").unwrap());\n- open.insert(CanonicalItemUrl::parse(\"https://slug.social/~/alphabet/b\").unwrap());\n- let selected = CanonicalItemUrl::parse(\"https://slug.social/~/alphabet/b\").unwrap();\n-\n- let s = encode_state_blob_v2(root, &open, Some(&selected));\n- let decoded = decode_state_blob_any(root, &s).expect(\"decode\");\n- assert_eq!(decoded.open, open);\n- assert_eq!(decoded.selected.as_ref().map(|c| c.as_str()), Some(selected.as_str()));\n- }\n-\n- #[test]\n- fn baseline_state_blob_decodes() {\n- let root = \"https://slug.social/~/\";\n- let s = baseline_state_blob();\n- let decoded = decode_state_blob_any(root, &s).expect(\"decode baseline\");\n- assert!(decoded.open.is_empty());\n- assert!(decoded.selected.is_none());\n- }\n-\n- #[test]\n- fn node_id_is_stable_for_same_path() {\n- let p = \"https://slug.social/~/alphabet/a\";\n- assert_eq!(node_id(p), node_id(p));\n- assert_ne!(node_id(p), node_id(\"https://slug.social/~/alphabet/b\"));\n- }\n-\n- #[test]\n- fn reducer_parent_key_for_tilde_items_is_without_trailing_slash() {\n- // This is the reducer invariant that the tree view must match.\n- let item = canonicalize_item(\"~/alphabet/a\");\n- assert_eq!(crate::canonical_path::item_parent_path(&item).unwrap(), \"https://slug.social/~/alphabet\");\n- let item2 = canonicalize_item(\"~/a\");\n- assert_eq!(crate::canonical_path::item_parent_path(&item2).unwrap(), \"https://slug.social/~\");\n- }\n-\n- #[test]\n- fn ranked_children_public_root_lists_children_under_tree_root() {\n- // Regression test: /tree root uses \"https://slug.social/~/\", but reducer stores\n- // top-level ontology children under parent \"https://slug.social/~\".\n- let reduced = reduced_with_items(\n- r#\"\n-#t\n-~/a\n-~/b\n-\"#,\n- );\n-\n- let root = \"https://slug.social/~/\";\n- let kids = ranked_children_public(&reduced, root);\n- let kids_s: BTreeSet = kids.into_iter().map(|c| c.as_str().to_string()).collect();\n-\n- assert!(kids_s.contains(\"https://slug.social/~/a\"));\n- assert!(kids_s.contains(\"https://slug.social/~/b\"));\n- }\n-}\n-\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}