samagotchi 0.45.0 → 0.46.1

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

@@ -77,12 +77,24 @@ export function speedText(tps, source) {
   return `${source === "estimate" ? "~" : ""}${number} tok/s`;
 }
 
-// A cost in USD: "$0.42"; under a cent, four decimals ("$0.0012"); "" for
-// none or zero. As Formatting#cost_text.
-export function costText(cost) {
+// A cost in USD: "$0.42"; under a cent, four decimals ("$0.0012"); "~$0.12"
+// for an estimate (hosts.<name>.models prices); "" for none or zero. As
+// Formatting#cost_text.
+export function costText(cost, { estimate = false } = {}) {
   const value = num(cost);
   if (value === null || value <= 0) return "";
-  return value >= 0.01 ? `$${value.toFixed(2)}` : `$${value.toFixed(4)}`;
+  return `${estimate ? "~" : ""}${value >= 0.01 ? `$${value.toFixed(2)}` : `$${value.toFixed(4)}`}`;
+}
+
+// The ctx tooltip's cost: the reported cost as is; with an estimate (an
+// older worker or saved file has none) the total with "~" and both parts.
+function costLine(tokens) {
+  const reported = num(tokens.cost_sum) || 0;
+  const estimated = num(tokens.cost_estimate_sum) || 0;
+  if (estimated <= 0) return reported > 0 ? `cost: ${costText(reported)}` : "";
+  const total = costText(reported + estimated, { estimate: true });
+  const parts = reported > 0 ? `${costText(reported)} reported, ${costText(estimated, { estimate: true })} estimated` : "estimated";
+  return `cost: ${total} (${parts})`;
 }
 
 function count(n) {
@@ -142,7 +154,8 @@ export function ctxWindowText(window) {
 
 // The ctx tooltip (info bar and card): +title+, then the session's tokens
 // (in summed over every request, cached with its share, out with the
-// reasoning part) and its cost, when it has any, and the memory indexes
+// reasoning part) and its cost, when it has any (an estimated part with
+// "~", costLine), and the memory indexes
 // its prompt holds (+memoryIndex+, the snapshot's memory_index); with
 // +window+ (ctxWindowText's) the window line under the title. A
 // delegated session keeps its own metrics, so these are this session's only.
@@ -160,8 +173,8 @@ export function tokensTipText(tokens, title = "Context used after the last turn"
   if (cached > 0 && prompt > 0) parts.push(`cached ${count(cached)} (${Math.round((cached * 100) / prompt)}%)`);
   parts.push(`out ${count(completion)}${reasoning > 0 ? ` (reasoning ${count(reasoning)})` : ""}`);
   const lines = [title, `tokens: ${parts.join(" · ")}`];
-  const cost = costText(tokens.cost_sum);
-  if (cost) lines.push(`cost: ${cost}`);
+  const cost = costLine(tokens);
+  if (cost) lines.push(cost);
   lines.push("this session only, all requests");
   return `${lines.join("\n")}${memoryLine}`;
 }

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

@@ -255,8 +255,13 @@ export function servedModelDiffers(asked, served) {
 }
 
 // The session's model for the info bar: the served model with a marker when
-// the server serves another one than +servedFor+ (the name asked).
-export function modelLabel(model, served, servedFor) {
+// the server serves another one than +servedFor+ (the name asked), unless
+// +expectedBy+ names the host whose hosts.<name>.models served: lists it.
+export function modelLabel(model, served, servedFor, expectedBy = null) {
+  if (expectedBy && servedModelDiffers(servedFor, served)) {
+    const name = model || "";
+    return { text: name.slice(0, 40), title: `${name}; served: ${served} (expected: hosts.${expectedBy}.models)`, mismatch: false };
+  }
   if (servedModelDiffers(servedFor, served)) {
     return { text: `${served.slice(0, 40)} ⚠`, title: `served: ${served}; asked for ${model}`, mismatch: true };
   }

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

@@ -494,6 +494,7 @@ body.has-session #composer .actions-col{flex-wrap:nowrap;flex-shrink:0}
 #composer .actions-col .model-pick:hover,#composer .actions-col .model-pick[aria-expanded="true"]{filter:none;background:color-mix(in srgb,var(--bg-hover) 75%,transparent);color:var(--text-2)}
 #composer .actions-col .model-pick[hidden],body.has-session #composer .actions-col .model-pick{display:none}
 .model-pick-name{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+#composer .actions-col .model-pick.unavailable .model-pick-name{color:var(--text-faint)}
 .model-pick::after{content:"";position:absolute;right:9px;top:50%;width:5px;height:5px;border-right:1.5px solid currentColor;border-bottom:1.5px solid currentColor;transform:translateY(-70%) rotate(45deg);pointer-events:none;transition:transform .12s ease}
 .model-pick[aria-expanded="true"]::after{transform:translateY(-20%) rotate(225deg)}
 @media(max-width:600px){#composer .actions-col .model-pick{max-width:60%}}
@@ -529,6 +530,8 @@ body.has-session #composer .actions-col{flex-wrap:nowrap;flex-shrink:0}
 #modelList mark{background:none;color:var(--accent);font-weight:600}
 #modelList .model-option.chosen mark{color:var(--text-bright)}
 #modelList .model-note{flex:none;font-size:11px;color:var(--text-faint)}
+#modelList .model-option.unavailable:not(.chosen) .model-id,#modelList .model-option.unavailable .model-host{color:var(--text-faint)}
+#modelList .model-option.unavailable .model-note{color:var(--warn-text)}
 #modelList .model-empty{padding:10px;font-size:13px;color:var(--text-faint)}
 @media(max-width:600px){#modelPanel{left:6px;width:calc(100% - 12px)}#modelSearch{font-size:16px}#modelList .model-option{padding-top:8px;padding-bottom:8px}}
 /* The / autocomplete: a list over the composer card's top edge. It wears the glass edge and shadow, but opaque:

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

@@ -2,16 +2,19 @@
 
 export const MODEL_KEY = "chi_model";
 
-// The name to preselect: the remembered one when it is still offered (any
-// case), else the server's default, else the first offered, else "".
-export function pickModel(names, defaultName, stored) {
+// The name to preselect from the rows (modelRows): the remembered one when
+// it is still offered (any case), else the server's default, both even
+// when their host is down; else the first row whose host answered, else
+// the first row, else "".
+export function pickModel(rows, defaultName, stored) {
+  const names = rows.map((r) => r.name);
   const want = String(stored || "").trim().toLowerCase();
   if (want) {
     const kept = names.find((n) => n.toLowerCase() === want);
     if (kept) return kept;
   }
   if (defaultName && names.includes(defaultName)) return defaultName;
-  return defaultName || names[0] || "";
+  return defaultName || (rows.find((r) => !r.unavailable) || rows[0])?.name || "";
 }
 
 
@@ -20,7 +23,9 @@ export const RECENT_KEY = "chi_model_recent";
 // The payload's models as rows: {name, host, id, isDefaultHost}, and
 // sampling (the configured request parameters as /model words them) when
 // the model has some, and llm_context (the LLM context it starts under,
-// LLMContextStrategy::Explained#summary) when the server sent one. The
+// LLMContextStrategy::Explained#summary) when the server sent one, and
+// configured when the host declares the id (hosts.<name>.models), and
+// unavailable when that host failed to list its models. The
 // default host's names are bare (name == id); the server's own default,
 // unshifted when no host lists it, has no host and goes with them, shown
 // by its name.
@@ -34,15 +39,19 @@ export function modelRows(payload) {
       const id = host ? String(m.id || name) : name;
       const row = { name, host, id, isDefaultHost: !host || name === id };
       if (m.sampling) row.sampling = String(m.sampling);
+      if (m.configured === true) row.configured = true;
+      if (m.unavailable === true) row.unavailable = true;
       if (m.llm_context && typeof m.llm_context === "object") row.llm_context = m.llm_context;
       return row;
     });
 }
 
-const byId = (a, b) => a.id.localeCompare(b.id, "en", { sensitivity: "base" });
+const byId = (a, b) => (b.configured === true) - (a.configured === true) ||
+  a.id.localeCompare(b.id, "en", { sensitivity: "base" });
 
-// The rows under their hosts, [{host, isDefault, rows}]: the default host
-// first, the others in the server's order, ids A-Z inside a host.
+// The rows under their hosts, [{host, isDefault, unavailable, rows}]: the
+// default host first, the others in the server's order; inside a host the
+// configured ids first, each part A-Z. unavailable: every row's host is down.
 export function groupRows(rows) {
   const groups = [];
   const find = (key) => groups.find((g) => g.key === key);
@@ -57,10 +66,28 @@ export function groupRows(rows) {
     group.rows.push(row);
   }
   return groups.map(({ host, isDefault, rows: rs }) => ({
-    host: host || "default", isDefault, rows: [...rs].sort(byId),
+    host: host || "default", isDefault, unavailable: rs.every((r) => r.unavailable === true), rows: [...rs].sort(byId),
   }));
 }
 
+// The words after a row's id: "default" for the default model, else
+// "config" for an id the host declares (hosts.<name>.models), else "";
+// then "host down" when its host failed to list its models.
+export function rowNote(row, defaultName) {
+  const word = row.name === defaultName ? "default" : row.configured ? "config" : "";
+  return [word, row.unavailable ? "host down" : ""].filter(Boolean).join(" · ");
+}
+
+// A row's tooltip: its configured sampling, where a configured id comes
+// from, and that its host is down; "" when none.
+export function rowTitle(row) {
+  const parts = [];
+  if (row.sampling) parts.push(`sampling: ${row.sampling}`);
+  if (row.configured) parts.push(`served by config (hosts.${row.host}.models)`);
+  if (row.unavailable) parts.push(`host ${row.host} didn't list its models (down?); a chat on it may fail`);
+  return parts.join("; ");
+}
+
 const SEPARATORS = "/-:._ ";
 const atSegmentStart = (text, i) => i === 0 || SEPARATORS.includes(text[i - 1]);
 

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

@@ -12,7 +12,7 @@
 import { escapeHtml } from "./format.js";
 import { moveSelection } from "./command_complete.js";
 import {
-  MODEL_KEY, RECENT_KEY, groupRows, matchModels, modelRows, pickModel, pushRecent, recentRows,
+  MODEL_KEY, RECENT_KEY, groupRows, matchModels, modelRows, pickModel, pushRecent, recentRows, rowNote, rowTitle,
 } from "./model_pick.js";
 
 const PAGE = 8;
@@ -50,16 +50,21 @@ export function createModelPicker({ button, panel, input, list, composer, center
 
   const isOpen = () => !panel.hidden;
 
+  // Greyed while the chosen row's host is down (the button's tooltip,
+  // app.js', carries the host's warning).
   function setChosen(name) {
     chosen = name;
     button.querySelector(".model-pick-name").textContent = name;
+    button.classList.toggle("unavailable", rows.some((r) => r.name === name && r.unavailable === true));
   }
 
   function rowHtml(row, i, { hostMarks = [], idMarks = [], showHost = !row.isDefaultHost } = {}) {
     const host = showHost ? `<span class="model-host">${markedHtml(row.host, hostMarks)}</span><span class="model-dot"> · </span>` : "";
-    const note = row.name === defaultName ? `<span class="model-note">default</span>` : "";
-    const cls = `model-option${i === active ? " active" : ""}${row.name === chosen ? " chosen" : ""}`;
-    const title = row.sampling ? ` title="${escapeHtml(`sampling: ${row.sampling}`)}"` : "";
+    const noteText = rowNote(row, defaultName);
+    const note = noteText ? `<span class="model-note">${noteText}</span>` : "";
+    const cls = `model-option${i === active ? " active" : ""}${row.name === chosen ? " chosen" : ""}${row.unavailable ? " unavailable" : ""}`;
+    const titleText = rowTitle(row);
+    const title = titleText ? ` title="${escapeHtml(titleText)}"` : "";
     return `<div class="${cls}" role="option" id="model-option-${i}" aria-selected="${i === active}" data-index="${i}"${title}>` +
       `<span class="model-id">${host}${markedHtml(row.id, idMarks)}</span>${note}</div>`;
   }
@@ -81,7 +86,7 @@ export function createModelPicker({ button, panel, input, list, composer, center
         recent.forEach((row) => add(row));
       }
       for (const group of groupRows(rows)) {
-        html += head(group.host, group.isDefault ? "default host" : "");
+        html += head(group.host, [group.isDefault ? "default host" : "", group.unavailable ? "host down" : ""].filter(Boolean).join(" · "));
         group.rows.forEach((row) => add(row, { showHost: false }));
       }
     }
@@ -215,7 +220,7 @@ export function createModelPicker({ button, panel, input, list, composer, center
       close();
       rows = next;
       defaultName = String(payload.default || "");
-      setChosen(pickModel(rows.map((r) => r.name), payload.default, stored || chosen));
+      setChosen(pickModel(rows, payload.default, stored || chosen));
       return true;
     },
     chosen: () => chosen,

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

@@ -25,6 +25,13 @@ const CONTINUE_CLOSED = {
   replaced: "Asked again",
 };
 
+// A close reason that reads as words on any card, not as "(reason)": a
+// question asked in a --non-interactive run (QuestionDesk's
+// UNANSWERABLE_REASON) had no one to answer it.
+const CLOSED_PLAIN = {
+  non_interactive: "No one could answer (non-interactive run)",
+};
+
 // 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.
@@ -97,6 +104,7 @@ function relayClosedText(relay, reason) {
 export function resultText(pq, { answer = null, cancelled = false, reason = "" } = {}) {
   const approval = isApproval(pq);
   const relay = relayView(pq);
+  if (cancelled && Object.hasOwn(CLOSED_PLAIN, reason)) return CLOSED_PLAIN[reason];
   if (cancelled && relay && reason !== "dismissed") return relayClosedText(relay, reason);
   if (isContinue(pq)) return continueResultText({ answer, cancelled, reason });
   if (cancelled) {

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

@@ -560,6 +560,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     },
     generationStarted: (data) => view.generationStarted(data),
     chunk: (data) => view.chunk(data),
+    generationRestarted: (data) => view.generationRestarted(data),
     generationCompleted: () => view.generationCompleted(),
     toolStarted: (data) => view.toolStarted(data),
     toolCompleted: (data) => view.toolCompleted(data),

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

@@ -208,11 +208,16 @@ export function noticeLine(entry = {}) {
 }
 
 // The live turn's status while the provider is asked again after an error
-// (generation_retrying): "↻ retrying (503) in 4 s, 2/5" (retry 2 of 5).
-export function retryStatusLine({ attempt, max_retries, next_delay, status, error_class } = {}) {
-  const why = status || String(error_class || "").split("::").pop();
-  const delay = Number(next_delay);
-  const when = Number.isFinite(delay) ? ` in ${delay < 1 ? delay.toFixed(1) : Math.round(delay)} s` : "";
+// (generation_retrying): "↻ retrying (503) in 4.0s, 2/5" (retry 2 of 5).
+// The TUI words it the same (Formatting#format_generation_retry_line;
+// spec/shared/labels_matrix.json).
+export function retryStatusLine({ attempt, max_retries, next_delay, status, error_class, restarted } = {}) {
+  // restarted: a dropped stream's step asked again (the chat loop's).
+  const why = restarted ? "stream dropped" : status || String(error_class || "").split("::").pop();
+  // null/"" are no delay (Number would make them 0).
+  const delay = next_delay === null || next_delay === "" ? NaN : Number(next_delay);
+  // Rounded as Ruby's Float#round does (half away from zero), then one decimal.
+  const when = Number.isFinite(delay) ? ` in ${(Math.round(delay * 10) / 10).toFixed(1)}s` : "";
   const count = attempt ? `, ${attempt}${max_retries ? `/${max_retries}` : ""}` : "";
   return `↻ retrying${why ? ` (${why})` : ""}${when}${count}`;
 }

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

@@ -12,6 +12,8 @@
 //   a chunk with no iteration goes to the current gen, unless that one is
 //   textDone or already has tool rows (an older server's replay), which
 //   opens a new gen.
+// - generation_retrying with restarted (a dropped stream's step asked
+//   again) empties its gen's thinking and text.
 // - generation_completed marks the current gen textDone; its tool rows
 //   follow it (the kernel emits them after).
 // - tool events go to the gen of their iteration, else to the current gen,
@@ -105,6 +107,20 @@ export function chunk(turn, { text = "", thinking = "", iteration = null } = {})
   return r;
 }
 
+// A step asked again after its stream dropped (generation_retrying with
+// restarted): the open gen of +iteration+ (else the current one) loses what
+// it streamed; null when there is none.
+export function generationRestarted(turn, iteration = null) {
+  const current = currentGen(turn);
+  const gen = iteration == null ? current
+    : [...turn.gens].reverse().find((g) => !g.closed && g.iteration === iteration) ?? null;
+  if (!gen) return null;
+  gen.thinking = "";
+  gen.text = "";
+  gen.textDone = false;
+  return { gen, opened: false, closed: null };
+}
+
 export function generationCompleted(turn) {
   const gen = currentGen(turn);
   if (gen) gen.textDone = true;

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

@@ -615,6 +615,25 @@ export function createTurnView({
       apply(r);
       scheduleFlush(r.gen);
     },
+    // A dropped stream's step asked again (generation_retrying with
+    // restarted): its gen's thinking and narration so far go, the step
+    // shows "…" until the new stream's text comes.
+    generationRestarted(data) {
+      if (!turn) return;
+      const r = model.generationRestarted(turn, data?.iteration ?? null);
+      const entry = r && genEls.get(r.gen);
+      if (!entry) return;
+      dirty.delete(r.gen);
+      if (entry.thinkingWrap) {
+        if (entry.tickerTimer) { clearTimeout(entry.tickerTimer); entry.tickerTimer = null; }
+        entry.ticker.close();
+        entry.thinkingWrap.remove();
+      }
+      Object.assign(entry, { thinking: null, thinkingWrap: null, thinkingLine: null, ticker: null, thinkingWritten: 0,
+        box: null, feed: createSentenceFeed() });
+      entry.text.textContent = "…";
+      onChange();
+    },
     generationCompleted() {
       if (!turn) return;
       const r = model.generationCompleted(turn);

data/lib/samagotchi/worker.rb

@@ -16,6 +16,7 @@ require_relative "session_manager"
 require_relative "archive_store"
 require_relative "log"
 require_relative "turn_flow"
+require_relative "llm/errors"
 require_relative "continue_offer"
 require_relative "iteration_limit"
 require_relative "session_commands"
@@ -830,7 +831,7 @@ module Samagotchi
       # failed prompt or wake turn that got nowhere, a canceled continue
       # turn). A failed turn whose work stayed, and a reminder or continue
       # turn that failed (kept with its failed note), read them.
-      settle_child_reports(rolled_back: @turn_flow.restores != restores)
+      settle_child_reports(rolled_back: @turn_flow.restores != restores || merges_lost?(error))
       ring_parent_after_turn
     end
 
@@ -843,6 +844,24 @@ module Samagotchi
       rolled_back ? @child_reports.release : @child_reports.commit
     end
 
+    # Whether +error+ ended the turn without its loop's conversation: a
+    # failure the loops didn't mark (LLM::FailedTurn), one past their end
+    # (the Engine's own end of the turn, say). The Engine kept the turn's
+    # start only, so the reports its loop merged are not in the
+    # conversation: their rings stay for the next turn, even when the turn
+    # itself stays (a reminder or continue turn). Not one raised after the
+    # turn ended (the Engine's post-turn work): the turn was kept as it
+    # ended, completed or canceled, the reports in it (a turn TurnFlow
+    # takes back is a restore, above).
+    def merges_lost?(error)
+      return false if error.nil? || error.is_a?(LLM::FailedTurn)
+
+      !KEPT_TURN_OUTCOMES.include?(@session.last_turn&.dig("outcome"))
+    end
+
+    # The Engine's turn endings that keep the turn's conversation (#merges_lost?).
+    KEPT_TURN_OUTCOMES = %w[completed canceled].freeze
+
     # A delegate child's turn that was its parent's (#reports_to_parent?)
     # rings the parent, after the save: the parent reads a settled child.
     # A question it rang about that still waits makes the next turn ring

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.46.1
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -136,6 +136,7 @@ files:
 - docs/internals/gemma4-contract.md
 - docs/internals/llm-context-bench.md
 - docs/internals/llm-context-forget.md
+- docs/internals/llm-context-live.md
 - docs/internals/prompt-caching.md
 - docs/internals/tool-guardrails.md
 - docs/memory.md
@@ -285,6 +286,7 @@ files:
 - lib/samagotchi/hooks/loader.rb
 - lib/samagotchi/hooks/registry.rb
 - lib/samagotchi/hooks/stream_watch.rb
+- lib/samagotchi/host_model.rb
 - lib/samagotchi/host_registry.rb
 - lib/samagotchi/idle_client.rb
 - lib/samagotchi/idle_recap.rb
@@ -348,6 +350,7 @@ files:
 - lib/samagotchi/model_match.rb
 - lib/samagotchi/model_notes.rb
 - lib/samagotchi/model_overlay.rb
+- lib/samagotchi/model_price.rb
 - lib/samagotchi/model_profile.rb
 - lib/samagotchi/model_ref.rb
 - lib/samagotchi/models_command.rb