samagotchi 0.145.0 → 0.146.0

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

@@ -433,6 +433,8 @@ const questionCards = createQuestionCards({
   renderMarkdown,
   linkRefs: linkRefsIn,
   pairRefs: pairRefsIn,
+  // The bar's chip reads questionCards.pendingQuestion() (sessionWaits).
+  onPending: () => store.touch("infoBar"),
 });
 // The history's bubbles (bubbles.js): output, end lines, every client's
 // prompts, the recap, warnings and notices, command and note bubbles.
@@ -1508,9 +1510,11 @@ async function restartWorker() {
 
 // The session bar (info_bar_model.js sessionBar): its buttons, and the
 // info line rendered by info_bar.js.
-// The open session waits on the user: its summary says so, or its card is up.
+// The open session waits on the user: its card is up, or its summary says so
+// (not for a question answered here: the summary is a refresh behind).
 function sessionWaits() {
-  return !!(waitingOn(store.sessions.find((s) => s.id === store.selected)) || questionCards.pendingQuestion());
+  const summary = waitingOn(store.sessions.find((s) => s.id === store.selected));
+  return !!((summary && !questionCards.isResolved(summary.id)) || questionCards.pendingQuestion());
 }
 function updateInfoBar() {
   annotateBar?.refresh();

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

@@ -18,6 +18,7 @@
 // blank the page.
 
 import { quoteBlock } from "./annotations.js";
+import { isParticipantAuthor } from "./participant_model.js";
 
 // Where a node on the participant page came from: { kind, root, … } where
 // root is the element a selection is clipped to, or null.
@@ -69,7 +70,7 @@ export function participantQuote(text, source) {
 // participant route's: mine, author, author_name, automatic).
 export function messageAuthorData(message) {
   if (message?.mine) return { by: "me" };
-  if (message?.author) return { by: "participant", name: message.author_name || "" };
+  if (isParticipantAuthor(message?.author)) return { by: "participant", name: message.author_name || "" };
   if (message?.automatic) return { by: "automatic" };
   return { by: "owner" };
 }

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

@@ -41,13 +41,18 @@ import { plainText } from "./plain_line.js";
 //   own text; markdown_place.js pairRefsIn)
 // @param api {sendAnswer, dismissQuestion, sendCommand} (data.js)
 // @param doc the page's document
+// @param onPending (pending|null) called whenever the open question changes:
+//   the page touches the redraws that read pendingQuestion() (the session
+//   bar's waiting chip, docs/internals/web-frontend.md write -> redraw)
 // @return {renderQuestion(pq, {said}), resolveQuestion(id, opts), removeQuestion(),
 //   questionCard() (the live card or null), pendingQuestion() (or null),
+//   isResolved(id) (this page already saw that question answered),
 //   renderContinue(offer), resolveContinue(data), forgetContinue()}
 export function createQuestionCards({
   sessionId, clientId, place, isNearBottom, scrollToEnd, removeHintIfEmpty, askingText = () => "",
   renderMarkdown = () => Promise.resolve(null), linkRefs = () => {}, pairRefs = () => {},
   api = { sendAnswer, dismissQuestion, sendCommand }, doc = globalThis.document,
+  onPending = () => {},
 }) {
   // Live ask_user_question card, keyed by pending question id. Re-rendered from
   // pending_question on session select so a reload mid-question restores it.
@@ -57,6 +62,16 @@ export function createQuestionCards({
   let continueEl = null;
   // card → the reply that asked it, drawn under the summary once resolved.
   const saidOf = new WeakMap();
+  // The question last answered here: a session summary fetched earlier still
+  // names it as pending until the next refresh (isResolved).
+  let resolvedId = null;
+
+  // The one way the open question changes: +onPending+ is the page's hook for
+  // the redraws that read it (the session bar's waiting chip).
+  function setPending(next) {
+    pending = next;
+    onPending(pending);
+  }
 
   // +said+: the asking reply when the caller knows it (a reloaded card: its
   // step's text, "" for none); else the running turn's (askingText).
@@ -65,8 +80,8 @@ export function createQuestionCards({
     if (action === "same") return;
     // A resolved card stays where it was; only a pending one is replaced.
     if (action === "keep") questionEl = null;
-    else removeQuestionCard();
-    pending = pq;
+    else replaceQuestionCard();
+    setPending(pq);
     removeHintIfEmpty();
 
     const approval = approvalView(pq);
@@ -424,7 +439,7 @@ export function createQuestionCards({
   // The parent relayed the open question, or no longer does (question_relay).
   function markRelayed(id, relayedTo) {
     if (!questionEl || !pending || String(pending.id) !== String(id)) return;
-    pending = { ...pending, relayed_to: relayedTo || null };
+    setPending({ ...pending, relayed_to: relayedTo || null });
     questionEl.querySelector(".question-relayed")?.replaceWith(renderRelayedTo(pending));
   }
 
@@ -491,7 +506,8 @@ export function createQuestionCards({
     if (!questionEl.dataset.toggled) questionEl.open = false;
     // After the collapse: a card left open by hand renders at once.
     if (full) renderSaidOnOpen(questionEl, full, asked, refs);
-    pending = null;
+    resolvedId = pending.id;
+    setPending(null);
   }
 
   // The body's copy as markdown, from the card's first open on (a reload
@@ -546,11 +562,18 @@ export function createQuestionCards({
   }
 
   function removeQuestionCard() {
-    if (questionEl) {
-      questionEl.remove();
-      questionEl = null;
-    }
-    pending = null;
+    replaceQuestionCard();
+    setPending(null);
+  }
+
+  // The live card taken off the history because a new one takes its place:
+  // the question itself changes in the same step, so the hook is not touched
+  // for the in-between null.
+  function replaceQuestionCard() {
+    if (!questionEl) return;
+
+    questionEl.remove();
+    questionEl = null;
   }
 
   // ── continue card ──────────────────────────────────────────────────────────
@@ -653,6 +676,7 @@ export function createQuestionCards({
     removeQuestion: removeQuestionCard,
     questionCard: () => questionEl,
     pendingQuestion: () => pending,
+    isResolved: (id) => resolvedId !== null && String(resolvedId) === String(id),
     renderContinue: renderContinueCard,
     resolveContinue: resolveContinueCard,
     // The running turn's DOM was reset: a later offer draws a new card.

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

@@ -30,6 +30,7 @@ import { bubbleCopyText } from "./copy.js";
 import { foldLabel, keepRowInView, lineCount, readFolded, writeFold } from "./answer_fold.js";
 import { clip } from "./format.js";
 import { NOTE_BOUNDARY } from "./turn_range.js";
+import { workerPredates } from "./worker_features.js";
 import { SWAPPED_CLASS, VIEW_CLASS, stepVersion, switcherTemplate, viewOf } from "./revise_switch.js";
 
 // The classes and attributes this module puts on the history.
@@ -113,12 +114,12 @@ export function versionChipText(count, at = count - 1) {
 // the worker predates Revise turns).
 export const REVISE_UNAVAILABLE = "restart this session to use Revise";
 
-// The feature gate (app.js featureGates): a live worker without the
-// "revise" feature predates Revise turns (chi web would answer 409
-// revise_unavailable). A worker that isn't up isn't asked: the send wakes a
-// new one, which has it (as Verify's gate, verify_preset.js).
+// The feature gate (app.js featureGates): a live worker without the "revise"
+// feature predates Revise turns (chi web would answer 409 revise_unavailable).
+// A worker that isn't up isn't asked: the send wakes a new one, which has it
+// (worker_features.js's rule, the same as Verify's gate).
 export function reviseWorkerUnavailable(workerFeatures, bridgeUp) {
-  return bridgeUp === true && Array.isArray(workerFeatures) && !workerFeatures.includes("revise");
+  return workerPredates(workerFeatures, bridgeUp, "revise");
 }
 export function reviseChipText(label, { unavailable = false } = {}) {
   if (unavailable) return `Revise: ${REVISE_UNAVAILABLE}`;

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

@@ -6,6 +6,8 @@
 // module of its own: static JS is cached at unversioned URLs, and a new
 // export on an old module would blank the page.
 
+import { workerPredates } from "./worker_features.js";
+
 export const VERIFY_PRESET = Object.freeze({
   label: "Verify",
   text: "Verify this claim against the code. If this session's context doesn't settle it, say so. "
@@ -14,8 +16,10 @@ export const VERIFY_PRESET = Object.freeze({
 
 export const VERIFY_UNAVAILABLE = "restart this session to use Verify";
 
+// The Verify gate (app.js featureGates): a live worker without "verify"
+// predates Verify turns (worker_features.js's rule).
 export function verifyWorkerUnavailable(workerFeatures, bridgeUp) {
-  return bridgeUp === true && Array.isArray(workerFeatures) && !workerFeatures.includes("verify");
+  return workerPredates(workerFeatures, bridgeUp, "verify");
 }
 
 // +presets+ (annotate_presets.js parsePresets) with Verify after them.

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

@@ -0,0 +1,14 @@
+// One rule for the worker-side feature gates: a worker that is up and whose
+// features lack +feature+ predates it (chi web would answer 409
+// <feature>_unavailable), so the page says so instead of offering the action.
+// A worker that isn't up isn't asked: the send wakes a new one that has it.
+// Used by Verify's gate (verify_preset.js) and Revise's (revise_stack.js).
+//
+// A new module: the page's modules are cached at unversioned URLs, and a new
+// export of an old one (docs/internals/web-frontend.md) leaves a cached copy
+// without it.
+
+// @return [bool] true only for a live worker without the feature.
+export function workerPredates(workerFeatures, bridgeUp, feature) {
+  return bridgeUp === true && Array.isArray(workerFeatures) && !workerFeatures.includes(feature);
+}

data/lib/samagotchi/working_set.rb

@@ -235,7 +235,8 @@ module Samagotchi
     def shared_with(touch, key) = touch.share > 1 ? found_names(touch.run) - [key] : []
 
     # A memory_read's names (Tools::MemoryRead.parse_names: none for the
-    # index listing), less the ones its output says weren't found.
+    # index listing), less the ones its output says weren't found. Public:
+    # `chi memory usage` counts reads the same way (MemoryUsage).
     def found_names(run)
       names = Tools::MemoryRead.parse_names(run.call[:content].to_s)
       last = run.text.split(ToolResponse::SEPARATOR).last.to_s
@@ -308,6 +309,6 @@ module Samagotchi
 
     def field(hash, key) = hash.key?(key) ? hash[key] : hash[key.to_s]
 
-    private_class_method :all_touches, :touches, :failed?, :found_names, :shared_with, :item, :still_sent?, :dropped?, :with_id, :changed?, :stamp_of, :field
+    private_class_method :all_touches, :touches, :failed?, :shared_with, :item, :still_sent?, :dropped?, :with_id, :changed?, :stamp_of, :field
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.145.0
+  version: 0.146.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -487,6 +487,7 @@ files:
 - lib/samagotchi/memory_command.rb
 - lib/samagotchi/memory_orphans.rb
 - lib/samagotchi/memory_paths.rb
+- lib/samagotchi/memory_usage.rb
 - lib/samagotchi/message_parts.rb
 - lib/samagotchi/message_time.rb
 - lib/samagotchi/model_binding.rb
@@ -958,6 +959,7 @@ files:
 - lib/samagotchi/web/public/verify_card.css
 - lib/samagotchi/web/public/verify_preset.js
 - lib/samagotchi/web/public/verify_target.js
+- lib/samagotchi/web/public/worker_features.js
 - lib/samagotchi/web/public/working_set.js
 - lib/samagotchi/web/public/working_set_rail.js
 - lib/samagotchi/web/public/working_set_view.js