samagotchi 0.15.0 → 0.17.0

data/lib/samagotchi/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.15.0"
+  VERSION = "0.17.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

data/lib/samagotchi/web/app.rb

@@ -1059,7 +1059,8 @@ module Samagotchi
         port && BridgeClient.new(session_id: session_id, port: port, host: DEFAULT_HOST)
       end
 
-      # Read the live Engine state over the bridge (raw GET /session/:id/state).
+      # GET a read path of the session's live Bridge (+path+: "state",
+      # "snapshot", "stats", ...).
       # @return [Hash, nil] parsed JSON body, or nil when no live bridge / timeout.
       def bridge_get_json(session_id, path)
         bridge_client(session_id)&.get_json(path)
@@ -1252,6 +1253,13 @@ module Samagotchi
             filtered << { role: "steer", content: content, source: (m[:source] || m["source"]).to_s, step: steer_step(list, index) }
             next
           end
+          # A turn that ended with no answer (TurnNote.empty's marker): its
+          # empty steps (with ?parts=1) and the item the page draws its
+          # notice from; the note itself stays hidden.
+          if (marker = Samagotchi::TurnNote.empty_answer(m))
+            filtered.concat(empty_answer_items(marker, parts: parts, cwd: cwd))
+            next
+          end
           next if role == "system"
           next if role == "tool_response"
 
@@ -1293,6 +1301,19 @@ module Samagotchi
         []
       end
 
+      # A no-answer turn's marker as display items: each empty step that
+      # has something to show (its thinking) as a text-less assistant step
+      # (only with +parts+, as other text-less steps), then
+      # { role: "empty_answer", retries: }.
+      def empty_answer_items(marker, parts:, cwd:)
+        steps = parts ? Array(marker[:steps] || marker["steps"]) : []
+        items = steps.filter_map do |step|
+          did = step.is_a?(Hash) ? MessageParts.for_message(step, [], cwd: cwd) : nil
+          { role: "assistant", content: "", parts: did } if did
+        end
+        items << { role: "empty_answer", content: "", retries: (marker[:retries] || marker["retries"]).to_i }
+      end
+
       # The last turn failed and its prompt went back to the user: the
       # prompt (session.last_prompt) and why, for the page to show after the
       # conversation as it did live. nil otherwise.

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

@@ -1,6 +1,5 @@
 import {
   listSessions,
-  createSession,
   getSession,
   sendTurn,
   cancelTurn,
@@ -21,7 +20,7 @@ import { emptySessionState } from "./session_state.js";
 import { createModelPicker } from "./model_picker.js";
 import { chipName, chipsHtml, imageFiles, restoredChips, thumbsHtml, turnRefs, turnText } from "./images.js";
 import { escapeHtml, noteHtml, normalize, steerRowHtml, userBodyHtml, ownerBadge, previewForCard, relativeTime, failedTurnText, modelLabel, deleteConfirmText, recapLabel, canStopSession, goneSessionNotice, withLiveStatus, withoutWorker, recapPlace, delegatedBy } from "./format.js";
-import { createTurnView, turnHistoryHtml } from "./turn_view.js";
+import { EMPTY_ANSWER_CLASS, createTurnView, turnHistoryHtml } from "./turn_view.js";
 import { createStageView } from "./stage_view.js";
 import { appendQuote } from "./annotations.js";
 import { parsePresets } from "./annotate_presets.js";
@@ -37,14 +36,14 @@ import { createPromptHistory } from "./prompt_history.js";
 import { ALL_SESSIONS_HASH, sessionHash, sessionIdFromHash } from "./route.js";
 import { allScopeHref, cardFolder, projectScopeHref, scopeDir } from "./scope.js";
 import { shouldFollowScroll, keepFollowing } from "./scroll.js";
-import { stripColumns, stripShowParts } from "./strip.js";
+import { SHORT_WINDOW_QUERY, stripAutoHidden, stripColumns, stripShowParts } from "./strip.js";
 import { applySessionEvent, heldOrder, listedSessions, sortedByUpdated, waitingBadge, waitingFirst, waitingSearchText, withChildrenAfterParents } from "./sessions_list.js";
 import { createNotifications } from "./notifications.js";
 import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, normalizeTiming, turnTimingText,
 } from "./timing.js";
 import { DONE_MS, applyInitEvent, dropDone, initRowHtml, newInitTasks, seedInitTasks } from "./init_row.js";
-import { clientLabel, commandView, emptyRetryLine, hookNoticeLabel, initWaitLine, isCommandLine, isOwn, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, restoreOnAck, retryStatusLine, snapshotEvents, turnOutput, webLocalReply, workerGoneText } from "./turn_events.js";
+import { clientLabel, commandView, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, restoreOnAck, retryStatusLine, snapshotEvents, turnOutput, webLocalReply, workerGoneText } from "./turn_events.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -776,6 +775,9 @@ function renderSessionView(data) {
   // A question the worker is blocked on (also after a reload).
   if (data.pending_question && data.pending_question.id && data.pending_question.status === "pending") {
     questionCards.renderQuestion(data.pending_question);
+    // The turn's replay drew it as asked; the snapshot knows whether it is
+    // relayed to the parent now.
+    questionCards.markRelayed(data.pending_question.id, data.pending_question.relayed_to || null);
   }
   // A turn ran out of iterations and waits for a yes or no.
   if (data.continue_offer) questionCards.renderContinue(data.continue_offer);
@@ -897,12 +899,25 @@ function addEndBubble(text) {
   if (!turnDom.holds?.()) historyEl.scrollTop = historyEl.scrollHeight;
 }
 
+// The notice of a turn that ended with no answer (turn_summary.empty_answer),
+// as a reload draws it (turn_view.js EMPTY_ANSWER_CLASS).
+function emptyAnswerEl(emptyAnswer) {
+  const el = document.createElement("div");
+  el.className = EMPTY_ANSWER_CLASS;
+  el.textContent = emptyAnswerLine(emptyAnswer);
+  return el;
+}
+
 // Everything a turn's end (completed, canceled, failed) closes: then its
 // end line (+endText+, the cancel or failed line), then the step cards that
 // left the collapsed block (card.js leavesBlock), where a reload puts them.
-function endTurnView(kind, endText = null) {
+function endTurnView(kind, endText = null, { emptyAnswer = null } = {}) {
   setTurnRunning(false);
-  const kept = turnDom.turnEnded({ kind }) || [];
+  // A completed turn with no answer: its notice where the answer goes
+  // (the turn view places it), else after the turn; before the timing.
+  const endNote = emptyAnswer ? emptyAnswerEl(emptyAnswer) : null;
+  const kept = turnDom.turnEnded({ kind, endNote, emptyAnswer: !!emptyAnswer }) || [];
+  if (endNote && !endNote.isConnected) appendToHistory(endNote);
   finishLiveTurnTiming(null, { canceled: kind === "canceled" });
   if (endText) addEndBubble(endText);
   if (kept.length) {
@@ -1203,7 +1218,7 @@ function reloadedTurnEls(before) {
 // What goes after a reloaded turn's own rows and cards: its answer, else
 // its timing line; null when it has neither.
 function turnAnswerEl(turnEls) {
-  return turnEls.filter((el) => el.matches(".bubble.output")).pop() || turnEls.find((el) => el.matches(".turn-timing")) || null;
+  return turnEls.filter((el) => el.matches(".bubble.output, .empty-answer")).pop() || turnEls.find((el) => el.matches(".turn-timing")) || null;
 }
 
 // A finished turn's question (the snapshot's cards keep it with its
@@ -1526,7 +1541,7 @@ const streamHandlers = {
     startLiveTurnTiming(data.started_at);
   }),
   turn_completed: async (data) => {
-    endTurnView("completed");
+    endTurnView("completed", null, { emptyAnswer: data.turn_summary?.empty_answer || null });
     const out = turnOutput(data);
     if (out) appendChunk(out);
     // after_turn hooks are running and may present the answer: its
@@ -1643,6 +1658,8 @@ const streamHandlers = {
   question_answered: (data) => {
     questionCards.resolveQuestion(data.id, { answer: data.answer });
   },
+  // A delegate's question relayed to its parent's card, or no longer.
+  question_relay: (data) => questionCards.markRelayed(data.id, data.relayed_to),
   question_cancelled: (data) => {
     questionCards.resolveQuestion(data.id, { cancelled: true, reason: data.reason });
   },
@@ -1714,37 +1731,19 @@ function addCreatedSession(created) {
   render();
 }
 
-// A first message: an idle session, then the turn into it as for any
-// later one (handleSendTurn), so a failed first turn's prompt comes back
-// into the composer too (sentIds). A first command line starts the session
-// with it.
-async function handleCreate() {
-  const prompt = promptEl.value.trim();
-  if (chips.length || (prompt && !isCommandLine(prompt))) return handleSendTurn();
-  if (!prompt) return;
-  actionBtn.disabled = true;
-  try {
-    const s = await createSession(prompt, { dir: scope.dir, model: chosenModel() });
-    addCreatedSession(s);
-    select(s.id);
-    promptEl.value = "";
-    fitPrompt();
-    refreshHistory();
-  } catch (e) {
-    alert(e.message);
-  } finally {
-    actionBtn.disabled = false;
-  }
+// A first message: an idle session, then the turn (or the command) into it
+// as for any later one (handleSendTurn), so a failed first turn's prompt
+// comes back into the composer too (sentIds).
+function handleCreate() {
+  return handleSendTurn();
 }
 
 async function handleSendTurn() {
-  if (!selected && !chips.length && isCommandLine(promptEl.value.trim())) return handleCreate();
   if (current.owner === "tui") return;
   const prompt = turnText(promptEl.value, chips);
   if (!prompt) return;
   // An image-only send's text is its placeholders: not for ↑.
   const typed = promptEl.value.trim() !== "";
-  if (!chips.length && isCommandLine(prompt)) return handleSendCommand(prompt);
   if (!selected) {
     actionBtn.disabled = true;
     try {
@@ -1758,6 +1757,9 @@ async function handleSendTurn() {
       actionBtn.disabled = false;
     }
   }
+  // A session command by the session's list (the new one's too: select
+  // read it); an unknown /word is a prompt, as in a terminal.
+  if (!chips.length && sessionCommandLine(prompt, current.commands)) return handleSendCommand(prompt);
   const hint = historyEl.querySelector(".hint");
   if (hint) hint.remove();
   // Sending moves a finished turn out of the stage at once (else the echo
@@ -1777,6 +1779,15 @@ async function handleSendTurn() {
       if (!chip.ref) chip.ref = await uploadImage(selected, chip.file, chip.name);
     }
     const ack = await sendTurn(selected, prompt, { clientId, images: turnRefs(sending), history: typed });
+    if (ack?.command_id) {
+      // The worker knew it as a command (its list was newer than ours):
+      // its command_ran shows it, not a prompt bubble.
+      echo.remove();
+      promptEl.value = "";
+      fitPrompt();
+      if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+      return;
+    }
     if (ack?.enqueued_id) sentIds.add(ack.enqueued_id);
     refreshHistory();
     // A turn that failed fast was restored before this ack: its prompt
@@ -2229,11 +2240,27 @@ function stripHiddenSaved() {
     return false;
   }
 }
+// A short window hides the strip by itself, so the stage keeps room for a
+// card that waits (its question and choices); the sessions pill brings it
+// back until the window is tall again. Not saved: the saved choice is the
+// user's own hide ▴ / show.
+const shortWindow = window.matchMedia(SHORT_WINDOW_QUERY);
+let stripShownWhileShort = false;
+function applyStripHidden() {
+  document.body.classList.toggle("strip-hidden", stripAutoHidden({
+    saved: stripHiddenSaved(), short: shortWindow.matches, shownWhileShort: stripShownWhileShort,
+  }));
+}
 function setStripHidden(hidden) {
   try { localStorage.setItem("chi_strip_hidden", hidden ? "1" : "0"); } catch (_) {}
-  document.body.classList.toggle("strip-hidden", hidden);
+  stripShownWhileShort = !hidden && shortWindow.matches;
+  applyStripHidden();
 }
-setStripHidden(stripHiddenSaved());
+applyStripHidden();
+shortWindow.addEventListener("change", () => {
+  if (!shortWindow.matches) stripShownWhileShort = false;
+  applyStripHidden();
+});
 $("#stripShow").addEventListener("click", () => setStripHidden(false));
 
 $("#filter").addEventListener("input", renderAll);

data/lib/samagotchi/web/public/index.html

@@ -253,6 +253,11 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .bubble.question.approval.answered.denied .question-result{color:var(--danger)}
 .bubble.question.approval.answered.denied .question-option.selected{border-color:var(--danger)}
 .approval-details{margin-bottom:8px;font-size:13px;color:var(--text-2)}
+.approval-delegate{font-size:12px;color:var(--text-muted);margin-bottom:4px;overflow-wrap:anywhere}
+.approval-delegate a{color:var(--text);font-weight:600}
+.question-relayed{font-size:12px;color:var(--text-muted);margin-bottom:6px}
+.question-relayed.hidden{display:none}
+.question-relayed a{color:var(--text);font-weight:600}
 .approval-tool{font-weight:700;color:var(--text);margin-bottom:4px}
 .approval-what{margin:0 0 6px;padding:8px 10px;background:var(--bg-inset);border:1px solid var(--warn-border);border-radius:6px;white-space:pre-wrap;word-break:break-all;color:var(--warn-bright);font-size:12.5px}
 .approval-where,.approval-why{font-size:12px;color:var(--text-muted);word-break:break-all}
@@ -429,6 +434,7 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 .turn-stage[data-phase="answered"]{border-left-color:var(--ok)}
 .turn-stage[data-phase="canceled"],.turn-stage[data-phase="waiting for you"]{border-left-color:var(--warn)}
 .turn-stage[data-phase="failed"]{border-left-color:var(--danger)}
+.turn-stage[data-phase="no answer"]{border-left-color:var(--warn)}
 .turn-stage.enter{animation:ts-rise .35s cubic-bezier(.3,.7,.2,1)}
 @keyframes ts-rise{from{opacity:0;transform:translateY(14px)}}
 .turn-stage.leaving{transition:height .4s cubic-bezier(.3,.7,.2,1),opacity .3s ease;opacity:0}
@@ -441,6 +447,7 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 .turn-stage[data-phase="answered"] .ts-mark,.turn-stage[data-phase="answered"] .ts-phase{color:var(--ok)}
 .turn-stage[data-phase="canceled"] .ts-mark,.turn-stage[data-phase="canceled"] .ts-phase,.turn-stage[data-phase="waiting for you"] .ts-phase{color:var(--warn-text)}
 .turn-stage[data-phase="failed"] .ts-mark,.turn-stage[data-phase="failed"] .ts-phase{color:var(--danger-text)}
+.turn-stage[data-phase="no answer"] .ts-mark,.turn-stage[data-phase="no answer"] .ts-phase{color:var(--text-muted)}
 .turn-stage[data-phase="waiting for you"] .ts-mark{background:var(--warn)}
 .ts-phase{color:var(--accent);font-weight:600}
 .ts-timing{min-width:0;overflow:hidden;text-overflow:ellipsis}

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

@@ -30,16 +30,29 @@ export function waitingOn(summary) {
   return null;
 }
 
+// How long a delegated child's new approval waits before it notifies: its
+// parent relays it when it waits on its children, and then the parent's
+// card notifies instead (one bell, not two). A child the parent isn't
+// waiting on directly is seen by its look at the others (DelegateRelay
+// OTHERS_EVERY, 2 s), and the relay reaches the page with the hub's next
+// scan (SessionHub SCAN_INTERVAL, 1 s): up to ~3 s. Only these approvals
+// wait; a child's approval nobody relays rings this late.
+export const RELAY_HOLD_MS = 3500;
+
 // What changed between two summaries of one session that needs the user.
 // @param prev the summary held before (null for a session not seen yet)
 // @param next the new summary
 // @return null | {reason: "question"|"approval"|"card"|"failed"|"done", sessionId, key}
-//   key names this one event, the same in every tab (the Notification tag)
+//   key names this one event, the same in every tab (the Notification tag);
+//   holdMs, when there, delays it (a delegated child's approval)
 export function attentionFor(prev, next) {
   if (!next || !next.id) return null;
   const q = next.pending_question;
   if (q && q.id && q.id !== prev?.pending_question?.id) {
-    return { reason: questionReason(q), sessionId: next.id, key: `${next.id}:${q.id}` };
+    // Relayed to the parent already: the parent's card notifies.
+    if (q.relayed_to) return null;
+    const attention = { reason: questionReason(q), sessionId: next.id, key: `${next.id}:${q.id}` };
+    return next.parent_id && q.kind === "approval" ? { ...attention, holdMs: RELAY_HOLD_MS } : attention;
   }
   const card = next.pending_card;
   if (card && card.id && card.id !== prev?.pending_card?.id) {
@@ -74,7 +87,9 @@ const cardKey = (sessionId, cardId) => `${sessionId}:card:${cardId}`;
 export function closedKeys(prev, next) {
   const keys = [];
   const q = prev?.pending_question;
-  if (q && q.id && next?.pending_question?.id !== q.id) keys.push(`${prev.id}:${q.id}`);
+  const nq = next?.pending_question;
+  // Gone, or relayed to the parent (its card notifies and badges instead).
+  if (q && q.id && (nq?.id !== q.id || (nq.relayed_to && !q.relayed_to))) keys.push(`${prev.id}:${q.id}`);
   const card = prev?.pending_card;
   if (card && card.id && next?.pending_card?.id !== card.id) keys.push(cardKey(prev.id, card.id));
   return keys;
@@ -178,10 +193,12 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
     },
     // A new attention in a tab behind: +deliver+ (notify, badge) unless
     // another tab has it in front. @return whether it may still be delivered
+    // An attention's own holdMs (a delegated child's approval) holds it
+    // longer, alone too.
     offer(attention, deliver) {
       const key = attention.key;
       if (seen.has(key)) return false;
-      if (!channel) {
+      if (!channel && !attention.holdMs) {
         deliver();
         return true;
       }
@@ -189,7 +206,7 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
       pending.set(key, schedule(() => {
         pending.delete(key);
         if (!seen.has(key)) deliver();
-      }, holdMs));
+      }, Math.max(holdMs, attention.holdMs || 0)));
       return true;
     },
     // Closed before its hold was up (a question answered at once).

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);
@@ -358,6 +360,13 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
   // never above the session panel (the dock is absolute: a tall composer or
   // a phone's keyboard would push the stage's top out) ────────────────────
 
+  // Scroll the stage so +slot+'s end shows (it is the scroller's child).
+  function revealSlot(slot) {
+    if (stage.hidden || slot.hidden) return;
+    const end = slot.offsetTop + slot.offsetHeight - scroller.clientHeight;
+    if (end > scroller.scrollTop) scroller.scrollTop = end;
+  }
+
   function fitCap() {
     if (stage.hidden) return;
     const rest = dockEl.offsetHeight - stage.offsetHeight;
@@ -452,6 +461,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     clearTimeout(settleTimer);
     holding = false;
     endKind = null;
+    emptyAnswer = false;
     settled = true;
     view.reset();
     emptySlots();
@@ -517,6 +527,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 +553,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.
@@ -588,8 +600,13 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       const stick = slot.scrollHeight - slot.scrollTop - slot.clientHeight < 24;
       slot.appendChild(el);
       slot.hidden = false;
-      if (stick || el.matches?.(PENDING) || el.querySelector?.(ASKS)) slot.scrollTop = slot.scrollHeight;
+      const waits = el.matches?.(PENDING) || el.querySelector?.(ASKS);
+      if (stick || waits) slot.scrollTop = slot.scrollHeight;
       scheduleRefresh();
+      // A card that waits for the user is brought into the stage's view: in
+      // a short window the prompt and headline fill it and the card sat
+      // below, out of sight (after the refresh, which hides the live slots).
+      if (waits) requestAnimationFrame(() => requestAnimationFrame(() => revealSlot(slot)));
       return true;
     },
     // Where the live timing line goes (the status row), null: the history.

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

@@ -30,3 +30,14 @@ export function stripShowParts(sessions) {
     waiting: waitingN ? `${waitingN} waiting` : "",
   };
 }
+
+// A window this short hides the strip by itself: at ~500-700 px the stage
+// is capped low and a card that waits there (a question, an approval) is
+// cut off below the strip.
+export const SHORT_WINDOW_QUERY = "(max-height: 700px)";
+
+// Whether the strip is hidden: the user's own hide (saved), or a short
+// window unless the user showed it (the pill) since it got short.
+export function stripAutoHidden({ saved, short, shownWhileShort }) {
+  return !!saved || (!!short && !shownWhileShort);
+}