samagotchi 0.71.0 → 0.72.0

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/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(" ") };
 }
 

data/lib/samagotchi/web/session_hub.rb

@@ -172,6 +172,14 @@ module Samagotchi
         end
       end
 
+      # A session's folder as the projection holds it (its file's, read at
+      # the last scan or touch): what a live read that loads no session
+      # file checks refs against. nil for a session the hub hasn't seen.
+      # @return [String, nil]
+      def working_directory(id)
+        @monitor.synchronize { @sessions[id]&.session&.working_directory }
+      end
+
       # Register a sink (#call(event)). With +snapshot:+ the current
       # projection comes back with the handle, taken in the same step, so
       # every event after it is newer than it.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.71.0
+  version: 0.72.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -279,6 +279,7 @@ files:
 - lib/samagotchi/empty_answer_retry.rb
 - lib/samagotchi/engine.rb
 - lib/samagotchi/engine_peers.rb
+- lib/samagotchi/event_routes.rb
 - lib/samagotchi/events.rb
 - lib/samagotchi/extension_load.rb
 - lib/samagotchi/file_ref.rb
@@ -459,6 +460,7 @@ files:
 - lib/samagotchi/session_inbox.rb
 - lib/samagotchi/session_manager.rb
 - lib/samagotchi/session_metrics.rb
+- lib/samagotchi/session_model_settings.rb
 - lib/samagotchi/session_observer.rb
 - lib/samagotchi/session_retention.rb
 - lib/samagotchi/session_setting.rb