samagotchi 0.80.0 → 0.82.0

data/lib/samagotchi/testing/sandbox.rb

@@ -9,8 +9,8 @@ require_relative "fake_executable"
 
 module Samagotchi
   module Testing
-    # The environment a bundle test runs in: temp config and state homes
-    # (config.yml, memories, ctx.data_dir, the debug log), HOME and the peer
+    # The environment a bundle test runs in: temp config, state, data and cache
+    # homes (config.yml, memories, ctx.data_dir, the debug log), HOME and the peer
     # CLIs' folders, git without the user's config, no Keychain, none of
     # the user's SAMAGOTCHI_* settings, a bin/ first on PATH for fake
     # commands. ENV is put back on #leave.
@@ -59,12 +59,14 @@ module Samagotchi
         @saved = ENV.to_h
         @outer = Sandbox.current
         ENV.each_key.select { |key| key.start_with?("SAMAGOTCHI_") && !KEPT.include?(key) }.each { |key| ENV.delete(key) }
-        %w[config state home work bin].each { |dir| FileUtils.mkdir_p(File.join(@root, dir)) }
+        %w[config state data cache home work bin].each { |dir| FileUtils.mkdir_p(File.join(@root, dir)) }
         File.write(File.join(@root, "gitconfig"), "")
         ENV.update(
           "HOME" => File.join(@root, "home"),
           "XDG_CONFIG_HOME" => File.join(@root, "config"),
           "XDG_STATE_HOME" => File.join(@root, "state"),
+          "XDG_DATA_HOME" => File.join(@root, "data"),
+          "XDG_CACHE_HOME" => File.join(@root, "cache"),
           "CLAUDE_CONFIG_DIR" => File.join(@root, "home", ".claude"),
           "CODEX_HOME" => File.join(@root, "home", ".codex"),
           "GIT_CONFIG_GLOBAL" => File.join(@root, "gitconfig"),

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -1798,7 +1798,10 @@ module Samagotchi
           # model_segments; none with one model, or from an older file).
           model_segments: Array(source["model_segments"]),
           # The memory indexes the session's prompt holds (the ctx tooltip).
-          memory_index: source["memory_index"]
+          memory_index: source["memory_index"],
+          # The side requests (recap, /btw, ctx.ask_model), apart from the
+          # tokens: the ctx tooltip's own line (nil without any).
+          side: source["side"]
         }
       end
 

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

@@ -1143,10 +1143,12 @@ function updateSessionTitle() {
 }
 
 // The stage takes a running turn's rows (its extras); else the history.
+// @return true when the stage took +el+ (it scrolls it into its view itself)
 function appendToHistory(el) {
   // (The stage's place first moves a turn still sliding away into the history.)
-  if (turnDom.place?.(el)) return;
+  if (turnDom.place?.(el)) return true;
   appendAboveLiveTiming(historyEl, el, liveTurn.timing.el);
+  return false;
 }
 
 // A turn-end re-read's timing (?tail=1&recent=1: the newest turn's records

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

@@ -142,14 +142,19 @@ export function ctxBarText(pct, windowSource = null) {
 // bar's; a /model whose new window didn't resolve, no request since:
 // Engine#announce_switched_context! sent usage null) adds "until the next
 // request", which asks for it again.
-export function ctxBarTip(tokens, memoryIndex, window, segments = null) {
+// +side+ (the timing's side block) adds the side requests' line, in the
+// "No request in this session yet" answer too (a /btw before any turn).
+export function ctxBarTip(tokens, memoryIndex, window, segments = null, side = null) {
   if (num(window?.pct) === null) {
-    if (!num(tokens?.prompt_sum) && !num(tokens?.completion_sum)) return "No request in this session yet";
+    if (!num(tokens?.prompt_sum) && !num(tokens?.completion_sum)) {
+      const sideText = sideRequestsText(side);
+      return `No request in this session yet${sideText ? `\nside requests: ${sideText}` : ""}`;
+    }
     const why = window?.afterSwitch ? "Context window unknown until the next request" : "Context window unknown";
-    return tokensTipText(tokens, why, memoryIndex, null, segments);
+    return tokensTipText(tokens, why, memoryIndex, null, segments, side);
   }
 
-  return tokensTipText(tokens, undefined, memoryIndex, window, segments);
+  return tokensTipText(tokens, undefined, memoryIndex, window, segments, side);
 }
 
 // The ctx tooltip's window line ({tokens:, source:, pct:, budget:} the
@@ -198,6 +203,24 @@ export function modelSegmentCostText(row) {
   return [costText(row?.cost_sum), costText(row?.cost_estimate_sum, { estimate: true })].filter(Boolean).join(" + ");
 }
 
+// "3 (recap 2, btw 1) · 14.2k in / 380 out · $0.0012 + ~$0.0009": the
+// session's side requests (the timing's side block: the idle recap, /btw and
+// other ctx.ask_model calls, apart from its turns' totals), the kinds in
+// first-seen order (one kind: its name alone), then the model rows' tokens
+// and cost words on the block; "" without any (the line is hidden). As
+// Formatting#side_requests_text (spec/shared/labels_matrix.json side_requests).
+export function sideRequestsText(side) {
+  if (!side || typeof side !== "object") return "";
+  const requests = num(side.requests) || 0;
+  if (requests <= 0) return "";
+  const kinds = side.by_kind && typeof side.by_kind === "object" ? Object.entries(side.by_kind) : [];
+  const names = kinds.length === 1
+    ? kinds[0][0]
+    : kinds.map(([kind, row]) => `${kind} ${Math.round(num(row?.requests) || 0)}`).join(", ");
+  const head = names ? `${Math.round(requests)} (${names})` : String(Math.round(requests));
+  return [head, modelSegmentTokensText(side), modelSegmentCostText(side)].filter(Boolean).join(" · ");
+}
+
 // "switch prefill 3.0k uncached prompt ≈$0.0060": what the switch to the
 // row's model prefilled (its cost an estimate from the configured price,
 // left out without one); "" for none.
@@ -246,14 +269,16 @@ function modelSegmentLines(segments) {
 // totals. 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", memoryIndex = null, window = null,
-                              segments = null) {
+                              segments = null, side = null) {
   const memory = memoryIndexText(memoryIndex);
   const memoryLine = memory ? `\nmemory index: ${memory}` : "";
+  const sideText = sideRequestsText(side);
+  const sideLine = sideText ? `side requests: ${sideText}` : "";
   const windowText = ctxWindowText(window);
   if (windowText) title = `${title}\n${windowText}`;
   const prompt = num(tokens?.prompt_sum) || 0;
   const completion = num(tokens?.completion_sum) || 0;
-  if (!prompt && !completion) return `${title}${memoryLine}`;
+  if (!prompt && !completion) return `${title}${sideLine ? `\n${sideLine}` : ""}${memoryLine}`;
   const cached = num(tokens.cached_sum) || 0;
   const reasoning = num(tokens.reasoning_sum) || 0;
   const parts = [`in ${count(prompt)}`];
@@ -262,6 +287,7 @@ export function tokensTipText(tokens, title = "Context used after the last turn"
   const lines = [title, ...modelSegmentLines(segments), `tokens: ${parts.join(" · ")}`];
   const cost = costLine(tokens);
   if (cost) lines.push(cost);
+  if (sideLine) lines.push(sideLine);
   lines.push("this session only, all requests");
   return `${lines.join("\n")}${memoryLine}`;
 }

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

@@ -68,7 +68,7 @@ export function infoBarModel({ id, state, sessions, chain, cardTitle, badge, res
   const ctxTip = ctxBarTip(tokens, state.timing.memoryIndex,
                            { tokens: state.ctxWindow, source: state.ctxWindowSource, pct: state.ctxPct,
                              budget: state.llmContext?.budget_tokens, afterSwitch: state.ctxUnknownAfterSwitch },
-                           state.timing.modelSegments);
+                           state.timing.modelSegments, state.timing.side);
   const speedTextNow = lastSpeedText(tokens);
   const avgSpeed = speedText(tokens?.avg_decode_tps, tokens?.tps_source);
   const sessionDuration = sessionDurationNow(state.timing, running);

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

@@ -145,7 +145,7 @@ export function cardTemplate(s, { deletable = false, archivable = false, selecta
   const folderT = folder ? html`<span class="folder" title=${s.working_directory}>${folder}</span>` : nothing;
   const archived = s.archived ? html`<span class="archived-badge" title="Archived: hidden from the lists, kept for good">archived</span>` : nothing;
   const ctx = cardCtxText(s.ctx_pct);
-  const ctxT = ctx ? html`<span class="ctx" title=${ctxBarTip(s.tokens, s.memory_index, { pct: s.ctx_pct })}>${ctx}</span>` : nothing;
+  const ctxT = ctx ? html`<span class="ctx" title=${ctxBarTip(s.tokens, s.memory_index, { pct: s.ctx_pct }, null, s.side)}>${ctx}</span>` : nothing;
   const waiting = waitingBadge(s);
   const waitingT = waiting ? html`<span class=${`attn attn-${waiting.kind}`} title=${waiting.title}>${waiting.text}</span>` : nothing;
   // A turn a hook stopped wears its own badge, unless the session waits on

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

@@ -26,7 +26,8 @@ import { plainText } from "./plain_line.js";
 
 // @param sessionId () => the open session's id (answers go there)
 // @param clientId this tab's id in the session's events
-// @param place (card) puts a new card at the end of the history
+// @param place (card) puts a new card at the end of the history; true: the
+//   stage took it (it brings the card into its view itself, eased)
 // @param isNearBottom () => whether the history follows its end
 // @param scrollToEnd () scrolls the history to its end
 // @param removeHintIfEmpty () drops the history's placeholder hint
@@ -200,10 +201,10 @@ export function createQuestionCards({
 
     // Read before the card makes the history taller.
     const follow = isNearBottom();
-    place(card);
+    const staged = place(card) === true;
     questionEl = card;
     if (follow) scrollToEnd();
-    focusWhenIdle(card, pq.id);
+    focusWhenIdle(card, pq.id, { staged });
   }
 
   function isPlainEnter(e) {
@@ -213,7 +214,10 @@ export function createQuestionCards({
   // A new card takes the focus while nobody is typing: the focus is on
   // the page or an empty composer. Checked after the caller is done, so a
   // card drawn already answered (the history replay) never takes it.
-  function focusWhenIdle(card, id) {
+  // +staged+: the stage holds the card and scrolls to it once it has grown
+  // for it (eased): the focus doesn't scroll, or the stage would snap to the
+  // card before its room eases in.
+  function focusWhenIdle(card, id, { staged = false } = {}) {
     queueMicrotask(() => {
       if (questionEl !== card || String(pending?.id) !== String(id)) return;
       const prompt = doc.getElementById?.("prompt");
@@ -221,7 +225,8 @@ export function createQuestionCards({
       const idle = !active || active === doc.body || (active === prompt && !prompt.value);
       if (!idle || (prompt && prompt.value)) return;
       const target = card.querySelector(".question-option input") || card.querySelector(".question-freeform");
-      target?.focus();
+      if (staged) target?.focus({ preventScroll: true });
+      else target?.focus();
     });
   }
 

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

@@ -339,6 +339,13 @@ export function createStreamHandlers(deps) {
     question_cancelled: (data) => {
       questionCards.resolveQuestion(data.id, { cancelled: true, reason: data.reason });
     },
+    // A side request (the recap, /btw, a plugin's ctx.ask_model) counted:
+    // the server's whole side block, for the ctx tooltip's line at once.
+    side_usage: (data) => {
+      if (!data?.side || typeof data.side !== "object") return;
+      state().timing.side = data.side;
+      updateInfoBar();
+    },
     // One collected just as a turn started describes the chat before it.
     recap_ready: (data) => {
       // After the turn it covers, never above it.

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

@@ -85,6 +85,10 @@ export function normalizeTiming(data = {}) {
     // (SessionMetrics' model_segments; [] with one model), for the ctx
     // tooltip.
     modelSegments: Array.isArray(data.model_segments) ? data.model_segments.filter(validRecord) : [],
+    // The session's side requests (SessionMetrics' side block: recap,
+    // /btw, ctx.ask_model, apart from tokens), for the ctx tooltip; null
+    // without any.
+    side: validRecord(data.side) ? data.side : null,
   };
 }
 
@@ -121,11 +125,12 @@ export function mergeTiming(timing, data = {}) {
   });
   const tokens = fresh.tokens || timing?.tokens || null;
   const memoryIndex = fresh.memoryIndex || timing?.memoryIndex || null;
+  const side = fresh.side || timing?.side || null;
   // A reply that has the rows is the answer, an empty list too (one model
   // now): a stale list never survives it; one without them (an older
   // server) keeps the page's.
   const modelSegments = data && "model_segments" in data ? fresh.modelSegments : (timing?.modelSegments || []);
-  return { timing: { ...fresh, turnRecords, toolRecords, tokens, memoryIndex, modelSegments },
+  return { timing: { ...fresh, turnRecords, toolRecords, tokens, memoryIndex, modelSegments, side },
            short: turnRecords.length < count };
 }
 

data/lib/samagotchi/web/session_summary.rb

@@ -77,6 +77,8 @@ module Samagotchi
           tokens: saved&.tokens,
           # The memory indexes its prompt held (the card's ctx tooltip).
           memory_index: saved&.memory_index,
+          # Its side requests, apart from the tokens (the tooltip's own line).
+          side: saved&.side,
           # 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.80.0
+  version: 0.82.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -292,6 +292,7 @@ files:
 - lib/samagotchi/guardrails/approvals.rb
 - lib/samagotchi/guardrails/child_boundary.rb
 - lib/samagotchi/guardrails/context.rb
+- lib/samagotchi/guardrails/data_readers.rb
 - lib/samagotchi/guardrails/gate.rb
 - lib/samagotchi/guardrails/load_failures.rb
 - lib/samagotchi/guardrails/model_size.rb
@@ -469,6 +470,7 @@ files:
 - lib/samagotchi/session_manager.rb
 - lib/samagotchi/session_metrics.rb
 - lib/samagotchi/session_metrics/model_segment.rb
+- lib/samagotchi/session_metrics/side_totals.rb
 - lib/samagotchi/session_metrics/totals.rb
 - lib/samagotchi/session_model_settings.rb
 - lib/samagotchi/session_observer.rb
@@ -477,6 +479,7 @@ files:
 - lib/samagotchi/session_setup.rb
 - lib/samagotchi/sessions_command.rb
 - lib/samagotchi/setting_explained.rb
+- lib/samagotchi/side_usage.rb
 - lib/samagotchi/steer.rb
 - lib/samagotchi/steer_cut.rb
 - lib/samagotchi/steer_cut_after.rb