samagotchi 0.70.0 → 0.72.0

data/lib/samagotchi/web/app.rb

@@ -46,6 +46,7 @@ require_relative "editor"
 require_relative "message_parts"
 require_relative "session_summary"
 require_relative "../log"
+require_relative "../paths"
 require_relative "../redacted_inspect"
 
 module Samagotchi
@@ -896,9 +897,9 @@ module Samagotchi
       # session part is what the page reads of it (id, status, used memory
       # names, the model notes its prompt carried: the first turn's build or
       # a /model records them). ?turn_id=: that turn's answer (a queued
-      # turn's page re-reads after the next one started). ?recent=1 (the page since this
-      # release): the timing's records are the newest turn's (#recent_timing),
-      # which the page merges by id; without it, the whole timing as before.
+      # turn's page re-reads after the next one started). The timing's records
+      # are the newest turn's (#recent_timing), which the page merges by id
+      # (the page still sends ?recent=1, which is accepted and not needed).
       def handle_tail_read(req, id)
         return error_response(404, "not_found", "Session not found: #{id}") unless session_exists?(id)
 
@@ -909,7 +910,14 @@ module Samagotchi
         state = nil unless state.is_a?(Hash)
         if state
           status, used, notes = state.values_at("status", "used_memory_names", "prompt_notes")
-          messages = last_assistant_for_display([tail["answer"]].compact)
+          # No session file read here: the folder the answer's file refs must
+          # stay under is the worker's (its tail's working_directory), else the
+          # hub's session list entry's (a worker from before the field, or read
+          # through its snapshot); nil then without a hub or before it saw the
+          # session: refs aren't checked.
+          cwd = tail["working_directory"]
+          cwd = @hub&.working_directory(id) unless cwd.is_a?(String) && !cwd.empty?
+          messages = last_assistant_for_display([tail["answer"]].compact, cwd: cwd)
         else
           session = @session_class.load(id, state_dir: default_state_dir)
           status = displayed_status(session)
@@ -919,9 +927,7 @@ module Samagotchi
         end
         session_json = { id: id, status: status, used_memory_names: Array(used), prompt_notes: Array(notes) }
         live_metrics = state && state["metrics"]
-        # Without recent=1: a tab opened before this release (it replaces its
-        # timing with the reply's). Remove this branch after the next release.
-        timing = req.params["recent"] == "1" ? recent_timing(id, live_metrics) : timing_payload(id, live_metrics: live_metrics)
+        timing = recent_timing(id, live_metrics)
         json_response(200, {
           tail: true,
           session: session_json,
@@ -951,9 +957,9 @@ module Samagotchi
       end
 
       # The worker's light read (Bridge GET tail): {"session_state_snapshot",
-      # "answer", "cards", "event_seq", "event_id"}. A worker from before the
-      # route answers 404 not_found: its GET snapshot, in the same shape (the
-      # answer by AnswerTail). Anything else (no worker, a refused connect, a
+      # "working_directory", "answer", "cards", "event_seq", "event_id"}. A
+      # worker from before the route answers 404 not_found: its GET snapshot,
+      # in the same shape (the answer by AnswerTail; no working_directory). Anything else (no worker, a refused connect, a
       # 500, a timeout) is nil: the caller reads the disk, with no second
       # try at a worker that failed once.
       # @return [Hash, nil]
@@ -1703,7 +1709,7 @@ module Samagotchi
                                                                  turn_count: (live && turn_count(live_metrics)) || turns.size)
       end
 
-      # The timing a ?tail=1&recent=1 read sends: a live worker's recent
+      # The timing a ?tail=1 read sends: a live worker's recent
       # records as its metrics hold them (the newest finished turn's and
       # the unsaved ones, the running turn's finished calls), no
       # analytics.json read; with no worker the disk's, trimmed to the
@@ -2000,12 +2006,7 @@ module Samagotchi
         home_label(File.expand_path(default_state_dir))
       end
 
-      def home_label(dir)
-        home = Dir.home
-        return "~" if dir == home
-
-        dir.start_with?("#{home}/") ? "~#{dir.delete_prefix(home)}" : dir
-      end
+      def home_label(dir) = Paths.tilde(dir)
 
       # <body> data for the page: where sessions are stored, where an
       # all-view new chat starts (the server's cwd), and, when ?dir names a

data/lib/samagotchi/web/message_parts.rb

@@ -53,7 +53,7 @@ module Samagotchi
       # The row shows 300 chars and the rest on hover; a read of a big file
       # would otherwise ride along with every reload. A longer one keeps its
       # head and tail (ToolOutputCut.preview).
-      OUTPUT_MAX = 2000
+      OUTPUT_MAX = ToolOutputCut::WEB_PREVIEW_CHARS
 
       QWEN_THINK = %r{<think>(.*?)</think>}m
       QWEN_OPEN_THINK = %r{\A(.*?)</think>}m # the template opened the block

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

@@ -67,6 +67,7 @@ export function applyFinalAnswer(messages, bubbles, normalize) {
   if (typeof message.html === "string") {
     bubble.classList.add("markdown");
     bubble.setAttribute(COPY_SOURCE_ATTR, copySource(message));
+    // The server's rendered markdown, sanitized there (Web::MarkdownRenderer#sanitize): set as it is, not templated.
     bubble.innerHTML = message.html;
   }
   setAnswerRefs(bubble, message.display_refs);

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

@@ -38,12 +38,13 @@ import { MODEL_KEY } from "./model_pick.js";
 import { emptySessionState, sessionStateFrom } from "./session_state.js";
 import { createModelPicker } from "./model_picker.js";
 import { chipName, chipsTemplate, imageFiles, restoredChips, thumbsTemplate, turnRefs, turnText, uploadChips } from "./images.js";
-import { normalize, firstPreview, failedTurnText, deleteConfirmText, goneSessionNotice, withLiveStatus, withoutWorker } from "./format.js";
+import { normalize, firstPreview, failedTurnText, deleteConfirmText, goneSessionNotice, cantText, withLiveStatus, withoutWorker } from "./format.js";
 import { createTurnView, turnHistoryNodes } from "./turn_view.js";
 import { elementOf, emptyAnswerTemplate } from "./turn_html.js";
 import { createBubbles, hintEl, outputBubbleTemplate, setBubbleDelivery } from "./bubbles.js";
 import { createCardsPlace } from "./cards_place.js";
 import { createStageView, FOLD_MS } from "./stage_view.js";
+import { reducedMotion, STAGE_GAP } from "./stage_frame.js";
 import { CONTINUE_OPENER, chainNeighbours, isOpener, continueRefusal, continuedText, freshLink, openChildrenTemplate } from "./chains.js";
 import { createTaskStopper } from "./task_stop.js";
 import { appendQuote } from "./annotations.js";
@@ -313,8 +314,6 @@ const {
 // The plugin cards and a snapshot's notices in the history (cards_place.js).
 const cards = createCardsPlace({
   historyEl,
-  appendToHistory: (el) => appendToHistory(el),
-  isNearBottom: () => isNearBottom(),
   turnDom,
   findInTurnRoots: (selector) => findInTurnRoots(selector),
   selected: () => selected,
@@ -1063,7 +1062,7 @@ async function restartWorker() {
     const result = await restartSession(id);
     showToast(result.version ? `Restarted on chi ${result.version}` : "Restarting: the new worker is starting");
   } catch (e) {
-    showToast(`Can't restart: ${String(e.message).replace(/ \(\d+\)$/, "")}`, null, { sticky: true });
+    showToast(cantText("restart", e), null, { sticky: true });
   } finally {
     restartingIds.delete(id);
     updateInfoBar();
@@ -1482,6 +1481,8 @@ const composerCommands = createComposerCommands({
   followWokenWorker: () => followWokenWorker(),
   refreshHistory: () => refreshHistory(),
   failed: (line, text) => addCommandBubble({ label: null, line, text, failed: true }),
+  // As handleSendTurn says a turn's failure after a switch.
+  failedElsewhere: (line, text) => alert(`${line}: ${text}`),
   ownedByTui: () => {
     current.owner = "tui";
     updateComposerMode();
@@ -1742,7 +1743,6 @@ const centerEl = $("#center");
 // A leaving stage (the hand-off's slide) no longer counts: the reserve eases
 // down over the slide (index.html, #center.reserve-easing).
 const stageEl = view === "stage" ? turnDom.root : null;
-const STAGE_GAP = 10;
 function dockReserve() {
   const shown = stageEl && !stageEl.hidden && !stageEl.classList.contains("leaving");
   return dockEl.offsetHeight + (shown ? stageEl.offsetHeight + STAGE_GAP : 0);
@@ -1760,7 +1760,7 @@ function updateReserve({ fromStage = false } = {}) {
   const changed = centerEl.style.getPropertyValue("--dock-h") !== reserve;
   if (changed) centerEl.style.setProperty("--dock-h", reserve);
   if (changed && follow) {
-    if (fromStage) easeScrollTo(historyEl, historyEnd, { ms: leaving ? FOLD_MS : FOLLOW_MS, reduce: matchMedia("(prefers-reduced-motion: reduce)").matches });
+    if (fromStage) easeScrollTo(historyEl, historyEnd, { ms: leaving ? FOLD_MS : FOLLOW_MS, reduce: reducedMotion() });
     else if (historyEl.dataset.following === undefined) historyEl.scrollTop = historyEl.scrollHeight;
   }
   placeToast();
@@ -1864,12 +1864,11 @@ $("#infoStopBtn").addEventListener("click", async () => {
   stoppingId = id;
   try {
     await stopSession(id);
-    if (id === selected) {
-      // The worker is gone: don't wait for its stream to notice.
-      streamControl?.close();
-      current.status = "stopped";
-      workerGone(id);
-    }
+    if (id === selected) stoppedWorker(id);
+  } catch (e) {
+    // A refusal (a terminal holds it) or a worker that won't stop: said, as
+    // a failed restart is.
+    showToast(cantText(`stop ${id.slice(0, 8)}`, e), null, { sticky: true });
   } finally {
     stoppingId = null;
   }
@@ -1963,6 +1962,14 @@ function markArchived(ids, archived) {
 // and a batch share. The ids in the answer flip in the list at once. When
 // the open session's worker was stopped (it, or a delegate of the archived
 // one), its stream ending is a stop, not a lost worker.
+// The open session's worker was stopped from here (the stop button, an
+// archive): don't wait for its stream to notice.
+function stoppedWorker(id) {
+  streamControl?.close();
+  current.status = "stopped";
+  workerGone(id);
+}
+
 // @return {ok: true, result} | {ok: false, error}
 async function archiveOne(id, archive) {
   // A live worker in the tree is stopped by the archive: the open
@@ -1972,12 +1979,7 @@ async function archiveOne(id, archive) {
   try {
     const result = archive ? await archiveSession(id) : await unarchiveSession(id);
     markArchived(archive ? result.archived : result.unarchived, archive);
-    if (mine && mine === selected && (result.stopped || []).includes(mine)) {
-      // Its worker is gone: don't wait for its stream to notice.
-      streamControl?.close();
-      current.status = "stopped";
-      workerGone(mine);
-    }
+    if (mine && mine === selected && (result.stopped || []).includes(mine)) stoppedWorker(mine);
     return { ok: true, result };
   } catch (error) {
     return { ok: false, error };

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

@@ -285,7 +285,7 @@ export function createBubbles({
   }
 
   return {
-    removeHintIfEmpty, appendChunk, addEndBubble, makeUserBubble, bubbleById, applyPromptOps, showRecap,
+    removeHintIfEmpty, placeFollowing, appendChunk, addEndBubble, makeUserBubble, bubbleById, applyPromptOps, showRecap,
     markRecapStale, showGuardrailWarning, showSteers, showHookNotice, addCommandBubble, commandBubble, addNoteBubble,
   };
 }

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

@@ -32,22 +32,20 @@ export function turnAnswerEl(turnEls) {
 }
 
 // @param historyEl the history
-// @param appendToHistory (el) puts +el+ at the history's end (or the stage's)
-// @param isNearBottom () => whether the history follows its end
 // @param turnDom the running turn's view (its card(el) takes a turn's card)
 // @param findInTurnRoots (selector) => the matching elements in the history
 //   and the stage
 // @param selected () => the open session's id
 // @param clientId this tab's id in the session's events
 // @param questionCards the history's question cards (question_cards.js)
-// @param bubbles {removeHintIfEmpty, showGuardrailWarning, showHookNotice}
+// @param bubbles {removeHintIfEmpty, placeFollowing, showGuardrailWarning, showHookNotice}
 //   (bubbles.js createBubbles)
 // @param followWokenWorker () follows the worker a card's command woke
 // @param api {getSession, sendCommand} (data.js)
 // @return {cardElement(id), upsertCard(card, {before}), placeSnapshotCards(entries),
 //   refreshCardBodies(), onCardAction(event)}
 export function createCardsPlace({
-  historyEl, appendToHistory, isNearBottom, turnDom, findInTurnRoots, selected, clientId, questionCards, bubbles,
+  historyEl, turnDom, findInTurnRoots, selected, clientId, questionCards, bubbles,
   followWokenWorker, api = { getSession, sendCommand },
 }) {
   function cardElement(id) {
@@ -73,10 +71,7 @@ export function createCardsPlace({
     const el = drawCard(document.createElement(isNoticeCard(card) ? "details" : "div"), card);
     const asks = (card.actions || []).some((a) => a && a.command);
     if (card.in_turn && !before && !asks && turnDom.card(el)) return;
-    const follow = isNearBottom();
-    if (before) historyEl.insertBefore(el, before);
-    else appendToHistory(el);
-    if (follow) historyEl.scrollTop = historyEl.scrollHeight;
+    bubbles.placeFollowing(el, before);
   }
 
   // A snapshot's cards and notices, each above the first turn after it; a
@@ -170,8 +165,9 @@ export function createCardsPlace({
     button.disabled = true;
     api.sendCommand(id, button.dataset.command, { clientId, card: true })
       .then(() => {
-        // The command woke the worker: follow its stream if none is open.
-        followWokenWorker();
+        // The command woke the worker: follow its stream if none is open
+        // (and the page still shows that session).
+        if (selected() === id) followWokenWorker();
       })
       .catch((error) => {
         err.textContent = error.message;

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

@@ -206,7 +206,7 @@ export function chainRowsTemplate(f, { activeId = null, now = Date.now() } = {})
 export function continueRefusal(error, sessions = []) {
   const body = error?.body || {};
   if (error?.code === "continued" && body.next_id) return { kind: "open", id: body.next_id };
-  const text = String(error?.message || "refused").replace(/\s*\(\d{3}\)$/, "");
+  const text = String(error?.message || "refused");
   if (error?.code === "open_children" && Array.isArray(body.ids) && body.ids.length) {
     const byId = new Map(sessions.map((s) => [s.id, s]));
     const children = body.ids.map((id) => {

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

@@ -84,10 +84,12 @@ export function createChipPopover({ id, className, width: widest, el, anchor: an
     show(data, false);
   }
 
+  // The click goes on to the document: another chip's popover (or the
+  // context popover) open meanwhile closes there. This one's own closer
+  // leaves its chip's click alone.
   el.addEventListener("click", (e) => {
     const anchor = e.target.closest(anchorSel);
     if (!anchor) return;
-    e.stopPropagation();
     if (isOpen()) close();
     else open(anchor);
   });

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

@@ -60,20 +60,26 @@ export function routeSessionLine(prompt, { commands = [], images = 0, delivery =
 //   followWokenWorker()  the command woke the worker: follow its stream
 //   refreshHistory()
 //   failed(line, text)   a failed command's bubble
+//   failedElsewhere(line, text)   a command to a session no longer open failed
 //   ownedByTui()         a plain terminal holds the session
 //   composer: {busy(), clear(), done()}   the composer's send button and text
 export function createComposerCommands(deps) {
-  const { session, clientId, sendCommand, followWokenWorker, refreshHistory, failed, ownedByTui, composer } = deps;
+  const { session, clientId, sendCommand, followWokenWorker, refreshHistory, failed, failedElsewhere, ownedByTui,
+          composer } = deps;
 
-  // A line typed in the composer (routeComposerLine's {command}).
+  // The page may open another session while a command is in flight: what
+  // follows is about the session it went to (+id+), so the open one's
+  // worker, owner and history are left alone then.
   async function send(line) {
+    const id = session();
     composer.busy();
     try {
-      await sendCommand(session(), line, { clientId });
+      await sendCommand(id, line, { clientId });
       composer.clear();
       refreshHistory();
-      followWokenWorker();
+      if (session() === id) followWokenWorker();
     } catch (e) {
+      if (session() !== id) return failedElsewhere(line, e.message);
       if (e.code === "owned_by_tui") {
         ownedByTui();
         return;
@@ -93,10 +99,11 @@ export function createComposerCommands(deps) {
     if (!id) return false;
     try {
       await sendCommand(id, line, { clientId });
-      followWokenWorker();
+      if (session() === id) followWokenWorker();
       return true;
     } catch (e) {
-      failed(line, e.message);
+      if (session() === id) failed(line, e.message);
+      else failedElsewhere(line, e.message);
       return false;
     }
   }

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

@@ -9,6 +9,8 @@
 
 import { html, nothing, render } from "./vendor/lit-html.js";
 import { keepFocus } from "./keep_focus.js";
+import { popoverPlace } from "./chip_popover.js";
+import { cantText } from "./format.js";
 
 // "now", "3m", "2h", "4d" since an ISO time; "" for none.
 export function ageText(iso, now = Date.now()) {
@@ -177,13 +179,24 @@ export function createContextChips({ el, api, toast = () => {}, doc = document,
     render(popoverTemplate(row, { text }), pop);
   }
 
-  // Above the chip, inside the window with a 16px gutter.
+  // At the chip as the session bar's chips place theirs (popoverPlace):
+  // above it, or below when the room above is short; capped to the room
+  // (it scrolls), inside the window with a 16px gutter.
   function place(chip) {
-    const rect = chip.getBoundingClientRect();
     const width = Math.min(380, win.innerWidth - 32);
     pop.style.width = `${width}px`;
-    pop.style.left = `${Math.max(16, Math.min(rect.left, win.innerWidth - width - 16))}px`;
-    pop.style.bottom = `${Math.max(16, win.innerHeight - rect.top + 8)}px`;
+    pop.style.maxHeight = "";
+    const at = popoverPlace(chip.getBoundingClientRect(), { width, height: pop.offsetHeight,
+                                                            innerWidth: win.innerWidth, innerHeight: win.innerHeight });
+    pop.style.left = `${at.left}px`;
+    pop.style.top = at.top === undefined ? "" : `${at.top}px`;
+    pop.style.bottom = at.bottom === undefined ? "" : `${at.bottom}px`;
+    if (at.maxHeight !== undefined) pop.style.maxHeight = `${at.maxHeight}px`;
+  }
+
+  function placeAtOpenChip() {
+    const chip = openName && el.querySelector(".ctx-chip.open");
+    if (chip) place(chip);
   }
 
   function open(name, chip) {
@@ -231,7 +244,7 @@ export function createContextChips({ el, api, toast = () => {}, doc = document,
     } catch (e) {
       if (id !== sessionId || openName !== ADD) return;
       // The same form again: what the user typed stays; the URL gets focus.
-      drawAdd({ busy: false, error: String(e.message).replace(/ \(\d+\)$/, "") });
+      drawAdd({ busy: false, error: e.message });
       pop.querySelector('input[name="url"]')?.focus();
     }
   }
@@ -255,8 +268,10 @@ export function createContextChips({ el, api, toast = () => {}, doc = document,
       if (!row) return;
       text = data.text || "";
       fill(row);
+      // The text makes it taller: placed again.
+      placeAtOpenChip();
     } catch (e) {
-      toast(`Can't read ${name}: ${String(e.message).replace(/ \(\d+\)$/, "")}`);
+      toast(cantText(`read ${name}`, e));
     }
   }
   async function detach() {
@@ -271,14 +286,15 @@ export function createContextChips({ el, api, toast = () => {}, doc = document,
       close();
       await refresh();
     } catch (e) {
-      toast(`Can't detach ${row.name}: ${String(e.message).replace(/ \(\d+\)$/, "")}`);
+      toast(cantText(`detach ${row.name}`, e));
     }
   }
 
   el.addEventListener("click", (e) => {
     const chip = e.target.closest(".ctx-chip");
     if (!chip) return;
-    e.stopPropagation();
+    // On to the document: a session-bar chip's popover closes (the close
+    // below leaves clicks in +el+ alone).
     if (chip.dataset.act === "add") {
       if (openName === ADD) close();
       else openAdd(chip);
@@ -301,10 +317,7 @@ export function createContextChips({ el, api, toast = () => {}, doc = document,
   doc.addEventListener("keydown", (e) => {
     if (e.key === "Escape" && openName) close();
   });
-  win.addEventListener("resize", () => {
-    const chip = openName && el.querySelector(".ctx-chip.open");
-    if (chip) place(chip);
-  });
+  win.addEventListener("resize", placeAtOpenChip);
   win.addEventListener("focus", () => refresh());
   // The ages move on by themselves.
   win.setInterval(() => { if (rows.length) drawChips(); }, 60_000);

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

@@ -6,7 +6,11 @@ export function api(path, opts = {}) {
   }).then(async (r) => {
     const j = await r.json().catch(() => ({}));
     if (!r.ok) {
-      const error = new Error(`${j.detail || j.error || r.statusText} (${r.status})`);
+      // The server's words as they are: what the page shows the user. The
+      // status goes in only when it sent none (a proxy's bare 502, a crash's
+      // 500): then it is all there is to go on.
+      const words = j.detail || j.error;
+      const error = new Error(words || `${r.statusText || "HTTP error"} (${r.status})`);
       error.status = r.status;
       // The server's error code ({error: "owned_by_tui", detail}): what
       // the page matches on, never the message's words.

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

@@ -168,6 +168,11 @@ export function goneSessionNotice(id, why) {
   return `Session ${String(id).slice(0, 8)} was ${why === "deleted" ? "deleted" : "not found"}.`;
 }
 
+// A failed action's toast: what failed and why (api()'s error says why).
+export function cantText(what, error) {
+  return `Can't ${what}: ${String(error?.message ?? error)}`;
+}
+
 // A session in the list after its live status changed (a turn started or
 // ended): that is activity now, so its card's "N min ago" says so too, and
 // the change came from a worker's stream, so the card says "live".

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

@@ -162,6 +162,7 @@ button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:non
 .activity-alias{color:var(--text-faint);white-space:nowrap}
 .activity-duration{color:var(--text-faint);font-size:11px;font-variant-numeric:tabular-nums;white-space:nowrap}
 .activity-output{margin:4px 0 2px var(--row-gutter);font-size:12px;color:var(--text-muted);white-space:pre-wrap;word-break:break-word;background:var(--bg);border-radius:6px;padding:6px 8px;max-height:160px;overflow:auto}
+.activity-output.tail{display:flex;flex-direction:column-reverse}
 /* A row's status and tool name never wrap (a phone broke them letter by
    letter); the params take what is left. The output goes on its own line
    under the call instead of a column beside it: on a desktop it lines up

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

@@ -264,10 +264,9 @@ export function batchTargets(picked, shownIds, archive, sessionsById) {
   });
 }
 
-// A refusal's reason as the card shows it: the server's words, without
-// the api() status suffix.
+// A refusal's reason as the card shows it: the server's words.
 function refusalText(error) {
-  return String(error?.message || "refused").replace(/\s*\(\d{3}\)$/, "");
+  return String(error?.message || "refused");
 }
 
 // Runs +act+ over +ids+ one at a time (a live session's stop waits on the

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

@@ -13,7 +13,7 @@ import { easeScrollTo } from "./scroll.js";
 const GROW_MS = 180;
 const GROW_EASE = "cubic-bezier(.2,.7,.3,1)";
 // The room between the stage and the composer card (index.html's margin-bottom).
-const STAGE_GAP = 10;
+export const STAGE_GAP = 10;
 
 export function reducedMotion() {
   return matchMedia("(prefers-reduced-motion: reduce)").matches;

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

@@ -127,6 +127,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
   let endedAt = 0;
   let thinkingLine = null; // { step, text } from the live step's ticker
   let flash = null; // { kind, text, until } a notice or nudge in the trail
+  let flashTimer = null; // its end's redraw
   let collapsed = readCollapsed();
   let cloudOpen = false;
   // A ref's "show in turn" opened a collapsed stage (not kept).
@@ -252,7 +253,8 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     if (!what) return;
     flash = { ...what, until: Date.now() + FLASH_MS };
     scheduleRefresh();
-    setTimeout(scheduleRefresh, FLASH_MS + 50);
+    clearTimeout(flashTimer);
+    flashTimer = setTimeout(scheduleRefresh, FLASH_MS + 50);
   }
 
   // The answer reads from its top (no tail pin in the stage): scrolled to
@@ -408,6 +410,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     promptSlot.classList.remove("full");
     thinkingLine = null;
     flash = null;
+    clearTimeout(flashTimer);
     setCloud(false);
     stage.classList.remove("plain", "ended", "waiting", "held-wait", "asking", "in-use");
     stage.style.removeProperty("--live-held");
@@ -590,8 +593,11 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     // composer's delivery line).
     current: () => view.current(),
     phase: () => liveSlots(view.current().turn, { pending: pendingCard() || asksCard() }).phase,
+    // Another session opens, or this one renders again: a turn still
+    // sliding away is dropped (its history is about to be drawn anew),
+    // never moved into whatever history shows now.
     reset() {
-      if (folding) finishFold();
+      folding = null;
       release();
     },
     // The stage's extras while it holds a turn (a card, a prompt for its

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

@@ -150,12 +150,15 @@ export function createStreamHandlers(deps) {
     // An after_turn hook presented the answer (AnswerDisplay) or attached
     // refs to it (AnswerRefs: refs, a count; display null when only refs):
     // it comes after turn_completed, so re-read the answer once that read
-    // is done.
+    // is done: the session's open then, so a switch meanwhile leaves the
+    // other session's answers alone.
     answer_display: async (data) => {
+      const id = selected();
       try {
         await liveTurn.endRead;
-        if (!selected() || (!data.display && !data.refs)) return;
-        const d = await getSession(selected(), { tail: true, recent: true });
+        if (!id || id !== selected() || (!data.display && !data.refs)) return;
+        const d = await getSession(id, { tail: true, recent: true });
+        if (id !== selected()) return;
         if (Array.isArray(d.messages)) applyFinalMarkdown(d.messages);
       } catch (_) {
       } finally {

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

@@ -278,7 +278,7 @@ function noMatch(record) {
 // every assistant message is one step. Its calls take the turn's records by
 // tool, in call order (each the next record of its tool, consumed with the
 // ones it skipped), not by iteration: an empty retry spends an iteration
-// that left no message (as the TUI's join, attached_loop.rb join_duration).
+// that left no message (as the TUI's join, attached_loop.rb join_record).
 // The last message is the answer when it has text and made no call (and the
 // turn is no canceled multi-step one); its thinking stays behind as a step,
 // as it does live.

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

@@ -5,7 +5,8 @@
 // worker's snapshot or a command_ran; the server's own reading of the
 // session file has no lists). Left out is reachable (find_tools and
 // call_tool reach them) and removed (only /toolkit add brings one back).
-// Changing it is /toolkit (no popover yet).
+// Changing it is /toolkit (no popover yet). A kit with a prompt text has
+// it on the summary too (prompt), and the tooltip ends with it.
 
 import { html, nothing } from "./vendor/lit-html.js";
 
@@ -24,6 +25,7 @@ export function chipModel(summary) {
     parts.push(summary.left_out.length ? `Not loaded: ${summary.left_out.join(", ")}.` : "Nothing left out.");
   }
   parts.push("/toolkit lists them; /toolkit NAME, add TOOL or remove TOOL changes them from the next turn.");
+  if (summary.prompt) parts.push(`Prompt: ${summary.prompt}`);
   return { text: `tools ${label}${summary.fallback ? " ?" : ""}`, title: parts.join(" ") };
 }