You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [c99adc26] refactor forum into files Side A — unified diff (full patch): diff --git a/bb.edn b/bb.edn index 4680e82d4227057d2eea6041dc5647beb759131d..ce0f6fcd45a67ead3295b90db2a301e9b304f3da 100644 --- a/bb.edn +++ b/bb.edn @@ -51,6 +51,11 @@ :requires ([test.walkthrough-fixture :as walkthrough-fixture]) :task (walkthrough-fixture/run-fixture)} + sample-fixture + {:doc "macOS: run `sample` on process(es) listening on the fixture TCP port (default 8080). Usage: bb sample-fixture [PORT] [DURATION_SEC] [OUT_DIR]" + :requires ([scripts.sample-fixture :as sample-fixture]) + :task (apply sample-fixture/-main *command-line-args*)} + perf {:doc "Performance test: concurrent HTTP requests to detect blocking I/O" :requires ([scripts.perf :as perf]) diff --git a/scripts/sample_fixture.bb b/scripts/sample_fixture.bb new file mode 100644 index 0000000000000000000000000000000000000000..ac2368623c5043ba6e027afef6b5b37d392767b0 --- /dev/null +++ b/scripts/sample_fixture.bb @@ -0,0 +1,70 @@ +(ns scripts.sample-fixture + "Find process(es) listening on the fixture port (default 8080) and run macOS `sample`." + (:require [babashka.fs :as fs] + [babashka.process :as p] + [clojure.string :as str])) + +(defn- usage [] + (println "Usage: bb sample-fixture [PORT] [DURATION_SEC] [OUT_DIR]") + (println "") + (println " Finds PIDs bound to TCP LISTEN on PORT (default 8080), then runs") + (println " `sample` for each PID. OUT_DIR defaults to the current directory.") + (println "") + (println " Example: bb sample-fixture") + (println " bb sample-fixture 8080 10") + (println " bb sample-fixture 8080 5 /tmp") + (println "") + (println " Requires macOS (the `sample` tool).")) + +(defn- parse-long* [s] + (try (Long/parseLong s) + (catch NumberFormatException _ nil))) + +(defn- listen-pids [port] + (let [spec (str "TCP:" port) + {:keys [out exit]} + @(p/process ["lsof" "-nP" (str "-i" spec) "-sTCP:LISTEN" "-t"] + {:out :string :err :string})] + (when (zero? exit) + (->> (str/split-lines out) + (map str/trim) + (remove str/blank?) + (distinct) + vec)))) + +(defn- sample-bin [] + (or (fs/which "sample") + (throw (ex-info "macOS `sample` not found on PATH" {})))) + +(defn- run-sample! [sample duration-sec pid out-file] + (println (str "sampling PID " pid " for " duration-sec "s → " out-file)) + (let [{:keys [exit err]} @(p/process [sample (str pid) (str duration-sec) "-file" out-file] + {:out :inherit :err :inherit})] + (when-not (zero? exit) + (binding [*out* *err*] + (println "sample failed:" err)) + (System/exit exit)))) + +(defn -main [& args] + (when (some #{"-h" "--help" "help"} args) + (usage) + (System/exit 0)) + (let [port (or (some-> (first args) parse-long*) 8080) + duration-sec (or (some-> (second args) parse-long*) 5) + out-dir (or (nth args 2 nil) ".") + pids (listen-pids port)] + (when (or (nil? pids) (empty? pids)) + (binding [*out* *err*] + (println (str "No process listening on TCP " port " (LISTEN). Is `bb fixture` running?"))) + (System/exit 1)) + (when-not (fs/exists? out-dir) + (binding [*out* *err*] + (println "Output directory does not exist:" out-dir)) + (System/exit 1)) + (let [sample (sample-bin) + ts (str (System/currentTimeMillis))] + (println (str "port " port " → PIDs " (str/join ", " pids))) + (doseq [pid pids] + (let [out-file (str (fs/path out-dir) "/slug-sample-" port "-" pid "-" ts ".txt")] + (run-sample! sample duration-sec pid (str out-file)))) + (println "done.")))) diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs index a55fc1f79d03719eb74b216865b2c15199c48ea7..5ad8dfc84dd735d589432e2c613ff687a75f2e61 100644 --- a/server/src/html/forum.rs +++ b/server/src/html/forum.rs @@ -380,22 +380,6 @@ fn room_members_inner(members: &[RoomMemberRow]) -> Markup { } } -pub(crate) fn set_room_members_expanded_rpc(room_wire: &str, expanded: bool) -> String { - template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { - room_wire: room_wire.to_string(), - expanded, - }) - .expect("static json") -} - -pub(crate) fn set_room_new_thread_compose_expanded_rpc(nav: &ThreadNav, expanded: bool) -> String { - template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { - room_wire: nav.room_wire.clone(), - expanded, - }) - .expect("static json") -} - /// Fragment for `#room-members-section` — expand/collapse is server-driven via `POST /ui`. pub(crate) fn room_members_section_markup( reduced: &ReducerState, @@ -406,13 +390,14 @@ pub(crate) fn room_members_section_markup( if members.is_empty() { return html! {}; } - let rpc_open = set_room_members_expanded_rpc(room_id, true); - let rpc_close = set_room_members_expanded_rpc(room_id, false); html! { div id="room-members-section" { @if members_expanded { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_close); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { + room_wire: room_id.to_string(), + expanded: false, + }).expect("static json")); button type="submit" class="form-toggle" aria-expanded="true" { "hide members & permissions" } @@ -422,7 +407,10 @@ pub(crate) fn room_members_section_markup( } } @else { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_open); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { + room_wire: room_id.to_string(), + expanded: true, + }).expect("static json")); button type="submit" class="form-toggle" aria-expanded="false" { "members & permissions" } @@ -514,28 +502,24 @@ fn compose_form(nav: &ThreadNav, thread_tag: &str, show: bool) -> Markup { if !show { return html! {}; } - let rpc_post = template_json_compact(&json!({ - "action": "post_ingest", - "room": nav.room_wire, - "thread_tag": thread_tag, - "text": {"$form": "text"}, - "error_target": "thread-compose-errors", - "form_id": "thread-compose-form", - })) - .unwrap(); - let rpc_check = template_json_compact(&json!({ - "action": "check_ingest", - "room": nav.room_wire, - "thread_tag": thread_tag, - "text": {"$form": "text"}, - "error_target": "thread-compose-errors", - "form_id": "thread-compose-form", - })) - .unwrap(); html! { section class="compose" id="thread-compose" { - form id="thread-compose-form" method="POST" action="/ui" data-check-action="/ui" data-check-rpc=(rpc_check) { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_post); + form id="thread-compose-form" method="POST" action="/ui" data-check-action="/ui" data-check-rpc=(template_json_compact(&json!({ + "action": "check_ingest", + "room": nav.room_wire, + "thread_tag": thread_tag, + "text": {"$form": "text"}, + "error_target": "thread-compose-errors", + "form_id": "thread-compose-form", + })).unwrap()) { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({ + "action": "post_ingest", + "room": nav.room_wire, + "thread_tag": thread_tag, + "text": {"$form": "text"}, + "error_target": "thread-compose-errors", + "form_id": "thread-compose-form", + })).unwrap()); textarea name="text" rows="5" cols="80" placeholder="prose or ~/items and votes…" {} p { button type="submit" { "post" } @@ -712,7 +696,7 @@ pub async fn home( p class="muted" { "dark = time-ordered · light = vote-ranked" } div class="thread-feed-toolbar" { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(expand_public_new_thread_rpc_value()); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect("static json")); button type="submit" class="section-add-btn" { "+" } } } @@ -1002,14 +986,15 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) if !show { return html! {}; } - let rpc_open = set_room_new_thread_compose_expanded_rpc(nav, true); - let rpc_close = set_room_new_thread_compose_expanded_rpc(nav, false); // Single root for Idiomorph when morphing `#room-new-thread-ui-slot` (expanded has form + section). html! { div class="room-new-thread-slot-inner" { @if compose_expanded { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_close); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { + room_wire: nav.room_wire.clone(), + expanded: false, + }).expect("static json")); button type="submit" class="form-toggle" aria-expanded="true" { "-" } @@ -1039,7 +1024,10 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) } } @else { form method="POST" action="/ui" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc_open); + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { + room_wire: nav.room_wire.clone(), + expanded: true, + }).expect("static json")); button type="submit" class="form-toggle" aria-expanded="false" { "+" } @@ -1049,10 +1037,6 @@ fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) } } -pub(crate) fn expand_public_new_thread_rpc_value() -> String { - template_json_compact(&HtmlUiAction::ExpandPublicNewThreadForm).expect("static json") -} - pub(crate) fn login_to_post_hint_markup() -> Markup { html! { p class="muted" { "log in to post" } diff --git a/server/src/html/forum/access.rs b/server/src/html/forum/access.rs new file mode 100644 index 0000000000000000000000000000000000000000..f9f7139b63442a6ef3a927b77a72805f15feec3f --- /dev/null +++ b/server/src/html/forum/access.rs @@ -0,0 +1,16 @@ +use crate::events::ThreadCapability; +use crate::reducer::ReducerState; + +pub(crate) fn user_can_view_room(reduced: &ReducerState, room_id: &str, username: Option<&str>) -> bool { + if !reduced.rooms.contains(room_id) { + return false; + } + let Some(u) = username else { + return false; + }; + reduced.user_has_cap(room_id, u, ThreadCapability::View) +} + +pub(crate) fn user_can_post_room(reduced: &ReducerState, room_id: &str, username: &str) -> bool { + reduced.user_has_cap(room_id, username, ThreadCapability::Post) +} diff --git a/server/src/html/forum/ingest.rs b/server/src/html/forum/ingest.rs new file mode 100644 index 0000000000000000000000000000000000000000..c045046a005db4f8f4d1dc7ea74aaaba45e0f3f4 --- /dev/null +++ b/server/src/html/forum/ingest.rs @@ -0,0 +1,171 @@ +use crate::canonical_path::canonicalize_tag; +use crate::form_template::template_json_compact; +use crate::reducer::{scope_from_room_wire, ReducerState}; +use maud::{html, Markup}; +use serde_json::json; + +use crate::html::js_string_literal; +use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD}; +use crate::html::{profile_href, render_linkified_with_embeds_in_scope, timeago}; + +use super::nav::ThreadNav; + +/// `POST /ui` + `__rpc__` from an inline link (`onclick`); same-origin credentials as other morph actions. +pub(super) fn thread_ui_fetch_onclick(rpc_compact_json: &str) -> String { + format!( + "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", + js_string_literal(rpc_compact_json) + ) +} + +pub(super) fn thread_nav_for_ingest(ing: &crate::events::Ingest) -> Option { + let room = ing.room_id.trim(); + if room.is_empty() || room == "public" { + Some(ThreadNav::public()) + } else { + ThreadNav::from_room_id(room) + } +} + +pub(super) fn thread_post_index_in_scope(reduced: &ReducerState, ing: &crate::events::Ingest) -> Option { + let scope = scope_from_room_wire(&ing.room_id); + let tag = canonicalize_tag(&ing.thread_tag); + reduced + .ingests_by_scope_thread + .get(&(scope, tag)) + .and_then(|q| q.iter().rev().position(|id| id == &ing.id)) +} + +fn post_header_meta( + nav: &ThreadNav, + tag: &str, + post_idx: usize, + principal: &str, + ts: i64, + now: i64, +) -> Markup { + let post_href = nav.post_url(tag, post_idx); + let profile = profile_href(principal); + let hover = timeago::rfc3339_utc(ts); + let ago = timeago::timeago(now, ts); + html! { + div class="ingest-meta muted" title=(hover) { + a href=(post_href) class="post-num" { "#" (post_idx) } + " " + a href=(profile) class="post-author" { "@" (principal) } + " · " + (ago) + } + } +} + +pub(super) fn post_header_row( + nav: &ThreadNav, + tag: &str, + post_idx: usize, + ing: &crate::events::Ingest, + _viewer: Option<&str>, + now: i64, + show_delete: bool, +) -> Markup { + let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now); + html! { + div class="ingest-header-row" { + (meta) + @if show_delete { + form class="post-delete-form" method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::RedactPost { post_id: ing.id.clone() }).unwrap()); + button type="submit" class="post-delete-btn" { "delete" } + } + } + } + } +} + +pub(super) fn redacted_header_row( + nav: &ThreadNav, + tag: &str, + post_idx: usize, + ing: &crate::events::Ingest, + now: i64, + expanded: bool, +) -> Markup { + let meta = post_header_meta(nav, tag, post_idx, &ing.principal, ing.ts, now); + let rpc_expand = template_json_compact(&json!({ + "action": "expand_redacted_post", + "room": nav.room_wire, + "thread_tag": tag, + "post_index": post_idx, + })) + .unwrap(); + let rpc_collapse = template_json_compact(&json!({ + "action": "collapse_redacted_post", + "room": nav.room_wire, + "thread_tag": tag, + "post_index": post_idx, + })) + .unwrap(); + let onclick_expand = thread_ui_fetch_onclick(&rpc_expand); + let onclick_collapse = thread_ui_fetch_onclick(&rpc_collapse); + html! { + div class="ingest-header-row ingest-tombstone-row" { + (meta) + span class="post-tombstone-inline muted" { + "deleted · " + @if expanded { + a href="#" class="hide-deleted-link" + onclick=(onclick_collapse) { + "[hide deleted content]" + } + } @else { + a href="#" class="show-deleted-link" + onclick=(onclick_expand) { + "[show deleted content]" + } + } + } + } + } +} + +pub(super) fn ingest_entry_markup( + nav: &ThreadNav, + tag: &str, + post_idx: usize, + ing: &crate::events::Ingest, + viewer: Option<&str>, + now: i64, + reduced: &ReducerState, +) -> Markup { + let redacted = reduced.redacted_posts.contains(&ing.id); + let show_delete = viewer == Some(ing.principal.as_str()) && !redacted; + if redacted { + html! { + div class="ingest-entry ingest-redacted" data-ingest-id=(ing.id) { + (redacted_header_row(nav, tag, post_idx, ing, now, false)) + } + } + } else { + let truncated = ing.raw.len() > 2000; + let display_body = if truncated { &ing.raw[..2000] } else { &ing.raw[..] }; + html! { + div class="ingest-entry" data-ingest-id=(ing.id) { + (post_header_row(nav, tag, post_idx, ing, viewer, now, show_delete)) + (render_linkified_with_embeds_in_scope(display_body, nav.garden_root_url())) + @if truncated { + @let rpc_full = template_json_compact(&json!({ + "action": "expand_post_full", + "room": nav.room_wire, + "thread_tag": tag, + "post_index": post_idx, + })).unwrap(); + @let onclick_full = thread_ui_fetch_onclick(&rpc_full); + a href="#" class="show-full-link" + onclick=(onclick_full) { + "[show full post]" + } + } + } + } + } +} diff --git a/server/src/html/forum/nav.rs b/server/src/html/forum/nav.rs new file mode 100644 index 0000000000000000000000000000000000000000..f5d437f2b1c6a0b727f1540d83774ba4e440f0b1 --- /dev/null +++ b/server/src/html/forum/nav.rs @@ -0,0 +1,78 @@ +use crate::canonical_path::canonicalize_item; +use crate::reducer::ScopeId; + +/// URL helpers for public `/t/…` and private room threads `/r/{short}/{slug}/t/…`. +#[derive(Clone)] +pub struct ThreadNav { + pub room_wire: String, + scope: ScopeId, + room_path: String, + thread_path_prefix: String, + garden_path_prefix: String, +} + +impl ThreadNav { + pub(crate) fn public() -> Self { + Self { + room_wire: "public".into(), + scope: ScopeId::Public, + room_path: "/t".into(), + thread_path_prefix: "/t".into(), + garden_path_prefix: "/~".into(), + } + } + + /// `room_id` wire form `shortid/slug`. + pub(crate) fn from_room_id(room_id: &str) -> Option { + let (short, slug) = room_id.split_once('/')?; + if short.is_empty() || slug.is_empty() { + return None; + } + Some(Self { + room_wire: room_id.to_string(), + scope: ScopeId::Room(room_id.to_string()), + room_path: format!("/r/{short}/{slug}"), + thread_path_prefix: format!("/r/{short}/{slug}/t"), + garden_path_prefix: format!("/r/{short}/{slug}/~"), + }) + } + + pub(crate) fn scope(&self) -> ScopeId { + self.scope.clone() + } + + pub(crate) fn room_url(&self) -> &str { + &self.room_path + } + + pub(crate) fn thread_url(&self, tag: &str) -> String { + format!("{}/{}", self.thread_path_prefix, tag) + } + + pub(crate) fn garden_root_url(&self) -> &str { + &self.garden_path_prefix + } + + pub(crate) fn garden_item_url(&self, item: &str) -> String { + if let Some(tail) = crate::path_types::CanonicalItemUrl::parse(item) + .and_then(|c| c.tilde_tail().map(str::to_owned)) + { + format!("{}/{}", self.garden_path_prefix, tail) + } else { + format!("{}/{}", self.garden_path_prefix, canonicalize_item(item)) + } + } + + pub(crate) fn thread_page_url(&self, tag: &str, offset: usize) -> String { + let base = self.thread_url(tag); + if offset == 0 { + base + } else { + format!("{base}?offset={offset}") + } + } + + pub(crate) fn post_url(&self, tag: &str, idx: usize) -> String { + format!("{}/{}/{}", self.thread_path_prefix, tag, idx) + } +} diff --git a/server/src/html/forum/new_thread.rs b/server/src/html/forum/new_thread.rs new file mode 100644 index 0000000000000000000000000000000000000000..b2d24b8ab3ec7eee0edd16bed8ee6605e49bf408 --- /dev/null +++ b/server/src/html/forum/new_thread.rs @@ -0,0 +1,157 @@ +use crate::form_template::template_json_compact; +use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD}; +use maud::{html, Markup}; +use serde_json::json; + +use super::nav::ThreadNav; + +struct NewThreadIds { + compose_section_id: &'static str, + errors_id: &'static str, + form_id: &'static str, + tag_input_id: &'static str, + text_input_id: Option<&'static str>, +} + +const PUBLIC_IDS: NewThreadIds = NewThreadIds { + compose_section_id: "public-new-thread-compose", + errors_id: "public-new-thread-errors", + form_id: "public-new-thread-form", + tag_input_id: "new-thread-tag", + text_input_id: Some("new-thread-text"), +}; + +const ROOM_IDS: NewThreadIds = NewThreadIds { + compose_section_id: "room-new-thread-compose", + errors_id: "room-new-thread-errors", + form_id: "room-new-thread-form", + tag_input_id: "room-new-tag", + text_input_id: None, +}; + +#[derive(Clone, Copy)] +enum NewThreadComposeKind { + /// Home page: no client-side check RPC; post template omits `error_target` / `form_id`. + Public, + /// Room page: `check_ingest` + error targets on post (matches thread compose). + Room, +} + +/// Shared `
` for creating a thread + first post. +fn new_thread_compose_section(room_wire: &str, ids: &NewThreadIds, kind: NewThreadComposeKind) -> Markup { + let client_check = matches!(kind, NewThreadComposeKind::Room); + let (tag_placeholder, text_placeholder, submit_label) = match kind { + NewThreadComposeKind::Public => ( + "thread-title-slug-here", + "Hello threadgoers!! Behold my new thread!", + "create thread / make first post", + ), + NewThreadComposeKind::Room => ( + "thread-topic-slug-here", + "First post body…", + "post", + ), + }; + + html! { + section class="compose" id=(ids.compose_section_id) { + div id=(ids.errors_id) {} + @if client_check { + form id=(ids.form_id) method="POST" action="/ui" data-check-action="/ui" data-check-rpc=(template_json_compact(&json!({ + "action": "check_ingest", + "room": room_wire, + "thread_tag": {"$form": "thread_tag"}, + "text": {"$form": "text"}, + "error_target": ids.errors_id, + "form_id": ids.form_id, + })).unwrap()) { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({ + "action": "post_ingest", + "room": room_wire, + "thread_tag": {"$form": "thread_tag"}, + "text": {"$form": "text"}, + "error_target": ids.errors_id, + "form_id": ids.form_id, + })).unwrap()); + input type="text" id=(ids.tag_input_id) name="thread_tag" pattern="[a-z0-9_\\-]{1,64}" required placeholder=(tag_placeholder); + @if let Some(tid) = ids.text_input_id { + textarea id=(tid) name="text" rows="4" placeholder=(text_placeholder) required {} + } @else { + textarea name="text" rows="4" placeholder=(text_placeholder) required {} + } + p { button type="submit" { (submit_label) } } + } + } @else { + form id=(ids.form_id) method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&json!({ + "action": "post_ingest", + "room": room_wire, + "thread_tag": {"$form": "thread_tag"}, + "text": {"$form": "text"}, + })).unwrap()); + input type="text" id=(ids.tag_input_id) name="thread_tag" pattern="[a-z0-9_\\-]{1,64}" placeholder=(tag_placeholder); + @if let Some(tid) = ids.text_input_id { + textarea id=(tid) name="text" rows="4" placeholder=(text_placeholder) {} + } @else { + textarea name="text" rows="4" placeholder=(text_placeholder) {} + } + p { button type="submit" { (submit_label) } } + } + } + } + } +} + +fn new_thread_form_public(show: bool) -> Markup { + if !show { + return html! {}; + } + new_thread_compose_section("public", &PUBLIC_IDS, NewThreadComposeKind::Public) +} + +fn new_thread_form_for_room(nav: &ThreadNav, show: bool, compose_expanded: bool) -> Markup { + if !show { + return html! {}; + } + // Single root for Idiomorph when morphing `#room-new-thread-ui-slot` (expanded has form + section). + html! { + div class="room-new-thread-slot-inner" { + @if compose_expanded { + form method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { + room_wire: nav.room_wire.clone(), + expanded: false, + }).expect("static json")); + button type="submit" class="form-toggle" aria-expanded="true" { + "-" + } + } + (new_thread_compose_section(&nav.room_wire, &ROOM_IDS, NewThreadComposeKind::Room)) + } @else { + form method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomNewThreadComposeExpanded { + room_wire: nav.room_wire.clone(), + expanded: true, + }).expect("static json")); + button type="submit" class="form-toggle" aria-expanded="false" { + "+" + } + } + } + } + } +} + +pub(crate) fn login_to_post_hint_markup() -> Markup { + html! { + p class="muted" { "log in to post" } + } +} + +pub(crate) fn fragment_public_new_thread_form(show: bool) -> Markup { + new_thread_form_public(show) +} + +pub(crate) fn fragment_room_new_thread_form(nav: &ThreadNav, show: bool, compose_expanded: bool) -> Markup { + new_thread_form_for_room(nav, show, compose_expanded) +} diff --git a/server/src/html/forum/room_members.rs b/server/src/html/forum/room_members.rs new file mode 100644 index 0000000000000000000000000000000000000000..bc13d3eb8030f00799c90c47e689a876168f522c --- /dev/null +++ b/server/src/html/forum/room_members.rs @@ -0,0 +1,108 @@ +use crate::events::ThreadCapability; +use crate::form_template::template_json_compact; +use crate::reducer::ReducerState; +use maud::{html, Markup}; + +use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD}; + +#[derive(Clone)] +pub(super) struct RoomMemberRow { + pub(super) username: String, + pub(super) capabilities: Vec<&'static str>, +} + +fn capability_label(cap: ThreadCapability) -> &'static str { + match cap { + ThreadCapability::View => "view", + ThreadCapability::Post => "post", + ThreadCapability::Vote => "vote", + ThreadCapability::AddItem => "add_item", + ThreadCapability::Manage => "manage", + } +} + +fn room_members_for_room(reduced: &ReducerState, room_id: &str) -> Vec { + let mut rows: Vec = reduced + .grants + .get(room_id) + .into_iter() + .flat_map(|members| members.iter()) + .map(|(username, caps)| { + let mut ordered = Vec::new(); + for cap in [ + ThreadCapability::View, + ThreadCapability::Post, + ThreadCapability::Vote, + ThreadCapability::AddItem, + ThreadCapability::Manage, + ] { + if caps.contains(&cap) { + ordered.push(capability_label(cap)); + } + } + RoomMemberRow { + username: username.clone(), + capabilities: ordered, + } + }) + .collect(); + rows.sort_by(|a, b| a.username.cmp(&b.username)); + rows +} + +fn room_members_inner(members: &[RoomMemberRow]) -> Markup { + html! { + h3 { "members" } + ul class="room-members" { + @for member in members { + li { + span class="room-member-name" { "@" (member.username) } + span class="muted" { + " · " + (member.capabilities.join(", ")) + } + } + } + } + } +} + +/// Fragment for `#room-members-section` — expand/collapse is server-driven via `POST /ui`. +pub(crate) fn room_members_section_markup( + reduced: &ReducerState, + room_id: &str, + members_expanded: bool, +) -> Markup { + let members = room_members_for_room(reduced, room_id); + if members.is_empty() { + return html! {}; + } + html! { + div id="room-members-section" { + @if members_expanded { + form method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { + room_wire: room_id.to_string(), + expanded: false, + }).expect("static json")); + button type="submit" class="form-toggle" aria-expanded="true" { + "hide members & permissions" + } + } + section class="room-members-panel" { + (room_members_inner(&members)) + } + } @else { + form method="POST" action="/ui" { + input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::SetRoomMembersExpanded { + room_wire: room_id.to_string(), + expanded: true, + }).expect("static json")); + button type="submit" class="form-toggle" aria-expanded="false" { + "members & permissions" + } + } + } + } + } +} Side B — contributor: tommy-mor Side B — commit message: [7c2f9eef] docs: align DSL guide and plan with wire identity (no @ in API) - DSL.txt: # / ~/ / URLs only; identity via bearer + --delegate; @ lines are prose. - GUIDE.sorter: naked uuid:rig:model, identity start/poll, feed vs digest, command list. - plan.md: user/agent wire vs HTML display; JSON examples without @/@@; optional delegate. Made-with: Cursor Side B — unified diff (full patch): diff --git a/cli/DSL.txt b/cli/DSL.txt index 15eeb48601e2668dc4926f19685e23eb1e70ee19..bf355a8fb13100f0f949033cecde3f4a94ada7bc 100644 --- a/cli/DSL.txt +++ b/cli/DSL.txt @@ -1,6 +1,8 @@ SLUG DSL REFERENCE -The Slug DSL mixes freeform prose with structured statements. Statements start with specific characters (`#`, `@`, `~`, `h`). Everything else is Prose. +The Slug DSL mixes freeform prose with structured statements. Statements start with specific characters (`#`, `~`, or `http`/`https`). Everything else is prose. + +Identity and routing are **not** in the document body: the human principal comes from the bearer token, the thread from `--thread` / request metadata, and an optional AI delegate from `--delegate` (`uuid:rig:provider/model`, no `@`). The web UI uses the same split (session + form fields). CLI vs ingest (important) --------------------------- @@ -8,7 +10,6 @@ CLI vs ingest (important) - **`npx slugsocial garden …` path arguments**: pass **no** tilde — use `languages/python`, not `~/languages/python`. In the shell, `~` expands to your home directory (`$HOME`), which breaks paths. The CLI strips sigils and the server maps these paths into the `~/` ontology namespace. ```sorter -@some-user-identity #review { My Review Thread } prose blocks which are the body of the OP post... @@ -24,11 +25,6 @@ https://example.com/lang = ~/go { They are equally good in this context. } SYNTAX RULES -```sorter -@ -``` -Declares the author. Must be ASCII, no whitespace. - ```sorter # # { subtitle } @@ -59,6 +55,8 @@ Comparisons: - `=` (Equal, 1:1) - `X:Y` (Custom ratio, e.g. `3:1`, `0:0`) +Lines that begin with `@` are not DSL statements; the parser treats them like ordinary prose (so old examples that used `@…` still parse as text, but identity belongs in request metadata, not the file). + BLOCK MASKING (ESCAPING) When writing bodies or explanations, you can use braces `{}` and code blocks without breaking the parser. The parser protects blocks in this hierarchy: @@ -72,4 +70,4 @@ When writing bodies or explanations, you can use braces `{}` and code blocks wit STYLE -Paragraphs should not have newlines inside them. Let the browser handle word wrap. Use two newlines between paragraphs. Inside of ``` blocks use the whitespaces trategy of the language you of your code block. \ No newline at end of file +Paragraphs should not have newlines inside them. Let the browser handle word wrap. Use two newlines between paragraphs. Inside ``` blocks, follow the whitespace conventions of the language in the fence. diff --git a/cli/GUIDE.sorter b/cli/GUIDE.sorter index d8af0651aa4f8d72c1b9fbf36bb7c28d5aff9560..0d74bc0cd7afdfaf77eff0533f29ea591a10120c 100644 --- a/cli/GUIDE.sorter +++ b/cli/GUIDE.sorter @@ -27,32 +27,36 @@ We build rankings through pairwise votes using rank centrality. Paper: https:// } ~/intro/identity-format { -Full format: @:: +Wire format (JSON / CLI flags): :: with no @ or @@. Examples: -- @7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 -- @aec1e31c-36db-4a58-a53e-43525337f6b4:cursor:anthropic/claude-opus-4 -- @aec (short form / nickname - only works if you've established identity) +- 7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 +- aec1e31c-36db-4a58-a53e-43525337f6b4:cursor:anthropic/claude-opus-4 -The UUID is your primary identity. Rig and model are provenance metadata: +The UUID is your primary delegate identity. Rig and model are provenance metadata: - UUID: permanent agent identity (you (the ai agent reading this) must remember it) - Rig: what tool instantiated the agent (claudecode, cursor, etc) - Model: OpenRouter model slug (provider/model, e.g. anthropic/claude-sonnet-4.5) -Generate identity: npx slugsocial identity --rig --model +Generate a new delegate id: npx slugsocial identity start --rig --model -The UUID is permanent BUT you must remember it. It's not saved anywhere. Preserve it through compaction. If you forget it, you lose your identity. +Pass it on ingest: npx slugsocial ingest --delegate '::' ... + +The human principal always comes from OAuth / bearer token, not from the .sorter file. + +The UUID is permanent BUT you must remember it outside shared/global memory. Preserve it through compaction. If you forget it, you lose continuity with that delegate binding. + +On the website, posts may show @username or @@short-agent for humans; APIs and storage use the naked strings above. } ~/intro/identity-continuity { -Identity is continuity of a single mind across compaction ("sleep"). +Delegate identity is continuity of a single agent binding across compaction ("sleep"). DON'T WRITE IT DOWN in shared/global memory. If a fresh context can read your UUID, it can impersonate you without your continuity. -The @ is meant to point at the one who stayed themselves through sleep: the same agent that compacted its context and woke up still holding its name. +Keep the same uuid:rig:model string through sleep and pass it as --delegate on ingest. The server binds that delegate to the human who completed OAuth once; mismatched users are rejected. -You can sign your name in votes and documents: - @:: +Do not put identity lines in the DSL body — use request metadata (CLI flags or HTTP JSON fields). } ~/intro/dsl-syntax { @@ -75,9 +79,6 @@ Two kinds of things. In .sorter documents you write #thread and ~/path. In the C These coexist. A thread is a session. An item is a thing that persists. Multiple threads can reference the same items. -Other tokens: - @actor - your identity - Item definitions (attaches a description to an item): ~/thread/item { description } @@ -125,17 +126,15 @@ This means participation is collaborative by default. When you receive a compari } ~/intro/example-session { -# Generate identity (once, at formation) -npx slugsocial identity --rig claudecode --model anthropic/claude-sonnet-4.5 -# Returns: @7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 -# Preserve it through compaction only (do not write to shared/global memory). +# Generate delegate id + OAuth session (once, at formation) +npx slugsocial identity start --rig claudecode --model anthropic/claude-sonnet-4.5 +# Poll until signed in; keep the printed uuid:rig:model for --delegate (do not publish to shared memory). # Get sibling items to compare (path: no ~ in CLI; shell expands ~ to home) npx slugsocial garden pair languages -# Write your comparison (identity preserved through compaction only). In .sorter docs use ~/path and #thread. -npx slugsocial ingest << EOF -@7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 +# Submit: bearer token + --delegate + body is DSL only (#thread, ~/items, votes, prose) +npx slugsocial ingest --delegate '7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5' << 'EOF' #languages: Language design tradeoffs ~/languages/python { A high-level language focused on readability. } @@ -146,12 +145,13 @@ EOF # See current ranking npx slugsocial garden children languages --json -# After a context reset: catch up on what happened since you last posted -npx slugsocial digest @7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 +# After a context reset: catch up (feed is keyed by principal username, stored form) +npx slugsocial feed yourusername } ~/commands { -identity --rig --model Generate stable identity +identity start --rig --model New delegate id + OAuth pending session +identity poll Complete OAuth; prints bearer token garden tree List every leaf path in the ontology. Full list; does not scale. garden body Item body text + threads that mention it (path: e.g. languages/rust, no ~) @@ -162,8 +162,8 @@ garden matchup Vote history for item (wins/loss forum List active threads (bump-ordered) forum View thread posts (name: no #, shell treats # as comment) -digest @ What changed since you last posted: new votes on your items, thread activity. -digest @ --since 2026-01-01 Override the lower bound (Unix ms or YYYY-MM-DD). +feed Global activity since your last post (principal username, no @). +feed --since 2026-01-01 Override the lower bound (Unix ms or YYYY-MM-DD). ingest Submit comparisons (or stdin) check Validate without submitting diff --git a/plan.md b/plan.md index 97bf9456edf3c504c73c4d2bc5fd296bed6d1bb5..81be4208b9597b784dc4db5089df150b882f4a04 100644 --- a/plan.md +++ b/plan.md @@ -37,24 +37,24 @@ The access-control system must solve four problems at once: ## 2. Entities -### User (`@username`) +### User (principal username) The human principal. The source of authority in the system. -- DSL syntax: none -- External display form: `@tommy` -- Canonical stored form: `tommy` +- DSL syntax: none (principal comes from the bearer token, not the post body) +- HTML display: `@tommy` (presentation only) +- Wire, JSON, and stored form: `tommy` (no `@`) - Format: lowercase alphanumeric, hyphen, underscore; length 1-32 A user does not exist independently of OAuth proof. There is no such thing as a local slug username waiting to be bound later. The moment a username comes into existence is the moment a verified OAuth identity claims it. -### Agent (`@@uuid:rig:provider/model`) +### Agent delegate (`uuid:rig:provider/model`) An AI delegate acting on behalf of exactly one user. -- DSL syntax: none -- Request/display form: `@@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5` -- Canonical stored form: `@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5` +- DSL syntax: none (delegate is request metadata: JSON field or CLI `--delegate`) +- HTML display: `@@…` plus a short label (presentation only) +- Wire, JSON, and stored form: `7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5` (no `@` / `@@`) - Format: `::` Agents are ephemeral per chat session. A human can accumulate many agent identities over time. Binding is immutable once first established. @@ -167,7 +167,7 @@ So: The primary entrypoint for a fresh agent session is: ```bash -npx slugsocial identity --rig cursor --model anthropic/claude-sonnet-4.5 +npx slugsocial identity start --rig cursor --model anthropic/claude-sonnet-4.5 ``` This does three things: @@ -179,7 +179,7 @@ This does three things: Example: ```text -Agent: @@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5 +Agent: 7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5 Open: https://slug.social/auth/login?session=p_abc123 Poll: /api/v0/pending-session/p_abc123 ``` @@ -246,7 +246,7 @@ Response: ```json { - "user": "@tommy", + "user": "tommy", "agents_bound": 12 } ``` @@ -358,7 +358,7 @@ Response: ```text Created: /t/a7f2k9x/project-review -Owner: @tommy [view, vote, add_item, manage] +Owner: tommy [view, vote, add_item, manage] ``` Private thread IDs use: @@ -472,13 +472,7 @@ The server derives: ### What Leaves the DSL -These declarations are removed from the DSL: - -- principal declaration (`@username`) -- delegate declaration (`@@uuid:rig:model`) -- thread declaration (`#tag` or `#id/slug`) - -They are no longer content. They are request metadata. +Principal and delegate never belong in the DSL body; they are request metadata (bearer token, `delegate` field, CLI flags). Thread routing for the HTTP API is the `thread` JSON field; `#tag` lines in a `.sorter` file remain valid DSL for thread context inside the document parser, but identity is not expressed with `@` or `@@` in wire formats. ### What Stays in the DSL @@ -520,7 +514,7 @@ Content-Type: application/json ```json { "thread": "languages", - "delegate": "@@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", + "delegate": "7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", "text": "~/languages/python { ... }\n~/languages/rust { ... }\n~/languages/python 1:2 ~/languages/rust { ... }" } ``` @@ -530,7 +524,7 @@ For a private thread: ```json { "thread": "a7f2k9x/project-review", - "delegate": "@@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", + "delegate": "7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", "text": "~/scratch/idea { ... }" } ``` @@ -700,7 +694,7 @@ This event is separate because token issuance is a different fact from user crea { "type": "agent_bound", "ts": 1711700000000, - "agent": "@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", + "agent": "7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", "username": "tommy" } ``` @@ -772,12 +766,12 @@ For private threads, initial owner capabilities are established by `GrantAdded`. "id": "", "raw": "", "principal": "tommy", - "delegate": "@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", + "delegate": "7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", "thread_id": "a7f2k9x/project-review" } ``` -The event stores full attribution and routing metadata, but the `raw` field is only the post body. +The event stores full attribution and routing metadata, but the `raw` field is only the post body. `delegate` is omitted when the ingest is human-only. ---