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: [bda5f8aa] Remove legacy evidence projection; Evidence envelopes only. Epoch and commit pages no longer invent history from bare GitDiscovery rows. Production ledger will be wiped to re-emit under the current schema. Co-authored-by: Cursor Side A — unified diff (full patch): diff --git a/constitution.py b/constitution.py index 4dd5b9dfbba231d46289c490f91b1dd5b1018bcf..26ba130e885e0e69fb7874ca5c3f07f42100a150 100644 --- a/constitution.py +++ b/constitution.py @@ -210,10 +210,10 @@ class Emission: distributions: dict # author -> amount str ranking: dict # author -> score str models_used: list - discovery_snapshot_id: str = "" # empty only for pre-discovery ledger history - evidence_schema_version: int = 1 - ranking_run_id: str = "" - ranking_event_id: str = "" + discovery_snapshot_id: str + evidence_schema_version: int + ranking_run_id: str + ranking_event_id: str @event @@ -502,26 +502,6 @@ def _epochs_in_ledger() -> list[int]: return sorted(epochs) -def _legacy_commit_row(commit_id: str) -> tuple[GitDiscovery | None, dict | None]: - for discovery in store.read(): - if not isinstance(discovery, GitDiscovery): - continue - for commit in discovery.commits: - if commit_id_for_oid(commit["oid"]) == commit_id: - return discovery, commit - return None, None - - -def _legacy_observation(commit_id: str) -> tuple[GitDiscovery | None, dict | None]: - for discovery in store.read(): - if not isinstance(discovery, GitDiscovery): - continue - for obs in discovery.observations: - if commit_id_for_oid(obs["oid"]) == commit_id: - return discovery, obs - return None, None - - def build_pairwise_prompt(side_a: dict, side_b: dict) -> str: return f"""You are ranking contributions to an open source project. Compare these two sides (each may be one or more commits). Decide which side contributed more. @@ -2040,7 +2020,7 @@ def _strip_heavy_fields(obj: dict) -> dict: @app.get("/api/ledger") async def get_ledger(offset: int = 0, limit: int = 100, full: int = 0): - """List of ledger dicts (backward-compatible). Heavy blobs stripped unless full=1.""" + """List of ledger dicts. Heavy blobs stripped unless full=1.""" limit = max(1, min(limit, 500)) rows = [] for e in store.read()[offset:offset + limit]: @@ -2274,23 +2254,25 @@ async def epochs_index(): epochs = _epochs_in_ledger() rows = [] for epoch in epochs: - discovery = _discovery_for_epoch(epoch) emission = _emission_for_epoch(epoch) - evidence_n = sum( - 1 for e in evidence_by_kind() if e.epoch == epoch + evidence_n = sum(1 for e in evidence_by_kind() if e.epoch == epoch) + disc = next( + ( + e for e in evidence_by_kind("git.discovery_completed") + if e.epoch == epoch + ), + None, ) detail = [] - if discovery: + if disc: detail.append( - f"{len(discovery.commits)} eligible / " - f"{len(discovery.observations)} observed" + f"{disc.payload.get('eligible_count', 0)} eligible / " + f"{disc.payload.get('observation_count', 0)} observed" ) if emission: detail.append(f"emitted {emission.total_emitted}") if evidence_n: detail.append(f"{evidence_n} evidence events") - elif discovery or emission: - detail.append("legacy (no Evidence envelopes)") rows.append(["li", _a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}"), " — ", @@ -2307,37 +2289,37 @@ async def epochs_index(): @app.get("/epochs/{epoch}") async def epoch_detail(epoch: int): - discovery = _discovery_for_epoch(epoch) emission = _emission_for_epoch(epoch) evidence_rows = [e for e in evidence_by_kind() if e.epoch == epoch] + if not evidence_rows and emission is None: + return _evidence_page(f"epoch {epoch}", [ + _evidence_nav(), + ["h1", f"epoch {epoch}"], + ["p.note", "No evidence for this epoch."], + ]) + commit_evs = [e for e in evidence_rows if e.kind == "git.commit"] comparison_evs = [e for e in evidence_rows if e.kind == "comparison.input"] judgment_evs = [e for e in evidence_rows if e.kind == "llm.judgment"] + discovery_ev = next( + (e for e in evidence_rows if e.kind == "git.discovery_completed"), None + ) ranking_started = next( (e for e in evidence_rows if e.kind == "ranking.started"), None ) ranking_completed = next( (e for e in evidence_rows if e.kind == "ranking.completed"), None ) - legacy = not evidence_rows and (discovery is not None or emission is not None) - - commit_links: list[tuple[str, str]] = [] - if commit_evs: - for e in commit_evs: - cid = e.payload.get("commit_id") or "" - label = ( - f"{e.payload.get('oid', cid)[:24]} " - f"({e.payload.get('contributor', '?')})" - ) - commit_links.append((label, _evidence_path("commit", cid))) - elif discovery: - for c in discovery.commits: - cid = commit_id_for_oid(c["oid"]) - commit_links.append(( - f"{c['oid'][:24]} ({c.get('contributor', '?')})", - _evidence_path("commit", cid), - )) + commit_links = [ + ( + f"{e.payload.get('oid', e.payload.get('commit_id', ''))[:24]} " + f"({e.payload.get('contributor', '?')})", + _evidence_path("commit", e.payload["commit_id"]), + ) + for e in commit_evs + if e.payload.get("commit_id") + ] comparison_links = [ ( e.payload.get("summary") or e.payload.get("comparison_id", e.event_id), @@ -2360,16 +2342,13 @@ async def epoch_detail(epoch: int): ] excluded = [] - if discovery: - for obs in discovery.observations: + if discovery_ev: + for obs in discovery_ev.payload.get("observations") or []: if obs.get("eligible"): continue oid = obs.get("oid", "?") reason = obs.get("exclusion_reason") or "excluded" - excluded.append(["li", - f"{oid[:28]} — {reason} — ", - ["span.note", "legacy evidence unavailable"], - ]) + excluded.append(["li", f"{oid[:28]} — {reason}"]) ranking_nodes: list = [] if ranking_completed: @@ -2388,21 +2367,10 @@ async def epoch_detail(epoch: int): indent=2, sort_keys=True, )], ] - elif emission: - if legacy and len(emission.ranking or {}) <= 1: - ranking_nodes.append(["p.note", - "Single-contributor epoch — no LLM judgments." - ]) - ranking_nodes.extend([ - ["p", "Projected from Emission (no ranking Evidence event)."], - ["pre.blob", json.dumps(emission.ranking, indent=2, sort_keys=True)], - ]) + elif ranking_started: + ranking_nodes = [["p.note", f"Ranking started: {ranking_started.event_id}"]] else: - ranking_nodes = [["p.note", "No ranking recorded."]] - if ranking_started and not ranking_completed: - ranking_nodes.insert(0, ["p.note", - f"Ranking started: {ranking_started.event_id}" - ]) + ranking_nodes = [["p.note", "No ranking evidence."]] if emission: emission_node = _dl_rows([ @@ -2411,44 +2379,41 @@ async def epoch_detail(epoch: int): ("pool_after", emission.pool_after), ("discovery_snapshot_id", emission.discovery_snapshot_id), ("ranking_run_id", emission.ranking_run_id or None), + ("ranking_event_id", emission.ranking_event_id or None), ("models_used", ", ".join(emission.models_used or [])), ("distributions", json.dumps(emission.distributions, sort_keys=True)), ]) else: emission_node = ["p.note", "No emission for this epoch."] - single_contributor = False - if discovery: - single_contributor = len({c.get("contributor") for c in discovery.commits}) <= 1 - elif emission: - single_contributor = len(emission.ranking or {}) <= 1 + contributors = { + e.payload.get("contributor") + for e in commit_evs + if e.payload.get("contributor") + } + no_comparisons_note = "No comparisons." + if len(contributors) <= 1: + no_comparisons_note += " Single-contributor — no LLM judgments." body = [ _evidence_nav(), ["div.eyebrow", f"epoch {epoch}"], ["h1", f"epoch {epoch}"], ] - if legacy: - body.append(["p.note", - "Legacy epoch: projected from GitDiscovery/Emission without Evidence " - "envelopes. Eligible commits use discovery patches; discarded observation " - "metadata is marked legacy evidence unavailable. Single-contributor " - "epochs have no LLM judgments." - ]) - if discovery: + if discovery_ev: body.extend([ ["h2", "discovery"], _dl_rows([ - ("snapshot_id", discovery.snapshot_id), - ("config_digest", discovery.config_digest), - ("initial_snapshot", discovery.initial_snapshot), - ("observations", len(discovery.observations)), - ("eligible", len(discovery.commits)), + ("snapshot_id", discovery_ev.payload.get("snapshot_id")), + ("config_digest", discovery_ev.payload.get("config_digest")), + ("observations", discovery_ev.payload.get("observation_count")), + ("eligible", discovery_ev.payload.get("eligible_count")), + ("event", _a( + _evidence_path("event", discovery_ev.event_id), + discovery_ev.event_id, + )), ]), ]) - no_comparisons_note = "No comparisons." - if single_contributor: - no_comparisons_note += " Single-contributor — no LLM judgments." body.extend([ ["h2", "commits"], _link_list(commit_links), @@ -2471,92 +2436,42 @@ async def epoch_detail(epoch: int): @app.get("/commits/{commit_id}") async def commit_detail(commit_id: str): ev = find_evidence_payload("git.commit", "commit_id", commit_id) - discovery, legacy_row = (None, None) if not ev: - discovery, legacy_row = _legacy_commit_row(commit_id) - if not ev and not legacy_row: - discovery, obs = _legacy_observation(commit_id) - if obs is not None: - epoch = discovery.epoch if discovery else "?" - return _evidence_page(f"commit {commit_id[:24]}", [ - _evidence_nav( - _a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}") - ), - ["div.eyebrow", "commit"], - ["h1", commit_id], - ["p.note", "legacy evidence unavailable"], - _dl_rows([ - ("oid", obs.get("oid")), - ("eligible", obs.get("eligible")), - ("exclusion_reason", obs.get("exclusion_reason")), - ("epoch", str(epoch)), - ]), - ]) return _evidence_page("commit not found", [ _evidence_nav(), ["h1", "commit not found"], ["p", commit_id], ]) - if ev: - p = ev.payload - epoch = ev.epoch - oid = p.get("oid", "") - contributor = p.get("contributor", "") - message = _blob_text(p.get("message")) - patch = _blob_text(p.get("patch")) - meta = _dl_rows([ + p = ev.payload + epoch = ev.epoch + return _evidence_page(f"commit {commit_id[:24]}", [ + _evidence_nav(_a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}")), + ["div.eyebrow", "commit"], + ["h1", commit_id], + _dl_rows([ ("commit_id", commit_id), - ("oid", oid), - ("contributor", contributor), + ("oid", p.get("oid", "")), + ("contributor", p.get("contributor", "")), ("patch_sha256", p.get("patch_sha256")), ("patch_identity", p.get("patch_identity")), ("committer_timestamp_ms", p.get("committer_timestamp_ms")), ("evidence_event", _a(_evidence_path("event", ev.event_id), ev.event_id)), ("epoch", _a(_evidence_path("epoch", str(epoch)), str(epoch))), - ]) - legacy_note = None - else: - assert legacy_row is not None and discovery is not None - epoch = discovery.epoch - oid = legacy_row.get("oid", "") - contributor = legacy_row.get("contributor", "") - message = legacy_row.get("message") or "" - patch = legacy_row.get("patch") or "" - meta = _dl_rows([ - ("commit_id", commit_id), - ("oid", oid), - ("contributor", contributor), - ("patch_sha256", legacy_row.get("patch_sha256")), - ("patch_identity", legacy_row.get("patch_identity")), - ("committer_timestamp_ms", legacy_row.get("committer_timestamp_ms")), - ("epoch", _a(_evidence_path("epoch", str(epoch)), str(epoch))), - ("source", "legacy GitDiscovery projection"), - ]) - legacy_note = ["p.note", "Projected from GitDiscovery — Evidence envelope absent."] - return _evidence_page(f"commit {commit_id[:24]}", [ - _evidence_nav(_a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}")), - ["div.eyebrow", "commit"], - ["h1", commit_id], - *([legacy_note] if legacy_note else []), - meta, + ]), ["p", _a(f"/commits/{commit_id}/patch", "download patch")], ["h2", "message"], - _pre_blob(message), + _pre_blob(_blob_text(p.get("message"))), ["h2", "patch"], - _pre_blob(patch), + _pre_blob(_blob_text(p.get("patch"))), ]) @app.get("/commits/{commit_id}/patch") async def commit_patch_download(commit_id: str): ev = find_evidence_payload("git.commit", "commit_id", commit_id) - if ev: - raw = _decode_blob(ev.payload.get("patch")) or _blob_text(ev.payload.get("patch")).encode() - else: - _, row = _legacy_commit_row(commit_id) - if not row: - return PlainTextResponse("not found", status_code=404) - raw = (row.get("patch") or "").encode("utf-8") + if not ev: + return PlainTextResponse("not found", status_code=404) + raw = _decode_blob(ev.payload.get("patch")) or _blob_text(ev.payload.get("patch")).encode() return Response( content=raw, media_type="text/plain; charset=utf-8", @@ -3226,7 +3141,9 @@ async def watch(): ["div.controls", ["button#play", {"type": "button", "disabled": "true"}, "▶ Play live feed"], ["button#pause", {"type": "button"}, "Ⅱ Pause feed"], - ["span.note", "Pause stops local updates; the constitutional process continues."], + ["span.note", + "Play/pause only affect this browser feed — they do not run or stop emission. " + "The server emits at each epoch boundary; status above is that process."], ], ], ["section.panel", diff --git a/tests/integration.clj b/tests/integration.clj index 204b0fedfbad57846205cb140c4ed9406b5f8e0e..11140e95a8cd86768a661a30e6b29a3ddfc95fcc 100644 --- a/tests/integration.clj +++ b/tests/integration.clj @@ -247,7 +247,10 @@ :decay_rate "0.003253356063468" :distributions {"alice" "381.4282558872" "bob" "190.7141279436"} :ranking {"alice" "0.6666" "bob" "0.3334"} - :models_used ["mock/chat-v1" "mock/chat-v2"]}] + :models_used ["mock/chat-v1" "mock/chat-v2"] + :evidence_schema_version 2 + :ranking_run_id "seed-rank" + :ranking_event_id "seed-rank-ev"}] (spit path (str (json/generate-string entry) "\n")))) ;; --------------------------------------------------------------------------- diff --git a/tests/test_evidence.py b/tests/test_evidence.py index 76adcd343eec3a65dec58fda93b068356fb1adcd..7cb74fd7fb1bcd0ab17d2cbe2e6ca7e61e164221 100644 --- a/tests/test_evidence.py +++ b/tests/test_evidence.py @@ -1,4 +1,4 @@ -"""HTML evidence graph: byte fidelity, resume, legacy projection, private ack.""" +"""HTML evidence graph: byte fidelity, resume, and Evidence-only pages.""" from __future__ import annotations @@ -86,55 +86,10 @@ def test_html_evidence_pages_escape_and_link(evidence_store): assert patch_resp.headers["content-disposition"].startswith("attachment") -def test_legacy_epoch_projects_from_gitdiscovery_without_evidence(evidence_store): - oid = "sha1:" + "b" * 40 - discovery = c.GitDiscovery( - schema_version=1, - epoch=3, - snapshot_id="legacy-snap", - timestamp_ms=1, - config_digest="d", - initial_snapshot=True, - configuration={"repositories": [], "contributors": {}}, - repositories=[], - observations=[{ - "oid": oid, - "eligible": False, - "exclusion_reason": "before_genesis", - "first_sources": [], - }, { - "oid": "sha1:" + "c" * 40, - "eligible": True, - "exclusion_reason": None, - "first_sources": [], - }], - commits=[{ - "oid": "sha1:" + "c" * 40, - "contributor": "tommy-mor", - "message": "eligible", - "patch": "diff --git a/x b/x\n", - }], - ) - emission = c.Emission( - epoch=3, - timestamp_ms=2, - pool_before="1", - total_emitted="0.1", - pool_after="0.9", - decay_rate="0.1", - distributions={"tommy-mor": "0.1"}, - ranking={"tommy-mor": "1"}, - models_used=[], - discovery_snapshot_id="legacy-snap", - ) - asyncio.run(c.store.append(discovery)) - asyncio.run(c.store.append(emission)) - html = asyncio.run(c.epoch_detail(3)).body.decode() - assert "legacy" in html.lower() - assert "Single-contributor" in html or "no LLM" in html - excluded_id = c.commit_id_for_oid(oid) - excluded_html = asyncio.run(c.commit_detail(excluded_id)).body.decode() - assert "legacy evidence unavailable" in excluded_html.lower() +def test_commit_without_evidence_is_not_found(evidence_store): + html = asyncio.run(c.commit_detail("c_missing")).body.decode() + assert "commit not found" in html + assert "legacy" not in html.lower() def test_ranking_resume_skips_duplicate_provider_calls(evidence_store, monkeypatch): @@ -202,6 +157,10 @@ def test_epochs_index_lists_epochs(evidence_store): distributions={}, ranking={}, models_used=[], + discovery_snapshot_id="snap", + evidence_schema_version=c.EVIDENCE_SCHEMA_VERSION, + ranking_run_id="r", + ranking_event_id="e", ))) html = asyncio.run(c.epochs_index()).body.decode() assert "/epochs/3" in html Side B — contributor: tommy-mor Side B — commit message: [30a67104] fixes Side B — unified diff (full patch): diff --git a/agents.md b/agents.md index a6a283716e09fcaba1fd690f4e877e0bbecda2c0..d9a924d2f77c444d9b112bbf37a480b963ace4f0 100644 --- a/agents.md +++ b/agents.md @@ -39,7 +39,7 @@ Strict **CSP** that blocks `eval` would break the current app. Other projects ma - **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-compare-preview`** (new ingest card) and **`#vote-edge-history-region`** (recomputed edge list). Uses **`RpcResult::PostOk`**’s **`post_id`** / **`post_index`** for the card. **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes. -- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`**. HUD: **`#slug-pin-hud`** when **`layout`** passes garden metadata on **`body`**. +- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`**. HUD: **`#slug-pin-hud`** when **`layout`** passes garden metadata on **`body`**; the label is **`POST /ui`** **`set_garden_pin`** **`clear:true`** (**`slug_ui.js`**), not a permalink to the item. **Rule of thumb:** New **CLI or API** verbs → `RpcCommand`. New **in-page morph or form-driven** behavior that only makes sense in the browser → `HtmlUiAction`. If both need the same operation, implement the real work once (e.g. call shared RPC helpers from `post_ui_html`) and keep the wire shapes separate. diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index 8a46b1e92d38f2c390f88d48750d95d11388cd73..121d9498e8cb93d4d001dc1bbce23d74fbb958f5 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -16,7 +16,6 @@ use crate::{ canonical_path::{canonicalize_item, canonicalize_tag}, form_template::template_json_compact, html::{ - forum::ingest_entry_markup, ui_action::UI_RPC_FIELD, user_can_post_room, JsBuilder, @@ -111,6 +110,23 @@ fn votes_for_edge(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec usize { + let (lo, hi) = canonical_edge_items(a, b); + let lo_s = lo.as_str(); + let hi_s = hi.as_str(); + content + .item_votes + .get(&lo) + .into_iter() + .flat_map(|q| q.iter()) + .filter(|v| { + (v.a.as_str() == lo_s && v.b.as_str() == hi_s) + || (v.a.as_str() == hi_s && v.b.as_str() == lo_s) + }) + .count() +} + fn vote_thread_tags_for_pair(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec { let set: HashSet = content .item_threads @@ -288,6 +304,7 @@ fn child_row_pin_or_vote( nav: &ThreadNav, row_item: &ItemId, pinned_room_and_item: Option<&(String, ItemId)>, + scope_content: &ContentState, next_path: &str, ) -> maud::Markup { let pin_matches_scope = pinned_room_and_item @@ -315,7 +332,16 @@ fn child_row_pin_or_vote( @if pi == row_item { span class="ont-garden-pinned-here" title="Pinned" aria-label="Pinned" { "📌" } } @else { - a class="ont-garden-vote-ico" href=(vote_compare_href(nav, pi, row_item, None)) title="Vote vs pinned" aria-label="Vote" { "⚖" } + @let nv = edge_vote_count_for_pair(scope_content, pi, row_item); + @let tip = format!( + "Compare and vote — {nv} pairwise vote{} in this scope for pinned vs this row", + if nv == 1 { "" } else { "s" }, + ); + @let aria = format!("Vote; {} pairwise {}", nv, if nv == 1 { "vote" } else { "votes" }); + a class="ont-garden-vote-ico" href=(vote_compare_href(nav, pi, row_item, None)) title=(tip) aria-label=(aria) { + span class="ont-garden-vote-glyph" aria-hidden="true" { "⚖" } + span class="ont-garden-vote-count" { (format!("{}", nv)) } + } } } @else { form method="POST" action="/ui" data-navigate="full" class="ont-pin-form ont-garden-pin-form" { @@ -978,10 +1004,9 @@ async fn render_scope_view( ) -> axum::response::Response { let scope = nav.scope(); let pin_ref = pinned_item_from_jar(&jar); - let model = { - let reduced = state.reduced.read().await; - build_item_page_view_model(&reduced, &scope, browse.item()) - }; + let reduced = state.reduced.read().await; + let model = build_item_page_view_model(&reduced, &scope, browse.item()); + let scope_content = content_for_garden_view(&reduced, &scope); let thread_href = |tag: &str| nav.thread_url(tag); let external_empty_body = browse.is_external() && model.body.is_none(); let cli_path_arg = item_display_path(&model.item); @@ -1108,7 +1133,7 @@ async fn render_scope_view( @let item_url = item_href(r.item.as_str(), &nav); @let score_str = format!("{:.3}", r.score); li data-garden-item=(r.item.as_str()) { - (child_row_pin_or_vote(&nav, &r.item, pin_ref.as_ref(), &next_for_pin)) + (child_row_pin_or_vote(&nav, &r.item, pin_ref.as_ref(), scope_content, &next_for_pin)) a class="item-link" href=(item_url) { code { (item_display_path(r.item.as_str())) } } span class="ont-rank-score" { (score_str) } } @@ -1124,7 +1149,7 @@ async fn render_scope_view( ul class="ont-group-list" { @for name in &model.child_rankings.unranked_items { li data-garden-item=(name.as_str()) { - (child_row_pin_or_vote(&nav, name, pin_ref.as_ref(), &next_for_pin)) + (child_row_pin_or_vote(&nav, name, pin_ref.as_ref(), scope_content, &next_for_pin)) @let href = item_href(name.as_str(), &nav); a class="item-link" href=(href) { code { (item_display_path(name.as_str())) } } } @@ -1363,6 +1388,33 @@ mod tests { })); } + #[test] + fn edge_vote_count_for_pair_matches_votes_for_edge_len() { + use super::{ + content_for_garden_view, edge_vote_count_for_pair, votes_for_edge, + }; + use crate::path_types::ItemId; + let mut reduced = ReducerState::default(); + apply_ingest( + &mut reduced, + 1, + "@00000000-0000-0000-0000-000000000000:test:local/test\n\ + ~/topic {root}\n\ + ~/topic/a {alpha}\n\ + ~/topic/b {beta}\n\ + ~/topic/a 3:2 ~/topic/b {first vote}\n\ + ~/topic/b 2:3 ~/topic/a {second vote}\n", + ); + let content = content_for_garden_view(&reduced, &ScopeId::Public); + let a = ItemId::parse("~/topic/a").unwrap().normalized_storage(); + let b = ItemId::parse("~/topic/b").unwrap().normalized_storage(); + assert_eq!( + edge_vote_count_for_pair(content, &a, &b), + votes_for_edge(content, &a, &b).len() + ); + assert_eq!(votes_for_edge(content, &a, &b).len(), 2); + } + #[test] fn item_page_model_includes_body_and_unranked_without_votes() { let mut reduced = ReducerState::default(); diff --git a/server/static/slug_ui.js b/server/static/slug_ui.js index c0de1cddbba78227dfb80bfd41e7b855b3a42bc3..86f935f8dd998f3d6df016f33b1e47f9780782ea 100644 --- a/server/static/slug_ui.js +++ b/server/static/slug_ui.js @@ -170,15 +170,6 @@ return { room: raw.slice(0, i), item: raw.slice(i + 1) }; } - function gardenItemHref(prefix, storageUrl) { - var marker = 'https://slug.social/~/'; - if (storageUrl.indexOf(marker) === 0) { - var tail = storageUrl.slice(marker.length); - return prefix.replace(/\/$/, '') + (tail ? '/' + tail : ''); - } - return storageUrl; - } - function refreshPinHud() { var hud = document.getElementById('slug-pin-hud'); if (!hud) return; @@ -187,19 +178,37 @@ var pin = decodePinCookie(); hud.innerHTML = ''; if (!pin || !prefix || pin.room !== bodyRoom) return; - var a = document.createElement('a'); - a.className = 'slug-pin-hud-link'; - a.href = gardenItemHref(prefix, pin.item); - a.title = 'Pinned item'; + var form = document.createElement('form'); + form.method = 'POST'; + form.action = '/ui'; + form.setAttribute('data-navigate', 'full'); + form.className = 'slug-pin-hud-form'; + var rpc = document.createElement('input'); + rpc.type = 'hidden'; + rpc.name = '__rpc__'; + rpc.value = JSON.stringify({ + action: 'set_garden_pin', + clear: true, + room_wire: '', + next: window.location.pathname + window.location.search, + form_action: '/ui', + }); + form.appendChild(rpc); + var btn = document.createElement('button'); + btn.type = 'submit'; + btn.className = 'slug-pin-hud-link slug-pin-hud-unpin-btn'; + btn.title = 'Unpin — removes this item from the corner HUD'; + btn.setAttribute('aria-label', 'Unpin pinned item'); var span = document.createElement('span'); span.className = 'slug-pin-hud-glyph'; span.setAttribute('aria-hidden', 'true'); span.textContent = '📌'; - a.appendChild(span); + btn.appendChild(span); var label = pin.item.replace(/^https:\/\/slug\.social\/~\/?/, '~/'); if (label.length > 36) label = label.slice(0, 34) + '…'; - a.appendChild(document.createTextNode(' ' + label)); - hud.appendChild(a); + btn.appendChild(document.createTextNode(' ' + label)); + form.appendChild(btn); + hud.appendChild(form); } refreshPinHud(); diff --git a/server/static/theme_default.css b/server/static/theme_default.css index ec0fbe7acee0aa2802f978f14a9b0fc86e78c5b8..9178f0629cfb868348740e6dea1626dc6afb8345 100644 --- a/server/static/theme_default.css +++ b/server/static/theme_default.css @@ -799,6 +799,12 @@ details > summary::-webkit-details-marker { display: none; } } /* Pinned item HUD — bottom bar, same plane as spread */ +.slug-pin-hud-form { + display: inline; + margin: 0; + padding: 0; + border: none; +} #slug-pin-hud.slug-pin-hud { margin-left: auto; max-width: min(42vw, 280px); @@ -808,6 +814,13 @@ details > summary::-webkit-details-marker { display: none; } overflow: hidden; text-overflow: ellipsis; } +.slug-pin-hud-link.slug-pin-hud-unpin-btn { + background: transparent; + border: none; + cursor: pointer; + font-size: inherit; + font-family: inherit; +} .slug-pin-hud-link { color: var(--ui); text-decoration: none; @@ -815,7 +828,10 @@ details > summary::-webkit-details-marker { display: none; } align-items: center; gap: 4px; } -.slug-pin-hud-link:hover { color: var(--signal); } +.slug-pin-hud-link:hover, +.slug-pin-hud-unpin-btn:hover { + color: var(--signal); +} .slug-pin-hud-glyph { font-size: 13px; line-height: 1; } /* Garden pin / vote controls */ @@ -890,10 +906,21 @@ span.ont-garden-pinned-here { align-items: center; justify-content: center; } +a.ont-garden-vote-ico { + gap: 4px; +} a.ont-garden-vote-ico:hover { color: var(--signal); background: var(--g4); } +.ont-garden-vote-count { + font-size: 10px; + font-weight: 700; + font-variant-numeric: tabular-nums; +} +span.ont-garden-vote-glyph { + line-height: 1; +} span.ont-garden-pinned-here { border-color: var(--link); color: var(--signal); diff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css index 092d4b3540b052cc86870179e4c264541c4446cc..efaeed06d01fd835df0621f4c621c8f034c8b536 100644 --- a/server/static/theme_retro_craft.css +++ b/server/static/theme_retro_craft.css @@ -593,6 +593,12 @@ body.view-ontology #controls { (Global craft `code` + `button[type=submit]` are tuned for dark thread pages; these overrides match the cream ontology shell.) ---------------------------------------------------------------- */ +body.view-ontology .slug-pin-hud-form { + display: inline; + margin: 0; + padding: 0; + border: none; +} body.view-ontology #slug-pin-hud.slug-pin-hud { margin-left: auto; max-width: min(42vw, 280px); @@ -603,6 +609,14 @@ body.view-ontology #slug-pin-hud.slug-pin-hud { overflow: hidden; text-overflow: ellipsis; } +body.view-ontology .slug-pin-hud-link.slug-pin-hud-unpin-btn { + background: transparent; + border: none; + cursor: pointer; + font-size: inherit; + font-family: inherit; + padding: 0; +} body.view-ontology .slug-pin-hud-link { color: #1a4a8c; text-decoration: none; @@ -610,7 +624,8 @@ body.view-ontology .slug-pin-hud-link { align-items: center; gap: 0.25rem; } -body.view-ontology .slug-pin-hud-link:hover { +body.view-ontology .slug-pin-hud-link:hover, +body.view-ontology .slug-pin-hud-unpin-btn:hover { color: #0d3d82; text-decoration: underline; } @@ -676,6 +691,20 @@ body.view-ontology .ont-garden-child-actions { gap: 0.1rem; } body.view-ontology button.ont-garden-pin-ico, +body.view-ontology a.ont-garden-vote-ico { + gap: 0.2rem; +} +body.view-ontology .ont-garden-vote-count { + font-size: 0.65rem; + font-family: var(--font-ui); + font-weight: 600; + font-variant-numeric: tabular-nums; + opacity: 0.92; +} +body.view-ontology span.ont-garden-vote-glyph { + line-height: 1; +} +body.view-ontology button.ont-garden-pin-ico, body.view-ontology a.ont-garden-vote-ico, body.view-ontology span.ont-garden-pinned-here { font-size: 0.95rem; diff --git a/test/browser_garden_pin.clj b/test/browser_garden_pin.clj index 169ff9b6913049094611fb0e5b6683b30220b285..98c086d5647207f3ac72dbb9cbc13488c030eef1 100644 --- a/test/browser_garden_pin.clj +++ b/test/browser_garden_pin.clj @@ -21,6 +21,17 @@ (do (Thread/sleep 200) (recur)) false)))))) +(defn- wait-for-absence-substr [pg selector substr timeout-ms] + "True once selector text does not contain substr (or is empty), or timeout." + (let [deadline (+ (System/currentTimeMillis) timeout-ms)] + (loop [] + (let [text (locator/text-content (page/locator pg selector))] + (if (not (and (string? text) (str/includes? text substr))) + true + (if (< (System/currentTimeMillis) deadline) + (do (Thread/sleep 200) (recur)) + false)))))) + (defn garden-pin-flow! [] (println "\n━━━ browser garden pin (POST /ui set_garden_pin + HUD + vote link) ━━━\n") @@ -75,8 +86,14 @@ (is (wait-for-text pg ".ont-item-shell" "~/gp-pin-b" 15000) "on item b page") (is (wait-for-text pg "a.ont-vote-compare-btn" "vote" 10000) "vote link visible vs pinned item") + ;; HUD clears pin (POST set_garden_pin clear), not navigate to item + (locator/click (page/locator pg "#slug-pin-hud button.slug-pin-hud-unpin-btn")) + (is (wait-for-absence-substr pg "#slug-pin-hud" "gp-pin-a" 15000) + "HUD clears after unpin from HUD button") + (is (wait-for-absence-substr pg "body" "ont-vote-compare-btn" 15000) + "compare vote CTA removed after HUD unpin on same reload") (is (str/includes? (or (page/url pg) "") "/~/gp-pin-b") - "still on item b after vote link check")))))) + "still on item b after HUD unpin")))))) (finally (when-some [s @!server] (common/kill-server s))