samagotchi 0.31.0 → 0.32.0

data/lib/samagotchi/worker.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require "securerandom"
+require "time"
 
+require_relative "config"
 require_relative "events"
 require_relative "session"
 require_relative "session_inbox"
@@ -18,6 +21,8 @@ require_relative "iteration_limit"
 require_relative "session_commands"
 require_relative "model_profile"
 require_relative "child_reports"
+require_relative "context_absorber"
+require_relative "context_poller"
 require_relative "tools/task_runtime"
 
 module Samagotchi
@@ -51,6 +56,9 @@ module Samagotchi
     # gets it over the Bridge a moment after it starts, and that message's
     # turn goes first (the reports join it).
     WAKE_START_GRACE = 2.0
+    # One context wake per source in this long (D5): later changes inside
+    # it arrive as notes.
+    CONTEXT_WAKE_WINDOW = 600
     # How much of a command's output goes into its :command_ran.
     COMMAND_OUTPUT_LIMIT = 4096
     BUSY_OUTPUT = "busy: wait for the turn to end"
@@ -168,6 +176,9 @@ module Samagotchi
       })
       # This session's own delegate children's news (rings in children/).
       @child_reports = ChildReports.new(session_id: @session_id, state_dir: @state_dir)
+      # Its attached context's notes (ContextSources).
+      @context_absorber = ContextAbsorber.new(session_id: @session_id, state_dir: @state_dir,
+                                              project_root: @session.project_root)
       # /model's default is the config's, as in the REPL; the Engine started
       # on the session's model.
       @default_model = ModelProfile.required_model_name(nil)
@@ -211,6 +222,11 @@ module Samagotchi
         # the background, shown by the UIs; a turn waits only for the ones
         # that bring tools.
         @engine.start_init_tasks!
+        # Attached context's commands, in the background; a new text wakes
+        # the loop to absorb it. Not activity: the idle exit stops it.
+        @context_poller = ContextPoller.new(session_id: @session_id, state_dir: @state_dir,
+                                            project_root: @session.project_root, cwd: @session.working_directory,
+                                            on_change: -> { @waker.wake }).start
         loop do
           # Check if the session was externally marked as stopped. Not
           # stopped_on_disk?, which reads a vanished file as "not stopped":
@@ -223,7 +239,10 @@ module Samagotchi
           next if run_queued_commands
 
           # Between turns, so the next turn (the first one too) sees them.
+          # A change that asks to wake may start a turn here (C4), but not
+          # ahead of an exit or restart a client asked for: it is a note then.
           absorb_notes
+          next if absorb_context(wake: nothing_queued? && !@exit_requested)
 
           if (prompt = take_initial_prompt)
             run_initial_prompt(prompt) unless initial_command(prompt)
@@ -263,6 +282,9 @@ module Samagotchi
         # step-limit question stays in the file (a save here would write
         # over a stop's status): with no live worker the lists don't read
         # it as waiting, and the next worker drops it (drop_dead_question).
+        # The context poller first: a command it runs goes (its process
+        # group) before the Engine does.
+        @context_poller&.stop
         @engine&.shutdown
         @bridge&.stop
       end
@@ -372,6 +394,108 @@ module Samagotchi
       claimed.each { |file| FileUtils.rm_f(file) }
     end
 
+    # The attached context's notes (ContextAbsorber), between turns. Not
+    # into a session with no turn yet (+before_turn+: one is about to
+    # run): auto-attached context alone doesn't make a session worth
+    # keeping. Saved, then the subscriptions written (a crash between the
+    # two re-delivers; the note ids dedupe).
+    # +wake+: the session is idle with nothing queued, so an update whose
+    # source asked to wake may start a turn (#context_wake_for): its note
+    # goes in as the turn's first message.
+    # @return [Boolean] whether a wake turn ran
+    def absorb_context(before_turn: false, wake: false)
+      return false unless before_turn || conversation_started?
+      return false if stopped_on_disk?
+
+      batch = @context_absorber.pending
+      return false unless batch
+
+      waking = wake ? context_wake_for(batch) : nil
+      turn_id = SecureRandom.uuid if waking
+      batch.deliveries.each do |delivery|
+        next unless delivery.note
+
+        note = delivery == waking ? delivery.wake_note.merge(turn_start: true, turn_id: turn_id) : delivery.note
+        @engine.add_context_note(@session, note)
+      end
+      # Saved even when every note was there already: after a failed save
+      # they are in memory only.
+      return false if batch.notes.any? && !save_or_log(:context) { @session.save(state_dir: @state_dir) }
+
+      @context_absorber.commit(waking ? woken(batch, waking) : batch)
+      return false unless waking
+
+      run_context_wake_turn(waking.name, turn_id)
+      true
+    rescue SystemCallError, IOError => e
+      Log.exception(:worker, "context_failed", e)
+      false
+    end
+
+    # No input file or queued command waits: the loop would go idle.
+    def nothing_queued? = @command_queue.empty? && SessionInbox.find_new_input_files(@session_dir).empty?
+
+    # The update in +batch+ that may start a wake turn now: its source
+    # asked (wake: true), context.wake is on, the shared wake step's
+    # conditions hold (no continue offer, wakes not paused by a failed one,
+    # under session.max_wakes in a row with no human input, 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.
+    def context_wake_for(batch, now: Time.now)
+      candidates = batch.deliveries.select(&:wake_note)
+      return nil if candidates.empty? || !context_wakes_on?
+      return nil if @wakes_paused || @turn_flow.awaiting_continue? || wake_grace_left.positive?
+
+      if @wakes_in_a_row >= max_wakes
+        Log.info(:worker, "context_wake_held", reason: "max_wakes", names: candidates.map(&:name).join(","))
+        return nil
+      end
+      candidates.find { |delivery| !woke_lately?(delivery.subscription, now) }
+    end
+
+    def context_wakes_on? = Config.get("context.wake") != false
+
+    def woke_lately?(subscription, now)
+      at = subscription&.wakes_at && Time.iso8601(subscription.wakes_at)
+      at ? now - at < CONTEXT_WAKE_WINDOW : false
+    rescue ArgumentError
+      false
+    end
+
+    # +batch+ with +waking+'s subscription recording the wake (the 10-minute window).
+    def woken(batch, waking)
+      stamped = waking.with(subscription: waking.subscription.with(wakes_at: Time.now.iso8601))
+      batch.with(deliveries: batch.deliveries.map { |delivery| delivery == waking ? stamped : delivery })
+    end
+
+    # 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: it was saved
+    # before the checkpoint) and pauses wakes until a human's input.
+    def run_context_wake_turn(name, turn_id)
+      @wakes_in_a_row += 1
+      Log.info(:worker, "context_wake_turn", name: name, in_a_row: @wakes_in_a_row)
+      @turn_flow.before_prompt_turn
+      run_engine_turn(nil, continue: true, origin: { client_id: "#{Steer::CONTEXT_CLIENT_PREFIX}#{name}" },
+                           id: turn_id, max_iterations: IterationLimit.for) do |result, error|
+        if error
+          note = TurnNote.failed(error.respond_to?(:summary) ? error.summary : error.message)
+          @turn_flow.prompt_turn_failed(note: note)
+          @wakes_paused = true
+        else
+          @continue_offer.after_turn(result)
+        end
+      end
+    end
+
+    # Whether the session has had a turn: a user or assistant message.
+    def conversation_started?
+      Array(@session.messages).any? { |m| %w[user assistant model].include?((m[:role] || m["role"]).to_s) }
+    end
+
     # The first prompt (spawn_session's): a delegate child's task, which is
     # its parent's although no client sent it.
     def run_initial_prompt(prompt)
@@ -400,6 +524,8 @@ module Samagotchi
     #   its continue turn
     # @param images [Array<Hash>] the prompt's image refs ({file:, name:})
     def run_prompt(prompt, origin, no_interrupt: false, images: [])
+      # A first turn sees the context attached before it.
+      absorb_context(before_turn: true)
       user_input(origin&.dig(:client_id))
       @continue_offer.drop(origin)
       @turn_flow.before_prompt_turn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -125,6 +125,7 @@ files:
 - docs/architecture.md
 - docs/cli.md
 - docs/configuration.md
+- docs/context.md
 - docs/desktop.md
 - docs/guardrails.md
 - docs/hooks.md
@@ -170,6 +171,9 @@ files:
 - lib/samagotchi/bundles/check-in/plugin.rb
 - lib/samagotchi/bundles/core/manifest.yml
 - lib/samagotchi/bundles/dev/manifest.yml
+- lib/samagotchi/bundles/github-pr/manifest.yml
+- lib/samagotchi/bundles/github-pr/plugin.rb
+- lib/samagotchi/bundles/github-pr/scripts/pr_context.rb
 - lib/samagotchi/bundles/guardrails/guardrails.md
 - lib/samagotchi/bundles/guardrails/guardrails/rules.yml
 - lib/samagotchi/bundles/guardrails/guardrails/small-models.yml
@@ -203,8 +207,14 @@ files:
 - lib/samagotchi/commands/registry.rb
 - lib/samagotchi/config.rb
 - lib/samagotchi/config_text_edit.rb
+- lib/samagotchi/context_absorber.rb
+- lib/samagotchi/context_command.rb
+- lib/samagotchi/context_fetch.rb
 - lib/samagotchi/context_note.rb
+- lib/samagotchi/context_poller.rb
+- lib/samagotchi/context_providers.rb
 - lib/samagotchi/context_quote.rb
+- lib/samagotchi/context_sources.rb
 - lib/samagotchi/context_status.rb
 - lib/samagotchi/context_usage.rb
 - lib/samagotchi/context_window.rb
@@ -315,6 +325,7 @@ files:
 - lib/samagotchi/paths.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/service.rb
@@ -394,6 +405,7 @@ files:
 - lib/samagotchi/tools/builtin_calls.rb
 - lib/samagotchi/tools/builtins.rb
 - lib/samagotchi/tools/cancel_reminder.rb
+- lib/samagotchi/tools/context_read.rb
 - lib/samagotchi/tools/delegate.rb
 - lib/samagotchi/tools/delegate_cursor.rb
 - lib/samagotchi/tools/delegate_relay.rb
@@ -448,6 +460,7 @@ files:
 - lib/samagotchi/web/public/command_list.js
 - lib/samagotchi/web/public/command_view.js
 - lib/samagotchi/web/public/composer_size.js
+- lib/samagotchi/web/public/context_chips.js
 - lib/samagotchi/web/public/copy.js
 - lib/samagotchi/web/public/ctx.js
 - lib/samagotchi/web/public/data.js