samagotchi 0.97.0 → 0.98.0

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

@@ -174,6 +174,26 @@ export function askingText(turn) {
   return gen.text.trim();
 }
 
+// A plugin's refs on the reply that asks (a question's refs, from its
+// pending question): kept on the asking step's gen, the last one, while
+// the turn goes on, for the stage's asking slot (askingRefs) and the
+// step's closed text (turn_view.js). A non-array or an empty list keeps
+// what the gen has. The gen, or null.
+export function questionRefs(turn, refs) {
+  if (!turn || turn.ended || !Array.isArray(refs) || !refs.length) return null;
+  const gen = turn.gens[turn.gens.length - 1];
+  if (!gen) return null;
+  gen.refs = refs;
+  return gen;
+}
+
+// The refs on the asking text (questionRefs), while it shows
+// (askingText's rule); else null.
+export function askingRefs(turn) {
+  if (!askingText(turn)) return null;
+  return turn.gens[turn.gens.length - 1].refs || null;
+}
+
 // The turn is over (completed, canceled, failed, the worker gone).
 export function turnEnded(turn) {
   const closed = closeCurrent(turn);

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

@@ -21,7 +21,7 @@
 // chrome (CSS :has), so a plain answer streams like today's bubble, and is
 // removed at the end: the answer bubble takes its place.
 import { html, nothing, render } from "./vendor/lit-html.js";
-import { setAnswerRefs } from "./answer_refs.js";
+import { answerRefsOf, setAnswerRefs } from "./answer_refs.js";
 import { bindRowRefs } from "./refs.js";
 import { leavesBlock } from "./card.js";
 import { failedTurnText, normalize, sourceLabel } from "./format.js";
@@ -70,13 +70,14 @@ function thinkingTemplate({ body, wrapped = true, line = null, cls = "thinking",
 // the newest last), the live "…" until the first one, or a closed step's
 // full text. None when there is nothing to say. A closed step's text is
 // set whole (.textContent): its refs (ref_scan.js) split it into spans
-// that a text part's update would leave behind.
-function textTemplate(text, { live, sentences, placeholder }) {
+// that a text part's update would leave behind. +at+: a reloaded step's
+// message index, for its refs (data-answer-at, as an answer's).
+function textTemplate(text, { live, sentences, placeholder, at = null }) {
   if (live && sentences?.length) {
     return html`<div class="gen-text streaming"><div class="narration">${sentences.map((s) => html`<div class="sentence">${s}</div>`)}</div></div>`;
   }
   if (live) return placeholder ? html`<div class="gen-text streaming">…</div>` : nothing;
-  return text ? html`<div class="gen-text" .textContent=${text}></div>` : nothing;
+  return text ? html`<div class="gen-text" data-answer-at=${at ?? nothing} .textContent=${text}></div>` : nothing;
 }
 
 // One step, live or reloaded. +gen+: { text, thinking, tools, answer } (a
@@ -86,16 +87,17 @@ function textTemplate(text, { live, sentences, placeholder }) {
 // answers, its +items+ (tool rows, notices, cards: nodes or templates; a
 // reload's are its rows' nodes), the thinking +body+ node, the ticker's
 // +line+, the narration's +sentences+ and "…" +placeholder+, +on+ (the
-// click and toggle handlers).
+// click and toggle handlers). A reload's +at+: the step's message index
+// (textTemplate).
 export function stepTemplate(gen, st = {}) {
   const { live = false, index = 0, open = live, steers = [], items = [], body = gen.thinking, line = null,
-    sentences = null, placeholder = false, on = {} } = st;
+    sentences = null, placeholder = false, on = {}, at = null } = st;
   const text = gen.answer ? "" : gen.text || "";
   const label = live ? { repeats: false, content: `step ${index + 1}` } : closedLabel({ ...gen, text });
   const failed = !live && model.failedCount(gen.tools) > 0;
   // A step left with its thinking only reads "thinking" once.
   const wrapped = live || !!text || gen.tools.length > 0;
-  return html`<details class=${`gen${live ? " live" : ""}${failed ? " has-failed" : ""}`} .open=${open}><summary class=${label.repeats ? "repeats" : nothing} @click=${on.stepClick ?? nothing}>${label.content}</summary>${steers}${gen.thinking ? thinkingTemplate({ body, wrapped, line, on }) : nothing}${textTemplate(text, { live, sentences, placeholder })}${items.length ? html`<div class="activity-body">${items}</div>` : nothing}</details>`;
+  return html`<details class=${`gen${live ? " live" : ""}${failed ? " has-failed" : ""}`} .open=${open}><summary class=${label.repeats ? "repeats" : nothing} @click=${on.stepClick ?? nothing}>${label.content}</summary>${steers}${gen.thinking ? thinkingTemplate({ body, wrapped, line, on }) : nothing}${textTemplate(text, { live, sentences, placeholder, at })}${items.length ? html`<div class="activity-body">${items}</div>` : nothing}</details>`;
 }
 
 // A hook's line (hook_notice) as a step's row. data.line is a whole row of
@@ -254,6 +256,10 @@ export function createTurnView({
       live: !entry.closed, index: entry.index, open: entry.open, steers: entry.steers, items: entry.items,
       body: entry.thinkingText, line: entry.line, sentences: entry.sentences, placeholder: entry.placeholder, on: entry.on,
     }), entry.frag, { renderBefore: entry.end });
+    // A closed step that asked a question knows its refs (model.questionRefs):
+    // the page pairs them with its text at the turn's end (linkTextRefs).
+    const text = entry.closed && entry.gen.refs ? entry.el?.querySelector(":scope > .gen-text") : null;
+    if (text && !answerRefsOf(text)) setAnswerRefs(text, entry.gen.refs);
   }
 
   // A step's nodes (lit's start marker, the <details>, the end marker), to
@@ -776,6 +782,10 @@ export function createTurnView({
     // The running turn's asking reply (turn_model.js askingText): what a
     // question or approval card keeps once answered.
     askingText: () => model.askingText(turn),
+    // A question's refs (its pending question's) on the step that asks it.
+    questionRefs(refs) {
+      if (turn) model.questionRefs(turn, refs);
+    },
     step(i) {
       const entry = turn && genEls.get(turn.gens[i]);
       return entry ? { el: entry.el, summary: entry.el.querySelector(":scope > summary"), thinkingWrap: thinkingWrap(entry) } : null;
@@ -880,6 +890,8 @@ export function turnHistoryNodes(items, timing, { thumbs }) {
         // The steers the step answered first, where the live rows went.
         steers: (group.steps[k].steers || []).map((i) => steerTemplate(i, false)),
         items: gen.tools.length ? [rowNodes(gen.tools, thumbs)] : [],
+        // Its text knows its message's refs (a question's), as an answer does.
+        at: group.steps[k].i,
       }));
       parts.push(html`<details class="turn-work done"><summary>${model.blockSummary({ gens, ended: true })}</summary>${steps}</details>`);
       outlines.push(gens);
@@ -910,8 +922,9 @@ export function turnHistoryNodes(items, timing, { thumbs }) {
   const out = nodesOf(parts);
   // A finished turn's block as the live end leaves it: its outline, open.
   [...out.children].filter((el) => el.matches(".turn-work")).forEach((block, i) => outlineBlock(block, outlines[i] || []));
-  // Each answer bubble knows its message's refs (answer_refs.js; the
-  // page pairs them after the render), the index stays out of the DOM.
+  // Each answer bubble and step text knows its message's refs
+  // (answer_refs.js; the page pairs them after the render), the index
+  // stays out of the DOM.
   for (const bubble of out.querySelectorAll("[data-answer-at]")) {
     setAnswerRefs(bubble, items[Number(bubble.dataset.answerAt)]?.display_refs);
     bubble.removeAttribute("data-answer-at");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.97.0
+  version: 0.98.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -485,6 +485,7 @@ files:
 - lib/samagotchi/prompt_note.rb
 - lib/samagotchi/prompt_warmup.rb
 - lib/samagotchi/question_answer.rb
+- lib/samagotchi/question_asked.rb
 - lib/samagotchi/question_desk.rb
 - lib/samagotchi/queued_command.rb
 - lib/samagotchi/reasoning_history.rb