samagotchi 0.134.0 → 0.136.0

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

@@ -14,6 +14,11 @@ import { hookNoticeLabel, isReportClient, promptOps } from "./turn_events.js";
 import { drawCommandBubble } from "./commands.js";
 import { TIME_GAP_CLASS, timeGapEl } from "./time_gaps.js";
 
+// What a session's load places at a turn's prompt from the snapshot
+// (cards_place.js placeSnapshotCards): its cards, answered questions,
+// notices and warnings.
+const SNAPSHOT_PLACED = ".plugin-card, .bubble.question, .bubble.hook-notice, .bubble.guardrail-warning";
+
 export function removeQueuedBubble(bubble) {
   if (!bubble) return;
   const slot = bubble.parentElement?.classList.contains("ts-queued") ? bubble.parentElement : null;
@@ -105,7 +110,7 @@ export function setBubbleDelivery(bubble, delivery) {
 // @param appendToHistory (el) puts +el+ at the history's end (or the stage's,
 //   while it holds a turn), above the live timing line
 // @param isNearBottom () => whether the history follows its end
-// @param turnDom the running turn's view (stage_view.js / turn_view.js)
+// @param turnDom the running turn's DOM (stage_view.js)
 // @param findInTurnRoots (selector) => the matching elements in the history
 //   and the stage
 // @param shownTexts the running turn's texts on the page (shown_texts.js)
@@ -149,7 +154,7 @@ export function createBubbles({
 
   function addEndBubble(text, { stopped = false } = {}) {
     appendToHistory(elementOf(endBubbleTemplate(text, { stopped })));
-    if (!turnDom.holds?.()) historyEl.scrollTop = historyEl.scrollHeight;
+    if (!turnDom.holds()) historyEl.scrollTop = historyEl.scrollHeight;
   }
 
   // ── Prompt bubbles ───────────────────────────────────────────────────────
@@ -159,10 +164,11 @@ export function createBubbles({
 
   // The bubble a reload draws (turn_html.js), with this page's own fields.
   // +delivery+: how it went into a running turn (next_step, cut, queue): its
-  // queued badge says what it waits for.
-  function makeUserBubble(prompt, { state = null, label = null, enqueuedId = null, own = false, images = null, delivery = null, author = null, turnId = null } = {}) {
+  // queued badge says what it waits for. +source+: a delegate report's
+  // "delegate_report" (its fold row, answer_fold.js).
+  function makeUserBubble(prompt, { state = null, label = null, enqueuedId = null, own = false, images = null, delivery = null, author = null, turnId = null, source = null } = {}) {
     removeHint();
-    const div = elementOf(userBubbleTemplate({ content: prompt, turn_id: turnId }, {
+    const div = elementOf(userBubbleTemplate({ content: prompt, turn_id: turnId, source }, {
       label, state, own, enqueuedId, delivery, author, key: normalize(prompt), thumbs: thumbsTemplate(selected(), images),
     }));
     return placeFollowing(div);
@@ -182,10 +188,16 @@ export function createBubbles({
     return echoes.find((el) => el.dataset.userContent === text) || echoes[0] || null;
   }
 
+  // The running wake turn's id (a turn chi ran for reports), for its report's bubble.
+  let wakeTurnId = null;
+
   // Returns the bubble of the turn a turn_started starts (the stage takes it
   // into its prompt line), else null.
   function applyPromptOps(event) {
-    if (event.type === "turn_started") liveTurn.wakeStart = !!event.continue && isReportClient(event.origin?.client_id);
+    if (event.type === "turn_started") {
+      liveTurn.wakeStart = !!event.continue && isReportClient(event.origin?.client_id);
+      wakeTurnId = liveTurn.wakeStart ? event.turn_id || null : null;
+    }
     const ops = promptOps(event, { myId: clientId, known: (id) => !!bubbleById(id), unmatchedMerge: liveTurn.unmatchedMerge, wakeStart: liveTurn.wakeStart });
     if (event.type === "input_merged") liveTurn.unmatchedMerge = false;
     if (event.type === "pending_input_merged") liveTurn.unmatchedMerge = false;
@@ -194,7 +206,10 @@ export function createBubbles({
       if (op.op === "report") {
         liveTurn.unmatchedMerge = "report";
       } else if (op.op === "add") {
-        const bubble = makeUserBubble(op.prompt, { state: op.state, label: op.label, enqueuedId: op.enqueuedId, images: op.images, delivery: op.delivery, author: op.author });
+        // A report that opens a wake turn carries that turn's id, as a
+        // reload's does (its fold key); a merged one has none until reload.
+        const turnId = op.source && !op.state && liveTurn.wakeStart ? wakeTurnId : null;
+        const bubble = makeUserBubble(op.prompt, { state: op.state, label: op.label, enqueuedId: op.enqueuedId, images: op.images, delivery: op.delivery, author: op.author, source: op.source, turnId });
         if (op.state === "started") started = bubble;
         if (event.type === "pending_input_merged") liveTurn.wakeStart = false;
       } else if (op.op === "tag") {
@@ -239,10 +254,15 @@ export function createBubbles({
     const details = elementOf(recapTemplate(text, turnsSince, createdAt));
     // A stale one sits where it was written, above the turns it doesn't cover.
     // Never in the stage: a recap is between turns.
-    turnDom.settleFold?.();
+    turnDom.settleFold();
     const prompt = recapPlace(turnPromptBubbles(historyEl), turnsSince);
-    // Above that turn's gap divider too: the recap was written before the quiet stretch ended.
-    const before = prompt?.previousElementSibling?.matches(`.${TIME_GAP_CLASS}`) ? prompt.previousElementSibling : prompt;
+    // Above that turn's gap divider too: the recap was written before the quiet stretch ended. The
+    // snapshot's cards placed at that prompt (placed first) sit between the divider and the prompt.
+    // A delegate report's fold row (answer_fold.js) heads its prompt.
+    const head = prompt?.previousElementSibling?.matches(".answer-fold") ? prompt.previousElementSibling : prompt;
+    let back = head?.previousElementSibling;
+    while (back?.matches(SNAPSHOT_PLACED)) back = back.previousElementSibling;
+    const before = back?.matches(`.${TIME_GAP_CLASS}`) ? back : head;
     keepFollowing(historyEl, () => (before ? historyEl.insertBefore(details, before) : appendAboveLiveTiming(historyEl, details, liveTurn.timing.el)));
   }
 

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

@@ -10,9 +10,10 @@
 import { getSession, sendCommand } from "./data.js";
 import { cardPlace, drawCard, isCard, isNoticeCard, refreshCardBody, turnNoticePlace } from "./card.js";
 import { elementOf } from "./turn_html.js";
-import { stepText } from "./turn_view.js";
+import { stepText } from "./turn_block.js";
 import { llmContextNotice, noticeLine } from "./turn_events.js";
 import { hookNoticeTemplate, TURN_PROMPT, turnPromptBubbles } from "./bubbles.js";
+import { stillOn } from "./latest.js";
 
 // The elements of the reloaded turn that ends before +before+ (the next
 // turn's prompt, or null for the last turn), its prompt first.
@@ -145,10 +146,11 @@ export function createCardsPlace({
   function refreshCardBodies() {
     clearTimeout(cardBodiesTimer);
     const id = selected();
+    const still = stillOn(selected, id);
     cardBodiesTimer = setTimeout(async () => {
       try {
         const data = await api.getSession(id, { cards: true });
-        if (id !== selected()) return;
+        if (!still()) return;
         for (const card of data.cards || []) {
           const el = card.type === "card" && cardElement(card.id);
           if (el) refreshCardBody(el, card);

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

@@ -1,5 +1,5 @@
-// The popover shell a session-bar chip opens (llm_context_chip.js,
-// level_chip.js, the working set's): a div.ctx-popover on the body, placed
+// The popover shell a session-bar chip opens (settings_chip.js' ⚙ panel,
+// the working set's, the start page's panels): a div.ctx-popover on the body, placed
 // at the chip, opened by a click on it (delegated on +el+) or by open()
 // (another opener: the working set's rail and footprint), closed by a second
 // click, its × (data-act="close"), a click outside or Esc; focus goes back

data/lib/samagotchi/web/public/composer.css

@@ -24,6 +24,14 @@ body.no-glass .composer-card{background:var(--bg-panel);-webkit-backdrop-filter:
 body.has-session #composer{flex-wrap:wrap;row-gap:6px}
 #chips{display:flex;flex-wrap:wrap;gap:6px}
 #chips[hidden]{display:none}
+/* The armed Revise (revise_stack.js reviseChipTemplate): "Revising: ‹first line› ✕". */
+#reviseChip{display:flex;min-width:0}
+#reviseChip[hidden]{display:none}
+.revise-chip{display:inline-flex;align-items:center;gap:6px;max-width:100%;min-width:0;padding:2px 4px 2px 10px;border-radius:999px;border:1px solid var(--accent-border);background:var(--accent-bg);color:var(--text-2);font-size:12px;line-height:18px}
+.revise-chip.refused{border-color:var(--warn-border);background:var(--warn-bg);color:var(--warn-text)}
+.revise-chip-text{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.revise-chip-clear{flex:none;display:inline-flex;align-items:center;justify-content:center;width:20px;height:20px;min-height:0;padding:0;border:0;border-radius:999px;background:transparent;color:var(--text-muted);font-size:11px;cursor:pointer}
+.revise-chip-clear:hover{background:var(--bg-raised);color:var(--text-bright);filter:none}
 .chip{display:inline-flex;align-items:center;gap:6px;background:var(--accent-bg);border:1px solid var(--border-strong);border-radius:8px;padding:3px 4px 3px 3px;font-size:12px;max-width:220px}
 .chip img{width:32px;height:32px;object-fit:cover;border-radius:5px}
 .chip .chip-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

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

@@ -11,6 +11,7 @@ import { html, nothing, render } from "./vendor/lit-html.js";
 import { keepFocus } from "./keep_focus.js";
 import { popoverPlace } from "./chip_popover.js";
 import { cantText } from "./format.js";
+import { createLatest, stillOn } from "./latest.js";
 
 // "now", "3m", "2h", "4d" since an ISO time; "" for none.
 export function ageText(iso, now = Date.now()) {
@@ -106,7 +107,8 @@ export function createContextChips({ el, api, toast = () => {}, doc = document,
   let rows = [];
   let canAdd = false;
   let openName = null;
-  let loadSeq = 0;
+  // Only the newest list read for the open session is drawn (latest.js).
+  const latest = createLatest(() => sessionId);
   // The open row's text once read (view text), and the "+ URL" form's
   // state ({error, busy}).
   let text = null;
@@ -140,15 +142,15 @@ export function createContextChips({ el, api, toast = () => {}, doc = document,
   async function refresh() {
     const id = sessionId;
     if (!id) return;
-    const seq = ++loadSeq;
+    const fresh = latest.begin();
     try {
       const data = await api.list(id);
-      if (seq !== loadSeq || id !== sessionId) return;
+      if (!fresh()) return;
       rows = data.sources || [];
       canAdd = data.can_add_url === true;
     } catch {
       // A session the server doesn't know (gone, or an older chi web): no chips.
-      if (seq !== loadSeq || id !== sessionId) return;
+      if (!fresh()) return;
       rows = [];
       canAdd = false;
     }
@@ -234,15 +236,16 @@ export function createContextChips({ el, api, toast = () => {}, doc = document,
     const url = form.elements.url.value.trim();
     const why = form.elements.why.value.trim();
     if (!id || !url) return;
+    const still = stillOn(() => sessionId);
     drawAdd({ busy: true });
     try {
       const data = await api.add(id, { url, why: why || undefined });
-      if (id !== sessionId) return;
+      if (!still()) return;
       close();
       await refresh();
       toast(`Attached ${data.name}: the agent gets a note before your next message`);
     } catch (e) {
-      if (id !== sessionId || openName !== ADD) return;
+      if (!still() || openName !== ADD) return;
       // The same form again: what the user typed stays; the URL gets focus.
       drawAdd({ busy: false, error: e.message });
       pop.querySelector('input[name="url"]')?.focus();

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

@@ -130,7 +130,7 @@ export function uploadImage(id, file, name, opts = {}) {
 // (mergeTiming), and opts.turnId asks for that turn's answer.
 // opts.timing: the whole timing alone (when the merge came up short).
 // opts.parts: each saved message with what it did (thinking, tool calls
-// and their output), for the turn view's reload.
+// and their output), for the turn block's reload.
 export function getSession(id, { tail, recent, turnId, timing, parts, cards, ...opts } = {}) {
   let query = cards ? "?cards=1" : tail ? "?tail=1" : timing ? "?timing=1" : parts ? "?parts=1" : "";
   if (tail && recent) query += "&recent=1";
@@ -144,12 +144,14 @@ export function getSession(id, { tail, recent, turnId, timing, parts, cards, ...
 // image-only send, whose text is only its [image: …] placeholders).
 // delivery: what the message does to a running turn ("cut": /cut TEXT);
 // none = the server's default (the next step).
-export function sendTurn(id, prompt, { clientId, images, history = true, delivery = null, verify = null, ...opts } = {}) {
+export function sendTurn(id, prompt, { clientId, images, history = true, delivery = null, verify = null, revises = null, ...opts } = {}) {
   const body = clientId ? { prompt, client_id: clientId } : { prompt };
   if (images?.length) body.images = images;
   if (delivery) body.delivery = delivery;
   if (history === false) body.history = false;
   if (verify) body.verify = verify;
+  // A Revise turn's draft: {turn_id} of the answer it rewrites.
+  if (revises) body.revises = revises;
   return api(`/api/sessions/${id}/turn`, {
     method: "POST",
     body: JSON.stringify(body),

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

@@ -21,7 +21,7 @@ import { toastBottom } from "./toast_place.js";
 // model panel (toast_place.js); with no card in sight (the start page, all
 // sessions) the CSS's 24 px from the bottom (--toast-bottom unset).
 //
-// +stageEl+: the stage (stage view) or null (turn view). +atHistoryEnd()+:
+// +stageEl+: the stage (stage_view.js). +atHistoryEnd()+:
 // the reader is at the history's end (app.js, scroll.js's threshold).
 // +reduce()+ / +ease+: prefers-reduced-motion and the eased follow
 // (scroll.js), defaults the page's.
@@ -37,7 +37,7 @@ export function createDockReserve({
   const win = doc.defaultView;
 
   function dockReserve() {
-    const shown = stageEl && !stageEl.hidden && !stageEl.classList.contains("leaving");
+    const shown = !stageEl.hidden && !stageEl.classList.contains("leaving");
     return dockEl.offsetHeight + (shown ? stageEl.offsetHeight + STAGE_GAP : 0);
   }
   const historyEnd = () => historyEl.scrollHeight - historyEl.clientHeight;
@@ -48,7 +48,7 @@ export function createDockReserve({
   // counts as at the end.
   function updateReserve({ fromStage = false } = {}) {
     const follow = atHistoryEnd() || historyEl.dataset.following !== undefined;
-    const leaving = !!stageEl?.classList.contains("leaving");
+    const leaving = stageEl.classList.contains("leaving");
     centerEl.classList.toggle("reserve-easing", leaving);
     const reserve = `${dockReserve()}px`;
     const changed = centerEl.style.getPropertyValue("--dock-h") !== reserve;
@@ -83,18 +83,16 @@ export function createDockReserve({
 
   const dockObserver = new win.ResizeObserver((entries) => updateReserve({ fromStage: entries.some((e) => e.target === stageEl) }));
   dockObserver.observe(dockEl);
-  if (stageEl) {
-    dockObserver.observe(stageEl);
-    // Only showing, hiding and leaving change the reserve (not the stage's
-    // other classes: waiting, in-use…).
-    let stageShown = "";
-    new win.MutationObserver(() => {
-      const shown = `${stageEl.hidden}|${stageEl.classList.contains("leaving")}`;
-      if (shown === stageShown) return;
-      stageShown = shown;
-      updateReserve({ fromStage: true });
-    }).observe(stageEl, { attributes: true, attributeFilter: ["class", "hidden"] });
-  }
+  dockObserver.observe(stageEl);
+  // Only showing, hiding and leaving change the reserve (not the stage's
+  // other classes: waiting, in-use…).
+  let stageShown = "";
+  new win.MutationObserver(() => {
+    const shown = `${stageEl.hidden}|${stageEl.classList.contains("leaving")}`;
+    if (shown === stageShown) return;
+    stageShown = shown;
+    updateReserve({ fromStage: true });
+  }).observe(stageEl, { attributes: true, attributeFilter: ["class", "hidden"] });
   win.addEventListener("resize", () => placeToast());
   // The model panel opening, closing or changing height (its list filters).
   new win.ResizeObserver(() => placeToast()).observe(modelPanelEl);

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

@@ -0,0 +1,33 @@
+// The open session's feature gates: a page action that its worker must
+// support (its sidecar features, a live bridge), and the redraw that
+// follows when that flips. Registered with the session store as its
+// `featureGates` redraw (session_store.js ORDER): it runs whenever a field
+// it reads changes, and a gate's own redraw only when its answer flipped.
+//
+// A session switch (forgetSession) and a full load (renderSessionView) draw
+// every card with the gate's answer already: they prime() the gates, so the
+// redraw that follows their write sees no flip. A write anywhere else (a
+// restart's hub event bringing the feature, the worker going) fires it.
+//
+// A new module: the page's modules are cached at unversioned URLs, and a
+// new export of an old module would leave a cached copy without it.
+
+// @param entries [{name, unavailable(current) → bool, redraw()}]
+// @return {prime(current), check(current)}: prime takes each gate's answer
+//   without redrawing; check redraws the gates whose answer flipped since
+export function createFeatureGates(entries) {
+  const last = new Map();
+  return {
+    prime(current) {
+      for (const gate of entries) last.set(gate.name, !!gate.unavailable(current));
+    },
+    check(current) {
+      for (const gate of entries) {
+        const now = !!gate.unavailable(current);
+        const flipped = last.has(gate.name) && last.get(gate.name) !== now;
+        last.set(gate.name, now);
+        if (flipped) gate.redraw();
+      }
+    },
+  };
+}

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

@@ -1,21 +1,25 @@
 // The one way a jump into the history shows what it lands on: whatever
 // hides +el+ unfolds: a closed <details> around it (a turn's steps block, a
-// step, a diff), an answer folded by hand (answer_fold.js: its row follows
-// the bubble's class; the jump's unfold isn't saved). Every jump goes through it (claim_link.js
-// showClaim, refs.js showRow and so the working set's step tags,
-// verdict_card.js "View check"), so a new way to hide history is opened in
-// one place.
+// step, a diff), an answer or a delegate report folded (answer_fold.js: its row follows
+// the bubble's class; the jump's unfold isn't saved), a superseded version
+// of a Revise stack (revise_stack.js: its stub opens, not saved). Every
+// jump goes through it (claim_link.js showClaim, refs.js showRow and so the
+// working set's step tags, verdict_card.js "View check"), so a new way to
+// hide history is opened in one place.
 //
 // Pure DOM, so it runs under `node --test` with happy-dom. A module of its
 // own: static JS is cached at unversioned URLs, and a new export on an old
 // module would blank the page.
 
+import { openStubOver } from "./revise_stack.js";
+
 // Opens each closed <details> that holds +el+ (not +el+ itself: a fold the
 // caller means to open it opens itself) and unfolds the folded answer that
 // is or holds it. +el+, or null.
 export function revealInHistory(el) {
   if (!el) return null;
-  el.closest?.(".bubble.output.folded")?.classList.remove("folded");
+  openStubOver(el);
+  el.closest?.(".bubble.folded")?.classList.remove("folded");
   for (let details = el.parentElement?.closest("details"); details; details = details.parentElement?.closest("details")) {
     details.open = true;
   }