samagotchi 0.13.0 → 0.14.0

data/lib/samagotchi/llm/turn_settings.rb

@@ -8,12 +8,14 @@ module Samagotchi
     # ChatLoop) and ToolRunner: the turn's VisionContext (nil sends no
     # images, placeholders instead), its request parameters
     # (SamplingSettings.for; empty sends none), its thinking level
-    # (Thinking.resolve) and the bare model id the turn runs on (every
-    # debug dump is tagged with it). The Engine sets them once per turn,
-    # in Engine#generate, after the model's host is synced.
-    TurnSettings = Data.define(:vision, :sampling, :thinking, :model_name) do
+    # (Thinking.resolve), the bare model id the turn runs on (every debug
+    # dump is tagged with it) and the model's or host's configured context
+    # window (ContextWindow.setting, nil for none). The Engine sets them
+    # once per turn, in Engine#generate, after the model's host is synced.
+    TurnSettings = Data.define(:vision, :sampling, :thinking, :model_name, :window_setting) do
       # No vision, no sampling, the default thinking, no model name.
-      def self.none = new(vision: nil, sampling: {}.freeze, thinking: Thinking::DEFAULT, model_name: nil)
+      def self.none = new(vision: nil, sampling: {}.freeze, thinking: Thinking::DEFAULT, model_name: nil,
+                          window_setting: nil)
     end
   end
 end

data/lib/samagotchi/session_manager.rb

@@ -12,6 +12,7 @@ require_relative "config"
 require_relative "session"
 require_relative "session_inbox"
 require_relative "session_metrics"
+require_relative "utf8_default"
 require_relative "turn_note"
 require_relative "owner_lock"
 require_relative "bridge_client"
@@ -552,6 +553,9 @@ module Samagotchi
           File.directory?(path) && (!EMPTY_DIRS.include?(name) || Dir.children(path).empty?)
         elsif name == "analytics.json"
           Array(JSON.parse(File.read(path))["turn_records"]).empty?
+        # Cards and notices from before any turn (Bridge::CardStore).
+        elsif name == "cards.json"
+          JSON.parse(File.read(path))["turns"].to_i.zero?
         else
           EMPTY_SKELETON_FILES.include?(name)
         end
@@ -631,6 +635,8 @@ module Samagotchi
     # @return [Symbol] :idle_exit or :exit_requested
     def self.run_session_loop(session_id, state_dir: nil, owner_wait: OwnerLock::DEFAULT_WAIT,
                               idle_exit_minutes: nil, poll_interval: nil)
+      # A worker inherits chi's locale (LC_ALL=C too): read files as UTF-8.
+      Utf8Default.apply!
       sd = state_dir || Session.default_state_dir
       # The spawner passed the file and level through ENV; a worker's stderr
       # is /dev/null, so warnings only reach the file.

data/lib/samagotchi/system_prompt.rb

@@ -335,7 +335,7 @@ module Samagotchi
       path = agent_description_path
       return nil unless path
 
-      content = File.read(path).strip
+      content = File.read(path, encoding: "UTF-8").strip
       return nil if content.empty?
 
       "Project specific description:\n#{content}"

data/lib/samagotchi/terminal_ui/attached_loop.rb

@@ -105,6 +105,7 @@ module Samagotchi
         @running = false
         @joined_mid_turn = false
         @attached = false
+        @early_lines = []
         @question = nil
         @answered_ids = Set.new
         @reader = nil
@@ -162,16 +163,17 @@ module Samagotchi
           when :event
             ended = safely_handle(payload)
             return ended if %i[closed failed unanswered].include?(ended)
+
+            ended = take_early_lines
+            return ended if ended
             return end_of_input if @input_ended && !own_turns_pending?
           when :line
-            if payload.nil? && @wait_at_eof && own_turns_pending?
-              # The pipe's end: this run's turns first. An open question
-              # has nothing left to answer it.
-              return unanswered_question(@question_pending) if @question
-
-              next @input_ended = true
-            end
-            return end_of_input if submit(payload) == :detach
+            # A pipe is read at once: its lines wait for the joining
+            # snapshot, which may bring the question they answer.
+            next @early_lines << payload if @wait_at_eof && !@attached
+
+            ended = take_line(payload)
+            return ended if ended
           when :interrupt then return :detached if interrupt(payload) == :detach
           end
         end
@@ -187,6 +189,30 @@ module Samagotchi
         stream&.close
       end
 
+      # One input line (nil: the input ended).
+      # @return [Symbol, nil] how the run ends, or nil to go on
+      def take_line(line)
+        if line.nil? && @wait_at_eof && own_turns_pending?
+          # The pipe's end: this run's turns first. An open question
+          # has nothing left to answer it.
+          return unanswered_question(@question_pending) if @question
+
+          @input_ended = true
+          return nil
+        end
+        end_of_input if submit(line) == :detach
+      end
+
+      # The lines read before the snapshot came, once it has.
+      # @return [Symbol, nil] how the run ends, or nil to go on
+      def take_early_lines
+        until !@attached || @early_lines.empty?
+          ended = take_line(@early_lines.shift)
+          return ended if ended
+        end
+        nil
+      end
+
       # Render one Bridge event (string keys).
       # @return [Symbol, nil] :closed when the stream ended, :failed when the
       #   launch's first command didn't go through
@@ -948,7 +974,8 @@ module Samagotchi
       # The snapshot's cards and between-turns notices (Bridge CardStore):
       # on join the ones since the last turn (and the running turn's), as
       # the join header shows the last exchange; on a resync only cards not
-      # shown here yet. A turn's own rows (notices, retries) are left out:
+      # shown here yet, and not the ones an earlier worker saved (a resync
+      # onto a new worker: earlier turns, not news). A turn's own rows (notices, retries) are left out:
       # the running turn's come with its parts, and the join shows no older
       # turn's steps.
       def render_snapshot_cards(entries, joining:)
@@ -959,7 +986,7 @@ module Samagotchi
 
             @screen.commit(EventRenderer.hook_notice_line(entry)) if joining && entry[:turns_since].to_i.zero?
           when "card"
-            next unless joining ? entry[:turns_since].to_i.zero? : !@renderer.card_shown?(entry[:id])
+            next unless joining ? entry[:turns_since].to_i.zero? : !entry[:earlier] && !@renderer.card_shown?(entry[:id])
 
             @renderer.render_card(entry, updated: entry[:updated] == true)
           end

data/lib/samagotchi/terminal_ui.rb

@@ -1112,6 +1112,7 @@ module Samagotchi
     # was cancelled).
     def answer_question_widget(prompt)
       loop do
+        @choice_echoed = false
         raw = begin
           yield
         rescue Interrupt
@@ -1133,7 +1134,7 @@ module Samagotchi
         @surface.commit(answer.note) if answer.note
         unless answer.ok?
           # The read left no echo: the line shows above its error.
-          @surface.commit("#{paint(QUESTION_PROMPT, 33)}#{raw}")
+          echo_choice(raw)
           @surface.commit(answer.error)
           next
         end
@@ -1146,7 +1147,7 @@ module Samagotchi
         rescue QuestionDesk::Refused => e
           # A parent's allow guardrails.parent_approvals doesn't let through:
           # the question stays open for a deny (or the end of the input).
-          @surface.commit("#{paint(QUESTION_PROMPT, 33)}#{raw}")
+          echo_choice(raw)
           @surface.commit(Guardrails::ParentApprovals.message(e.reason, typed: true))
           next
         rescue ArgumentError => e
@@ -1173,7 +1174,19 @@ module Samagotchi
     # A ? read of its own, off a terminal (specs, pipes): $stdin.gets.
     def read_choice_line(question_prompt)
       @surface.set_slot(:editor, [question_prompt])
-      $stdin.gets
+      line = $stdin.gets
+      # A pipe doesn't echo: the line completes the ? prompt here, once,
+      # and the widget doesn't echo it again (#echo_choice).
+      unless $stdin.tty?
+        @surface.commit(line.to_s.chomp)
+        @choice_echoed = true
+      end
+      line
+    end
+
+    # The answer line above its error, unless its read echoed it already.
+    def echo_choice(raw)
+      @surface.commit("#{paint(QUESTION_PROMPT, 33)}#{raw}") unless @choice_echoed
     end
 
     # The next line submitted at the open prompt (?), nil for Ctrl-D

data/lib/samagotchi/tools/delegate_wait.rb

@@ -9,7 +9,8 @@ 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.
@@ -56,22 +57,23 @@ module Samagotchi
                                         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, "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)
@@ -95,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)

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/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.13.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,7 +534,7 @@ 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)
@@ -584,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,
@@ -601,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"
 
@@ -613,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/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))];
+}