{"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[cdeb4072] tree nixed\n\nSide A — 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\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[d1912140] viewcount in votepage\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex 86b4c184724910bb464682b9025d19ce6cd2050d..82c1b4b4f36ea13a906035a1789ba893222b3695 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -1397,10 +1397,14 @@ async fn vote_compare_inner(\n }\n };\n \n+ let url_key = canonical_view_url(&uri);\n+ let view_count = state.views.get_views(&url_key);\n+\n let page = layout_full_bleed_chromeless(\n &title,\n \"view-ontology view-ontology-light view-vote-compare view-vote-compare-fullscreen\",\n body,\n+ Some(view_count),\n theme_from_jar(&jar),\n &theme_next_from_uri(&uri),\n );\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex f1b0f31b0c516c2e71ca7938d1ec2764e3b077eb..fbc3fc4ed7c53cc68125fb50f5c4db9122f9a261 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -310,6 +310,7 @@ pub(super) fn layout_full_bleed_chromeless(\n title: &str,\n view: &str,\n body: Markup,\n+ views: Option,\n theme: &str,\n theme_next: &str,\n ) -> Markup {\n@@ -317,7 +318,7 @@ pub(super) fn layout_full_bleed_chromeless(\n title,\n view,\n body,\n- None,\n+ views,\n theme,\n theme_next,\n None,\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex e96d11c820c3bbaa8bb55ad11636397ef225e55a..62c84862d5c2cba212f9ceabd6273203a43e804c 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -1421,12 +1421,24 @@ async fn test_view_counts_increment_and_display() {\n .await\n .unwrap();\n assert!(v1.status().is_success(), \"vote compare GET 1: {}\", v1.status());\n+ let v1_body = v1.text().await.unwrap();\n+ assert!(\n+ v1_body.contains(\"1 views\"),\n+ \"vote compare page should show view count, snippet: {}\",\n+ v1_body.chars().take(600).collect::()\n+ );\n let v2 = client\n .get(format!(\"http://{addr}{vote_q_left_first}\"))\n .send()\n .await\n .unwrap();\n assert!(v2.status().is_success(), \"vote compare GET 2: {}\", v2.status());\n+ let v2_body = v2.text().await.unwrap();\n+ assert!(\n+ v2_body.contains(\"2 views\"),\n+ \"vote compare page should reflect incremented count, snippet: {}\",\n+ v2_body.chars().take(600).collect::()\n+ );\n \n assert_eq!(\n state.views.get_views(&vote_key),\n","role":"user"}],"model":"openai/gpt-chat-latest"}