samagotchi 0.124.0 → 0.125.0

data/lib/samagotchi/worker.rb

@@ -21,6 +21,7 @@ require_relative "worker_signals"
 require_relative "worker_task_wakes"
 require_relative "session_manager"
 require_relative "archive_store"
+require_relative "reminder_carry"
 require_relative "log"
 require_relative "turn_flow"
 require_relative "turn_checkpoint"
@@ -248,7 +249,11 @@ module Samagotchi
       drop_dead_question
       # The running turn, on disk at its iteration boundaries.
       @checkpoint = TurnCheckpoint.new(session: @session, state_dir: @state_dir)
+      # A restart's hand-off, checked before the Engine's build (its window
+      # runs from the leave) and restored into it after.
+      carried = take_carried_reminders
       @engine = build_engine
+      restore_carried_reminders(carried)
       @config_restart_unsubscribe = ConfigFile.watch_restart_settings!(process: :worker) do |message|
         @engine.announce(type: :hook_notice, hook: "config", text: message, level: :warn, between_turns: true)
       end
@@ -446,7 +451,9 @@ module Samagotchi
       return if run_task_wake
       return if run_due_reminders
       return left(:idle_exit) if @idle_exit.due? && leave_idle
-      return left(@exit_restart ? :restart : :exit_requested) if @exit_requested && leave_on_request
+
+      leaving = @exit_requested && leave_on_request
+      return left(leaving) if leaving
 
       watch_participants
       @waker.wait(idle_wait)
@@ -1514,6 +1521,11 @@ module Samagotchi
     def exit_request(client_id, delete: false, restart: false, stop: false, ask: true)
       # The Bridge serves before the idle-exit policy exists.
       return WorkerIdleExit::Hold.new(reason: :starting) unless @idle_exit
+      # One exit is already taken: the first one decides how the worker
+      # leaves (a later stop-all can't turn a restart, whose reminders go to
+      # the next worker, into a plain exit). Held at the leave, it is
+      # forgotten and the next request counts again.
+      return nil if @exit_requested
 
       if restart
         hold = @idle_exit.hold_for_restart
@@ -1551,7 +1563,8 @@ module Samagotchi
     # intake and stop the idle jobs (the Bridge stops after the log). Other clients' streams no longer hold: the asker's
     # may not have closed yet, and a UI joining now finds the worker gone
     # (:stream_closed), the window #leave_idle has too.
-    # @return [Boolean] false when something came in since the request
+    # @return [Symbol, false] how it leaves (:restart or :exit_requested,
+    #   decided under the lock), false when something came in since the request
     def leave_on_request
       stop_bridge_after do
         @engine.synchronize_events do
@@ -1566,16 +1579,57 @@ module Samagotchi
             Log.info(:worker, "exit_held", reason: hold)
             next false
           end
+          next false if @exit_restart && !carry_reminders
 
           @bridge&.close_intake
           # Not joined: a recap tick's emit waits for the event log held here.
           @engine.stop_idle(join: false)
           Log.info(:worker, @exit_restart ? "restart_requested" : "exit_requested", by: @exit_requested_by || "a client")
-          true
+          @exit_restart ? :restart : :exit_requested
         end
       end
     end
 
+    # A restart hands the reminders to the next worker (ReminderCarry), while
+    # the event log is held: no turn can register or fire one from here. A
+    # write that fails keeps this worker up with them rather than losing them.
+    # A session stopped meanwhile drops them (run_session_loop then starts no
+    # successor): nothing is written.
+    # @return [Boolean] false when the write failed
+    def carry_reminders
+      if stopped_on_disk?
+        ReminderCarry.remove(@session_dir)
+      else
+        ReminderCarry.write(@session_dir, session_id: @session_id, store: @engine.reminder_store)
+      end
+      true
+    rescue StandardError => e
+      @exit_requested = nil
+      @exit_restart = false
+      Log.warn(:worker, "reminders_carry_failed", error: e.class.name, msg: e.message)
+      false
+    end
+
+    # The reminders a restart handed over (#carry_reminders), read and
+    # deleted; a stopped session drops them.
+    # @return [Array<Hash>, nil] ReminderStore#export's entries
+    def take_carried_reminders
+      ReminderCarry.take(@session_dir, session_id: @session_id, stopped: stopped_on_disk?)
+    rescue StandardError => e
+      Log.warn(:worker, "reminders_carry_take_failed", error: e.class.name, msg: e.message)
+      nil
+    end
+
+    # Into the new Engine's store, before the idle scheduler starts polling it.
+    def restore_carried_reminders(entries)
+      return unless entries
+
+      names = @engine.reminder_store.restore(entries)
+      Log.info(:worker, "reminders_carried", count: names.size)
+    rescue StandardError => e
+      Log.warn(:worker, "reminders_carry_restore_failed", error: e.class.name, msg: e.message)
+    end
+
     # @return [Symbol] +result+, with #discard? decided and, for a session
     #   kept, its recap written: the Bridge is closed and the idle jobs are
     #   stopped by now, and nothing waits on this (the TUI has detached). A

data/lib/samagotchi/worker_idle_exit.rb

@@ -11,7 +11,8 @@ module Samagotchi
   # * a client holds the Bridge's stream (an attached TUI, even an idle one,
   #   or a web tab);
   # * a reminder is registered. Reminders live only in the Engine and repeat
-  #   until the agent cancels them, so an exit would drop them for good;
+  #   until the agent cancels them, so an exit would drop them for good (a
+  #   restart hands them to the next worker instead: ReminderCarry);
   # * a continue offer waits for an answer; it too lives only in memory;
   # * a background task the worker watches for a finish wake (TaskWatch)
   #   still runs, or finished and waits for the next pass's wake: its end
@@ -167,18 +168,18 @@ module Samagotchi
     # 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.
+    # this worker's to report). Reminders don't hold: the worker writes them
+    # for its successor as it leaves (Worker#leave_on_request, ReminderCarry).
+    # Clients' streams don't hold either: 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
+    #   :question_pending, :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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.124.0
+  version: 0.125.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -528,6 +528,7 @@ files:
 - lib/samagotchi/relay_desk.rb
 - lib/samagotchi/relay_verifier.rb
 - lib/samagotchi/relay_watcher.rb
+- lib/samagotchi/reminder_carry.rb
 - lib/samagotchi/reminder_queue.rb
 - lib/samagotchi/reminder_store.rb
 - lib/samagotchi/remote_attach_command.rb
@@ -603,13 +604,20 @@ files:
 - lib/samagotchi/terminal_ui/attach_launcher.rb
 - lib/samagotchi/terminal_ui/attach_link.rb
 - lib/samagotchi/terminal_ui/attached_loop.rb
+- lib/samagotchi/terminal_ui/attached_loop/composer.rb
+- lib/samagotchi/terminal_ui/attached_loop/exit_commands.rb
+- lib/samagotchi/terminal_ui/attached_loop/questions.rb
+- lib/samagotchi/terminal_ui/attached_loop/queueing.rb
+- lib/samagotchi/terminal_ui/attached_loop/sending.rb
 - lib/samagotchi/terminal_ui/attached_view.rb
 - lib/samagotchi/terminal_ui/between_turns.rb
 - lib/samagotchi/terminal_ui/event_renderer.rb
+- lib/samagotchi/terminal_ui/exit_lines.rb
 - lib/samagotchi/terminal_ui/formatting.rb
 - lib/samagotchi/terminal_ui/gap_clock.rb
 - lib/samagotchi/terminal_ui/image_input.rb
 - lib/samagotchi/terminal_ui/input_support.rb
+- lib/samagotchi/terminal_ui/join_replay.rb
 - lib/samagotchi/terminal_ui/line_reader.rb
 - lib/samagotchi/terminal_ui/live_region.rb
 - lib/samagotchi/terminal_ui/local_link.rb
@@ -757,6 +765,7 @@ files:
 - lib/samagotchi/web/public/chains.js
 - lib/samagotchi/web/public/chip_popover.js
 - lib/samagotchi/web/public/chunk_router.js
+- lib/samagotchi/web/public/claim_link.js
 - lib/samagotchi/web/public/command_complete.js
 - lib/samagotchi/web/public/command_list.js
 - lib/samagotchi/web/public/command_view.js
@@ -871,6 +880,7 @@ files:
 - lib/samagotchi/web/public/vendor/directives/repeat.js
 - lib/samagotchi/web/public/vendor/directives/unsafe-html.js
 - lib/samagotchi/web/public/vendor/lit-html.js
+- lib/samagotchi/web/public/verify_preset.js
 - lib/samagotchi/web/public/working_set.js
 - lib/samagotchi/web/public/working_set_rail.js
 - lib/samagotchi/web/public/working_set_view.js