samagotchi 0.104.0 → 0.105.0

data/lib/samagotchi/worker.rb

@@ -299,9 +299,9 @@ module Samagotchi
                                    context_absorber: @context_absorber, wakes: @wakes,
                                    awaiting_continue: -> { @turn_flow.awaiting_continue? },
                                    stopped: -> { stopped_on_disk? },
-                                   queue_command: lambda { |line, client_id, after_file, enqueued_id|
+                                   queue_command: lambda { |line, client_id, after_file, enqueued_id, author: nil|
                                      @bridge.queue_command(line, client_id: client_id, after_file: after_file,
-                                                                 enqueued_id: enqueued_id)
+                                                                 enqueued_id: enqueued_id, author: author)
                                    })
       # /model's default is the config's, as in the REPL; the Engine started
       # on the session's model.  nil when there is no default.model.
@@ -1006,7 +1006,8 @@ module Samagotchi
       @reporting_turn = reports_to_parent?(turn_args[:origin])
       restores = @turn_flow.restores
       begin
-        @checkpoint.begin_turn(prompt: prompt, enqueued_id: turn_args[:origin]&.dig(:enqueued_id))
+        @checkpoint.begin_turn(prompt: prompt, enqueued_id: turn_args[:origin]&.dig(:enqueued_id),
+                               author: turn_author_fields(turn_args[:origin]))
         @session.status = Session::STATUS_RUNNING
         # A continue that moved this session to the chain's new link wrote
         # the new parent beside it (Session::PARENT_FILE): this turn's
@@ -1186,9 +1187,9 @@ module Samagotchi
           @merged_this_turn.concat(merged)
         end
         # Each line keeps its sender (Steer.source_for_client): a chi send or
-        # a delegating parent's line is saved and shown to the model as theirs.
-        lines = merged.map { |prompt, origin| Steer::Line.new(text: prompt, source: Steer.source_for_client(origin&.dig(:client_id))) } +
-                reports.map(&:line)
+        # a delegating parent's line is saved and shown to the model as theirs,
+        # a participant's with its author (Engine#author_fields).
+        lines = merged.map { |prompt, origin| merged_line(prompt, origin) } + reports.map(&:line)
         # A wake turn starts with its first line, whoever sent it.
         lines[0] = lines[0].with(mark: mark) if mark && lines.any?
         # The turn so far, with what this boundary merges (its input files
@@ -1199,6 +1200,17 @@ module Samagotchi
       end
     end
 
+    # A participant's author fields (Engine#author_fields), {} for the owner.
+    def turn_author_fields(origin)
+      Steer.participant_author?(origin&.dig(:author)) ? @engine.author_fields(origin[:author], session: @session) : {}
+    end
+
+    def merged_line(prompt, origin)
+      author = turn_author_fields(origin)
+      Steer::Line.new(text: prompt, source: Steer.source_for_client(origin&.dig(:client_id)),
+                      author: author[:author], author_name: author[:author_name])
+    end
+
     # The reports for rings that came in since the turn last looked. A
     # failure to read them must not take the turn's steering with it.
     # A wake turn's first call gets the reports it was started for (their

data/lib/samagotchi/worker_inbound.rb

@@ -11,6 +11,7 @@ require_relative "context_note"
 require_relative "log"
 require_relative "session"
 require_relative "session_inbox"
+require_relative "steer"
 require_relative "tools/task_record"
 require_relative "worker_wakes"
 
@@ -237,12 +238,14 @@ module Samagotchi
     # A session command sent as a message (chi send -m "/model x", a web
     # page's first message) runs as the command, as the Bridge does for a
     # POST /turn; an unknown /word stays a prompt. Queued: the loop's next
-    # pass runs it.
+    # pass runs it, with its input's author (only a participant's: the
+    # owner's command is queued as it always was).
     # @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)
 
-      @queue_command.call(text, origin&.dig(:client_id), after_file, origin&.dig(:enqueued_id))
+      author = Steer.sender_author(origin&.dig(:author))
+      @queue_command.call(text, origin&.dig(:client_id), after_file, origin&.dig(:enqueued_id), **{ author: author }.compact)
       true
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.104.0
+  version: 0.105.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -463,6 +463,7 @@ files:
 - lib/samagotchi/owner_lock.rb
 - lib/samagotchi/parent_answers_command.rb
 - lib/samagotchi/parent_report.rb
+- lib/samagotchi/participant_name.rb
 - lib/samagotchi/participants.rb
 - lib/samagotchi/paths.rb
 - lib/samagotchi/peer_sources.rb
@@ -547,6 +548,7 @@ files:
 - lib/samagotchi/session_metrics/usage.rb
 - lib/samagotchi/session_model_settings.rb
 - lib/samagotchi/session_observer.rb
+- lib/samagotchi/session_participants.rb
 - lib/samagotchi/session_retention.rb
 - lib/samagotchi/session_setting.rb
 - lib/samagotchi/session_setup.rb