samagotchi 0.12.0 → 0.14.0

data/lib/samagotchi/tools/delegate_wait.rb

@@ -2,13 +2,15 @@
 
 require_relative "../session"
 require_relative "../reply_wait"
+require_relative "../parent_report"
 require_relative "output_guardrails"
 require_relative "peers"
 
 module Samagotchi
   module Tools
     # Waiting for a delegated session's next reply, shared by delegate and
-    # delegate_result: ReplyWait in the tools' words, with a cursor per
+    # delegate_result: ReplyWait in the tools' words, with the status words
+    # `chi send --wait` and `chi answer` use (ParentReport.status), with a cursor per
     # child (the newest reply this parent was already given) and the child
     # as it was before the message went in (ReplyWait's baseline), so a turn
     # that ends before the wait's first look (a fast failure) still ends it.
@@ -18,6 +20,10 @@ module Samagotchi
     module DelegateWait
       TIMEOUT_DEFAULT = 600
       POLL_INTERVAL = 0.5
+      # Seconds with no worker before the child counts as gone: as long as
+      # Delegate gives a starting child (its worker takes the owner lock
+      # only once it has booted).
+      OWNER_GRACE = 15
       # Cut like an execute result: full up to TRUNCATE_AT bytes, else a
       # head-and-tail preview of PREVIEW bytes.
       TRUNCATE_AT_BYTES = OutputGuardrails::DEFAULT_TRUNCATE_AT_BYTES
@@ -39,29 +45,36 @@ module Samagotchi
       # @param peers [Peers] the parent (session_id, state_dir, cancelled?)
       # @param timeout [Integer] seconds
       # @param poll_interval [Float]
+      # @param owner_grace [Numeric] seconds with no live worker before
+      #   the child's worker counts as gone
       # @return [String] the tool result
-      def call(child_id, peers:, timeout: TIMEOUT_DEFAULT, poll_interval: POLL_INTERVAL)
+      def call(child_id, peers:, timeout: TIMEOUT_DEFAULT, poll_interval: POLL_INTERVAL, owner_grace: OWNER_GRACE)
         sd = peers.state_dir || Session.default_state_dir
         key = [peers.session_id, child_id]
         cancelled = -> { peers.cancelled? }
         wait = ReplyWait.call(child_id, state_dir: sd, cursor: seen[key], timeout: timeout.to_i,
-                                        poll_interval: poll_interval, cancelled: cancelled, baseline: baselines[key])
+                                        poll_interval: poll_interval, cancelled: cancelled, baseline: baselines[key],
+                                        owner_grace: owner_grace)
         # The turn sent to is handed over: a later wait looks for a later one.
         baselines.delete(key) if %i[done no_reply].include?(wait.status)
+        status = ParentReport.status(wait)
         case wait.status
         when :done
           seen[key] = wait.file
-          reply_result(child_id, wait.text)
+          reply_result(child_id, status, wait.text)
         when :error
-          result(child_id, "error", "the child's worker failed: #{wait.text}; its session shows what happened")
+          result(child_id, status, "the child's worker failed: #{wait.text}; its session shows what happened")
         when :stopped
-          result(child_id, "stopped", "the child was stopped (chi sessions stop); delegate with session: #{child_id} starts it again with a message")
+          result(child_id, status, "the child was stopped (chi sessions stop); delegate with session: #{child_id} starts it again with a message")
         when :waiting_for_answer
-          result(child_id, "waiting_for_answer", waiting_text(child_id, wait.question))
+          result(child_id, status, waiting_text(child_id, wait.question))
         when :canceled
-          result(child_id, "canceled", "wait canceled; the child keeps running; delegate_result #{child_id} waits again")
+          result(child_id, status, "wait canceled; the child keeps running; delegate_result #{child_id} waits again")
         when :no_reply
-          result(child_id, "no_reply", "the child's turn ended without a reply (canceled, failed or empty); its session shows what happened")
+          result(child_id, status, "#{no_reply_text(wait)}; its session shows what happened")
+        when :worker_gone
+          result(child_id, status,
+                 "the child's worker is gone (it stopped or crashed); delegate with session: #{child_id} starts it again with a message")
         else
           timeout_result(child_id, timeout)
         end
@@ -84,8 +97,13 @@ module Samagotchi
         baselines[[parent_id, child.id]] = ReplyWait.baseline_of(child, question_id: nil)
       end
 
-      def reply_result(child_id, text)
-        "session: #{child_id}\nstatus: done\n---\n#{cut(text)}"
+      def reply_result(child_id, status, text)
+        "session: #{child_id}\nstatus: #{status}\n---\n#{cut(text)}"
+      end
+
+      # ParentReport's line for a turn that left no reply, about the child.
+      def no_reply_text(wait)
+        ParentReport.no_reply_line(wait).sub(/\Athe turn/, "the child's turn")
       end
 
       def result(child_id, status, text)
@@ -98,9 +116,10 @@ module Samagotchi
                "chi --attach #{child_id} shows it.")
       end
 
+      # The whole question, as `chi send --wait` prints it (ParentReport):
+      # its text, options and the commands that answer it.
       def waiting_text(child_id, pending)
-        what = pending[:kind].to_s == "approval" ? "an approval" : "a question"
-        "Child #{child_id} is waiting for an answer (#{what}); attach with chi --attach #{child_id} or answer it in the web. " \
+        "Child #{child_id} is #{ParentReport.question_text(pending, session_id: child_id)}" \
           "delegate_result #{child_id} waits again once it is answered."
       end
 

data/lib/samagotchi/tools/execute.rb

@@ -25,7 +25,8 @@ module Samagotchi
 
       # @param cancelled [#call] true once the user stopped the turn: the
       #   command is killed (or not started) and its output so far returned
-      def self.call(command, cwd: nil, cancelled: -> { false })
+      # @param env [Hash, nil] added to the command's environment
+      def self.call(command, cwd: nil, cancelled: -> { false }, env: nil)
         return NOT_RUN_ON_STOP if cancelled.call
 
         command = command.strip
@@ -33,7 +34,8 @@ module Samagotchi
         return "Error: cwd not found: #{resolved_cwd}" unless resolved_cwd
 
         timeout_sec = timeout_seconds
-        stdout, stderr, status = run_command(command, timeout_sec: timeout_sec, cwd: resolved_cwd, cancelled: cancelled)
+        stdout, stderr, status = run_command(command, timeout_sec: timeout_sec, cwd: resolved_cwd, cancelled: cancelled,
+                                                      env: env)
 
         stdout_block = output_block("stdout", stdout)
         stderr_block = output_block("stderr", stderr)
@@ -66,7 +68,7 @@ module Samagotchi
       end
       private_class_method :stopped_result
 
-      def self.run_command(command, timeout_sec:, cwd:, cancelled: -> { false })
+      def self.run_command(command, timeout_sec:, cwd:, cancelled: -> { false }, env: nil)
         stdout_text = ""
         stderr_text = ""
         status = nil
@@ -75,7 +77,7 @@ module Samagotchi
         started = monotonic_time
         deadline = started + timeout_sec
 
-        Open3.popen3(command, chdir: cwd, pgroup: true) do |stdin, stdout, stderr, wait_thr|
+        Open3.popen3(env || {}, command, chdir: cwd, pgroup: true) do |stdin, stdout, stderr, wait_thr|
           stdin.close
           stdout_reader = reader_thread_for(stdout)
           stderr_reader = reader_thread_for(stderr)
@@ -173,11 +175,9 @@ module Samagotchi
       end
       private_class_method :monotonic_time
 
+      # execute.timeout_sec (SAMAGOTCHI_EXECUTE_TIMEOUT_SEC); 0 or less = the default.
       def self.timeout_seconds
-        value = Integer(ENV["SAMAGOTCHI_EXECUTE_TIMEOUT_SEC"].to_s, exception: false)
-        return TIMEOUT_SEC if value.nil? || value <= 0
-
-        value
+        OutputGuardrails.config_positive_int("execute.timeout_sec", TIMEOUT_SEC)
       end
       private_class_method :timeout_seconds
 

data/lib/samagotchi/tools/memory.rb

@@ -59,13 +59,13 @@ module Samagotchi
           resolved_scopes.each do |resolved_scope|
             path = memory_path(name, resolved_scope)
             if File.exist?(path)
-              body = File.read(path)
+              body = File.read(path, encoding: "UTF-8")
               # Append model-specific overlay if key is provided and overlay exists.
               [model_key, fallback_model_key].compact.each do |key|
                 overlay_path = ModelOverlay.overlay_path_for(name, key, resolved_scope)
                 next unless overlay_path && File.exist?(overlay_path)
 
-                body += SEPARATOR + "Model-specific guidance (#{key}):\n" + File.read(overlay_path)
+                body += SEPARATOR + "Model-specific guidance (#{key}):\n" + File.read(overlay_path, encoding: "UTF-8")
                 break
               end
               results << body
@@ -114,7 +114,7 @@ module Samagotchi
       def self.scoped_index(scope)
         dir = memories_dir(scope)
         index_path = File.join(dir, "#{MEMORY_INDEX}.md")
-        return File.read(index_path) if File.exist?(index_path)
+        return File.read(index_path, encoding: "UTF-8") if File.exist?(index_path)
 
         files = Dir.glob(File.join(dir, "*.md")).sort
         return "No memories stored yet." if files.empty?

data/lib/samagotchi/tools/task_create.rb

@@ -9,8 +9,9 @@ module Samagotchi
 
       def self.name = NAME
 
-      def self.call(command, cwd: nil, env: nil)
-        record, error = TaskRuntime.create_task(command, cwd: cwd, env: env)
+      # @param marker_env [Hash] set after the model's env (Builtins.parent_env)
+      def self.call(command, cwd: nil, env: nil, marker_env: {})
+        record, error = TaskRuntime.create_task(command, cwd: cwd, env: env, marker_env: marker_env)
         return error if error
 
         [

data/lib/samagotchi/tools/task_runtime.rb

@@ -19,10 +19,13 @@ module Samagotchi
       METADATA_VERSION = 1
       OUTPUT_TAIL_READ_BYTES = 16 * 1024
       SANITIZED_ENV_KEYS = %w[RUBYOPT RUBYLIB BUNDLE_GEMFILE BUNDLE_BIN_PATH BUNDLER_VERSION].freeze
+      # Set by chi (Builtins.parent_env); the model's env can't change it.
+      MARKER_ENV_KEYS = %w[SAMAGOTCHI_PARENT_SESSION].freeze
 
       module_function
 
-      def create_task(command, cwd: nil, env: nil)
+      # @param marker_env [Hash] chi's own variables, set over the model's +env+
+      def create_task(command, cwd: nil, env: nil, marker_env: {})
         normalized_command = command.to_s.strip
         return [nil, "Error: command is required"] if normalized_command.empty?
 
@@ -32,6 +35,8 @@ module Samagotchi
         spawn_env, env_error = spawn_env_for(env)
         return [nil, env_error] if env_error
 
+        spawn_env = spawn_env.merge(marker_env || {})
+
         task_id = generate_task_id
         task_dir = task_dir_for(task_id)
         output_path = File.join(task_dir, OUTPUT_FILENAME)
@@ -258,7 +263,7 @@ module Samagotchi
         overrides.each do |key, value|
           return [nil, "Error: env keys and values must be strings"] unless key.is_a?(String) && value.is_a?(String)
           return [nil, "Error: env keys and values cannot contain NUL bytes"] if key.include?("\0") || value.include?("\0")
-          return [nil, "Error: env key is reserved: #{key}"] if SANITIZED_ENV_KEYS.include?(key)
+          return [nil, "Error: env key is reserved: #{key}"] if SANITIZED_ENV_KEYS.include?(key) || MARKER_ENV_KEYS.include?(key)
 
           normalized[key] = value
         end

data/lib/samagotchi/utf8_default.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Samagotchi
+  # chi's files (memories, AGENT.md, sessions, config.yml) are UTF-8,
+  # whatever the locale. Under LC_ALL=C (or with no locale at all: an app
+  # started from Finder or launchd, `env -i`) Ruby reads files as US-ASCII,
+  # and a UTF-8 memory index then breaks the system prompt
+  # (Encoding::CompatibilityError). bin/chi and every worker call #apply!
+  # first.
+  module Utf8Default
+    LOCALE_KEYS = %w[LC_ALL LC_CTYPE LANG].freeze
+
+    # Files read as UTF-8 when the locale says US-ASCII. With no locale set
+    # at all, LANG too, so the workers and tools chi spawns get one; a
+    # locale the user set (LC_ALL=C) is left to them.
+    def self.apply!(env = ENV)
+      return unless Encoding.default_external == Encoding::US_ASCII
+
+      env["LANG"] = "en_US.UTF-8" if LOCALE_KEYS.none? { |key| env[key] }
+      verbose = $VERBOSE
+      begin
+        $VERBOSE = nil # Encoding.default_external= warns
+        Encoding.default_external = Encoding::UTF_8
+      ensure
+        $VERBOSE = verbose
+      end
+    end
+  end
+end

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -11,6 +11,7 @@ require "rack/request"
 
 require_relative "../bridge_client"
 require_relative "../bridge/bounded_queue"
+require_relative "../bridge/card_store"
 require_relative "../session"
 require_relative "../session_manager"
 require_relative "../session_commands"
@@ -533,17 +534,18 @@ module Samagotchi
         # ?cards=1: the page's re-read when a card arrives, for its rendered
         # body (the stream carries the card's plain text only).
         if req.params["cards"] == "1"
-          return json_response(200, { cards: cards_for_display(turn_snapshot) })
+          return json_response(200, { cards: cards_for_display(turn_snapshot, id) })
         end
         snapshot = live && live["session_state_snapshot"]
         last_event_seq = snapshot ? snapshot["event_seq"] : bridge_event_seq(id)
         current_turn = turn_snapshot && turn_snapshot["current_turn"]
         owner = session_owner(id)
-        # The file's question only with a live owner: one a dead worker
-        # saved can't be answered (its turn is gone).
+        # The file's question only while a worker owns the session: one a
+        # dead worker saved can't be answered (its turn is gone), nor a chi
+        # REPL's (it shares nothing with the web).
         pending = if turn_snapshot
                     current_turn && current_turn["pending_question"]
-                  elsif owner
+                  elsif owner&.worker?
                     session.pending_question
                   end
         # A /model in the worker changes it before the file catches up.
@@ -583,7 +585,7 @@ module Samagotchi
           plugin_warning: turn_snapshot && turn_snapshot["plugin_warning"],
           # Plugins' slow setup still running (chi.init): the page's init row.
           init_tasks: turn_snapshot ? Array(turn_snapshot["init_tasks"]) : [],
-          cards: cards_for_display(turn_snapshot),
+          cards: cards_for_display(turn_snapshot, id),
           # The composer's / autocomplete; the built-ins until a worker
           # names its plugins' too.
           commands: turn_snapshot&.fetch("commands", nil) || SessionCommands.builtin_registry.listing,
@@ -600,11 +602,14 @@ module Samagotchi
       end
 
       # The worker's last cards and between-turns notices (Bridge
-      # snapshot[:cards]), a card's body as body_html: rendered markdown
-      # when the renderer is on, else the escaped text in a <pre>.
-      # @return [Array<Hash>] [] without a live worker
-      def cards_for_display(turn_snapshot)
-        Array(turn_snapshot && turn_snapshot["cards"]).filter_map do |card|
+      # snapshot[:cards]), else (no live worker) the ones the last worker
+      # saved in the session's folder (CardStore.saved), a card's body as
+      # body_html: rendered markdown when the renderer is on, else the
+      # escaped text in a <pre>.
+      # @return [Array<Hash>]
+      def cards_for_display(turn_snapshot, id)
+        cards = turn_snapshot ? turn_snapshot["cards"] : saved_cards(id)
+        Array(cards).filter_map do |card|
           next unless card.is_a?(Hash)
           next card unless card["type"].to_s == "card"
 
@@ -612,6 +617,13 @@ module Samagotchi
         end
       end
 
+      # As JSON has them (string keys and values), like a snapshot's.
+      def saved_cards(id)
+        JSON.parse(JSON.generate(Samagotchi::Bridge::CardStore.saved(Session.session_dir(id, state_dir: default_state_dir))))
+      rescue StandardError
+        []
+      end
+
       def card_body_html(body)
         return "" if body.strip.empty?
 

data/lib/samagotchi/web/message_parts.rb

@@ -46,7 +46,8 @@ module Samagotchi
 
       QWEN_THINK = %r{<think>(.*?)</think>}m
       QWEN_OPEN_THINK = %r{\A(.*?)</think>}m # the template opened the block
-      GEMMA_THOUGHT = /<\|channel>thought(.*?)(?:<channel\|>|\z)/m
+      GEMMA_THOUGHT = Regexp.new("#{Regexp.escape(ModelProfile::GEMMA_THOUGHT_CHANNEL_OPEN)}(.*?)" \
+                                 "(?:#{Regexp.escape(ModelProfile::GEMMA_THOUGHT_CHANNEL_CLOSE)}|\\z)", Regexp::MULTILINE)
 
       CallRef = Struct.new(:name, :arguments)
 

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

@@ -12,6 +12,9 @@ export const ROW_STATUS = Object.freeze({
   ERROR: "error",
   // A task_wait the user's Stop ended (the task itself runs on).
   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.
+  BLOCKED: "blocked",
 });
 
 // What a row shows for its tool: a plugin tool's label ("chrome:
@@ -101,9 +104,11 @@ export function addCompleted(model, event = {}) {
   return row;
 }
 
-// A completed call's row status from the server's: error, stopped, else ok.
+// A completed call's row status from the server's: error, stopped,
+// blocked, else ok.
 export function completedStatus(status) {
   if (status === "error") return ROW_STATUS.ERROR;
   if (status === "stopped") return ROW_STATUS.STOPPED;
+  if (status === "blocked") return ROW_STATUS.BLOCKED;
   return ROW_STATUS.OK;
 }

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

@@ -38,7 +38,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 { stripColumns, stripShowParts } from "./strip.js";
-import { applySessionEvent, listedSessions, sortedByUpdated, withChildrenAfterParents } from "./sessions_list.js";
+import { applySessionEvent, heldOrder, listedSessions, sortedByUpdated, waitingBadge, waitingFirst, withChildrenAfterParents } from "./sessions_list.js";
 import { createNotifications } from "./notifications.js";
 import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, normalizeTiming, turnTimingText,
@@ -267,7 +267,9 @@ function filteredSessions(list) {
 }
 
 // A card: the first message as its title, then status, how long ago, owner
-// and memories. The id is in the tooltip (and the search) only.
+// and memories. The id is in the tooltip (and the search) only. A session
+// that waits on the user (a question, an approval, a card with actions)
+// wears the warning colour and says what for.
 // deletable: the all-sessions view's cards get a delete button.
 function cardHtml(s, { deletable = false } = {}) {
   const ts = s.updated_at || s.created_at || "";
@@ -281,7 +283,10 @@ function cardHtml(s, { deletable = false } = {}) {
   const archivedHtml = s.archived ? `<span class="archived-badge" title="Archived: hidden from the lists, kept for good">archived</span>` : "";
   const ctx = cardCtxText(s.ctx_pct);
   const ctxHtml = ctx ? `<span class="ctx" title="Context used after the last turn">${escapeHtml(ctx)}</span>` : "";
-  return `<div class="card${s.archived ? " archived" : ""}" 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)}" title="${escapeHtml(s.status)}" aria-label="${escapeHtml(s.status)}"></span>${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>`;
+  const waiting = waitingBadge(s);
+  const waitingHtml = waiting ? `<span class="attn ${waiting.kind}" title="${escapeHtml(waiting.title)}">${escapeHtml(waiting.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>`;
 }
 
 // A delegated session's `↳ <parent>` chip; the parent's preview is the tooltip.
@@ -304,9 +309,30 @@ function fitStripColumns() {
   topStripEl.style.setProperty("--strip-cols", stripCols);
 }
 
+// The order a list draws its cards in: the sessions that wait on the user
+// first (waitingFirst), back to their place once answered. Never under the
+// pointer, though: while it is over the list the order last drawn holds,
+// and its leaving draws the list again.
+const drawnOrder = new Map(); // list element → ids in the order last drawn
+const heldLists = new Set(); // lists drawn in a held order
+const canHover = globalThis.matchMedia?.("(hover: hover)").matches ?? false;
+function listOrder(el, list) {
+  const next = waitingFirst(list);
+  const held = canHover && el.matches(":hover") ? drawnOrder.get(el) : null;
+  const ordered = held ? heldOrder(held, next) : next;
+  if (held && ordered.some((s, i) => s !== next[i])) heldLists.add(el);
+  else heldLists.delete(el);
+  drawnOrder.set(el, ordered.map((s) => s.id));
+  return ordered;
+}
+
+function stripSessions() {
+  return listOrder(topStripEl, shownSessions()).slice(0, stripCols);
+}
+
 function render() {
   fitStripColumns();
-  renderTop(shownSessions().slice(0, stripCols));
+  renderTop(stripSessions());
   if (allViewOpen()) renderAll();
 }
 
@@ -316,7 +342,7 @@ window.addEventListener("resize", () => {
   stripResizeTimer = setTimeout(() => {
     const before = stripCols;
     fitStripColumns();
-    if (stripCols !== before && allSessions.length) renderTop(shownSessions().slice(0, stripCols));
+    if (stripCols !== before && allSessions.length) renderTop(stripSessions());
   }, 150);
 });
 
@@ -370,7 +396,7 @@ function renderStripShow() {
 // render, since a hub snapshot hands the list back in the server's order.
 function renderAll() {
   const listed = allViewSessions();
-  const sessions = withChildrenAfterParents(filteredSessions(listed));
+  const sessions = listOrder(allListEl, withChildrenAfterParents(filteredSessions(listed)));
   $("#count").textContent = sessions.length === listed.length
     ? `${listed.length}`
     : `${sessions.length} / ${listed.length}`;
@@ -2208,6 +2234,13 @@ setStripHidden(stripHiddenSaved());
 $("#stripShow").addEventListener("click", () => setStripHidden(false));
 
 $("#filter").addEventListener("input", renderAll);
+// A list whose order was held under the pointer (listOrder) catches up.
+topStripEl.addEventListener("pointerleave", () => {
+  if (heldLists.has(topStripEl)) renderTop(stripSessions());
+});
+allListEl.addEventListener("pointerleave", () => {
+  if (heldLists.has(allListEl) && allViewOpen()) renderAll();
+});
 // Esc leaves the all-sessions view.
 document.addEventListener("keydown", (e) => {
   if (e.key === "Escape" && allViewOpen()) closeAllView();

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

@@ -14,6 +14,9 @@ body{font-family: ui-sans-serif,system-ui,-apple-system,Segoe UI,Roboto,Helvetic
 #dock,.turn-stage,.dock-card,#topStrip .card,#allList .card,.bubble.question,.bubble.plugin-card{background:var(--glass-bg);-webkit-backdrop-filter:blur(18px) saturate(1.35);backdrop-filter:blur(18px) saturate(1.35);border:1px solid var(--glass-border);box-shadow:inset 0 1px 0 var(--glass-highlight),var(--glass-shadow)}
 #topStrip .card:hover,#allList .card:hover{background:color-mix(in srgb,var(--bg-hover) 75%,transparent);border-color:rgba(255,255,255,.14)}
 #topStrip .card.active,#allList .card.active{background:color-mix(in srgb,var(--accent-bg) 75%,transparent);border-color:color-mix(in srgb,var(--accent) 35%,transparent)}
+/* A session that waits on the user (a question, an approval, a card with actions): the warning colour of its question card, also when active or hovered. */
+#topStrip .card.waiting,#allList .card.waiting{border-color:color-mix(in srgb,var(--warn) 75%,transparent)}
+#topStrip .card.waiting:hover,#allList .card.waiting:hover{border-color:var(--warn)}
 @supports not ((backdrop-filter:blur(1px)) or (-webkit-backdrop-filter:blur(1px))){#dock,.turn-stage,.dock-card,#topStrip .card,#allList .card,#allHead input{background:var(--bg-panel)}.bubble.question{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel))}.bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel))}}
 @media (prefers-reduced-transparency:reduce){#dock,.turn-stage,.dock-card,#topStrip .card,#allList .card,#allHead input{background:var(--bg-panel);-webkit-backdrop-filter:none;backdrop-filter:none}.bubble.question{background:color-mix(in srgb,var(--warn) 7%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}.bubble.plugin-card{background:color-mix(in srgb,var(--accent) 6%,var(--bg-panel));-webkit-backdrop-filter:none;backdrop-filter:none}}
 body.no-glass #dock,body.no-glass .turn-stage,body.no-glass .dock-card,body.no-glass #topStrip .card,body.no-glass #allList .card,body.no-glass #allHead input{background:var(--bg-panel);-webkit-backdrop-filter:none;backdrop-filter:none}
@@ -111,6 +114,7 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .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)}
 .activity-tool{color:var(--accent);font-weight:600}
 .activity-params{color:var(--text-muted);word-break:break-all}
 .activity-duration{color:var(--text-faint);font-size:11px;font-variant-numeric:tabular-nums;white-space:nowrap}
@@ -687,7 +691,10 @@ body.all-view #center, body.all-view #topStrip{display:none}
 .card .dot.completed{background:var(--accent)}
 .card .dot.error{background:var(--danger)}
 @keyframes dot-pulse{0%,100%{box-shadow:0 0 0 0 color-mix(in srgb,var(--ok) 55%,transparent)}50%{box-shadow:0 0 0 4px color-mix(in srgb,var(--ok) 0%,transparent)}}
-@media (prefers-reduced-motion:reduce){.card .dot.running{animation:none}}
+.card .dot.waiting{background:var(--warn);animation:attn-pulse 1.6s ease-in-out infinite}
+@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)}
 .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/notify.js

@@ -15,6 +15,21 @@ export function notifyState({ hasNotification, secureContext, permission, wanted
 // A finished turn shorter than this was watched: no "done".
 export const DONE_MIN_SECONDS = 10;
 
+const questionReason = (q) => (q.kind === "approval" ? "approval" : "question");
+
+// What a session waits on the user for right now, from one summary: an open
+// question or approval, or a running turn's card with actions (check-in's
+// Nudge / Keep going / Stop asks as a question does). The session cards
+// mark and lift these; attentionFor notifies when one opens.
+// @return null | {reason: "question"|"approval"|"card", id}
+export function waitingOn(summary) {
+  const q = summary?.pending_question;
+  if (q && q.id) return { reason: questionReason(q), id: q.id };
+  const card = summary?.pending_card;
+  if (card && card.id) return { reason: "card", id: card.id };
+  return null;
+}
+
 // What changed between two summaries of one session that needs the user.
 // @param prev the summary held before (null for a session not seen yet)
 // @param next the new summary
@@ -24,10 +39,8 @@ export function attentionFor(prev, next) {
   if (!next || !next.id) return null;
   const q = next.pending_question;
   if (q && q.id && q.id !== prev?.pending_question?.id) {
-    return { reason: q.kind === "approval" ? "approval" : "question", sessionId: next.id, key: `${next.id}:${q.id}` };
+    return { reason: questionReason(q), sessionId: next.id, key: `${next.id}:${q.id}` };
   }
-  // A running turn's card with actions (check-in's Nudge / Keep going /
-  // Stop) asks the user as a question does.
   const card = next.pending_card;
   if (card && card.id && card.id !== prev?.pending_card?.id) {
     return { reason: "card", sessionId: next.id, key: cardKey(next.id, card.id) };

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

@@ -158,9 +158,11 @@ export function createQuestionCards({
     });
     card.appendChild(dismiss);
 
+    // Read before the card makes the history taller.
+    const follow = isNearBottom();
     place(card);
     questionEl = card;
-    if (isNearBottom()) scrollToEnd();
+    if (follow) scrollToEnd();
   }
 
   // The tool, the command (or paths, or args) as code, where and why; no

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

@@ -1,5 +1,6 @@
 // The page's session list as a projection of the hub's events
 // (GET /api/events): a pure reducer over the list the page holds.
+import { waitingOn } from "./notify.js";
 
 // @param list the current list (never mutated)
 // @param type "snapshot" | "session" | "session_gone"
@@ -65,3 +66,39 @@ export function withChildrenAfterParents(list) {
   const ordered = heads.slice().sort((a, b) => familyMs(b) - familyMs(a));
   return ordered.flatMap((s) => [s, ...(children.get(s.id) || [])]);
 }
+
+const WAITING_BADGES = {
+  question: { text: "question", title: "Waiting for your answer" },
+  approval: { text: "approval", title: "Waiting for your approval" },
+  card: { text: "needs you", title: "A card in the running turn waits for you" },
+};
+
+// A card's "needs you" badge: what the session waits on the user for
+// (notify.js waitingOn), or null.
+// @return null | {kind, text, title}
+export function waitingBadge(summary) {
+  const waiting = waitingOn(summary);
+  return waiting ? { kind: waiting.reason, ...WAITING_BADGES[waiting.reason] } : null;
+}
+
+// The sessions that wait on the user (waitingOn) first, the rest after,
+// each part in the list's order: an answered one goes back to its place.
+// A delegated session moves with its parent when both are listed (a
+// family waits when any of it does), so withChildrenAfterParents' groups
+// stay together.
+export function waitingFirst(list) {
+  const ids = new Set(list.map((s) => s.id));
+  const family = (s) => (s.parent_id && ids.has(s.parent_id) ? s.parent_id : s.id);
+  const waiting = new Set(list.filter((s) => waitingOn(s)).map(family));
+  if (!waiting.size) return list;
+  return [...list.filter((s) => waiting.has(family(s))), ...list.filter((s) => !waiting.has(family(s)))];
+}
+
+// The list in an order shown before (+ids+): what the pointer is over
+// doesn't move. Sessions new since then go after, in the list's order;
+// gone ones drop out.
+export function heldOrder(ids, list) {
+  const at = new Map(ids.map((id, i) => [id, i]));
+  const known = list.filter((s) => at.has(s.id)).sort((a, b) => at.get(a.id) - at.get(b.id));
+  return [...known, ...list.filter((s) => !at.has(s.id))];
+}

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

@@ -24,19 +24,16 @@ import * as model from "./turn_model.js";
 import { createHold } from "./hold.js";
 
 // A row's status (live, or a saved tool record's on reload): running,
-// error, stopped (a task_wait the user's Stop ended), else ok ("done").
+// error, stopped (a task_wait the user's Stop ended), blocked (a guardrail
+// denied it), else ok ("done").
+const NAMED_STATUSES = ["running", "error", "stopped", "blocked"];
+
 function activityStatusClass(status) {
-  if (status === "running") return "running";
-  if (status === "error") return "error";
-  if (status === "stopped") return "stopped";
-  return "ok";
+  return NAMED_STATUSES.includes(status) ? status : "ok";
 }
 
 function activityStatusLabel(status) {
-  if (status === "running") return "running";
-  if (status === "error") return "error";
-  if (status === "stopped") return "stopped";
-  return "done";
+  return NAMED_STATUSES.includes(status) ? status : "done";
 }
 
 // A live tool row filled from its activity row (status, title, output).

data/lib/samagotchi/web/server.rb

@@ -16,6 +16,7 @@ require_relative "../config"
 require_relative "../project_scope"
 require_relative "../log"
 require_relative "../version"
+require_relative "../cli/exit"
 
 module Samagotchi
   module Web
@@ -99,7 +100,7 @@ module Samagotchi
         # Ctrl-C: the server has stopped (start's ensure); one line, and the
         # status a shell gives a command it interrupted.
         puts "#{"\n" if $stdout.tty?}Chi Web stopped."
-        130
+        CLI::Exit::INTERRUPTED
       end
 
       # @param hub [SessionHub, nil] the session projection the page streams