samagotchi 0.20.0 → 0.21.0

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

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

data/lib/samagotchi/engine.rb

@@ -1637,12 +1637,25 @@ module Samagotchi
     def stopped_before_model(turn)
       reason = turn.controller.reason
       end_turn(turn, "canceled") do |seconds|
-        [nil, { type: :turn_canceled, cancellation_reason: reason, duration_ms: (seconds * 1000).round }]
+        [nil, { type: :turn_canceled, cancellation_reason: reason, cancelled_by: cancelled_by(turn),
+                duration_ms: (seconds * 1000).round }]
       end
       LLM::ModelResult.new(text: "", canceled: true, cancellation_reason: reason)
     end
     private :stopped_before_model
 
+    # Who stopped a turn a hook stopped or cut (the controller's detail: the
+    # bundle, or the hook's label), for the UIs' "stopped by loop-guard";
+    # nil for any other cancel.
+    def cancelled_by(turn)
+      return nil unless turn.controller.reason == :hook
+
+      detail = turn.controller.detail
+      by = detail[:by].to_s if detail.is_a?(Hash)
+      by unless by.nil? || by.empty?
+    end
+    private :cancelled_by
+
     # The turn's settings for the kernel (LLM::TurnSettings): vision,
     # sampling and thinking, the thinking resolved before the hooks run.
     # The model name is added in #generate, after the hooks that may switch
@@ -1744,7 +1757,7 @@ module Samagotchi
       end_turn(turn, canceled ? "canceled" : "completed", exhausted: !canceled && result.exhausted?) do |seconds|
         kept = kept_messages(turn, result, seconds)
         if canceled
-          [kept, { type: :turn_canceled, cancellation_reason: result.cancellation_reason,
+          [kept, { type: :turn_canceled, cancellation_reason: result.cancellation_reason, cancelled_by: cancelled_by(turn),
                    duration_ms: (seconds * 1000).round }]
         else
           # For a client that attaches later (session_state_snapshot).

data/lib/samagotchi/events.rb

@@ -13,7 +13,7 @@ module Samagotchi
     TURN_KEPT = %i[turn_completed turn_canceled].freeze
     # The kinds of a running turn's parts (Bridge::TurnAccumulator), which a
     # joining UI replays as live events.
-    PART_KINDS = %w[thinking text tool input steer reminder notice].freeze
+    PART_KINDS = %w[generation thinking text tool input steer reminder notice].freeze
     # Types no Engine emits that a UI handles: the Bridge's stream frames
     # and the web's one synthetic replay event (a prompt merged into the
     # turn, turn_events.js snapshotEvents).

data/lib/samagotchi/llm/chat_loop.rb

@@ -438,7 +438,7 @@ module Samagotchi
           record_context_status(response.usage, window)
           emit(type: :generation_completed, iteration: iteration, content_length: response.text.length,
                thinking_chars: response.reasoning.to_s.length, served_model: response.model,
-               requested_model: @model_name, finish_reason: response.finish_reason)
+               served_provider: response.provider, requested_model: @model_name, finish_reason: response.finish_reason)
           dump_response(response, iteration)
           @loop.fire_hook(:after_generation, { type: :after_generation, iteration: iteration, response: response.text,
                                                messages: AnswerDisplay.strip_all(@conversation).map(&:dup).freeze })

data/lib/samagotchi/llm/openai_chat.rb

@@ -35,10 +35,12 @@ module Samagotchi
     # ([] when none), usage (never nil) and the finish reason.
     # +model+ is the model the server says answered (the body's `model`),
     # which can differ from the one asked for; nil when it says nothing.
+    # +provider+ is the provider that served it (the body's `provider`,
+    # OpenRouter's routing name); nil when the server says nothing.
     # +cut+ is set on the empty response the chat loop makes for a
     # generation a plugin cut (stop_generation): {by:, reason:}.
-    ChatResponse = Data.define(:text, :reasoning, :tool_calls, :usage, :finish_reason, :model, :cut) do
-      def initialize(model: nil, cut: nil, **fields) = super
+    ChatResponse = Data.define(:text, :reasoning, :tool_calls, :usage, :finish_reason, :model, :provider, :cut) do
+      def initialize(model: nil, provider: nil, cut: nil, **fields) = super
     end
 
     # The OpenAI Chat Completions API (llama.cpp's /v1, and any compatible
@@ -248,7 +250,8 @@ module Samagotchi
         ChatResponse.new(text: OpenAIChat.drop_leading_newlines(message["content"].to_s),
                          reasoning: (message["reasoning_content"] || message["reasoning"]).to_s,
                          tool_calls: calls, usage: Usage.from_payload(body) || Usage.none,
-                         finish_reason: body.dig("choices", 0, "finish_reason"), model: served_model(body))
+                         finish_reason: body.dig("choices", 0, "finish_reason"), model: served_model(body),
+                         provider: self.class.served_provider(body))
       end
 
       # Workaround for Splash 1.0.2/1.1.0, which keeps the "\n\n" the model
@@ -265,6 +268,15 @@ module Samagotchi
 
       def served_model(payload) = self.class.served_model(payload)
 
+      # OpenRouter names the provider that served a request (Baseten,
+      # Fireworks, …) in the body's `provider`; other servers send none.
+      def self.served_provider(payload)
+        provider = payload.is_a?(Hash) ? payload["provider"] : nil
+        provider.is_a?(String) && !provider.strip.empty? ? provider : nil
+      end
+
+      def served_provider(payload) = self.class.served_provider(payload)
+
       # The parsed payload of a `data:` line; nil for blank lines, comments
       # and [DONE]. Error events raise their ProviderError.
       # A 200 whose body is a plain JSON error instead of a stream (OpenRouter
@@ -352,7 +364,7 @@ module Samagotchi
       def monotonic = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
       # Streamed deltas put together: text, reasoning, tool calls by index,
-      # the finish reason, the usage chunk and the served model.
+      # the finish reason, the usage chunk, the served model and provider.
       class Assembly
         # The chunk carries part of a tool call.
         def self.tool_call_delta?(payload)
@@ -367,12 +379,14 @@ module Samagotchi
           @finish_reason = nil
           @usage = nil
           @model = nil
+          @provider = nil
         end
 
         # @return [Array(String, String)] this chunk's content and reasoning
         def add(payload)
           @usage = Usage.from_payload(payload) || @usage if payload.key?("usage")
           @model = OpenAIChat.served_model(payload) || @model
+          @provider = OpenAIChat.served_provider(payload) || @provider
           choice = payload["choices"].is_a?(Array) ? payload["choices"].first : nil
           return ["", ""] unless choice.is_a?(Hash)
 
@@ -392,7 +406,7 @@ module Samagotchi
             ToolCall.new(id: call[:id], name: call[:name].to_s, arguments: OpenAIChat.parse_arguments(call[:arguments]))
           end
           ChatResponse.new(text: @text, reasoning: @reasoning, tool_calls: calls, usage: @usage || Usage.none,
-                           finish_reason: @finish_reason, model: @model)
+                           finish_reason: @finish_reason, model: @model, provider: @provider)
         end
 
         private

data/lib/samagotchi/log_subscriber.rb

@@ -82,7 +82,8 @@ module Samagotchi
     end
 
     def on_turn_canceled(event)
-      log(:info, :turn_canceled, ms: since(@turn_started_at), reason: event[:cancellation_reason], **origin(event))
+      log(:info, :turn_canceled, ms: since(@turn_started_at), reason: event[:cancellation_reason], by: event[:cancelled_by],
+                                 **origin(event))
     end
 
     def on_turn_failed(event)
@@ -100,7 +101,8 @@ module Samagotchi
     def on_generation_completed(event)
       ms = since(@generation_started_at.delete(event[:iteration]))
       log(:info, :generation_completed, iteration: event[:iteration], ms: ms,
-                                        served_model: event[:served_model], requested_model: event[:requested_model],
+                                        served_model: event[:served_model], provider: event[:served_provider],
+                                        requested_model: event[:requested_model],
                                         content_length: event[:content_length],
                                         thinking_chars: event[:thinking_chars], finish_reason: event[:finish_reason],
                                         stopped_by: event[:stopped_by])

data/lib/samagotchi/session_manager.rb

@@ -24,6 +24,7 @@ require_relative "installed_gem"
 require_relative "installed_versions"
 require_relative "recap_store"
 require_relative "archive_store"
+require_relative "continue_offer"
 require_relative "image_store"
 require_relative "plugin_session_state"
 require_relative "terminal_ui"
@@ -105,6 +106,10 @@ module Samagotchi
         case @reason
         when :scratch then "a scratch session is deleted when you leave; nothing to archive"
         when :busy_child then "its delegate #{@busy_id[0, 8]} is running a turn; wait for it or stop it first"
+        when :queued then "a prompt is queued, which a resume would run; let it run first"
+        when :queued_child then "its delegate #{@busy_id[0, 8]} has a prompt queued, which a resume would run; let it run first"
+        when :offer then "the step-limit question waits for an answer; answer Continue or Stop first"
+        when :offer_child then "its delegate #{@busy_id[0, 8]} waits for an answer to its step-limit question; answer it first"
         else "a turn is running; wait for it or cancel it first"
         end
       end
@@ -309,8 +314,9 @@ module Samagotchi
     #   discarded: empty sessions their stopping worker deleted
     # @raise [ArgumentError] unknown id (Session::AmbiguousId for a prefix of several)
     # @raise [OwnedByTUI] a chi REPL owns it or one of its children
-    # @raise [ArchiveRefused] a turn runs in it or in a child, or it is a
-    #   scratch session
+    # @raise [ArchiveRefused] a turn runs in it or in a child, a prompt is
+    #   queued in one (a later resume would run it), a live one offers to
+    #   continue past the step limit, or it is a scratch session
     def self.archive_session(id_or_prefix, state_dir: nil, wait: 5)
       sd = state_dir || Session.default_state_dir
       id = archive_target(id_or_prefix, sd)
@@ -319,13 +325,8 @@ module Samagotchi
       tree = [id, *descendant_ids(id, sd)]
       owners = tree.to_h { |sid| [sid, session_owner(sid, state_dir: sd)] }
       tree.each do |sid|
-        owner = owners[sid]
-        next unless owner
-
-        raise OwnedByTUI, sid if owner.tui?
-        next unless Session.load(sid, state_dir: sd).status == Session::STATUS_RUNNING
-
-        raise ArchiveRefused.new(id, sid == id ? :busy : :busy_child, busy_id: sid)
+        refusal = archive_refusal(sid, owners[sid], sd)
+        raise ArchiveRefused.new(id, sid == id ? refusal : :"#{refusal}_child", busy_id: sid) if refusal
       end
 
       stopped = tree.select { |sid| owners[sid] }
@@ -334,6 +335,22 @@ module Samagotchi
       { id: id, archived: archived, stopped: stopped, discarded: discarded }
     end
 
+    # What keeps +sid+ (in an archive's tree) from being archived: :busy (a
+    # turn runs), :queued (input/ holds a prompt, which outlives the stop and
+    # runs on a resume, live worker or not), :offer (a live worker's continue
+    # offer, which the stop would drop), or nil.
+    # @raise [OwnedByTUI] a chi REPL owns it
+    def self.archive_refusal(sid, owner, state_dir)
+      raise OwnedByTUI, sid if owner&.tui?
+
+      session = owner && Session.load(sid, state_dir: state_dir)
+      return :busy if session&.status == Session::STATUS_RUNNING
+      return :queued unless SessionInbox.find_new_input_files(Session.session_dir(sid, state_dir: state_dir)).empty?
+
+      :offer if session&.waiting_question(live: true)&.dig(:kind) == ContinueOffer::KIND
+    end
+    private_class_method :archive_refusal
+
     # Unarchive a session and its delegated children.
     # @return [Hash] {id:, unarchived: [ids that were archived]}
     # @raise [ArgumentError] unknown id

data/lib/samagotchi/session_metrics.rb

@@ -277,7 +277,7 @@ module Samagotchi
       when :turn_completed
         end_turn(status: "completed")
       when :turn_canceled
-        end_turn(status: "canceled", reason: event[:cancellation_reason])
+        end_turn(status: "canceled", reason: event[:cancellation_reason], by: event[:cancelled_by])
       when :turn_failed
         end_turn(status: "failed")
       end
@@ -457,9 +457,10 @@ module Samagotchi
       end
     end
 
-    # A canceled turn's record keeps why (+reason+: "user", "ctrl_c", ...), so
-    # a reloaded web history can show the cancel line the live one did.
-    def end_turn(status: "completed", reason: nil)
+    # A canceled turn's record keeps why (+reason+: "user", "ctrl_c", ...)
+    # and who stopped it (+by+: a hook's bundle), so a reloaded web history
+    # can show the cancel line the live one did.
+    def end_turn(status: "completed", reason: nil, by: nil)
       @mutex.synchronize do
         if @turn
           # A turn that failed mid-stream never saw its generation end:
@@ -478,6 +479,7 @@ module Samagotchi
             duration_ms: elapsed_ms(@turn.started_monotonic)
           }
           record[:cancellation_reason] = reason.to_s unless reason.nil? || reason.to_s.empty?
+          record[:cancelled_by] = by.to_s unless by.nil? || by.to_s.empty?
           record.merge!(turn_token_fields(@turn))
           @turn_records << record
           count_turn(record)

data/lib/samagotchi/steer.rb

@@ -80,7 +80,7 @@ module Samagotchi
     # :pending_input_merged. After a cancel the input stays queued: it runs
     # as the next turn instead of dying with this one. +answer+ (a String,
     # or a Proc called only on a merge) is the answer the merge follows, for
-    # the UIs; given, the drain is told it is the after-answer site (plugin
+    # the TUI's line (the web has it as the step's streamed text); given, the drain is told it is the after-answer site (plugin
     # steers are dropped there). A blank answer is none.
     # @return [Boolean] whether anything was injected
     def inject!(conversation, pending_input, iteration:, emit:, cancel_controller:, answer: nil)

data/lib/samagotchi/terminal_ui/attached_loop.rb

@@ -47,6 +47,10 @@ module Samagotchi
       DETACH_HINT = "Ctrl-D to detach, /exit stops the worker"
       # Why a request the Bridge read after its deadline didn't go through.
       LATE = "worker not answering in time"
+      # An exit the worker agreed to in an empty session. Said before it has
+      # left: it checks again once it lets go, and a note or prompt arriving
+      # first keeps the session (SessionManager.discard_left_session).
+      EMPTY_EXIT = "Detached; the session is empty: it will be discarded if nothing arrives before its worker stops."
       # Why the worker stayed up after /exit, by the reason it gave.
       HELD_REASONS = {
         "turn_running" => "a turn is running", "input_queued" => "prompts are queued",
@@ -420,7 +424,9 @@ module Samagotchi
           return detach("#{line} Not deleted.")
         end
         # An empty session: the worker deletes it as it leaves.
-        @delete_session.call(id) unless discards?(reply)
+        return detach(EMPTY_EXIT) if discards?(reply)
+
+        @delete_session.call(id)
         detach("Detached; deleted session #{id}.")
       rescue SystemCallError, IOError => e
         detach("#{exit_failed_line(e.message)} Not deleted.")
@@ -429,14 +435,15 @@ module Samagotchi
       end
 
       # /archive: the worker is asked to exit as for /exit, then the session
-      # is archived. A worker staying up for another UI (or reminders, a
-      # queued prompt) is stopped by the archive, as the web's archive
-      # stops it; a turn running refuses it. An empty session: the worker
+      # is archived. A worker staying up for another UI (or reminders) is
+      # stopped by the archive, as the web's archive stops it; a turn
+      # running, a queued prompt or an open continue offer refuses it
+      # (SessionManager.archive_session). An empty session: the worker
       # deletes it as it leaves.
       def exit_and_archive
         reply = @client.request_exit(client_id: @client_id)
         id = @client.session_id
-        return detach("Detached; the session was empty, so it is discarded.") if reply.status == 200 && discards?(reply)
+        return detach(EMPTY_EXIT) if reply.status == 200 && discards?(reply)
         return detach("#{exit_line(reply)} Not archived.") unless [200, 409].include?(reply.status)
 
         result = @archive_session.call(id)
@@ -454,15 +461,14 @@ module Samagotchi
         error = reply.json&.fetch("error", nil)
         case reply.status
         when 200
-          # Said as the worker agreed to leave; a note coming in before it
-          # does keeps the session after all (rare, left as is).
-          return "Detached; the session was empty, so it is discarded." if discards?(reply)
+          return EMPTY_EXIT if discards?(reply)
 
           "Detached; the session's worker is stopping. Resume with: chi --resume #{id}"
         when 409
           reason = reply.json&.fetch("reason", nil).to_s
           "Detached; the session keeps running (#{HELD_REASONS.fetch(reason, reason)}). Re-attach with: chi --attach #{id}"
         when 0 then exit_failed_line("no reply")
+        when 408 then exit_failed_line(LATE)
         else
           # A worker from before the route answers the Bridge's plain 404.
           return "Detached; this worker runs an older chi and can't be stopped from here: chi sessions stop #{id}" if error == "not_found"
@@ -1029,7 +1035,8 @@ module Samagotchi
         exchange = messages.select { |m| %w[user model assistant].include?(m[:role].to_s) }
         # The id stays findable: the detach line and chi sessions list show it.
         Log.session_id = @client.session_id
-        Log.info(:attached, "joined", session: @client.session_id, messages: exchange.size)
+        Log.info(:attached, "joined", session: @client.session_id, messages: exchange.size,
+                                      notes: messages.count { |m| ContextNote.note?(m) })
         last_user = exchange.rindex { |m| Steer.prompt?(m) }
         render_join_notes(messages)
         return unless last_user
@@ -1166,6 +1173,8 @@ module Samagotchi
         running_tool = nil
         Bridge::TurnAccumulator.replay_events(turn).each do |event|
           case event[:type]
+          # A new step starts its line over, as live (a join during a hold).
+          when :generation_started then tail, lane = nil, :writing
           when :generation_chunk
             tail, lane = event[:thinking].to_s.empty? ? [event[:text], :writing] : [event[:thinking], :thinking]
           when :tool_call_started

data/lib/samagotchi/terminal_ui/event_renderer.rb

@@ -84,7 +84,7 @@ module Samagotchi
           render_turn_summary(event[:turn_summary]) if event[:turn_summary]
         when :turn_canceled
           @view.finish_thinking_spinner
-          @view.print_line(@view.turn_canceled_line(event[:cancellation_reason], event[:duration_ms]))
+          @view.print_line(@view.turn_canceled_line(event[:cancellation_reason], event[:duration_ms], by: event[:cancelled_by]))
           @view.print_line(@view.turn_end_hint(Formatting::ROLLBACK_HINT)) unless @turn_continues
         when :turn_failed
           # A provider error's one-line summary, else the message (an image

data/lib/samagotchi/terminal_ui/formatting.rb

@@ -203,8 +203,13 @@ module Samagotchi
       # started): its partial progress stays in the conversation.
       ROLLBACK_HINT = "partial progress kept; !rollback restores the pre-turn state"
 
-      # "✕ turn canceled (Ctrl-C) · 3.1s"
-      def turn_canceled_line(reason, duration_ms)
+      # "✕ turn canceled (Ctrl-C) · 3.1s"; a hook's stop that names who
+      # (+by+, turn_canceled's cancelled_by): "✕ turn stopped by loop-guard"
+      def turn_canceled_line(reason, duration_ms, by: nil)
+        if reason.to_s == "hook" && !by.to_s.empty?
+          return "#{paint("✕", 33)} turn stopped by #{by}#{turn_duration_suffix(duration_ms)}"
+        end
+
         label = reason.to_s.empty? ? nil : CANCEL_REASONS.fetch(reason.to_s, reason.to_s)
         "#{paint("✕", 33)} turn canceled#{" (#{label})" if label}#{turn_duration_suffix(duration_ms)}"
       end

data/lib/samagotchi/terminal_ui/live_region.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "io/console"
 require_relative "screen"
 require_relative "reline_seam"
 
@@ -22,10 +23,48 @@ module Samagotchi
         screen
       end
 
-      # Hand Reline its own drawing back, then close the surface.
-      def close(surface)
+      # How long #drain_input waits for input still on its way.
+      DRAIN_WINDOW = 0.05
+      # How long Reline waits for the reply to its cursor query (Reline::ANSI#cursor_pos).
+      CURSOR_REPLY_WAIT = 0.5
+      CURSOR_REPLY = /\e\[\d+;\d+R/
+
+      # Hand Reline its own drawing back, close the surface, then drop the
+      # input nobody read (#drain_input).
+      def close(surface, input: $stdin)
         RelineSeam.detach(surface)
         surface.close
+        query_at = RelineSeam.unanswered_query_at
+        RelineSeam.unanswered_query_at = nil
+        drain_input(input, query_at: query_at) if surface.is_a?(Screen)
+      end
+
+      # Reline asks the terminal for the cursor row (ESC[6n) as each read
+      # starts; the reply to one cut short at exit, read by nobody, would
+      # land at the shell's prompt. What came, or comes within DRAIN_WINDOW,
+      # is read and dropped (keys typed in that moment too), in raw mode, so
+      # a reply with no newline is readable. With a query left unanswered
+      # (RelineSeam.unanswered_query_at), until its reply, up to as long as
+      # Reline would have waited for it.
+      def drain_input(input, query_at: nil)
+        return unless input.is_a?(IO) && input.tty?
+
+        now = -> { Process.clock_gettime(Process::CLOCK_MONOTONIC) }
+        deadline = now.call + DRAIN_WINDOW
+        deadline = [deadline, query_at + CURSOR_REPLY_WAIT].max if query_at
+        dropped = +""
+        input.raw do
+          while (left = deadline - now.call).positive? && input.wait_readable(left)
+            read = input.read_nonblock(1024, exception: false)
+            break if read.nil?
+
+            dropped << read if read.is_a?(String)
+            # The reply came: no need to wait out the rest.
+            deadline = [now.call + DRAIN_WINDOW, deadline].min if query_at && dropped.match?(CURSOR_REPLY)
+          end
+        end
+      rescue IOError, SystemCallError
+        nil
       end
 
       def available?(out:, input:, env:)

data/lib/samagotchi/terminal_ui/reline_seam.rb

@@ -66,6 +66,12 @@ module Samagotchi
         # @api private
         attr_writer :reading
 
+        # Monotonic time a read's cursor query went out (#reset) when the read
+        # was stopped before Reline took the reply: the reply is still on its
+        # way, and LiveRegion.close waits for it. nil with none.
+        # @return [Float, nil]
+        attr_accessor :unanswered_query_at
+
         # @return [Boolean] this Reline has every method the seam relies on
         def supported?
           defined?(Reline::LineEditor::RenderedScreen) &&
@@ -107,7 +113,11 @@ module Samagotchi
       end
 
       def reset(...)
+        # Reline's reset asks the terminal for the cursor row and waits for
+        # the reply: a Stop raised meanwhile leaves this set.
+        RelineSeam.unanswered_query_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         super
+        RelineSeam.unanswered_query_at = nil
         RelineSeam.reading = true
         @rendered_screen.base_y = 0 if RelineSeam.screen
       end

data/lib/samagotchi/version.rb

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

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

@@ -45,7 +45,7 @@ import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, mergeTiming, normalizeTiming, turnTimingText,
 } from "./timing.js";
 import { DONE_MS, applyInitEvent, dropDone, initRowHtml, newInitTasks, seedInitTasks } from "./init_row.js";
-import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, retryStatusLine, snapshotEvents, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
+import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, replaysDrawnTurn, retryStatusLine, snapshotEvents, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -134,6 +134,9 @@ const questionCards = createQuestionCards({
 // was rendered at (null: no live worker then), where a stream opened later
 // has to start.
 let selectSeq = null;
+// The stream was opened from 0 (a wake with no cursor to go on) and no
+// new turn has started on it yet: see followWokenWorker.
+let streamFromGuess = false;
 // The last input_merged had an origin with no bubble: its merged text
 // (pending_input_merged) gets one.
 let unmatchedMerge = false;
@@ -165,6 +168,7 @@ let scopeError = null;
 async function refresh() {
   try {
     allSessions = await listSessions("updated_at", "desc", { dir: scope.dir });
+    notifications.noticeList(allSessions);
   } catch (e) {
     if (e.status !== 400 || !scope.dir) throw e;
     scopeError = e.message;
@@ -1341,7 +1345,7 @@ function onCardAction(e) {
   sendCommand(selected, button.dataset.command, { clientId, card: true })
     .then(() => {
       // The command woke the worker: follow its stream if none is open.
-      if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+      followWokenWorker();
     })
     .catch((error) => {
       err.textContent = error.message;
@@ -1416,6 +1420,7 @@ function updateInfoBar() {
     archiveBtn.style.display = selected ? "" : "none";
     const archived = selectedArchived();
     archiveBtn.textContent = archived ? "unarchive" : "archive";
+    archiveBtn.classList.toggle("archived", archived);
     archiveBtn.title = archived ? "Unarchive: back to the lists" : "Archive: hide from the lists, keep for good";
   }
   if (!selected) {
@@ -1593,7 +1598,18 @@ function setUsedMemories(names) {
   }
 }
 
+// A turn or command just woke the session's worker: follow its stream if
+// none is open, from the render's cursor. A render with none (no worker
+// then) streams from 0, the start of a new worker's events; should that
+// worker have been up already, turn_started says so (replaysDrawnTurn).
+function followWokenWorker() {
+  if (streamControl?.live) return;
+  startStream(selected, selectSeq ?? 0);
+  streamFromGuess = selectSeq === null;
+}
+
 function startStream(id, fromSeq) {
+  streamFromGuess = false;
   if (streamControl) {
     streamControl.close();
     streamControl = null;
@@ -1675,7 +1691,8 @@ const streamHandlers = {
   // Prompts sent while a turn ran merge into it at an iteration boundary:
   // input_merged names them (their bubbles turn "steered"), then
   // pending_input_merged carries the merged text, shown only for prompts
-  // this tab has no bubble for.
+  // this tab has no bubble for. Its `answer` (the answer the merge
+  // superseded) is the TUI's line: here it streamed as that step's text.
   input_merged: (data) => applyPromptOps(data),
   pending_input_merged: (data) => {
     applyPromptOps(data);
@@ -1683,6 +1700,16 @@ const streamHandlers = {
   },
   turn_enqueued: (data) => applyPromptOps(data),
   turn_started: (data) => keepFollowing(historyEl, () => {
+    if (streamFromGuess) {
+      streamFromGuess = false;
+      // A replay of a turn the render drew: re-read and stream from there.
+      if (replaysDrawnTurn(data, current.timing.turnRecords)) {
+        streamControl?.close();
+        streamControl = null;
+        resync();
+        return;
+      }
+    }
     // A finished turn still in the stage goes first: the start op looks
     // for a queued prompt among its rows.
     turnDom.handOff?.({ immediate: true });
@@ -1729,7 +1756,7 @@ const streamHandlers = {
     }
   },
   turn_canceled: (data) => {
-    endTurnView("canceled", cancelLineText(data.cancellation_reason || ""));
+    endTurnView("canceled", cancelLineText(data.cancellation_reason || "", data.cancelled_by));
     setLiveStatus("idle");
     refreshTimingFromSession();
   },
@@ -1965,7 +1992,7 @@ async function handleSendTurn() {
       echo.remove();
       promptEl.value = "";
       fitPrompt();
-      if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+      followWokenWorker();
       return;
     }
     if (ack?.enqueued_id) sentIds.add(ack.enqueued_id);
@@ -1987,7 +2014,7 @@ async function handleSendTurn() {
     // events in between. Without one, POST /turn just woke a worker: its
     // events start after the seq the session was rendered at (0 for a new
     // worker process).
-    if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+    followWokenWorker();
   } catch (e) {
     echo.remove();
     // The turn never reached the worker's queue: an early restore waiting
@@ -2028,7 +2055,7 @@ async function handleSendCommand(line) {
     fitPrompt();
     refreshHistory();
     // The command woke the worker: follow its stream if none is open.
-    if (!streamControl?.live) startStream(selected, selectSeq ?? 0);
+    followWokenWorker();
   } catch (e) {
     if (/owned_by_tui|409/.test(e.message)) {
       current.owner = "tui";

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

@@ -606,6 +606,13 @@ body.stage-view #dock,body.stage-view #dock:focus-within{background:transparent;
   #infoBar .meta .mem-chip{display:inline;order:-1}
   #infoBar .meta .dir{word-break:normal}
   #infoBar button{padding:4px 8px}
+  /* Icon-only buttons (the words stay as the accessible name, the title says more): the meta gets the width. */
+  #infoBar>button{font-size:0;line-height:0;padding:5px 7px}
+  #infoBar>button::before{content:"";display:block;width:14px;height:14px;background:currentColor;-webkit-mask:var(--icon) center/contain no-repeat;mask:var(--icon) center/contain no-repeat}
+  #infoBar #infoArchiveBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M6.5 9h3'/%3E%3C/svg%3E")}
+  #infoBar #infoArchiveBtn.archived{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M8 11.5V8.25M6.5 9.75 8 8.25l1.5 1.5'/%3E%3C/svg%3E")}
+  #infoBar #infoStopBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M8 2v5.5M4.6 4.4a5 5 0 1 0 6.8 0'/%3E%3C/svg%3E")}
+  #infoBar #infoDeleteBtn{--icon:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2.5 4.5h11M6 4.5V2.75h4V4.5M4 4.5l.7 8.6a1 1 0 0 0 1 .9h4.6a1 1 0 0 0 1-.9l.7-8.6M6.75 7.25v4.5M9.25 7.25v4.5'/%3E%3C/svg%3E")}
 }
 #empty{position:absolute;inset:0;display:grid;place-items:center;color:var(--text-muted);padding:24px;text-align:center;background:color-mix(in srgb,var(--bg) 35%,transparent);z-index:1}
 #empty.hidden{display:none !important}

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

@@ -35,7 +35,7 @@ function defaultChannel() {
 // @param storage () => localStorage (it can throw)
 // @param channel the BroadcastChannel to the other chi tabs, or null
 // @param gateOptions passed to createNotifyGate (specs: schedule, now)
-// @return {noticeSessions(type, data), setBaseTitle(title), clearBadge()}
+// @return {noticeSessions(type, data), noticeList(sessions), setBaseTitle(title), clearBadge()}
 export function createNotifications({
   button,
   doc = globalThis.document,
@@ -125,11 +125,12 @@ export function createNotifications({
       notifyGate.seenInFront(next.attentions.map((a) => a.key));
     } else {
       for (const a of next.attentions) {
-        notifyGate.offer(a, () => {
+        // Every tab behind badges; one of them notifies (notify.js).
+        notifyGate.offer(a, (notify) => {
           if (tabInFront()) return;
           badgeKeys.add(a.key);
           setTitle();
-          showNotification(attention.byId[a.sessionId], a);
+          if (notify) showNotification(attention.byId[a.sessionId], a);
         });
       }
     }
@@ -159,6 +160,10 @@ export function createNotifications({
 
   return {
     noticeSessions,
+    // The list fetched without a hub (app.js refresh): a snapshot.
+    noticeList(sessions) {
+      noticeSessions("snapshot", { sessions });
+    },
     // The title without the badge ("Chi · <project>").
     setBaseTitle(title) {
       baseTitle = title;