samagotchi 0.44.0 → 0.46.0

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

@@ -302,6 +302,8 @@ button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:non
 .note-text{white-space:pre-wrap;max-height:8em;overflow:auto}
 .bubble.command.busy{border-left-color:var(--warn)}
 .bubble.command.failed{border-left-color:var(--danger)}
+.bubble.command.queued{border-left-style:dashed}
+.bubble.command.queued .command-output{color:var(--text-faint)}
 .command-line{font-family:ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--text-3)}
 .command-output{margin:6px 0 0;white-space:pre-wrap;font-size:12px;color:var(--text-2)}
 .bubble.continue{border-left:3px solid var(--accent);background:var(--bg-panel);padding:10px 12px}
@@ -612,7 +614,7 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 .ts-trail-item:is(.error,.blocked){color:var(--danger-text)}
 .ts-trail-item.warn{color:var(--warn-text)}
 .ts-trail-item.stopped{color:var(--warn-text);opacity:.8}
-.ts-trail-item.info,.ts-trail-item.steer{color:var(--accent)}
+.ts-trail-item.info,.ts-trail-item.steer,.ts-trail-item.edit{color:var(--accent)}
 .ts-trail-item.none{font-style:italic}
 /* A card waits: the tool row and trail give it their room. */
 .turn-stage.waiting .ts-now,.turn-stage.waiting .ts-trail{display:none}

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

@@ -179,9 +179,9 @@ export function formHtml(summary, escapeHtml, { running = false, kind = SESSION,
     `<label class="llmctx-field"><span>Budget</span><input name="budget" type="text" inputmode="numeric" autocomplete="off" ` +
     `placeholder="follow the model (64000, 64k or off)" value="${escapeHtml(own.budget)}"></label>` +
     `<div class="ctx-pop-error llmctx-error" hidden></div>` +
-    `<div class="ctx-pop-meta">${when}${running ? " A turn is running: set it when it ends." : ""}</div>` +
+    `<div class="ctx-pop-meta">${when}${running ? " A turn is running: it applies after this turn." : ""}</div>` +
     `<div class="ctx-pop-actions"><button type="button" class="ctx-pop-detach" data-act="reset">follow the model</button>` +
-    `<button type="submit" class="llmctx-set"${running ? " disabled" : ""}>Set</button></div></form>`;
+    `<button type="submit" class="llmctx-set">Set</button></div></form>`;
 }
 
 const EDGE = 16;
@@ -263,8 +263,6 @@ export function createLlmContextControl({ el, escapeHtml, summary, session = ()
     if (!data || session() !== openFor) return close();
     const now = pop.querySelector(".llmctx-now");
     if (now) now.textContent = nowText(data);
-    const set = pop.querySelector(".llmctx-set");
-    if (set) set.disabled = running();
   }
 
   el.addEventListener("click", (e) => {

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

@@ -20,7 +20,8 @@ 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). 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 +35,18 @@ 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.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.
+// first, the others in the server's order; inside a host the configured
+// ids first, each part A-Z.
 export function groupRows(rows) {
   const groups = [];
   const find = (key) => groups.find((g) => g.key === key);
@@ -61,6 +65,22 @@ export function groupRows(rows) {
   }));
 }
 
+// The word after a row's id: "default" for the default model, else
+// "config" for an id the host declares (hosts.<name>.models), else "".
+export function rowNote(row, defaultName) {
+  if (row.name === defaultName) return "default";
+  return row.configured ? "config" : "";
+}
+
+// A row's tooltip: its configured sampling, and where a configured id
+// comes from; "" when neither.
+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)`);
+  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;
@@ -57,9 +57,11 @@ export function createModelPicker({ button, panel, input, list, composer, center
 
   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 noteText = rowNote(row, defaultName);
+    const note = noteText ? `<span class="model-note">${noteText}</span>` : "";
     const cls = `model-option${i === active ? " active" : ""}${row.name === chosen ? " chosen" : ""}`;
-    const title = row.sampling ? ` title="${escapeHtml(`sampling: ${row.sampling}`)}"` : "";
+    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>`;
   }

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

@@ -198,15 +198,29 @@ export function handOffOrder({ prompt = null, block = null, extras = [], answer
 // history (it is idle-only).
 // What flashes in the trail for a few seconds while the turn runs (the
 // rows themselves go into their step inside the closed cloud): a hook's
-// notice, warn or info, as its row reads, and a plugin's nudge (steer).
-// chi's own asking-again row (a notice with a line and no hook) does not:
-// the status line tells that already. null: nothing flashes.
+// notice, warn or info, as its row reads, the ✂ row of an applied LLM
+// context edit (kind "edit"), a steer-cut row (a message cut in on a
+// thinking-only generation; kind "steer"), and a plugin's nudge (steer).
+// The row's leading mark ("✂ ", "↪ ") goes: FLASH_MARKS's stands in.
+// chi's own asking-again row (a notice with a line and no hook or cls)
+// does not: the status line tells that already. null: nothing flashes.
+// A hookless notice's cls names its flash: [cls, trail kind, the leading
+// mark the line loses].
+const HOOKLESS_FLASH = [
+  ["llm-context", "edit", /^✂ /],
+  ["steer-cut", "steer", /^↪ /],
+];
 export function flashOf(what, data = {}) {
   if (what === "steer") {
     const sender = steerSender(data.source);
     return { kind: "steer", text: sender ? `${sender} nudged the model` : "nudged the model" };
   }
-  if (what !== "notice" || !data.hook) return null;
+  if (what !== "notice") return null;
+  if (!data.hook) {
+    const flash = HOOKLESS_FLASH.find(([cls]) => cls === data.cls);
+    if (!flash || !data.line) return null;
+    return { kind: flash[1], text: data.line.replace(flash[2], "") };
+  }
   return { kind: data.level === "warn" ? "warn" : "info", text: data.line || `${hookNoticeLabel(data.hook)}: ${data.text || ""}` };
 }
 

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

@@ -28,9 +28,9 @@ const PENDING = ".bubble.question:not(.answered):not(.cancelled), .bubble.contin
 // 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: "✓", "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: "↪" };
+// The mark of a flash in the trail: a warn notice, a hook's info notice,
+// an applied LLM context edit (✂), a steer-cut row and a plugin's nudge (↪).
+const FLASH_MARKS = { warn: "⚠", info: "ℹ", edit: "✂", steer: "↪" };
 
 function node(tag, cls, parent = null) {
   const el = document.createElement(tag);
@@ -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

@@ -209,8 +209,9 @@ 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();
+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();
   const delay = Number(next_delay);
   const when = Number.isFinite(delay) ? ` in ${delay < 1 ? delay.toFixed(1) : Math.round(delay)} s` : "";
   const count = attempt ? `, ${attempt}${max_retries ? `/${max_retries}` : ""}` : "";
@@ -339,18 +340,26 @@ export function continueLine(choice, reason = "") {
 // tab's own), `resync` says the conversation changed (!rollback, !cmd, a
 // continue answered no) and must be read again. An anytime command's
 // (`anytime`, D8) bubble is drawn at its command_queued, before the cards
-// it shows; its command_ran fills that bubble in (`commandId`).
+// it shows; its command_ran fills that bubble in (`commandId`). So is a
+// command queued for after the running turn (`queued`): its command_queued
+// (waits: "turn_end") draws it `waiting`, saying so, until it ran or was
+// dropped (styled as failed).
+export const QUEUED_TEXT = "queued: runs after this turn";
+
 export function commandView(event, myId) {
   const own = isOwn(event.client_id, myId);
+  const waiting = event.waits === "turn_end";
   return {
     label: own ? null : clientLabel(event.client_id),
     line: event.line || "",
-    text: event.output || "",
+    text: event.output || (waiting ? QUEUED_TEXT : ""),
     busy: event.status === "busy",
-    failed: event.status === "error",
+    failed: event.status === "error" || event.status === "dropped",
     resync: (event.changed || []).includes("messages"),
     modelName: event.model_name || null,
     anytime: event.anytime === true,
+    queued: waiting || event.queued === true,
+    waiting,
     commandId: event.command_id || null,
     // A card's action (Nudge…): no bubble unless it says something back.
     hidden: event.card === true && !event.output && event.status !== "error",
@@ -498,7 +507,7 @@ export function replaysDrawnTurn(event, turnRecords = []) {
 // A `notice` part carries its event as it came (TurnNotice). The TUI replays
 // a turn the same way (TurnAccumulator.replay_events); spec/shared/
 // turn_snapshot.json pins both.
-export function snapshotEvents({ current_turn: turn = null, queued = [], started_at = undefined } = {}) {
+export function snapshotEvents({ current_turn: turn = null, queued = [], queued_commands: commands = [], started_at = undefined } = {}) {
   const events = [];
   if (turn) {
     events.push(withImages({ type: "turn_started", prompt: turn.prompt, origin: turn.origin, continue: !!turn.continue, started_at }, turn.images));
@@ -576,6 +585,10 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
   for (const entry of queued || []) {
     events.push(withImages({ type: "turn_enqueued", enqueued_id: entry.enqueued_id, client_id: entry.client_id, prompt: entry.prompt }, entry.images));
   }
+  // Commands waiting for the turn's end: their bubbles, as live.
+  for (const entry of commands || []) {
+    events.push({ type: "command_queued", command_id: entry.command_id, client_id: entry.client_id, line: entry.line, waits: "turn_end" });
+  }
   return events;
 }
 

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/web/session_hub.rb

@@ -297,7 +297,7 @@ module Samagotchi
 
         entry.owner = owner
         entry.live = live
-        summary = SessionSummary.build(entry.session, owner: owner, session_dir: dir)
+        summary = SessionSummary.build(entry.session, owner: owner, session_dir: dir, registry: hub_registry)
         # A new worker (pid) or a new Bridge for the same session is an
         # event for the page even when the summary reads the same: it
         # reconnects its stream on it.
@@ -307,6 +307,14 @@ module Samagotchi
         emit("session", session: summary)
       end
 
+      # One HostRegistry for the hub's lifetime: every session's ctx_pct may
+      # need its llm_context budget resolved, and the registry's config read
+      # is what would otherwise repeat per scan and per session. Built on
+      # the first summary that needs it.
+      def hub_registry
+        @hub_registry ||= HostRegistry.new
+      end
+
       def drop(id)
         entry = @sessions.delete(id)
         emit("session_gone", id: id) if entry&.summary

data/lib/samagotchi/web/session_summary.rb

@@ -4,6 +4,8 @@ require_relative "../session"
 require_relative "../recap_store"
 require_relative "../archive_store"
 require_relative "../session_metrics"
+require_relative "../llm_context_strategy"
+require_relative "../host_registry"
 require_relative "../bridge_client"
 require_relative "../worker_sidecar"
 require_relative "../bridge/pending_card"
@@ -26,12 +28,18 @@ module Samagotchi
       # @param root_cache [Hash, nil] ProjectScope.root_for's cache, shared
       #   across one listing (a session saved before project_root existed
       #   looks its project up)
+      # @param registry [HostRegistry, nil] the hosts to resolve the
+      #   session's llm_context budget against (its ctx_pct counts against
+      #   the smaller of that budget and the window, as the live meter
+      #   does). nil: one is built here; a caller that builds many summaries
+      #   (the session hub) keeps one and passes it.
       # @return [Hash] symbol keys
-      def build(session, owner:, session_dir:, status: displayed_status(session, owner: owner), root_cache: nil)
+      def build(session, owner:, session_dir:, status: displayed_status(session, owner: owner), root_cache: nil,
+                registry: nil)
         used = Array(session.used_memory_names)
         up = bridge_up?(session_dir, owner)
         sidecar = up ? WorkerSidecar.read(session_dir) : nil
-        saved = SessionMetrics.saved_summary(session_dir)
+        saved = SessionMetrics.saved_summary(session_dir, budget_tokens: budget_resolver(session, registry))
         {
           id: session.id,
           status: status,
@@ -86,6 +94,15 @@ module Samagotchi
         }
       end
 
+      # The budget resolver SessionMetrics.saved_summary takes: a callable,
+      # so the session's llm_context budget (config + the registry's index,
+      # no network) is resolved only for a session that has a saved context
+      # to count. One registry per caller (the hub) or one built here.
+      def budget_resolver(session, registry)
+        -> { LLMContextStrategy.session_budget(session, registry: registry ||= HostRegistry.new) }
+      end
+      private_class_method :budget_resolver
+
       # status is turn state (idle/running). The live worker's snapshot is the
       # truth; on disk, a "running" with no live owner was left by a worker
       # that died mid-turn.