samagotchi 0.7.0 → 0.8.0

data/lib/samagotchi/worker.rb

@@ -3,6 +3,7 @@
 require "fileutils"
 
 require_relative "session"
+require_relative "session_inbox"
 require_relative "turn_note"
 require_relative "context_note"
 require_relative "worker_idle_exit"
@@ -24,9 +25,9 @@ module Samagotchi
   # disk exits the process; an error outside a turn marks the session and
   # exits with 1.
   #
-  # The file IPC stays behind SessionManager's class methods
-  # (find_new_input_files, claim_input_file, start_bridge, ...), which specs
-  # stub as seams.
+  # The file IPC stays behind SessionInbox's functions (find_new_input_files,
+  # claim_input_file, ...) and the Bridge behind SessionManager.start_bridge,
+  # which specs stub as seams.
   #
   # The loop sleeps on a Waker, which the Bridge wakes when it queues a turn
   # or a command, and the reminder callback when it queues one. A fallback
@@ -98,6 +99,7 @@ module Samagotchi
     #   to exit (Bridge POST /exit)
     def run
       @session = Session.load(@session_id, state_dir: @state_dir)
+      drop_dead_question
       @engine = build_engine
       # Before the Bridge serves anything: a UI joining a resumed worker's
       # stream gets the session's history and status in its snapshot, not
@@ -142,7 +144,7 @@ module Samagotchi
       @idle_exit = WorkerIdleExit.new(
         engine: @engine, bridge: @bridge,
         timeout_minutes: @idle_exit_minutes || SessionManager.config_idle_exit_minutes,
-        input_pending: -> { !@command_queue.empty? || !SessionManager.find_new_input_files(@session_dir).empty? },
+        input_pending: -> { !@command_queue.empty? || !SessionInbox.find_new_input_files(@session_dir).empty? },
         awaiting_continue: -> { @turn_flow.awaiting_continue? }
       )
 
@@ -170,7 +172,7 @@ module Samagotchi
             next
           end
 
-          input_files = SessionManager.find_new_input_files(@session_dir)
+          input_files = SessionInbox.find_new_input_files(@session_dir)
           if input_files.empty?
             next if run_due_reminders
             return left(:idle_exit) if @idle_exit.due? && leave_idle
@@ -208,7 +210,6 @@ module Samagotchi
       waker = @waker
       engine = nil
       engine = Samagotchi::Engine.new(
-        mode: @session.mode.to_sym,
         model_name: @session.model_name,
         # The session's --memory and --mute lists: the same prompt on every
         # (re)spawn.
@@ -231,6 +232,19 @@ module Samagotchi
       engine
     end
 
+    # A question saved by a worker that died while it waited (an
+    # ask_user_question, an approval, a hook's question): the turn that
+    # asked is gone, so nobody can answer it, and left in the file it
+    # would keep the hub's "needs you" badge on for good. Dropped and saved
+    # before the Engine and the Bridge exist (no question lock, no events).
+    def drop_dead_question
+      return unless @session.pending_question
+
+      Log.info(:worker, "dead_question_dropped", id: @session.pending_question[:id])
+      @session.pending_question = nil
+      @session.save(state_dir: @state_dir)
+    end
+
     # spawn_session hands the first prompt over in last_prompt, but
     # last_prompt also records every later turn's prompt (and mark_error's
     # reason), so only a session with no conversation yet has one pending; a
@@ -255,12 +269,12 @@ module Samagotchi
     # the saved conversation already holds. Not activity: a note alone
     # neither starts a turn nor keeps an idle worker up.
     def absorb_notes
-      files = SessionManager.find_new_note_files(@session_dir)
+      files = SessionInbox.find_new_note_files(@session_dir)
       return if files.empty? || stopped_on_disk?
 
-      claimed = files.filter_map { |file| SessionManager.claim_note_file(file) }
+      claimed = files.filter_map { |file| SessionInbox.claim_note_file(file) }
       claimed.each do |file|
-        note = SessionManager.read_note(file)
+        note = SessionInbox.read_note(file)
         @engine.add_context_note(@session, note) if note
       end
       @session.save(state_dir: @state_dir)
@@ -268,11 +282,11 @@ module Samagotchi
     end
 
     def run_input_file(input_file)
-      claimed_file = SessionManager.claim_input_file(input_file)
+      claimed_file = SessionInbox.claim_input_file(input_file)
       return unless claimed_file
 
       begin
-        message, origin, no_interrupt, images = SessionManager.read_input(claimed_file)
+        message, origin, no_interrupt, images = SessionInbox.read_input(claimed_file)
         run_prompt(message, origin, no_interrupt: !!no_interrupt, images: images || []) unless message.to_s.strip.empty?
       ensure
         FileUtils.rm_f(claimed_file)
@@ -303,7 +317,7 @@ module Samagotchi
       end
       after_turn(result, no_interrupt: no_interrupt)
       response = result.respond_to?(:output) ? result.output : nil
-      SessionManager.write_output(@session_dir, response) unless response.nil? || response.strip.empty?
+      SessionInbox.write_output(@session_dir, response) unless response.nil? || response.strip.empty?
       @session.save(state_dir: @state_dir) unless stopped_on_disk?
     end
 
@@ -326,7 +340,7 @@ module Samagotchi
                                                  origin: { client_id: SessionManager::REMINDER_CLIENT_ID },
                                                  max_iterations: DEFAULT_MAX_ITERATIONS)
         response = result.respond_to?(:output) ? result.output : nil
-        SessionManager.write_output(@session_dir, response) unless response.nil? || response.strip.empty?
+        SessionInbox.write_output(@session_dir, response) unless response.nil? || response.strip.empty?
       rescue StandardError
         nil # the Engine announced :turn_failed; there is no prompt to hand back
       ensure
@@ -462,7 +476,7 @@ module Samagotchi
       end
       after_turn(result, continue: true, no_interrupt: offer[:no_interrupt])
       response = result.respond_to?(:output) ? result.output : nil
-      SessionManager.write_output(@session_dir, response) unless response.nil? || response.strip.empty?
+      SessionInbox.write_output(@session_dir, response) unless response.nil? || response.strip.empty?
       @session.save(state_dir: @state_dir) unless stopped_on_disk?
     end
 
@@ -527,14 +541,14 @@ module Samagotchi
         refuse_queued_commands(mid_turn: true)
         # A line with images runs as its own next turn (steering merges text
         # only), and so does anything queued after it, to keep the order.
-        files = SessionManager.find_new_input_files(@session_dir).sort
-                              .take_while { |input_file| !SessionManager.input_has_images?(input_file) }
+        files = SessionInbox.find_new_input_files(@session_dir).sort
+                            .take_while { |input_file| !SessionInbox.input_has_images?(input_file) }
         merged = files.filter_map do |input_file|
-          claimed_file = SessionManager.claim_input_file(input_file)
+          claimed_file = SessionInbox.claim_input_file(input_file)
           next unless claimed_file
 
           begin
-            prompt, origin = SessionManager.read_input(claimed_file)
+            prompt, origin = SessionInbox.read_input(claimed_file)
             prompt = prompt.to_s.strip
             prompt.empty? ? nil : [prompt, origin]
           ensure
@@ -626,8 +640,8 @@ module Samagotchi
 
     # Memory used before any turn saved it lives only in the Engine.
     def empty_session?
-      SessionManager.discard_empty? && Array(@engine.used_memory_names).empty? &&
-        SessionManager.empty_session?(@session_id, state_dir: @state_dir, default_model: @default_model)
+      SessionManager.discardable?(@session_id, state_dir: @state_dir, default_model: @default_model,
+                                               used_memory_names: @engine.used_memory_names)
     end
 
     def log_idle_exit

data/lib/samagotchi/worker_sidecar.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "json"
+require "fileutils"
+require_relative "atomic_file"
+
+module Samagotchi
+  # A worker's bridge.json in its session directory: how clients reach its
+  # Bridge (port, bind), when it started (a new worker behind the same
+  # "worker" owner), the chi it runs (chi update) and the input-file format
+  # it reads (SessionInbox::INPUT_FORMAT). The Bridge writes it on start
+  # and removes it on stop; one a dead worker left stays until a client's
+  # probe finds its port closed (BridgeClient.sidecar_port).
+  class WorkerSidecar < Data.define(:port, :bind, :session_id, :started_at, :version, :input_format)
+    FILE = "bridge.json"
+
+    def self.path(session_dir) = File.join(session_dir, FILE)
+
+    # @return [WorkerSidecar, nil] nil when there is none, or it is not a
+    #   JSON object; port is 0 when it names none
+    def self.read(session_dir)
+      data = JSON.parse(File.read(path(session_dir)))
+      return nil unless data.is_a?(Hash)
+
+      port = data["port"]
+      new(port: port.respond_to?(:to_i) ? port.to_i : 0, bind: data["bind"], session_id: data["session_id"],
+          started_at: data["started_at"], version: data["version"], input_format: data["input_format"])
+    rescue JSON::ParserError, SystemCallError
+      nil
+    end
+
+    def initialize(port:, bind: nil, session_id: nil, started_at: nil, version: nil, input_format: nil) = super
+
+    # Written whole or not at all; input_format only when it names one.
+    def write(session_dir)
+      FileUtils.mkdir_p(session_dir)
+      record = to_h.transform_keys(&:to_s)
+      record.delete("input_format") if input_format.nil?
+      AtomicFile.write(self.class.path(session_dir), "#{JSON.pretty_generate(record)}\n")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -139,6 +139,8 @@ files:
 - lib/samagotchi.rb
 - lib/samagotchi/answer_display.rb
 - lib/samagotchi/archive_store.rb
+- lib/samagotchi/atomic_file.rb
+- lib/samagotchi/bootstrap/bundles.rb
 - lib/samagotchi/bootstrap/config_writer.rb
 - lib/samagotchi/bootstrap/probe.rb
 - lib/samagotchi/bootstrap_command.rb
@@ -160,6 +162,8 @@ files:
 - lib/samagotchi/bundles/btw/plugin.rb
 - lib/samagotchi/bundles/check-in/manifest.yml
 - lib/samagotchi/bundles/check-in/plugin.rb
+- lib/samagotchi/bundles/core/manifest.yml
+- lib/samagotchi/bundles/dev/manifest.yml
 - lib/samagotchi/bundles/guardrails/guardrails.md
 - lib/samagotchi/bundles/guardrails/guardrails/rules.yml
 - lib/samagotchi/bundles/guardrails/manifest.yml
@@ -187,6 +191,7 @@ files:
 - lib/samagotchi/config.rb
 - lib/samagotchi/context_note.rb
 - lib/samagotchi/context_quote.rb
+- lib/samagotchi/context_status.rb
 - lib/samagotchi/context_usage.rb
 - lib/samagotchi/context_window.rb
 - lib/samagotchi/debug_log.rb
@@ -242,6 +247,7 @@ files:
 - lib/samagotchi/llm/native_tool_normalizer.rb
 - lib/samagotchi/llm/openai_chat.rb
 - lib/samagotchi/llm/usage.rb
+- lib/samagotchi/llm/utf8_scrub.rb
 - lib/samagotchi/log.rb
 - lib/samagotchi/log_line.rb
 - lib/samagotchi/log_path.rb
@@ -254,6 +260,7 @@ files:
 - lib/samagotchi/memory_bundle/manifest.rb
 - lib/samagotchi/memory_bundle/merger.rb
 - lib/samagotchi/memory_bundle/placeholder.rb
+- lib/samagotchi/memory_bundle/profile.rb
 - lib/samagotchi/memory_bundle/provenance.rb
 - lib/samagotchi/memory_bundle/shipped_update.rb
 - lib/samagotchi/memory_bundle/source.rb
@@ -267,6 +274,7 @@ files:
 - lib/samagotchi/note_command.rb
 - lib/samagotchi/output_formatter.rb
 - lib/samagotchi/owner_lock.rb
+- lib/samagotchi/paths.rb
 - lib/samagotchi/pending_input_queue.rb
 - lib/samagotchi/plugin/api.rb
 - lib/samagotchi/plugin/context.rb
@@ -292,9 +300,11 @@ files:
 - lib/samagotchi/session_archive_command.rb
 - lib/samagotchi/session_commands.rb
 - lib/samagotchi/session_delete_command.rb
+- lib/samagotchi/session_inbox.rb
 - lib/samagotchi/session_manager.rb
 - lib/samagotchi/session_metrics.rb
 - lib/samagotchi/session_observer.rb
+- lib/samagotchi/session_retention.rb
 - lib/samagotchi/sessions_command.rb
 - lib/samagotchi/steer.rb
 - lib/samagotchi/system_prompt.rb
@@ -362,6 +372,7 @@ files:
 - lib/samagotchi/vision_context.rb
 - lib/samagotchi/vision_support.rb
 - lib/samagotchi/web/app.rb
+- lib/samagotchi/web/info_probe.rb
 - lib/samagotchi/web/lan.rb
 - lib/samagotchi/web/markdown_renderer.rb
 - lib/samagotchi/web/message_parts.rb
@@ -407,6 +418,7 @@ files:
 - lib/samagotchi/web/token.rb
 - lib/samagotchi/worker.rb
 - lib/samagotchi/worker_idle_exit.rb
+- lib/samagotchi/worker_sidecar.rb
 homepage: https://github.com/dm1try/samagotchi
 licenses:
 - MIT