samagotchi 0.18.1 → 0.19.0

data/lib/samagotchi/worker.rb

@@ -16,6 +16,7 @@ require_relative "continue_offer"
 require_relative "iteration_limit"
 require_relative "session_commands"
 require_relative "model_profile"
+require_relative "tools/task_runtime"
 
 module Samagotchi
   # The loop of a background session worker, once it owns the session (see
@@ -85,6 +86,8 @@ module Samagotchi
       @exit_requested_by = nil
       # Set as it leaves: nothing happened in the session (#discard?).
       @discard = false
+      # The exit asked for is a restart (POST /exit restart: true).
+      @exit_restart = false
     end
 
     # Whether the session was empty as the worker left it, so the caller
@@ -96,7 +99,8 @@ module Samagotchi
     attr_reader :default_model
 
     # @return [Symbol] :idle_exit, :exit_requested when a client asked it
-    #   to exit (Bridge POST /exit), :stopped when the session was stopped
+    #   to exit (Bridge POST /exit), :restart when it asked for a restart
+    #   (the caller starts a new worker), :stopped when the session was stopped
     #   (chi stop), :crashed when the loop raised (the session is marked
     #   errored); SessionManager.run_session_loop turns it into the exit
     def run
@@ -154,7 +158,8 @@ module Samagotchi
         engine: @engine, bridge: @bridge,
         timeout_minutes: @idle_exit_minutes || SessionManager.config_idle_exit_minutes,
         input_pending: -> { !@command_queue.empty? || !SessionInbox.find_new_input_files(@session_dir).empty? },
-        awaiting_continue: -> { @turn_flow.awaiting_continue? }
+        awaiting_continue: -> { @turn_flow.awaiting_continue? },
+        running_tasks: -> { Tools::TaskRuntime.running_created_in(@engine.messages_checkpoint) }
       )
 
       begin
@@ -188,7 +193,7 @@ module Samagotchi
           if input_files.empty?
             next if run_due_reminders
             return left(:idle_exit) if @idle_exit.due? && leave_idle
-            return left(:exit_requested) if @exit_requested && leave_on_request
+            return left(@exit_restart ? :restart : :exit_requested) if @exit_requested && leave_on_request
 
             @waker.wait(@poll_interval)
             next
@@ -581,17 +586,20 @@ module Samagotchi
 
     # Bridge POST /exit, on a Bridge thread with the event log held.
     # +delete+: the session is deleted after (/exit --delete), so no recap.
+    # +restart+: a new worker takes over (on the newest chi installed), so
+    # WorkerIdleExit#hold_for_restart's rules, and no recap or discard.
     # @return [Symbol, nil] what keeps the worker up, nil when it will leave
-    def exit_request(client_id, delete: false)
+    def exit_request(client_id, delete: false, restart: false)
       # The Bridge serves before the idle-exit policy exists.
       return :starting unless @idle_exit
 
-      hold = @idle_exit.hold_for_request(requester: client_id)
+      hold = restart ? @idle_exit.hold_for_restart : @idle_exit.hold_for_request(requester: client_id)
       return hold if hold
 
       @exit_requested = true
       @exit_requested_by = client_id
-      @exit_deletes = delete
+      @exit_deletes = delete && !restart
+      @exit_restart = restart
       @waker.wake
       nil
     end
@@ -604,16 +612,21 @@ module Samagotchi
     # @return [Boolean] false when something came in since the request
     def leave_on_request
       @engine.synchronize_events do
-        hold = @idle_exit.hold_for_request(requester: @exit_requested_by, streams: false)
+        hold = if @exit_restart
+                 @idle_exit.hold_for_restart
+               else
+                 @idle_exit.hold_for_request(requester: @exit_requested_by, streams: false)
+               end
         if hold
           @exit_requested = nil
+          @exit_restart = false
           Log.info(:worker, "exit_held", reason: hold)
           next false
         end
 
         @bridge&.stop
         @engine.stop_idle
-        Log.info(:worker, "exit_requested", by: @exit_requested_by || "a client")
+        Log.info(:worker, @exit_restart ? "restart_requested" : "exit_requested", by: @exit_requested_by || "a client")
         true
       end
     end
@@ -623,7 +636,11 @@ module Samagotchi
     #   stopped by now, and nothing waits on this (the TUI has detached). A
     #   `chi send` meanwhile is picked up after the exit (run_session_loop);
     #   a `chi --attach` finds no Bridge until then.
+    # A restart keeps even an empty session (a new worker takes it over at
+    # once) and leaves the recap to the conversation's next real pause.
     def left(result)
+      return result if result == :restart
+
       @discard = empty_session?
       write_recap_on_leave unless @discard || (result == :exit_requested && @exit_deletes)
       result

data/lib/samagotchi/worker_idle_exit.rb

@@ -18,7 +18,8 @@ module Samagotchi
   #
   # A client can also ask the worker to exit now (`/exit` in the attached
   # TUI, Bridge POST /exit): #hold_for_request applies the same rules without
-  # the timeout and leaves out the asking client's own stream.
+  # the timeout and leaves out the asking client's own stream. A restart
+  # (POST /exit restart: true) has its own rules, #hold_for_restart.
   class WorkerIdleExit
     # @param engine [Engine] #turn_running?, #last_activity_at, #reminder_store
     # @param bridge [Bridge, nil] #open_streams, #last_client_activity_at; nil
@@ -26,14 +27,17 @@ module Samagotchi
     # @param timeout_minutes [Numeric, nil] 0 or nil: never exit
     # @param input_pending [#call] true while input files wait
     # @param awaiting_continue [#call] true while a continue offer waits
+    # @param running_tasks [#call] the background tasks this conversation
+    #   started that still run (Tools::TaskRuntime.running_created_in)
     # @param clock [#call] monotonic seconds, the Engine's and Bridge's clock
     def initialize(engine:, bridge:, timeout_minutes:, input_pending:, awaiting_continue: -> { false },
-                   clock: -> { Process.clock_gettime(Process::CLOCK_MONOTONIC) })
+                   running_tasks: -> { [] }, clock: -> { Process.clock_gettime(Process::CLOCK_MONOTONIC) })
       @engine = engine
       @bridge = bridge
       @timeout = timeout_minutes.to_f * 60
       @input_pending = input_pending
       @awaiting_continue = awaiting_continue
+      @running_tasks = running_tasks
       @clock = clock
       @started_at = clock.call
     end
@@ -78,6 +82,31 @@ module Samagotchi
       nil
     end
 
+    # What keeps the worker from restarting now (a client asked: POST /exit
+    # restart: true), or nil. A restart drops what lives only in this
+    # process, so whatever would be lost or cut holds it: a question or
+    # approval waiting (a turn's), a /btw (or another anytime command)
+    # running, a delegate's approval relay this worker still answers for,
+    # background tasks this conversation started (their output and end are
+    # this worker's to report). Clients' streams don't hold: a web tab
+    # reconnects on the new worker's bridge_up, an attached terminal finds
+    # the new worker's Bridge.
+    # @return [Symbol, nil] :turn_running, :input_queued, :continue_offered,
+    #   :question_pending, :reminders, :command_running, :relays_open or
+    #   :background_tasks
+    def hold_for_restart
+      return :turn_running if @engine.turn_running?
+      return :input_queued if @input_pending.call
+      return :continue_offered if @awaiting_continue.call
+      return :question_pending if @engine.pending_question
+      return :reminders if @engine.reminder_store&.any?
+      return :command_running if @engine.anytime_running?
+      return :relays_open if @engine.relay_desk.active?
+      return :background_tasks if @running_tasks.call.any?
+
+      nil
+    end
+
     # @return [Float] seconds since the latest activity of any kind
     def idle_seconds
       last = [@started_at, @engine.last_activity_at, @bridge&.last_client_activity_at].compact.max

data/lib/samagotchi/worker_sidecar.rb

@@ -8,11 +8,12 @@ require_relative "atomic_file"
 module Samagotchi
   # A worker's bridge.json in its session directory: how clients reach its
   # Bridge (port, bind), when it started (a new worker behind the same
-  # "worker" owner), the chi it runs (chi update) and the input-file format
-  # it reads (SessionInbox::INPUT_FORMAT). The Bridge writes it on start
+  # "worker" owner), the chi it runs (chi update, the web's stale-worker
+  # badge), the input-file format it reads (SessionInbox::INPUT_FORMAT) and
+  # what else it can do (Bridge::FEATURES). The Bridge writes it on start
   # and removes it on stop; one a dead worker left stays until a client's
   # probe finds its port closed (.live with unlink: true).
-  class WorkerSidecar < Data.define(:port, :bind, :session_id, :started_at, :version, :input_format)
+  class WorkerSidecar < Data.define(:port, :bind, :session_id, :started_at, :version, :input_format, :features)
     FILE = "bridge.json"
     # Seconds a liveness probe waits for the port to take a connect.
     PROBE_TIMEOUT = 0.2
@@ -27,7 +28,8 @@ module Samagotchi
 
       port = data["port"]
       new(port: port.respond_to?(:to_i) ? port.to_i : 0, bind: data["bind"], session_id: data["session_id"],
-          started_at: data["started_at"], version: data["version"], input_format: data["input_format"])
+          started_at: data["started_at"], version: data["version"], input_format: data["input_format"],
+          features: Array(data["features"]).map(&:to_s))
     rescue JSON::ParserError, SystemCallError
       nil
     end
@@ -61,7 +63,7 @@ module Samagotchi
     # @return [Integer, nil] .live's port
     def self.live_port(session_dir, unlink:, host: "127.0.0.1") = live(session_dir, unlink: unlink, host: host)&.port
 
-    def initialize(port:, bind: nil, session_id: nil, started_at: nil, version: nil, input_format: nil) = super
+    def initialize(port:, bind: nil, session_id: nil, started_at: nil, version: nil, input_format: nil, features: []) = super
 
     # Written whole or not at all; input_format only when it names one.
     def write(session_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -252,6 +252,7 @@ files:
 - lib/samagotchi/idle_scheduler.rb
 - lib/samagotchi/image_store.rb
 - lib/samagotchi/installed_gem.rb
+- lib/samagotchi/installed_versions.rb
 - lib/samagotchi/iteration_limit.rb
 - lib/samagotchi/kernel_loop.rb
 - lib/samagotchi/launch_mode.rb
@@ -363,6 +364,7 @@ files:
 - lib/samagotchi/terminal_ui/status_row.rb
 - lib/samagotchi/terminal_ui/surface.rb
 - lib/samagotchi/terminal_ui/thinking_line.rb
+- lib/samagotchi/terminal_ui/version_lines.rb
 - lib/samagotchi/text_diff.rb
 - lib/samagotchi/thinking.rb
 - lib/samagotchi/thinking_ticker.rb