samagotchi 0.124.0 → 0.126.0

data/lib/samagotchi/web/public/annotate_bar.js

@@ -9,7 +9,8 @@
 //
 // A bundle's pills (chi.annotation) come after the presets: each prepares
 // its command line with the selection (annotate_actions.js), at most 3
-// inline, the rest behind "⋯".
+// inline, the rest behind "⋯". Last, "Copy link" where the page has a
+// link for the selection (a claim link, claim_link.js).
 //
 // On a touch screen the bar docks above the composer instead: the OS's own
 // selection menu (Copy, Look Up…) and the handles sit next to the selection,
@@ -21,7 +22,8 @@ import { annotateBarLeft, annotationSource, quoteBlock } from "./annotations.js"
 import { presetNote } from "./annotate_presets.js";
 import { actionEnabled, actionTitle, sameActions, selectionFields, splitInline } from "./annotate_actions.js";
 
-// @param presets the preset texts (annotate_presets.js parsePresets)
+// @param presets the presets: each a text (annotate_presets.js
+//   parsePresets) or {label, text} (verify_preset.js)
 // @param canAnnotate () => whether the open session takes annotations (one
 //   is open and the composer can send)
 // @param roots () => the elements a selection may start in (the history,
@@ -45,12 +47,17 @@ import { actionEnabled, actionTitle, sameActions, selectionFields, splitInline }
 //   passes its own, participant_annotate.js)
 // @param quote (text, source) => the quote block for the selected +text+
 //   (annotations.js quoteBlock by default), or null for no text
+// @param link (source, range) => the selection's link, {url, title}, or
+//   null for no "Copy link" (the default); +range+ the selection clipped
+//   to +source+'s root
+// @param onLink (link) runs on "Copy link"; the selection is cleared and
+//   the bar hidden first
 // @param doc, win the page's document and window
 // @return {schedule(), hide(), el}; schedule() re-reads the selection on the
 //   next frame (call it on scroll)
 export function createAnnotateBar({
-  presets, canAnnotate, roots, isLive, onQuote, actions = () => [], running = () => false, onAction = () => {},
-  dock = () => null, source: sourceOf = annotationSource, quote = quoteBlock,
+  presets, canAnnotate, roots, isLive, onQuote, onPreset = () => {}, actions = () => [], running = () => false, onAction = () => {},
+  dock = () => null, source: sourceOf = annotationSource, quote = quoteBlock, link = () => null, onLink = () => {},
   doc = globalThis.document, win = globalThis.window,
 }) {
   const bar = doc.createElement("div");
@@ -66,8 +73,9 @@ export function createAnnotateBar({
     return btn;
   }
   bar.appendChild(button("Annotate", "annotate-main"));
-  presets.forEach((text, i) => {
-    const btn = button(text, "annotate-preset");
+  presets.forEach((preset, i) => {
+    const { label, text } = presetParts(preset);
+    const btn = button(label, "annotate-preset");
     btn.dataset.index = String(i);
     btn.title = text;
     bar.appendChild(btn);
@@ -78,10 +86,16 @@ export function createAnnotateBar({
   group.className = "annotate-actions";
   group.hidden = true;
   bar.appendChild(group);
+  const linkBtn = button("Copy link", "annotate-link");
+  linkBtn.hidden = true;
+  bar.appendChild(linkBtn);
   doc.body.appendChild(bar);
   const touch = win.matchMedia?.("(pointer: coarse)");
   let pendingQuote = null;
   let pendingFields = null;
+  let pendingSource = null;
+  let pendingRange = null;
+  let pendingLink = null;
   let drawn = [];
   let moreList = null;
 
@@ -129,6 +143,9 @@ export function createAnnotateBar({
   function hide() {
     pendingQuote = null;
     pendingFields = null;
+    pendingSource = null;
+    pendingRange = null;
+    pendingLink = null;
     if (moreList) moreList.hidden = true;
     bar.hidden = true;
   }
@@ -151,6 +168,11 @@ export function createAnnotateBar({
     if (!block) return hide();
     pendingQuote = block;
     pendingFields = selectionFields(raw, source);
+    pendingSource = source;
+    pendingRange = clipped;
+    pendingLink = link(source, clipped) || null;
+    linkBtn.hidden = !pendingLink;
+    linkBtn.title = pendingLink?.title || "";
     const list = actions() || [];
     if (!sameActions(list, drawn)) drawActions(list);
     markActions();
@@ -209,6 +231,13 @@ export function createAnnotateBar({
       moreList.hidden = !moreList.hidden;
       return;
     }
+    if (btn === linkBtn) {
+      const target = pendingLink;
+      win.getSelection()?.removeAllRanges();
+      hide();
+      if (target) onLink(target);
+      return;
+    }
     if (btn.dataset.action !== undefined) {
       const action = drawn[Number(btn.dataset.action)];
       if (!action || btn.disabled) return;
@@ -219,11 +248,18 @@ export function createAnnotateBar({
       return;
     }
     const preset = btn.dataset.index === undefined ? null : presets[Number(btn.dataset.index)];
-    const text = preset ? presetNote(pendingQuote, preset) : pendingQuote;
+    const text = preset ? presetNote(pendingQuote, presetParts(preset).text) : pendingQuote;
+    const fields = { ...pendingFields, source: pendingSource, range: pendingRange };
     win.getSelection()?.removeAllRanges();
     hide();
+    if (preset) onPreset(preset, fields);
     onQuote(text);
   });
 
   return { schedule, hide, el: bar };
 }
+
+// A preset's button label and note: a text is both.
+function presetParts(preset) {
+  return typeof preset === "string" ? { label: preset, text: preset } : { label: preset.label, text: preset.text };
+}

data/lib/samagotchi/web/public/app.js

@@ -30,6 +30,7 @@ import {
   restartWorkers,
   restartWeb,
   onAuthLost,
+  api,
 } from "./data.js";
 import { authProbe, createAuthLost } from "./auth_lost.js";
 import { REPLACE_SESSION_TEXT, fragmentCode, tradeFragmentCode } from "./token_fragment.js";
@@ -58,9 +59,12 @@ import { createTaskStopper } from "./task_stop.js";
 import { createSystemOneWrongAction } from "./system_one_wrong.js";
 import { appendQuote } from "./annotations.js";
 import { applyComposerText, applyRowTemplate, fetchApply } from "./review_apply.js";
+import { nameVerdictCards } from "./verdict_card.js";
+import { freshURL, placeVerdictWithFresh, settleRunning } from "./verdict_fresh.js";
 import { authorBadge, nameUnnamedBadges } from "./participant_names.js";
 import { parsePresets } from "./annotate_presets.js";
 import { createAnnotateBar } from "./annotate_bar.js";
+import { VERIFY_PRESET, withVerify } from "./verify_preset.js";
 import { actionLine, annotationActions, composerWithAction } from "./annotate_actions.js";
 import { copyText, installCopy } from "./copy.js";
 import { createQuestionCards } from "./question_cards.js";
@@ -70,6 +74,9 @@ import { mountComposer } from "./composer_mount.js";
 import { readStored, writeStored } from "./storage.js";
 import { createCommandList } from "./command_list.js";
 import { ALL_SESSIONS_HASH, sessionHash, sessionIdFromHash } from "./route.js";
+import {
+  claimFromHash, ownerClaimHash, participantClaimLink, selectionClaim, showClaim, turnIdOf,
+} from "./claim_link.js";
 import { scopeDir, scopeTemplate } from "./scope.js";
 import { html, render } from "./vendor/lit-html.js";
 import { shouldFollowScroll } from "./scroll.js";
@@ -175,7 +182,13 @@ const participantsControl = createParticipantsControl({
   startReview: (opts) => sessionActions.reviewSelected(opts),
   reviewing: () => sessionActions.reviewing.has(selected),
   // An older prompt drawn before the list came says "a participant": named now.
-  onNames: () => nameUnnamedBadges(document),
+  onNames: () => {
+    nameUnnamedBadges(document);
+    nameVerdictCards(historyEl, (author) => {
+      const badge = authorBadge(author);
+      return badge && !badge.unnamed ? badge.name : null;
+    });
+  },
   onChange: () => updateInfoBar(),
   toast: (text, action, options) => showToast(text, action, options),
 });
@@ -220,6 +233,7 @@ const infoCancelBtn = $("#infoCancelBtn");
 const composeHintEl = $("#composeHint");
 
 let selected = null;
+let pendingVerifyAnchor = null;
 // The session the composer's text was last written in ("" the start page,
 // undefined unknown): the composer is one for every session, and continue →
 // keeps only a draft of its own (fillOpener).
@@ -719,9 +733,61 @@ function setSessionHash(id) {
   history.replaceState(null, "", location.pathname + location.search + hash);
 }
 // A #/s/<id> typed or pasted into the address bar, or reached by back.
+// A claim link (claim_link.js; #/s/<id>?t=…&q=…, or the participant's
+// #s=<id>&t=… opened in this browser) opens its session and, once drawn,
+// shows the claim.
 function selectFromHash() {
-  const id = sessionIdFromHash(location.hash);
+  const claim = claimFromHash(location.hash);
+  const id = sessionIdFromHash(location.hash) || claim?.sessionId || null;
+  if (claim) pendingClaim = claim;
   if (id && id !== selected) select(id);
+  else if (claim) showPendingClaim();
+}
+let pendingClaim = null;
+// Where a claim's text can be on this page: answers, own messages, steps.
+const CLAIM_ROOTS = ".bubble.output, .bubble.user .user-message, .gen-text";
+// The claim link's quote scrolled to and marked, its text read as the
+// participant page shows it (the session's folder relative, home ~); a
+// quote not found marks its turn; neither found: the top, and a toast.
+// The hash is the session's again (select() already set it when it
+// switched), so the same link opened again is a hashchange.
+function showPendingClaim() {
+  const claim = pendingClaim;
+  if (!claim || claim.sessionId !== selected) return;
+  pendingClaim = null;
+  if (!allViewOpen() && location.hash !== sessionHash(selected)) {
+    history.replaceState(null, "", location.pathname + location.search + sessionHash(selected));
+  }
+  if (showClaim(historyEl, claim, { roots: CLAIM_ROOTS, opts: claimOpts() })) return;
+  historyEl.scrollTop = 0;
+  showToast("The linked turn isn't in this session.");
+}
+// How the participant page shows this page's text (claim_link.js).
+function claimOpts() {
+  return { home: document.body.dataset.home || "", cwd: current.dir || "" };
+}
+// Annotate's "Copy link" for a selection in a turn's answer, step or own
+// message: the participant page's link when the session has a person
+// active (it opens in the browser their review link was opened in: one
+// link per browser, the cookie), else this page's own.
+function claimLinkFor(source, range) {
+  if (!selected || !["answer", "step", "user"].includes(source.kind) || !historyEl.contains(source.root)) return null;
+  const turnId = turnIdOf(historyEl, source.root);
+  if (!turnId) return null;
+  const claim = { turnId, ...selectionClaim(source.root, range, claimOpts()) };
+  if (!claim.q) return null;
+  const target = participantsControl.claimTarget();
+  if (!target) {
+    return { url: `${location.origin}${location.pathname}${location.search}${ownerClaimHash(selected, claim)}`,
+             title: "A link to this on your page (no person is invited to this session)" };
+  }
+  const whose = target.names.map((name) => `${name}'s`).join(" or ");
+  return { url: participantClaimLink(target.base, selected, claim),
+           title: `A link to this for ${whose} browser: it opens where their review link was opened (one link per browser). Opened here, it shows your page.` };
+}
+async function copyClaimLink({ url }) {
+  if (await copyText(url)) showToast("Link copied");
+  else showToast(`Couldn't copy: ${url}`, null, { sticky: true });
 }
 function applyView() {
   const open = allViewOpen();
@@ -914,13 +980,16 @@ function clearNotice() {
 }
 promptEl.addEventListener("input", clearNotice);
 promptEl.addEventListener("input", () => noteDraft());
-// An emptied composer lets go of its Apply turn.
+// An emptied composer lets go of its Apply turn and its Verify claim.
 promptEl.addEventListener("input", () => {
-  if (!promptEl.value.trim()) deliveryControl.release();
+  if (promptEl.value.trim()) return;
+  deliveryControl.release();
+  pendingVerifyAnchor = null;
 });
 
 async function select(id) {
   clearNotice();
+  if (selected !== id) pendingVerifyAnchor = null;
   selected = id;
   setSessionHash(id);
   lists.paintActive();
@@ -1002,6 +1071,7 @@ async function resync({ endText = null } = {}) {
     const kept = keptCommandBubbles(historyEl, id);
     resetTurnView();
     renderSessionView(data, { kept });
+    showPendingClaim();
     // Preview is read-only: a worker is woken only by POST /turn, so attach
     // only when a live bridge exists.
     current.streamSeq = typeof data.last_event_seq === "number" ? (data.last_event_id || data.last_event_seq) : null;
@@ -1116,6 +1186,7 @@ function renderHistory(items) {
   }
   if (typeof items[0] === "object" && items[0].role) {
     historyEl.replaceChildren(turnHistoryNodes(items, current.timing, { thumbs: (images) => thumbsTemplate(selected, images), workingSet: !!workingSet }));
+    renderSavedVerdicts();
     // The live dividers count from the history's last activity.
     gapClock.seed(lastActivity(turnGroups(items, current.timing), items));
     linkTextRefs();
@@ -1257,6 +1328,44 @@ function placeApply(data) {
   appendToHistory(elementOf(applyRowTemplate(data.turn_id, badge)));
 }
 
+function placeVerdict(record) {
+  if (!record) return;
+  const known = (current.verdicts || []).some((item) => item.check_turn_id === record.check_turn_id);
+  if (!known) current.verdicts = [...(current.verdicts || []), record];
+  // A fresh verdict ends its check's "verifying fresh" (the card shows it).
+  if (record.fresh) current.verifyFresh = settleRunning(current.verifyFresh, record);
+  const badge = record.by && authorBadge(record.by);
+  placeVerdictWithFresh(historyEl, record, {
+    who: badge ? badge.name : "You",
+    author: record.by || null,
+  }, verifyFreshState());
+}
+
+// The owner's Verify fresh on an unclear verdict's card (verdict_fresh.js):
+// always theirs to start; its running check links to the child's session.
+function verifyFreshState() {
+  const id = selected;
+  if (!Array.isArray(current.verifyFresh)) current.verifyFresh = [];
+  return {
+    verdicts: current.verdicts || [],
+    running: current.verifyFresh,
+    canStart: !!id,
+    start: async (of) => {
+      try {
+        const body = await api(freshURL(id, of), { method: "POST", body: "{}" });
+        return { ok: true, child_id: body.child_id || null };
+      } catch (error) {
+        return { ok: false, error: error.message };
+      }
+    },
+    childHref: (childId) => sessionHash(childId),
+  };
+}
+
+function renderSavedVerdicts() {
+  for (const record of current.verdicts || []) placeVerdict(record);
+}
+
 // Apply: the owner's Apply turn into the composer, after what is typed
 // there; never sent from here.
 historyEl.addEventListener("click", async (e) => {
@@ -1494,6 +1603,7 @@ const streamHandlers = createStreamHandlers({
   workingSet,
   participantsControl,
   placeApply,
+  placeVerdict,
   sentIds,
   earlyRestores,
   stream: {
@@ -1599,6 +1709,8 @@ const sendTurnControl = createSendTurn({
   sentIds,
   earlyRestores,
   api: { createIdleSession, uploadImage, sendTurn },
+  verify: () => pendingVerifyAnchor,
+  clearVerify: (anchor) => { if (pendingVerifyAnchor === anchor) pendingVerifyAnchor = null; },
   dir: scope.dir,
   startPage,
   takeDelivery: () => deliveryControl.take(),
@@ -1821,9 +1933,11 @@ const updateSheet = createUpdateSheet({
 function showToast(text, action = null, options = {}) { toasts.show(text, action, options); }
 
 // Annotate (annotate_bar.js): a selection in the conversation offers
-// "Annotate" and the presets, which append a quote to the composer, and the
-// session's plugins' pills (chi.annotation, annotate_actions.js), which fill
-// the composer with their command line and the quote, or send it at once.
+// "Annotate" and the presets (then the built-in Verify: verify_preset.js),
+// which append a quote to the composer, the session's plugins' pills
+// (chi.annotation, annotate_actions.js), which fill the composer with their
+// command line and the quote, or send it at once, and Copy link in a turn
+// (claimLinkFor).
 function fillComposer(text) {
   openForVisit();
   promptEl.value = text;
@@ -1835,11 +1949,14 @@ function fillComposer(text) {
 }
 
 const annotateBar = createAnnotateBar({
-  presets: parsePresets(document.body.dataset.annotatePresets),
+  presets: withVerify(parsePresets(document.body.dataset.annotatePresets)),
   canAnnotate: () => !!selected && current.owner !== "tui",
   roots: turnRoots,
   isLive: (root) => liveTurn.running && turnDom.containsLive(root),
   onQuote: (text) => fillComposer(appendQuote(promptEl.value, text)),
+  onPreset: (preset, fields) => {
+    pendingVerifyAnchor = preset === VERIFY_PRESET ? verifyAnchorFor(fields) : null;
+  },
   actions: () => annotationActions(current.commands),
   running: () => liveTurn.running,
   onAction: (action, fields) => {
@@ -1847,8 +1964,17 @@ const annotateBar = createAnnotateBar({
     if (action.send) runSessionCommand(line);
     else fillComposer(composerWithAction(promptEl.value, action, line));
   },
+  link: claimLinkFor,
+  onLink: copyClaimLink,
   dock: () => $("#dock"),
 });
+
+function verifyAnchorFor({ source, range }) {
+  if (!source || !["answer", "step", "user"].includes(source.kind) || !historyEl.contains(source.root)) return null;
+  const turnId = turnIdOf(historyEl, source.root);
+  const quote = selectionClaim(source.root, range, claimOpts()).q;
+  return turnId && quote ? { turn_id: turnId, quote } : null;
+}
 historyEl.addEventListener("scroll", annotateBar.schedule);
 // A command bubble's Apply (CacheConfirm): sends the change's --yes line
 // once; its own bubble then says what it did.