samagotchi 0.158.0 → 0.160.0

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

@@ -6,6 +6,7 @@ require "time"
 
 require_relative "child_reports"
 require_relative "client_id"
+require_relative "command_intake"
 require_relative "config"
 require_relative "context_note"
 require_relative "log"
@@ -106,6 +107,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 +150,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 +178,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.
@@ -200,11 +212,24 @@ module Samagotchi
       prompt
     end
 
+    # The first prompt's origin: the turn id spawn_session gave it (a wait
+    # for it, --new --wait, names it) and who sent it when no person did
+    # (Session#first_turn_client_id: a delegating parent, a schedule). A
+    # delegate child's task is its parent's even without the field (one
+    # spawned by an older chi, or by a caller that names no sender). NONE
+    # for a person's session from before either field.
+    # @return [TurnOrigin]
+    def initial_origin
+      client_id = @session.first_turn_client_id
+      client_id ||= ClientId.delegate(@session.parent_id) if @session.delegate? && @session.parent_id
+      TurnOrigin.of(client_id: client_id, enqueued_id: @session.first_turn_id)
+    end
+
     # The first prompt as a command (queued): the session was saved as
     # running for a turn that won't run.
     # @return [Boolean] whether it was one
     def initial_command?(prompt)
-      return false unless queue_as_command(prompt, TurnOrigin::NONE)
+      return false unless queue_as_command(prompt, initial_origin)
 
       @session.status = Session::STATUS_IDLE
       save(:initial_command, unless_stopped: true)
@@ -253,7 +278,11 @@ module Samagotchi
     # POST /turn; an unknown /word stays a prompt. Queued: the loop's next
     # pass runs it. A participant's is refused (dropped, with its audit
     # line): commands and shell lines are the owner's (chi web and the
-    # Bridge refuse them first; this is the worker's own layer).
+    # Bridge refuse them first; this is the worker's own layer). From a
+    # sender that may not send commands (CommandIntake.allowed?: a
+    # delegate, a schedule, a plugin...) a /word line is a prompt, and a
+    # shell line is queued for Worker#run_command_line to refuse, so its
+    # sender and the UIs see the refusal as the command's error.
     # @return [Boolean] whether +text+ was one
     def queue_as_command(text, origin, after_file = nil)
       return false unless @engine.command_registry.command?(text.to_s)
@@ -264,6 +293,7 @@ module Samagotchi
                                                 what: "command", reason: "not_permitted")
         return true
       end
+      return false unless CommandIntake.allowed?(origin.client_id) || CommandIntake.shell_line?(text)
 
       @queue_command.call(text, origin.client_id, after_file, origin.enqueued_id)
       true
@@ -300,6 +330,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.160.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
@@ -313,6 +314,7 @@ files:
 - lib/samagotchi/cli/parent_wait.rb
 - lib/samagotchi/client.rb
 - lib/samagotchi/client_id.rb
+- lib/samagotchi/command_intake.rb
 - lib/samagotchi/command_steps.rb
 - lib/samagotchi/commands/registry.rb
 - lib/samagotchi/composer_route.rb
@@ -499,6 +501,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
@@ -593,6 +596,8 @@ files:
 - lib/samagotchi/process_group.rb
 - lib/samagotchi/project_command.rb
 - lib/samagotchi/project_env.rb
+- lib/samagotchi/project_id.rb
+- lib/samagotchi/project_id_clash.rb
 - lib/samagotchi/project_init.rb
 - lib/samagotchi/project_scope.rb
 - lib/samagotchi/prompt.rb
@@ -640,6 +645,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
@@ -690,6 +697,7 @@ files:
 - lib/samagotchi/side_judgments.rb
 - lib/samagotchi/side_usage.rb
 - lib/samagotchi/starting_marker.rb
+- lib/samagotchi/state_format.rb
 - lib/samagotchi/steer.rb
 - lib/samagotchi/steer_cut.rb
 - lib/samagotchi/steer_cut_after.rb
@@ -802,6 +810,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 +823,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 +833,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