samagotchi 0.27.0 → 0.29.0

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

@@ -127,40 +127,50 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .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 +228,17 @@ 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}
+/* 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 +271,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 +448,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}
@@ -617,7 +634,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 +826,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;
@@ -80,9 +81,11 @@ function rowTitle(row) {
 }
 
 // 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

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

@@ -54,10 +54,24 @@ export function createTaskStopper({
   alert = (text) => globalThis.alert(text),
 }) {
   const inFlight = new Set();
+  const watchers = new Map(); // key -> Set of fn(busy)
   const keyOf = (taskId) => `${sessionId()}|${taskId}`;
+  const notify = (key, busy) => watchers.get(key)?.forEach((fn) => fn(busy));
   return {
     target: (row) => stopTarget(row, features()),
     busy: (taskId) => inFlight.has(keyOf(taskId)),
+    // Call +fn+ whenever a stop for +taskId+ starts or ends (the key enters
+    // or leaves the in-flight set) — the session's own task, on this session.
+    // Returns unwatch. A task drawn in two rows (the stage's "now" slot and
+    // the step list) so both buttons stay in step; a watcher for a button
+    // that is gone unwatches itself.
+    watch(taskId, fn) {
+      const key = keyOf(taskId);
+      let set = watchers.get(key);
+      if (!set) watchers.set(key, (set = new Set()));
+      set.add(fn);
+      return () => set.delete(fn);
+    },
     // true once the worker stopped it. A stop that went through stays in
     // flight: the button goes with its row's completion a moment later.
     async stop(taskId, command = null) {
@@ -65,11 +79,13 @@ export function createTaskStopper({
       const key = keyOf(taskId);
       if (!id || inFlight.has(key) || !confirm(confirmText(taskId, command))) return false;
       inFlight.add(key);
+      notify(key, true);
       try {
         await stopTask(id, taskId);
         return true;
       } catch (e) {
         inFlight.delete(key);
+        notify(key, false);
         if (!quietFailure(e)) alert(e.message);
         return false;
       }
@@ -79,7 +95,10 @@ export function createTaskStopper({
 
 // The button itself (the one DOM part): a click asks, posts, and keeps it
 // disabled while the stop is in flight. +command+ is read at the click;
-// +onChange+ lets a view redraw (the stage's slot).
+// +onChange+ lets a view redraw (the stage's slot). It also watches the
+// task's in-flight state, so a stop started from a second button of the
+// same row (the stage draws one in the "now" slot and one in the step
+// list) disables this one too — a button that is gone unwatched.
 export function taskStopButton(stopper, taskId, { command = () => null, onChange = () => {} } = {}) {
   const btn = document.createElement("button");
   btn.type = "button";
@@ -87,6 +106,10 @@ export function taskStopButton(stopper, taskId, { command = () => null, onChange
   btn.textContent = "stop task";
   btn.title = "Kill this background task; the model is told you stopped it";
   btn.disabled = stopper.busy(taskId);
+  const unwatch = stopper.watch?.(taskId, (busy) => {
+    if (!btn.isConnected) { unwatch(); return; }
+    btn.disabled = busy;
+  });
   btn.addEventListener("click", (e) => {
     e.stopPropagation();
     const pending = stopper.stop(taskId, command());

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

@@ -159,13 +159,22 @@ function cut(line) {
   return line.length > LABEL_MAX ? `${line.slice(0, LABEL_MAX).trimEnd()}…` : line;
 }
 
-function toolCallsText(n) {
-  return `${n} tool call${n === 1 ? "" : "s"}`;
+// "3 tool calls (1 failed)": failed = status error, the tally's predicate
+// (tally.js), so a step's label and the block's summary never disagree.
+function toolCallsText(rows) {
+  const n = rows.length;
+  const failed = failedCount(rows);
+  return `${n} tool call${n === 1 ? "" : "s"}${failed ? ` (${failed} failed)` : ""}`;
+}
+
+// A gen's calls that failed (status error; blocked and stopped don't count).
+export function failedCount(rows) {
+  return rows.filter((r) => r.status === "error").length;
 }
 
 // The collapsed row of a gen: its narration's first line, else its first
 // call's title ("edit lib/a.rb"), else the tools it worked with, else
-// "thinking"; then its call count.
+// "thinking"; then its call count and how many failed.
 export function genLabel(gen) {
   const line = String(gen.text || "").trim().split("\n")[0].trim();
   const calls = gen.tools.length;
@@ -181,7 +190,7 @@ export function genLabel(gen) {
   } else {
     return "thinking";
   }
-  return calls ? `${head} · ${toolCallsText(calls)}` : head;
+  return calls ? `${head} · ${toolCallsText(gen.tools)}` : head;
 }
 
 // The block's summary line: "working · 3 steps · 8 tool calls · execute ×7 · …"
@@ -192,7 +201,7 @@ export function blockSummary(turn, { running = false } = {}) {
   const fields = [`${steps} step${steps === 1 ? "" : "s"}`];
   const tally = tallyText(rows, { last: false });
   if (tally) fields.push(tally);
-  else if (rows.length) fields.push(toolCallsText(rows.length));
+  else if (rows.length) fields.push(toolCallsText(rows));
   if (running) fields.unshift("working");
   return fields.join(" · ");
 }

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

@@ -30,19 +30,44 @@ import { taskCommand, taskStopButton } from "./task_stop.js";
 // denied it), else ok ("done").
 const NAMED_STATUSES = ["running", "error", "stopped", "blocked"];
 
-function activityStatusClass(status) {
-  return NAMED_STATUSES.includes(status) ? status : "ok";
+// A row's status as its parts: the mark's class (CSS draws the glyph), its
+// label (aria-label and title) and the word an exception shows after the
+// title (empty for done and running). Live and reload share it.
+export function statusParts(status) {
+  const named = NAMED_STATUSES.includes(status);
+  const cls = named ? status : "ok";
+  const label = named ? status : "done";
+  return { cls, label, word: cls === "ok" || cls === "running" ? "" : label };
 }
 
-function activityStatusLabel(status) {
-  return NAMED_STATUSES.includes(status) ? status : "done";
+function statusMarkHtml({ cls, label }) {
+  return `<span class="activity-status ${cls}" role="img" aria-label="${label}" title="${label}"></span>`;
+}
+
+function statusWordHtml({ cls, word }) {
+  return word ? `<span class="activity-state ${cls}">${word}</span>` : "";
 }
 
 // A live tool row filled from its activity row (status, title, output).
 function fillActivityRow(el, row, sessionId) {
+  const parts = statusParts(row.status);
   const statusEl = el.querySelector(".activity-status");
-  statusEl.className = `activity-status ${activityStatusClass(row.status)}`;
-  statusEl.textContent = activityStatusLabel(row.status);
+  statusEl.className = `activity-status ${parts.cls}`;
+  statusEl.setAttribute("role", "img");
+  statusEl.setAttribute("aria-label", parts.label);
+  statusEl.title = parts.label;
+  // The exception's word after the title (reloadRowHtml's place); never
+  // beside a running task_wait's stop button, which needs "running".
+  let wordEl = el.querySelector(":scope > .activity-state");
+  if (!parts.word) wordEl?.remove();
+  else {
+    if (!wordEl) {
+      wordEl = document.createElement("span");
+      (el.querySelector(":scope > .activity-params") || el.querySelector(":scope > .activity-tool")).after(wordEl);
+    }
+    wordEl.className = `activity-state ${parts.cls}`;
+    wordEl.textContent = parts.word;
+  }
   const toolEl = el.querySelector(".activity-tool");
   if (toolEl) toolEl.textContent = toolName(row);
   const paramsEl = el.querySelector(".activity-params");
@@ -363,13 +388,21 @@ export function createTurnView({
       // answer, which reuses the wrap).
       if (!gen.text && !gen.tools.length && turn.gens.length > 1) unwrapThinking(entry);
     }
-    entry.summary.textContent = model.genLabel(gen);
+    writeClosedLabel(entry, gen);
     if (!entry.toggled) entry.el.open = false;
     // Every generation's text goes into seenContent (the turn output dedupe).
     const k = normalize(gen.text);
     if (k) sawText(k);
   }
 
+  // A closed step's label and its failed mark (a red chevron that survives
+  // an ellipsed label): at close, and again when a late tool result lands
+  // in a step that already closed.
+  function writeClosedLabel(entry, gen) {
+    entry.summary.textContent = model.genLabel(gen);
+    entry.el.classList.toggle("has-failed", model.failedCount(gen.tools) > 0);
+  }
+
   // A step that closes mid-turn (the next one starts) collapses: a warn card
   // in it would go out of sight until the turn ends. It moves out of the
   // step, right after it in the block (open while the turn runs), where
@@ -417,6 +450,7 @@ export function createTurnView({
       fillActivityRow(el, r.row, sessionId());
       syncTaskStop(el, r.row);
     }
+    if (!entry.el.classList.contains("live")) writeClosedLabel(entry, r.gen);
     updateBlockSummary();
     onChange();
   }
@@ -712,8 +746,9 @@ function reloadRowHtml(r, thumbs) {
   const output = full
     ? `<div class="activity-output" title="${escapeHtml(full)}">${escapeHtml(full.length > 300 ? `${full.slice(0, 300)}…` : full)}</div>`
     : "";
-  return `<div class="activity-row" data-key="${escapeHtml(r.key)}"><span class="activity-status ${activityStatusClass(r.status)}">${activityStatusLabel(r.status)}</span>` +
-    `<span class="activity-tool">${escapeHtml(toolName(r))}</span>${params}${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}` +
+  const status = statusParts(r.status);
+  return `<div class="activity-row" data-key="${escapeHtml(r.key)}">${statusMarkHtml(status)}` +
+    `<span class="activity-tool">${escapeHtml(toolName(r))}</span>${params}${statusWordHtml(status)}${duration ? `<span class="activity-duration">${escapeHtml(duration)}</span>` : ""}` +
     `${commandBlockHtml(r.view, r.title)}${output}` +
     `${r.images?.length ? thumbs(r.images) : ""}${r.diff ? activityDiffHtml(r.diff) : ""}</div>`;
 }
@@ -775,7 +810,8 @@ export function turnHistoryHtml(items, timing, { thumbs }) {
         // The steers the step answered first, where the live rows went.
         const steers = (group.steps[k].steers || []).map((i) => steerHtml(i, false)).join("");
         const tools = gen.tools.length ? `<div class="activity-body">${gen.tools.map((r) => reloadRowHtml(r, thumbs)).join("")}</div>` : "";
-        return `<details class="gen"><summary>${escapeHtml(model.genLabel(gen))}</summary>${steers}${thinking}${text}${tools}</details>`;
+        const failed = model.failedCount(gen.tools) ? " has-failed" : "";
+        return `<details class="gen${failed}"><summary>${escapeHtml(model.genLabel(gen))}</summary>${steers}${thinking}${text}${tools}</details>`;
       });
       parts.push(`<details class="turn-work done"><summary>${escapeHtml(model.blockSummary({ gens, ended: true }))}</summary>${rows.join("")}</details>`);
     }

data/lib/samagotchi/worker.rb

@@ -515,7 +515,16 @@ module Samagotchi
       unless response.nil? || response.strip.empty? || @continue_offer.awaiting?
         SessionInbox.write_output(@session_dir, response)
       end
+      save_after_turn
+    end
+
+    # The turn's own save: the turn ended fine and its messages are in
+    # memory, so a save that fails here (disk full, permissions; the next
+    # save writes them) must not take the worker down with it.
+    def save_after_turn
       save_session
+    rescue SystemCallError, IOError => e
+      Log.exception(:worker, "save_failed", e)
     end
 
     # Back to the conversation before the failed turn, as the REPL does (so

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Dmitry Dedov