samagotchi 0.19.0 → 0.20.0

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -21,6 +21,7 @@ require_relative "../steer"
 require_relative "../host_registry"
 require_relative "../model_catalog"
 require_relative "../model_profile"
+require_relative "../sampling_settings"
 require_relative "../project_scope"
 require_relative "../prompt_history"
 require_relative "../version"
@@ -440,11 +441,29 @@ module Samagotchi
         if default && models.none? { |m| m[:name].casecmp?(default) }
           models.unshift({ name: default, host: nil, id: default })
         end
+        add_sampling(models, registry)
         payload = { default: default, models: models }
         payload[:warning] = warnings.join("; ") unless warnings.empty?
         json_response(200, payload)
       end
 
+      # Each model's configured sampling as /model words it ("temperature=0.6
+      # (hosts.work)"), on the models that have some: the picker's tooltip.
+      # A config that can't be read leaves the list as it is.
+      def add_sampling(models, registry)
+        return if registry.nil? || models.empty?
+
+        settings = ConfigFile.model_settings
+        models.each do |model|
+          target = registry.resolve(model[:name])
+          summary = SamplingSettings.summary(target, names: registry.lookup_names(model[:name], target: target),
+                                                     models: settings)
+          model[:sampling] = summary if summary
+        end
+      rescue StandardError
+        nil
+      end
+
       # Built again when config.yml's hosts: changed (compared as read: the
       # YAML read is mtime-cached), so the model picker lists a host added
       # while chi web runs. An injected registry (specs) stays.

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

@@ -20,7 +20,7 @@ import { MODEL_KEY } from "./model_pick.js";
 import { emptySessionState } from "./session_state.js";
 import { createModelPicker } from "./model_picker.js";
 import { chipName, chipsHtml, imageFiles, restoredChips, thumbsHtml, turnRefs, turnText } from "./images.js";
-import { escapeHtml, noteHtml, normalize, steerRowHtml, userBodyHtml, ownerBadge, previewForCard, relativeTime, failedTurnText, modelLabel, deleteConfirmText, recapLabel, canStopSession, goneSessionNotice, withLiveStatus, withoutWorker, recapPlace, delegatedBy } from "./format.js";
+import { escapeHtml, memChipText, memChipTitle, noteHtml, normalize, steerRowHtml, userBodyHtml, ownerBadge, previewForCard, relativeTime, failedTurnText, modelLabel, deleteConfirmText, recapLabel, canStopSession, goneSessionNotice, withLiveStatus, withoutWorker, recapPlace, delegatedBy } from "./format.js";
 import { EMPTY_ANSWER_CLASS, createTurnView, turnHistoryHtml } from "./turn_view.js";
 import { createStageView } from "./stage_view.js";
 import { appendQuote } from "./annotations.js";
@@ -28,9 +28,9 @@ import { parsePresets } from "./annotate_presets.js";
 import { createAnnotateBar } from "./annotate_bar.js";
 import { COPY_SOURCE_ATTR, copySource, copyText, installCopy, showsAnswer } from "./copy.js";
 import { routeChunk } from "./chunk_router.js";
-import { extractCtxPct, savedCtxPct, cardCtxText } from "./ctx.js";
+import { extractCtxPct, savedCtxPct, cardCtxText, generationTokens, lastSpeedText, speedText, tokensTipText } from "./ctx.js";
 import { createQuestionCards } from "./question_cards.js";
-import { cardClass, cardInnerHtml, cardPlace, isCard, splitSnapshotCards, turnNoticePlace } from "./card.js";
+import { cardClass, cardInnerHtml, cardPlace, isCard, isNoticeCard, noticeInnerHtml, splitSnapshotCards, turnNoticePlace } from "./card.js";
 import { gripFloor, promptHeight } from "./composer_size.js";
 import { createCommandList } from "./command_list.js";
 import { createPromptHistory } from "./prompt_history.js";
@@ -317,7 +317,7 @@ function cardHtml(s, { deletable = false } = {}) {
   const folderHtml = folder ? `<span class="folder" title="${escapeHtml(s.working_directory)}">${escapeHtml(folder)}</span>` : "";
   const archivedHtml = s.archived ? `<span class="archived-badge" title="Archived: hidden from the lists, kept for good">archived</span>` : "";
   const ctx = cardCtxText(s.ctx_pct);
-  const ctxHtml = ctx ? `<span class="ctx" title="Context used after the last turn">${escapeHtml(ctx)}</span>` : "";
+  const ctxHtml = ctx ? `<span class="ctx" title="${escapeHtml(tokensTipText(s.tokens))}">${escapeHtml(ctx)}</span>` : "";
   const waiting = waitingBadge(s);
   const waitingHtml = waiting ? `<span class="attn attn-${waiting.kind}" title="${escapeHtml(waiting.title)}">${escapeHtml(waiting.text)}</span>` : "";
   const dotWord = waiting ? waiting.title : s.status;
@@ -1173,13 +1173,26 @@ function cardElement(id) {
   return findInTurnRoots(".plugin-card").find((el) => el.dataset.cardId === String(id)) || null;
 }
 
+// A notice is a <details> (a one-line row that opens), a card a <div>: a
+// card that turns into the other kind (btw's "thinking…" → its answer) is
+// drawn on a new element in its place. Returns the element drawn.
 function drawCard(el, card) {
+  const notice = isNoticeCard(card);
+  if (el.tagName !== (notice ? "DETAILS" : "DIV")) {
+    const fresh = document.createElement(notice ? "details" : "div");
+    el.replaceWith(fresh);
+    el = fresh;
+  }
   el.className = cardClass(card);
   el.dataset.cardId = card.id;
   // A running turn's own card (the stage's status waits on one that asks).
   if (card.in_turn) el.dataset.inTurn = "1";
   else delete el.dataset.inTurn;
-  if (card.body_html === undefined && el.dataset.body === String(card.body ?? "") && el.querySelector(".card-body")) {
+  if (notice) {
+    const open = el.open;
+    el.innerHTML = noticeInnerHtml(card);
+    el.open = open;
+  } else if (card.body_html === undefined && el.dataset.body === String(card.body ?? "") && el.querySelector(".card-body")) {
     // The same body again from the stream: keep the rendered one.
     const body = el.querySelector(".card-body").innerHTML;
     el.innerHTML = cardInnerHtml({ ...card, body_html: body });
@@ -1187,6 +1200,7 @@ function drawCard(el, card) {
     el.innerHTML = cardInnerHtml(card);
   }
   el.dataset.body = String(card.body ?? "");
+  return el;
 }
 
 // Show +card+: update the one with its id where it is, else add it (a
@@ -1198,14 +1212,13 @@ function upsertCard(card, { before = null } = {}) {
   if (!card || !card.id) return;
   const existing = cardElement(card.id);
   if (existing) {
-    drawCard(existing, card);
-    existing.classList.add("card-updated");
-    setTimeout(() => existing.classList.remove("card-updated"), 900);
+    const drawn = drawCard(existing, card);
+    drawn.classList.add("card-updated");
+    setTimeout(() => drawn.classList.remove("card-updated"), 900);
     return;
   }
   removeHintIfEmpty();
-  const el = document.createElement("div");
-  drawCard(el, card);
+  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();
@@ -1416,6 +1429,11 @@ function updateInfoBar() {
   const idShort = selected.slice(0,8);
   const memText = current.usedMemories.length ? current.usedMemories.join(", ") : "—";
   const ctxText = current.ctxPct !== null ? `ctx ${Math.round(current.ctxPct)}%` : "";
+  const tokens = current.timing.tokens;
+  const ctxTip = tokensTipText(tokens);
+  const speedTextNow = lastSpeedText(tokens);
+  const avgSpeed = speedText(tokens?.avg_decode_tps, tokens?.tps_source);
+  const speedTip = `Decode speed of the last generation${avgSpeed ? `; session average ${avgSpeed}` : ""}`;
   const sessionDuration = currentSessionDuration();
   const timingText = sessionDuration === null ? "" : `session ${formatDuration(sessionDuration)}`;
   const statusClass = current.status ? `status ${escapeHtml(current.status)}` : "status";
@@ -1426,7 +1444,7 @@ function updateInfoBar() {
   const attachCmd = `chi --attach ${selected}`;
   const copied = Date.now() - attachCopiedAt < 2000;
   const copyHtml = `<button type="button" class="copy-attach" title="Copy &quot;${escapeHtml(attachCmd)}&quot; to attach a terminal">${copied ? "copied ✓" : "copy chi --attach"}</button>`;
-  const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${parentHtml}<span class="dir" title="${escapeHtml(current.dir||"")}">${escapeHtml((current.dir||"").slice(0,48))}</span>${ctxText ? `<span class="model">${escapeHtml(ctxText)}</span>` : ""}${timingText ? `<span class="model">${escapeHtml(timingText)}</span>` : ""}${workerBadgeHtml()}</div>`;
+  const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${parentHtml}${current.usedMemories.length ? `<span class="model mem-chip" title="${escapeHtml(memChipTitle(current.usedMemories))}">${escapeHtml(memChipText(current.usedMemories))}</span>` : ""}<span class="dir" title="${escapeHtml(current.dir||"")}">${escapeHtml((current.dir||"").slice(0,48))}</span>${ctxText ? `<span class="model ctx" title="${escapeHtml(ctxTip)}">${escapeHtml(ctxText)}</span>` : ""}${speedTextNow ? `<span class="model speed" title="${escapeHtml(speedTip)}">${escapeHtml(speedTextNow)}</span>` : ""}${timingText ? `<span class="model">${escapeHtml(timingText)}</span>` : ""}${workerBadgeHtml()}</div>`;
   const previewHtml = `<div class="preview-line"><span class="preview">${escapeHtml(current.firstPreview || "—")}</span> · <span class="mem" title="${escapeHtml(current.usedMemories.join(", "))}">mem: ${escapeHtml(memText)}</span></div>`;
   infoTextEl.innerHTML = metaHtml + previewHtml;
   infoTextEl.title = memoriesTooltip(current.usedMemories, current.preloadedMemories, current.mutedMemories);
@@ -1648,10 +1666,10 @@ const streamHandlers = {
   },
   generation_completed: (data) => {
     setLiveTurnNote("");
-    if (data?.served_model) {
-      current.served = [data.served_model, data.requested_model];
-      updateInfoBar();
-    }
+    if (data?.served_model) current.served = [data.served_model, data.requested_model];
+    // The generation's speed and the session's token totals, from the server.
+    current.timing.tokens = generationTokens(current.timing.tokens, data);
+    if (data?.served_model || data?.tokens) updateInfoBar();
     turnDom.generationCompleted();
   },
   // Prompts sent while a turn ran merge into it at an iteration boundary:
@@ -2432,6 +2450,7 @@ shortWindow.addEventListener("change", () => {
   applyStripHidden();
 });
 $("#stripShow").addEventListener("click", () => setStripHidden(false));
+$("#stripHideTop").addEventListener("click", () => setStripHidden(true));
 
 $("#filter").addEventListener("input", renderAll);
 // A list whose order was held under the pointer (listOrder) catches up.

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

@@ -3,9 +3,41 @@
 // the element; this module draws it and says where it goes.
 import { escapeHtml, recapPlace } from "./format.js";
 
-// The card's class: a warn card wears the warning colour.
+// The card's class: a warn card wears the warning colour; a notice is a
+// one-line row.
 export function cardClass(card) {
-  return "bubble plugin-card" + (card?.level === "warn" ? " warn" : "");
+  return "bubble plugin-card" + (card?.level === "warn" ? " warn" : "") + (isNoticeCard(card) ? " notice" : "");
+}
+
+// The longest body a notice row carries; a longer one is a card to read.
+export const NOTICE_CHARS = 160;
+
+// Whether a card is a notice (check-in's "Nudged the model at 105 tool
+// calls."): info level, nothing to click, a body of one short line. It
+// shows as a collapsed one-line row, "▸ check-in: Nudged …", as the tool
+// rows and the resolved question cards do; a click opens it. A warn card,
+// one that asks (actions) and one with more to read stay cards.
+export function isNoticeCard(card) {
+  if (!card || card.level === "warn") return false;
+  if ((card.actions || []).some((a) => a && a.command)) return false;
+  const body = String(card.body ?? "").trim();
+  return !body.includes("\n") && body.length <= NOTICE_CHARS;
+}
+
+// A notice's one line: "title: body" (the title alone for no body).
+export function noticeCardLine(card) {
+  const title = String(card?.title ?? "").trim();
+  const body = String(card?.body ?? "").trim();
+  return title && body ? `${title}: ${body}` : title || body;
+}
+
+// A notice's markup inside its <details>: the line as the summary, and
+// where it came from when the row is opened (the line wraps then).
+export function noticeInnerHtml(card) {
+  const title = String(card?.title ?? "").trim();
+  const source = String(card?.source ?? "").trim();
+  const from = source && source !== title ? `<div class="notice-from">from <span class="card-source">${escapeHtml(source)}</span></div>` : "";
+  return `<summary>${escapeHtml(noticeCardLine(card))}</summary>${from}`;
 }
 
 // Whether a card shown as a row of a step leaves the turn's block when the

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

@@ -48,3 +48,62 @@ export function savedCtxPct(context) {
 export function cardCtxText(pct) {
   return num(pct) === null ? "" : `${Math.round(pct)}%`;
 }
+
+// A decode speed: "87 tok/s", "1.9k tok/s"; "~64 tok/s" for an estimate (no
+// server timings); "" without one. The TUI's /stats says the same
+// (Formatting#speed_text; spec/shared/labels_matrix.json).
+export function speedText(tps, source) {
+  const value = num(tps);
+  if (value === null || value <= 0) return "";
+  const number = value >= 1000 ? `${(Math.round(value / 100) / 10).toFixed(1)}k` : String(Math.round(value));
+  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) {
+  const value = num(cost);
+  if (value === null || value <= 0) return "";
+  return value >= 0.01 ? `$${value.toFixed(2)}` : `$${value.toFixed(4)}`;
+}
+
+function count(n) {
+  return Math.round(n).toLocaleString("en-US");
+}
+
+// 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. A delegated session keeps
+// its own metrics, so these are this session's only.
+export function tokensTipText(tokens, title = "Context used after the last turn") {
+  const prompt = num(tokens?.prompt_sum) || 0;
+  const completion = num(tokens?.completion_sum) || 0;
+  if (!prompt && !completion) return title;
+  const cached = num(tokens.cached_sum) || 0;
+  const reasoning = num(tokens.reasoning_sum) || 0;
+  const parts = [`in ${count(prompt)}`];
+  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}`);
+  lines.push("this session only, all requests");
+  return lines.join("\n");
+}
+
+// The info bar's speed: the newest generation's decode speed, "" before one.
+export function lastSpeedText(tokens) {
+  return speedText(tokens?.last_decode_tps, tokens?.tps_source);
+}
+
+// The session's tokens block after a :generation_completed: the event's
+// running totals (the server closed the generation and put them on it),
+// with its speed; an event without them (a replay, an older worker) keeps
+// +previous+.
+export function generationTokens(previous, data) {
+  const tokens = data?.tokens;
+  if (!tokens || typeof tokens !== "object") return previous ?? null;
+  const speed = data.speed;
+  if (!speed || num(speed.decode_tps) === null) return tokens;
+  return { ...tokens, last_decode_tps: speed.decode_tps, tps_source: speed.source };
+}

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

@@ -218,3 +218,14 @@ export function recapLabel(turnsSince, stale = false) {
   if (n > 1) return `recap · before the last ${n} turns`;
   return stale ? "recap · earlier" : "recap";
 }
+
+// The info bar's memory chip on a phone (where the "mem: …" line goes),
+// for a session that used memories: "mem 2", the names its tooltip.
+export function memChipText(names) {
+  return `mem ${(names || []).length}`;
+}
+
+export function memChipTitle(names) {
+  const list = names || [];
+  return list.length ? `memories: ${list.join(", ")}` : "no memories in this session";
+}

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

@@ -303,6 +303,17 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .bubble.plugin-card{border-left:3px solid var(--accent);background:color-mix(in srgb,var(--accent) 6%,var(--glass-bg));padding:10px 12px;transition:box-shadow .3s ease}
 .bubble.plugin-card.warn{border-left-color:var(--warn);background:color-mix(in srgb,var(--warn) 7%,var(--glass-bg))}
 .bubble.plugin-card.card-updated{box-shadow:inset 0 1px 0 var(--glass-highlight),0 0 0 1px var(--accent-ring),var(--glass-shadow)}
+/* A notice card (card.js isNoticeCard): a one-line row like a resolved question, "▸ check-in: Nudged …"; opened, the line wraps and the card's glass comes back. */
+.bubble.plugin-card.notice:not([open]){padding:3px 10px;background:transparent;border-color:transparent;border-left-color:var(--accent);box-shadow:none;-webkit-backdrop-filter:none;backdrop-filter:none;align-self:flex-start;max-width:100%;border-radius:6px;transition:background .12s ease}
+.bubble.plugin-card.notice:not([open]):hover{background:var(--bg-panel)}
+.bubble.plugin-card.notice>summary{cursor:pointer;color:var(--text-muted);font-size:12px;font-weight:500;user-select:none;list-style:none;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.bubble.plugin-card.notice>summary::-webkit-details-marker{display:none}
+.bubble.plugin-card.notice>summary::before{content:"▸ ";color:var(--accent)}
+.bubble.plugin-card.notice[open]{padding:6px 10px}
+.bubble.plugin-card.notice[open]>summary{white-space:pre-wrap;font-size:13px;color:var(--text-2)}
+.bubble.plugin-card.notice[open]>summary::before{content:"▾ "}
+.notice-from{margin-top:4px;font-size:11px;color:var(--text-faint)}
+.gen .bubble.plugin-card.notice:not([open]){margin:2px 0;padding:2px 8px}
 .card-head{display:flex;align-items:baseline;gap:8px;margin-bottom:4px}
 .card-title{font-size:14px;font-weight:600;color:var(--text-bright)}
 .card-source{font-size:11px;color:var(--text-faint);font-family:ui-monospace,SFMono-Regular,Menlo,monospace}
@@ -557,7 +568,10 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 #infoBar .meta .copy-attach:hover{color:#fff;border-color:var(--border-strong)}
 #infoBar .meta .status{font-size:11px;padding:2px 6px;border-radius:999px}
 #infoBar .meta .dir{font-family:ui-monospace,monospace;font-size:11px;color:var(--text-muted);word-break:break-all}
-#infoBar .meta .model{font-size:11px;padding:2px 6px;border-radius:6px;background:var(--bg-hover);color:var(--text-3)}
+/* The footer sits on the card's glass: its chips are tinted, not solid, so the glass reads through them. */
+#infoBar .meta .model{font-size:11px;padding:2px 6px;border-radius:6px;background:color-mix(in srgb,var(--bg-hover) 55%,transparent);color:var(--text-3)}
+/* The memory chip ("mem 2", when the session used some): phones only, where the "mem: …" line is hidden. */
+#infoBar .meta .mem-chip{display:none}
 #infoBar .meta .model.served-mismatch{background:var(--warn-bg);color:var(--warn-bright);border:1px solid var(--warn-border)}
 /* The open session's worker runs an older chi: its version, and Restart when it can. */
 #infoBar .meta .worker-badge{display:inline-flex;align-items:center;gap:6px;font-size:11px;padding:2px 2px 2px 6px;border-radius:6px;background:var(--warn-bg);color:var(--warn-bright);border:1px solid var(--warn-border);white-space:nowrap}
@@ -588,10 +602,12 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
   #infoBar .meta>*{flex-shrink:0}
   #infoBar .meta .id{order:-2}
   #infoBar .meta .status{order:-1}
+  /* After the status (same order, later in the DOM): the meta scrolls, and only its start is in sight. */
+  #infoBar .meta .mem-chip{display:inline;order:-1}
   #infoBar .meta .dir{word-break:normal}
   #infoBar button{padding:4px 8px}
 }
-#empty{position:absolute;inset:0;display:grid;place-items:center;color:var(--text-muted);padding:24px;text-align:center;background:var(--bg);z-index:1}
+#empty{position:absolute;inset:0;display:grid;place-items:center;color:var(--text-muted);padding:24px;text-align:center;background:color-mix(in srgb,var(--bg) 35%,transparent);z-index:1}
 #empty.hidden{display:none !important}
 /* Start page (no session): the composer alone, centered; no info bar. */
 body:not(.has-session) #center{justify-content:safe center;background:transparent}
@@ -661,6 +677,13 @@ body.has-session #scope .scope-where{display:none}
 #stripShow .waiting-dot{display:inline-block;width:7px;height:7px;border-radius:50%;background:var(--warn);margin-right:4px;vertical-align:1px}
 #stripHide{align-self:flex-end;border:0;padding:0 2px;border-radius:4px}
 #stripHide:hover{text-decoration:underline;color:var(--text-2)}
+/* A narrow window's strip scrolls sideways, which puts its own "hide ▴" out of sight: the top bar has it instead, where the pill comes back, with a finger-sized target. */
+#stripHideTop{display:none;white-space:nowrap;flex-shrink:0}
+@media(max-width:900px){
+  body:not(.strip-hidden):not(.all-view) #stripHideTop{display:block}
+  #stripHide{display:none}
+  #stripHideTop,#stripShow{min-height:30px;padding:4px 12px;font-size:12px}
+}
 body.strip-hidden #stripShow{display:block}
 body.strip-hidden #topStrip, body.all-view #stripShow{display:none}
 #allTile{flex:1;flex-direction:column;justify-content:center;align-items:flex-start;text-align:left;color:var(--text-2);font-size:13px;font-weight:600;width:100%}
@@ -740,6 +763,7 @@ a{color:var(--accent)}
     <button type="button" id="newBtn" class="brand" title="New chat"><span class="brand-name">chi</span><span class="brand-new">+<span class="brand-new-word"> new chat</span></span></button>
     <div id="scope" hidden></div>
     <button type="button" class="strip-toggle" id="stripShow" title="Show the latest sessions"><span class="pill-arrow" aria-hidden="true">▾</span> sessions</button>
+    <button type="button" class="strip-toggle" id="stripHideTop" title="Hide the latest sessions"><span class="pill-arrow" aria-hidden="true">▴</span> hide</button>
     <button type="button" id="notifyBtn" aria-label="Notifications" aria-pressed="false" hidden><svg viewBox="0 0 16 16" width="15" height="15" aria-hidden="true"><path class="bell" d="M8 1.75a4 4 0 0 0-4 4v2.6L2.75 10.6v.9h10.5v-.9L12 8.35v-2.6a4 4 0 0 0-4-4Z"/><path class="clapper" d="M6.5 13a1.5 1.5 0 0 0 3 0"/><path class="slash" d="M2.5 2.5l11 11"/></svg></button>
   </div>
   <section id="topStrip" aria-label="Latest sessions" class="loading"><div class="card skeleton"><div class="line long"></div><div class="meta"><span class="line tiny" style="display:inline-block"></span></div></div><div class="card skeleton"><div class="line long"></div><div class="meta"><span class="line tiny" style="display:inline-block"></span></div></div><div class="card skeleton"><div class="line long"></div><div class="meta"><span class="line tiny" style="display:inline-block"></span></div></div></section>

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

@@ -17,7 +17,9 @@ export function pickModel(names, defaultName, stored) {
 
 export const RECENT_KEY = "chi_model_recent";
 
-// The payload's models as rows: {name, host, id, isDefaultHost}. The
+// 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. 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.
@@ -29,7 +31,9 @@ export function modelRows(payload) {
       const name = String(m.name);
       const host = m.host ? String(m.host) : "";
       const id = host ? String(m.id || name) : name;
-      return { name, host, id, isDefaultHost: !host || name === id };
+      const row = { name, host, id, isDefaultHost: !host || name === id };
+      if (m.sampling) row.sampling = String(m.sampling);
+      return row;
     });
 }
 

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

@@ -59,7 +59,8 @@ export function createModelPicker({ button, panel, input, list, composer, center
     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" : ""}`;
-    return `<div class="${cls}" role="option" id="model-option-${i}" aria-selected="${i === active}" data-index="${i}">` +
+    const title = row.sampling ? ` title="${escapeHtml(`sampling: ${row.sampling}`)}"` : "";
+    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/question_card.js

@@ -52,7 +52,8 @@ export function approvalView(pq) {
   const command = a.command || null;
   let where = a.cwd || "";
   if (a.repo_root) {
-    const repo = String(a.repo_root).split("/").filter(Boolean).pop() || a.repo_root;
+    // The repository's name (a worktree's main checkout), else the root's folder.
+    const repo = a.repo_name || String(a.repo_root).split("/").filter(Boolean).pop() || a.repo_root;
     where += ` (repo ${repo}${a.branch ? `, branch ${a.branch}` : ""})`;
   } else if (where) {
     where += " (not in a repo)";

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

@@ -52,6 +52,8 @@ export function normalizeTiming(data = {}) {
     turnRecords: Array.isArray(data.turn_records) ? data.turn_records.filter(validRecord) : [],
     toolRecords: Array.isArray(data.tool_records) ? data.tool_records.filter(validRecord) : [],
     activeTurn: validRecord(data.active_turn) ? data.active_turn : null,
+    // The session's token sums and speeds (SessionMetrics' tokens block).
+    tokens: validRecord(data.tokens) ? data.tokens : null,
   };
 }
 
@@ -61,7 +63,8 @@ export function normalizeTiming(data = {}) {
 // place; an unknown turn goes in started_at order (ties and unparsable
 // dates keep arrival order), an unknown tool record at the end (they come
 // grouped by turn, in call order). startedAt, sessionDurationMs and
-// activeTurn are the reply's. `short`: the reply's turn_count says the page
+// activeTurn are the reply's, and so are its tokens (a reply without them
+// keeps the page's). `short`: the reply's turn_count says the page
 // misses a turn (it then reads the whole timing). A reply without
 // turn_count (an older server: the whole timing) replaces, as before; more
 // records than the count (a worker died before saving a turn the page saw)
@@ -85,7 +88,8 @@ export function mergeTiming(timing, data = {}) {
   fresh.toolRecords.forEach((record) => {
     if (!replaceById(toolRecords, record)) toolRecords.push(record);
   });
-  return { timing: { ...fresh, turnRecords, toolRecords }, short: turnRecords.length < count };
+  const tokens = fresh.tokens || timing?.tokens || null;
+  return { timing: { ...fresh, turnRecords, toolRecords, tokens }, short: turnRecords.length < count };
 }
 
 function replaceById(records, record) {

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

@@ -234,7 +234,7 @@ const WEB_LOCAL_REPLIES = {
   "/exit": "/exit: close the tab to leave; stop in the session bar stops the worker",
   "/quit": "/quit: close the tab to leave; stop in the session bar stops the worker",
   "/recap": "/recap: not in the web yet; a recap shows here by itself when you come back to an idle session, and /recap in a terminal (chi --attach) makes one now",
-  "/stats": "/stats: not in the web yet; each turn shows its time and the context use, and /stats in a terminal (chi --attach) has the totals",
+  "/stats": "/stats: not in the web yet; each turn shows its time, the session bar the context use and speed (hover ctx for tokens and cost), and /stats in a terminal (chi --attach) has the rest",
 };
 
 export function webLocalReply(text) {

data/lib/samagotchi/web/session_summary.rb

@@ -31,6 +31,7 @@ module Samagotchi
         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)
         {
           id: session.id,
           status: status,
@@ -52,8 +53,11 @@ module Samagotchi
           owner: owner&.kind,
           # The saved recap's first sentence, for the session card.
           recap: RecapStore.preview(session_dir),
-          # How full the context was after the last turn (%), or nil.
-          ctx_pct: SessionMetrics.saved_context_pct(session_dir)&.round(1),
+          # How full the context was after the last turn (%), or nil, and
+          # the session's token sums and cost (the card's ctx tooltip), from
+          # one read of analytics.json.
+          ctx_pct: saved&.ctx_pct&.round(1),
+          tokens: saved&.tokens,
           # Hidden from the strip and the list unless "include archived".
           archived: ArchiveStore.archived?(session_dir),
           project_root: session.project_root(cache: root_cache),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -235,9 +235,13 @@ files:
 - lib/samagotchi/guardrails/parent_approvals.rb
 - lib/samagotchi/guardrails/parent_continue.rb
 - lib/samagotchi/guardrails/protected_paths.rb
+- lib/samagotchi/guardrails/read_only_shell.rb
+- lib/samagotchi/guardrails/rm_targets.rb
 - lib/samagotchi/guardrails/rules.rb
 - lib/samagotchi/guardrails/scratch_writes.rb
 - lib/samagotchi/guardrails/shell_git_dirs.rb
+- lib/samagotchi/guardrails/shell_lex.rb
+- lib/samagotchi/guardrails/shell_paths.rb
 - lib/samagotchi/guardrails/targets.rb
 - lib/samagotchi/guardrails/verdict.rb
 - lib/samagotchi/hooks.rb