samagotchi 0.23.0 → 0.25.0

data/lib/samagotchi/tools/execute.rb

@@ -2,6 +2,7 @@
 
 require "open3"
 require_relative "output_guardrails"
+require_relative "shell"
 
 module Samagotchi
   module Tools
@@ -90,7 +91,7 @@ module Samagotchi
         started = monotonic_time
         deadline = started + timeout_sec
 
-        Open3.popen3(env || {}, command, chdir: cwd, pgroup: true) do |stdin, stdout, stderr, wait_thr|
+        Open3.popen3(env || {}, *Shell.argv(command), chdir: cwd, pgroup: true) do |stdin, stdout, stderr, wait_thr|
           stdin.close
           readers = [OutputReader.new(stdout), OutputReader.new(stderr)]
 

data/lib/samagotchi/tools/registry.rb

@@ -3,7 +3,11 @@
 module Samagotchi
   module Tools
     # The tools a session offers the model, in declaration order: the
-    # built-ins (Tools::Builtins), and later the ones bundles add. The
+    # built-ins (Tools::Builtins) as registered, then the ones bundles add,
+    # by bundle and name. That order doesn't depend on which plugin
+    # finished its init first or re-registered a changed tool, so the
+    # tool list (part of the prompt's cached prefix) is the same in every
+    # session with the same tools. The
     # native prompts and the chat path's tools: are rendered from #schemas,
     # and KernelLoop#dispatch runs a call through its entry's handler.
     class Registry
@@ -43,13 +47,16 @@ module Samagotchi
       def key?(name) = @entries.key?(name.to_s)
 
       # @return [Array<String>] in declaration order
-      def names = @entries.keys
+      def names = entries.map(&:name)
 
       # @return [Array<Entry>] in declaration order
-      def entries = @entries.values
+      def entries
+        core, added = @entries.values.partition(&:core?)
+        core + added.sort_by { |entry| [entry.source.to_s, entry.name] }
+      end
 
       # @return [Array<Hash>] the schemas, in declaration order
-      def schemas = @entries.values.map(&:schema)
+      def schemas = entries.map(&:schema)
 
       def freeze
         @entries.freeze

data/lib/samagotchi/tools/shell.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+
+module Samagotchi
+  module Tools
+    # The shell a model's (or the user's `!`) command runs in: execute,
+    # task_create and the shell bang. Non-login (a login shell re-sources
+    # profile files, which can rebuild PATH and shadow the inherited toolchain).
+    #
+    # macOS's /bin/sh is bash 3.2, which can't parse an apostrophe in a
+    # heredoc inside "$( )" -- the usual `git commit -m "$(cat <<'EOF' ...`.
+    # There, zsh in sh emulation runs instead (it reads no rc files in that
+    # mode), with the options that keep bash habits working: `{1..3}` brace
+    # expansion, unquoted `( )` in `[[ =~ ]]`, BASH_REMATCH, and echo
+    # expanding `\t` as macOS's sh does. Elsewhere (Linux) /bin/sh as before.
+    module Shell
+      ZSH = "/bin/zsh"
+      ZSH_SH_MODE = [ZSH, "--emulate", "sh", "+o", "ignore_braces", "+o", "sh_glob", "-o", "bash_rematch",
+                     "+o", "bsd_echo"].freeze
+      SH = ["/bin/sh"].freeze
+
+      # @return [Array<String>] the argv that runs +command+
+      def self.argv(command) = [*program, "-c", command]
+
+      # @return [Array<String>] the shell and its options, without -c
+      def self.program(host_os: RbConfig::CONFIG["host_os"], zsh: File.executable?(ZSH))
+        host_os.to_s.include?("darwin") && zsh ? ZSH_SH_MODE : SH
+      end
+    end
+  end
+end

data/lib/samagotchi/tools/task_runtime.rb

@@ -6,6 +6,7 @@ require "securerandom"
 require "shellwords"
 require "time"
 require_relative "../atomic_file"
+require_relative "shell"
 
 module Samagotchi
   module Tools
@@ -49,11 +50,10 @@ module Samagotchi
         output_io.sync = true
 
         wrapped_command = wrapped_shell_command(normalized_command, exit_code_path)
-        # Non-login shell (matches Execute): a login shell re-sources profile
-        # files, which can rebuild PATH and shadow the inherited toolchain.
+        # Non-login, the shell Execute uses too (Shell).
         pid = Process.spawn(
           spawn_env,
-          "/bin/sh", "-c", wrapped_command,
+          *Shell.argv(wrapped_command),
           chdir: resolved_cwd,
           out: output_io,
           err: output_io,

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.23.0"
+  VERSION = "0.25.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

data/lib/samagotchi/waiting_steer.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Samagotchi
+  # A message for the running turn that may cut its generation but came too
+  # early (the generation hadn't streamed only thinking for long enough):
+  # it waits here until the thinking passes steer.cut_after (the Engine
+  # checks on each thinking chunk), or until a drain hands the message to
+  # the model at a boundary, or the turn ends. One cut covers every waiting
+  # message: the first one's source names it.
+  #
+  # The epoch counts the drains that took input. A caller reads it before
+  # it queues its message; a drain after that may have taken the message
+  # already, so the message doesn't wait (it may be in the model's prompt).
+  # Written from the UIs' threads and the turn's; its own Mutex.
+  class WaitingSteer
+    def initialize
+      @mutex = Mutex.new
+      @source = nil
+      @epoch = 0
+    end
+
+    # @return [Integer] the drains that took input so far
+    def epoch
+      @mutex.synchronize { @epoch }
+    end
+
+    # +source+'s message waits for a cut, unless a drain took input since
+    # +epoch+. Returns whether it waits.
+    def wait!(source, epoch: nil)
+      @mutex.synchronize do
+        next false if epoch && epoch != @epoch
+
+        @source ||= source.to_s
+        true
+      end
+    end
+
+    def waiting?
+      @mutex.synchronize { !@source.nil? }
+    end
+
+    # The waiting source, taken (nil when none waits).
+    def take
+      @mutex.synchronize do
+        source = @source
+        @source = nil
+        source
+      end
+    end
+
+    # A drain took input: what waited is delivered.
+    def delivered!
+      @mutex.synchronize do
+        @epoch += 1
+        @source = nil
+      end
+    end
+
+    # The turn ended, or a cut happened: nothing waits.
+    def clear!
+      @mutex.synchronize { @source = nil }
+    end
+  end
+end

data/lib/samagotchi/web/message_parts.rb

@@ -3,6 +3,7 @@
 require_relative "../model_profile"
 require_relative "../tool_call_parser"
 require_relative "../tool_activity"
+require_relative "../tool_view"
 require_relative "../llm/native_tool_normalizer"
 require_relative "../tools/builtins"
 require_relative "../image_store"
@@ -158,6 +159,10 @@ module Samagotchi
         part = { tool: name, params: params.to_s }
         title = ToolActivity.tool_title(name, call, cwd: cwd)
         part[:title] = title if title
+        # Built from the saved call (never saved itself), so older sessions
+        # get it too.
+        view = ToolView.for(name, call)&.to_h
+        part[:view] = view if view
         part[:label] = label if label.is_a?(String) && !label.empty?
         unless output.nil?
           part[:output] = output.length > OUTPUT_MAX ? output[0, OUTPUT_MAX] : output

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

@@ -50,6 +50,7 @@ export function addStarted(model, event = {}) {
     row.label = event.label || row.label;
     row.params = event.params || row.params;
     row.title = event.title || row.title;
+    row.view = event.view || row.view;
     return { row, created: false };
   }
   row = {
@@ -63,6 +64,9 @@ export function addStarted(model, event = {}) {
     // project-relative path, a command without its "cd … &&"); rows show it
     // in place of the params when there is one.
     title: event.title || null,
+    // The call's full arguments for the expanded row and the hovers (the
+    // server's ToolView: an execute/task_create's command, its cwd).
+    view: event.view || null,
     status: ROW_STATUS.RUNNING,
     output: "",
     output_truncated: false,
@@ -87,6 +91,7 @@ export function addCompleted(model, event = {}) {
       label: event.label,
       params: event.activity?.params || "",
       title: event.activity?.title,
+      view: event.view,
     });
     row = synthesized.row;
   }

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

@@ -45,7 +45,7 @@ import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, mergeTiming, normalizeTiming, turnTimingText,
 } from "./timing.js";
 import { DONE_MS, applyInitEvent, dropDone, initRowHtml, newInitTasks, seedInitTasks } from "./init_row.js";
-import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, replaysDrawnTurn, retryStatusLine, snapshotEvents, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
+import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, replaysDrawnTurn, retryStatusLine, snapshotEvents, steerCutLine, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -1861,6 +1861,7 @@ const streamHandlers = {
   // The loop asks again after an empty answer: a row of the empty step
   // (a reload puts it back from the snapshot's cards).
   empty_answer_retry: (data) => { turnDom.notice({ line: emptyRetryLine(data) }); },
+  steer_cut: (data) => { turnDom.notice({ line: steerCutLine(data) }); },
   // The provider is asked again after an error, or the turn waits for
   // plugins' setup: a note on the live timing line until it streams.
   generation_retrying: (data) => setLiveTurnNote(retryStatusLine(data)),

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

@@ -0,0 +1,96 @@
+// A tool call's full command in a richer UI than the TUI's params line:
+// the server's view (ToolView: an execute/task_create's command uncut up to
+// 8,000 chars, the call's cwd: argument). Pure HTML builders, shared by the
+// live row (turn_view.js fillActivityRow) and the reloaded one
+// (reloadRowHtml), so the two can't differ.
+import { copyButtonHtml } from "./copy.js";
+import { escapeHtml } from "./format.js";
+
+// What a row's title hovers: the full command when the call has one,
+// else the params line when the row shows a title in its place.
+export function rowHover(row) {
+  if (row?.view?.command) return row.view.command;
+  return row?.title && row?.params ? row.params : "";
+}
+
+// The expanded row's command block: "in <cwd>" when the call gave one (as
+// 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.
+//
+// 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) 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 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>`
+    : "";
+  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>`;
+  }
+  const head = `<div class="activity-command-head"><span class="activity-command-cwd">${where}</span>` +
+    `<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/copy.js

@@ -88,6 +88,13 @@ const ICON = '<svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true"
 const BUBBLES = ".bubble.output:not(.streaming), .bubble.user";
 const CODE = ".bubble.output pre";
 
+// The button as markup, for a builder that returns HTML (a tool row's
+// command block, command_view.js); the same click handler answers it.
+export function copyButtonHtml(kind) {
+  const title = kind === "code" ? "Copy code" : "Copy";
+  return `<button type="button" class="copy-btn copy-${kind}" title="${title}" aria-label="${title}">${ICON}</button>`;
+}
+
 function makeButton(doc, kind) {
   const btn = doc.createElement("button");
   btn.type = "button";

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

@@ -134,10 +134,43 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .activity-diff>summary{cursor:pointer;font-size:12px;color:var(--text-muted);width:max-content;font-variant-numeric:tabular-nums}
 .activity-diff>summary:hover{color:var(--text-2)}
 .activity-diff[open]>summary{margin-bottom:4px}
+/* An execute/task_create's full command, above its output and lined up with it: as written, its own scroll. */
+.activity-row>.activity-command{flex:1 1 100%;min-width:0;margin:4px 0 2px 60px}
+.activity-command pre{margin:0;max-height:160px;overflow:auto;white-space:pre-wrap;word-break:break-word;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;line-height:1.45;color:var(--text-2);background:var(--bg-inset);border:1px solid var(--border);border-radius:6px;padding:6px 34px 6px 8px}
+.activity-command-cwd,.activity-command-cut{font-size:11px;color:var(--text-faint)}
+.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}
   .activity-diff{margin-left:0}
+  .activity-row>.activity-command{margin-left:0}
 }
 .bubble.thinking{border-left:3px solid var(--think);background:color-mix(in srgb,var(--think) 6%,var(--bg-panel));padding:8px 12px}
 .bubble.thinking:not([open]),.bubble.activity:not([open]){padding:3px 10px;background:transparent;border-color:transparent;align-self:flex-start;border-radius:6px;transition:background .12s ease}

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"]);
@@ -78,6 +79,12 @@ function rowTitle(row) {
   return row.title || row.params || "";
 }
 
+// A slot's full command (the row's view), for its hover; none for a tool
+// without one.
+function withCommand(slot, row) {
+  return row.view?.command ? { ...slot, command: row.view.command } : slot;
+}
+
 // While the first step has no thinking and no tool rows the turn is plain:
 // its text streams in the stage's answer slot, as the turn view's
 // chrome-less block streams like a bubble.
@@ -98,9 +105,10 @@ const NO_ANSWER = "no answer";
 //   headline the newest narration sentence (+narration+, the view's sentence
 //            feed), else the newest thinking one (+thinking+, its ticker),
 //            else "…";
-//   tool     the running call ({name, title, kind}) or null;
+//   tool     the running call ({name, title, kind}, and command: its full
+//            command when it has one) or null;
 //   trail    the last three finished calls, newest last (a file's title
-//            without its dir);
+//            without its dir; command as for tool);
 //   ticks    one per call: {kind, status, step (the gen's index)}.
 // +pending+: a card waits for the user; +ended+: the turn's end kind;
 // +emptyAnswer+: a completed turn ended with no answer
@@ -123,13 +131,13 @@ export function liveSlots(turn, { narration = "", thinking = "", pending = false
   else if (thinking) headline = { text: thinking, thinking: true };
   const trail = rows.filter(({ row }) => row.status !== "running").slice(-TRAIL).map(({ row }) => {
     const title = rowTitle(row);
-    return { name: toolName(row), title: FILE_TOOLS.has(row.tool) ? title.split("/").pop() : title, status: row.status };
+    return withCommand({ name: toolName(row), title: FILE_TOOLS.has(row.tool) ? title.split("/").pop() : title, status: row.status }, row);
   });
   return {
     phase,
     step: ended ? gens.filter((g) => !g.answer || g.thinking || g.tools.length).length : gens.length,
     headline,
-    tool: running ? { name: toolName(running), title: rowTitle(running), kind: toolKind(running.tool) } : null,
+    tool: running ? withCommand({ name: toolName(running), title: rowTitle(running), kind: toolKind(running.tool) }, running) : null,
     trail,
     ticks: rows.map(({ row, step }) => ({ kind: toolKind(row.tool), status: row.status, step })),
   };
@@ -167,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

@@ -195,6 +195,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     const elapsed = endKind ? formatDuration(endedAt - startedAt) : "";
     chipLabel.textContent = `${slots.step} step${slots.step === 1 ? "" : "s"} · ${calls} tool call${calls === 1 ? "" : "s"}${elapsed ? ` · ${elapsed}` : ""}`;
     miniTool.textContent = collapsed && slots.tool ? `${slots.tool.name} ${slots.tool.title}` : "";
+    miniTool.title = (collapsed && slots.tool?.command) || "";
 
     live.hidden = plain || !!endKind;
     cloud.hidden = !blockEl || blockEl.parentNode !== cloudBody;
@@ -222,7 +223,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
 
   function drawNow(tool, gen) {
     const quiet = gen?.text && !gen.textDone ? "writing…" : "thinking…";
-    const key = tool ? `run|${tool.name}|${tool.title}` : `quiet|${quiet}`;
+    const key = tool ? `run|${tool.name}|${tool.title}|${tool.command || ""}` : `quiet|${quiet}`;
     if (shown.now === key) return;
     shown.now = key;
     now.replaceChildren();
@@ -233,7 +234,8 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       name.textContent = tool.name;
       const title = node("span", "ts-title", now);
       title.textContent = tool.title;
-      title.title = tool.title;
+      // 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);
       word.textContent = quiet;
@@ -251,6 +253,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
       const failed = item.status === "error";
       const el = node("span", `ts-trail-item${failed ? " error" : ""}`, trail);
       el.textContent = `${failed ? "✕" : "✓"} ${item.name} ${item.title}`.trim();
+      if (item.command) el.title = item.command;
     }
     if (!flashing && !items.length) node("span", "ts-trail-item none", trail).textContent = "no tool calls yet";
   }

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

@@ -123,6 +123,17 @@ export function emptyRetryLine({ attempt, of, stopped_by: stoppedBy } = {}) {
   return `↻ ${what}, asking again (${attempt}/${of})`;
 }
 
+// The row a step gets when a message for the running turn cut a generation
+// that was only thinking (steer_cut; source "" is the user's, as is an
+// unknown one). The TUI words it the same (spec/shared/labels_matrix.json).
+const STEER_CUT_FOR = {
+  chi_send: "a message sent with chi send",
+  parent_agent: "the parent agent's message",
+};
+export function steerCutLine({ source } = {}) {
+  return `↪ cut in for ${STEER_CUT_FOR[source] || "your message"}`;
+}
+
 // The one muted line for a turn that ended with no answer (turn_completed's
 // turn_summary.empty_answer, or a reloaded turn's marker): the TUI words
 // it the same (TurnNote.empty_answer_line; spec/shared/labels_matrix.json).
@@ -136,6 +147,7 @@ export function emptyAnswerLine({ retries = 0 } = {}) {
 // notice as "<label>: text", the loop's asking-again row as its line.
 export function noticeLine(entry = {}) {
   if (entry.type === "empty_answer_retry") return emptyRetryLine(entry);
+  if (entry.type === "steer_cut") return steerCutLine(entry);
   return `${hookNoticeLabel(entry.hook)}: ${entry.text || ""}`;
 }
 
@@ -451,7 +463,8 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
           const call = { iteration: part.iteration, call_index: part.call_index, tool: part.tool };
           if (part.label) call.label = part.label;
           const title = part.title ? { title: part.title } : {};
-          events.push({ type: "tool_call_started", ...call, params: part.params, ...title });
+          const view = part.view ? { view: part.view } : {};
+          events.push({ type: "tool_call_started", ...call, params: part.params, ...title, ...view });
           if (part.status !== "running") {
             // The activity as the live event had it; action and duration_ms
             // only in snapshots from a worker that keeps them (the TUI's
@@ -463,6 +476,7 @@ export function snapshotEvents({ current_turn: turn = null, queued = [], started
             };
             if (part.duration_ms != null) completed.duration_ms = part.duration_ms;
             if (part.diff) completed.diff = part.diff;
+            if (part.view) completed.view = part.view;
             events.push(withImages(completed, part.images));
           }
           break;