samagotchi 0.14.0 → 0.16.0

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

@@ -16,7 +16,7 @@ import { activityDiffHtml } from "./diff_view.js";
 import { escapeHtml, messageBodyHtml, noteHtml, normalize, steerRowHtml } from "./format.js";
 import { thumbsHtml } from "./images.js";
 import { shouldFollowScroll } from "./scroll.js";
-import { hookNoticeLabel } from "./turn_events.js";
+import { emptyAnswerLine, hookNoticeLabel } from "./turn_events.js";
 import { cancelLineHtml, formatDuration, turnGroups, turnTimingText } from "./timing.js";
 import { createSentenceFeed } from "./sentences.js";
 import { createTicker } from "./thinking_ticker.js";
@@ -465,11 +465,15 @@ export function createTurnView({
   // +heldHeight+ (the live box's height, measured before the step closed) the
   // bubble is held at that height, scrolled to its tail, until answerReady()
   // (the rendered markdown landed) or 1.5 s reveals it.
-  function promote(gen, { heldHeight = 0 } = {}) {
+  // +endNote+: the notice of a turn that ended with no answer (app.js
+  // builds it), placed where the answer bubble would go.
+  function promote(gen, { heldHeight = 0, endNote = null } = {}) {
     const entry = genEls.get(gen);
     const bubble = entry.text;
-    bubble.className = "bubble output";
-    if (!gen.text) bubble.textContent = "";
+    // No text (an empty answer): no bubble, not even an empty one left in
+    // the step.
+    if (gen.text) bubble.className = "bubble output";
+    else bubble.remove();
     // A hidden tab gets no pop: nobody sees it, and its timers are throttled.
     const holding = useHold && heldHeight > 0 && !!gen.text && !document.hidden;
     let holdHeight = 0;
@@ -512,11 +516,12 @@ export function createTurnView({
       }
       pieces.push(...cards);
       if (gen.text) pieces.push(bubble);
+      else if (endNote) pieces.push(endNote);
       placeAnswer(pieces, { plain: true, blockEl });
       blockEl = null;
       blockSummaryEl = null;
     } else {
-      placeAnswer(gen.text ? [...cards, bubble] : cards, { plain: false, blockEl });
+      placeAnswer(gen.text ? [...cards, bubble] : [...cards, ...(endNote ? [endNote] : [])], { plain: false, blockEl });
       // The last step, left with its thinking only, reads "thinking" once.
       if (!gen.tools.length && gen.thinking) unwrapThinking(entry);
     }
@@ -524,8 +529,10 @@ export function createTurnView({
   }
 
   // Returns the cards that left the block (card.js leavesBlock), detached:
-  // app.js puts them after the turn's end line.
-  function turnEnded({ kind }) {
+  // app.js puts them after the turn's end line. +endNote+ (a completed turn
+  // with no answer): its notice, in the answer's place; left unplaced
+  // with no turn to end (app.js then shows it itself).
+  function turnEnded({ kind, endNote = null }) {
     // Once per turn: a second end (a re-dispatched event) would promote again.
     if (!turn || turn.ended) return [];
     const last = model.currentGen(turn);
@@ -541,7 +548,8 @@ export function createTurnView({
     const heldHeight = box ? box.getBoundingClientRect().height : 0;
     if (pendingSteers.length) flushSteers();
     apply(model.turnEnded(turn));
-    if (promoting) promote(last, { heldHeight });
+    if (promoting) promote(last, { heldHeight, endNote });
+    else if (endNote) placeAnswer([endNote], { plain: false, blockEl });
     const kept = [];
     if (blockEl) {
       updateBlockSummary();
@@ -678,6 +686,13 @@ function reloadRowHtml(r, thumbs) {
     `${r.images?.length ? thumbs(r.images) : ""}${r.diff ? activityDiffHtml(r.diff) : ""}</div>`;
 }
 
+// The notice of a turn that ended with no answer: a muted row like the
+// loop's retry row, where the answer would be (live: promote()).
+export const EMPTY_ANSWER_CLASS = "bubble hook-notice empty-answer";
+function emptyAnswerHtml(item) {
+  return `<div class="${EMPTY_ANSWER_CLASS}">${escapeHtml(emptyAnswerLine(item))}</div>`;
+}
+
 // A reloaded history in the turn view (renderHistory's object path): per
 // turn the prompt, a collapsed block of its steps when it had any (texts,
 // and with the server's parts the thinking, params and output, from the
@@ -687,8 +702,11 @@ function reloadRowHtml(r, thumbs) {
 export function turnHistoryHtml(items, timing, { thumbs }) {
   const timingHtml = (group) => {
     const record = group.record;
+    // Numbered by its place in the turn records, as live (a failed turn
+    // whose prompt went back still counts).
+    const at = (timing?.turnRecords || []).indexOf(record);
     return record && formatDuration(record.duration_ms)
-      ? `<div class="turn-timing">${escapeHtml(turnTimingText(group.turnIndex + 1, record.duration_ms, { canceled: record.status === "canceled" }))}</div>`
+      ? `<div class="turn-timing">${escapeHtml(turnTimingText(at >= 0 ? at + 1 : group.turnIndex + 1, record.duration_ms, { canceled: record.status === "canceled" }))}</div>`
       : "";
   };
   // The timing line after the bubble, not in it: where the live view
@@ -705,9 +723,13 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     const prompt = items[group.user];
     const parts = [`<div class="bubble user"${copySourceAttr(prompt, false)}><div class="user-message">${messageBodyHtml(prompt).body}${thumbs(prompt.images)}</div></div>`];
     const [only] = group.steps;
-    const noBlock = !group.steps.length ||
-      (group.steps.length === 1 && group.answer !== null && only.i === null && !only.tools.length && only.thinking);
-    if (group.steps.length === 1 && group.answer !== null && only.i === null && !only.tools.length && only.thinking) {
+    const ended = group.answer !== null || group.emptyAnswer != null;
+    const textless = only && (only.i === null || !String(items[only.i].content ?? ""));
+    // A lone thinking step before an answer (or the notice of a turn with
+    // none): no block, as live.
+    const plainThinking = group.steps.length === 1 && ended && textless && !only.tools.length && only.thinking;
+    const noBlock = !group.steps.length || plainThinking;
+    if (plainThinking) {
       // A plain answer with thinking: the collapsed thinking block, as live.
       parts.push(`<details class="bubble thinking"><summary>thinking</summary><div class="thinking-body">${escapeHtml(only.thinking)}</div></details>`);
     } else if (group.steps.length) {
@@ -733,9 +755,12 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
     // after its steps and before its answer.
     parts.push((group.merged || []).map((i) =>
       `<div class="bubble user steered" data-user-state="steered"${items[i].step ? ` data-step="${Number(items[i].step)}"` : ""}${copySourceAttr(items[i], false)}><div class="user-message">${messageBodyHtml(items[i]).body}${thumbs(items[i].images)}</div><span class="state-badge">steered</span></div>`).join(""));
+    // A turn that ended with no answer: chi's muted notice where the answer
+    // would be, before the timing, as live.
+    if (group.emptyAnswer != null) parts.push(`${emptyAnswerHtml(items[group.emptyAnswer])}${timingHtml(group)}`);
     // A turn with no answer (canceled, or running: no record yet) shows its
     // timing after its prompt and steps, where the live view leaves it.
-    if (group.answer === null) parts.push(timingHtml(group));
+    else if (group.answer === null) parts.push(timingHtml(group));
     else parts.push(answerHtml(items[group.answer], timingHtml(group)));
     // A canceled turn ends with its cancel line, as the live view left it.
     parts.push(cancelLineHtml(group.record, escapeHtml));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -301,6 +301,7 @@ files:
 - lib/samagotchi/plugin/sessions.rb
 - lib/samagotchi/plugin/side_question.rb
 - lib/samagotchi/plugin/tool_result.rb
+- lib/samagotchi/plugin_session_state.rb
 - lib/samagotchi/plugin_tasks.rb
 - lib/samagotchi/project_scope.rb
 - lib/samagotchi/prompt.rb
@@ -309,6 +310,10 @@ files:
 - lib/samagotchi/question_desk.rb
 - lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
+- lib/samagotchi/relay.rb
+- lib/samagotchi/relay_desk.rb
+- lib/samagotchi/relay_verifier.rb
+- lib/samagotchi/relay_watcher.rb
 - lib/samagotchi/reminder_queue.rb
 - lib/samagotchi/reminder_store.rb
 - lib/samagotchi/reply_wait.rb
@@ -365,6 +370,7 @@ files:
 - lib/samagotchi/tools/builtins.rb
 - lib/samagotchi/tools/cancel_reminder.rb
 - lib/samagotchi/tools/delegate.rb
+- lib/samagotchi/tools/delegate_relay.rb
 - lib/samagotchi/tools/delegate_result.rb
 - lib/samagotchi/tools/delegate_wait.rb
 - lib/samagotchi/tools/edit.rb