samagotchi 0.32.0 → 0.33.0

data/lib/samagotchi/tools/execute.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "open3"
+require_relative "../process_group"
 require_relative "output_guardrails"
 require_relative "shell"
 
@@ -95,7 +96,7 @@ module Samagotchi
 
         Open3.popen3(env || {}, *Shell.argv(command), chdir: cwd, pgroup: true) do |stdin, stdout, stderr, wait_thr|
           stdin.close
-          readers = [OutputReader.new(stdout), OutputReader.new(stderr)]
+          readers = [stdout, stderr].map { |io| ProcessGroup::PipeReader.new(io, chunk: READ_CHUNK_BYTES) }
 
           begin
             until wait_thr.join(WAIT_SLICE_SEC)
@@ -132,7 +133,7 @@ module Samagotchi
               stopped = stop_process_group(wait_thr.pid, readers)
               held_open = (stopped ? :stopped : :detached) if outcome == :grace && !stopping
             end
-            readers.each(&:finish)
+            readers.each { |reader| reader.finish(poll: STOP_POLL_INTERVAL_SEC, grace: STOP_GRACE_SEC) }
             stdout_text, stderr_text = readers.map(&:text)
           end
         end
@@ -162,95 +163,23 @@ module Samagotchi
       # has members holding the output: TERM the group, then KILL it. A process
       # that left the group (setsid) is out of reach; the pipes get closed.
       # True once the output was released, false if something still holds it.
+      # Only the group: the leader's pid is reaped, so it may name another process.
       def self.stop_process_group(pgid, readers)
-        signal_group(pgid, "TERM")
-        return true if await_readers(readers, until_time: monotonic_time + STOP_GRACE_SEC, deadline: nil,
-                                              cancelled: -> { false }) == :done
+        released = -> { readers.all?(&:done?) }
+        wait = ->(seconds) { readers.find { |r| !r.done? }&.wait(seconds) }
+        return true if ProcessGroup.stop(pgid, grace: STOP_GRACE_SEC, poll: STOP_POLL_INTERVAL_SEC, stopped: released, wait: wait)
 
-        signal_group(pgid, "KILL")
         await_readers(readers, until_time: monotonic_time + STOP_GRACE_SEC, deadline: nil, cancelled: -> { false }) == :done
       end
       private_class_method :stop_process_group
 
-      # Only the group: the leader's pid is reaped, so it may name another process.
-      def self.signal_group(pgid, signal)
-        Process.kill(signal, -pgid)
-      rescue Errno::ESRCH, Errno::EPERM
-        nil
-      end
-      private_class_method :signal_group
-
-      # Reads a pipe in chunks on its own thread, so the output read so far
-      # survives the pipe being closed under it.
-      class OutputReader
-        def initialize(io)
-          @io = io
-          @buffer = String.new(encoding: Encoding::BINARY)
-          @thread = Thread.new do
-            Thread.current.report_on_exception = false
-            loop { @buffer << io.readpartial(READ_CHUNK_BYTES) }
-          rescue IOError # EOFError is one
-            nil
-          end
-        end
-
-        def done? = !@thread.alive?
-
-        def wait(seconds) = @thread.join(seconds)
-
-        # Closes the pipe (a reader still blocked gets IOError) and ends the
-        # thread; the text is safe to read afterwards.
-        def finish
-          @thread.join(STOP_POLL_INTERVAL_SEC) unless done?
-          close_quietly
-          @thread.kill unless @thread.join(STOP_GRACE_SEC)
-        end
-
-        def text
-          @buffer.dup.force_encoding(@io.external_encoding || Encoding.default_external)
-        end
-
-        private
-
-        def close_quietly
-          @io.close unless @io.closed?
-        rescue IOError
-          nil
-        end
-      end
-      private_constant :OutputReader
-
+      # The shell still runs: TERM its group (or the shell alone, if it left
+      # the group), then KILL it once the grace is over.
       def self.terminate_process_tree(pid)
-        signal_process(pid, "TERM")
-
-        deadline = monotonic_time + STOP_GRACE_SEC
-        sleep(STOP_POLL_INTERVAL_SEC) while process_alive?(pid) && monotonic_time < deadline
-
-        signal_process(pid, "KILL") if process_alive?(pid)
+        ProcessGroup.stop(pid, grace: STOP_GRACE_SEC, poll: STOP_POLL_INTERVAL_SEC, leader: true)
       end
       private_class_method :terminate_process_tree
 
-      def self.signal_process(pid, signal)
-        Process.kill(signal, -pid)
-      rescue Errno::ESRCH, Errno::EPERM
-        begin
-          Process.kill(signal, pid)
-        rescue Errno::ESRCH, Errno::EPERM
-          nil
-        end
-      end
-      private_class_method :signal_process
-
-      def self.process_alive?(pid)
-        Process.kill(0, pid)
-        true
-      rescue Errno::ESRCH
-        false
-      rescue Errno::EPERM
-        true
-      end
-      private_class_method :process_alive?
-
       def self.monotonic_time
         Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end

data/lib/samagotchi/tools/task_runtime.rb

@@ -6,6 +6,7 @@ require "securerandom"
 require "shellwords"
 require "time"
 require_relative "../atomic_file"
+require_relative "../process_group"
 require_relative "shell"
 
 module Samagotchi
@@ -24,6 +25,9 @@ module Samagotchi
       MARKER_ENV_KEYS = %w[SAMAGOTCHI_PARENT_SESSION SAMAGOTCHI_SESSION_MODEL].freeze
       # task_wait and task_get add it to a task the user stopped (the web's
       # stop-task button), so the model doesn't rerun the job.
+      # A record whose pid isn't a process group chi started (missing, 0, 1,
+      # not a number, or a pid another process reuses): nothing is signalled.
+      NOT_CHIS_PROCESS = "the task's process is gone or isn't the one chi started"
       USER_STOP_NOTE = "note: the user stopped this task; don't restart it unless they ask."
 
       module_function
@@ -54,13 +58,12 @@ module Samagotchi
 
         wrapped_command = wrapped_shell_command(normalized_command, exit_code_path)
         # Non-login, the shell Execute uses too (Shell).
-        pid = Process.spawn(
+        pid = ProcessGroup.spawn(
           spawn_env,
           *Shell.argv(wrapped_command),
           chdir: resolved_cwd,
           out: output_io,
-          err: output_io,
-          pgroup: true
+          err: output_io
         )
         Process.detach(pid)
 
@@ -185,26 +188,15 @@ module Samagotchi
         refreshed = refresh_record(record)
         return [refreshed, nil] unless refreshed["status"] == "running"
 
+        pid = refreshed["pid"]
+        # Checked again just before the signal: never a group chi didn't start.
+        return [mark_not_chis(refreshed), nil] unless ProcessGroup.leader?(pid)
+
         refreshed["stop_requested_by"] = by.to_s
         write_record(refreshed)
-        pid = refreshed["pid"].to_i
-
-        begin
-          Process.kill("TERM", -pid)
-        rescue Errno::ESRCH
-          # Process already exited; status refresh below handles final state.
-        end
 
-        deadline = monotonic_time + STOP_GRACE_SEC
-        sleep(STOP_POLL_INTERVAL_SEC) while process_alive?(pid) && monotonic_time < deadline
-
-        if process_alive?(pid)
-          begin
-            Process.kill("KILL", -pid)
-          rescue Errno::ESRCH
-            # Process exited between checks.
-          end
-        end
+        # A group that isn't ours (EPERM) is an error, not a stop.
+        ProcessGroup.stop(pid, grace: STOP_GRACE_SEC, poll: STOP_POLL_INTERVAL_SEC, quiet: [Errno::ESRCH])
 
         updated = mark_stopped(refresh_record(refreshed))
         write_record(updated)
@@ -217,10 +209,18 @@ module Samagotchi
       def refresh_record(record)
         return record unless record["status"] == "running"
 
-        pid = record["pid"].to_i
-        return mark_finished_without_exit_code(record) unless process_alive?(pid)
+        pid = record["pid"]
+        return record if ProcessGroup.leader?(pid)
+        # Gone: its exit code says how it ended.
+        return mark_finished_without_exit_code(record) if ProcessGroup.signalable?(pid) && !ProcessGroup.alive?(pid)
 
-        record
+        mark_not_chis(record)
+      end
+
+      # A running record whose pid isn't a group chi started (NOT_CHIS_PROCESS)
+      # ends as failed, unless its exit code or a stop on disk says more.
+      def mark_not_chis(record)
+        mark_finished_without_exit_code(record, missing_reason: NOT_CHIS_PROCESS)
       end
 
       # A session id (a uuid) is never a task's: task ids are a timestamp
@@ -338,16 +338,7 @@ module Samagotchi
         filtered.join(" ")
       end
 
-      def process_alive?(pid)
-        Process.kill(0, pid)
-        true
-      rescue Errno::ESRCH
-        false
-      rescue Errno::EPERM
-        true
-      end
-
-      def mark_finished_without_exit_code(record)
+      def mark_finished_without_exit_code(record, missing_reason: "process_ended_without_exit_code")
         record = current_record(record)
         return record unless record["status"] == "running"
 
@@ -359,7 +350,7 @@ module Samagotchi
         elsif exit_code.nil?
           record["status"] = "failed"
           record["exit_code"] = nil
-          record["stop_reason"] ||= "process_ended_without_exit_code"
+          record["stop_reason"] ||= missing_reason
         elsif exit_code.zero?
           record["status"] = "completed"
           record["exit_code"] = 0
@@ -401,10 +392,6 @@ module Samagotchi
       def timestamp
         Time.now.utc.iso8601
       end
-
-      def monotonic_time
-        Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      end
     end
   end
 end

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -9,6 +9,7 @@ require "uri"
 require "rack"
 require "rack/request"
 
+require_relative "../client_id"
 require_relative "../answer_tail"
 require_relative "../bridge_client"
 require_relative "../bridge/bounded_queue"
@@ -1069,7 +1070,7 @@ module Samagotchi
       # {error: "held" | "not_running" | "unsupported" | "failed", reason, detail} in words; 409
       # owned_by_tui; 404.
       def handle_restart(_req, id)
-        result = @manager.restart_session(id, state_dir: @state_dir, client_id: "web:restart")
+        result = @manager.restart_session(id, state_dir: @state_dir, client_id: ClientId::WEB_RESTART)
         @hub&.touch(id)
         json_response(200, { status: "restarted", session_id: id, from_version: result.from_version,
                              version: result.version })

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

@@ -21,6 +21,8 @@ import {
   addContext,
 } from "./data.js";
 import { createContextChips } from "./context_chips.js";
+import { renderStable } from "./stable_html.js";
+import { createShownTexts } from "./shown_texts.js";
 import { MODEL_KEY } from "./model_pick.js";
 import { emptySessionState } from "./session_state.js";
 import { createModelPicker } from "./model_picker.js";
@@ -63,7 +65,7 @@ const infoBarEl = $("#infoBar");
 const firstPeekEl = $("#firstPeek");
 const infoTextEl = $("#infoText");
 // The open session's attached context, in its own row of the session bar
-// (updateInfoBar rewrites #infoText every tick; the chips keep their popover).
+// (updateInfoBar redraws #infoText every tick; the chips keep their popover).
 const contextChips = createContextChips({
   el: $("#contextChips"),
   api: { list: listContext, show: getContext, detach: detachContext, add: addContext },
@@ -87,7 +89,8 @@ let eventsControl = null;
 let resyncsInFlight = 0;
 let resyncAgain = false;
 let allSessions = [];
-let seenContent = new Set();
+// The running turn's texts on the page (the turn output dedupe).
+const shownTexts = createShownTexts();
 // The page's view of a turn (web.view, or ?view=stage|turn): the running
 // turn pinned above the composer (the stage, stage_view.js), or one block
 // per turn with its steps in the history (turn_view.js).
@@ -98,7 +101,7 @@ const viewArgs = {
   historyEl,
   appendToHistory: (el) => appendToHistory(el),
   isNearBottom: () => isNearBottom(),
-  sawText: (k) => seenContent.add(k),
+  sawText: (k) => shownTexts.saw(k),
   sessionId: () => selected,
   // The stop-task button on a running task_wait, for a worker that has
   // the route (its sidecar features).
@@ -950,11 +953,7 @@ function applyFinalMarkdown(messages) {
 }
 
 function seedSeenFromDom() {
-  seenContent = new Set();
-  findInTurnRoots(".bubble").forEach((b) => {
-    const k = normalize(b.textContent);
-    if (k) seenContent.add(k);
-  });
+  shownTexts.seed(findInTurnRoots(".bubble").map((b) => normalize(b.textContent)));
 }
 
 // Sticky-follow scroll: only auto-scroll to the bottom while the user is
@@ -974,7 +973,7 @@ function atHistoryEnd() {
 function appendChunk(text) {
   if (!text) return;
   const k = normalize(text);
-  if (!k || seenContent.has(k)) return;
+  if (!k || shownTexts.shows(k)) return;
   const follow = isNearBottom();
   const hint = historyEl.querySelector(".hint");
   if (hint) hint.remove();
@@ -1464,7 +1463,7 @@ function updateInfoBar() {
   }
   if (!selected) {
     // The start page hides the info bar (the storage path is on #/sessions).
-    infoTextEl.innerHTML = "";
+    renderStable(infoTextEl, "");
     infoTextEl.title = "";
     if (stopBtn) stopBtn.style.display = "none";
     return;
@@ -1488,9 +1487,11 @@ function updateInfoBar() {
   const attachCmd = `chi --attach ${selected}`;
   const copied = Date.now() - attachCopiedAt < 2000;
   const copyHtml = `<button type="button" class="copy-attach" title="Copy &quot;${escapeHtml(attachCmd)}&quot; to attach a terminal">${copied ? "copied ✓" : "copy chi --attach"}</button>`;
-  const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${parentHtml}${current.usedMemories.length ? `<span class="model mem-chip" title="${escapeHtml(memChipTitle(current.usedMemories))}">${escapeHtml(memChipText(current.usedMemories))}</span>` : ""}<span class="dir" title="${escapeHtml(current.dir||"")}"><bdi>${escapeHtml(current.dir||"")}</bdi></span>${ctxText ? `<span class="model ctx" title="${escapeHtml(ctxTip)}">${escapeHtml(ctxText)}</span>` : ""}${speedTextNow ? `<span class="model speed" title="${escapeHtml(speedTip)}">${escapeHtml(speedTextNow)}</span>` : ""}${timingText ? `<span class="model">${escapeHtml(timingText)}</span>` : ""}${workerBadgeHtml()}</div>`;
+  const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${parentHtml}${current.usedMemories.length ? `<span class="model mem-chip" title="${escapeHtml(memChipTitle(current.usedMemories))}">${escapeHtml(memChipText(current.usedMemories))}</span>` : ""}<span class="dir" title="${escapeHtml(current.dir||"")}"><bdi>${escapeHtml(current.dir||"")}</bdi></span>${ctxText ? `<span class="model ctx" title="${escapeHtml(ctxTip)}">${escapeHtml(ctxText)}</span>` : ""}${speedTextNow ? `<span class="model speed" title="${escapeHtml(speedTip)}">${escapeHtml(speedTextNow)}</span>` : ""}${timingText ? `<span class="model session-time"></span>` : ""}${workerBadgeHtml()}</div>`;
   const previewHtml = `<div class="preview-line"><span class="preview">${escapeHtml(current.firstPreview || "—")}</span> · <span class="mem" title="${escapeHtml(current.usedMemories.join(", "))}">mem: ${escapeHtml(memText)}</span></div>`;
-  infoTextEl.innerHTML = metaHtml + previewHtml;
+  // The session clock ticks every second while a turn runs: only its text
+  // changes, the bar's other nodes (a tooltip, a button mid-press) stay.
+  renderStable(infoTextEl, metaHtml + previewHtml, { ".session-time": timingText });
   infoTextEl.title = memoriesTooltip(current.usedMemories, current.preloadedMemories, current.mutedMemories);
 }
 
@@ -1759,6 +1760,7 @@ const streamHandlers = {
     // for a queued prompt among its rows.
     turnDom.handOff?.({ immediate: true });
     markRecapStale();
+    shownTexts.turnStarted();
     const promptBubble = applyPromptOps(data);
     setTurnRunning(true);
     setLiveStatus("running");
@@ -2071,12 +2073,9 @@ async function handleSendTurn() {
     // for its ack is never taken back (4.13), so drop it here. The prompt
     // is still in the composer, as the echo was removed.
     dropEarlyRestores(earlyRestores);
-    // The chips stay (uploaded ones keep their ref) for another try.
-    if (/bad_image|too_large/.test(e.message)) {
-      alert(e.message);
-      return;
-    }
-    if (/owned_by_tui|409/.test(e.message)) {
+    // The chips stay (uploaded ones keep their ref) for another try: an
+    // image refused (bad_image, too_large, bad_images) says why below.
+    if (e.code === "owned_by_tui") {
       current.owner = "tui";
       updateComposerMode();
       return;
@@ -2107,7 +2106,7 @@ async function handleSendCommand(line) {
     // The command woke the worker: follow its stream if none is open.
     followWokenWorker();
   } catch (e) {
-    if (/owned_by_tui|409/.test(e.message)) {
+    if (e.code === "owned_by_tui") {
       current.owner = "tui";
       updateComposerMode();
       return;
@@ -2168,7 +2167,7 @@ async function handleCancel() {
     await cancelTurn(selected);
   } catch (e) {
     // The turn ended meanwhile: nothing left to cancel.
-    if (!/not_running|409/.test(e.message)) alert(e.message);
+    if (e.code !== "not_running") alert(e.message);
   } finally {
     cancelBtn.disabled = false;
   }

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

@@ -8,6 +8,9 @@ export function api(path, opts = {}) {
     if (!r.ok) {
       const error = new Error(`${j.detail || j.error || r.statusText} (${r.status})`);
       error.status = r.status;
+      // The server's error code ({error: "owned_by_tui", detail}): what
+      // the page matches on, never the message's words.
+      error.code = j.error || null;
       throw error;
     }
     return j;

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

@@ -163,14 +163,13 @@ export function approvalAllowed(pq, answer) {
 }
 
 // What the card says when an answer or a dismissal didn't go through. 503
-// (the server found no live bridge) reads as the session not running; any
-// other failure — the worker's own (the server maps it to a 502
+// not_live (the server found no live bridge) reads as the session not
+// running; any other failure — the worker's own (the server maps it to a 502
 // bridge_error) or the connection's — shows what it said, so a worker that
 // failed the request is not mistaken for one that is gone.
 export function answerErrorText(error) {
-  const status = error?.status;
   const message = String(error?.message ?? error ?? "");
-  if (status === 503 || /not_live/.test(message)) return "Session is not running — restart it to answer.";
+  if (error?.status === 503 || error?.code === "not_live") return "Session is not running — restart it to answer.";
   return message;
 }
 

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

@@ -0,0 +1,13 @@
+// The texts the running turn already shows (its generations as they close,
+// the bubbles a render drew): turn_completed's answer gets a bubble of its
+// own only when it isn't one of them (it wasn't streamed). A new turn starts
+// over, so an earlier turn's "Done." doesn't hide this one's.
+export function createShownTexts() {
+  let seen = new Set();
+  return {
+    turnStarted() { seen = new Set(); },
+    seed(texts) { seen = new Set(texts.filter(Boolean)); },
+    saw(text) { if (text) seen.add(text); },
+    shows(text) { return seen.has(text); },
+  };
+}

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

@@ -0,0 +1,18 @@
+// A block redrawn every tick (the info bar, once a second while a turn
+// runs) keeps its nodes: +html+ is written only when it changed, so a
+// shown tooltip stays up and a press on one of its buttons isn't lost to a
+// rewrite between mousedown and mouseup. +live+ ({selector: text}) names
+// the parts that change every tick (a running clock): +html+ carries them
+// empty and only their text is set, so a tick alone rewrites nothing else.
+const shown = new WeakMap();
+
+export function renderStable(el, html, live = {}) {
+  if (shown.get(el) !== html) {
+    el.innerHTML = html;
+    shown.set(el, html);
+  }
+  for (const [selector, text] of Object.entries(live)) {
+    const part = el.querySelector(selector);
+    if (part && part.textContent !== text) part.textContent = text;
+  }
+}

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

@@ -93,7 +93,13 @@ export function isOwn(clientId, myId) {
 
 // As the TUI labels them (Formatting::CLIENT_LABELS); this file's label
 // helpers and the TUI's agree per spec/shared/labels_matrix.json.
-const CLIENT_LABELS = Object.freeze({ tui: "tui", web: "web", system: "reminder", delegate: "delegate", child: "delegate report" });
+// By the whole id or its prefix (up to and with its first ":"); an id
+// chi doesn't know is "automatic", not the user (ClientId.human?).
+const CLIENT_LABELS = Object.freeze({
+  "tui:": "tui", "web:": "web", "system:": "reminder", "delegate:": "delegate", "child:": "delegate report",
+  "cli:send": "chi send", "cli:answer": "chi answer", plugin: "plugin",
+});
+const AUTOMATIC_LABEL = "automatic";
 
 // A delegate child's report comes in as client child:<id8> (ChildReports).
 const REPORT_CLIENT = "child:";
@@ -110,7 +116,8 @@ export function clientLabel(clientId) {
   if (!clientId) return null;
   const id = String(clientId);
   if (id.startsWith(CONTEXT_CLIENT) && id.length > CONTEXT_CLIENT.length) return `context ${id.slice(CONTEXT_CLIENT.length)} changed`;
-  return CLIENT_LABELS[id.split(":", 1)[0]] || "user";
+  const colon = id.indexOf(":");
+  return CLIENT_LABELS[id] || (colon >= 0 && CLIENT_LABELS[id.slice(0, colon + 1)]) || AUTOMATIC_LABEL;
 }
 
 // The note for reminders a turn got (a reminder turn has no prompt).

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

@@ -390,7 +390,7 @@ export function createTurnView({
     }
     writeClosedLabel(entry, gen);
     if (!entry.toggled) entry.el.open = false;
-    // Every generation's text goes into seenContent (the turn output dedupe).
+    // Every generation's text goes into the shown texts (the turn output dedupe).
     const k = normalize(gen.text);
     if (k) sawText(k);
   }

data/lib/samagotchi/worker.rb

@@ -4,6 +4,7 @@ require "fileutils"
 require "securerandom"
 require "time"
 
+require_relative "client_id"
 require_relative "config"
 require_relative "events"
 require_relative "session"
@@ -287,6 +288,9 @@ module Samagotchi
         @context_poller&.stop
         @engine&.shutdown
         @bridge&.stop
+        # The process exits next: a parent wake it rang for (a crash's
+        # ring comes just above) must spawn the parent's worker first.
+        ChildRing.await_wakes
       end
     end
 
@@ -425,7 +429,7 @@ module Samagotchi
       @context_absorber.commit(waking ? woken(batch, waking) : batch)
       return false unless waking
 
-      run_context_wake_turn(waking.name, turn_id)
+      run_context_wake_turn(waking, turn_id)
       true
     rescue SystemCallError, IOError => e
       Log.exception(:worker, "context_failed", e)
@@ -473,17 +477,20 @@ module Samagotchi
     # turn from context:<name> whose first message is the wake note already
     # in the conversation (named by +turn_id+), on the same rules as a
     # delegate report's wake turn: it counts toward session.max_wakes, and
-    # a failure goes back to before the turn (the note stays: it was saved
-    # before the checkpoint) and pauses wakes until a human's input.
-    def run_context_wake_turn(name, turn_id)
+    # a failure goes back to before the turn (the note stays, as a plain
+    # one: #unmark_wake_note) and pauses wakes until a human's input.
+    # +waking+: the ContextAbsorber::Delivery that woke it.
+    def run_context_wake_turn(waking, turn_id)
+      name = waking.name
       @wakes_in_a_row += 1
       Log.info(:worker, "context_wake_turn", name: name, in_a_row: @wakes_in_a_row)
       @turn_flow.before_prompt_turn
-      run_engine_turn(nil, continue: true, origin: { client_id: "#{Steer::CONTEXT_CLIENT_PREFIX}#{name}" },
+      run_engine_turn(nil, continue: true, origin: { client_id: "#{ClientId::CONTEXT_PREFIX}#{name}" },
                            id: turn_id, max_iterations: IterationLimit.for) do |result, error|
         if error
           note = TurnNote.failed(error.respond_to?(:summary) ? error.summary : error.message)
           @turn_flow.prompt_turn_failed(note: note)
+          unmark_wake_note(turn_id, waking.note)
           @wakes_paused = true
         else
           @continue_offer.after_turn(result)
@@ -491,6 +498,18 @@ module Samagotchi
       end
     end
 
+    # A failed wake turn kept nothing but its note: the update goes back to
+    # a plain note (no turn start, the background wording), so a reload
+    # draws no empty turn for it.
+    def unmark_wake_note(turn_id, note)
+      messages = @engine.messages_checkpoint
+      index = messages.index { |m| m[:turn_start] && m[:turn_id] == turn_id }
+      return unless index
+
+      messages[index] = ContextNote.message(**note)
+      @engine.rollback_to(messages)
+    end
+
     # Whether the session has had a turn: a user or assistant message.
     def conversation_started?
       Array(@session.messages).any? { |m| %w[user assistant model].include?((m[:role] || m["role"]).to_s) }
@@ -551,11 +570,11 @@ module Samagotchi
       @engine.clear_due_reminder_names!
       return false unless @engine.reminders_due?
 
-      @continue_offer.drop({ client_id: SessionManager::REMINDER_CLIENT_ID })
+      @continue_offer.drop({ client_id: ClientId::REMINDER })
       # A failure has no prompt to hand back (the Engine announced
       # :turn_failed). The offer went before the turn
       # (ContinueOffer#drop); either way the rollback window closes.
-      run_engine_turn(nil, continue: true, origin: { client_id: SessionManager::REMINDER_CLIENT_ID },
+      run_engine_turn(nil, continue: true, origin: { client_id: ClientId::REMINDER },
                            max_iterations: IterationLimit.for) { @turn_flow.after_reminder_turn }
       true
     end
@@ -759,8 +778,11 @@ module Samagotchi
       rescue StandardError => e
         error = e
         # Still running: no turn of the Engine's ended (it never began).
+        # It ends here, failed, as an Engine turn would record it: a wait
+        # (ReplyWait) tells a turn's end by last_turn.
         if @session.status == Session::STATUS_RUNNING
           @session.status = Session::STATUS_IDLE
+          @engine.record_last_turn(@session, "failed", 0, turn_args[:origin], { type: :turn_failed })
           Log.warn(:worker, "turn_not_begun", error: e.class.name, msg: e.message)
         end
       ensure
@@ -800,12 +822,12 @@ module Samagotchi
     # Whether the turn starting now is a delegate child's parent's: its
     # task (the initial prompt), a follow-up, a continue the parent
     # answered, a reminder, anything but a human typing into the child
-    # (ArchiveStore.user_input?), and any turn after a question the parent
+    # (ClientId.human?), and any turn after a question the parent
     # was rung about.
     def reports_to_parent?(origin)
       return false unless @session.delegate?
 
-      @initial_turn || @owes_parent || !ArchiveStore.user_input?(origin&.dig(:client_id))
+      @initial_turn || @owes_parent || !ClientId.human?(origin&.dig(:client_id))
     end
 
     # The Engine published a question (after the question desk saved it).
@@ -1023,11 +1045,11 @@ module Samagotchi
       Log.info(:worker, "idle_exit", idle_s: @idle_exit.idle_seconds.round)
     end
 
-    # A human's input (ArchiveStore.user_input?) un-archives the session;
+    # A human's input (ClientId.human?) un-archives the session;
     # a delegate's, a plugin's or a reminder's doesn't.
     # It also resets the delegate-report wakes (budget and pause).
     def user_input(client_id)
-      return unless ArchiveStore.user_input?(client_id)
+      return unless ClientId.human?(client_id)
 
       ArchiveStore.user_input(@session_id, state_dir: @state_dir)
       @wakes_in_a_row = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -203,6 +203,7 @@ files:
 - lib/samagotchi/cli/flags.rb
 - lib/samagotchi/cli/parent_wait.rb
 - lib/samagotchi/client.rb
+- lib/samagotchi/client_id.rb
 - lib/samagotchi/command_steps.rb
 - lib/samagotchi/commands/registry.rb
 - lib/samagotchi/config.rb
@@ -334,6 +335,7 @@ files:
 - lib/samagotchi/plugin/tool_result.rb
 - lib/samagotchi/plugin_session_state.rb
 - lib/samagotchi/plugin_tasks.rb
+- lib/samagotchi/process_group.rb
 - lib/samagotchi/project_scope.rb
 - lib/samagotchi/prompt.rb
 - lib/samagotchi/prompt_history.rb
@@ -483,6 +485,8 @@ files:
 - lib/samagotchi/web/public/sentences.js
 - lib/samagotchi/web/public/session_state.js
 - lib/samagotchi/web/public/sessions_list.js
+- lib/samagotchi/web/public/shown_texts.js
+- lib/samagotchi/web/public/stable_html.js
 - lib/samagotchi/web/public/stage_model.js
 - lib/samagotchi/web/public/stage_view.js
 - lib/samagotchi/web/public/strip.js