samagotchi 0.158.0 → 0.159.0

data/lib/samagotchi/worker.rb

@@ -374,7 +374,9 @@ module Samagotchi
                              # chi web's Stop asks about these before TERMed-ing
                              # the worker (its own holds routes).
                              on_holds: -> { @idle_exit&.stoppable_holds },
-                             on_holds_stop: -> { @hold_stop&.stop_all })
+                             on_holds_stop: -> { @hold_stop&.stop_all },
+                             # `chi schedule tick` asks this before firing.
+                             on_activity: method(:activity_snapshot))
       # What failed to load and what plugins showed as they loaded, now that
       # a UI can be there (a late one gets them in the snapshot).
       @engine.announce_load_events!
@@ -410,12 +412,12 @@ module Samagotchi
     #   there is no live SSE or in-process cancel/answer).
     # @param on_input [#call, nil] called after the Bridge queues a turn
     def start_bridge(engine:, state_dir:, session_id:, on_input: nil, on_command: nil, on_exit_request: nil,
-                     exit_discards: nil, exit_stopped: nil, on_holds: nil, on_holds_stop: nil)
+                     exit_discards: nil, exit_stopped: nil, on_holds: nil, on_holds_stop: nil, on_activity: nil)
       require_relative "bridge"
       Samagotchi::Bridge.new(
         engine: engine, state_dir: state_dir, session_id: session_id, input_format: SessionInbox::INPUT_FORMAT,
         on_input: on_input, on_command: on_command, on_exit_request: on_exit_request, exit_discards: exit_discards,
-        exit_stopped: exit_stopped, on_holds: on_holds, on_holds_stop: on_holds_stop
+        exit_stopped: exit_stopped, on_holds: on_holds, on_holds_stop: on_holds_stop, on_activity: on_activity
       ).start
     rescue StandardError => e
       Log.error(:bridge, "start_failed", echo: "Bridge: failed to start for session #{session_id}: #{e.class}: #{e.message}", sid: session_id, error: e.class.name)
@@ -426,6 +428,22 @@ module Samagotchi
       Degrade.call(:config, "idle_exit_minutes_unreadable") { Samagotchi::Config.get("session.idle_exit_minutes") }
     end
 
+    # What this worker is busy with right now, for GET /activity: the same
+    # signals WorkerIdleExit#hold reads. A schedule never holds a worker up,
+    # so +reminders+ and +tasks_holding+ are reported for the log but are not a
+    # reason for a tick to skip a firing.
+    # @return [Hash]
+    def activity_snapshot
+      {
+        turn_running: @engine.turn_running?,
+        input_pending: input_pending?,
+        awaiting_continue: @turn_flow.awaiting_continue?,
+        open_streams: @bridge&.open_streams.to_i,
+        reminders: @engine.reminder_store&.any? ? 1 : 0,
+        tasks_holding: Degrade.call(:worker, "activity_tasks_unreadable") { @task_wakes&.watch&.holding&.size.to_i }
+      }
+    end
+
     # The delegate children of this session that are running a turn or have
     # a live worker. ChildrenStatus.of scans the session files; this runs on
     # an exit request, not every pass.
@@ -1033,9 +1051,9 @@ module Samagotchi
                kept: "Its note stays for the user's next message.", mark: task_wake)
     end
 
-    # The idle loop's sleep: the fallback tick, or less while reports wait
-    # out the start grace.
-    def idle_wait = @wakes.idle_wait(@poll_interval) { wake_state == :due }
+    # The idle loop's sleep: the fallback tick, or less while reports or
+    # attached-context wakes wait out the start grace.
+    def idle_wait = @wakes.idle_wait(@poll_interval) { wake_state == :due || @inbound.context_wake_waiting? }
 
     # The wake budget is spent: the parent's UIs hear once that reports
     # wait for the next message.

data/lib/samagotchi/worker_boot.rb

@@ -3,9 +3,8 @@
 require_relative "session_manager"
 
 module Samagotchi
-  # WorkerBoot: the worker process, from run_session_loop (what the boot
-  # string SessionManager#worker_command writes runs, through
-  # SessionManager.run_session_loop) to what it does as it leaves (CROSS-VERSION
+  # WorkerBoot: the worker process, from the entry the boot string names
+  # (WorkerBoot.run_session_loop) to what it does as it leaves (CROSS-VERSION
   # CONTRACT: spec/worker_contract_spec.rb). It takes the session's OwnerLock,
   # leaves the spawner's process tree, installs the signals and the project
   # env, and runs the Worker (worker.rb loads only then, after the lock). Calls
@@ -14,7 +13,7 @@ module Samagotchi
   module WorkerBoot
     class << self
       # Run the session loop inside the forked process: the worker's main,
-      # which the boot string reaches through SessionManager.run_session_loop.
+      # which the boot string names directly.
       #
       # Every worker starts its per-session Bridge (the single live client
       # transport) on a port bound to 127.0.0.1 before the loop and stops it on

data/lib/samagotchi/worker_inbound.rb

@@ -106,6 +106,7 @@ module Samagotchi
       @stopped = stopped
       @queue_command = queue_command
       @initial_prompt_taken = false
+      @context_wake_waiting = false
     end
 
     # Add the queued context notes to the conversation (between turns only,
@@ -148,12 +149,18 @@ module Samagotchi
     # @return [ContextWake, nil] the wake turn to run now
     # @raise [SystemCallError, IOError] the caller logs it (context_failed)
     def absorb_context(before_turn: false, wake: false)
+      @context_wake_waiting = false
       return nil unless before_turn || conversation_started?
       return nil if @stopped.call
 
       batch = @context_absorber.pending
       return nil unless batch
 
+      if wake && context_wake_waiting_for?(batch)
+        @context_wake_waiting = true
+        return nil
+      end
+
       waking = wake ? context_wake_for(batch) : nil
       turn_id = SecureRandom.uuid if waking
       batch.deliveries.each do |delivery|
@@ -170,6 +177,10 @@ module Samagotchi
       waking && ContextWake.new(delivery: waking, turn_id: turn_id)
     end
 
+    # Whether #absorb_context left an eligible wake batch uncommitted for
+    # the start grace, so the idle loop can revisit it when grace expires.
+    def context_wake_waiting? = @context_wake_waiting
+
     # A failed wake turn kept nothing but its note: the note goes back to
     # a plain note (no turn start, the background wording), so a reload
     # draws no empty turn for it. +wake+: a ContextWake or a TaskWake.
@@ -300,6 +311,18 @@ module Samagotchi
       waking.first
     end
 
+    def context_wake_waiting_for?(batch)
+      return false unless @wakes.in_grace?
+
+      candidates = batch.deliveries.select(&:wake_note)
+      return false if candidates.empty? || !context_wakes_on?
+      return false unless @wakes.context_ready?(awaiting_continue: @awaiting_continue.call, names: candidates.map(&:name))
+
+      candidates.any? do |delivery|
+        delivery.peer ? @wakes.peer_in_a_row < @wakes.peer_turns : !woke_lately?(delivery.subscription, Time.now)
+      end
+    end
+
     # A peer's answer waits as a note: the UIs hear it once per
     # interactive input (WorkerWakes#notice_peer_budget!). +key+: the
     # budget that holds it.

data/lib/samagotchi/worker_link.rb

@@ -34,6 +34,11 @@ module Samagotchi
     # newer worker's (Skew).
     PROTOCOL = 1
 
+    # A worker whose sidecar publishes this may be asked what it is busy with
+    # (Bridge's GET /activity, Worker#activity_snapshot): a sidecar without it
+    # is an older chi's, and asking it would only cost a 404.
+    ACTIVITY_FEATURE = "activity"
+
     # Seconds a worker may hold the lock without publishing its Bridge before
     # Starting is stuck (SessionManager::WORKER_START_GRACE).
     START_LIMIT = 30.0

data/lib/samagotchi/worker_wakes.rb

@@ -101,7 +101,15 @@ module Samagotchi
     # not paused, past the start grace and under the budget. +names+: the
     # sources asking, for the log line when the budget holds them.
     def context_open?(awaiting_continue:, names:)
-      return false if @paused || awaiting_continue || in_grace?
+      return false if in_grace?
+
+      context_ready?(awaiting_continue:, names:)
+    end
+
+    # The context wake gates apart from start grace; used to decide whether
+    # a wake must remain pending until that grace ends.
+    def context_ready?(awaiting_continue:, names:)
+      return false if @paused || awaiting_continue
 
       if @in_a_row >= max
         Log.info(:worker, "context_wake_held", reason: "max_wakes", names: names.join(","))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.158.0
+  version: 0.159.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -176,6 +176,7 @@ files:
 - docs/memory.md
 - docs/plugins.md
 - docs/releasing.md
+- docs/scheduling.md
 - docs/sessions.md
 - docs/sub-agent.md
 - docs/system-one.md
@@ -499,6 +500,7 @@ files:
 - lib/samagotchi/log_subscriber.rb
 - lib/samagotchi/memory_bundle.rb
 - lib/samagotchi/memory_bundle/asset_installer.rb
+- lib/samagotchi/memory_bundle/asset_state.rb
 - lib/samagotchi/memory_bundle/builder.rb
 - lib/samagotchi/memory_bundle/bundle_hook.rb
 - lib/samagotchi/memory_bundle/entry_size.rb
@@ -640,6 +642,8 @@ files:
 - lib/samagotchi/run_options.rb
 - lib/samagotchi/sampling_settings.rb
 - lib/samagotchi/sandbox_layout.rb
+- lib/samagotchi/schedule_command.rb
+- lib/samagotchi/schedules.rb
 - lib/samagotchi/self_report.rb
 - lib/samagotchi/send_command.rb
 - lib/samagotchi/send_command/busy.rb
@@ -802,6 +806,7 @@ files:
 - lib/samagotchi/tools/builtin_calls.rb
 - lib/samagotchi/tools/builtins.rb
 - lib/samagotchi/tools/cancel_reminder.rb
+- lib/samagotchi/tools/cancel_schedule.rb
 - lib/samagotchi/tools/context_read.rb
 - lib/samagotchi/tools/deferred_tools.rb
 - lib/samagotchi/tools/delegate.rb
@@ -814,6 +819,7 @@ files:
 - lib/samagotchi/tools/forget_outputs.rb
 - lib/samagotchi/tools/index_hint.rb
 - lib/samagotchi/tools/list_reminders.rb
+- lib/samagotchi/tools/list_schedules.rb
 - lib/samagotchi/tools/list_sessions.rb
 - lib/samagotchi/tools/memory.rb
 - lib/samagotchi/tools/objectives_tool.rb
@@ -823,6 +829,7 @@ files:
 - lib/samagotchi/tools/ref_text.rb
 - lib/samagotchi/tools/register_reminder.rb
 - lib/samagotchi/tools/registry.rb
+- lib/samagotchi/tools/schedule_task.rb
 - lib/samagotchi/tools/send_note.rb
 - lib/samagotchi/tools/shell.rb
 - lib/samagotchi/tools/task_create.rb