samagotchi 0.62.0 → 0.64.0

data/lib/samagotchi/worker.rb

@@ -468,10 +468,10 @@ module Samagotchi
     # 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
+      id = @session.drop_dead_question
+      return unless id
 
-      Log.info(:worker, "dead_question_dropped", id: @session.pending_question[:id])
-      @session.pending_question = nil
+      Log.info(:worker, "dead_question_dropped", id: id)
       save_or_log(:dead_question) { @session.save(state_dir: @state_dir) }
     end
 
@@ -900,7 +900,7 @@ module Samagotchi
       @reporting_turn = reports_to_parent?(turn_args[:origin])
       restores = @turn_flow.restores
       begin
-        @checkpoint.begin_turn(prompt: prompt)
+        @checkpoint.begin_turn(prompt: prompt, enqueued_id: turn_args[:origin]&.dig(:enqueued_id))
         @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
@@ -929,7 +929,7 @@ module Samagotchi
       # no reply: its text is what came before its last tool calls, and a
       # wait (chi send --wait) gets the question instead.
       unless response.nil? || response.strip.empty? || @continue_offer.awaiting?
-        SessionInbox.write_output(@session_dir, response)
+        SessionInbox.write_output(@session_dir, response, enqueued_id: turn_args[:origin]&.dig(:enqueued_id))
       end
       save_or_log(:turn) { save_session }
       # The reports the turn merged were read unless its end took the turn
@@ -1045,10 +1045,12 @@ module Samagotchi
       @pending_input_drain ||= lambda do
         # An iteration boundary: tell whoever sent a command now that it waits.
         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.
+        # A queued line or one with images runs as its own turn after this
+        # one (steering merges text only): skipped here, not a barrier, so a
+        # line sent after it still goes in at this boundary. Only the files
+        # claimed below reach @merged_this_turn and the checkpoint.
         files = SessionInbox.find_new_input_files(@session_dir).sort
-                            .take_while { |input_file| !SessionInbox.waits_for_turn_end?(input_file) }
+                            .reject { |input_file| SessionInbox.waits_for_turn_end?(input_file) }
         merged = files.filter_map do |input_file|
           claimed_file = SessionInbox.claim_input_file(input_file)
           next unless claimed_file
@@ -1103,22 +1105,36 @@ module Samagotchi
     end
 
     # Check again with the event log held, which the Bridge holds while it
-    # queues a POST /turn, then close the Bridge so no client can queue one
-    # after the check, and stop the idle jobs (reminder callback, recap).
+    # queues a POST /turn, then close the Bridge's intake so no client can
+    # queue one after the check, and stop the idle jobs (reminder callback,
+    # recap). The Bridge stops after the log is let go (#stop_bridge_after).
     # A client connecting from here on finds no worker: `chi --attach` fails
     # and the web stream answers 503 (a small window, left as is).
     # @return [Boolean] false when something came in since #due?
     def leave_idle
-      @engine.synchronize_events do
-        next false unless @idle_exit.due?
-
-        @bridge&.stop
-        @engine.stop_idle
-        log_idle_exit
-        true
+      stop_bridge_after do
+        @engine.synchronize_events do
+          next false unless @idle_exit.due?
+
+          @bridge&.close_intake
+          @engine.stop_idle
+          log_idle_exit
+          true
+        end
       end
     end
 
+    # The Bridge stops once the block (which closed its intake with the
+    # event log held) answers true, outside the log: Bridge#stop waits for
+    # the requests it is answering, and one waiting on the log would hold
+    # it for the whole grace before being killed.
+    # @return [Boolean] what the block answered
+    def stop_bridge_after
+      leaving = yield
+      @bridge&.stop if leaving
+      leaving
+    end
+
     # Bridge POST /exit, on a Bridge thread with the event log held.
     # +delete+: the session is deleted after (/exit --delete), so no recap.
     # +restart+: a new worker takes over (on the newest chi installed), so
@@ -1140,29 +1156,31 @@ module Samagotchi
     end
 
     # #leave_idle for an exit a client asked for: check again with the event
-    # log held (a prompt may have come in since), then close the Bridge and
-    # stop the idle jobs. Other clients' streams no longer hold: the asker's
+    # log held (a prompt may have come in since), then close the Bridge's
+    # intake and stop the idle jobs (the Bridge stops after the log). Other clients' streams no longer hold: the asker's
     # may not have closed yet, and a UI joining now finds the worker gone
     # (:stream_closed), the window #leave_idle has too.
     # @return [Boolean] false when something came in since the request
     def leave_on_request
-      @engine.synchronize_events do
-        hold = if @exit_restart
-                 @idle_exit.hold_for_restart
-               else
-                 @idle_exit.hold_for_request(requester: @exit_requested_by, streams: false)
-               end
-        if hold
-          @exit_requested = nil
-          @exit_restart = false
-          Log.info(:worker, "exit_held", reason: hold)
-          next false
-        end
+      stop_bridge_after do
+        @engine.synchronize_events do
+          hold = if @exit_restart
+                   @idle_exit.hold_for_restart
+                 else
+                   @idle_exit.hold_for_request(requester: @exit_requested_by, streams: false)
+                 end
+          if hold
+            @exit_requested = nil
+            @exit_restart = false
+            Log.info(:worker, "exit_held", reason: hold)
+            next false
+          end
 
-        @bridge&.stop
-        @engine.stop_idle
-        Log.info(:worker, @exit_restart ? "restart_requested" : "exit_requested", by: @exit_requested_by || "a client")
-        true
+          @bridge&.close_intake
+          @engine.stop_idle
+          Log.info(:worker, @exit_restart ? "restart_requested" : "exit_requested", by: @exit_requested_by || "a client")
+          true
+        end
       end
     end
 

data/lib/samagotchi/worker_inbound.rb

@@ -106,9 +106,10 @@ module Samagotchi
     # 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.
+    # +wake+: the session is idle with nothing queued, so a delivery with a
+    # wake note (an update whose source asked to wake, or a session push
+    # source's first text that asked) may start a turn (#context_wake_for):
+    # its wake note goes in as the turn's first message.
     # @return [ContextWake, nil] the wake turn to run now
     # @raise [SystemCallError, IOError] the caller logs it (context_failed)
     def absorb_context(before_turn: false, wake: false)
@@ -134,7 +135,7 @@ module Samagotchi
       waking && ContextWake.new(delivery: waking, turn_id: turn_id)
     end
 
-    # A failed wake turn kept nothing but its note: the update goes back to
+    # A failed wake turn kept nothing but its note: the note goes back to
     # a plain note (no turn start, the background wording), so a reload
     # draws no empty turn for it.
     def unmark_wake(context_wake)
@@ -224,13 +225,13 @@ module Samagotchi
       true
     end
 
-    # The update in +batch+ that may start a wake turn now: its source
-    # asked (wake: true), 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.
+    # The delivery in +batch+ that may start a wake turn now: it has a wake
+    # note (ContextAbsorber decides: its source asked, wake: true),
+    # 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.
     def context_wake_for(batch, now: Time.now)
       candidates = batch.deliveries.select(&:wake_note)
       return nil if candidates.empty? || !context_wakes_on?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.64.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -185,6 +185,11 @@ files:
 - lib/samagotchi/bundles/btw/plugin.rb
 - lib/samagotchi/bundles/check-in/manifest.yml
 - lib/samagotchi/bundles/check-in/plugin.rb
+- lib/samagotchi/bundles/claude-peer/manifest.yml
+- lib/samagotchi/bundles/claude-peer/plugin.rb
+- lib/samagotchi/bundles/claude-peer/scripts/chi-peer-SKILL.md
+- lib/samagotchi/bundles/claude-peer/scripts/pair
+- lib/samagotchi/bundles/claude-peer/skill_claude_peer.md
 - lib/samagotchi/bundles/coordinator/manifest.yml
 - lib/samagotchi/bundles/coordinator/plugin.rb
 - lib/samagotchi/bundles/coordinator/skill_coordinator.md
@@ -230,6 +235,7 @@ files:
 - lib/samagotchi/client_id.rb
 - lib/samagotchi/command_steps.rb
 - lib/samagotchi/commands/registry.rb
+- lib/samagotchi/composer_route.rb
 - lib/samagotchi/config.rb
 - lib/samagotchi/config_text_edit.rb
 - lib/samagotchi/context_absorber.rb
@@ -600,6 +606,8 @@ files:
 - lib/samagotchi/web/public/turn_model.js
 - lib/samagotchi/web/public/turn_view.js
 - lib/samagotchi/web/public/update_notice.js
+- lib/samagotchi/web/public/vendor/directive.js
+- lib/samagotchi/web/public/vendor/directives/unsafe-html.js
 - lib/samagotchi/web/public/vendor/lit-html.js
 - lib/samagotchi/web/qr.rb
 - lib/samagotchi/web/server.rb