samagotchi 0.24.0 → 0.25.0

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

@@ -141,6 +141,31 @@ 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}
+.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}

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>`;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -131,6 +131,7 @@ files:
 - docs/internals/background-tasks.md
 - docs/internals/context-telemetry.md
 - docs/internals/gemma4-contract.md
+- docs/internals/prompt-caching.md
 - docs/internals/tool-guardrails.md
 - docs/memory.md
 - docs/plugins.md
@@ -196,6 +197,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
@@ -373,6 +375,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 +405,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