samagotchi 0.155.0 → 0.157.0

data/lib/samagotchi/worker_boot.rb

@@ -0,0 +1,184 @@
+# frozen_string_literal: true
+
+require_relative "session_manager"
+
+module Samagotchi
+  # WorkerBoot: the worker process, from run_session_loop (what the boot
+  # string SessionManager#worker_command writes runs, through
+  # SessionManager.run_session_loop) to what it does as it leaves (CROSS-VERSION
+  # CONTRACT: spec/worker_contract_spec.rb). It takes the session's OwnerLock,
+  # leaves the spawner's process tree, installs the signals and the project
+  # env, and runs the Worker (worker.rb loads only then, after the lock). Calls
+  # SessionManager's resume_session, discardable? and delete_session; the env
+  # keys it reads are SessionManager's, which the spawner sets.
+  module WorkerBoot
+    class << self
+      # Run the session loop inside the forked process: the worker's main,
+      # which the boot string reaches through SessionManager.run_session_loop.
+      #
+      # Every worker starts its per-session Bridge (the single live client
+      # transport) on a port bound to 127.0.0.1 before the loop and stops it on
+      # exit. If the bridge fails to start the worker degrades: turns still flow
+      # through the input-dir loop, but there is no live SSE or in-process
+      # cancel/answer.
+      #
+      # The worker first takes the session's OwnerLock; when another owner holds
+      # it (a racing resume spawned two workers, or the TUI has the session) it
+      # exits quietly.
+      #
+      # A worker nobody uses returns once session.idle_exit_minutes have passed
+      # (see WorkerIdleExit), and one a client asked to exit (Bridge POST /exit)
+      # returns as soon as nothing keeps it. The next send wakes a new one.
+      # @param idle_exit_minutes [Numeric, nil] nil: session.idle_exit_minutes
+      # @param poll_interval [Numeric, nil] seconds between the loop's fallback
+      #   ticks (nil: Worker::FALLBACK_TICK_SECONDS); queued turns wake it at once
+      # A stopped session's worker exits 0 (a signalled one too) and a
+      # crashed one 1, there.
+      # @return [Symbol] :idle_exit, :exit_requested, :restart or :scratch_left
+      def run_session_loop(session_id, state_dir: nil, owner_wait: OwnerLock::DEFAULT_WAIT,
+                           idle_exit_minutes: nil, poll_interval: nil)
+        # A worker inherits chi's locale (LC_ALL=C too): read files as UTF-8.
+        Utf8Default.apply!
+        sd = state_dir || Session.default_state_dir
+        # The spawner passed the file and level through ENV; a worker's stderr
+        # is /dev/null, so warnings only reach the file.
+        Log.configure(stderr: false)
+        Log.session_id = session_id
+        session_dir = Session.session_dir(session_id, state_dir: sd)
+        # Read (and taken out of ENV, so nothing the worker runs inherits it)
+        # before anything else: set by spawn_options for a spawned worker.
+        spawned = ENV.delete(SessionManager::WORKER_PROCESS_ENV) == "1"
+        # Out of the spawner's process tree before the lock (it records this
+        # process's pid) and before any thread starts.
+        detach_from_spawner(session_dir) if ENV.delete(SessionManager::WORKER_DETACH_ENV) == "1"
+        # Kept in a module ivar so the lock's File lives as long as the worker.
+        @owner_lock = OwnerLock.acquire(session_dir, kind: "worker", wait: owner_wait)
+        exit(0) unless @owner_lock
+        # Set by the boot string when the newest installed chi didn't load.
+        fallback = ENV.delete(SessionManager::BOOT_FALLBACK_ENV)
+        Log.info(:worker, "start", cwd: Dir.pwd, version: VERSION)
+        Log.warn(:worker, "boot_fallback", version: VERSION, error: fallback) if fallback
+        # Tools follow the project (its `mise env`, computed once per worker;
+        # this process's ENV is left as it is); never in a loop run in-process.
+        apply_project_env(session_id, state_dir: sd) if spawned
+        # A spawned worker stops its turn on TERM/HUP/INT and saves it; a
+        # loop run in-process (specs) traps nothing.
+        signals = spawned ? WorkerSignals.new.install! : WorkerSignals::NONE
+        # Only now, after the detach and the lock: the Engine and all it loads.
+        require_relative "worker"
+        worker = Worker.new(session_id: session_id, state_dir: sd, session_dir: session_dir,
+                            idle_exit_minutes: idle_exit_minutes, poll_interval: poll_interval, signals: signals,
+                            owner_lock: @owner_lock)
+        result = begin
+          worker.run
+        rescue StandardError, ScriptError => e
+          # The worker's stderr is /dev/null: the log is the only trace.
+          Log.exception(:worker, "crashed", e)
+          raise
+        ensure
+          @owner_lock.release
+          # A signal from here on ends the process as Ruby's default does.
+          signals.restore!
+        end
+        Log.info(:worker, "stop", reason: result)
+        # A scratch session goes with its worker however it leaves (its
+        # terminal deletes it too, whichever comes first); nothing resumes it.
+        if worker.scratch?
+          delete_left_scratch(session_id, state_dir: sd)
+          exit(result == :crashed ? 1 : 0) if %i[stopped signal crashed].include?(result)
+          return result
+        end
+        # A stopped session is left as it is: no resume for input that came
+        # in, no discard. One whose worker a signal stopped isn't discarded
+        # either; input that came in (queued behind the turn it stopped)
+        # wakes a new worker, as after an idle exit.
+        exit(0) if result == :stopped
+        if result == :signal
+          SessionManager.resume_session(session_id, state_dir: sd) unless SessionInbox.find_new_input_files(session_dir).empty?
+          exit(0)
+        end
+        exit(1) if result == :crashed
+        # Only after the release: a writer that still saw this worker as the
+        # owner may have queued input since the last check. Either it finds no
+        # owner after its write and wakes one, or this finds its input.
+        # A restart starts its successor here, on the newest chi installed
+        # (worker_command), once this one's lock is free.
+        # Delegate reports that rang while it left wake one too.
+        if result == :restart && Session.stopped_marker?(session_id, state_dir: sd)
+          # A stop landed as it left: no successor (resume_session would clear
+          # the stop), and the reminders go with it.
+          ReminderCarry.remove(session_dir)
+          Log.info(:worker, "restart_dropped", why: :stopped)
+        elsif result == :restart ||
+              (%i[idle_exit exit_requested].include?(result) &&
+            (!SessionInbox.find_new_input_files(session_dir).empty? || worker.wake_due?))
+          SessionManager.resume_session(session_id, state_dir: sd)
+        elsif worker.discard?
+          discard_left_session(session_id, state_dir: sd, default_model: worker.default_model)
+        end
+        result
+      end
+
+      # A spawned worker leaves its spawner's process tree: a killer that
+      # walks the tree by parent pid (a terminal closing, a tool's teardown
+      # of a `chi send --wait` it ran in the background) no longer reaches it.
+      # This process (the spawner's child, which its Process.detach waits on)
+      # forks the worker, which starts a session of its own (setsid: no
+      # controlling terminal, no SIGHUP from one) and returns to run the loop;
+      # this one waits until the worker holds the session's OwnerLock, or has
+      # exited, or WORKER_START_GRACE passed, and exits: the spawner's waiter
+      # stays alive exactly while the worker starts (#still_starting?). The
+      # worker is reparented to init (launchd), which reaps it.
+      private def detach_from_spawner(session_dir)
+        worker = Process.fork
+        unless worker
+          Process.setsid
+          return
+        end
+
+        deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + SessionManager::WORKER_START_GRACE
+        until Process.waitpid(worker, Process::WNOHANG) || OwnerLock.owner(session_dir)&.pid == worker ||
+              Process.clock_gettime(Process::CLOCK_MONOTONIC) >= deadline
+          sleep(OwnerLock::RETRY_INTERVAL)
+        end
+        Process.exit!(0)
+      end
+
+      # Delete a scratch session its worker left (its terminal gone:
+      # Worker#leave_scratch, or any other way out), now the lock is free.
+      # Its terminal may have deleted it first.
+      private def delete_left_scratch(session_id, state_dir:)
+        SessionManager.delete_session(session_id, state_dir: state_dir)
+        Log.info(:worker, "scratch_deleted", sid: session_id)
+      rescue SessionManager::DeleteRefused, ArgumentError, SystemCallError => e
+        Log.info(:worker, "scratch_kept", sid: session_id, error: e.class.name, msg: e.message)
+      end
+
+      # Delete a session its worker left empty. Checked again now the lock is
+      # free: a note or input may have come in since the worker looked, and a
+      # worker woken meanwhile owns it (delete_session refuses). A `chi send`
+      # landing between this check and the delete fails with "no session"
+      # (a window of an empty session's last moments, left as is).
+      private def discard_left_session(session_id, state_dir:, default_model:)
+        return unless SessionManager.discardable?(session_id, state_dir: state_dir, default_model: default_model)
+
+        SessionManager.delete_session(session_id, state_dir: state_dir, purge_runs: false)
+        Log.info(:worker, "discarded_empty", sid: session_id)
+      rescue SessionManager::DeleteRefused, SessionManager::OwnedByTUI, ArgumentError, SystemCallError => e
+        Log.info(:worker, "kept_session", sid: session_id, error: e.class.name, msg: e.message)
+      end
+
+      # The tools' ProjectEnv for the session's folder (its working_directory;
+      # spawn_options chdirs there unless it is gone), installed for this
+      # process's tool spawns. Never fatal: a worker without it still runs.
+      private def apply_project_env(session_id, state_dir:)
+        session = Session.summary_from_file(Session.session_file(session_id, state_dir: state_dir))
+        dir = session&.working_directory.to_s
+        overlay = ProjectEnv.install!(ProjectEnv.compute(dir))
+        Log.info(:worker, "project_env_applied", dir: dir, ruby: overlay.ruby) if overlay.applied
+      rescue StandardError => e
+        Log.warn(:worker, "project_env", reason: "error", error: e.class.name, msg: e.message)
+      end
+    end
+  end
+end

data/lib/samagotchi/worker_link.rb

@@ -113,6 +113,9 @@ module Samagotchi
 
     def not_live(session_id) = "no live worker for session #{session_id}"
     def unanswered(session_id) = "the worker for session #{session_id} didn't answer"
+    # A worker chi started that never came up within its wait (chi send
+    # --new's, a delegate child's).
+    def did_not_start = "its worker did not start"
 
     # @param session_dir [String]
     # @param unlink [Boolean] remove a Stale sidecar (the clients that would

data/lib/samagotchi/worker_signals.rb

@@ -3,7 +3,7 @@
 module Samagotchi
   # TERM, HUP and INT in a worker process: the running turn stops as a Stop
   # does (reason :signal), is saved, and the worker leaves (Worker#run
-  # returns :signal). SessionManager.run_session_loop installs the traps in
+  # returns :signal). WorkerBoot.run_session_loop installs the traps in
   # a spawned worker only (WORKER_PROCESS_ENV), never in a process that runs
   # the loop in-process (the specs, which fire #fire directly).
   #

data/lib/samagotchi/worker_task_wakes.rb

@@ -3,10 +3,10 @@
 require "securerandom"
 
 require_relative "child_reports"
-require_relative "kernel_loop"
 require_relative "log"
 require_relative "task_finish_note"
 require_relative "task_watch"
+require_relative "tool_output_cut"
 require_relative "tools/task_runtime"
 require_relative "worker_inbound"
 require_relative "worker_wakes"
@@ -130,7 +130,7 @@ module Samagotchi
 
     def note(entry, record, wake:, turn_id: nil)
       TaskFinishNote.note(record, limit_sec: entry.limit_sec, early_sec: entry.early_sec, wake: wake, turn_id: turn_id,
-                                  cap: KernelLoop.resolve_output_char_cap(nil))
+                                  cap: ToolOutputCut.max_chars(nil))
     end
 
     def add_note(entry, record)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.155.0
+  version: 0.157.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -204,6 +204,7 @@ files:
 - lib/samagotchi/bridge/ring_buffer.rb
 - lib/samagotchi/bridge/sse_writer.rb
 - lib/samagotchi/bridge/turn_accumulator.rb
+- lib/samagotchi/bridge/turn_drawings.rb
 - lib/samagotchi/bridge/turn_notice.rb
 - lib/samagotchi/bridge_client.rb
 - lib/samagotchi/bridge_client/event_stream.rb
@@ -267,9 +268,9 @@ files:
 - lib/samagotchi/bundles/guardrails/manifest.yml
 - lib/samagotchi/bundles/inline-widgets/manifest.yml
 - lib/samagotchi/bundles/inline-widgets/plugin.rb
-- lib/samagotchi/bundles/known-names/hooks/known_names.rb
 - lib/samagotchi/bundles/known-names/known_names.md
 - lib/samagotchi/bundles/known-names/manifest.yml
+- lib/samagotchi/bundles/known-names/plugin.rb
 - lib/samagotchi/bundles/loop-guard/manifest.yml
 - lib/samagotchi/bundles/loop-guard/plugin.rb
 - lib/samagotchi/bundles/mcp/manifest.yml
@@ -284,8 +285,8 @@ files:
 - lib/samagotchi/bundles/skills/plugin.rb
 - lib/samagotchi/bundles/slow-commands/manifest.yml
 - lib/samagotchi/bundles/slow-commands/plugin.rb
-- lib/samagotchi/bundles/source-links/hooks/source_links.rb
 - lib/samagotchi/bundles/source-links/manifest.yml
+- lib/samagotchi/bundles/source-links/plugin.rb
 - lib/samagotchi/bundles/source-links/source_links.md
 - lib/samagotchi/bundles/system/config_modification_protocol.md
 - lib/samagotchi/bundles/system/delegated.md
@@ -438,6 +439,7 @@ files:
 - lib/samagotchi/hooks/loader.rb
 - lib/samagotchi/hooks/registry.rb
 - lib/samagotchi/hooks/stream_watch.rb
+- lib/samagotchi/host_address.rb
 - lib/samagotchi/host_config.rb
 - lib/samagotchi/host_keys.rb
 - lib/samagotchi/host_model.rb
@@ -501,8 +503,10 @@ files:
 - lib/samagotchi/memory_bundle/builder.rb
 - lib/samagotchi/memory_bundle/bundle_hook.rb
 - lib/samagotchi/memory_bundle/entry_size.rb
+- lib/samagotchi/memory_bundle/file_actions.rb
 - lib/samagotchi/memory_bundle/file_digest.rb
 - lib/samagotchi/memory_bundle/file_standing.rb
+- lib/samagotchi/memory_bundle/file_state.rb
 - lib/samagotchi/memory_bundle/index_size.rb
 - lib/samagotchi/memory_bundle/index_sync.rb
 - lib/samagotchi/memory_bundle/index_updater.rb
@@ -538,6 +542,7 @@ files:
 - lib/samagotchi/model_binding.rb
 - lib/samagotchi/model_catalog.rb
 - lib/samagotchi/model_list_store.rb
+- lib/samagotchi/model_lookup.rb
 - lib/samagotchi/model_match.rb
 - lib/samagotchi/model_notes.rb
 - lib/samagotchi/model_overlay.rb
@@ -604,6 +609,7 @@ files:
 - lib/samagotchi/reasoning_history.rb
 - lib/samagotchi/reasoning_history_command.rb
 - lib/samagotchi/recap_command.rb
+- lib/samagotchi/recap_place.rb
 - lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
 - lib/samagotchi/recap_title.rb
@@ -621,7 +627,10 @@ files:
 - lib/samagotchi/remote_command.rb
 - lib/samagotchi/remotes.rb
 - lib/samagotchi/reply_wait.rb
+- lib/samagotchi/reply_wait/liveness.rb
 - lib/samagotchi/reply_wait/poll.rb
+- lib/samagotchi/reply_wait/target.rb
+- lib/samagotchi/reprefill_meter.rb
 - lib/samagotchi/review_apply.rb
 - lib/samagotchi/review_command.rb
 - lib/samagotchi/review_start.rb
@@ -634,7 +643,6 @@ files:
 - lib/samagotchi/send_command.rb
 - lib/samagotchi/send_command/busy.rb
 - lib/samagotchi/send_command/parent_gate.rb
-- lib/samagotchi/send_command/wait_target.rb
 - lib/samagotchi/served_model.rb
 - lib/samagotchi/session.rb
 - lib/samagotchi/session_access.rb
@@ -650,8 +658,16 @@ files:
 - lib/samagotchi/session_config.rb
 - lib/samagotchi/session_continue.rb
 - lib/samagotchi/session_delete_command.rb
+- lib/samagotchi/session_field.rb
 - lib/samagotchi/session_inbox.rb
 - lib/samagotchi/session_manager.rb
+- lib/samagotchi/session_manager/delivery.rb
+- lib/samagotchi/session_manager/emptiness.rb
+- lib/samagotchi/session_manager/lifecycle.rb
+- lib/samagotchi/session_manager/listing.rb
+- lib/samagotchi/session_manager/removal.rb
+- lib/samagotchi/session_manager/spawn.rb
+- lib/samagotchi/session_manager/worker_command.rb
 - lib/samagotchi/session_metrics.rb
 - lib/samagotchi/session_metrics/cost.rb
 - lib/samagotchi/session_metrics/model_segment.rb
@@ -661,8 +677,10 @@ files:
 - lib/samagotchi/session_model_settings.rb
 - lib/samagotchi/session_observer.rb
 - lib/samagotchi/session_participants.rb
+- lib/samagotchi/session_paths.rb
 - lib/samagotchi/session_retention.rb
 - lib/samagotchi/session_review.rb
+- lib/samagotchi/session_row.rb
 - lib/samagotchi/session_setting.rb
 - lib/samagotchi/session_setup.rb
 - lib/samagotchi/sessions_command.rb
@@ -670,6 +688,7 @@ files:
 - lib/samagotchi/share_command.rb
 - lib/samagotchi/side_judgments.rb
 - lib/samagotchi/side_usage.rb
+- lib/samagotchi/starting_marker.rb
 - lib/samagotchi/steer.rb
 - lib/samagotchi/steer_cut.rb
 - lib/samagotchi/steer_cut_after.rb
@@ -687,6 +706,7 @@ files:
 - lib/samagotchi/system_one/log.rb
 - lib/samagotchi/system_one/question.rb
 - lib/samagotchi/system_one/record.rb
+- lib/samagotchi/system_one/recorder.rb
 - lib/samagotchi/system_one/recording.rb
 - lib/samagotchi/system_one/runs.rb
 - lib/samagotchi/system_one/runs_store.rb
@@ -791,6 +811,7 @@ files:
 - lib/samagotchi/tools/edit.rb
 - lib/samagotchi/tools/execute.rb
 - lib/samagotchi/tools/forget_outputs.rb
+- lib/samagotchi/tools/index_hint.rb
 - lib/samagotchi/tools/list_reminders.rb
 - lib/samagotchi/tools/list_sessions.rb
 - lib/samagotchi/tools/memory.rb
@@ -911,6 +932,7 @@ files:
 - lib/samagotchi/web/public/forms.css
 - lib/samagotchi/web/public/hash_intent.js
 - lib/samagotchi/web/public/history_reveal.js
+- lib/samagotchi/web/public/history_shape.js
 - lib/samagotchi/web/public/icons/chi-180.png
 - lib/samagotchi/web/public/icons/chi-192.png
 - lib/samagotchi/web/public/icons/chi-512.png
@@ -962,9 +984,11 @@ files:
 - lib/samagotchi/web/public/question_cards.js
 - lib/samagotchi/web/public/read_view.js
 - lib/samagotchi/web/public/reasoning_history_chip.js
+- lib/samagotchi/web/public/recap_stamp.js
 - lib/samagotchi/web/public/ref_menu.js
 - lib/samagotchi/web/public/ref_scan.js
 - lib/samagotchi/web/public/refs.js
+- lib/samagotchi/web/public/reload_check.js
 - lib/samagotchi/web/public/restore.js
 - lib/samagotchi/web/public/review_apply.js
 - lib/samagotchi/web/public/review_history.js
@@ -1019,9 +1043,11 @@ files:
 - lib/samagotchi/web/public/toolkit_chip.js
 - lib/samagotchi/web/public/tools_overview.js
 - lib/samagotchi/web/public/turn_block.js
+- lib/samagotchi/web/public/turn_drawing.js
 - lib/samagotchi/web/public/turn_events.js
 - lib/samagotchi/web/public/turn_html.js
 - lib/samagotchi/web/public/turn_model.js
+- lib/samagotchi/web/public/turn_pieces.js
 - lib/samagotchi/web/public/turn_range.js
 - lib/samagotchi/web/public/unqueue.js
 - lib/samagotchi/web/public/update_notice.js
@@ -1054,6 +1080,7 @@ files:
 - lib/samagotchi/web/push/store.rb
 - lib/samagotchi/web/push_routes.rb
 - lib/samagotchi/web/qr.rb
+- lib/samagotchi/web/reload_check_route.rb
 - lib/samagotchi/web/running.rb
 - lib/samagotchi/web/server.rb
 - lib/samagotchi/web/session_access_routes.rb
@@ -1070,6 +1097,7 @@ files:
 - lib/samagotchi/web/update_ops.rb
 - lib/samagotchi/web/verify_fresh_routes.rb
 - lib/samagotchi/worker.rb
+- lib/samagotchi/worker_boot.rb
 - lib/samagotchi/worker_idle_exit.rb
 - lib/samagotchi/worker_inbound.rb
 - lib/samagotchi/worker_link.rb

data/lib/samagotchi/send_command/wait_target.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../delivery"
-require_relative "../reply_wait"
-require_relative "../session"
-
-module Samagotchi
-  class SendCommand
-    # Which turn chi send --wait waits for and names in its report:
-    # ReplyWait's +turn+ (an enqueued_id; nil: the next reply), +queued+
-    # and +ended_before+, and ParentWait's +report_turn_id+ (the turn_id
-    # of the --format json line). Each run path builds it its way.
-    WaitTarget = Data.define(:turn, :report_turn_id, :queued, :ended_before) do
-      def initialize(turn: nil, report_turn_id: nil, queued: false, ended_before: false) = super
-
-      # A --new session's first message: its own turn, the ack's id (a
-      # file-delivered one's also names the outcome of a session command
-      # that runs no turn), so a worker that dies in it and the next one's
-      # settle end the wait (TurnCheckpoint.settled_turn). A message merged
-      # into a turn starting then falls back to that turn's reply
-      # (ReplyWait's turn: without queued:); no id (an older worker), the
-      # next reply. A prompt the session was created with has no delivery:
-      # its turn is the id the create gave it (+direct_turn+,
-      # Session#first_turn_id), and nothing can merge into it, so the wait
-      # is for that turn alone (ReplyWait's queued:).
-      # @param delivered [SessionManager::DeliverResult, nil] nil when the
-      #   message started the session itself (no delivery)
-      # @param direct_turn [String, nil] that first turn's id, for a direct
-      #   start
-      def self.first_message(delivered, direct_turn: nil)
-        return new unless delivered || !direct_turn.to_s.strip.empty?
-
-        return new(turn: direct_turn, report_turn_id: direct_turn, queued: true) if delivered.nil?
-
-        new(turn: delivered.enqueued_id, report_turn_id: delivered.enqueued_id)
-      end
-
-      # A message to an existing session. --queue: its own turn, the ack's
-      # id, also when the turn running at the check ended before it went in
-      # (an idle worker's ack says next_step, and the file still runs as
-      # that turn). A file fallback's id names its turn too, and so does a
-      # plain message to an idle session, as #first_message's. Otherwise
-      # (a session left running by a dead worker, the busy check's owner
-      # gone) the next reply, reported as the turn that was running when it
-      # went in (+running_turn+, ReplyWait.own_turn). A plain message the
-      # worker queued (its ack says queue: a participant's review turn was
-      # running, which takes no steer) is a --queue's.
-      # @param running [Boolean] the session was running when it went in
-      def self.message(delivered, queue:, running:, running_turn:)
-        queue ||= delivered.delivery == Delivery::QUEUE
-        turn = delivered.enqueued_id if queue || delivered.file? || !running
-        report = if queue then turn
-                 elsif running then running_turn
-                 else delivered.enqueued_id
-                 end
-        new(turn: turn, report_turn_id: report, queued: queue && !turn.nil?)
-      end
-
-      # --wait with no message: --turn's (+requested+), or the turn running
-      # now or whose continue offer stands (ReplyWait.own_turn). Settled
-      # (idle, a turn ended, no question standing: a continue offer waits
-      # for its answer), its last turn's end is the answer (ended_before);
-      # with --turn, when that turn is the last one.
-      def self.wait_only(session, session_dir:, requested:)
-        settled = session.status == Session::STATUS_IDLE && !session.last_turn.nil? && session.pending_question.nil?
-        own = requested ? nil : ReplyWait.own_turn(session, session_dir: session_dir)
-        wait_only_of(own_turn: own, settled: settled, last_turn_id: session.last_turn&.enqueued_id, requested: requested)
-      end
-
-      # #wait_only from what SessionAccess#prepare_wait read
-      # (SessionAccess::WaitStart): its own_turn, settled and last_turn_id.
-      def self.after(start, requested:)
-        wait_only_of(own_turn: start.own_turn, settled: start.settled, last_turn_id: start.last_turn_id,
-                     requested: requested)
-      end
-
-      def self.wait_only_of(own_turn:, settled:, last_turn_id:, requested:)
-        turn = requested || own_turn
-        ended_before = requested ? last_turn_id == requested : settled
-        new(turn: turn, report_turn_id: turn || (last_turn_id if settled), ended_before: ended_before)
-      end
-      private_class_method :wait_only_of
-    end
-  end
-end