samagotchi 0.76.0 → 0.78.0

data/lib/samagotchi/terminal_ui.rb

@@ -42,8 +42,8 @@ require_relative "children_status"
 require_relative "log"
 
 module Samagotchi
-  # Loaded on first use: session_manager requires this file (its worker
-  # process loads the whole UI stack through it), a require cycle otherwise.
+  # Loaded on first use: this autoload keeps SessionManager and its ~80
+  # files unloaded until the delegate/session path needs them.
   autoload :SessionManager, File.expand_path("session_manager", __dir__)
 
   # The in-process terminal front end (`chi --no-shared`, `chi scratch`,
@@ -873,6 +873,7 @@ module Samagotchi
                   end
         if command
           show_command_result(command)
+          refresh_status_row(clear_unknown_context: true) if command.changed.include?(:model)
           persist_recent_history(input) if command.shell
           return
         end
@@ -1400,9 +1401,10 @@ module Samagotchi
 
     # The status row under the prompt, from the Engine's state (what a
     # worker hands an attached TUI when it joins): drawn when it changed.
-    def refresh_status_row
+    def refresh_status_row(clear_unknown_context: false)
       state = @engine.session_state_snapshot.merge(model_name: @effective_model_name)
       @status_row.take_state(state, default_model: @default_model_name)
+      @status_row.update(context: nil) if clear_unknown_context && state.key?(:context_status) && state[:context_status].nil?
       refresh_children_status
     end
 
@@ -1463,13 +1465,13 @@ module Samagotchi
     def drain_pending_question?
       pq = @pending_question_event
       # Also check Engine's persisted pending (covers resume)
-      pq ||= @engine.pending_question
+      pq ||= @engine.pending_question&.to_h
       return false unless pq
 
       # If the pending no longer matches the engine's current pending (stale
       # event after sync handler already answered and cleared), discard.
       current = @engine.pending_question
-      if current && (pq[:id] || pq["id"]).to_s != (current[:id] || current["id"]).to_s
+      if current && (pq[:id] || pq["id"]).to_s != current.id.to_s
         @pending_question_event = nil
         return false
       end

data/lib/samagotchi/tool_output_cut.rb

@@ -38,7 +38,7 @@ module Samagotchi
     HEAD_CUT = /\[cut: \d+ of \d+ chars; read it in parts\]\z/
 
     # What a web row keeps of a tool's output, on a reload
-    # (Web::MessageParts) and a mid-turn join (Bridge::TurnAccumulator): the
+    # (MessageParts) and a mid-turn join (Bridge::TurnAccumulator): the
     # row shows 300 chars and the rest on hover. A longer one keeps its head
     # and tail (preview).
     WEB_PREVIEW_CHARS = 2000

data/lib/samagotchi/tool_response.rb

@@ -29,7 +29,7 @@ module Samagotchi
     # Runs +calls+ in order (ToolRunner#run each), yielding each run and its
     # index as it finishes. +emit+ takes the dispatch events, the runner's
     # own go to +on_stream_event+.
-    # @return [Array<Hash>] the runs
+    # @return [Array<ToolRun>] the runs
     def run_batch(runner, calls, iteration:, emit:, on_stream_event:, cap:)
       emit.call({ type: :tool_dispatch_started, iteration: iteration, call_count: calls.length })
       runs = calls.each_with_index.map do |call, index|
@@ -45,7 +45,7 @@ module Samagotchi
     # The runs' activity, for the turn's tool list (none for a call whose
     # dispatcher raised).
     def activities(runs)
-      runs.filter_map { |run| run[:activity] }
+      runs.filter_map(&:activity)
     end
 
     # The native loop's entry for a batch: the capped outputs joined, every image
@@ -53,14 +53,14 @@ module Samagotchi
     # each on its own tool row), and the saved-only fields one per call:
     # +ids+ (ToolIds.next_ids) as tool_ids.
     def joined(runs, ids:)
-      images = runs.flat_map { |run| Array(run[:images]) }
-      entry = { role: "tool_response", content: runs.map { |run| run[:capped_output] }.join(SEPARATOR) }
+      images = runs.flat_map { |run| Array(run.images) }
+      entry = { role: "tool_response", content: runs.map(&:capped_output).join(SEPARATOR) }
       unless images.empty?
         entry[:images] = images
-        entry[:image_counts] = runs.map { |run| Array(run[:images]).size }
+        entry[:image_counts] = runs.map { |run| Array(run.images).size }
       end
-      saved = { tool_params: runs.map { |run| run[:shown_params] }, tool_labels: runs.map { |run| run[:shown_label] },
-                tool_diffs: runs.map { |run| run[:diff] }, tool_refs: runs.map { |run| run[:refs] } }
+      saved = { tool_params: runs.map(&:shown_params), tool_labels: runs.map(&:shown_label),
+                tool_diffs: runs.map(&:diff), tool_refs: runs.map(&:refs) }
       saved.each { |key, values| entry[key] = values if values.any? }
       entry[:tool_ids] = ids
       entry
@@ -70,12 +70,12 @@ module Samagotchi
     # call by +tool_call_id+, and its chi-owned id (a one-id +ids+, as
     # #joined's tool_ids).
     def single(run, tool_call_id:, ids:)
-      entry = { role: "tool_response", content: run[:capped_output], tool_call_id: tool_call_id }
-      entry[:images] = run[:images] if run[:images]&.any?
-      entry[:tool_params] = run[:shown_params] if run[:shown_params]
-      entry[:tool_labels] = run[:shown_label] if run[:shown_label]
-      entry[:tool_diffs] = run[:diff] if run[:diff]
-      entry[:tool_refs] = run[:refs] if run[:refs]
+      entry = { role: "tool_response", content: run.capped_output, tool_call_id: tool_call_id }
+      entry[:images] = run.images if run.images&.any?
+      entry[:tool_params] = run.shown_params if run.shown_params
+      entry[:tool_labels] = run.shown_label if run.shown_label
+      entry[:tool_diffs] = run.diff if run.diff
+      entry[:tool_refs] = run.refs if run.refs
       entry[:tool_ids] = ids
       entry
     end

data/lib/samagotchi/tool_row_fields.rb

@@ -7,7 +7,7 @@ require_relative "file_ref"
 module Samagotchi
   # The fields a tool row shows beyond its params, built from the call in
   # one place for every path: the live tool_call_started (ToolRunner#run)
-  # and a reload from the saved call (Web::MessageParts#tool_part). The
+  # and a reload from the saved call (MessageParts#tool_part). The
   # bridge's snapshot and replay (Bridge::TurnAccumulator) copy them by
   # these lists, so a new field is added here and travels everywhere.
   #

data/lib/samagotchi/tool_runner.rb

@@ -15,6 +15,17 @@ require_relative "memory_bundle/index_sync"
 require_relative "memory_bundle/index_size"
 
 module Samagotchi
+  # One call's result from ToolRunner#run, read by ToolResponse (the loops'
+  # tool_response entries) and the loops' activity list. Fields a call didn't
+  # produce (images, shown_params, shown_label, refs, diff, output_file) are nil.
+  ToolRun = Data.define(:output, :capped_output, :truncated, :activity, :images, :shown_params, :shown_label, :refs, :diff,
+                        :output_file) do
+    def initialize(output: nil, capped_output: nil, truncated: nil, activity: nil, images: nil, shown_params: nil,
+                   shown_label: nil, refs: nil, diff: nil, output_file: nil)
+      super
+    end
+  end
+
   # The single per-call path both loops use: the tool_call_started and
   # tool_call_completed events, the guardrail gate (before_tool_call hooks
   # and their veto), dispatch through KernelLoop, the after_tool_call hook
@@ -40,7 +51,7 @@ module Samagotchi
     end
 
     # @param call_index [Integer] 1-based position of the call in its batch
-    # @return [Hash] output:, capped_output:, truncated:, activity:,
+    # @return [ToolRun] output:, capped_output:, truncated:, activity:,
     #   output_file: (the saved whole output of a cut execute result),
     #   images: (refs) when the tool returned images the model gets to see, and
     #   shown_params: the params line the live row showed, and shown_label:
@@ -135,14 +146,10 @@ module Samagotchi
       fire(:after_tool_call, { type: :after_tool_call, iteration: iteration, tool: call[:name], output: capped,
                                status: status || "error", call: call.dup, elapsed_ms: elapsed_ms, result: tool_text })
 
-      run = { output: output, capped_output: capped, truncated: truncated, activity: result[:activity] }
-      run[:images] = images if images&.any?
-      run[:shown_params] = params if params && plugin_tool?(call[:name])
-      run[:shown_label] = label if label
-      run[:refs] = refs unless refs.empty?
-      run[:diff] = diff if diff
-      run[:output_file] = output_file if output_file
-      run
+      ToolRun.new(output: output, capped_output: capped, truncated: truncated, activity: result[:activity],
+                  images: images&.any? ? images : nil,
+                  shown_params: params && plugin_tool?(call[:name]) ? params : nil,
+                  shown_label: label, refs: refs.empty? ? nil : refs, diff: diff, output_file: output_file)
     end
 
     private

data/lib/samagotchi/tools/delegate.rb

@@ -10,8 +10,8 @@ require_relative "delegate_wait"
 require_relative "../child_reports"
 
 module Samagotchi
-  # Loaded on first use: session_manager requires terminal_ui, which
-  # requires KernelLoop and so these tools (a require cycle otherwise).
+  # Loaded on first use: this autoload keeps SessionManager and its ~80
+  # files unloaded until the delegate/session path needs them.
   autoload :SessionManager, File.expand_path("../session_manager", __dir__)
 
   module Tools

data/lib/samagotchi/tools/delegate_relay.rb

@@ -37,7 +37,7 @@ module Samagotchi
       # @param relay [#open_question, #relay_desk] Peers#relay
       # @return [Boolean] a relay can take this question
       def relayable?(relay, question)
-        !relay.nil? && question.is_a?(Hash) && question[:kind].to_s == Guardrails::Approval::KIND
+        !relay.nil? && question.is_a?(PendingQuestion) && question.kind.to_s == Guardrails::Approval::KIND
       end
 
       # Relay the child's pending approval and wait until it settles.
@@ -45,7 +45,7 @@ module Samagotchi
       # @return [Outcome]
       def call(child_id, question, relay:, state_dir:, more: 0)
         child = Session.load(child_id, state_dir: state_dir)
-        qid = question[:id].to_s
+        qid = question.id.to_s
         desk = relay.relay_desk
         relay_id = desk.open(child_id: child_id, child_question_id: qid)
         client = BridgeClient.discover(child_id, session_dir: Session.session_dir(child_id, state_dir: state_dir))
@@ -70,7 +70,7 @@ module Samagotchi
           end
 
           pending = Session.load(child_id, state_dir: state_dir).pending_question
-          pending && pending[:id].to_s == qid ? nil : "answered_on_child"
+          pending && pending.id.to_s == qid ? nil : "answered_on_child"
         rescue ArgumentError
           "child_gone"
         end
@@ -175,7 +175,7 @@ module Samagotchi
           return if waiting.empty?
 
           child_id, question = waiting.first
-          @done[question[:id].to_s] = true
+          @done[question.id.to_s] = true
           outcome = DelegateRelay.call(child_id, question, relay: @relay, state_dir: @state_dir, more: waiting.size - 1)
           @on_outcome.call(child_id, outcome)
           # The next one, if any, right after.
@@ -186,7 +186,7 @@ module Samagotchi
         # @return [Integer]
         def count = waiting.size
 
-        # @return [Array<Array(String, Hash)>] [child id, pending question],
+        # @return [Array<Array(String, PendingQuestion)>] [child id, pending question],
         #   oldest question first
         def waiting
           rows = SessionManager.children_of(@parent_id, state_dir: @state_dir).select do |row|
@@ -194,10 +194,10 @@ module Samagotchi
           end
           rows.filter_map do |row|
             pending = Session.load(row[:id], state_dir: @state_dir).pending_question
-            [row[:id], pending] if pending && pending[:id].to_s == row[:waiting_id].to_s
+            [row[:id], pending] if pending && pending.id.to_s == row[:waiting_id].to_s
           rescue ArgumentError
             nil
-          end.sort_by { |_, pending| pending[:created_at].to_s }
+          end.sort_by { |_, pending| pending.created_at.to_s }
         end
 
         private

data/lib/samagotchi/tools/delegate_result.rb

@@ -6,8 +6,8 @@ require_relative "delegate"
 require_relative "delegate_wait"
 
 module Samagotchi
-  # Loaded on first use: session_manager requires terminal_ui, which
-  # requires KernelLoop and so these tools (a require cycle otherwise).
+  # Loaded on first use: this autoload keeps SessionManager and its ~80
+  # files unloaded until the delegate/session path needs them.
   autoload :SessionManager, File.expand_path("../session_manager", __dir__)
 
   module Tools

data/lib/samagotchi/tools/delegate_wait.rb

@@ -91,7 +91,7 @@ module Samagotchi
           # asked), the relayed question no longer reported: a turn that
           # ends with no reply during the relay's POST or after it still
           # ends the wait.
-          baseline = ReplyWait.baseline_of(wait.session, question_id: wait.question[:id])
+          baseline = ReplyWait.baseline_of(wait.session, question_id: wait.question.id)
         end
       rescue ArgumentError => e
         "Error: #{e.message}"

data/lib/samagotchi/tools/list_sessions.rb

@@ -6,8 +6,8 @@ require_relative "../session"
 require_relative "peers"
 
 module Samagotchi
-  # Loaded on first use: session_manager requires terminal_ui, which
-  # requires KernelLoop and so these tools (a require cycle otherwise).
+  # Loaded on first use: this autoload keeps SessionManager and its ~80
+  # files unloaded until the delegate/session path needs them.
   autoload :SessionManager, File.expand_path("../session_manager", __dir__)
 
   module Tools

data/lib/samagotchi/tools/web_fetch.rb

@@ -3,7 +3,6 @@
 require "net/http"
 require "uri"
 require "ipaddr"
-require "nokogiri"
 require_relative "../version"
 
 module Samagotchi
@@ -128,6 +127,9 @@ module Samagotchi
       def self.extract_text_from_html(html)
         return "Error: empty HTML response" if html.nil? || html.empty?
 
+        # Load lazily so workers don't pay for Nokogiri on every start.
+        require "nokogiri"
+
         doc = Nokogiri::HTML(html)
 
         # Extract noscript text before removing it

data/lib/samagotchi/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.76.0"
+  VERSION = "0.78.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

data/lib/samagotchi/web/app.rb

@@ -43,7 +43,7 @@ require_relative "../recap_store"
 require_relative "markdown_renderer"
 require_relative "capabilities"
 require_relative "editor"
-require_relative "message_parts"
+require_relative "../message_parts"
 require_relative "session_summary"
 require_relative "../log"
 require_relative "../paths"
@@ -855,7 +855,7 @@ module Samagotchi
           current_turn = turn_snapshot["current_turn"]
           current_turn ? current_turn["pending_question"] : turn_snapshot["pending_question"]
         elsif owner&.worker?
-          session.pending_question
+          session.pending_question&.to_h
         end
       end