samagotchi 0.19.0 → 0.21.0

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,19 @@ 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}
+  /* Icon-only buttons (the words stay as the accessible name, the title says more): the meta gets the width. */
+  #infoBar>button{font-size:0;line-height:0;padding:5px 7px}
+  #infoBar>button::before{content:"";display:block;width:14px;height:14px;background:currentColor;-webkit-mask:var(--icon) center/contain no-repeat;mask:var(--icon) center/contain no-repeat}
+  #infoBar #infoArchiveBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M6.5 9h3'/%3E%3C/svg%3E")}
+  #infoBar #infoArchiveBtn.archived{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M8 11.5V8.25M6.5 9.75 8 8.25l1.5 1.5'/%3E%3C/svg%3E")}
+  #infoBar #infoStopBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M8 2v5.5M4.6 4.4a5 5 0 1 0 6.8 0'/%3E%3C/svg%3E")}
+  #infoBar #infoDeleteBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2.5 4.5h11M6 4.5V2.75h4V4.5M4 4.5l.7 8.6a1 1 0 0 0 1 .9h4.6a1 1 0 0 0 1-.9l.7-8.6M6.75 7.25v4.5M9.25 7.25v4.5'/%3E%3C/svg%3E")}
 }
-#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 +684,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 +770,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/notifications.js

@@ -35,7 +35,7 @@ function defaultChannel() {
 // @param storage () => localStorage (it can throw)
 // @param channel the BroadcastChannel to the other chi tabs, or null
 // @param gateOptions passed to createNotifyGate (specs: schedule, now)
-// @return {noticeSessions(type, data), setBaseTitle(title), clearBadge()}
+// @return {noticeSessions(type, data), noticeList(sessions), setBaseTitle(title), clearBadge()}
 export function createNotifications({
   button,
   doc = globalThis.document,
@@ -125,11 +125,12 @@ export function createNotifications({
       notifyGate.seenInFront(next.attentions.map((a) => a.key));
     } else {
       for (const a of next.attentions) {
-        notifyGate.offer(a, () => {
+        // Every tab behind badges; one of them notifies (notify.js).
+        notifyGate.offer(a, (notify) => {
           if (tabInFront()) return;
           badgeKeys.add(a.key);
           setTitle();
-          showNotification(attention.byId[a.sessionId], a);
+          if (notify) showNotification(attention.byId[a.sessionId], a);
         });
       }
     }
@@ -159,6 +160,10 @@ export function createNotifications({
 
   return {
     noticeSessions,
+    // The list fetched without a hub (app.js refresh): a snapshot.
+    noticeList(sessions) {
+      noticeSessions("snapshot", { sessions });
+    },
     // The title without the badge ("Chi · <project>").
     setBaseTitle(title) {
       baseTitle = title;

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

@@ -119,7 +119,16 @@ export function trackAttention(state, type, data = {}) {
     byId[s.id] = s;
   };
   if (type === "snapshot") {
-    (Array.isArray(data.sessions) ? data.sessions : []).forEach(see);
+    const sessions = Array.isArray(data.sessions) ? data.sessions : [];
+    sessions.forEach(see);
+    // The whole list: a session missing from it went while no frame said so
+    // (the hub away, or between two fetches), as if session_gone came.
+    const present = new Set(sessions.map((s) => s?.id));
+    for (const id of Object.keys(byId)) {
+      if (present.has(id)) continue;
+      close(byId[id], null);
+      delete byId[id];
+    }
     return { state: { seeded: true, byId }, attentions, closed };
   }
   if (type === "session") see(data.session);
@@ -152,7 +161,10 @@ export function attentionText(session, attention) {
 // (BroadcastChannel "chi-notify") which attention keys it has in front, and
 // a tab behind neither notifies nor badges those: it holds a new attention
 // for +holdMs+ in case the front tab's word is on its way, and drops a key
-// from its badge when the word comes later. Without BroadcastChannel every
+// from its badge when the word comes later. Every tab behind badges its
+// title, but only one shows the OS notification: each tab behind claims
+// the key on the channel as it holds it, and at the end of the hold the
+// lowest claim (a tab id) shows it (4.11). Without BroadcastChannel every
 // tab goes on alone, at once.
 export const NOTIFY_CHANNEL = "chi-notify";
 export const NOTIFY_HOLD_MS = 300;
@@ -162,16 +174,31 @@ const SEEN_TTL_MS = 10 * 60 * 1000;
 // @param channel a BroadcastChannel (postMessage, onmessage), or null
 // @param onSeen(keys) another tab has these keys in front (drop them from
 //   the badge)
+// @param id this tab's claim (random by default)
 // @return {seenInFront(keys), offer(attention, deliver), drop(keys)}
 export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSeen = () => {},
-  schedule = setTimeout, cancel = clearTimeout, now = Date.now } = {}) {
+  schedule = setTimeout, cancel = clearTimeout, now = Date.now, id = randomTabId() } = {}) {
   const seen = new Map(); // key → when
   const pending = new Map(); // key → timer
+  const claims = new Map(); // key → {ids: the other tabs' claims, at}
   const mark = (keys) => {
     const at = now();
     for (const [key, when] of seen) if (at - when > SEEN_TTL_MS) seen.delete(key);
     for (const key of keys) seen.set(key, at);
   };
+  const claimed = (key, tab) => {
+    const at = now();
+    for (const [k, claim] of claims) if (at - claim.at > SEEN_TTL_MS) claims.delete(k);
+    const claim = claims.get(key) || { ids: new Set(), at };
+    claim.ids.add(tab);
+    claims.set(key, claim);
+  };
+  // This tab's claim is the lowest: it shows the OS notification.
+  const won = (key) => {
+    const others = claims.get(key)?.ids || new Set();
+    claims.delete(key);
+    return [...others].every((other) => id < other);
+  };
   const drop = (keys) => {
     for (const key of keys) {
       if (!pending.has(key)) continue;
@@ -181,6 +208,10 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
   };
   if (channel) {
     channel.onmessage = (e) => {
+      if (e?.data?.type === "claim" && typeof e.data.key === "string" && typeof e.data.id === "string") {
+        claimed(e.data.key, e.data.id);
+        return;
+      }
       const keys = e?.data?.type === "seen" && Array.isArray(e.data.keys) ? e.data.keys.map(String) : [];
       if (keys.length === 0) return;
       mark(keys);
@@ -194,21 +225,25 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
       if (!channel || keys.length === 0) return;
       try { channel.postMessage({ type: "seen", keys }); } catch (_) {}
     },
-    // A new attention in a tab behind: +deliver+ (notify, badge) unless
-    // another tab has it in front. @return whether it may still be delivered
+    // A new attention in a tab behind: +deliver(notify)+ (badge; the OS
+    // notification when +notify+) unless another tab has it in front.
+    // @return whether it may still be delivered
     // An attention's own holdMs (a delegated child's approval) holds it
     // longer, alone too.
     offer(attention, deliver) {
       const key = attention.key;
       if (seen.has(key)) return false;
       if (!channel && !attention.holdMs) {
-        deliver();
+        deliver(true);
         return true;
       }
       drop([key]);
+      if (channel) {
+        try { channel.postMessage({ type: "claim", key, id }); } catch (_) {}
+      }
       pending.set(key, schedule(() => {
         pending.delete(key);
-        if (!seen.has(key)) deliver();
+        if (!seen.has(key)) deliver(won(key));
       }, Math.max(holdMs, attention.holdMs || 0)));
       return true;
     },
@@ -216,3 +251,10 @@ export function createNotifyGate({ channel = null, holdMs = NOTIFY_HOLD_MS, onSe
     drop,
   };
 }
+
+function randomTabId() {
+  try {
+    if (typeof globalThis.crypto?.randomUUID === "function") return globalThis.crypto.randomUUID();
+  } catch (_) {}
+  return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
+}

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

@@ -26,8 +26,10 @@ const CANCEL_REASONS = { ctrl_c: "Ctrl-C", user: "stopped", hook: "by a hook" };
 
 // The line a canceled turn ends with: "✕ canceled (stopped)", live from
 // turn_canceled's reason and after a re-render from the turn record's
-// cancellation_reason (records saved before it existed: no reason).
-export function cancelLineText(reason) {
+// cancellation_reason (records saved before it existed: no reason). A
+// hook's stop that names who (+by+, cancelled_by): "✕ stopped by loop-guard".
+export function cancelLineText(reason, by) {
+  if (reason === "hook" && by) return `\u2715 stopped by ${by}`;
   return "\u2715 canceled" + (reason ? ` (${CANCEL_REASONS[reason] || reason})` : "");
 }
 
@@ -35,7 +37,7 @@ export function cancelLineText(reason) {
 // record is not a canceled one.
 export function cancelLineHtml(record, escape) {
   if (record?.status !== "canceled") return "";
-  return `<div class="bubble cancel">${escape(cancelLineText(record.cancellation_reason))}</div>`;
+  return `<div class="bubble cancel">${escape(cancelLineText(record.cancellation_reason, record.cancelled_by))}</div>`;
 }
 
 export function elapsedSince(startedAt, now = Date.now()) {
@@ -52,6 +54,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 +65,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 +90,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) {
@@ -401,6 +401,16 @@ export function promptOps(event, { myId, known, unmatchedMerge = false }) {
   }
 }
 
+// A stream opened with no cursor (a worker woken after a render that had
+// none) replays the worker's events from its start: a turn_started for a
+// turn the page drew already (+turnRecords+, the render's timing) means
+// that replay overlaps the render, and the page re-reads the session
+// rather than drawing the turn twice (4.01).
+export function replaysDrawnTurn(event, turnRecords = []) {
+  if (event?.type !== "turn_started" || !event.turn_id) return false;
+  return turnRecords.some((record) => record.id === event.turn_id);
+}
+
 // A session view from the server (GET /api/sessions/:id on a live worker)
 // as the live events that would have drawn it: the turn in progress (its
 // parts in order), then the prompts queued behind it. app.js feeds these to
@@ -420,6 +430,12 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
     };
     for (const part of turn.parts || []) {
       switch (part.kind) {
+        // A generation the model is on: a join during a hold (no chunk yet)
+        // shows its live step.
+        case "generation":
+          closeText();
+          events.push({ type: "generation_started", iteration: part.iteration ?? null });
+          break;
         // The chunks carry the part's iteration, so the turn view groups a
         // join like the live stream (turn_model.js).
         case "thinking":

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.21.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