samagotchi 0.29.0 → 0.30.0

data/lib/samagotchi/send_command.rb

@@ -241,9 +241,10 @@ module Samagotchi
 
     # A worker session like the web start page's: saved as running with the
     # message before its worker spawns, so lists and the web show it at
-    # once. The full id, so a script can pass it on. Only the model's host
-    # is checked here (in spawn_session, as in the web): a wrong model id
-    # fails in the worker.
+    # once. The full id, so a script can pass it on. The model's host is
+    # checked here (in spawn_session, as in the web): an unknown one is
+    # refused before anything is spawned; an id the host's saved model list
+    # doesn't have starts with a warning on stderr.
     # @return [Integer] the exit status
     def run_new(prompt, options)
       images = !@images.empty?
@@ -264,6 +265,7 @@ module Samagotchi
         error_line("chi send: could not start a session: #{e.message}")
         return 1
       end
+      error_line("chi send: warning: #{session.model_warning}") if session.model_warning
       if through_worker
         return 1 unless deliver_new(session, prompt)
       else

data/lib/samagotchi/session.rb

@@ -79,6 +79,11 @@ module Samagotchi
     # sets it); not saved.
     attr_accessor :seed_images_dropped
 
+    # The warning for a model id its host's saved list doesn't have
+    # (ModelProfile.model_warning; SessionManager.spawn_session sets it);
+    # not saved.
+    attr_accessor :model_warning
+
     def initialize(id:, mode:, model_name:, working_directory:, messages:, created_at:, updated_at:,
                    metadata_version: METADATA_VERSION, status: STATUS_IDLE, last_prompt: "",
                    first_preview: "", test_run: false, pending_question: nil,

data/lib/samagotchi/session_manager.rb

@@ -130,14 +130,20 @@ module Samagotchi
     # @param images_from [String, nil] the session dir the seed's images are in
     # @param title [String, nil] what the lists show before the first turn
     #   (the prompt's preview by default, else the seed's first user message)
-    # @return [Session] with #seed_images_dropped: refs whose file was gone
+    # @return [Session] with #seed_images_dropped: refs whose file was gone,
+    #   and #model_warning: an id its host's saved list doesn't have
     def self.spawn_session(prompt:, mode: "assist", working_directory: nil, model_name: nil, state_dir: nil,
                            memories: [], muted_memories: [], parent_id: nil, messages: [], images_from: nil,
                            title: nil)
       sd = state_dir || Session.default_state_dir
       # The resolved ref is stored (a resumed session keeps its model when an
-      # alias is retargeted), with the name as typed beside it.
+      # alias is retargeted), with the name as typed beside it. A wrong host
+      # refuses here, before anything is saved or spawned; a model id the
+      # host's saved list doesn't have (ModelListStore) only warns
+      # (#model_warning on the session), as some hosts serve ids they don't
+      # list.
       typed = Samagotchi::ModelProfile.check_host!(Samagotchi::ModelProfile.required_model_name(model_name))
+      model_warning = Samagotchi::ModelProfile.model_warning(typed)
       ref = ConfigFile.model_ref(typed).ref
       session = Session.new_session(
         mode: mode,
@@ -149,6 +155,7 @@ module Samagotchi
         parent_id: parent_id,
         messages: messages
       )
+      session.model_warning = model_warning
       # With no prompt there is no first turn to run (an attaching UI sends
       # the prompts), so the session starts idle.
       session.status = prompt.to_s.strip.empty? ? Session::STATUS_IDLE : Session::STATUS_RUNNING

data/lib/samagotchi/session_metrics.rb

@@ -481,9 +481,12 @@ module Samagotchi
           # A turn that failed mid-stream never saw its generation end:
           # what it got to still counts.
           close_generation if @turn.gen_open
-          # A call still running when the turn ends (a cancel, a failure)
-          # never completes: its record says so, as the count already has it.
-          @turn.tool_calls_by_id.each_value { |active| finish_tool_record(active, "canceled") }
+          # A call still running when the turn ends never completes: its
+          # record says so, as the count already has it. A cancel stopped it
+          # ("stopped", as ToolActivity names a call the Stop cut); a
+          # failure left it "canceled".
+          cut = status == "canceled" ? "stopped" : "canceled"
+          @turn.tool_calls_by_id.each_value { |active| finish_tool_record(active, cut) }
           @turn.tool_calls_by_id.clear
           finished_at = now
           record = {

data/lib/samagotchi/terminal_ui/formatting.rb

@@ -226,19 +226,22 @@ module Samagotchi
       # A cancel's reason as the UIs name it (anything else as it is);
       # spec/shared/labels_matrix.json pins it for both.
       CANCEL_REASONS = { "ctrl_c" => "Ctrl-C", "user" => "stopped", "hook" => "by a hook" }.freeze
+      # A canceled turn's mark: a stop someone chose (Ctrl-C, Stop, a hook),
+      # not an error's ✕ (timing.js STOP_MARK; the labels matrix pins it).
+      STOP_MARK = "■"
       # Under a canceled prompt turn (a canceled continue is back where it
       # started): its partial progress stays in the conversation.
       ROLLBACK_HINT = "partial progress kept; !rollback restores the pre-turn state"
 
-      # "✕ turn canceled (Ctrl-C) · 3.1s"; a hook's stop that names who
-      # (+by+, turn_canceled's cancelled_by): "✕ turn stopped by loop-guard"
+      # "■ turn canceled (Ctrl-C) · 3.1s"; a hook's stop that names who
+      # (+by+, turn_canceled's cancelled_by): "■ turn stopped by loop-guard"
       def turn_canceled_line(reason, duration_ms, by: nil)
         if reason.to_s == "hook" && !by.to_s.empty?
-          return "#{paint("✕", 33)} turn stopped by #{by}#{turn_duration_suffix(duration_ms)}"
+          return "#{paint(STOP_MARK, 33)} turn stopped by #{by}#{turn_duration_suffix(duration_ms)}"
         end
 
         label = reason.to_s.empty? ? nil : CANCEL_REASONS.fetch(reason.to_s, reason.to_s)
-        "#{paint("✕", 33)} turn canceled#{" (#{label})" if label}#{turn_duration_suffix(duration_ms)}"
+        "#{paint(STOP_MARK, 33)} turn canceled#{" (#{label})" if label}#{turn_duration_suffix(duration_ms)}"
       end
 
       # "✕ turn failed: <summary> · 2.0s"

data/lib/samagotchi/terminal_ui.rb

@@ -16,6 +16,7 @@ require_relative "host_registry"
 require_relative "session"
 require_relative "owner_lock"
 require_relative "bridge/card_store"
+require_relative "bridge/pending_card"
 require_relative "engine"
 require_relative "guardrails/parent_approvals"
 require_relative "tools/memory"
@@ -298,7 +299,10 @@ module Samagotchi
     ensure
       # However it ends (the early returns too; the Engine was built in
       # #initialize): the anytime commands finish, the plugins' services
-      # stop (a server process).
+      # stop (a server process). Nothing resolves an open card any more, so
+      # its pending_card.json goes (a scratch session's folder is deleted
+      # below anyway; the others stay).
+      clear_pending_card
       @engine&.shutdown
       # A scratch session goes on every way out: /exit, Ctrl-D, an error,
       # SIGTERM or SIGHUP (Ruby raises those here). Only kill -9 leaves it
@@ -308,6 +312,17 @@ module Samagotchi
 
     EMPTY_ANSWER_ERROR = "chi: the model gave an empty answer"
 
+    # The session is over for this process (its exits and the ensure below):
+    # nothing will resolve the open card any more, so its pending_card.json
+    # goes (the Engine's TURN_END would clear it, but the REPL may end
+    # mid-turn).
+    def clear_pending_card
+      return unless @pending_card_handle
+
+      @pending_card_handle.observer.clear
+      @pending_card_handle = nil
+    end
+
     # A -p --non-interactive turn that failed (bin/chi exits 1): the error,
     # then how to go on. The Engine saved the failed turn with its prompt,
     # so the session is kept and `chi --resume` takes it up again.
@@ -415,13 +430,28 @@ module Samagotchi
       @surface.commit("Session #{session.id} was not archived (#{e.message}): chi sessions archive #{session.id}")
     end
 
-    # The session's cards.json, kept as a worker's Bridge keeps it (it owns
-    # the session as a worker would): this REPL's kept turns count on from
-    # the saved count, so a card an earlier worker showed stays that many
-    # turns back, and its own cards and notices are saved for the next.
+    # The session's cards.json and pending_card.json, kept as a worker's
+    # Bridge keeps them (it owns the session as a worker would): this REPL's
+    # kept turns count on from the saved count, so a card an earlier worker
+    # showed stays that many turns back, and its own cards and notices are
+    # saved for the next; an open card with actions is on disk, where
+    # `chi web`'s session hub reads it to mark the session as waiting.
     def keep_cards(session)
       path = File.join(Session.session_dir(session.id), Bridge::CardStore::FILE)
       @cards_handle ||= @engine.subscribe(observer: Bridge::CardStore.new(path: path))
+      keep_pending_card(session)
+    end
+
+    # A card a worker that died left isn't open: the file goes before the
+    # observer takes over, as Bridge#start does. Subscribed once: the REPL
+    # keeps one session, and a second observer would fold every card twice
+    # and clear the file at the first turn's end.
+    def keep_pending_card(session)
+      return if @pending_card_handle
+
+      pending = Bridge::PendingCard.new(Session.session_dir(session.id))
+      pending.clear
+      @pending_card_handle = @engine.subscribe(observer: pending)
     end
 
     # Take the session's OwnerLock for this process's lifetime: the TUI runs

data/lib/samagotchi/tool_activity.rb

@@ -176,10 +176,14 @@ module Samagotchi
     # "error" for an "Error:" result, and for an execute whose command
     # exited non-zero (its last "exit: N" line; no number: killed by a
     # signal), so the turn tally's "(N failed)" counts it. "stopped" for a
-    # task_wait the user's Stop ended (the task itself runs on), and for one
-    # whose task was stopped (the stop-task button, or the model's task_stop).
+    # task_wait the user's Stop ended (the task itself runs on), for one
+    # whose task was stopped (the stop-task button, or the model's task_stop),
+    # and for a command the user's Stop killed or kept from starting: a
+    # cancel, not a failure (its text still starts "Error:" for the model).
     def tool_activity_status(result, tool_name = nil)
       text = result.to_s
+      return "stopped" if text == Tools::Execute::NOT_RUN_ON_STOP
+      return "stopped" if tool_name == Tools::Execute::NAME && text.start_with?(Tools::Execute::STOPPED_BY_USER)
       return "error" if text.start_with?("Error:")
       return "error" if tool_name == Tools::Execute::NAME && execute_failed?(text)
       return "stopped" if tool_name == Tools::TaskWait::NAME && text.match?(/^(wait_result: canceled|status: stopped)$/)

data/lib/samagotchi/tools/delegate.rb

@@ -51,16 +51,18 @@ module Samagotchi
         wait = parse_wait(wait)
         timeout = parse_timeout(timeout)
 
-        child_id = if session.to_s.strip.empty?
-                     start_child(task, parent: parent, model: model, state_dir: sd)
-                   else
-                     follow_up(task, session: session.to_s.strip, parent: parent, state_dir: sd)
-                   end
+        child_id, warning = if session.to_s.strip.empty?
+                              start_child(task, parent: parent, model: model, state_dir: sd)
+                            else
+                              follow_up(task, session: session.to_s.strip, parent: parent, state_dir: sd)
+                            end
         return child_id if child_id.start_with?("Error:")
-        return DelegateWait.call(child_id, peers: peers, timeout: timeout) if wait
+
+        note = warning ? "Warning: #{warning}\n" : ""
+        return note + DelegateWait.call(child_id, peers: peers, timeout: timeout) if wait
 
         started = session.to_s.strip.empty? ? "Started a delegate session" : "Sent the follow-up to delegate #{child_id[0, 8]}"
-        "session: #{child_id}\nstatus: running\n#{started}; delegate_result waits for its reply. " \
+        "#{note}session: #{child_id}\nstatus: running\n#{started}; delegate_result waits for its reply. " \
           "It shows in chi sessions list and the web as a child of this session; the user can attach to it."
       rescue ArgumentError => e
         "Error: #{e.message}"
@@ -84,7 +86,7 @@ module Samagotchi
                                              model_name: child_model(model, parent), memories: CHILD_MEMORIES,
                                              parent_id: parent.id, state_dir: state_dir)
         DelegateWait.mark_started(parent.id, child)
-        child.id
+        [child.id, child.model_warning]
       end
       private_class_method :start_child
 
@@ -118,8 +120,10 @@ module Samagotchi
       private_class_method :follow_up
 
       # The model as typed (spawn_session stores its resolved ref), else the
-      # parent's. No existence check: an unknown model fails the child's
-      # first turn.
+      # parent's. No existence check here: spawn_session checks the host
+      # (check_host!, its UnknownHost comes back as this tool's Error: line)
+      # and warns about an id the host's saved model list doesn't have
+      # (ModelProfile.model_warning, added to this tool's result).
       def self.child_model(model, parent)
         return parent.model_name if model.to_s.strip.empty?
 

data/lib/samagotchi/tools/execute.rb

@@ -21,6 +21,8 @@ module Samagotchi
       STOP_POLL_INTERVAL_SEC = 0.05
       WAIT_SLICE_SEC = 0.2
       NOT_RUN_ON_STOP = "Error: not run, the user stopped the turn"
+      # The first words of a command the user's Stop killed.
+      STOPPED_BY_USER = "Error: command stopped by the user"
       TIMEOUT_HINT = "(killed at the limit; for a long command use task_create, then task_wait)"
       # How long the output may stay open once the shell has exited: a
       # `server &` child keeps the pipes, and the read would never end.
@@ -67,7 +69,7 @@ module Samagotchi
         # a long command, and return whatever it printed before it was killed.
         stopped_result("Error: command timed out after #{timeout_sec}s\n#{TIMEOUT_HINT}", e)
       rescue CommandCancelled => e
-        stopped_result("Error: command stopped by the user after #{e.elapsed.round}s (killed; rerun it if still needed)", e)
+        stopped_result("#{STOPPED_BY_USER} after #{e.elapsed.round}s (killed; rerun it if still needed)", e)
       rescue StandardError => e
         "Error: #{e.message}"
       end

data/lib/samagotchi/version.rb

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

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

@@ -10,7 +10,8 @@ export const ROW_STATUS = Object.freeze({
   RUNNING: "running",
   OK: "ok",
   ERROR: "error",
-  // A task_wait the user's Stop ended (the task itself runs on).
+  // A call the user's Stop cut: a task_wait (the task itself runs on), a
+  // killed or never-started command. Not a failure.
   STOPPED: "stopped",
   // A call a guardrail denied (a hook, the guardrails bundle, a parent's
   // or the user's Deny): it never ran, and it isn't a failed call either.

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

@@ -43,7 +43,7 @@ import { applySessionEvent, heldOrder, listedSessions, sortedByUpdated, stoppedB
 import { createNotifications } from "./notifications.js";
 import { restartConfirmText, versionNotice, workerBadge } from "./update_notice.js";
 import {
-  appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, mergeTiming, normalizeTiming, turnTimingText,
+  appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, mergeTiming, normalizeTiming, STOPPED_LINE_CLASS, 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, steerCutLine, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
@@ -960,9 +960,11 @@ function appendChunk(text) {
   if (follow) historyEl.scrollTop = historyEl.scrollHeight;
 }
 
-function addEndBubble(text) {
+// +stopped+: a stop someone chose (a cancel, the session's stop), drawn in
+// the stopped style (timing.js STOPPED_LINE_CLASS); else a failure's line.
+function addEndBubble(text, { stopped = false } = {}) {
   const div = document.createElement("div");
-  div.className = "bubble cancel";
+  div.className = stopped ? STOPPED_LINE_CLASS : "bubble cancel";
   div.textContent = text;
   appendToHistory(div);
   if (!turnDom.holds?.()) historyEl.scrollTop = historyEl.scrollHeight;
@@ -980,7 +982,7 @@ function emptyAnswerEl(emptyAnswer) {
 // Everything a turn's end (completed, canceled, failed) closes: then its
 // end line (+endText+, the cancel or failed line), then the step cards that
 // left the collapsed block (card.js leavesBlock), where a reload puts them.
-function endTurnView(kind, endText = null, { emptyAnswer = null } = {}) {
+function endTurnView(kind, endText = null, { emptyAnswer = null, stopped = false } = {}) {
   setTurnRunning(false);
   // Every ended turn has a record (completed, canceled, failed); a worker
   // gone mid-turn is re-rendered (resync), which counts again.
@@ -991,7 +993,7 @@ function endTurnView(kind, endText = null, { emptyAnswer = null } = {}) {
   const kept = turnDom.turnEnded({ kind, endNote, emptyAnswer: !!emptyAnswer }) || [];
   if (endNote && !endNote.isConnected) appendToHistory(endNote);
   finishLiveTurnTiming(null, { canceled: kind === "canceled" });
-  if (endText) addEndBubble(endText);
+  if (endText) addEndBubble(endText, { stopped });
   if (kept.length) {
     kept.forEach((el) => appendToHistory(el));
     if (!turnDom.holds?.()) historyEl.scrollTop = historyEl.scrollHeight;
@@ -1653,7 +1655,7 @@ function workerGone(id, { opened = true } = {}) {
   const stopped = stoppingId === id;
   const endText = workerGoneText({ turnRunning, stopped });
   if (endText) {
-    endTurnView("gone", endText);
+    endTurnView("gone", endText, { stopped });
     if (!stopped) setLiveStatus("idle");
   }
   if (current.owner === "worker") current.owner = null;
@@ -1770,7 +1772,7 @@ const streamHandlers = {
     }
   },
   turn_canceled: (data) => {
-    endTurnView("canceled", cancelLineText(data.cancellation_reason || "", data.cancelled_by));
+    endTurnView("canceled", cancelLineText(data.cancellation_reason || "", data.cancelled_by), { stopped: true });
     setLiveStatus("idle");
     refreshTimingFromSession();
   },

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

@@ -82,6 +82,24 @@ export function stepTextHtml(text) {
   return out + escapeHtml(String(text).slice(at));
 }
 
+function heredocLabel({ tag, lines }) {
+  return `${tag} · ${Number(lines)} ${lines === 1 ? "line" : "lines"}`;
+}
+
+// A step's heredoc chip: the first heredoc's tag and size, and "+N" for
+// the others when the step has more (CommandSteps' heredocs:, as gh api
+// -f body="$(cat <<EOF …)" -f title="$(cat <<EOF …)"), as a title with
+// more steps reads "+N"; the hover lists them all. "" without one.
+export function heredocChip(step) {
+  if (!step?.heredoc) return "";
+  const all = Array.isArray(step.heredocs) && step.heredocs.length > 1 ? step.heredocs : [step.heredoc];
+  const more = all.length > 1 ? ` +${all.length - 1}` : "";
+  const title = all.length > 1
+    ? `${all.length} heredocs: ${all.map(heredocLabel).join(", ")}; their text in the raw command`
+    : "a heredoc: its text in the raw command";
+  return `<span class="step-chip heredoc" title="${escapeHtml(title)}">${escapeHtml(heredocLabel(all[0]))}${more}</span>`;
+}
+
 // 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).
@@ -89,11 +107,7 @@ 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 `${label}<li class="activity-step">${opHtml(step.op)}<span class="step-body"><code>${stepTextHtml(step.text)}</code>${limit}${heredocChip(step)}</span></li>`;
   });
   return `<ol class="activity-steps">${items.join("")}</ol>`;
 }

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

@@ -122,6 +122,8 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .bubble.user blockquote:last-child{margin-bottom:0}
 .bubble.tool{border-left:3px solid var(--ok);background:var(--bg-panel);font-size:13px;color:var(--text-2)}
 .bubble.cancel{border-left:3px solid var(--danger);background:color-mix(in srgb,var(--danger) 8%,var(--bg-panel));color:var(--danger-text);font-size:13px}
+/* A stop someone chose (a cancel, the session's stop): the ■ STOPPED rows' colours, not an error's. */
+.bubble.cancel.stopped{border-left-color:var(--warn);background:color-mix(in srgb,var(--warn) 8%,var(--bg-panel));color:var(--warn-text)}
 .bubble.recap{border-left:3px solid var(--think-text);background:color-mix(in srgb,var(--think) 6%,var(--bg-panel));font-size:13px}
 .bubble.recap summary{cursor:pointer;color:var(--think-text);font-size:12px}
 .bubble.recap .recap-body{white-space:pre-wrap;margin-top:6px}
@@ -236,6 +238,8 @@ button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:non
 .gen>summary::-webkit-details-marker{display:none}
 .gen>summary::before{content:"▸ ";color:var(--text-faint)}
 .gen[open]>summary::before{content:"▾ "}
+/* Open, a step whose label starts with its body's first words (turn_view.js labelParts) says only its calls. */
+.gen[open]>summary.repeats>:is(.gen-head,.gen-sep){display:none}
 /* A step with a failed call (status error): its chevron in the danger colour. */
 .gen.has-failed>summary::before{color:var(--danger)}
 .gen.live{border-top-color:transparent;background:var(--accent-tint);border-radius:8px;padding:6px 9px 8px calc(9px + var(--step-indent));margin-left:-9px;margin-right:-9px}
@@ -545,6 +549,7 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 .turn-stage[data-phase="no answer"] .ts-mark,.turn-stage[data-phase="no answer"] .ts-phase{color:var(--text-muted)}
 .turn-stage[data-phase="waiting for you"] .ts-mark{background:var(--warn)}
 .ts-phase{color:var(--accent);font-weight:600}
+.ts-step:empty{display:none}
 .ts-timing{min-width:0;overflow:hidden;text-overflow:ellipsis}
 .ts-timing .turn-timing{margin:0;font-size:12px;color:var(--text-muted);display:inline}
 .ts-mini{min-width:0;overflow:hidden;text-overflow:ellipsis;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--text-2)}
@@ -579,14 +584,13 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 .ts-spin{flex:none;width:11px;height:11px;border:2px solid var(--warn);border-right-color:transparent;border-radius:50%;animation:init-spin .8s linear infinite}
 .ts-idle{flex:none;width:11px;height:11px;border:2px solid var(--border-strong);border-radius:50%}
 .ts-tool{flex:none;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;font-weight:600;color:var(--accent)}
-.ts-tool.exec{color:var(--think-text)}
-.ts-tool.edit{color:var(--ok-text)}
 .ts-title{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;color:var(--text-2)}
 .ts-title.quiet{font-family:inherit;font-style:italic;color:var(--text-faint)}
 .ts-trail{height:18px;display:flex;gap:10px;overflow:hidden;font-size:12px;line-height:18px;color:var(--text-faint);white-space:nowrap}
 .ts-trail-item{flex:none;max-width:36ch;overflow:hidden;text-overflow:ellipsis}
-.ts-trail-item.error{color:var(--danger-text)}
+.ts-trail-item:is(.error,.blocked){color:var(--danger-text)}
 .ts-trail-item.warn{color:var(--warn-text)}
+.ts-trail-item.stopped{color:var(--warn-text);opacity:.8}
 .ts-trail-item.info,.ts-trail-item.steer{color:var(--accent)}
 .ts-trail-item.none{font-style:italic}
 /* A card waits: the tool row and trail give it their room. */
@@ -617,10 +621,14 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
 .ts-ticks{display:flex;flex-wrap:nowrap;justify-content:flex-end;overflow:hidden;gap:2px;flex:0 1 auto;min-width:0}
 .ts-tick{flex:none}
 .ts-tick{width:5px;height:12px;border-radius:1.5px;background:var(--text-faint);opacity:.55;cursor:pointer}
-.ts-tick.exec{background:var(--think);opacity:.85}
-.ts-tick.edit{background:var(--ok);opacity:.85}
-.ts-tick.other{background:var(--accent);opacity:.7}
+/* exec and edit are the rows' tool blue (purple is thinking's, green a done ✓'s); other a quieter blue-grey. */
+.ts-tick:is(.exec,.edit){background:var(--accent);opacity:.85}
+.ts-tick.other{background:var(--narr);opacity:.7}
 .ts-tick.error{background:var(--danger);opacity:1}
+/* A call a guardrail blocked: its ✕ BLOCKED row's red. */
+.ts-tick.blocked{background:var(--danger-text);opacity:1}
+/* A call the user's Stop cut: the ■ STOPPED rows' amber, still (running blinks). */
+.ts-tick.stopped{background:var(--warn-text);opacity:.8}
 .ts-tick.running{background:var(--warn);opacity:1;animation:ts-blink 1s ease-in-out infinite}
 @keyframes ts-blink{50%{opacity:.35}}
 .ts-cloud-body{max-height:calc(var(--stage-max,60vh) * .62);overflow:auto;scrollbar-width:thin;border-left:1px solid var(--border);margin-left:6px;padding-left:10px}

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

@@ -76,6 +76,20 @@ export function toolKind(name) {
   return "other";
 }
 
+// A finished call's mark in the trail, as its row's (index.html
+// .activity-status): error and blocked ✕, stopped (a Stop cut it) ■, else ✓.
+export function trailMark(status) {
+  if (status === "error" || status === "blocked") return "\u2715";
+  if (status === "stopped") return "\u25A0";
+  return "\u2713";
+}
+
+// A finished call's tone in the trail, its class as its row's colour:
+// error and blocked (a guardrail's deny) red, stopped amber, else none.
+export function trailTone(status) {
+  return status === "error" || status === "blocked" || status === "stopped" ? status : "";
+}
+
 function rowTitle(row) {
   return row.title || row.params || "";
 }
@@ -116,6 +130,9 @@ const NO_ANSWER = "no answer";
 //            else "…";
 //   tool     the running call ({name, title, kind}, and command: its full
 //            command when it has one; taskId and key: a task_wait's) or null;
+//   quiet    the now row's word while no call runs: "writing…" while the
+//            step's text streams, else "thinking…"; "" once the turn has
+//            ended (nothing happens now);
 //   trail    the last three finished calls, newest last (a file's title
 //            without its dir; command as for tool);
 //   ticks    one per call: {kind, status, step (the gen's index)}.
@@ -146,6 +163,7 @@ export function liveSlots(turn, { narration = "", thinking = "", pending = false
     phase,
     step: ended ? gens.filter((g) => !g.answer || g.thinking || g.tools.length).length : gens.length,
     headline,
+    quiet: ended ? "" : current?.text && !current.textDone ? "writing…" : "thinking…",
     tool: running ? withTask(withCommand({ name: toolName(running), title: rowTitle(running), kind: toolKind(running.tool) }, running), running) : null,
     trail,
     ticks: rows.map(({ row, step }) => ({ kind: toolKind(row.tool), status: row.status, step })),

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

@@ -11,7 +11,7 @@
 // reload. Slots are patched in place, never rebuilt from HTML: a selection
 // and annotate survive. The rules are pure in stage_model.js.
 import { createTurnView } from "./turn_view.js";
-import { flashOf, handOffDue, handOffOrder, headlineOf, inUseFrom, isPlain, liveSlots, placeFor } from "./stage_model.js";
+import { flashOf, handOffDue, handOffOrder, headlineOf, inUseFrom, isPlain, liveSlots, placeFor, trailMark, trailTone } from "./stage_model.js";
 import { formatDuration } from "./timing.js";
 import { taskCommand, taskStopButton } from "./task_stop.js";
 
@@ -189,20 +189,26 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     stage.dataset.phase = slots.phase;
     mark.textContent = MARKS[slots.phase] || "";
     phaseEl.textContent = slots.phase;
-    stepEl.textContent = endKind ? `${slots.step} step${slots.step === 1 ? "" : "s"}` : `step ${slots.step}`;
+    const steps = `${slots.step} step${slots.step === 1 ? "" : "s"}`;
 
     drawHeadline(slots.headline);
-    drawNow(slots.tool, gen);
+    drawNow(slots.tool, slots.quiet);
     drawTrail(slots.trail);
     drawTicks(slots.ticks);
     const calls = slots.ticks.length;
-    const elapsed = endKind ? formatDuration(endedAt - startedAt) : "";
-    chipLabel.textContent = `${slots.step} step${slots.step === 1 ? "" : "s"} · ${calls} tool call${calls === 1 ? "" : "s"}${elapsed ? ` · ${elapsed}` : ""}`;
+    // An ended turn says each thing once: its steps in the chip (the label
+    // of what the cloud holds), its time in the status row's timing line
+    // (the one that moves into the history). The chip keeps the time when
+    // that line is elsewhere (a turn the stage didn't hold from its start).
+    const elapsed = endKind && !timingSlot.firstChild ? formatDuration(endedAt - startedAt) : "";
+    chipLabel.textContent = `${steps} · ${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;
+    // Running: the step it is on. Ended: the count, unless the chip says it.
+    stepEl.textContent = !endKind ? `step ${slots.step}` : cloud.hidden ? steps : "";
     promptSlot.hidden = !promptSlot.firstChild;
     extras.hidden = !extras.firstChild;
     answer.hidden = !answer.firstChild;
@@ -225,8 +231,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     headline.classList.add("fresh");
   }
 
-  function drawNow(tool, gen) {
-    const quiet = gen?.text && !gen.textDone ? "writing…" : "thinking…";
+  function drawNow(tool, quiet) {
     // A task_wait's stop button, as the row's (task_stop.js): in the key
     // with its in-flight state, so a redraw keeps a clicked one disabled.
     const stopId = tool?.taskId && taskStop?.target({ tool: "task_wait", status: "running", view: { task_id: tool.taskId } });
@@ -248,7 +253,7 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
         const command = () => taskCommand(view.current().turn?.gens, stopId);
         now.appendChild(taskStopButton(taskStop, stopId, { command, onChange: scheduleRefresh }));
       }
-    } else {
+    } else if (quiet) {
       const word = node("span", "ts-title quiet", now);
       word.textContent = quiet;
     }
@@ -262,9 +267,9 @@ export function createStageView({ historyEl, appendToHistory, isNearBottom: hist
     trail.replaceChildren();
     if (flashing) node("span", `ts-trail-item ${flashing.kind}`, trail).textContent = `${FLASH_MARKS[flashing.kind]} ${flashing.text}`;
     for (const item of items) {
-      const failed = item.status === "error";
-      const el = node("span", `ts-trail-item${failed ? " error" : ""}`, trail);
-      el.textContent = `${failed ? "✕" : "✓"} ${item.name} ${item.title}`.trim();
+      const tone = trailTone(item.status);
+      const el = node("span", `ts-trail-item${tone ? ` ${tone}` : ""}`, trail);
+      el.textContent = `${trailMark(item.status)} ${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/task_stop.js

@@ -19,17 +19,26 @@ export function stopTarget(row, features) {
   return row.view?.task_id || null;
 }
 
+// A task_wait row's title without its wait ("npm test · up to 600s").
+const WAIT_SUFFIX = / · up to \d+s$/;
+
 // The command a task_create of this turn started +taskId+ with (its row's
-// view), or null: a task from an earlier turn has no row here.
+// view), else a task_wait row's title for it (the server titles one by its
+// task's command, also for a task from an earlier turn: ToolActivity.
+// task_title), or null.
 export function taskCommand(gens, taskId) {
+  let titled = null;
   for (const gen of gens || []) {
     for (const row of gen.tools || []) {
+      if (row.tool === "task_wait" && row.view?.task_id === taskId && row.title) {
+        titled ||= row.title.replace(WAIT_SUFFIX, "");
+      }
       if (row.tool !== "task_create") continue;
       const id = /(?:^|\n)task_id: (\S+)/.exec(row.output || "")?.[1];
       if (id === taskId) return row.view?.command || null;
     }
   }
-  return null;
+  return titled;
 }
 
 export function confirmText(taskId, command) {

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

@@ -24,20 +24,25 @@ export function turnTimingText(number, durationMs, { running = false, canceled =
 // CANCEL_REASONS); anything else as it is. Both sides: spec/shared/labels_matrix.json.
 const CANCEL_REASONS = { ctrl_c: "Ctrl-C", user: "stopped", hook: "by a hook" };
 
-// The line a canceled turn ends with: "✕ canceled (stopped)", live from
+// 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). A
-// hook's stop that names who (+by+, cancelled_by): "✕ stopped by loop-guard".
+// hook's stop that names who (+by+, cancelled_by): "■ stopped by loop-guard".
+// Every cancel is a stop someone chose (the user, Ctrl-C, a hook), not a
+// failure: the ■ mark and the stopped colours of a call the Stop cut
+// (STOPPED_LINE_CLASS), not the ✕ of an error.
+export const STOP_MARK = "\u25A0";
+export const STOPPED_LINE_CLASS = "bubble cancel stopped";
 export function cancelLineText(reason, by) {
-  if (reason === "hook" && by) return `\u2715 stopped by ${by}`;
-  return "\u2715 canceled" + (reason ? ` (${CANCEL_REASONS[reason] || reason})` : "");
+  if (reason === "hook" && by) return `${STOP_MARK} stopped by ${by}`;
+  return `${STOP_MARK} canceled` + (reason ? ` (${CANCEL_REASONS[reason] || reason})` : "");
 }
 
-// A re-rendered turn's cancel line (a .bubble.cancel), or "" when the turn
-// record is not a canceled one.
+// A re-rendered turn's cancel line (a .bubble.cancel.stopped), or "" when
+// the turn 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, record.cancelled_by))}</div>`;
+  return `<div class="${STOPPED_LINE_CLASS}">${escape(cancelLineText(record.cancellation_reason, record.cancelled_by))}</div>`;
 }
 
 export function elapsedSince(startedAt, now = Date.now()) {