samagotchi 0.15.0 → 0.16.0

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

@@ -8,8 +8,26 @@ export function isApproval(pq) {
   return !!pq && pq.kind === "approval";
 }
 
-// @return {null | {tool, what, isCommand, where, why, preview?}}; preview is
-// an edit/write's dry-run diff (diff_view.js draws it)
+// A delegate's approval relayed to this session's user (the approval
+// relay): who asks (the chain, "ab12 → cd34" for a grandchild's) and its
+// task, or null.
+// @return {null | {who, childId, childShort, task, more}}
+export function relayView(pq) {
+  const r = pq && pq.relay;
+  if (!r || typeof r !== "object" || !r.child_id) return null;
+  const chain = Array.isArray(r.chain) && r.chain.length ? r.chain : [String(r.child_id).slice(0, 8)];
+  return {
+    who: [...chain].reverse().join(" → "),
+    childId: String(r.child_id),
+    childShort: r.child_short || String(r.child_id).slice(0, 8),
+    task: r.task ? String(r.task) : "",
+    more: Number(r.more) || 0,
+  };
+}
+
+// @return {null | {tool, what, isCommand, where, why, preview?, delegate?}};
+// preview is an edit/write's dry-run diff (diff_view.js draws it); delegate
+// is relayView's, for a delegate's approval
 export function approvalView(pq) {
   if (!isApproval(pq)) return null;
   const a = pq.approval || {};
@@ -33,12 +51,34 @@ export function approvalView(pq) {
     where,
     why: `${reason} (${who})`,
     ...(a.preview && typeof a.preview === "object" ? { preview: a.preview } : {}),
+    ...(relayView(pq) ? { delegate: relayView(pq) } : {}),
   };
 }
 
+// This session's question waits in its parent's card too (the parent
+// relayed it): the parent's id and short id, or null.
+// @return {null | {parentId, parentShort}}
+export function relayedToView(pq) {
+  const r = pq && pq.relayed_to;
+  if (!r || typeof r !== "object" || !r.parent_id) return null;
+  return { parentId: String(r.parent_id), parentShort: r.parent_short || String(r.parent_id).slice(0, 8) };
+}
+
+// How a relayed approval's card closed without an answer here: the
+// delegate's question was answered there, its worker went, or this turn
+// stopped (the question still waits in the delegate). A dismiss here
+// denied it.
+function relayClosedText(relay, reason) {
+  if (reason === "answered_on_child") return `Answered in ${relay.who}`;
+  if (reason === "child_gone") return `${relay.who}'s worker is gone`;
+  return reason ? `Left open in ${relay.who} (${reason})` : `Left open in ${relay.who}`;
+}
+
 // The line a resolved card shows.
 export function resultText(pq, { answer = null, cancelled = false, reason = "" } = {}) {
   const approval = isApproval(pq);
+  const relay = relayView(pq);
+  if (cancelled && relay && reason !== "dismissed") return relayClosedText(relay, reason);
   if (cancelled) {
     const label = approval ? "Denied" : "Cancelled";
     return reason ? `${label} (${reason})` : label;
@@ -70,8 +110,10 @@ export function truncate(text, n = 80) {
 export function summaryText(pq, { answer = null, cancelled = false, reason = "" } = {}) {
   if (cancelled || answer) {
     const result = resultText(pq, { answer, cancelled, reason }).replace(/^Answered: /, "");
+    const relay = relayView(pq);
     const asked = summaryAsked(pq);
-    return truncate(asked ? `${truncate(asked, 60)} → ${result}` : result, 120);
+    const text = asked ? `${truncate(asked, 60)} → ${result}` : result;
+    return truncate(relay ? `${relay.who}: ${text}` : text, 120);
   }
   const label = isApproval(pq) ? `Approve ${pq.approval?.label || pq.approval?.tool || "call"}?` : "Question";
   return truncate(pq.header || label);

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

@@ -14,7 +14,8 @@
 
 import { dismissQuestion, sendAnswer, sendCommand } from "./data.js";
 import { diffHtml } from "./diff_view.js";
-import { approvalAllowed, approvalView, nextCardAction, resultText, summaryText } from "./question_card.js";
+import { approvalAllowed, approvalView, nextCardAction, relayedToView, resultText, summaryText } from "./question_card.js";
+import { sessionHash } from "./route.js";
 import { clientLabel, continueLine, isOwn } from "./turn_events.js";
 
 // @param sessionId () => the open session's id (answers go there)
@@ -64,6 +65,8 @@ export function createQuestionCards({
     // left it (rememberToggle-style, as turn_view.js does).
     summary.addEventListener("click", () => { card.dataset.toggled = "1"; });
 
+    // Relayed to the parent: say where else it waits (QuestionDesk#annotate).
+    card.appendChild(renderRelayedTo(pq));
     if (approval) {
       card.appendChild(renderApprovalDetails(approval));
     } else {
@@ -170,6 +173,23 @@ export function createQuestionCards({
   function renderApprovalDetails(view) {
     const box = doc.createElement("div");
     box.className = "approval-details";
+    // A delegate's approval: who asks, and its task.
+    if (view.delegate) {
+      const who = doc.createElement("div");
+      who.className = "approval-delegate";
+      const label = doc.createElement("span");
+      label.className = "approval-label";
+      label.textContent = "delegate ";
+      who.appendChild(label);
+      const name = doc.createElement("a");
+      name.className = "approval-delegate-link";
+      name.href = sessionHash(view.delegate.childId);
+      name.title = "Open the delegate's session";
+      name.textContent = view.delegate.who;
+      who.appendChild(name);
+      if (view.delegate.task) who.appendChild(doc.createTextNode(` · ${view.delegate.task}`));
+      box.appendChild(who);
+    }
     const tool = doc.createElement("div");
     tool.className = "approval-tool";
     tool.textContent = view.tool;
@@ -203,6 +223,32 @@ export function createQuestionCards({
     return box;
   }
 
+  // "Waiting for approval in parent ab12: answering here works too", or
+  // an empty (hidden) line while the question isn't relayed.
+  function renderRelayedTo(pq) {
+    const line = doc.createElement("div");
+    line.className = "question-relayed";
+    const view = relayedToView(pq);
+    if (!view) {
+      line.classList.add("hidden");
+      return line;
+    }
+    line.appendChild(doc.createTextNode(`Waiting for ${pq.kind === "approval" ? "approval" : "an answer"} in parent `));
+    const link = doc.createElement("a");
+    link.href = sessionHash(view.parentId);
+    link.textContent = view.parentShort;
+    line.appendChild(link);
+    line.appendChild(doc.createTextNode(": answering here works too"));
+    return line;
+  }
+
+  // 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 };
+    questionEl.querySelector(".question-relayed")?.replaceWith(renderRelayedTo(pending));
+  }
+
   function resolveQuestionCard(id, { answer = null, cancelled = false, reason = "" } = {}) {
     if (!questionEl) return;
     if (id && pending && String(pending.id) !== String(id)) return;
@@ -225,6 +271,7 @@ export function createQuestionCards({
     questionEl.appendChild(note);
     questionEl.classList.remove("submitting");
     disableQuestionInputs();
+    questionEl.querySelector(".question-relayed")?.classList.add("hidden");
     // The summary becomes the result; the card collapses to that one line
     // unless the user opened or closed it by hand.
     const summary = questionEl.querySelector("summary");
@@ -343,6 +390,7 @@ export function createQuestionCards({
   return {
     renderQuestion: renderQuestionCard,
     resolveQuestion: resolveQuestionCard,
+    markRelayed,
     removeQuestion: removeQuestionCard,
     questionCard: () => questionEl,
     pendingQuestion: () => pending,

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

@@ -78,7 +78,14 @@ const WAITING_BADGES = {
 // @return null | {kind, text, title}
 export function waitingBadge(summary) {
   const waiting = waitingOn(summary);
-  return waiting ? { kind: waiting.reason, ...WAITING_BADGES[waiting.reason] } : null;
+  if (!waiting) return null;
+  // A delegate's approval waiting in its parent's card (the approval relay).
+  const parent = summary.pending_question?.relayed_to;
+  if (parent && waiting.reason !== "card") {
+    return { kind: waiting.reason, text: `in parent ${parent}`,
+      title: `Waiting for your ${waiting.reason} in parent session ${parent} (answering here works too)` };
+  }
+  return { kind: waiting.reason, ...WAITING_BADGES[waiting.reason] };
 }
 
 // What the all view's search matches for a session that waits on the user:

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

@@ -88,6 +88,8 @@ export function isPlain(turn) {
 }
 
 const END_PHASES = { completed: "answered", canceled: "canceled" };
+// A completed turn whose model returned nothing (the turn view's notice).
+const NO_ANSWER = "no answer";
 
 // What the live slots show for +turn+:
 //   phase    the status row's word;
@@ -100,14 +102,17 @@ const END_PHASES = { completed: "answered", canceled: "canceled" };
 //   trail    the last three finished calls, newest last (a file's title
 //            without its dir);
 //   ticks    one per call: {kind, status, step (the gen's index)}.
-// +pending+: a card waits for the user; +ended+: the turn's end kind.
-export function liveSlots(turn, { narration = "", thinking = "", pending = false, ended = null } = {}) {
+// +pending+: a card waits for the user; +ended+: the turn's end kind;
+// +emptyAnswer+: a completed turn ended with no answer
+// (turn_summary.empty_answer), so it reads "no answer", not "answered".
+export function liveSlots(turn, { narration = "", thinking = "", pending = false, ended = null, emptyAnswer = false } = {}) {
   const gens = turn?.gens || [];
   const rows = gens.flatMap((gen, step) => gen.tools.map((row) => ({ row, step })));
   const running = [...rows].reverse().find(({ row }) => row.status === "running")?.row || null;
   const current = gens[gens.length - 1];
   let phase;
-  if (ended) phase = END_PHASES[ended] || "failed";
+  if (ended === "completed" && emptyAnswer) phase = NO_ANSWER;
+  else if (ended) phase = END_PHASES[ended] || "failed";
   else if (pending) phase = "waiting for you";
   else if (running) phase = "running a tool";
   else if (current?.text && isPlain(turn)) phase = "writing the answer";

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

@@ -26,7 +26,7 @@ const PENDING = ".bubble.question:not(.answered):not(.cancelled), .bubble.contin
 // asks the user too, but the turn goes on: it waits only while the turn runs
 // and never holds the hand-off (a turn cut short can leave it open).
 const ASKS = ".plugin-card[data-in-turn] .card-action";
-const MARKS = { answered: "✓", canceled: "■", failed: "✕" };
+const MARKS = { answered: "✓", "no answer": "∅", canceled: "■", failed: "✕" };
 // The mark of a flash in the trail: a warn notice, a hook's info notice, a
 // plugin's nudge (steer).
 const FLASH_MARKS = { warn: "⚠", info: "ℹ", steer: "↪" };
@@ -93,6 +93,8 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
   // The turn in the stage, from turnStarted until the hand-off (or a reset).
   let holding = false;
   let endKind = null;
+  // The ended turn had no answer (turn_summary.empty_answer).
+  let emptyAnswer = false;
   let settled = true;
   let settleTimer = null;
   let startedAt = 0;
@@ -175,7 +177,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     // A question blocks the turn: its card takes the live slots' room. An
     // asking card's turn goes on: the status waits, the slots stay.
     const blocked = pendingCard();
-    const slots = liveSlots(turn, { narration, thinking, pending: blocked || asksCard(), ended: endKind });
+    const slots = liveSlots(turn, { narration, thinking, pending: blocked || asksCard(), ended: endKind, emptyAnswer });
 
     stage.classList.toggle("plain", plain);
     stage.classList.toggle("ended", !!endKind);
@@ -452,6 +454,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     clearTimeout(settleTimer);
     holding = false;
     endKind = null;
+    emptyAnswer = false;
     settled = true;
     view.reset();
     emptySlots();
@@ -517,6 +520,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       }
       holding = true;
       endKind = null;
+      emptyAnswer = false;
       settled = true;
       startedAt = Date.parse(data?.started_at) || Date.now();
       emptySlots();
@@ -542,6 +546,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       kept.push(...warn);
       view.chronological();
       endKind = args.kind;
+      emptyAnswer = !!args.emptyAnswer;
       endedAt = Date.now();
       // A completed turn's end read (markdown, answer_display) is pending
       // until answerReady; the others have none.

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

@@ -88,7 +88,9 @@ export function timedTurnIndexes(items) {
 // the last, in order; a text-less iteration leaves no message, so a text
 // can sit one step early: inspection, not truth) and its answer (the last
 // assistant message). Assistant messages before any prompt are answers on
-// their own. The turn index counts prompts, as timedTurnIndexes does. The
+// their own. A turn that ended with no answer (the server's empty_answer
+// item) has no answer: its texts are steps, and `emptyAnswer` is that
+// item's index. The turn index counts prompts, as timedTurnIndexes does. The
 // user's lines merged into the running turn (`merged`, the server's
 // Steer::INPUT_KIND) stay in it: the turn's `merged` list.
 export function turnGroups(items, timing) {
@@ -110,13 +112,18 @@ export function turnGroups(items, timing) {
     } else if (item?.role === "assistant") {
       if (turn) turn.texts.push(i);
       else groups.push({ kind: "answer", answer: i });
+    } else if (item?.role === "empty_answer" && turn) {
+      turn.emptyAnswer = i;
     }
   });
   return groups.map((g) => {
     if (g.kind !== "turn") return g;
     const group = withSteers(turnGroup(g, items, timing), g.steers, items);
+    // A turn that ended with no answer: its notice (the item's index) in
+    // the answer's place.
+    const ended = g.emptyAnswer == null ? group : { ...group, emptyAnswer: g.emptyAnswer };
     // A turn with no merged lines keeps its shape.
-    return g.merged.length ? { ...group, merged: g.merged } : group;
+    return g.merged.length ? { ...ended, merged: g.merged } : ended;
   });
 }
 
@@ -150,7 +157,8 @@ function promptRecord(timing, g) {
 function turnGroup(g, items, timing) {
   const record = promptRecord(timing, g);
   const tools = record ? (timing?.toolRecords || []).filter((r) => r.turn_id === record.id) : [];
-  const stepsOnly = canceledSteps(g, record, tools);
+  // A turn with no answer has none of its texts as one: they are steps.
+  const stepsOnly = canceledSteps(g, record, tools) || g.emptyAnswer != null;
   if (g.texts.some((i) => items[i].parts)) return partsTurn(g, items, record, tools, stepsOnly);
   const maxIteration = tools.reduce((m, r) => Math.max(m, Number(r.iteration) || 0), 0);
   const stepTexts = stepsOnly ? g.texts : g.texts.slice(0, -1);

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

@@ -64,6 +64,15 @@ export function emptyRetryLine({ attempt, of, stopped_by: stoppedBy } = {}) {
   return `↻ ${what}, asking again (${attempt}/${of})`;
 }
 
+// The one muted line for a turn that ended with no answer (turn_completed's
+// turn_summary.empty_answer, or a reloaded turn's marker): the TUI words
+// it the same (TurnNote.empty_answer_line; spec/shared/labels_matrix.json).
+export function emptyAnswerLine({ retries = 0 } = {}) {
+  const count = Number(retries) || 0;
+  const after = count > 0 ? ` (after ${count} ${count === 1 ? "retry" : "retries"})` : "";
+  return `no answer: the model returned nothing${after}`;
+}
+
 // The text of a turn's row from a snapshot entry (CardStore): a hook's
 // notice as "<label>: text", the loop's asking-again row as its line.
 export function noticeLine(entry = {}) {

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
@@ -708,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) {
@@ -736,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.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -310,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
@@ -366,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