samagotchi 0.66.0 → 0.67.0

data/lib/samagotchi/worker.rb

@@ -218,7 +218,7 @@ module Samagotchi
     # The session, its Engine and what runs its turns, before anyone can
     # reach it.
     def start
-      # The wake turns' budget (delegate reports, attached context), from now.
+      # The wake turns' budget (delegate reports, attached context, peers), from now.
       @wakes = WorkerWakes.new(grace: WAKE_START_GRACE)
       # This worker holds the session now (a continue's starting marker held
       # off any other until it did), and a continue that died moving
@@ -272,7 +272,8 @@ module Samagotchi
                                         predecessor: @session.continues)
       # Its attached context's notes (ContextSources).
       @context_absorber = ContextAbsorber.new(session_id: @session_id, state_dir: @state_dir,
-                                              project_root: @session.project_root)
+                                              project_root: @session.project_root,
+                                              peer_sources: @engine.peer_sources, peer_turns: -> { @wakes.peer_turns })
       # What comes in between turns, and how each kind is saved.
       @inbound = WorkerInbound.new(session: @session, state_dir: @state_dir, session_dir: @session_dir, engine: @engine,
                                    context_absorber: @context_absorber, wakes: @wakes,
@@ -496,13 +497,14 @@ module Samagotchi
     # A turn nobody typed for a changed source (a context wake): a continue
     # turn from context:<name> whose first message is the wake note already
     # in the conversation (named by +turn_id+), on the same rules as a
-    # delegate report's wake turn: it counts toward session.max_wakes, and
-    # a failure goes back to before the turn (the note stays, as a plain
-    # one: WorkerInbound#unmark_wake) and pauses wakes until a human's input.
+    # delegate report's wake turn: it counts toward session.max_wakes (a
+    # peer's answer toward context.peer_turns too), and a failure goes back
+    # to before the turn (the note stays, as a plain one:
+    # WorkerInbound#unmark_wake) and pauses wakes until a human's input.
     # +context_wake+: a WorkerInbound::ContextWake.
     def run_context_wake_turn(context_wake)
       name = context_wake.name
-      Log.info(:worker, "context_wake_turn", name: name, in_a_row: @wakes.count!)
+      Log.info(:worker, "context_wake_turn", name: name, in_a_row: @wakes.count!(peer: context_wake.peer?))
       @turn_flow.before_prompt_turn
       run_engine_turn(nil, continue: true, origin: context_wake.origin,
                            id: context_wake.turn_id, max_iterations: IterationLimit.for) do |result, error|
@@ -1220,12 +1222,13 @@ module Samagotchi
 
     # A human's input (ClientId.human?) un-archives the session;
     # a delegate's, a plugin's or a reminder's doesn't.
-    # It also resets the delegate-report wakes (budget and pause).
+    # It also resets the wakes (budget and pause); input typed in the web or
+    # a TUI the peer wakes too (chi send doesn't: a peer can run it).
     def user_input(client_id)
       return unless ClientId.human?(client_id)
 
       ArchiveStore.user_input(@session_id, state_dir: @state_dir)
-      @wakes.human_input!
+      @wakes.human_input!(interactive: ClientId.interactive?(client_id))
     end
 
     def stopped_on_disk?

data/lib/samagotchi/worker_inbound.rb

@@ -4,12 +4,14 @@ require "fileutils"
 require "securerandom"
 require "time"
 
+require_relative "child_reports"
 require_relative "client_id"
 require_relative "config"
 require_relative "context_note"
 require_relative "log"
 require_relative "session"
 require_relative "session_inbox"
+require_relative "worker_wakes"
 
 module Samagotchi
   # What comes into a worker's session between turns, each kind with its
@@ -43,6 +45,8 @@ module Samagotchi
     # the turn +turn_id+.
     ContextWake = Data.define(:delivery, :turn_id) do
       def name = delivery.name
+      # For a peer agent's answer (its own budget, WorkerWakes#peer_open?).
+      def peer? = !delivery.peer.nil?
       def origin = { client_id: "#{ClientId::CONTEXT_PREFIX}#{name}" }
     end
 
@@ -230,14 +234,42 @@ module Samagotchi
     # context.wake is on, the wake budget is open (WorkerWakes#context_open?:
     # no continue offer, not paused, under session.max_wakes, past the start
     # grace) and the source hasn't woken the session in the last
-    # CONTEXT_WAKE_WINDOW. The others stay plain notes. Within the start
-    # grace a change is a note: it came while the session was away.
+    # CONTEXT_WAKE_WINDOW; a peer's answer (Delivery#peer) has no window but
+    # the peer budget (WorkerWakes#peer_open?). The others stay plain notes.
+    # Within the start grace a change is a note: it came while the session
+    # was away. A peer's answer held by either budget is announced once.
     def context_wake_for(batch, now: Time.now)
       candidates = batch.deliveries.select(&:wake_note)
       return nil if candidates.empty? || !context_wakes_on?
-      return nil unless @wakes.context_open?(awaiting_continue: @awaiting_continue.call, names: candidates.map(&:name))
 
-      candidates.find { |delivery| !woke_lately?(delivery.subscription, now) }
+      unless @wakes.context_open?(awaiting_continue: @awaiting_continue.call, names: candidates.map(&:name))
+        peer_held(candidates.find(&:peer), ChildRing::MAX_WAKES_KEY) if @wakes.spent?
+        return nil
+      end
+
+      held = []
+      waking = candidates.select do |delivery|
+        next !woke_lately?(delivery.subscription, now) unless delivery.peer
+
+        next true if @wakes.peer_open?(name: delivery.name)
+
+        held << delivery
+        false
+      end
+      peer_held(held.first, WorkerWakes::PEER_TURNS_KEY)
+      waking.first
+    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.
+    def peer_held(delivery, key)
+      return unless delivery && @wakes.notice_peer_budget!
+
+      turns = key == ChildRing::MAX_WAKES_KEY ? @wakes.max : @wakes.peer_turns
+      @engine.announce(type: :hook_notice, hook: "context", level: :info, between_turns: true,
+                       text: "#{delivery.peer} answered again; it waits as a note for your next message " \
+                             "(#{turns} wake turn#{"s" if turns != 1} in a row, #{key})")
     end
 
     def context_wakes_on? = Config.get("context.wake") != false

data/lib/samagotchi/worker_wakes.rb

@@ -13,23 +13,36 @@ module Samagotchi
   # it what happened. It also holds the reports a delegate wake turn was
   # started for until the turn's first boundary takes them (#hand_over,
   # #take_handed).
+  #
+  # A peer agent's answers (PeerSources) have a budget of their own on top:
+  # context.peer_turns wake turns in a row, reset only by input typed in the
+  # web or a TUI (ClientId.interactive?), not by chi send, which a peer can
+  # run (docs/context.md, Waking).
   class WorkerWakes
+    PEER_TURNS_KEY = "context.peer_turns"
+    PEER_TURNS_DEFAULT = 3
+
     # @param grace [Numeric] seconds after the start with no wake turn
     # @param clock [#call] monotonic seconds
     # @param max [#call, nil] the budget; nil reads session.max_wakes
-    def initialize(grace:, clock: -> { Process.clock_gettime(Process::CLOCK_MONOTONIC) }, max: nil)
+    # @param peer_max [#call, nil] the peer budget; nil reads context.peer_turns
+    def initialize(grace:, clock: -> { Process.clock_gettime(Process::CLOCK_MONOTONIC) }, max: nil, peer_max: nil)
       @grace = grace
       @clock = clock
       @max = max
+      @peer_max = peer_max
       @started_at = clock.call
       @in_a_row = 0
+      @peer_in_a_row = 0
       @paused = false
       @budget_noticed = false
+      @peer_noticed = false
       @handed = nil
     end
 
-    # Wake turns run since the last human input.
-    attr_reader :in_a_row
+    # Wake turns run since the last human input; peer wake turns since the
+    # last interactive one.
+    attr_reader :in_a_row, :peer_in_a_row
 
     def grace_left = @grace - (@clock.call - @started_at)
 
@@ -44,6 +57,35 @@ module Samagotchi
       ChildRing::MAX_WAKES_DEFAULT
     end
 
+    # context.peer_turns: 0 (or less) is 0, the peer policy off.
+    def peer_max
+      return @peer_max.call if @peer_max
+
+      value = Integer(Config.get(PEER_TURNS_KEY), exception: false)
+      value ? [value, 0].max : PEER_TURNS_DEFAULT
+    rescue StandardError
+      PEER_TURNS_DEFAULT
+    end
+
+    # The peer wake turns that may run in a row: context.peer_turns, or
+    # session.max_wakes when it is lower; 0 when the peer policy is off.
+    def peer_turns
+      peers = peer_max
+      peers.zero? ? 0 : [peers, max].min
+    end
+
+    # Whether session.max_wakes holds wake turns now.
+    def spent? = @in_a_row >= max
+
+    # Whether a peer's answer may start a wake turn by the peer budget
+    # (#context_open? asked first). +name+: the source, for the log line.
+    def peer_open?(name:)
+      return true if @peer_in_a_row < peer_turns
+
+      Log.info(:worker, "context_wake_held", reason: "peer_turns", names: name)
+      false
+    end
+
     # For delegate reports: :due when a wake turn may run now (the block
     # says reports wait; asked only when nothing else holds), :budget when
     # only the budget stops it, nil otherwise. The start grace is the
@@ -68,8 +110,12 @@ module Samagotchi
       true
     end
 
-    # A wake turn starts. @return [Integer] the wake turns in a row now
-    def count! = @in_a_row += 1
+    # A wake turn starts; +peer+: for a peer's answer, which counts toward
+    # both budgets. @return [Integer] the wake turns in a row now
+    def count!(peer: false)
+      @peer_in_a_row += 1 if peer
+      @in_a_row += 1
+    end
 
     # A wake turn failed (or was stopped before it got anywhere): none
     # starts again until a human's input.
@@ -77,11 +123,17 @@ module Samagotchi
       @paused = true
     end
 
-    # A human's input resets the budget, the pause and the budget notice.
-    def human_input!
+    # A human's input resets the budget, the pause and the budget notice;
+    # an +interactive+ one (ClientId.interactive?: the web, a TUI) the peer
+    # budget and its notice too. chi send isn't: a peer can run it.
+    def human_input!(interactive: true)
       @in_a_row = 0
       @paused = false
       @budget_noticed = false
+      return unless interactive
+
+      @peer_in_a_row = 0
+      @peer_noticed = false
     end
 
     # @return [Boolean] true the first time the budget is spent since the
@@ -92,6 +144,14 @@ module Samagotchi
       @budget_noticed = true
     end
 
+    # @return [Boolean] true the first time a peer's answer is held since
+    #   the last interactive input: the UIs hear it once
+    def notice_peer_budget!
+      return false if @peer_noticed
+
+      @peer_noticed = true
+    end
+
     # The idle loop's sleep: +poll+, or less while a wake (the block says
     # one is due) waits out the start grace.
     def idle_wait(poll)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.67.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -130,6 +130,7 @@ files:
 - docs/desktop.md
 - docs/guardrails.md
 - docs/hooks.md
+- docs/internals/anthropic.md
 - docs/internals/background-tasks.md
 - docs/internals/bundles.md
 - docs/internals/context-telemetry.md
@@ -260,6 +261,7 @@ files:
 - lib/samagotchi/delivery.rb
 - lib/samagotchi/desktop.rb
 - lib/samagotchi/desktop/macos.rb
+- lib/samagotchi/desktop/macos/AgentTerminal.swift
 - lib/samagotchi/desktop/macos/App.swift
 - lib/samagotchi/desktop/macos/Broadcast.swift
 - lib/samagotchi/desktop/macos/ChiRunner.swift
@@ -270,6 +272,7 @@ files:
 - lib/samagotchi/desktop/macos/Models.swift
 - lib/samagotchi/desktop/macos/Panel.swift
 - lib/samagotchi/desktop/macos/ProcessRunner.swift
+- lib/samagotchi/desktop/macos/Tmux.swift
 - lib/samagotchi/desktop_command.rb
 - lib/samagotchi/edit_preview.rb
 - lib/samagotchi/empty_answer_retry.rb
@@ -304,12 +307,14 @@ files:
 - lib/samagotchi/guardrails/shell_paths.rb
 - lib/samagotchi/guardrails/targets.rb
 - lib/samagotchi/guardrails/verdict.rb
+- lib/samagotchi/hook_routes.rb
 - lib/samagotchi/hooks.rb
 - lib/samagotchi/hooks/bundle_loader.rb
 - lib/samagotchi/hooks/loader.rb
 - lib/samagotchi/hooks/registry.rb
 - lib/samagotchi/hooks/stream_watch.rb
 - lib/samagotchi/host_config.rb
+- lib/samagotchi/host_keys.rb
 - lib/samagotchi/host_model.rb
 - lib/samagotchi/host_registry.rb
 - lib/samagotchi/idle_client.rb
@@ -326,6 +331,7 @@ files:
 - lib/samagotchi/last_turn.rb
 - lib/samagotchi/launch_mode.rb
 - lib/samagotchi/live_versions.rb
+- lib/samagotchi/llm/adapter_common.rb
 - lib/samagotchi/llm/adapters.rb
 - lib/samagotchi/llm/anthropic_assembly.rb
 - lib/samagotchi/llm/anthropic_messages.rb
@@ -342,6 +348,7 @@ files:
 - lib/samagotchi/llm/native_tool_normalizer.rb
 - lib/samagotchi/llm/openai_chat.rb
 - lib/samagotchi/llm/prompt_cache.rb
+- lib/samagotchi/llm/refusal_memo.rb
 - lib/samagotchi/llm/stream_drops.rb
 - lib/samagotchi/llm/turn_settings.rb
 - lib/samagotchi/llm/usage.rb
@@ -399,15 +406,18 @@ files:
 - lib/samagotchi/owner_lock.rb
 - lib/samagotchi/parent_report.rb
 - lib/samagotchi/paths.rb
+- lib/samagotchi/peer_sources.rb
 - lib/samagotchi/pending_input_queue.rb
 - lib/samagotchi/plugin/api.rb
 - lib/samagotchi/plugin/attached_context.rb
 - lib/samagotchi/plugin/context.rb
 - lib/samagotchi/plugin/loader.rb
+- lib/samagotchi/plugin/peer.rb
 - lib/samagotchi/plugin/service.rb
 - lib/samagotchi/plugin/sessions.rb
 - lib/samagotchi/plugin/side_question.rb
 - lib/samagotchi/plugin/tool_result.rb
+- lib/samagotchi/plugin/tool_spec.rb
 - lib/samagotchi/plugin_session_state.rb
 - lib/samagotchi/plugin_tasks.rb
 - lib/samagotchi/process_group.rb
@@ -495,6 +505,7 @@ files:
 - lib/samagotchi/tool_runner.rb
 - lib/samagotchi/tool_view.rb
 - lib/samagotchi/toolkit.rb
+- lib/samagotchi/toolkit_binding.rb
 - lib/samagotchi/toolkit_command.rb
 - lib/samagotchi/tools/args.rb
 - lib/samagotchi/tools/ask_user_question.rb
@@ -523,9 +534,11 @@ files:
 - lib/samagotchi/tools/task_create.rb
 - lib/samagotchi/tools/task_get.rb
 - lib/samagotchi/tools/task_list.rb
+- lib/samagotchi/tools/task_record.rb
 - lib/samagotchi/tools/task_runtime.rb
 - lib/samagotchi/tools/task_stop.rb
 - lib/samagotchi/tools/task_wait.rb
+- lib/samagotchi/tools/tool_index.rb
 - lib/samagotchi/tools/tool_path.rb
 - lib/samagotchi/tools/web_fetch.rb
 - lib/samagotchi/tools/write.rb