samagotchi 0.153.0 → 0.154.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.153.0
+  version: 0.154.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -185,6 +185,7 @@ files:
 - lib/samagotchi/answer_display.rb
 - lib/samagotchi/answer_refs.rb
 - lib/samagotchi/answer_tail.rb
+- lib/samagotchi/answer_text.rb
 - lib/samagotchi/archive_store.rb
 - lib/samagotchi/atomic_file.rb
 - lib/samagotchi/block_renderers.rb
@@ -335,6 +336,7 @@ files:
 - lib/samagotchi/cut.rb
 - lib/samagotchi/cut_policy.rb
 - lib/samagotchi/debug_log.rb
+- lib/samagotchi/degrade.rb
 - lib/samagotchi/delivery.rb
 - lib/samagotchi/desktop.rb
 - lib/samagotchi/desktop/macos.rb
@@ -356,6 +358,26 @@ files:
 - lib/samagotchi/effective_model.rb
 - lib/samagotchi/empty_answer_retry.rb
 - lib/samagotchi/engine.rb
+- lib/samagotchi/engine/cards.rb
+- lib/samagotchi/engine/context_judge.rb
+- lib/samagotchi/engine/events.rb
+- lib/samagotchi/engine/guardrails.rb
+- lib/samagotchi/engine/hooks.rb
+- lib/samagotchi/engine/messages.rb
+- lib/samagotchi/engine/model_settings.rb
+- lib/samagotchi/engine/models.rb
+- lib/samagotchi/engine/objectives.rb
+- lib/samagotchi/engine/participants.rb
+- lib/samagotchi/engine/plugins.rb
+- lib/samagotchi/engine/questions.rb
+- lib/samagotchi/engine/recap.rb
+- lib/samagotchi/engine/session.rb
+- lib/samagotchi/engine/side_requests.rb
+- lib/samagotchi/engine/steering.rb
+- lib/samagotchi/engine/toolkit.rb
+- lib/samagotchi/engine/turn_end.rb
+- lib/samagotchi/engine/turn_helpers.rb
+- lib/samagotchi/engine/verify.rb
 - lib/samagotchi/engine_peers.rb
 - lib/samagotchi/engine_snapshots.rb
 - lib/samagotchi/event_fanout.rb
@@ -367,6 +389,7 @@ files:
 - lib/samagotchi/generation_phase.rb
 - lib/samagotchi/git_env.rb
 - lib/samagotchi/git_head.rb
+- lib/samagotchi/grants.rb
 - lib/samagotchi/guardrail_wiring.rb
 - lib/samagotchi/guardrails.rb
 - lib/samagotchi/guardrails/approval.rb
@@ -526,11 +549,13 @@ files:
 - lib/samagotchi/objectives_audit.rb
 - lib/samagotchi/objectives_check.rb
 - lib/samagotchi/objectives_command.rb
+- lib/samagotchi/objectives_edit.rb
 - lib/samagotchi/output_formatter.rb
 - lib/samagotchi/owner_lock.rb
 - lib/samagotchi/owner_prompt.rb
 - lib/samagotchi/parent_answers_command.rb
 - lib/samagotchi/parent_report.rb
+- lib/samagotchi/participant_exposure.rb
 - lib/samagotchi/participant_messages.rb
 - lib/samagotchi/participant_mode.rb
 - lib/samagotchi/participant_name.rb
@@ -557,6 +582,7 @@ files:
 - lib/samagotchi/plugin/tool_spec.rb
 - lib/samagotchi/plugin_session_state.rb
 - lib/samagotchi/plugin_tasks.rb
+- lib/samagotchi/private_files.rb
 - lib/samagotchi/process_group.rb
 - lib/samagotchi/project_env.rb
 - lib/samagotchi/project_scope.rb
@@ -578,6 +604,7 @@ files:
 - lib/samagotchi/recap_setup.rb
 - lib/samagotchi/recap_store.rb
 - lib/samagotchi/recap_title.rb
+- lib/samagotchi/redact.rb
 - lib/samagotchi/redacted_inspect.rb
 - lib/samagotchi/ref.rb
 - lib/samagotchi/relay.rb
@@ -674,7 +701,6 @@ files:
 - lib/samagotchi/terminal_ui/attached_loop/queueing.rb
 - lib/samagotchi/terminal_ui/attached_loop/sending.rb
 - lib/samagotchi/terminal_ui/attached_view.rb
-- lib/samagotchi/terminal_ui/between_turns.rb
 - lib/samagotchi/terminal_ui/event_renderer.rb
 - lib/samagotchi/terminal_ui/exit_lines.rb
 - lib/samagotchi/terminal_ui/formatting.rb
@@ -685,6 +711,7 @@ files:
 - lib/samagotchi/terminal_ui/line_reader.rb
 - lib/samagotchi/terminal_ui/live_region.rb
 - lib/samagotchi/terminal_ui/local_link.rb
+- lib/samagotchi/terminal_ui/log_tail.rb
 - lib/samagotchi/terminal_ui/model_segments_text.rb
 - lib/samagotchi/terminal_ui/one_shot_sink.rb
 - lib/samagotchi/terminal_ui/own_turns.rb
@@ -696,7 +723,6 @@ files:
 - lib/samagotchi/terminal_ui/reline_seam.rb
 - lib/samagotchi/terminal_ui/remote_connector.rb
 - lib/samagotchi/terminal_ui/remote_link.rb
-- lib/samagotchi/terminal_ui/repl_input.rb
 - lib/samagotchi/terminal_ui/screen.rb
 - lib/samagotchi/terminal_ui/status_row.rb
 - lib/samagotchi/terminal_ui/surface.rb
@@ -810,20 +836,17 @@ files:
 - lib/samagotchi/web/block_renderer_routes.rb
 - lib/samagotchi/web/capabilities.rb
 - lib/samagotchi/web/editor.rb
-- lib/samagotchi/web/grants.rb
 - lib/samagotchi/web/info_probe.rb
 - lib/samagotchi/web/lan.rb
 - lib/samagotchi/web/link_codes.rb
 - lib/samagotchi/web/markdown_renderer.rb
 - lib/samagotchi/web/message_display.rb
 - lib/samagotchi/web/participant_access.rb
-- lib/samagotchi/web/participant_exposure.rb
 - lib/samagotchi/web/participant_review.rb
 - lib/samagotchi/web/participant_stream_filter.rb
 - lib/samagotchi/web/participant_view.rb
 - lib/samagotchi/web/participants_admin.rb
 - lib/samagotchi/web/principal.rb
-- lib/samagotchi/web/private_files.rb
 - lib/samagotchi/web/project_list.rb
 - lib/samagotchi/web/proxy_gate.rb
 - lib/samagotchi/web/public/activity.js

data/lib/samagotchi/terminal_ui/between_turns.rb

@@ -1,138 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "formatting"
-require_relative "event_renderer"
-
-module Samagotchi
-  class TerminalUI
-    # What the REPL prints between turns: cards and plugins' notices shown
-    # outside a turn, anytime commands' output, plugins' init lines and load
-    # warnings, and a recap written while idle.
-    #
-    # They are announced on other threads (the Engine's observers, the idle
-    # scheduler, an anytime command's own), where they are only kept; the
-    # main thread prints them at the open prompt (#flush_recap,
-    # #flush_cards), after the command that showed them. One that comes
-    # while a turn runs prints at once (above the live region) where the
-    # turn wouldn't print it itself.
-    class BetweenTurns
-      include Formatting
-
-      # A plugin's init task and a load warning: shown between turns too.
-      INIT_EVENTS = %i[plugin_init_started plugin_init_finished guardrail_warning].freeze
-
-      # @param surface [Surface] where lines print (swapped with #surface=)
-      # @param view [AttachedView] turns the activity row for init tasks
-      # @param renderer [EventRenderer] draws cards
-      # @param turn_running [#call] whether a turn runs now
-      # @param quiet [Boolean] a --non-interactive run: no init lines
-      # @param gaps [GapClock, nil] the session's last activity: a recap
-      #   after a quiet gap has its divider
-      def initialize(surface:, view:, renderer:, turn_running:, quiet: false, gaps: nil)
-        @surface = surface
-        @view = view
-        @renderer = renderer
-        @turn_running = turn_running
-        @quiet = quiet
-        @cards = Queue.new
-        @recap = nil
-        @gaps = gaps
-      end
-
-      attr_writer :surface
-
-      # The Engine's observer for cards, notices and init events (any
-      # thread). A card or a plugin's notice shown outside a turn is kept
-      # for the next flush; one shown during a turn is a turn event, the
-      # turn's sink prints it where it happens (EventRenderer).
-      #
-      # An anytime command's (event[:anytime]) print as it shows them: on
-      # the main thread (the command runs at the prompt) or beside a running
-      # turn, else at the next flush.
-      #
-      # A plugin's init task (chi.init) turns the activity row while it runs
-      # and prints a line when it is done; a load warning announced before
-      # the first turn, one. Beside a running turn they print at once.
-      def observe(event)
-        if INIT_EVENTS.include?(event[:type])
-          return if @quiet
-          return @view.init_started(event) if event[:type] == :plugin_init_started
-
-          @view.init_finished(event) if event[:type] == :plugin_init_finished
-          return show(event) if turn_running?
-
-          return @cards << event
-        end
-        return unless (event[:type] == :card && !event[:in_turn]) || (event[:type] == :hook_notice && event[:between_turns])
-        return show(event) if event[:anytime] && (Thread.current == Thread.main || turn_running?)
-
-        @cards << event
-      end
-
-      # Keep an item for the next flush (any thread).
-      def keep(item)
-        @cards << item
-      end
-
-      # An anytime command's output: beside a running turn at once, else at
-      # the next flush.
-      def show_or_keep(item)
-        turn_running? ? show(item) : keep(item)
-      end
-
-      # The Engine's observer for :recap_ready (the idle scheduler's thread):
-      # kept for #flush_recap. One collected just as a turn started describes
-      # the chat before it, and is dropped.
-      def take_recap(event)
-        return unless event[:type] == :recap_ready
-        return if event[:recap].to_s.strip.empty? || turn_running?
-
-        @recap = { text: event[:recap].to_s, at: event[:created_at] }
-      end
-
-      # Print a recap written while idle (main thread, at the open prompt).
-      def flush_recap
-        recap = @recap
-        return unless recap
-
-        @recap = nil
-        line = @gaps&.divider
-        @surface.commit(gap_divider(line)) if line
-        @surface.commit(recap_block(recap[:text], at: recap[:at]))
-      end
-
-      # Print the cards, notices and anytime commands' output kept since the
-      # last flush (main thread). A card replaced later in the same batch
-      # (the same id: btw's "thinking…", then its answer) prints once, as its
-      # last.
-      def flush_cards
-        items = []
-        loop { items << @cards.pop(true) }
-      rescue ThreadError
-        items.each_with_index do |item, index|
-          replaced = item[:type] == :card && items.drop(index + 1).any? { |later| later[:type] == :card && later[:id] == item[:id] }
-          show(item) unless replaced
-        end
-        nil
-      end
-
-      # A card, a notice, an anytime command's output (:command_output), a
-      # plugin init task's done line or a load warning.
-      def show(item)
-        case item[:type]
-        when :card then @renderer.render_card(item)
-        when :command_output then @surface.commit(item[:text])
-        when :guardrail_warning then @surface.commit(EventRenderer.load_warning_line(item))
-        when :plugin_init_finished
-          line = EventRenderer.init_line(item)
-          @surface.commit(line) if line
-        else @surface.commit(EventRenderer.hook_notice_line(item))
-        end
-      end
-
-      private
-
-      def turn_running? = @turn_running.call
-    end
-  end
-end

data/lib/samagotchi/terminal_ui/repl_input.rb

@@ -1,152 +0,0 @@
-# frozen_string_literal: true
-
-require "monitor"
-require_relative "line_reader"
-
-module Samagotchi
-  class TerminalUI
-    # The REPL's input on a terminal: one LineReader keeps a prompt open for
-    # the whole session, turns included, and this routes what it reads. A
-    # line goes to a question waiting at the prompt (asked at ? ), to
-    # the running turn when its handler takes it (steering), else to the
-    # inbox the REPL loop takes its next line from.
-    class ReplInput
-      # @param prompt [#call] -> the prompt when no question waits
-      # @param read [#call] (prompt, prefill) -> line (nil = Ctrl-D)
-      # @param surface [Surface] the editor slot a dropped read leaves is
-      #   cleared under its lock
-      def initialize(prompt:, read:, surface:)
-        @prompt = prompt
-        @read = read
-        @surface = surface
-        @inbox = Thread::Queue.new
-        # Lines a turn left over: they come before the inbox.
-        @front = []
-        @turn = nil
-        @lock = Monitor.new
-        @answers = nil
-      end
-
-      def start(prefill: nil)
-        @reader = LineReader.new(self, prompt: method(:prompt_text), read: @read, prefill: prefill).start
-        self
-      end
-
-      def open? = @reader&.alive? || false
-
-      def stop
-        @reader&.stop
-        @surface.clear_slot(:editor)
-      end
-
-      # From the reader thread: [:line, text] or [:interrupt, info].
-      def <<(item)
-        @lock.synchronize do
-          next @answers << item if @answers
-
-          taken = @turn && item.first == :line && @turn.call(item.last)
-          # Not now: the line goes back into the prompt.
-          next @reader&.prefill_next(item.last) if taken == :back
-          next if taken
-
-          @inbox << item
-        end
-        self
-      end
-
-      # @return [Array, nil] the next item, nil after +timeout+ seconds
-      def pop(timeout:)
-        @lock.synchronize { return @front.shift unless @front.empty? }
-        @inbox.pop(timeout: timeout)
-      end
-
-      # While a turn runs, +handler+ (line -> truthy when it took the line,
-      # :back to put it back into the prompt) sees each line first. Once it ends, +leftovers+ (-> lines it took that the
-      # turn never merged) come next, in order, before anything in the inbox.
-      def during_turn(handler, leftovers:)
-        @lock.synchronize { @turn = handler }
-        yield
-      ensure
-        @lock.synchronize do
-          @turn = nil
-          @front.concat(Array(leftovers.call).map { |line| [:line, line] })
-        end
-      end
-
-      def prompt_text
-        @lock.synchronize { @answers ? @choice_prompt : @prompt.call }
-      end
-
-      # Start the open read again when its prompt changed (a continue offer
-      # came or went); what was typed is kept.
-      def sync_prompt
-        return unless open?
-
-        with_surface_lock do
-          next if @reader.current == prompt_text
-
-          @surface.clear_slot(:editor)
-          @reader.reprompt(keep_text: true)
-        end
-      end
-
-      # Put +text+ into the open prompt, unless something is typed there.
-      # @return [Boolean] whether it went in
-      def prefill(text) = open? && @reader.prefill(text)
-
-      # What the open prompt holds, nil when none is open: a line typed
-      # ahead there is the next turn's input.
-      def typed_text = @reader&.typed_text
-
-      # Whether the next turn's input is already here: text typed ahead at
-      # the open prompt, or a line a turn took as steering but never merged
-      # (it runs as the next turn).
-      def waiting_input?
-        @lock.synchronize { return true unless @front.empty? }
-
-        !typed_text.to_s.strip.empty?
-      end
-
-      # A question answered at the open prompt: the lines submitted from now
-      # on go to it, at the ? prompt. What was typed at the prompt is put aside
-      # and comes back once the question closes.
-      # @yield [Thread::Queue] the answers ([:line, text] or [:interrupt, info])
-      # A prompt closed by Ctrl-D mid-turn (the REPL exits after the turn)
-      # opens for the question and closes again after it.
-      def ask(choice_prompt)
-        was_open = open?
-        typed = was_open ? @reader.typed_text : nil
-        answers = Thread::Queue.new
-        @lock.synchronize do
-          @answers = answers
-          @choice_prompt = choice_prompt
-        end
-        was_open ? reprompt : start
-        yield answers
-      ensure
-        @lock.synchronize { @answers = nil }
-        if !was_open
-          stop
-        elsif open?
-          reprompt(prefill: typed)
-        else
-          # Ctrl-D at the question ended the reader: start it again.
-          start(prefill: typed)
-        end
-      end
-
-      private
-
-      def reprompt(prefill: nil)
-        with_surface_lock do
-          @surface.clear_slot(:editor)
-          @reader.reprompt(prefill: prefill)
-        end
-      end
-
-      def with_surface_lock(&)
-        @surface.respond_to?(:synchronize) ? @surface.synchronize(&) : yield
-      end
-    end
-  end
-end