samagotchi 0.24.0 → 0.26.0

data/lib/samagotchi/turn_tally.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "tool_view"
+
 module Samagotchi
   # A running count of one turn's tool calls, for the one-line tally a long,
   # tool-heavy turn shows under its activity row:
@@ -32,10 +34,13 @@ module Samagotchi
 
     # @param key [Object] one call's identity within the turn (the event's
     #   [iteration, call_index])
-    def started(key:, tool:, params: nil)
+    # @param description [String, nil] a command's description, which the
+    #   last call shows in place of its params
+    def started(key:, tool:, params: nil, description: nil)
       call = (@calls[key] ||= { tool: tool.to_s, params: "", status: "running" })
       call[:tool] = tool.to_s unless tool.to_s.empty?
       call[:params] = params.to_s unless params.nil?
+      call[:description] = description if description
       call[:status] = "running"
       call
     end
@@ -43,9 +48,10 @@ module Samagotchi
     # A completion with no start seen still counts as a call (as the web's
     # activity rows do). Only "error" is a failure: a call a guardrail or an
     # approval blocked still counts as a call, not as a failed one.
-    def completed(key:, tool:, status:, params: nil)
-      call = @calls[key] || started(key: key, tool: tool, params: params)
+    def completed(key:, tool:, status:, params: nil, description: nil)
+      call = @calls[key] || started(key: key, tool: tool, params: params, description: description)
       call[:params] = params.to_s if params
+      call[:description] = description if description
       call[:status] = status.to_s == "error" ? "error" : "ok"
       call
     end
@@ -58,7 +64,8 @@ module Samagotchi
         next unless part[:kind].to_s == "tool"
 
         key = [part[:iteration].to_i, part[:call_index].to_i]
-        started(key: key, tool: part[:tool], params: part[:params])
+        view = part[:view].is_a?(Hash) ? part[:view].transform_keys(&:to_sym) : {}
+        started(key: key, tool: part[:tool], params: part[:params], description: ToolView.description_title(view))
         completed(key: key, tool: part[:tool], status: part[:status]) unless part[:status].to_s == "running"
       end
       self
@@ -85,8 +92,12 @@ module Samagotchi
       fields = [head] + top.map { |(tool, n), _| "#{tool} ×#{n}" }
       if last
         call = calls.last
-        params = call[:params].to_s.gsub(/\s+/, " ").strip
-        fields << "last: #{[call[:tool], params].reject(&:empty?).join(" ")}"
+        shown = if call[:description]
+                  "#{call[:tool]}: #{call[:description]}"
+                else
+                  [call[:tool], call[:params].to_s.gsub(/\s+/, " ").strip].reject(&:empty?).join(" ")
+                end
+        fields << "last: #{shown}"
       end
       cut(fields.join(SEPARATOR), width)
     end

data/lib/samagotchi/version.rb

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

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

@@ -17,12 +17,83 @@ export function rowHover(row) {
 // given: execute's may be relative to the project root), the command as
 // written (whitespace kept, its own scroll), a copy button, and a line
 // saying how much a cut command left out. "" for a call without a view.
-export function commandBlockHtml(view) {
+//
+// A view with steps (CommandSteps) shows them in the command's place, its
+// leading cd as one more "in" tag, and a "raw" toggle (a checkbox, CSS
+// only, so a live and a reloaded row behave alike; beside the first step
+// when there's no "in" tag) that swaps the steps for the command as
+// written. The copy button copies the raw command
+// either way. A view without steps (the parser's fallback) is the raw
+// block alone: nothing hides the command.
+//
+// +title+ is the row's: the model's description of the command, when it
+// gave one, cut to fit. The block starts with the whole description when
+// the title is cut, never in place of the command.
+export function commandBlockHtml(view, title = null) {
   const command = view?.command;
   if (!command) return "";
-  const cwd = view.cwd ? `<div class="activity-command-cwd">in <span>${escapeHtml(view.cwd)}</span></div>` : "";
+  const desc = view.description && view.description !== title
+    ? `<div class="activity-command-desc">${escapeHtml(view.description)}</div>`
+    : "";
+  const steps = Array.isArray(view.steps) && view.steps.length ? view.steps : null;
+  const dirs = [view.cwd, steps && view.cd].filter(Boolean);
+  const where = dirs.length
+    ? `in ${dirs.map((d) => `<span>${escapeHtml(d)}</span>`).join(" <span class=\"activity-command-sep\">›</span> ")}`
+    : "";
   const cut = view.truncated
     ? `<div class="activity-command-cut">… (${command.length.toLocaleString("en-US")} of ${Number(view.chars || 0).toLocaleString("en-US")} chars)</div>`
     : "";
-  return `<div class="activity-command code-wrap">${cwd}<pre><code>${escapeHtml(command)}</code></pre>${copyButtonHtml("code")}${cut}</div>`;
+  const raw = `<pre><code>${escapeHtml(command)}</code></pre>`;
+  if (!steps) {
+    const cwd = where ? `<div class="activity-command-cwd">${where}</div>` : "";
+    return `<div class="activity-command code-wrap">${desc}${cwd}${raw}${copyButtonHtml("code")}${cut}</div>`;
+  }
+  // No "in" tag: the toggle alone, floated beside the first step (an
+  // empty line for it would sit above the steps).
+  const head = (where ? `<div class="activity-command-head"><span class="activity-command-cwd">${where}</span>` : `<div class="activity-command-head bare">`) +
+    `<label class="activity-command-raw" title="Show the command as written"><input type="checkbox">raw</label></div>`;
+  return `<div class="activity-command code-wrap has-steps">${desc}${head}${stepsHtml(steps)}${raw}${copyButtonHtml("code")}${cut}</div>`;
+}
+
+// What an op between two steps reads as: an arrow for "then" (&&, ;, a
+// new line, a pipe), "else" for ||, "&" for one put in the background.
+const OP_GLYPHS = { "&&": "→", ";": "→", "\n": "→", "|": "→", "|&": "→", "||": "else", "&": "&" };
+const OP_NAMES = { "\n": "new line", "&": "after starting the step before in the background" };
+
+function opHtml(op) {
+  if (!op) return `<span class="step-op"></span>`;
+  const glyph = OP_GLYPHS[op] || op;
+  const name = OP_NAMES[op] || op;
+  return `<span class="step-op${op === "||" ? " else" : ""}" title="${escapeHtml(name)}">${escapeHtml(glyph)}</span>`;
+}
+
+// A step's redirections to or from nowhere (2>&1, 2>/dev/null, </dev/null),
+// dimmed: plumbing, not what the step does.
+const PLUMBING = /(^|\s)(\d*>&\d+|&>\/dev\/null|\d*>>?\s*\/dev\/null|<\s*\/dev\/null)(?=\s|$)/g;
+
+export function stepTextHtml(text) {
+  let out = "";
+  let at = 0;
+  for (const m of String(text).matchAll(PLUMBING)) {
+    const start = m.index + m[1].length;
+    out += `${escapeHtml(text.slice(at, start))}<span class="step-plumbing">${escapeHtml(m[2])}</span>`;
+    at = start + m[2].length;
+  }
+  return out + escapeHtml(String(text).slice(at));
+}
+
+// The steps as a list: a label as a small heading above its step, the op
+// that links a step to the one before, its text, its limit and heredoc
+// as chips (beside the text, below it when the row is narrow).
+export function stepsHtml(steps) {
+  const items = steps.map((step) => {
+    const label = step.label ? `<li class="step-label">${escapeHtml(step.label)}</li>` : "";
+    const limit = step.limit ? `<span class="step-chip" title="output limited">${escapeHtml(step.limit)}</span>` : "";
+    const heredoc = step.heredoc
+      ? `<span class="step-chip heredoc" title="a heredoc: its text in the raw command">${escapeHtml(step.heredoc.tag)} · ` +
+        `${Number(step.heredoc.lines)} ${step.heredoc.lines === 1 ? "line" : "lines"}</span>`
+      : "";
+    return `${label}<li class="activity-step">${opHtml(step.op)}<span class="step-body"><code>${stepTextHtml(step.text)}</code>${limit}${heredoc}</span></li>`;
+  });
+  return `<ol class="activity-steps">${items.join("")}</ol>`;
 }

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

@@ -23,11 +23,21 @@ export function noteHtml(note) {
   return `<div class="note-line">${escapeHtml(from)}</div><div class="note-text">${escapeHtml(note?.content ?? "")}</div>`;
 }
 
+// Who a steer names as its sender: a plugin's own label, chi's sender ids
+// in words (the TUI's Formatting#steer_sender agrees;
+// spec/shared/labels_matrix.json). "": no one named.
+const STEER_SENDERS = { parent_agent: "parent agent", chi_send: "chi send", plugin_send: "plugin" };
+export function steerSender(source) {
+  const id = String(source ?? "");
+  return STEER_SENDERS[id] || id;
+}
+
 // A plugin's steer (a nudge put into the running turn): one line that
 // names who nudged the model, its text collapsed under it. +bubble+: on its
 // own between bubbles (no step holds it), not a row of a step.
 export function steerRowHtml({ source, text } = {}, { bubble = false } = {}) {
-  const who = source ? `${source} nudged the model` : "nudged the model";
+  const sender = steerSender(source);
+  const who = sender ? `${sender} nudged the model` : "nudged the model";
   return `<details class="${bubble ? "bubble " : ""}steer-row"><summary>${escapeHtml(who)}</summary>` +
     `<div class="steer-text">${escapeHtml(text ?? "")}</div></details>`;
 }

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

@@ -5,14 +5,20 @@
 <title>Chi</title>
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <style>
-:root{--bg:#0b0d11;--bg-panel:#151821;--bg-inset:#0f1115;--bg-raised:#22262f;--bg-hover:#1b1f27;--border:#1f232b;--border-strong:#2d333f;--text:#e6e8eb;--text-bright:#f0f3f6;--text-2:#c9d1d9;--text-3:#9aa4b2;--text-muted:#8b949e;--text-faint:#6e7681;--accent:#7aa5ff;--accent-strong:#1f6feb;--accent-bg:#1b2336;--accent-ring:rgba(122,165,255,.18);--primary:#2a68d1;--ok:#3fb950;--ok-text:#7ee787;--ok-bg:#1a2e1a;--warn:#d29922;--warn-text:#e3b341;--warn-bright:#f2cc60;--warn-bg:#2b2108;--warn-border:#6b5416;--danger:#f85149;--danger-bg:#da3633;--danger-text:#ff7b72;--danger-bg-dim:#3d1f1f;--think:#8957e5;--think-text:#d2a8ff;--accent-border:#223150;--accent-tint:color-mix(in srgb,var(--accent) 7%,transparent);--narr:color-mix(in srgb,var(--accent) 38%,var(--text-muted));
+:root{color-scheme:dark;--bg:#0b0d11;--bg-panel:#151821;--bg-inset:#0f1115;--bg-raised:#22262f;--bg-hover:#1b1f27;--border:#1f232b;--border-strong:#2d333f;--text:#e6e8eb;--text-bright:#f0f3f6;--text-2:#c9d1d9;--text-3:#9aa4b2;--text-muted:#8b949e;--text-faint:#6e7681;--accent:#7aa5ff;--accent-strong:#1f6feb;--accent-bg:#1b2336;--accent-ring:rgba(122,165,255,.18);--primary:#2a68d1;--ok:#3fb950;--ok-text:#7ee787;--ok-bg:#1a2e1a;--warn:#d29922;--warn-text:#e3b341;--warn-bright:#f2cc60;--warn-bg:#2b2108;--warn-border:#6b5416;--danger:#f85149;--danger-bg:#da3633;--danger-text:#ff7b72;--danger-bg-dim:#3d1f1f;--think:#8957e5;--think-text:#d2a8ff;--accent-border:#223150;--accent-tint:color-mix(in srgb,var(--accent) 7%,transparent);--narr:color-mix(in srgb,var(--accent) 38%,var(--text-muted));
   --glass-bg:color-mix(in srgb,var(--bg-panel) 70%,transparent);--glass-border:rgba(255,255,255,.08);--glass-highlight:rgba(255,255,255,.05);--glass-shadow:0 8px 30px rgba(0,0,0,.35);
-  --diff-add-bg:rgba(63,185,80,.14);--diff-add-text:#aff5b4;--diff-del-bg:rgba(248,81,73,.14);--diff-del-text:#ffc1bc}
+  --diff-add-bg:rgba(63,185,80,.14);--diff-add-text:#aff5b4;--diff-del-bg:rgba(248,81,73,.14);--diff-del-text:#ffc1bc;
+  --card-hover-border:rgba(255,255,255,.14);--on-solid:#fff;--on-warn:#fff;--text-hover:#fff;--badge-bg:rgba(255,255,255,.08);--badge-ring:rgba(255,255,255,.18);--shadow-strong:rgba(0,0,0,.5);--backdrop:rgba(0,0,0,.85);--toast-shadow:0 6px 24px rgba(0,0,0,.25)}
+/* Light palette: follows the system setting. :not([data-theme="dark"]) leaves room for a later in-page toggle (data-theme on <html>); there is none yet. Each palette sets color-scheme, so native radios, inputs and scrollbars follow it. */
+@media (prefers-color-scheme:light){:root:not([data-theme="dark"]){color-scheme:light;--bg:#f5f6f8;--bg-panel:#ffffff;--bg-inset:#f1f3f6;--bg-raised:#e8ebf0;--bg-hover:#eceff4;--border:#dde1e7;--border-strong:#c3c9d2;--text:#1f2328;--text-bright:#0d1117;--text-2:#2f363d;--text-3:#475160;--text-muted:#57606a;--text-faint:#636c76;--accent:#0b5cd5;--accent-strong:#0550ae;--accent-bg:#e2ecfd;--accent-ring:rgba(11,92,213,.2);--primary:#1f6feb;--ok:#1a7f37;--ok-text:#116329;--ok-bg:#dafbe1;--warn:#9a6700;--warn-text:#7d4e00;--warn-bright:#875c00;--warn-bg:#fff6cc;--warn-border:#d4a72c;--danger:#cf222e;--danger-bg:#cf222e;--danger-text:#a40e26;--danger-bg-dim:#ffebe9;--think:#8250df;--think-text:#6639ba;--accent-border:#b8cef5;
+  --glass-border:rgba(31,35,40,.10);--glass-highlight:rgba(255,255,255,.7);--glass-shadow:0 8px 30px rgba(31,35,40,.10);
+  --diff-add-bg:rgba(26,127,55,.12);--diff-add-text:#116329;--diff-del-bg:rgba(207,34,46,.10);--diff-del-text:#82071e;
+  --card-hover-border:rgba(31,35,40,.18);--on-solid:#fff;--on-warn:#1f2328;--text-hover:#0d1117;--badge-bg:rgba(31,35,40,.06);--badge-ring:rgba(31,35,40,.15);--shadow-strong:rgba(31,35,40,.18);--backdrop:rgba(13,17,23,.85);--toast-shadow:0 6px 24px rgba(31,35,40,.14)}}
 *{box-sizing:border-box;margin:0;padding:0}
 body{font-family: ui-sans-serif,system-ui,-apple-system,Segoe UI,Roboto,Helvetica,Arial,sans-serif;background:radial-gradient(1100px 700px at 8% 0%,color-mix(in srgb,var(--accent) 13%,transparent),transparent 70%),radial-gradient(900px 700px at 100% 100%,color-mix(in srgb,var(--think) 9%,transparent),transparent 70%),var(--bg);background-attachment:fixed;color:var(--text);height:100vh;display:flex;flex-direction:column}
 /* Glass: the composer card, the strip cards, the all-sessions cards and the question cards (by selector, so app.js is untouched). */
 #dock,.turn-stage,.dock-card,#topStrip .card,#allList .card,.bubble.question,.bubble.plugin-card{background:var(--glass-bg);-webkit-backdrop-filter:blur(18px) saturate(1.35);backdrop-filter:blur(18px) saturate(1.35);border:1px solid var(--glass-border);box-shadow:inset 0 1px 0 var(--glass-highlight),var(--glass-shadow)}
-#topStrip .card:hover,#allList .card:hover{background:color-mix(in srgb,var(--bg-hover) 75%,transparent);border-color:rgba(255,255,255,.14)}
+#topStrip .card:hover,#allList .card:hover{background:color-mix(in srgb,var(--bg-hover) 75%,transparent);border-color:var(--card-hover-border)}
 #topStrip .card.active,#allList .card.active{background:color-mix(in srgb,var(--accent-bg) 75%,transparent);border-color:color-mix(in srgb,var(--accent) 35%,transparent)}
 /* A session that waits on the user (a question, an approval, a card with actions): the warning colour of its question card, also when active or hovered. */
 #topStrip .card.waiting,#allList .card.waiting{border-color:color-mix(in srgb,var(--warn) 75%,transparent)}
@@ -23,7 +29,7 @@ body.no-glass #dock,body.no-glass .turn-stage,body.no-glass .dock-card,body.no-g
 body.no-glass .bubble.question{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}
 body.no-glass .bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}
 button,input,textarea,select{font:inherit}
-button{background:var(--primary);border:0;color:#fff;padding:8px 12px;border-radius:8px;cursor:pointer;transition:filter .12s ease,background .12s ease}
+button{background:var(--primary);border:0;color:var(--on-solid);padding:8px 12px;border-radius:8px;cursor:pointer;transition:filter .12s ease,background .12s ease}
 button:hover:not(:disabled){filter:brightness(1.12)}
 button:focus-visible,input:focus-visible{outline:2px solid var(--accent);outline-offset:2px}
 button.ghost{background:var(--bg-raised);color:var(--text-2)}
@@ -91,8 +97,8 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .bubble.user.queued{border-left-style:dashed;opacity:.8}
 .bubble.user.steered{border-left-style:dashed;border-left-color:var(--accent);opacity:.9}
 .bubble.user.failed{border-left-color:var(--danger);opacity:.8}
-.bubble.user .state-badge{display:inline-flex;align-items:center;justify-content:center;gap:6px;padding:2px 7px;border-radius:999px;background:rgba(255,255,255,.08);color:var(--text);font-size:11px;line-height:1.2;white-space:nowrap;flex-shrink:0}
-.bubble.user .state-badge::before{content:"";display:inline-block;width:7px;height:7px;border-radius:50%;background:currentColor;opacity:.8;box-shadow:0 0 0 1px rgba(255,255,255,.18)}
+.bubble.user .state-badge{display:inline-flex;align-items:center;justify-content:center;gap:6px;padding:2px 7px;border-radius:999px;background:var(--badge-bg);color:var(--text);font-size:11px;line-height:1.2;white-space:nowrap;flex-shrink:0}
+.bubble.user .state-badge::before{content:"";display:inline-block;width:7px;height:7px;border-radius:50%;background:currentColor;opacity:.8;box-shadow:0 0 0 1px var(--badge-ring)}
 .bubble.user.queued .state-badge::before{background:var(--accent);box-shadow:0 0 0 1px var(--accent-ring)}
 .bubble.user.steered .state-badge::before{background:var(--accent);box-shadow:0 0 0 1px var(--accent-ring)}
 .bubble.user.failed .state-badge::before{background:var(--danger);box-shadow:0 0 0 1px color-mix(in srgb,var(--danger) 40%,transparent)}
@@ -141,6 +147,32 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .activity-command-cwd{margin-bottom:2px}
 .activity-command-cwd>span{font-family:ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--text-muted)}
 .activity-command-cut{margin-top:2px}
+.activity-command-desc{font-size:12px;line-height:1.4;color:var(--text-2);margin-bottom:3px;overflow-wrap:anywhere}
+/* The command as its steps (CommandSteps): the op that links each to the one before, labels as small headings, limits and heredocs as chips; "raw" swaps in the command as written (CSS only). */
+.activity-command.has-steps{background:var(--bg-inset);border:1px solid var(--border);border-radius:6px;padding:4px 8px 5px}
+.activity-command-head{display:flex;align-items:center;gap:8px;min-height:20px;padding-right:30px}
+.activity-command-head.bare{float:right;min-height:0;margin-left:8px}
+.has-steps .activity-command-cwd{flex:1 1 auto;min-width:0;margin:0;overflow-wrap:anywhere}
+.activity-command-cwd>.activity-command-sep{font-family:inherit;color:var(--text-faint)}
+.activity-command-raw{flex:none;display:inline-flex;align-items:center;height:18px;padding:0 7px;border:1px solid var(--border-strong);border-radius:9px;font-size:11px;color:var(--text-muted);cursor:pointer;user-select:none;-webkit-user-select:none}
+.activity-command-raw:hover{color:var(--text-2)}
+.activity-command-raw input{position:absolute;opacity:0;width:0;height:0;margin:0}
+.activity-command-raw:has(input:focus-visible){outline:2px solid var(--accent);outline-offset:1px}
+.activity-command-raw:has(input:checked){color:var(--accent);border-color:var(--accent-border);background:var(--accent-tint)}
+.activity-steps{list-style:none;margin:2px 0 0;padding:0;max-height:220px;overflow:auto;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;line-height:1.5;color:var(--text-2)}
+.activity-step{display:flex;align-items:baseline;gap:6px;min-width:0}
+.step-body{flex:1 1 auto;min-width:0;display:flex;flex-wrap:wrap;align-items:baseline;gap:2px 6px}
+.step-body>code{min-width:0;font:inherit;white-space:pre-wrap;overflow-wrap:anywhere}
+.step-op{flex:none;width:2.4em;text-align:right;font-family:ui-sans-serif,system-ui,sans-serif;font-size:11px;color:var(--text-faint)}
+.step-op.else{color:var(--warn-text)}
+.step-label{margin:5px 0 0 calc(2.4em + 6px);font-family:ui-sans-serif,system-ui,sans-serif;font-size:11px;font-weight:600;color:var(--text-muted)}
+.step-label:first-child{margin-top:1px}
+.step-chip{flex:none;align-self:center;padding:0 6px;border:1px solid var(--border-strong);border-radius:8px;font-family:ui-sans-serif,system-ui,sans-serif;font-size:10.5px;line-height:15px;color:var(--text-muted);white-space:nowrap}
+.step-chip.heredoc{border-style:dashed}
+.step-plumbing{color:var(--text-faint)}
+.activity-command.has-steps>pre{display:none;max-height:220px;margin-top:2px;padding:0 4px;background:none;border:0}
+.has-steps:has(.activity-command-raw input:checked)>pre{display:block}
+.has-steps:has(.activity-command-raw input:checked)>.activity-steps{display:none}
 @media(max-width:600px){
   .activity-params{flex:1 1 0}
   .activity-output{margin-left:0}
@@ -341,7 +373,7 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 /* The selection bubble (app.js Annotate): Annotate + the presets (web.annotate_presets), small pills with a gap (they wrap on a narrow page). */
 #annotateBar{position:fixed;z-index:20;display:flex;flex-wrap:wrap;gap:4px;max-width:calc(100vw - 16px)}
 #annotateBar[hidden]{display:none}
-#annotateBar button{font-size:12px;padding:4px 10px;border-radius:999px;box-shadow:0 2px 8px rgba(0,0,0,.5)}
+#annotateBar button{font-size:12px;padding:4px 10px;border-radius:999px;box-shadow:0 2px 8px var(--shadow-strong)}
 #annotateBar .annotate-preset{background:var(--bg-raised);color:var(--text-2);border:1px solid var(--border-strong);padding:3px 10px;max-width:32ch;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 /* Copy buttons (copy.js): top-right in an answer and a code block, left of a prompt (its right edge is the page's); shown on hover or focus, always (dim) on touch. They hold no text: "copied ✓" is CSS content. */
 .bubble.output,.bubble.user{position:relative}
@@ -382,7 +414,7 @@ body.has-session #history{padding-bottom:calc(var(--dock-h,160px) + 32px)}
 .thumbs{display:flex;flex-wrap:wrap;gap:6px;margin-top:6px}
 .thumb{max-height:120px;max-width:200px;border-radius:6px;border:1px solid var(--border-strong);cursor:zoom-in;object-fit:contain;background:var(--bg)}
 .activity-row .thumbs{flex-basis:100%}
-#lightbox{position:fixed;inset:0;z-index:50;background:rgba(0,0,0,.85);display:flex;align-items:center;justify-content:center;cursor:zoom-out}
+#lightbox{position:fixed;inset:0;z-index:50;background:var(--backdrop);display:flex;align-items:center;justify-content:center;cursor:zoom-out}
 #lightbox[hidden]{display:none}
 #lightbox img{max-width:96vw;max-height:94vh;border-radius:6px}
 #composer textarea{flex:1 1 auto;min-height:72px;resize:none;background:transparent;border:0;color:var(--text);padding:2px;border-radius:0;font-size:15px;line-height:1.45}
@@ -573,7 +605,7 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 #infoBar .meta{font-size:11px;display:flex;gap:8px;flex-wrap:wrap;align-items:center}
 #infoBar .meta .id{font-family:ui-monospace,monospace;font-weight:700;font-size:12px;color:var(--accent)}
 #infoBar .meta .copy-attach{padding:2px 8px;border-radius:6px;font-size:11px;font-weight:600;background:var(--bg-raised);color:var(--text-2);border:1px solid var(--border-strong)}
-#infoBar .meta .copy-attach:hover{color:#fff;border-color:var(--border-strong)}
+#infoBar .meta .copy-attach:hover{color:var(--text-hover);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}
 /* The footer sits on the card's glass: its chips are tinted, not solid, so the glass reads through them. */
@@ -585,7 +617,7 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 #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}
 #infoBar .meta .worker-badge:not(:has(button)){padding-right:6px}
 #infoBar .meta .worker-restart{padding:1px 8px;border-radius:5px;font-size:11px;font-weight:600;background:var(--bg-raised);color:var(--warn-bright);border:1px solid var(--warn-border)}
-#infoBar .meta .worker-restart:hover:not(:disabled){background:var(--warn-border);color:#fff}
+#infoBar .meta .worker-restart:hover:not(:disabled){background:var(--warn-border);color:var(--on-warn)}
 #infoBar .meta .worker-restart:disabled{opacity:.7;cursor:default}
 #infoBar .preview-line{font-size:13px;word-break:break-word;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;line-clamp:2;overflow:hidden;line-height:1.4;max-height:2.8em}
 #infoBar .preview-line .preview, #infoBar .preview-line .mem{word-break:break-word}
@@ -596,7 +628,7 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 #infoBar #infoArchiveBtn{background:transparent;color:var(--text-muted);border:1px solid var(--border-strong)}
 #infoBar #infoArchiveBtn:hover{color:var(--text);background:var(--bg-hover)}
 #infoBar #infoDeleteBtn{background:transparent;color:var(--text-muted);border:1px solid transparent}
-#infoBar #infoDeleteBtn:hover{color:#fff;background:var(--danger-bg);border-color:var(--danger-bg)}
+#infoBar #infoDeleteBtn:hover{color:var(--on-solid);background:var(--danger-bg);border-color:var(--danger-bg)}
 /* Phones: the footer is one line; its meta scrolls sideways (all of it stays reachable) and the first-message line, the strip card's title, goes. */
 @media(max-width:600px){
   /* The key hint: cut off at this width, and phones have no Shift+Enter. */
@@ -718,7 +750,7 @@ body.all-view #center, body.all-view #topStrip{display:none}
 .card.archived{opacity:.6}
 .card.archived:hover{opacity:.85}
 .card .archived-badge{font-size:10px;padding:1px 6px;border-radius:6px;border:1px solid var(--border-strong);color:var(--text-muted)}
-#toast{position:fixed;left:50%;bottom:24px;transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;gap:12px;align-items:center;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:0 6px 24px rgba(0,0,0,.25);font-size:13px}
+#toast{position:fixed;left:50%;bottom:24px;transform:translateX(-50%);width:max-content;max-width:calc(100vw - 32px);box-sizing:border-box;z-index:50;display:flex;gap:12px;align-items:center;padding:8px 14px;border-radius:10px;background:var(--bg-raised);color:var(--text);border:1px solid var(--border-strong);box-shadow:var(--toast-shadow);font-size:13px}
 #toast[hidden]{display:none}
 #toast .toast-action{background:transparent;border:0;color:var(--accent);font-weight:600;cursor:pointer;padding:2px 4px}
 #toast .toast-close{background:transparent;border:0;color:var(--text-muted);cursor:pointer;padding:2px 4px;margin-left:-6px}
@@ -736,7 +768,7 @@ body.all-view #center, body.all-view #topStrip{display:none}
 #allList .card{position:relative}
 .card-del{position:absolute;top:6px;right:6px;padding:2px 7px;border-radius:6px;border:1px solid transparent;background:transparent;color:var(--text-muted);font-size:12px;line-height:1.2;cursor:pointer;opacity:0;transition:opacity .15s}
 #allList .card:hover .card-del, .card-del:focus-visible{opacity:1}
-.card-del:hover{color:#fff;background:var(--danger-bg);border-color:var(--danger-bg)}
+.card-del:hover{color:var(--on-solid);background:var(--danger-bg);border-color:var(--danger-bg)}
 @media (hover:none){.card-del{opacity:1}}
 .card.active{background:var(--accent-bg);border-color:var(--accent-border)}
 .card .preview{font-size:14px;line-height:1.4;color:var(--text);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}

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

@@ -4,6 +4,7 @@
 // covers the rules; stage_view.js draws them.
 import { toolName } from "./activity.js";
 import { splitSentences } from "./sentences.js";
+import { steerSender } from "./format.js";
 import { hookNoticeLabel } from "./turn_events.js";
 
 const READ_LIKE = new Set(["read", "memory_read", "web_fetch", "task_get", "task_list", "list_sessions"]);
@@ -174,7 +175,10 @@ export function handOffOrder({ prompt = null, block = null, extras = [], answer
 // 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.
 export function flashOf(what, data = {}) {
-  if (what === "steer") return { kind: "steer", text: data.source ? `${data.source} nudged the model` : "nudged the model" };
+  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;
   return { kind: data.level === "warn" ? "warn" : "info", text: data.line || `${hookNoticeLabel(data.hook)}: ${data.text || ""}` };
 }

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

@@ -234,7 +234,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       name.textContent = tool.name;
       const title = node("span", "ts-title", now);
       title.textContent = tool.title;
-      // The full command when the call has one (the title is its first line).
+      // The full command when the call has one (the title is its first step +N).
       title.title = tool.command || tool.title;
     } else {
       const word = node("span", "ts-title quiet", now);

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

@@ -54,8 +54,8 @@ function fillActivityRow(el, row, sessionId) {
   const outEl = el.querySelector(".activity-output");
   // The call's full command, above its output (running too).
   if (row.view?.command && !el.querySelector(".activity-command")) {
-    if (outEl) outEl.insertAdjacentHTML("beforebegin", commandBlockHtml(row.view));
-    else el.insertAdjacentHTML("beforeend", commandBlockHtml(row.view));
+    if (outEl) outEl.insertAdjacentHTML("beforebegin", commandBlockHtml(row.view, row.title));
+    else el.insertAdjacentHTML("beforeend", commandBlockHtml(row.view, row.title));
   }
   if (outEl) {
     if (row.status === "running") {
@@ -691,7 +691,7 @@ function reloadRowHtml(r, thumbs) {
     : "";
   return `<div class="activity-row" data-key="${escapeHtml(r.key)}"><span class="activity-status ${activityStatusClass(r.status)}">${activityStatusLabel(r.status)}</span>` +
     `<span class="activity-tool">${escapeHtml(toolName(r))}</span>${params}${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}` +
-    `${commandBlockHtml(r.view)}${output}` +
+    `${commandBlockHtml(r.view, r.title)}${output}` +
     `${r.images?.length ? thumbs(r.images) : ""}${r.diff ? activityDiffHtml(r.diff) : ""}</div>`;
 }
 

data/lib/samagotchi/worker.rb

@@ -112,6 +112,9 @@ module Samagotchi
       # stream gets the session's history and status in its snapshot, not
       # an empty session until the first turn.
       @engine.session = @session
+      # Input already waiting in the inbox starts the next turn at once: no
+      # turn-end warm-up then.
+      @engine.next_turn_waiting = -> { SessionInbox.find_new_input_files(@session_dir).any? }
       @turn_flow = TurnFlow.new(engine: @engine)
       # Its question's answer is queued as the matching /continue (the
       # Bridge exists by the time anyone answers).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -130,7 +130,9 @@ files:
 - docs/hooks.md
 - docs/internals/background-tasks.md
 - docs/internals/context-telemetry.md
+- docs/internals/engine.md
 - docs/internals/gemma4-contract.md
+- docs/internals/prompt-caching.md
 - docs/internals/tool-guardrails.md
 - docs/memory.md
 - docs/plugins.md
@@ -196,6 +198,7 @@ files:
 - lib/samagotchi/cli/flags.rb
 - lib/samagotchi/cli/parent_wait.rb
 - lib/samagotchi/client.rb
+- lib/samagotchi/command_steps.rb
 - lib/samagotchi/commands/registry.rb
 - lib/samagotchi/config.rb
 - lib/samagotchi/config_text_edit.rb
@@ -322,6 +325,7 @@ files:
 - lib/samagotchi/prompt.rb
 - lib/samagotchi/prompt_history.rb
 - lib/samagotchi/prompt_literal_guard.rb
+- lib/samagotchi/prompt_warmup.rb
 - lib/samagotchi/question_desk.rb
 - lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
@@ -373,6 +377,7 @@ files:
 - lib/samagotchi/terminal_ui/version_lines.rb
 - lib/samagotchi/text_diff.rb
 - lib/samagotchi/thinking.rb
+- lib/samagotchi/thinking_tails.rb
 - lib/samagotchi/thinking_ticker.rb
 - lib/samagotchi/thought_stream_splitter.rb
 - lib/samagotchi/token_usage.rb
@@ -402,6 +407,7 @@ files:
 - lib/samagotchi/tools/register_reminder.rb
 - lib/samagotchi/tools/registry.rb
 - lib/samagotchi/tools/send_note.rb
+- lib/samagotchi/tools/shell.rb
 - lib/samagotchi/tools/task_create.rb
 - lib/samagotchi/tools/task_get.rb
 - lib/samagotchi/tools/task_list.rb