samagotchi 0.28.0 → 0.30.0

data/lib/samagotchi/tools/builtins.rb

@@ -117,13 +117,16 @@ module Samagotchi
         peers = kctx.peers
         id = peers.respond_to?(:session_id) ? peers.session_id.to_s : ""
         model = peers.respond_to?(:model_ref) ? peers.model_ref.to_s : ""
-        vars = { Guardrails::ParentApprovals::PARENT_SESSION_ENV => id.empty? ? "chi" : id,
-                 SESSION_MODEL_ENV => model.empty? ? nil : model }
-        if env[ModelProfile::MODEL_FROM_CLI_ENV]
-          vars[ModelProfile::MODEL_ENV] = nil
-          vars[ModelProfile::MODEL_FROM_CLI_ENV] = nil
-        end
-        vars
+        { Guardrails::ParentApprovals::PARENT_SESSION_ENV => id.empty? ? "chi" : id,
+          SESSION_MODEL_ENV => model.empty? ? nil : model }.merge(cli_model_unset(env))
+      end
+
+      # The unsets that keep a `chi --model X` worker's default from passing
+      # for the default of a chi run here (nothing when it wasn't the CLI's).
+      def cli_model_unset(env = ENV)
+        return {} unless env[ModelProfile::MODEL_FROM_CLI_ENV]
+
+        { ModelProfile::MODEL_ENV => nil, ModelProfile::MODEL_FROM_CLI_ENV => nil }
       end
 
       SESSION_MODEL_ENV = "SAMAGOTCHI_SESSION_MODEL"

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/tools/task_runtime.rb

@@ -129,6 +129,27 @@ module Samagotchi
         end.uniq
       end
 
+      # A task id as task_create makes them: no path parts.
+      TASK_ID = /\A[A-Za-z0-9_-]+\z/
+
+      # The command of the task +task_id+ under +root+ (a session's working
+      # directory) as its record has it, for a UI row's title; nil for no
+      # such task or an unreadable record. Reads the record only (no
+      # refresh), so it is cheap and never fails.
+      # @return [String, nil]
+      def command_of(task_id, root: Dir.pwd)
+        id = task_id.to_s.strip
+        return nil unless id.match?(TASK_ID)
+
+        path = File.join(root || Dir.pwd, TASKS_DIR, id, METADATA_FILENAME)
+        return nil unless File.file?(path)
+
+        command = JSON.parse(File.read(path))["command"]
+        command.is_a?(String) && !command.strip.empty? ? command : nil
+      rescue StandardError
+        nil
+      end
+
       def stopped_by_user?(record) = record["stop_reason"] == "stopped_by_user"
 
       def get_record(task_id)

data/lib/samagotchi/turn_note.rb

@@ -188,6 +188,16 @@ module Samagotchi
       list
     end
 
+    # A copy of +messages+ without the note at its tail when that note is a
+    # retry nudge (anything else stays: an earlier turn's note is what says
+    # why that turn ended).
+    def without_trailing_nudge(messages)
+      list = Array(messages).dup
+      index = trailing_index(list)
+      list.delete_at(index) if index && retry_nudge?(list[index])
+      list
+    end
+
     # The index of the note at the tail of +list+ (behind context notes at
     # most), or nil.
     def trailing_index(list)

data/lib/samagotchi/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.28.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

@@ -39,11 +39,11 @@ import { ALL_SESSIONS_HASH, sessionHash, sessionIdFromHash } from "./route.js";
 import { allScopeHref, cardFolder, projectScopeHref, scopeDir } from "./scope.js";
 import { shouldFollowScroll, keepFollowing } from "./scroll.js";
 import { SHORT_WINDOW_QUERY, stripAutoHidden, stripColumns, stripShowParts } from "./strip.js";
-import { applySessionEvent, heldOrder, listedSessions, sortedByUpdated, waitingBadge, waitingFirst, waitingSearchText, withChildrenAfterParents } from "./sessions_list.js";
+import { applySessionEvent, heldOrder, listedSessions, sortedByUpdated, stoppedBadge, waitingBadge, waitingFirst, waitingSearchText, withChildrenAfterParents } from "./sessions_list.js";
 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";
@@ -328,8 +328,12 @@ function cardHtml(s, { deletable = false } = {}) {
   const ctxHtml = ctx ? `<span class="ctx" title="${escapeHtml(tokensTipText(s.tokens))}">${escapeHtml(ctx)}</span>` : "";
   const waiting = waitingBadge(s);
   const waitingHtml = waiting ? `<span class="attn attn-${waiting.kind}" title="${escapeHtml(waiting.title)}">${escapeHtml(waiting.text)}</span>` : "";
+  // A turn a hook stopped wears its own badge, unless the session waits on
+  // the user (the waiting badge wins: the stop is behind the need).
+  const stopped = waiting ? null : stoppedBadge(s);
+  const stoppedHtml = stopped ? `<span class="stopped-badge" title="${escapeHtml(stopped.title)}">${escapeHtml(stopped.text)}</span>` : "";
   const dotWord = waiting ? waiting.title : s.status;
-  return `<div class="card${s.archived ? " archived" : ""}${waiting ? " waiting" : ""}" data-id="${s.id}" title="${escapeHtml(tip)}${memTitle ? ` · ${escapeHtml(memTitle)}` : ""}"><div class="preview">${preview}</div>${s.recap ? `<div class="recap" title="${escapeHtml(s.recap)}">${escapeHtml(s.recap)}</div>` : ""}<div class="meta"><span class="status dot ${escapeHtml(s.status)}${waiting ? " waiting" : ""}" title="${escapeHtml(dotWord)}" aria-label="${escapeHtml(dotWord)}"></span>${waitingHtml}${timeHtml}${ctxHtml}${folderHtml}${parentChipHtml(s)}${ownerBadgeHtml(s)}${archivedHtml}${s.used_memory_names && s.used_memory_names.length ? `<span title="${escapeHtml(s.used_memory_names.join(", "))}">mem ${s.used_memory_names.length}</span>` : ""}</div>${deletable ? `<button type="button" class="card-del" data-del="${escapeHtml(s.id)}" title="Delete session" aria-label="Delete session ${escapeHtml(s.short_id)}">\u2715</button>` : ""}</div>`;
+  return `<div class="card${s.archived ? " archived" : ""}${waiting ? " waiting" : ""}" data-id="${s.id}" title="${escapeHtml(tip)}${memTitle ? ` · ${escapeHtml(memTitle)}` : ""}"><div class="preview">${preview}</div>${s.recap ? `<div class="recap" title="${escapeHtml(s.recap)}">${escapeHtml(s.recap)}</div>` : ""}<div class="meta"><span class="status dot ${escapeHtml(s.status)}${waiting ? " waiting" : ""}" title="${escapeHtml(dotWord)}" aria-label="${escapeHtml(dotWord)}"></span>${waitingHtml}${stoppedHtml}${timeHtml}${ctxHtml}${folderHtml}${parentChipHtml(s)}${ownerBadgeHtml(s)}${archivedHtml}${s.used_memory_names && s.used_memory_names.length ? `<span title="${escapeHtml(s.used_memory_names.join(", "))}">mem ${s.used_memory_names.length}</span>` : ""}</div>${deletable ? `<button type="button" class="card-del" data-del="${escapeHtml(s.id)}" title="Delete session" aria-label="Delete session ${escapeHtml(s.short_id)}">\u2715</button>` : ""}</div>`;
 }
 
 // A delegated session's `↳ <parent>` chip; the parent's preview is the tooltip.
@@ -956,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;
@@ -976,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.
@@ -987,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;
@@ -1483,6 +1489,10 @@ function clearTimingInterval() {
 }
 
 let liveTurnNumber = null;
+// The live line sits in the stage's status row, which already says the turn
+// runs ("running a tool"): it drops its own "running" there. It never moves
+// mid-turn (finishLiveTurnTiming rewrites it before any hand-off).
+let liveTurnTimingInStage = false;
 
 function startLiveTurnTiming(startedAt = new Date().toISOString(), turnId = null) {
   clearTimingInterval();
@@ -1495,7 +1505,9 @@ function startLiveTurnTiming(startedAt = new Date().toISOString(), turnId = null
   liveTurnTimingEl.className = "turn-timing live";
   // The stage's status row while it holds the turn: the line moves into the
   // history with it.
-  (turnDom.timingHost?.() || historyEl).appendChild(liveTurnTimingEl);
+  const stageHost = turnDom.timingHost?.() || null;
+  liveTurnTimingInStage = !!stageHost;
+  (stageHost || historyEl).appendChild(liveTurnTimingEl);
   updateLiveTiming();
   timingInterval = setInterval(updateLiveTiming, 1000);
 }
@@ -1509,7 +1521,7 @@ function appendToHistory(el) {
 function updateLiveTiming() {
   const duration = elapsedSince(current.timing.activeTurn?.started_at);
   if (liveTurnTimingEl && duration !== null) {
-    liveTurnTimingEl.textContent = turnTimingText(liveTurnNumber, duration, { running: true }) + (liveTurnNote ? ` · ${liveTurnNote}` : "");
+    liveTurnTimingEl.textContent = turnTimingText(liveTurnNumber, duration, { running: !liveTurnTimingInStage }) + (liveTurnNote ? ` · ${liveTurnNote}` : "");
   }
   updateInfoBar();
 }
@@ -1643,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;
@@ -1760,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,45 +122,57 @@ 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}
 .bubble.recap.stale{opacity:.7;border-left-style:dashed}
 .activity-body{margin-top:6px}
-.activity-row{display:flex;gap:8px;align-items:baseline;font-size:13px;color:var(--text-2);padding:5px 2px;border-top:1px solid var(--border)}
+.activity-row{--row-gutter:22px;display:flex;gap:8px;align-items:baseline;font-size:13px;color:var(--text-2);padding:5px 2px;border-top:1px solid var(--border)}
 .activity-row:first-child{border-top:none}
-.activity-status{font-size:11px;min-width:52px;text-transform:uppercase;letter-spacing:.03em;font-weight:600}
-.activity-status.running{color:var(--warn)}
-.activity-status.ok{color:var(--ok)}
-.activity-status.error{color:var(--danger)}
-.activity-status.stopped{color:var(--warn-text);opacity:.8}
-.activity-status.blocked{color:var(--danger-text)}
+/* A row's status is a mark in a 14 px slot, drawn from its class (no text: a copy or an annotate quote gets
+   no glyph; the word is its aria-label and title). The glyphs the stage already uses: done ✓, error and
+   blocked ✕, stopped ■, running its border spinner (still once the turn is over: a dead worker's row).
+   An exception also shows its word after the title (.activity-state). */
+.activity-status{width:14px;text-align:center;font-size:12px;font-weight:700}
+.activity-status.ok::before{content:"\2713";opacity:.85}
+.activity-status.error::before,.activity-status.blocked::before{content:"\2715"}
+.activity-status.stopped::before{content:"\25A0";font-size:10px}
+.activity-status.running::before{content:"";display:inline-block;box-sizing:border-box;width:10px;height:10px;vertical-align:-1px;border:1.5px solid currentColor;border-right-color:transparent;border-radius:50%}
+.turn-work:not(.done) .activity-status.running::before{animation:init-spin .8s linear infinite}
+.activity-state{flex:none;white-space:nowrap;font-size:11px;text-transform:uppercase;letter-spacing:.03em;font-weight:600}
+:is(.activity-status,.activity-state).running{color:var(--warn)}
+:is(.activity-status,.activity-state).ok{color:var(--ok)}
+:is(.activity-status,.activity-state).error{color:var(--danger)}
+:is(.activity-status,.activity-state).stopped{color:var(--warn-text);opacity:.8}
+:is(.activity-status,.activity-state).blocked{color:var(--danger-text)}
 .activity-tool{color:var(--accent);font-weight:600}
 /* The stop-task button on a running task_wait (task_stop.js): a small ghost
    button in the danger colours, at the row's end and in the stage's now slot. */
 button.task-stop{flex:none;margin-left:auto;padding:1px 8px;border:1px solid color-mix(in srgb,var(--danger) 45%,transparent);border-radius:6px;background:transparent;color:var(--danger-text);font-size:11.5px;line-height:18px;white-space:nowrap}
 button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:none}
 .ts-now button.task-stop{align-self:center}
-.activity-params{color:var(--text-muted);word-break:break-all}
+.activity-params{color:var(--text-muted);overflow-wrap:anywhere}
 .activity-duration{color:var(--text-faint);font-size:11px;font-variant-numeric:tabular-nums;white-space:nowrap}
-.activity-output{margin:4px 0 2px 60px;font-size:12px;color:var(--text-muted);white-space:pre-wrap;word-break:break-word;background:var(--bg);border-radius:6px;padding:6px 8px;max-height:160px;overflow:auto}
+.activity-output{margin:4px 0 2px var(--row-gutter);font-size:12px;color:var(--text-muted);white-space:pre-wrap;word-break:break-word;background:var(--bg);border-radius:6px;padding:6px 8px;max-height:160px;overflow:auto}
 /* A row's status and tool name never wrap (a phone broke them letter by
    letter); the params take what is left. The output goes on its own line
    under the call instead of a column beside it: on a desktop it lines up
-   under the tool name (the status is 52 px + the 8 px gap), on a phone it
-   takes the full width and the params break inside the rest of the first
-   line rather than drop to a line of their own. */
+   under the tool name (--row-gutter: the 14 px mark slot + the 8 px gap), on
+   a phone it takes the full width and the params break inside the rest of
+   the first line rather than drop to a line of their own. */
 .activity-row{flex-wrap:wrap}
 .activity-status,.activity-tool{flex-shrink:0;white-space:nowrap}
 .activity-params{min-width:0}
 .activity-output{flex:1 1 100%;min-width:0}
 /* An edit/write's change: a closed "diff +3 −1" under the output, lined up with it. */
-.activity-diff{flex:1 1 100%;min-width:0;margin:2px 0 2px 60px}
+.activity-diff{flex:1 1 100%;min-width:0;margin:2px 0 2px var(--row-gutter)}
 .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-row>.activity-command{flex:1 1 100%;min-width:0;margin:4px 0 2px var(--row-gutter)}
 .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}
@@ -218,12 +230,19 @@ button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:non
 .turn-work:not([open]){padding:3px 10px;background:transparent;border-color:transparent;border-left-color:var(--accent);align-self:flex-start;border-radius:6px;transition:background .12s ease}
 .turn-work:not([open]):hover{background:var(--bg-panel)}
 .turn-work:not([open])>summary{font-size:12px;font-weight:500}
-.gen{margin-top:8px;padding-top:6px;border-top:1px solid var(--border)}
-.gen>summary{cursor:pointer;color:var(--text-muted);font-size:12px;font-weight:500;user-select:none;list-style:none;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+/* A step's body (thinking, narration, rows, cards) sits --step-indent right of its summary, so the thinking
+   chevron and the row marks share one column under the step's own chevron. The summary takes it back with a
+   negative margin: a child's own margin shorthand can't undo the padding. */
+.gen{--step-indent:14px;margin-top:8px;padding-top:6px;padding-left:var(--step-indent);border-top:1px solid var(--border)}
+.gen>summary{margin-left:calc(-1 * var(--step-indent));cursor:pointer;color:var(--text-muted);font-size:12px;font-weight:500;user-select:none;list-style:none;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .gen>summary::-webkit-details-marker{display:none}
 .gen>summary::before{content:"▸ ";color:var(--text-faint)}
 .gen[open]>summary::before{content:"▾ "}
-.gen.live{border-top-color:transparent;background:var(--accent-tint);border-radius:8px;padding:6px 9px 8px;margin-left:-9px;margin-right:-9px}
+/* 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}
 .gen.live>summary{color:var(--accent);white-space:normal}
 /* The live step's marker: a pulsing accent dot in place of the chevron (the block's own left bar stays the only one). */
 .gen.live>summary::before{content:"";display:inline-block;width:7px;height:7px;margin:0 8px 1px 2px;border-radius:50%;background:var(--accent);vertical-align:middle;animation:step-pulse 1.6s ease-in-out infinite}
@@ -256,6 +275,7 @@ button.task-stop:hover:not(:disabled){background:var(--danger-bg-dim);filter:non
 .turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body))>summary,.turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body)) .gen>summary{display:none}
 .turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body)) .gen{margin:0;padding:0;border:0;background:transparent}
 .turn-work:not(:has(.gen~.gen,.thinking-body,.activity-body)) .gen-text{margin:0;background:var(--bg-panel);border:1px solid var(--border);border-left:3px solid var(--accent);border-radius:12px;padding:12px 14px;opacity:.95}
+@media(max-width:600px){.gen{--step-indent:8px}}
 /* A question card asks for input like the composer card, so it wears the same glass (the recipe above); only its warm tint is its own. */
 .bubble.question{border-left:3px solid var(--warn);background:color-mix(in srgb,var(--warn) 7%,var(--glass-bg));padding:10px 12px}
 /* Collapsed (resolved) question: one line, like the thinking and activity blocks.
@@ -432,7 +452,8 @@ body.has-session #history{padding-bottom:calc(var(--dock-h,160px) + 32px)}
 .chip .chip-remove{background:transparent;color:var(--text-3);padding:0 6px;min-height:0;font-size:14px}
 .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%}
+.activity-row .thumbs{flex-basis:100%;margin-left:var(--row-gutter)}
+@media(max-width:600px){.activity-row .thumbs{margin-left:0}}
 #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}
@@ -528,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)}
@@ -562,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. */
@@ -600,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}
@@ -617,7 +642,7 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
   .ts-defer{display:none}
   .ts-trail-item{max-width:24ch}
 }
-@media (prefers-reduced-motion:reduce){.turn-stage.enter,.ts-arrive,.ts-headline.fresh,.ts-tick.running,.ts-mark{animation:none}.turn-stage.leaving{transition:none}}
+@media (prefers-reduced-motion:reduce){.turn-stage.enter,.ts-arrive,.ts-headline.fresh,.ts-tick.running,.ts-mark,.turn-work:not(.done) .activity-status.running::before{animation:none}.turn-stage.leaving{transition:none}}
 #infoBar{display:flex;padding:8px 14px 10px;border-top:1px solid var(--glass-border);background:transparent;border-radius:0 0 16px 16px;color:var(--text-2);gap:10px;align-items:flex-start;flex-wrap:wrap;flex-shrink:0;transition:opacity 280ms ease}
 #infoBar.visible{display:flex}
 #infoBar .info{flex:1;min-width:0;font-size:13px;line-height:1.4;word-break:break-word;display:flex;flex-direction:column;gap:2px}
@@ -809,6 +834,7 @@ body.all-view #center, body.all-view #topStrip{display:none}
 @keyframes attn-pulse{0%,100%{box-shadow:0 0 0 0 color-mix(in srgb,var(--warn) 60%,transparent)}50%{box-shadow:0 0 0 4px color-mix(in srgb,var(--warn) 0%,transparent)}}
 @media (prefers-reduced-motion:reduce){.card .dot.running,.card .dot.waiting{animation:none}}
 .card .attn{font-size:11px;font-weight:600;padding:1px 7px;border-radius:999px;white-space:nowrap;flex-shrink:0;background:var(--warn-bg);color:var(--warn-text);border:1px solid var(--warn-border)}
+.card .stopped-badge{font-size:11px;font-weight:600;padding:1px 7px;border-radius:999px;white-space:nowrap;flex-shrink:0;background:var(--warn);color:var(--bg)}
 .status.running{background:var(--ok-bg);color:var(--ok-text)}
 .status.idle{background:var(--bg-raised)}
 .status.completed{background:var(--accent-bg);color:var(--accent)}

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

@@ -89,12 +89,29 @@ export function waitingBadge(summary) {
   return { kind: waiting.reason, ...WAITING_BADGES[waiting.reason] };
 }
 
-// What the all view's search matches for a session that waits on the user:
-// "waiting" and its badge's word ("question", "approval", "needs you");
-// "" for one that doesn't.
+// A card's badge for a last turn a hook stopped (the same marker as
+// `chi sessions list`'s "[looped]" / "[stopped by X]"): "looped" for
+// loop-guard, "stopped by <name>" for any other hook; null when the last
+// turn ended otherwise.
+// @return null | {text, title}
+export function stoppedBadge(summary) {
+  const by = summary?.last_turn?.stopped_by;
+  if (!by) return null;
+  return by === "loop-guard"
+    ? { text: "looped", title: "loop-guard stopped the last turn" }
+    : { text: `stopped by ${by}`, title: `${by} stopped the last turn` };
+}
+
+// What the all view's search matches for a session: its waiting badge's words
+// ("waiting", "question", "approval", …) and/or its stopped badge's words
+// ("looped", "stopped by <name>"); "" for one with neither.
 export function waitingSearchText(summary) {
+  const parts = [];
   const badge = waitingBadge(summary);
-  return badge ? `waiting ${badge.text}` : "";
+  if (badge) parts.push(`waiting ${badge.text}`);
+  const stopped = stoppedBadge(summary);
+  if (stopped) parts.push(stopped.text);
+  return parts.join(" ");
 }
 
 // The sessions that wait on the user (waitingOn) first, the rest after,

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

@@ -11,6 +11,7 @@ const READ_LIKE = new Set(["read", "memory_read", "web_fetch", "task_get", "task
 const EDITS = new Set(["edit", "write", "memory_write"]);
 const EXECS = new Set(["execute", "task_create", "task_wait", "task_stop", "delegate", "delegate_result"]);
 const FILE_TOOLS = new Set(["read", "edit", "write"]);
+const TASK_TOOLS = new Set(["task_wait", "task_get", "task_stop"]);
 const TRAIL = 3;
 // The hand-off waits this long after the stage was last in use.
 export const QUIET_MS = 1500;
@@ -75,14 +76,30 @@ 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 || "";
 }
 
 // A slot's full command (the row's view), for its hover; none for a tool
-// without one.
+// without one. A task tool titled by its task's command (the server's
+// title) hovers its params instead: the id line it replaced.
 function withCommand(slot, row) {
-  return row.view?.command ? { ...slot, command: row.view.command } : slot;
+  if (row.view?.command) return { ...slot, command: row.view.command };
+  return TASK_TOOLS.has(row.tool) && row.title && row.params ? { ...slot, command: row.params } : slot;
 }
 
 // A running task_wait's slot: the task it waits on and the row's key, for
@@ -113,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)}.
@@ -143,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 })),