samagotchi 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51c7c1a00eec47f70f15b04381eb6b60f5bd6c66c8dd11fbe05ef045c41d5219
-  data.tar.gz: 00cbfcba1b3b21ef54c9d54bd9de349a90a19314cb5613e9daa94ca51c8c04fe
+  metadata.gz: 581b7b0fa7184fb49a83588921656f2f91f05ae04538592e69874ba1207b686c
+  data.tar.gz: 4c381eb155ab69b933cda29461a02b111910adfb53309bb38ffc5819dfc764d6
 SHA512:
-  metadata.gz: 11f14c97b088efe1c1eafafb63604f44c84a7a7a79d738db5f6344191b6fa9948ceab37acd0f8daba2a85840b3f272bfcd767bd2147b0da7abbc23a04936bba4
-  data.tar.gz: e3136af1decc273b092f66756e2994ad0760a626cb9b007a4a4ad2f68ee85bdf6f37aab3f5a0bde85597f677bde3fde32826763c9b44001e941945abc39dfa5d
+  metadata.gz: 84b0ba1d65c4c5d41fcbee9e925934f6fd6ee1eb4b46bb35af98b46cde28f9ad334ab56ff44e1ee503f0f7f9dab107d03429c145c7097fa35f90aa8ab86f1f4f
+  data.tar.gz: 7725dc03f4d5c9d42e7a5c4cae0ba5729740a6d95d37fb04c7bdcc611489907b039ad2ec9b0770c7f47ff04fc681d750309988825896c0e90c1e5b7c0dda3605

data/CHANGELOG.md

@@ -8,6 +8,35 @@ and commands may change between minor versions. How releases are made:
 
 ## [Unreleased]
 
+## [0.29.0] - 2026-10-05
+
+### Added
+
+- Web: a session card shows `looped` when loop-guard stopped its last turn (`stopped by <name>` for another hook),
+  like `chi sessions list`'s `[looped]`; the all-sessions search finds them by those words.
+- `chi bundle install` warns when a bundle needs a newer chi and its guardrail rules won't load (it already warned
+  about its hooks and plugin).
+
+### Changed
+
+- Web: a tool row shows its status as a mark (✓, ✕, ■, a spinner while it runs) instead of the word, so its command,
+  output and diff start right under the tool name; error, stopped and blocked calls keep their word after the title.
+  An open step's body sits indented under its summary.
+- Web: a step with a failed call says so in its collapsed label, `3 tool calls (1 failed)`, with a red chevron; the
+  turn's summary counts failed calls below 3 calls too.
+- Web: a `task_wait`, `task_get` or `task_stop` row names its task by the task's command instead of its id, a wait with
+  how long it waits (`bundle exec rspec · up to 600s`), also for a task started in an earlier turn; the id line stays
+  on hover.
+
+### Fixed
+
+- Guardrails: `> /tmp/x cat <<EOF` (a redirection written with a space before the command) is read as a heredoc of
+  data like `cat > /tmp/x <<EOF`, and a `)` inside quotes or a heredoc body no longer ends a `$(…)` early.
+- `!cmd` no longer hands a `--model` worker's model to a chi it runs as the default model.
+- A session worker survives a failed save at the end of a turn (it logs it) instead of crashing.
+- A turn that ends with an empty answer removes only its own retry note, not an earlier turn's cancel or failure note.
+- Web: streamed chunks from llama.cpp no longer carry its whole echoed prompt to every web client.
+
 ## [0.28.0] - 2026-10-04
 
 ### Added
@@ -1471,7 +1500,8 @@ and long-lived sessions.
 - A macOS desktop helper (`chi desktop install`): a "Send to chi" Service and a
   hotkey panel that send selected text or the clipboard to your sessions.
 
-[Unreleased]: https://github.com/dm1try/samagotchi/compare/v0.28.0...HEAD
+[Unreleased]: https://github.com/dm1try/samagotchi/compare/v0.29.0...HEAD
+[0.29.0]: https://github.com/dm1try/samagotchi/compare/v0.28.0...v0.29.0
 [0.28.0]: https://github.com/dm1try/samagotchi/compare/v0.27.0...v0.28.0
 [0.27.0]: https://github.com/dm1try/samagotchi/compare/v0.26.0...v0.27.0
 [0.26.0]: https://github.com/dm1try/samagotchi/compare/v0.25.0...v0.26.0

data/docs/sessions.md

@@ -56,7 +56,7 @@ chi sessions clean --dry-run --days 7            # test sessions older than 7 da
 
 `--dry-run` is the safe preview. `--keep N` keeps the N newest sessions that stay: one that goes anyway (a leftover scratch session, one left empty, one older than `--days`) takes no place in the count. Web has no prune endpoint; use the CLI.
 
-`chi sessions list` shows each session's saved recap, its first sentence without the "The user was…" opening (as on the web cards), in place of its last prompt, cut to 60 characters; a session with no recap shows its last prompt. A session whose last turn a hook stopped carries `[looped]` when the hook was loop-guard (the thinking watch's cut, or its stop) and `[stopped by <hook>]` for any other hook, after `[archived]` (`--format json` has it as `stopped_by`; from `Session#last_turn`, so it stays until a later turn ends differently). A delegated session's row ends with `↳ <parent's short id>` (plain and `--live`; `--format json` has `parent_id`); rows keep their `updated_at` order, so a parent may be on another page than its children. After the status, `ctx 12%` says how full the context was after the session's last counted turn (from its `analytics.json`; blank when no turn had a server count or the window is unknown; `ctx_pct` in `--format json`). The web's session cards show it quietly too (`12%`), and a session's ctx meter shows it on load, before its next turn streams.
+`chi sessions list` shows each session's saved recap, its first sentence without the "The user was…" opening (as on the web cards), in place of its last prompt, cut to 60 characters; a session with no recap shows its last prompt. A session whose last turn a hook stopped carries `[looped]` when the hook was loop-guard (the thinking watch's cut, or its stop) and `[stopped by <hook>]` for any other hook, after `[archived]` (`--format json` has it as `stopped_by`; from `Session#last_turn`, so it stays until a later turn ends differently). The web's session cards wear the same marker as a badge: `looped` or `stopped by <hook>` after the status dot (a session that also waits on you shows only its waiting badge: the stop is behind the need), and the all-view's search matches its words too. A delegated session's row ends with `↳ <parent's short id>` (plain and `--live`; `--format json` has `parent_id`); rows keep their `updated_at` order, so a parent may be on another page than its children. After the status, `ctx 12%` says how full the context was after the session's last counted turn (from its `analytics.json`; blank when no turn had a server count or the window is unknown; `ctx_pct` in `--format json`). The web's session cards show it quietly too (`12%`), and a session's ctx meter shows it on load, before its next turn streams.
 
 **Projects:** a session belongs to the git project it was started in: the repository, whichever worktree or subfolder of it (the same project root memories use). `chi sessions list` (with `--live` and `--format` too) and `chi web` show the current folder's project; `--scope=all` shows every session, and so does a folder in no repo (`~`). `--cwd PATH` is a folder filter instead of the project. The project is stored with the session (`project_root` in its JSON, `project` in `--format json`), so a session keeps it after its worktree is deleted; sessions older than that are placed by their folder, and one whose folder is gone shows in `--scope=all` only. Retention, `--resume`/`--attach ID`, `chi send`/`chi note ID` and `chi note --all` (every live session) are not scoped. The agent's `list_sessions` lists its own project's sessions; `cwd: "/"` lists every one.
 

data/lib/samagotchi/bundle_command.rb

@@ -36,7 +36,8 @@ module Samagotchi
         build [--scope system|project] [--name NAME] [--version VER] [--description DESC] [--out PATH] [FILES...]
           Build local memories and installed hooks (and plugin) into a shareable bundle (dir or zip).
           --scope selects source dir (default: system). --out inferred from extension; default <name>.zip.
-          FILES... optional allowlist of *.md basenames to include (default: all but installed bundles' ones).
+          FILES... optional allowlist of *.md basenames to include (default: all but installed bundles' ones);
+          a named memory brings its model overlays (<name>.<model-key>.md).
 
         trash [--empty] [--dry-run] [--older-than DAYS]
           List bundle trash (moved files from uninstalls/upgrades).
@@ -61,7 +62,8 @@ module Samagotchi
         build [--scope system|project] [--name NAME] [--version VER] [--description DESC] [--out PATH] [FILES...]
           Build local memories and installed hooks into a shareable bundle (dir or zip).
           --scope selects source dir (default: system). --out inferred from extension; default <name>.zip.
-          FILES... optional allowlist of *.md basenames to include (default: all but installed bundles' ones).
+          FILES... optional allowlist of *.md basenames to include (default: all but installed bundles' ones);
+          a named memory brings its model overlays (<name>.<model-key>.md).
 
         Examples:
           chi bundle build --scope system

data/lib/samagotchi/bundles/system/manifest.yml

@@ -1,6 +1,6 @@
 ---
 name: samagotchi-system
-version: 0.28.0
+version: 0.29.0
 scope: system
 description: Default system memories — identity, self map, config modification protocol, memory guide and the delegated-session rules
 files:

data/lib/samagotchi/engine.rb

@@ -1942,11 +1942,12 @@ module Samagotchi
       # that way: the note, and nothing made up as its answer. The note's
       # marker is for the UIs (the notice, and the empty steps after a
       # reload); it goes on the result's conversation too (the REPL keeps it).
-      # A retry's nudge at the tail goes: this note says it all.
+      # A retry's nudge at the tail goes: this note says it all. An earlier
+      # turn's note stays: it says why that turn ended.
       if result.empty_answer?
         note = TurnNote.empty(retries: result.empty_retries, steps: result.empty_steps)
-        conversation&.replace(TurnNote.without_trailing(conversation))
-        saved = TurnNote.without_trailing(conversation || turn.session.messages)
+        conversation&.replace(TurnNote.without_trailing_nudge(conversation))
+        saved = TurnNote.without_trailing_nudge(conversation || turn.session.messages)
         conversation << note if conversation
         saved + [note]
       elsif result.canceled? && conversation

data/lib/samagotchi/guardrails/shell_lex.rb

@@ -169,19 +169,76 @@ module Samagotchi
           add(SUBST, close + 1 - @i)
         end
 
+        # From $( to the ) that closes it, as one SUBST. A quote or a
+        # heredoc body inside it is skipped over: a ) in one of those
+        # doesn't close the substitution.
         def substitution
           depth = 0
           j = @i + 1
           loop do
-            depth += 1 if @s[j] == "("
-            depth -= 1 if @s[j] == ")"
-            j += 1
-            break if depth.zero? || j >= @s.size
+            break if j >= @s.size
+
+            c = @s[j]
+            if ["'", '"'].include?(c)
+              j = quote_end(j)
+            elsif c == "("
+              depth += 1
+              j += 1
+            elsif c == ")"
+              depth -= 1
+              j += 1
+              break if depth.zero?
+            elsif @s[j, 2] == "<<"
+              j = substitution_heredoc(j)
+            else
+              j += 1
+            end
           end
           @unterminated = true unless depth.zero?
           add(SUBST, j - @i)
         end
 
+        # The index after the quote starting at +j+, a backslash in a double
+        # quote escaping the next character; the text's end when it is never
+        # closed.
+        def quote_end(j)
+          quote = @s[j]
+          k = j + 1
+          while k < @s.size
+            if quote == '"' && @s[k] == "\\" then k += 2
+            elsif @s[k] == quote then return k + 1
+            else k += 1
+            end
+          end
+          k
+        end
+
+        # From a << at +j+ inside a $(…) past its body's terminator line
+        # (nothing is lexed: the body is only stepped over), or on to the
+        # next character when no tag follows or the terminator never comes
+        # (a << that is no heredoc, as arithmetic's 1<<3, stays scanned).
+        def substitution_heredoc(j)
+          dash = @s[j + 2] == "-"
+          k = j + (dash ? 3 : 2)
+          k += 1 while [" ", "\t"].include?(@s[k])
+          tag, _quoted, stop = heredoc_tag(k)
+          return j + 1 if tag.empty?
+
+          eol = @s.index("\n", stop)
+          return j + 1 if eol.nil?
+
+          k = eol + 1
+          while k < @s.size
+            eol = @s.index("\n", k) || @s.size
+            line = @s[k...eol]
+            line = line.sub(/\A\t+/, "") if dash
+            return [eol + 1, @s.size].min if line == tag
+
+            k = eol + 1
+          end
+          j + 1
+        end
+
         def comment
           @i = @s.index("\n", @i) || @s.size
         end
@@ -306,10 +363,27 @@ module Samagotchi
         def data_sink?(at)
           start = at
           start -= 1 while start.positive? && @tokens[start - 1][0] == :word
-          verb = @tokens[start...at].map { |t| t[1] }.find { |w| !w.match?(/\A[A-Za-z_]\w*=/) && !w.match?(REDIRECT) }
+          verb = command_word(@tokens[start...at])
           next_op = @tokens[at..].find { |t| t[0] == :op }
           DATA_SINKS.include?(File.basename(verb.to_s)) && !["|", "|&"].include?(next_op&.dig(1))
         end
+
+        # The command word among the words before a heredoc's: the NAME=
+        # words and the redirections dropped, and with a redirection written
+        # with a space (> /tmp/x) its target word too.
+        def command_word(words)
+          i = 0
+          while i < words.size
+            word = words[i][1]
+            if word.match?(REDIRECT)
+              i += 1 if word.match?(/\A\d*[<>]{1,2}\z/)
+            elsif !word.match?(/\A[A-Za-z_]\w*=/)
+              return word
+            end
+            i += 1
+          end
+          nil
+        end
       end
     end
   end

data/lib/samagotchi/kernel_loop.rb

@@ -372,13 +372,20 @@ module Samagotchi
       return unless turn.on_stream_event
 
       event = { type: :generation_chunk, iteration: turn.iteration, content: chunk[:content], text: split[:text],
-                thinking: split[:thinking], payload: chunk[:payload] }
+                thinking: split[:thinking], payload: event_payload(chunk[:payload]) }
       # A chunk of a tool call (its bytes are dropped from both lanes): a
       # steer doesn't cut this generation (Engine#cut_for_steer).
       event[:tool_call] = true if split[:tool]
       emit(turn, **event)
     end
 
+    # The payload a :generation_chunk event carries: llama.cpp's last chunk
+    # echoes the whole rendered prompt, which nothing reads and every SSE
+    # client would get (the kernel's own reads keep the full payload).
+    def event_payload(payload)
+      payload.is_a?(Hash) ? payload.except("prompt") : payload
+    end
+
     # The payload's prompt-cache counts, kept as the largest seen.
     def note_cache_counts(generation, payload)
       counts = TokenUsage.from_payload(payload)

data/lib/samagotchi/memory_bundle/installer.rb

@@ -303,6 +303,7 @@ module Samagotchi
         # Like the rules, the bundle's plugin replaces an earlier one.
         plugin_file_for_provenance = install_plugin(manifest, normalized_dir, provenance)
         warn_hooks_requires_chi(manifest, all_hooks_in_bundle)
+        warn_rules_requires_chi(manifest, incoming_rules)
 
         # Files the previous version shipped and this one doesn't.
         if @upgrade && existing_provenance && existing_provenance[:files]
@@ -559,6 +560,19 @@ module Samagotchi
         end
       end
 
+      # GuardrailWiring#bundle_rules doesn't read the rules of a bundle whose
+      # requires_chi this chi doesn't meet, and a session that never loaded
+      # them records a required load failure (the gate refuses guarded calls
+      # until chi is updated): say so at install, as the hooks warning does.
+      def warn_rules_requires_chi(manifest, rule_files)
+        return if manifest.nil? || rule_files.empty?
+
+        if (failure = Manifest.requires_chi_failure(manifest.requires_chi, Samagotchi::VERSION))
+          @warnings << "Bundle #{@name}: its guardrail rules won't load: #{failure}; until chi is updated " \
+                       "(chi update), guarded tool calls are refused"
+        end
+      end
+
       # Copy the manifest's plugin file into the bundle's plugin/ dir,
       # warning when its sha256 differs from the declared one or this chi
       # doesn't meet requires_chi (the Engine then won't load it).

data/lib/samagotchi/session_commands.rb

@@ -5,6 +5,7 @@ require_relative "model_profile"
 require_relative "served_model"
 require_relative "turn_flow"
 require_relative "tools/execute"
+require_relative "tools/builtins"
 require_relative "commands/registry"
 
 module Samagotchi
@@ -207,12 +208,15 @@ module Samagotchi
     end
 
     # The output goes into the conversation for the next turn. Not saved
-    # here (as in the REPL, the next turn saves it).
+    # here (as in the REPL, the next turn saves it). No parent-session
+    # marker: the user runs this, not the model. A worker's `chi --model X`
+    # default is unset, though: it was that run's, not the default of a chi
+    # run here (Tools::Builtins.cli_model_unset).
     def shell(text)
       command = text.delete_prefix(SHELL_BANG_PREFIX).strip
       return reply("!: please provide a shell command after '!'", status: :error) if command.empty?
 
-      output = Samagotchi::Tools::Execute.call(command)
+      output = Samagotchi::Tools::Execute.call(command, env: Samagotchi::Tools::Builtins.cli_model_unset)
       @engine.append_messages([{ role: "user", content: "!(#{command})\n#{output}" }])
       # Rolling back past this would silently drop the command output.
       @turn_flow.note_conversation_changed

data/lib/samagotchi/tool_activity.rb

@@ -12,6 +12,7 @@ require_relative "tools/edit"
 require_relative "tools/task_create"
 require_relative "tools/task_get"
 require_relative "tools/task_list"
+require_relative "tools/task_runtime"
 require_relative "tools/task_stop"
 require_relative "tools/task_wait"
 require_relative "tools/web_fetch"
@@ -62,11 +63,13 @@ module Samagotchi
     # command without its "cd … &&"): a file tool's path relative to +cwd+
     # when it is under it, a command's description (the model's few words),
     # else its first step and how many more (CommandSteps; its first line
-    # when it has no steps), a memory's name;
-    # nil for the other tools (a plugin's row keeps its preview, the
+    # when it has no steps), a memory's name, a task tool's task command
+    # (task_title); nil for the other tools (a plugin's row keeps its preview, the
     # params). +params+ stays the full key=value line (the TUI, the
     # guardrails).
     def tool_title(tool_name, call, cwd: nil)
+      return task_title(tool_name, call, cwd) if TASK_TOOLS.include?(tool_name)
+
       if [Tools::Execute::NAME, Tools::TaskCreate::NAME].include?(tool_name)
         title = command_description(tool_name, call) || steps_title(call[:content])
         return title if title
@@ -90,19 +93,42 @@ module Samagotchi
       end
     end
 
+    TASK_TOOLS = [Tools::TaskWait::NAME, Tools::TaskGet::NAME, Tools::TaskStop::NAME].freeze
+
+    # A task_wait / task_get / task_stop row's title: the task's command
+    # (its record under +cwd+, the process's directory when nil) as a
+    # command's title, and for a wait how long it waits ("npm test · up to
+    # 600s"). nil when there is no record: the row keeps its id.
+    def task_title(tool_name, call, cwd)
+      command = Tools::TaskRuntime.command_of(call[:content], root: cwd)
+      return nil unless command
+
+      suffix = ""
+      if tool_name == Tools::TaskWait::NAME
+        timeout = call[:timeout].to_s.strip
+        suffix = " · up to #{timeout.empty? ? Tools::TaskWait::TIMEOUT_DEFAULT : timeout.to_i}s"
+      end
+      room = TOOL_ACTIVITY_PREVIEW_LIMIT - suffix.length
+      text = steps_title(command, room) || command_title(command).gsub(/\s+/, " ")
+      return nil if text.empty?
+
+      text = "#{text[0, room - 1]}…" if text.length > room
+      "#{text}#{suffix}"
+    end
+
     # A leading "cd <dir> &&" / "cd <dir>;" goes: the model's habit, and it
     # eats the line.
     LEADING_CD = /\Acd\s+(?:"[^"]*"|'[^']*'|\S+)\s*(?:&&|;)\s*/
 
-    # "<first step> +N" (N the steps after it), cut to fit
-    # TOOL_ACTIVITY_PREVIEW_LIMIT; nil when the command has no steps.
-    def steps_title(command)
+    # "<first step> +N" (N the steps after it), cut to fit +limit+
+    # (TOOL_ACTIVITY_PREVIEW_LIMIT); nil when the command has no steps.
+    def steps_title(command, limit = TOOL_ACTIVITY_PREVIEW_LIMIT)
       steps = CommandSteps.parse(command)&.steps
       return nil unless steps
 
       first = steps.first.text.gsub(/\s+/, " ")
       more = steps.size > 1 ? " +#{steps.size - 1}" : ""
-      room = TOOL_ACTIVITY_PREVIEW_LIMIT - more.length
+      room = limit - more.length
       first = "#{first[0, room - 1]}…" if first.length > room
       "#{first}#{more}"
     end

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

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

@@ -39,7 +39,7 @@ 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 {
@@ -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.
@@ -1483,6 +1487,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 +1503,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 +1519,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();
 }

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/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.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Dmitry Dedov