samagotchi 0.76.0 → 0.77.0

data/lib/samagotchi/tools/delegate_relay.rb

@@ -37,7 +37,7 @@ module Samagotchi
       # @param relay [#open_question, #relay_desk] Peers#relay
       # @return [Boolean] a relay can take this question
       def relayable?(relay, question)
-        !relay.nil? && question.is_a?(Hash) && question[:kind].to_s == Guardrails::Approval::KIND
+        !relay.nil? && question.is_a?(PendingQuestion) && question.kind.to_s == Guardrails::Approval::KIND
       end
 
       # Relay the child's pending approval and wait until it settles.
@@ -45,7 +45,7 @@ module Samagotchi
       # @return [Outcome]
       def call(child_id, question, relay:, state_dir:, more: 0)
         child = Session.load(child_id, state_dir: state_dir)
-        qid = question[:id].to_s
+        qid = question.id.to_s
         desk = relay.relay_desk
         relay_id = desk.open(child_id: child_id, child_question_id: qid)
         client = BridgeClient.discover(child_id, session_dir: Session.session_dir(child_id, state_dir: state_dir))
@@ -70,7 +70,7 @@ module Samagotchi
           end
 
           pending = Session.load(child_id, state_dir: state_dir).pending_question
-          pending && pending[:id].to_s == qid ? nil : "answered_on_child"
+          pending && pending.id.to_s == qid ? nil : "answered_on_child"
         rescue ArgumentError
           "child_gone"
         end
@@ -175,7 +175,7 @@ module Samagotchi
           return if waiting.empty?
 
           child_id, question = waiting.first
-          @done[question[:id].to_s] = true
+          @done[question.id.to_s] = true
           outcome = DelegateRelay.call(child_id, question, relay: @relay, state_dir: @state_dir, more: waiting.size - 1)
           @on_outcome.call(child_id, outcome)
           # The next one, if any, right after.
@@ -186,7 +186,7 @@ module Samagotchi
         # @return [Integer]
         def count = waiting.size
 
-        # @return [Array<Array(String, Hash)>] [child id, pending question],
+        # @return [Array<Array(String, PendingQuestion)>] [child id, pending question],
         #   oldest question first
         def waiting
           rows = SessionManager.children_of(@parent_id, state_dir: @state_dir).select do |row|
@@ -194,10 +194,10 @@ module Samagotchi
           end
           rows.filter_map do |row|
             pending = Session.load(row[:id], state_dir: @state_dir).pending_question
-            [row[:id], pending] if pending && pending[:id].to_s == row[:waiting_id].to_s
+            [row[:id], pending] if pending && pending.id.to_s == row[:waiting_id].to_s
           rescue ArgumentError
             nil
-          end.sort_by { |_, pending| pending[:created_at].to_s }
+          end.sort_by { |_, pending| pending.created_at.to_s }
         end
 
         private

data/lib/samagotchi/tools/delegate_wait.rb

@@ -91,7 +91,7 @@ module Samagotchi
           # asked), the relayed question no longer reported: a turn that
           # ends with no reply during the relay's POST or after it still
           # ends the wait.
-          baseline = ReplyWait.baseline_of(wait.session, question_id: wait.question[:id])
+          baseline = ReplyWait.baseline_of(wait.session, question_id: wait.question.id)
         end
       rescue ArgumentError => e
         "Error: #{e.message}"

data/lib/samagotchi/tools/web_fetch.rb

@@ -3,7 +3,6 @@
 require "net/http"
 require "uri"
 require "ipaddr"
-require "nokogiri"
 require_relative "../version"
 
 module Samagotchi
@@ -128,6 +127,9 @@ module Samagotchi
       def self.extract_text_from_html(html)
         return "Error: empty HTML response" if html.nil? || html.empty?
 
+        # Load lazily so workers don't pay for Nokogiri on every start.
+        require "nokogiri"
+
         doc = Nokogiri::HTML(html)
 
         # Extract noscript text before removing it

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -43,7 +43,7 @@ require_relative "../recap_store"
 require_relative "markdown_renderer"
 require_relative "capabilities"
 require_relative "editor"
-require_relative "message_parts"
+require_relative "../message_parts"
 require_relative "session_summary"
 require_relative "../log"
 require_relative "../paths"
@@ -855,7 +855,7 @@ module Samagotchi
           current_turn = turn_snapshot["current_turn"]
           current_turn ? current_turn["pending_question"] : turn_snapshot["pending_question"]
         elsif owner&.worker?
-          session.pending_question
+          session.pending_question&.to_h
         end
       end
 

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

@@ -45,6 +45,7 @@ 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 { createMarkdownPlace } from "./markdown_place.js";
 import { reducedMotion, STAGE_GAP } from "./stage_frame.js";
 import { chainNeighbours, continueRefusal, continuedText, freshLink, openChildrenTemplate, openerText, openTitle } from "./chains.js";
 import { createTaskStopper } from "./task_stop.js";
@@ -86,6 +87,7 @@ import { liveSlots } from "./stage_model.js";
 import { currentGen } from "./turn_model.js";
 import { toolName } from "./activity.js";
 import { toastBottom } from "./toast_place.js";
+import { createToasts } from "./toasts.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -231,26 +233,25 @@ const viewArgs = {
   // the route (its sidecar features).
   taskStop: createTaskStopper({ sessionId: () => selected, features: () => current.workerFeatures }),
 };
+const markdownPlace = createMarkdownPlace({
+  capabilities: () => pageCapabilities,
+  renderText,
+  roots: () => turnRoots(),
+  touchedFiles,
+  currentDir: () => current.dir,
+  linkRefs,
+  applyFinalAnswer,
+  findInTurnRoots: (selector) => findInTurnRoots(selector),
+  normalize,
+  pairAnswerRefs,
+});
+const { renderMarkdown, linkRefsIn, applyFinalMarkdown, linkTextRefs } = markdownPlace;
 const turnDom = view === "stage"
   ? createStageView({
     ...viewArgs, isNearBottom: () => atHistoryEnd(), dockEl: $("#dock"), centerEl: $("#center"), composerEl,
     renderMarkdown, linkRefs: linkRefsIn,
   })
   : createTurnView(viewArgs);
-// A text the page already shows as its markdown HTML (POST /api/render,
-// sanitised there), or null: markdown off here (no request), or a failed
-// read (the raw text stays).
-function renderMarkdown(text) {
-  if (pageCapabilities.display !== true) return Promise.resolve(null);
-  return renderText(text)
-    .then((d) => (typeof d?.html === "string" && d.html ? d.html : null))
-    .catch(() => null);
-}
-// The `path:line` refs in one rendered text (the stage's asking slot, a
-// kept reply), as linkTextRefs links the answers'.
-function linkRefsIn(el) {
-  linkRefs(el, touchedFiles(turnRoots()), current.dir);
-}
 // Where a running turn's rows can be: the history, and the stage while it
 // holds a turn (lookups by id, copy, annotate, card actions).
 function turnRoots() {
@@ -978,32 +979,6 @@ async function readTurnEnd() {
   } catch(_){}
 }
 
-// The turn's answer as its rendered markdown and with its plugin refs,
-// once it is final (the turn-end read, an answer_display re-read:
-// answer_refs.js applyFinalAnswer); then the refs.
-function applyFinalMarkdown(messages) {
-  applyFinalAnswer(messages, findInTurnRoots(".bubble.output"), normalize);
-  linkTextRefs();
-}
-
-// The refs on the answers' and closed steps' texts, on this page: first
-// each answer's own (a plugin's, answer_refs.js), then the `path:line`
-// refs that name a file the session's rows (and cards) touched
-// (ref_scan.js), which leave a plugin's alone. Not mid-stream: at a
-// turn's end and after a reload's render. A ref already made stays as it
-// is.
-function linkTextRefs() {
-  const roots = turnRoots();
-  const touched = touchedFiles(roots);
-  for (const root of roots) {
-    for (const el of root.querySelectorAll(".bubble.output")) pairAnswerRefs(el);
-  }
-  if (!touched.size) return;
-  for (const root of roots) {
-    for (const el of root.querySelectorAll(".bubble.output, .gen:not(.live) > .gen-text")) linkRefs(el, touched, current.dir);
-  }
-}
-
 function seedSeenFromDom() {
   shownTexts.seed(findInTurnRoots(".bubble").map((b) => normalize(b.textContent)));
 }
@@ -2053,24 +2028,11 @@ function placeToast() {
     else root.removeProperty("--toast-bottom");
   }
 }
+const toasts = createToasts({ el: $("#toast"), onChange: placeToast });
 // The model panel opening, closing or changing height (its list filters).
 new ResizeObserver(() => placeToast()).observe(document.getElementById("modelPanel"));
 
-// sticky: stays until its action or its ✕ (else gone after 6 s). +text+:
-// words, or a template (chains.js openChildrenTemplate: a link in it, a
-// delegate a continue waits for, opens that session and hides the toast).
-let toastTimer = null;
-function showToast(text, action = null, { sticky = false } = {}) {
-  const el = $("#toast");
-  const hide = () => { el.hidden = true; };
-  render(html`<span @click=${(e) => { if (e.target.closest?.("a[href]")) hide(); }}>${text}</span>${action
-    ? html`<button type="button" class="toast-action" @click=${() => { hide(); action.run(); }}>${action.label}</button>`
-    : nothing}${sticky ? html`<button type="button" class="toast-close" title="Dismiss" aria-label="Dismiss" @click=${hide}>✕</button>` : nothing}`, el);
-  el.hidden = false;
-  placeToast();
-  clearTimeout(toastTimer);
-  if (!sticky) toastTimer = setTimeout(hide, 6000);
-}
+function showToast(text, action = null, options = {}) { toasts.show(text, action, options); }
 
 // Annotate (annotate_bar.js): a selection in the conversation offers
 // "Annotate" and the presets, which append a quote to the composer, and the

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

@@ -208,6 +208,17 @@ export function modelSegmentPrefillText(row) {
   return `switch prefill ${countK(tokens)} uncached prompt${cost ? ` ≈${cost}` : ""}`;
 }
 
+// A ref past +max+ characters with its middle cut to one "…":
+// the tooltip is a native title, which grows as wide as its longest line.
+// The host's start and the model's end stay; the model chip has the full ref.
+const TIP_REF_MAX = 40;
+export function shortRef(text, max = TIP_REF_MAX) {
+  const chars = [...text];
+  if (chars.length <= max) return text;
+  const head = Math.floor((max - 1) / 3);
+  return `${chars.slice(0, head).join("")}…${chars.slice(chars.length - (max - 1 - head)).join("")}`;
+}
+
 // The tooltip's rows per model, with ≥ 2 (one model: none): "model ·
 // turns · in / out · cost", a switch's prefill under its row.
 function modelSegmentLines(segments) {
@@ -215,7 +226,7 @@ function modelSegmentLines(segments) {
   const lines = ["per model:"];
   for (const row of segments) {
     const turns = num(row.turns) || 0;
-    const parts = [modelSegmentLabel(row), `${turns} ${turns === 1 ? "turn" : "turns"}`, modelSegmentTokensText(row)];
+    const parts = [shortRef(modelSegmentLabel(row)), `${turns} ${turns === 1 ? "turn" : "turns"}`, modelSegmentTokensText(row)];
     const cost = modelSegmentCostText(row);
     if (cost) parts.push(cost);
     lines.push(`  ${parts.join(" · ")}`);

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

@@ -1121,8 +1121,9 @@ body.all-view #center, body.all-view #topStrip{display:none}
 .card.archived:hover{opacity:.85}
 .card .archived-badge,.family-row .archived-badge{font-size:10px;padding:1px 6px;border-radius:6px;border:1px solid var(--border-strong);color:var(--text-muted)}
 /* bottom: above the session's composer card when one shows (--toast-bottom, app.js placeToast). */
-#toast{position:fixed;left:50%;bottom:var(--toast-bottom,24px);transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;gap:12px;align-items:center;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
+#toast{position:fixed;left:50%;bottom:var(--toast-bottom,24px);transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;flex-direction:column;align-items:center;gap:8px}
 #toast[hidden]{display:none}
+#toast .toast-item{display:flex;gap:12px;align-items:center;width:max-content;max-width:100%;box-sizing:border-box;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
 #toast .toast-action{background:transparent;border:0;color:var(--accent);font-weight:600;cursor:pointer;padding:2px 4px}
 #toast .toast-close{background:transparent;border:0;color:var(--text-muted);cursor:pointer;padding:2px 4px;margin-left:-6px}
 #toast .toast-close:hover{color:var(--text)}

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

@@ -0,0 +1,53 @@
+// Where the page's rendered markdown and its refs go (moved out of app.js):
+// a text as its markdown HTML, the `path:line` refs in one rendered text,
+// a final answer's rendering and refs, and the refs across the page. The
+// page's state comes in as getters (capabilities, roots, currentDir), read
+// at each call.
+export function createMarkdownPlace({
+  capabilities, renderText, roots, touchedFiles, currentDir, linkRefs, applyFinalAnswer, findInTurnRoots, normalize,
+  pairAnswerRefs,
+}) {
+  // A text the page already shows as its markdown HTML (POST /api/render,
+  // sanitised there), or null: markdown off here (no request), or a failed
+  // read (the raw text stays).
+  function renderMarkdown(text) {
+    if (capabilities().display !== true) return Promise.resolve(null);
+    return renderText(text)
+      .then((d) => (typeof d?.html === "string" && d.html ? d.html : null))
+      .catch(() => null);
+  }
+
+  // The `path:line` refs in one rendered text (the stage's asking slot, a
+  // kept reply), as linkTextRefs links the answers'.
+  function linkRefsIn(el) {
+    linkRefs(el, touchedFiles(roots()), currentDir());
+  }
+
+  // The turn's answer as its rendered markdown and with its plugin refs,
+  // once it is final (the turn-end read, an answer_display re-read:
+  // answer_refs.js applyFinalAnswer); then the refs.
+  function applyFinalMarkdown(messages) {
+    applyFinalAnswer(messages, findInTurnRoots(".bubble.output"), normalize);
+    linkTextRefs();
+  }
+
+  // The refs on the answers' and closed steps' texts, on this page: first
+  // each answer's own (a plugin's, answer_refs.js), then the `path:line`
+  // refs that name a file the session's rows (and cards) touched
+  // (ref_scan.js), which leave a plugin's alone. Not mid-stream: at a
+  // turn's end and after a reload's render. A ref already made stays as it
+  // is.
+  function linkTextRefs() {
+    const pageRoots = roots();
+    const touched = touchedFiles(pageRoots);
+    for (const root of pageRoots) {
+      for (const el of root.querySelectorAll(".bubble.output")) pairAnswerRefs(el);
+    }
+    if (!touched.size) return;
+    for (const root of pageRoots) {
+      for (const el of root.querySelectorAll(".bubble.output, .gen:not(.live) > .gen-text")) linkRefs(el, touched, currentDir());
+    }
+  }
+
+  return { renderMarkdown, linkRefsIn, applyFinalMarkdown, linkTextRefs };
+}

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

@@ -75,12 +75,16 @@ export function createStreamHandlers(deps) {
     generation_started: (data) => {
       // The request after a /model's unresolved window started: whatever it
       // brings, the ctx tooltip no longer waits for it (ctxBarTip).
-      state().ctxUnknownAfterSwitch = false;
+      const current = state();
+      let contextChanged = current.ctxUnknownAfterSwitch !== false;
+      current.ctxUnknownAfterSwitch = false;
       if (data?.context_window_tokens) {
-        const current = state();
+        const source = data.context_window_source || null;
+        contextChanged ||= current.ctxWindow !== data.context_window_tokens || current.ctxWindowSource !== source;
         current.ctxWindow = data.context_window_tokens;
-        current.ctxWindowSource = data.context_window_source || null;
+        current.ctxWindowSource = source;
       }
+      if (contextChanged) updateInfoBar();
       liveTurn.timing.setNote("");
       // The step's clock (the composer's delivery line): the page's own at a
       // live start; a replay's comes from the snapshot's generation age,

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

@@ -0,0 +1,69 @@
+import { html, nothing, render } from "./vendor/lit-html.js";
+
+// The page's toasts (app.js showToast): a stack in #toast, newest last, at
+// most MAX_TOASTS. Each item has its own 6 s timer, or none when sticky: a
+// sticky one stays until its action, its ✕ or a link in it is clicked, so a
+// later notice can't hide an error. +text+: words, or a template
+// (chains.js openChildrenTemplate: a link in it opens that session and hides
+// the toast). The same text again while it shows reuses its item, moved to
+// the end with a fresh timer. When a 4th comes, the oldest non-sticky goes
+// (the oldest of all if every one is sticky).
+const TOAST_MS = 6000;
+const MAX_TOASTS = 3;
+
+export function createToasts({ el, onChange = () => {}, doc = globalThis.document }) {
+  const entries = [];
+
+  function sync() {
+    el.hidden = entries.length === 0;
+    onChange();
+  }
+
+  function remove(entry, notify = true) {
+    const index = entries.indexOf(entry);
+    if (index < 0) return;
+    if (entry.timer !== null) clearTimeout(entry.timer);
+    entry.timer = null;
+    entries.splice(index, 1);
+    entry.el.remove();
+    if (notify) sync();
+  }
+
+  function draw(entry, text, action, sticky) {
+    render(html`<span class="toast-message" @click=${(e) => { if (e.target.closest?.("a[href]")) remove(entry); }}>${text}</span>${action
+      ? html`<button type="button" class="toast-action" @click=${() => { remove(entry); action.run(); }}>${action.label}</button>`
+      : nothing}${sticky ? html`<button type="button" class="toast-close" title="Dismiss" aria-label="Dismiss" @click=${() => remove(entry)}>✕</button>` : nothing}`,
+    entry.el);
+  }
+
+  function show(text, action = null, { sticky = false } = {}) {
+    const candidate = { el: doc.createElement("div"), timer: null, sticky, key: null };
+    candidate.el.className = "toast-item";
+    draw(candidate, text, action, sticky);
+    candidate.key = candidate.el.querySelector(".toast-message").textContent;
+
+    const duplicate = entries.find((entry) => entry.key === candidate.key);
+    if (duplicate) {
+      if (duplicate.timer !== null) clearTimeout(duplicate.timer);
+      duplicate.timer = null;
+      duplicate.sticky = sticky;
+      duplicate.key = candidate.key;
+      draw(duplicate, text, action, sticky);
+      entries.push(...entries.splice(entries.indexOf(duplicate), 1));
+      el.appendChild(duplicate.el);
+      if (!sticky) duplicate.timer = setTimeout(() => remove(duplicate), TOAST_MS);
+      sync();
+      return;
+    }
+
+    if (entries.length === MAX_TOASTS) {
+      remove(entries.find((entry) => !entry.sticky) || entries[0], false);
+    }
+    entries.push(candidate);
+    el.appendChild(candidate.el);
+    if (!sticky) candidate.timer = setTimeout(() => remove(candidate), TOAST_MS);
+    sync();
+  }
+
+  return { show };
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.76.0
+  version: 0.77.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -393,6 +393,7 @@ files:
 - lib/samagotchi/memory_bundle/trash.rb
 - lib/samagotchi/memory_bundle/uninstaller.rb
 - lib/samagotchi/memory_paths.rb
+- lib/samagotchi/message_parts.rb
 - lib/samagotchi/model_catalog.rb
 - lib/samagotchi/model_list_store.rb
 - lib/samagotchi/model_match.rb
@@ -412,6 +413,7 @@ files:
 - lib/samagotchi/paths.rb
 - lib/samagotchi/peer_sources.rb
 - lib/samagotchi/pending_input_queue.rb
+- lib/samagotchi/pending_question.rb
 - lib/samagotchi/plugin/api.rb
 - lib/samagotchi/plugin/attached_context.rb
 - lib/samagotchi/plugin/context.rb
@@ -485,6 +487,7 @@ files:
 - lib/samagotchi/terminal_ui/input_support.rb
 - lib/samagotchi/terminal_ui/line_reader.rb
 - lib/samagotchi/terminal_ui/live_region.rb
+- lib/samagotchi/terminal_ui/model_segments_text.rb
 - lib/samagotchi/terminal_ui/one_shot_sink.rb
 - lib/samagotchi/terminal_ui/plain_surface.rb
 - lib/samagotchi/terminal_ui/question_prompt.rb
@@ -573,7 +576,6 @@ files:
 - lib/samagotchi/web/info_probe.rb
 - lib/samagotchi/web/lan.rb
 - lib/samagotchi/web/markdown_renderer.rb
-- lib/samagotchi/web/message_parts.rb
 - lib/samagotchi/web/public/activity.js
 - lib/samagotchi/web/public/annotate_actions.js
 - lib/samagotchi/web/public/annotate_bar.js
@@ -615,6 +617,7 @@ files:
 - lib/samagotchi/web/public/live_timing.js
 - lib/samagotchi/web/public/live_turn.js
 - lib/samagotchi/web/public/llm_context_chip.js
+- lib/samagotchi/web/public/markdown_place.js
 - lib/samagotchi/web/public/model_pick.js
 - lib/samagotchi/web/public/model_picker.js
 - lib/samagotchi/web/public/notice_links.js
@@ -651,6 +654,7 @@ files:
 - lib/samagotchi/web/public/thinking_ticker.js
 - lib/samagotchi/web/public/timing.js
 - lib/samagotchi/web/public/toast_place.js
+- lib/samagotchi/web/public/toasts.js
 - lib/samagotchi/web/public/toolkit_chip.js
 - lib/samagotchi/web/public/turn_events.js
 - lib/samagotchi/web/public/turn_html.js