samagotchi 0.3.0 → 0.5.0

data/lib/samagotchi/terminal_ui.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "monitor"
 require "json"
 require "fileutils"
 require "io/console"
@@ -13,8 +12,6 @@ require_relative "context_note"
 require_relative "cancellation_controller"
 require_relative "llm/errors"
 require_relative "host_registry"
-require_relative "context_usage"
-require_relative "context_window"
 require_relative "kernel_loop"
 require_relative "session"
 require_relative "owner_lock"
@@ -22,17 +19,17 @@ require_relative "engine"
 require_relative "tools/memory"
 require_relative "output_formatter"
 require_relative "turn_flow"
-require_relative "turn_tally"
 require_relative "session_commands"
+require_relative "terminal_ui/attached_view"
 require_relative "terminal_ui/event_renderer"
 require_relative "terminal_ui/formatting"
 require_relative "terminal_ui/input_support"
 require_relative "terminal_ui/image_input"
-require_relative "terminal_ui/legacy_surface"
+require_relative "terminal_ui/plain_surface"
 require_relative "terminal_ui/live_region"
 require_relative "terminal_ui/question_prompt"
 require_relative "terminal_ui/repl_input"
-require_relative "terminal_ui/thinking_line"
+require_relative "terminal_ui/status_row"
 require_relative "log"
 
 module Samagotchi
@@ -47,47 +44,10 @@ module Samagotchi
     include Formatting
     include InputSupport
 
-    AGENT_DESCRIPTION_FILE = "AGENT.md"
-    SKIP_AGENT_DESCRIPTION_ENV = "SAMAGOTCHI_SKIP_AGENT_MD"
-    STATS_COMMAND = "/stats"
-    # /exit --delete: delete the session on the way out.
-    EXIT_DELETE_FLAG = "--delete"
-    # Leave, then archive the session (hidden from the lists, kept for good).
-    ARCHIVE_COMMAND = "/archive"
     SCRATCH_ARCHIVE_REFUSED = "a scratch session is deleted when you leave; nothing to archive"
-    RECAP_COMMAND = "/recap"
     # The prompt while a question waits for its answer (its choices are in
     # the notes slot).
     QUESTION_PROMPT = "? "
-    THINKING_UI_ENV = "SAMAGOTCHI_THINKING_UI"
-    THINKING_UI_SPINNER = "spinner"
-    THINKING_UI_OFF = "off"
-    THINKING_SPINNER_FRAMES = ["|", "/", "-", "\\"].freeze
-    MEMORY_SPINNER_COLOR = "38;5;208"
-    TOOL_SPINNER_COLOR = 32
-    NETWORK_RETRY_SPINNER_COLOR = 31
-    MEMORY_SPINNER_PREVIEW_LIMIT = 3
-    MEMORY_STICKY_PREVIEW_LIMIT = 8
-    THINKING_PREVIEW_WIDTH = 120
-    # Columns a sentence needs on the spinner row; with less, it reads "thinking...".
-    MIN_SENTENCE_ROOM = 12
-    THINKING_TOOL_PREVIEW_LIMIT = 56
-    THINKING_RENDER_MIN_INTERVAL = 0.08
-    # The spinner also turns with time: a ticker redraws it when no chunk
-    # did for this long, and after THINKING_WAIT_NOTICE_AFTER seconds with no
-    # chunk it says how long the first token has taken.
-    THINKING_TICK_INTERVAL = 0.25
-    THINKING_WAIT_NOTICE_AFTER = 2.0
-    THINKING_RENDER_INTERVAL_ENV = "SAMAGOTCHI_THINKING_RENDER_INTERVAL"
-    STATUS_LINE_ENV = "SAMAGOTCHI_STATUS_LINE"
-    STATUS_LINE_ON = "on"
-    STATUS_LINE_OFF = "off"
-    STATUS_WIDTH_MODE_ENV = "SAMAGOTCHI_STATUS_WIDTH_MODE"
-    STATUS_WIDTH_MODE_TERMINAL_CAP = "terminal_cap"
-    STATUS_WIDTH_MODE_FIXED = "fixed"
-    STATUS_FIXED_WIDTH_ENV = "SAMAGOTCHI_STATUS_FIXED_WIDTH"
-    STATUS_MAX_WIDTH_ENV = "SAMAGOTCHI_STATUS_MAX_WIDTH"
-    STATUS_MAX_WIDTH_DEFAULT = 160
     REMINDER_PENDING_POLL_INTERVAL = 0.5
     # What a command sent during a turn gets, as from a worker (Worker::BUSY_OUTPUT).
     COMMAND_BUSY = "busy: wait for the turn to end"
@@ -109,14 +69,9 @@ module Samagotchi
     # @param scratch [Boolean] `chi scratch`: a new session that is deleted
     #   however the REPL ends, saves no memories and writes no recap
     def initialize(mode: :assist, prompt: nil, client: nil, host_registry: nil, profile: nil, session_id: nil, no_interrupt: false, no_default_input: false, model_name: nil, memories: [], muted_memories: [], non_interactive: false, surface: nil,
-                   spinner_tick_interval: THINKING_TICK_INTERVAL, scratch: false)
+                   spinner_tick_interval: AttachedView::TICK_INTERVAL, spinner_clock: nil, scratch: false)
       @mode           = mode.to_sym
       @scratch        = scratch
-      # nil: no ticker thread (specs that compare exact frames).
-      @spinner_tick_interval = spinner_tick_interval
-      @spinner_lock = Monitor.new
-      @turn_tally = TurnTally.new
-      @thinking_line = ThinkingLine.new(clock: -> { monotonic_time })
       @prompt         = prompt
       @default_model_name = ModelProfile.required_model_name(nil)
       aliased_model_name = model_name.to_s.strip.empty? ? nil : ConfigFile.resolve_model_alias(model_name)
@@ -145,6 +100,9 @@ module Samagotchi
         # Re-resolve client after resume may change effective model
         @client = @host_registry.resolve(@effective_model_name).client
       end
+      # The model it starts on names a configured host (a bad default.model
+      # doesn't matter when --model or the session picks another).
+      ModelProfile.check_host!(@effective_model_name, hosts: @host_registry.entries)
       # Only a caller's profile goes in; otherwise the Engine resolves one
       # for the effective model and hands it to the kernel.
       @kernel         = KernelLoop.new(client: @client, profile: profile, no_interrupt: no_interrupt, reminder_store: Samagotchi::ReminderStore.new)
@@ -167,9 +125,17 @@ module Samagotchi
       # Every terminal write goes through the surface. The REPL swaps in a
       # live region when the terminal can show one (#assist_loop), unless it
       # was given a surface to draw on.
-      @surface = surface || LegacySurface.new
+      @surface = surface || PlainSurface.new
       @surface_given = !surface.nil?
-      @renderer = EventRenderer.new(self)
+      # The turn view is the attached TUI's, and so is the status row; both
+      # move to the live region with the surface (#use_surface). A
+      # spinner_tick_interval of nil: no ticker thread, and a spinner_clock
+      # fixes the frames (specs that compare exact frames).
+      view_options = { tick_interval: spinner_tick_interval }
+      view_options[:clock] = spinner_clock if spinner_clock
+      @view = AttachedView.new(@surface, **view_options)
+      @status_row = StatusRow.new(@surface)
+      @renderer = EventRenderer.new(@view)
       @render_event = ->(event) { handle_stream_event(event) }
       @engine         = Engine.new(
         mode: :assist,
@@ -178,7 +144,9 @@ module Samagotchi
         profile: profile,
         session_id: session_id,
         no_interrupt: no_interrupt,
-        model_name: @default_model_name,
+        # nil: the config default, unchecked here (the model the REPL starts
+        # on is checked above, and --model may make the default moot).
+        model_name: nil,
         memories: @requested_memories,
         muted_memories: @muted_memory_names,
         kernel: @kernel,
@@ -235,6 +203,8 @@ module Samagotchi
     # (auto-executing it, then saving), then either exits when there is no
     # follow-up REPL (--non-interactive) or drops into the REPL carrying the
     # post-turn conversation.
+    # @return [Symbol, nil] :turn_failed when lines came from a pipe and a
+    #   turn failed (bin/chi exits 1)
     def run
       unless @mode == :assist
         raise ArgumentError, "Unknown mode '#{@mode}'. Use: assist"
@@ -296,6 +266,8 @@ module Samagotchi
       else
         keep_after_exit(session)
       end
+      # Lines from a pipe (`chi -p X </dev/null`): a failed turn fails the run.
+      :turn_failed if @piped_turn_failed
     ensure
       # However it ends (the early returns too; the Engine was built in
       # #initialize): the anytime commands finish, the plugins' services
@@ -426,26 +398,8 @@ module Samagotchi
       messages
     end
 
-    # Public entrypoint for background session workers.
-    # Keeps worker call sites out of TerminalUI private API details.
-    def process_background_prompt(session:, prompt:)
-      @engine.process_background_prompt(session: session, prompt: prompt)
-    end
-
     private
 
-    # Generate profile-aware tool calling hint.
-    # Kept as a one-line delegator to Engine (single source of truth).
-    def tool_call_hint
-      return @engine.tool_call_hint
-    end
-
-    # Assist system prompt — delegates wholesale to Engine so the two can
-    # never drift apart. This single delegator fixes the 4-line regression.
-    def assist_system_prompt
-      return @engine.assist_system_prompt
-    end
-
     # Interactive REPL loop. Session seed + messages are built by #run and
     # threaded in here (so --prompt / --resume share one code path). The
     # working session is persisted at the end of every turn.
@@ -508,15 +462,24 @@ module Samagotchi
       return yield unless screen
 
       plain = @surface
-      @surface = screen
+      use_surface(screen)
       begin
         yield
       ensure
-        @surface = plain
+        # Nothing may draw on the screen once it is closed: the view moves
+        # off it, then its ticker ends.
+        use_surface(plain)
+        @view.stop
         LiveRegion.close(screen)
       end
     end
 
+    def use_surface(surface)
+      @surface = surface
+      @view.surface = surface
+      @status_row.surface = surface
+    end
+
     # Interactive REPL loop. Session seed + messages are built by #run and
     # threaded in here (so --prompt / --resume share one code path). The
     # session's conversation is the single working copy: turns go through
@@ -559,21 +522,22 @@ module Samagotchi
           end
         end
         break if input.nil?
-        if exit_command?(input)
-          @delete_on_exit ||= delete_on_exit?(input)
+        local = local_command(input)
+        if local == :exit
+          @delete_on_exit ||= SessionCommands.delete_on_exit?(input)
           break
         end
-        if archive_command?(input)
+        if local == :archive
           next @surface.commit(SCRATCH_ARCHIVE_REFUSED) if @scratch
 
           @archive_on_exit = true
           break
         end
         # Not an answer to a continue offer either.
-        next detach_note if detach_command?(input)
+        next detach_note if local == :detach
 
         # /stats and /recap run; the offer stays open.
-        if @turn_flow.awaiting_continue? && !stats_command?(input) && !recap_command?(input)
+        if @turn_flow.awaiting_continue? && !%i[stats recap].include?(local)
           answer_continue_offer(session, input)
         else
           # The ? read left no echo: show what ran.
@@ -602,8 +566,9 @@ module Samagotchi
       @turn_flow.before_continue_turn
       begin
         result = run_engine_turn(session, nil, continue: true)
-      rescue LLM::ProviderError => e
-        @surface.commit("\nmodel> #{e.summary}; continue prompt preserved")
+      rescue LLM::ProviderError
+        # The renderer showed the failure (:turn_failed).
+        @surface.commit(turn_end_hint("continue prompt preserved"))
         return
       end
       finish_turn(session, result, continue: true)
@@ -626,20 +591,17 @@ module Samagotchi
         persist_recent_history(input) if command.shell
         return
       end
-      return @surface.commit("\nmodel> session stats:\n#{format_session_metrics(@engine.stats_snapshot)}") if stats_command?(input)
-      return @surface.commit("\nmodel> #{handle_recap_command}") if recap_command?(input)
+      return if show_local_command(input)
 
       @turn_flow.before_prompt_turn
       persist_recent_history(input)
       begin
         # Engine#run_turn injects due reminders as a tail message, appends
         # the prompt, and renders through @renderer via on_event.
-        result = run_engine_turn(session, normalize_model_input(input), images: ImageInput.extract(input))
+        result = run_engine_turn(session, input, images: ImageInput.extract(input))
       rescue LLM::ProviderError, ImageStore::Error => e
-        # Engine closed the turn (:turn_failed); show its duration.
-        # Retries were already tallied via generation_retrying events.
+        # Engine closed the turn (:turn_failed), which the renderer showed.
         # An @path image that can't be used fails the turn the same way.
-        emit_interactive_turn_duration(canceled: false)
         summary = e.respond_to?(:summary) ? e.summary : e.message
         # The model reads why on its next turn. An image that couldn't be
         # used, or that the host refused, never reached it: no note for that
@@ -648,7 +610,14 @@ module Samagotchi
         @turn_flow.prompt_turn_failed(note: note)
         # The Engine saved the failed turn; the file follows the rollback.
         save_session(session) if note
-        @surface.commit("\nmodel> #{summary}; #{restore_prompt_for_retry(input)}")
+        if piped_input?
+          # Nobody can edit a restored prompt, and Reline would hand it back
+          # as the next line: the turn would run again and again. It failed;
+          # the exit status says so.
+          @piped_turn_failed = true
+        else
+          @surface.commit(turn_end_hint(restore_prompt_for_retry(input)))
+        end
         return
       end
       finish_turn(session, result, continue: false)
@@ -666,10 +635,9 @@ module Samagotchi
         # and the partial assistant reply (marked [interrupted]) into
         # result.conversation, so progress is preserved by default — the
         # user's next message continues from it. !rollback restores the
-        # pre-turn checkpoint for an explicit full discard.
-        emit_interactive_turn_duration(canceled: true)
+        # pre-turn checkpoint for an explicit full discard (the renderer's
+        # hint under :turn_canceled says so).
         save_session(session) if result.respond_to?(:conversation) && result.conversation.is_a?(Array)
-        @surface.commit("\nmodel> turn cancelled; partial progress kept in context; use !rollback immediately after cancellation to restore the pre-turn checkpoint")
         return
       end
 
@@ -702,191 +670,11 @@ module Samagotchi
       @default_model_name = @commands.default_model
     end
 
-    def status_server_segment
-      # Show per-host info when multi-host is configured
-      if @host_registry && @host_registry.entries.size > 1
-        active = @host_registry.resolve(@effective_model_name).entry rescue nil
-        if active
-          host = active.host
-          port = active.port
-          total = @host_registry.entries.size
-          return "" if ["localhost", "127.0.0.1"].include?(host) && total == 1
-          # When multiple hosts, always show active + count
-          return "server=#{host}:#{port} (#{total} hosts)"
-        end
-      end
-      host = Samagotchi::Config.get("server.host")
-      return "" if ["localhost", "127.0.0.1"].include?(host)
-
-      port = Samagotchi::Config.get("server.port")
-      "server=#{host}:#{port}"
-    end
-
-    # Engine's built-once system prompt (the one run_turn sends), plus the
-    # --memory activations it recorded for the sticky status line.
-    def seed_system_prompt
-      prompt = @engine.system_prompt
-      sync_engine_activated_memories
-      prompt
-    end
-
-    # Appends the current memory index to the base system prompt so the agent
-    # is always aware of stored memories without needing to call a tool first.
-    # Delegates wholesale to Engine (single source of truth).
-    def system_prompt_with_index(base)
-      result = @engine.system_prompt_with_index(base)
-      # Mirror any --memory activations the Engine performed so the sticky
-      # status line can surface them. The prompt body injection moved into
-      # Engine; echoing the activated names here is purely a UI concern.
-      sync_engine_activated_memories
-      result
-    end
-
-    # Engine owns the system prompt (including --memory activation), but the
-    # sticky status line is a UI concern. Mirror the activated names so they
-    # appear in the status line.
-    def sync_engine_activated_memories
-      @engine.activated_memory_names.each do |name|
-        add_unique_memory_name(:@session_memory_names, name)
-      end
-    end
-
-    # Render a result from a turn that bypassed Engine#run_turn (continue,
-    # reminder turns) exactly as a :turn_completed would be rendered.
-    def emit_result(result)
-      @renderer.render_turn_summary(@engine.turn_summary(result))
-    end
-
-    # ── Turn view: the drawing surface EventRenderer calls ──────────────────
-    public
-
-    def emit_active_memories_line
-      lines = sticky_status_lines(width: status_effective_width)
-      return if lines.empty?
-
-      lines.each { |line| @surface.commit(line) }
-    end
-
-    def print_line(text)
-      @surface.commit(text)
-    end
-
-    def reset_turn_feedback
-      @spinner_lock.synchronize { @turn_tally.reset }
-      clear_retry_spinner_status
-      reset_thinking_memory_notification
-      reset_thinking_memory_names
-      reset_thinking_tool_notification
-    end
-
-    # A turn waits for plugins' slow setup (chi.init) before its first
-    # request: the spinner says what for, until the model starts.
-    def init_wait_feedback(event)
-      labels = Array(event[:tasks]).map { |task| "#{task[:bundle]}: #{task[:label]}" }
-      @spinner_lock.synchronize do
-        @init_wait_status = "chi> waiting for #{labels.join(" · ")}..."
-        start_thinking_spinner
-        refresh_thinking_spinner_status
-      end
-    end
-
-    def generation_feedback_started(event = {})
-      @init_wait_status = nil
-      @context_window_tokens = event[:context_window_tokens] if event[:context_window_tokens]
-      clear_retry_spinner_status
-      @latest_server_context_status = nil
-      @spinner_lock.synchronize do
-        @thinking_line.reset
-        start_thinking_spinner
-      end
-    end
-
-    def generation_feedback_retrying(event)
-      @spinner_lock.synchronize do
-        # The retry streams from the start: wait for its first token again.
-        @thinking_waiting_since = monotonic_time if @thinking_spinner_active
-        set_retry_spinner_status(event)
-        refresh_thinking_spinner_status
-      end
-    end
-
-    def generation_feedback_chunk(event)
-      @spinner_lock.synchronize do
-        @thinking_waiting_since = nil
-        clear_retry_spinner_status if retry_spinner_status_active?
-        capture_server_context_status_from_payload(event[:payload])
-        # A new sentence shows at once (the line changes at most once a dwell).
-        next refresh_thinking_spinner_status if @thinking_line.chunk(event)
-
-        tick_thinking_spinner
-      end
-    end
-
-    def tool_call_feedback_started(event)
-      @spinner_lock.synchronize do
-        @thinking_waiting_since = nil
-        clear_retry_spinner_status
-        @turn_tally.started(key: tally_key(event), tool: event[:tool], params: event[:params])
-        memory_loaded = capture_memory_tool_call(event)
-        capture_thinking_tool_call(event) if memory_loaded
-        refresh_thinking_spinner_status
-      end
-    end
-
-    def tool_call_feedback_completed(event)
-      @spinner_lock.synchronize do
-        @turn_tally.completed(key: tally_key(event), tool: event[:tool],
-                              status: event.dig(:activity, :status), params: event.dig(:activity, :params))
-      end
-    end
-
-    def clear_generation_retry
-      @spinner_lock.synchronize { clear_retry_spinner_status }
-    end
-
-    def generation_feedback_finished
-      @spinner_lock.synchronize do
-        clear_retry_spinner_status
-        @thinking_line.reset
-        finish_thinking_spinner
-      end
-    end
-
-    # The kernel reports the last emitted context status on the result; keep
-    # the previous one when a turn reports none.
-    def capture_context_status(status)
-      return unless status
-
-      @latest_context_status = {
-        est_pct: status[:est_pct],
-        bucket: status[:bucket]
-      }
-    end
-
-    private
-
-    # The last turn's line: completed, canceled or failed, as the Engine
-    # closed it (a provider error closes it with :turn_failed).
-    def emit_interactive_turn_duration(canceled:)
-      record = Array(@engine.metrics.snapshot[:turn_records]).last
-      return unless record && record[:duration_ms]
-
-      state = record[:status] == "failed" ? "failed" : (canceled ? "canceled" : "completed")
-      @surface.commit("#{paint('chi>', 36)} turn #{state} (#{format_elapsed_duration(record[:duration_ms])})")
-    end
-
-    def split_memory_scope(raw)
-      value = raw.to_s.strip
-      if value.include?("/")
-        scope, name = value.split("/", 2)
-        return [scope, name] if Tools::VALID_SCOPES.include?(scope)
-      end
-
-      [nil, value]
-    end
+    # Engine's built-once system prompt (the one run_turn sends).
+    def seed_system_prompt = @engine.system_prompt
 
     def read_input(awaiting_continue:)
-      emit_idle_status_line
+      refresh_status_row
 
       if awaiting_continue
         sync_continue_slot(true)
@@ -910,20 +698,24 @@ module Samagotchi
       # empty synthetic turn then (it duplicated output).
       return unless @engine.reminders_due?
 
+      # A pending continue offer goes, as for a new prompt (the worker's rule).
+      if @turn_flow.before_reminder_turn
+        sync_continue_slot(false)
+        @surface.commit(QuestionSlot.continue_summary("(dropped: a reminder ran)", paint: method(:paint)))
+      end
+      @surface.commit("reminder: #{names.join(", ")}")
       hint = "reminder: #{names.join(", ")} · Ctrl-C cancels it"
       @surface.set_slot(:hints, [color_output? ? paint(hint, 90) : hint])
       result = nil
       begin
         result = run_engine_turn(session, nil, continue: true)
         @prompt = nil
-      rescue LLM::ProviderError => e
-        # like other failed turns: back to the prompt
-        @surface.commit("\nmodel> #{e.summary}")
+      rescue LLM::ProviderError
+        nil # the renderer showed the failure; back to the prompt
       ensure
         @surface.clear_slot(:hints)
       end
       canceled = result.respond_to?(:canceled?) && result.canceled?
-      emit_interactive_turn_duration(canceled: canceled)
       if result && !canceled
         session.messages = result.conversation if result.respond_to?(:conversation) && result.conversation.is_a?(Array)
         session.model_name = @effective_model_name
@@ -949,7 +741,7 @@ module Samagotchi
 
       if @idle_status_due
         @idle_status_due = false
-        emit_idle_status_line
+        refresh_status_row
       end
       sync_continue_slot(awaiting_continue)
       @repl_input.sync_prompt
@@ -972,7 +764,7 @@ module Samagotchi
       return unless STDIN.tty? && $stdin.tty?
 
       @idle_status_due = false
-      emit_idle_status_line
+      refresh_status_row
       @repl_input = ReplInput.new(prompt: method(:repl_prompt_text), read: method(:read_repl_line), surface: @surface).start
     end
 
@@ -1013,6 +805,10 @@ module Samagotchi
       prompt == paint(QUESTION_PROMPT, 33) ? RelineSeam.without_echo(&read) : read.call
     end
 
+    # Lines come from a pipe or a file (`chi -p X </dev/null`, `echo … | chi`),
+    # not a terminal: no prompt is restored for a retry.
+    def piped_input? = !$stdin.tty?
+
     # A failed prompt goes back into the input for a retry.
     # @return [String] what the failed-turn line says about it
     def restore_prompt_for_retry(input)
@@ -1023,27 +819,20 @@ module Samagotchi
       @repl_input.prefill(input) ? "prompt restored for retry" : "the failed prompt is in the input history (↑)"
     end
 
-    def shell_bang_command?(input)
-      input.to_s.match?(/\A!\s*\S/)
-    end
-
-    def stats_command?(input)
-      input.to_s.strip == STATS_COMMAND
-    end
-
-    def recap_command?(input)
-      input.to_s.strip == RECAP_COMMAND
-    end
-
-    # SessionCommands runs /model; the REPL mirrors the result.
-    def handle_model_command(input)
-      result = @commands.run(input)
-      sync_model_mirrors
-      result.output
-    end
+    # The id of the terminal's own command +input+ is (:exit, :archive,
+    # :detach, :stats, :recap; SessionCommands registers them), or nil.
+    def local_command(input) = command_registry.lookup_local(input)&.id
 
-    def handle_models_command
-      @commands.run(SessionCommands::MODELS_COMMAND).output
+    # /stats and /recap, which show and change nothing (at the prompt, a
+    # continue offer's ? prompt, or during a turn).
+    # @return [Boolean] whether +input+ was one
+    def show_local_command(input)
+      case local_command(input)
+      when :stats then @surface.commit("\nmodel> session stats:\n#{format_session_metrics(@engine.stats_snapshot)}")
+      when :recap then @surface.commit("\nmodel> #{handle_recap_command}")
+      else return false
+      end
+      true
     end
 
     # /recap: the saved recap, and a new one asked for at once when the
@@ -1060,31 +849,10 @@ module Samagotchi
     # A resumed session doesn't get the default input either.
     def default_input_wanted? = !@resume_session && !@no_default_input
 
-    # exit or /exit, with --delete to delete the session on the way out.
-    def exit_command?(input)
-      words = input.to_s.strip.downcase.split
-      %w[exit /exit].include?(words.first) && (words.size == 1 || words == [words.first, EXIT_DELETE_FLAG])
-    end
-
-    def delete_on_exit?(input) = input.to_s.strip.downcase.split.last == EXIT_DELETE_FLAG
-
-    def detach_command?(input) = input.to_s.strip.casecmp?("/detach")
-
-    def archive_command?(input) = input.to_s.strip.casecmp?(ARCHIVE_COMMAND)
-
     def clone_messages(messages)
       Array(messages).map(&:dup)
     end
 
-    def skip_agent_description?
-      value = ENV[SKIP_AGENT_DESCRIPTION_ENV]
-      value == "1" || value&.casecmp?("true")
-    end
-
-    def rg_available?
-      system("command -v rg", out: File::NULL, err: File::NULL)
-    end
-
     # Run one REPL turn (a prompt, or a continue/reminder turn with nil) through
     # Engine#run_turn, rendering via @renderer.
     # @param images [Array<Hash>] the prompt's `@path` images ({path:})
@@ -1092,12 +860,11 @@ module Samagotchi
       cancellation_controller = CancellationController.new
       @active_cancel_controller = cancellation_controller
       @renderer.begin_turn
-      # Build the (memoized) prompt now so --memory activations show in this
-      # turn's status lines, including after /model rebuilt it.
-      seed_system_prompt
+      # The row shows the turn's model (a -p turn runs before any read).
+      refresh_status_row
       # A prompt the user typed brings an archived session back to the lists.
       ArchiveStore.user_input(session.id, state_dir: Session.default_state_dir) if prompt && !continue
-      result = with_steering do
+      with_steering do
         @engine.run_turn(
           session,
           prompt,
@@ -1109,17 +876,14 @@ module Samagotchi
           images: images
         )
       end
-      emit_cancellation_notice(result)
-      result
     rescue Interrupt
-      # Engine kept the prompt in the session and emitted :turn_canceled.
+      # Engine kept the prompt in the session and emitted :turn_canceled
+      # (the renderer's line).
       cancellation_controller&.cancel!(:ctrl_c)
-      result = cancelled_result_from(session.messages, reason: :ctrl_c)
-      emit_cancellation_notice(result)
-      result
+      cancelled_result_from(session.messages, reason: :ctrl_c)
     ensure
       @active_cancel_controller = nil
-      finish_thinking_spinner
+      @view.finish_thinking_spinner
     end
 
     # While a turn runs, a line submitted at the open prompt steers it: it
@@ -1139,11 +903,13 @@ module Samagotchi
     # in the prompt.
     # @return [Boolean, :back] whether the turn took it, :back to put it back
     def steer_line(line)
-      return exit_after_turn(delete: delete_on_exit?(line)) if line.nil? || exit_command?(line)
-      return detach_note if detach_command?(line)
+      local = local_command(line) unless line.nil?
+      return exit_after_turn(delete: SessionCommands.delete_on_exit?(line)) if line.nil? || local == :exit
+      return detach_note if local == :detach
       return false if @active_cancel_controller&.cancelled?
       return start_anytime_command(line) if command_registry.lookup(line)&.anytime
-      return command_during_turn(line) if command_line?(line)
+      # A command, never steering text (/archive waits, back in the prompt).
+      return command_during_turn(line) if local || command_registry.command?(line)
       return true if line.strip.empty?
       # Steering merges text only: a line with images runs as the next turn.
       return image_line_waits if ImageInput.extract(line).any?
@@ -1177,15 +943,10 @@ module Samagotchi
 
     # @return [true, :back]
     def command_during_turn(line)
-      if stats_command?(line)
-        @surface.commit("\nmodel> session stats:\n#{format_session_metrics(@engine.stats_snapshot)}")
-      elsif recap_command?(line)
-        @surface.commit("\nmodel> #{handle_recap_command}")
-      else
-        @surface.commit(COMMAND_BUSY)
-        return :back
-      end
-      true
+      return true if show_local_command(line)
+
+      @surface.commit(COMMAND_BUSY)
+      :back
     end
 
     # D8: an anytime command runs on its own thread while the turn goes on
@@ -1205,35 +966,32 @@ module Samagotchi
       true
     end
 
-    def command_line?(line)
-      command_registry.command?(line) || stats_command?(line) || recap_command?(line) || exit_command?(line)
-    end
-
-    # The kernel's drain at an iteration boundary: queued lines, #memory
-    # shorthand made words as for a prompt, and saved in the history.
+    # The kernel's drain at an iteration boundary: queued lines, sent as
+    # typed and saved in the history.
     def drain_steering
       @pending_input_queue.drain.map do |line|
         persist_recent_history(line)
-        normalize_model_input(line)
+        line
       end
     end
 
-    # The REPL's on_event sink for Engine#run_turn: render one event. Engine
-    # swallows on_event errors to protect the turn, so log ours instead.
+    # The REPL's on_event sink for Engine#run_turn: render one event, after
+    # taking what the status row shows from it (as AttachedLoop does from the
+    # Bridge's). Engine swallows on_event errors to protect the turn, so log
+    # ours instead.
     def handle_stream_event(event)
+      case event[:type]
+      when :context_status
+        @status_row.update(context: { est_pct: event.dig(:usage, :estimated_pct), bucket: event[:bucket] })
+      when :used_memories_updated then @status_row.update(used_memories: Array(event[:used_memory_names]))
+      when :generation_completed
+        @status_row.update(served: [event[:served_model], event[:requested_model]]) if event[:served_model]
+      end
       @renderer.call(event)
     rescue StandardError => e
       Log.error(:repl, "render_failed", echo: "[render] #{event[:type]}: #{e.class}: #{e.message}", event_type: event[:type].to_s, error: e.class.name)
     end
 
-    def emit_cancellation_notice(result)
-      return unless result.respond_to?(:canceled?) && result.canceled?
-
-      reason = result.respond_to?(:cancellation_reason) ? result.cancellation_reason : nil
-      label = cancellation_reason_label(reason)
-      @surface.commit("\nmodel> request cancelled#{label.empty? ? "" : " (#{label})"}")
-    end
-
     def cancelled_result_from(messages, reason:)
       KernelLoop::Result.new(
         output: "",
@@ -1246,291 +1004,16 @@ module Samagotchi
       )
     end
 
-    def cancellation_reason_label(reason)
-      return "" if reason.nil?
-
-      case reason.to_sym
-      when :ctrl_c
-        "ctrl-c"
-      else
-        reason.to_s
-      end
-    end
-
-    def start_thinking_spinner
-      return unless thinking_spinner_enabled?
-
-      @thinking_spinner_active = true
-      @thinking_spinner_index = 0 if @thinking_spinner_index.nil?
-      @thinking_spinner_last_render_at = nil
-      @thinking_waiting_since = monotonic_time
-      render_thinking_spinner
-      start_thinking_ticker
-    end
-
-    # One thread per spinner; it ends when the spinner does.
-    def start_thinking_ticker
-      return unless @spinner_tick_interval
-      return if @thinking_ticker&.alive?
-
-      @thinking_ticker = Thread.new do
-        loop do
-          sleep(@spinner_tick_interval)
-          break unless tick_thinking_spinner_on_timer
-        end
-      rescue StandardError
-        nil
-      end
-      @thinking_ticker.report_on_exception = false
-    end
-
-    # Turn the spinner when no chunk did for a tick.
-    # @return [Boolean] whether the spinner is still shown
-    def tick_thinking_spinner_on_timer
-      @spinner_lock.synchronize do
-        return false unless @thinking_spinner_active
-
-        last = @thinking_spinner_last_render_at
-        if last.nil? || (monotonic_time - last) >= @spinner_tick_interval
-          @thinking_spinner_index = (@thinking_spinner_index + 1) % THINKING_SPINNER_FRAMES.length
-          render_thinking_spinner
-        end
-        true
-      end
-    end
-
-    def tick_thinking_spinner
-      return unless @thinking_spinner_active
-
-      @thinking_spinner_index = (@thinking_spinner_index + 1) % THINKING_SPINNER_FRAMES.length
-      render_thinking_spinner_if_due
-    end
-
-    def refresh_thinking_spinner_status
-      return unless @thinking_spinner_active
-
-      render_thinking_spinner
-    end
-
-    def render_thinking_spinner_if_due
-      last = @thinking_spinner_last_render_at
-      return render_thinking_spinner if last.nil?
-      return if (monotonic_time - last) < thinking_render_min_interval
-
-      render_thinking_spinner
-    end
-
-    public
-
-    # Erase the spinner rows; nothing to do when none are shown.
-    def finish_thinking_spinner
-      @spinner_lock.synchronize do
-        # Off even when the rows are gone already, so the ticker ends.
-        @thinking_spinner_active = false
-        @init_wait_status = nil
-        @thinking_waiting_since = nil
-        next unless @surface.clear_slot(:activity)
-
-        @thinking_spinner_last_render_at = nil
-      end
-    end
-
-    private
-
-    def retry_spinner_status_line(frame, width)
-      data = @retry_spinner_status || {}
-      attempt = data[:attempt].to_i
-      max_retries = data[:max_retries].to_i
-      total_attempts = max_retries + 1
-      delay = format("%.1f", data[:next_delay].to_f)
-      error_class = data[:error_class].to_s
-      message = "model> network error: retrying (#{attempt}/#{total_attempts} in #{delay}s) #{frame}"
-      message += " #{error_class}" unless error_class.empty?
-      capped = cap_preview_line(message, width)
-      color_output? ? paint(capped, NETWORK_RETRY_SPINNER_COLOR) : capped
-    end
-
-    def cap_preview_line(text, width)
-      cap_preview_text(text, thinking_preview_width(width))
-    end
-
-    def thinking_preview_width(width)
-      return THINKING_PREVIEW_WIDTH if width <= 0
-
-      [width, THINKING_PREVIEW_WIDTH].min
-    end
-
-
-    def thinking_render_min_interval
-      value = ENV.fetch(THINKING_RENDER_INTERVAL_ENV, THINKING_RENDER_MIN_INTERVAL.to_s).to_f
-      return THINKING_RENDER_MIN_INTERVAL unless value.positive?
-
-      value
-    end
-
-    def monotonic_time
-      Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    end
-
-    def capture_memory_tool_call(event)
-      call = event[:call].is_a?(Hash) ? event[:call] : {}
-      memory_name = memory_name_from_tool_call(call)
-      return false if memory_name.nil? || memory_name.empty?
-
-      added_to_thinking = add_unique_memory_name(:@thinking_memory_names, memory_name)
-      add_unique_memory_name(:@session_memory_names, memory_name)
-      @thinking_recent_memory_loaded = memory_name if added_to_thinking
-      added_to_thinking
-    end
-
-    def capture_thinking_tool_call(event)
-      call = event[:call].is_a?(Hash) ? event[:call] : {}
-      name = call[:name].to_s.strip
-      return if name.empty?
-
-      params = thinking_tool_params_preview(call, event[:params])
-      text = params.empty? ? name : "#{name}(#{params})"
-      @thinking_recent_tool_call = cap_preview_text(text, THINKING_TOOL_PREVIEW_LIMIT)
-    end
-
-    def thinking_tool_params_preview(call, raw_params)
-      compact = raw_params.to_s.gsub(/\s+/, " ").strip
-      return compact unless compact.empty?
-
-      tool_name = call[:name].to_s
-      case tool_name
-      when Tools::Execute::NAME
-        "command=#{preview_value_for_spinner(call[:content])}"
-      when Tools::Read::NAME
-        "path=#{preview_value_for_spinner(call[:content])}"
-      when Tools::Write::NAME, Tools::Edit::NAME
-        "path=#{preview_value_for_spinner(call[:path])}"
-      when Tools::MemoryRead::NAME
-        parts = []
-        name = call[:content].to_s.strip
-        parts << "name=#{preview_value_for_spinner(name)}" unless name.empty?
-        scope = call[:scope].to_s.strip
-        parts << "scope=#{preview_value_for_spinner(scope)}" unless scope.empty?
-        parts.join(" ")
-      when Tools::MemoryWrite::NAME
-        parts = []
-        path = call[:path].to_s.strip
-        parts << "name=#{preview_value_for_spinner(path)}" unless path.empty?
-        scope = call[:scope].to_s.strip
-        parts << "scope=#{preview_value_for_spinner(scope)}" unless scope.empty?
-        parts.join(" ")
-      else
-        ""
-      end
-    end
-
-    def preview_value_for_spinner(value)
-      text = value.to_s.gsub(/\s+/, " ").strip
-      return '""' if text.empty?
-
-      text.inspect
-    end
-
-    def add_unique_memory_name(ivar_name, value)
-      names = instance_variable_get(ivar_name) || []
-      return false if names.include?(value)
-
-      names << value
-      instance_variable_set(ivar_name, names)
-      true
-    end
-
-    def memory_name_from_tool_call(call)
-      tool_name = call[:name].to_s
-      case tool_name
-      when Tools::MemoryRead::NAME
-        normalize_memory_name(call[:content])
-      when Tools::Read::NAME
-        memory_name_from_read_path(call[:content])
-      else
-        nil
-      end
-    end
-
-    def normalize_memory_name(raw)
-      value = raw.to_s.strip
-      return nil if value.empty?
-
-      File.basename(value, ".md")
-    end
-
-    def memory_name_from_read_path(raw_path)
-      path = raw_path.to_s.strip.tr("\\", "/")
-      return nil if path.empty?
-      return nil unless path.match?(/memories[\/].+\.md\z/)
-
-      normalize_memory_name(path)
-    end
-
-    def memory_spinner_segment
-      segment = memory_spinner_segment_plain
-      return "" if segment.empty?
-
-      color_output? ? paint(segment, MEMORY_SPINNER_COLOR) : segment
-    end
-
-    def memory_spinner_segment_plain
-      names = Array(@thinking_memory_names)
-      return "" if names.empty?
-
-      visible = names.first(MEMORY_SPINNER_PREVIEW_LIMIT)
-      suffix = names.length > visible.length ? ", +#{names.length - visible.length}" : ""
-      " mem: #{visible.join(', ')}#{suffix}"
-    end
-
-    def memory_sticky_line
-      names = Array(@session_memory_names)
-      muted = @engine.muted_memory_names
-      return "" if names.empty? && muted.empty?
-
-      parts = []
-      parts << "active this session: #{preview_names(names)}" unless names.empty?
-      parts << "muted: #{preview_names(muted)}" unless muted.empty?
-      body = "memories> #{parts.join(' · ')}"
-      color_output? ? paint(body, MEMORY_SPINNER_COLOR) : body
-    end
-
-    def preview_names(names, limit: MEMORY_STICKY_PREVIEW_LIMIT)
-      visible = names.first(limit)
-      suffix = names.length > visible.length ? ", +#{names.length - visible.length}" : ""
-      "#{visible.join(', ')}#{suffix}"
-    end
-
-    def reset_thinking_memory_names
-      @thinking_memory_names = []
-    end
-
-    def reset_thinking_memory_notification
-      @thinking_recent_memory_loaded = nil
-    end
-
-    def reset_thinking_tool_notification
-      @thinking_recent_tool_call = nil
-    end
-
-    def capture_server_context_status_from_payload(payload)
-      # The window the kernel resolved for this generation (see
-      # :generation_started); the configured one before the first generation.
-      window_tokens = @context_window_tokens || ContextWindow.configured.tokens
-      normalized = ContextUsage.normalize(payload, window_tokens: window_tokens)
-      return unless normalized
-
-      @latest_server_context_status = normalized
-    end
-
-
-    def emit_idle_status_line
-      return unless status_line_enabled?
-
-      lines = idle_status_lines(width: status_effective_width)
-      return if lines.empty?
-
-      @surface.set_slot(:status, lines)
+    # 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
+      state = @engine.session_state_snapshot
+      served = state[:served_model] ? [state[:served_model], state[:served_model_for]] : nil
+      fields = { model: @effective_model_name, default_model: @default_model_name, served: served,
+                 parent_id: state[:parent_id], used_memories: Array(state[:used_memory_names]),
+                 preloaded: Array(state[:preloaded_memory_names]), muted: Array(state[:muted_memory_names]) }
+      fields[:context] = state[:context_status] if state[:context_status].is_a?(Hash)
+      @status_row.update(**fields)
     end
 
     # ── Idle session recap ───────────────────────────────────────────────────
@@ -1567,13 +1050,17 @@ module Samagotchi
     # main thread (the command runs at the prompt) or beside a running turn
     # (above the live region), else at the next flush.
     #
-    # A plugin's init task (chi.init) prints a line as it starts and one
-    # when it is done; a load warning announced before the first turn, one.
-    # Beside a running turn they print at once; a --non-interactive run
-    # prints only its answer.
+    # A plugin's init task (chi.init) turns the activity row while it runs
+    # (between turns too, as in attached mode) 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; a --non-interactive run prints only
+    # its answer.
     def handle_card_event(event)
       if INIT_EVENTS.include?(event[:type])
         return if @non_interactive
+        return @view.init_started(event) if event[:type] == :plugin_init_started
+
+        @view.init_finished(event) if event[:type] == :plugin_init_finished
         return show_pending_item(event) if @engine.turn_running?
 
         return @pending_cards << event
@@ -1601,13 +1088,13 @@ module Samagotchi
     INIT_EVENTS = %i[plugin_init_started plugin_init_finished guardrail_warning].freeze
 
     # A card, a notice, an anytime command's output (:command_output), a
-    # plugin init task's line or a load warning.
+    # plugin init task's done line or a load warning.
     def show_pending_item(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_started, :plugin_init_finished
+      when :plugin_init_finished
         line = EventRenderer.init_line(item)
         @surface.commit(line) if line
       else @surface.commit(EventRenderer.hook_notice_line(item))
@@ -1622,188 +1109,6 @@ module Samagotchi
       ConfigFile.recap_config
     end
 
-    def bare_model_for(full_ref)
-      @host_registry.bare_name(full_ref)
-    end
-
-    def spinner_status_line
-      return "" unless status_line_enabled?
-
-      lines = spinner_status_lines
-      lines.empty? ? "" : lines.first
-    end
-
-    def spinner_status_lines(width: status_effective_width)
-      return [] unless status_line_enabled?
-
-      build_status_lines(scope: :spinner, width: width)
-    end
-
-    def sticky_status_line
-      return "" unless status_line_enabled?
-
-      lines = sticky_status_lines
-      lines.empty? ? "" : lines.first
-    end
-
-    def sticky_status_lines(width: status_effective_width)
-      return [] unless status_line_enabled?
-
-      build_status_lines(scope: :sticky, width: width)
-    end
-
-    def idle_status_line
-      return "" unless status_line_enabled?
-
-      lines = idle_status_lines
-      lines.empty? ? "" : lines.first
-    end
-
-    def idle_status_lines(width: status_effective_width)
-      return [] unless status_line_enabled?
-
-      build_status_lines(scope: :idle, width: width)
-    end
-
-    def build_status_line(scope:)
-      lines = build_status_lines(scope: scope)
-      lines.empty? ? "" : lines.first
-    end
-
-    # The status rows for +scope+ (:spinner, :sticky or :idle), cut to +width+.
-    def build_status_lines(scope:, width: status_effective_width)
-      status_rows(status_segments(scope), width)
-    end
-
-
-    def status_width_mode
-      mode = ENV.fetch(STATUS_WIDTH_MODE_ENV, STATUS_WIDTH_MODE_TERMINAL_CAP).to_s.strip.downcase
-      return STATUS_WIDTH_MODE_FIXED if mode == STATUS_WIDTH_MODE_FIXED
-
-      STATUS_WIDTH_MODE_TERMINAL_CAP
-    end
-
-    def status_effective_width
-      mode = status_width_mode
-      width = if mode == STATUS_WIDTH_MODE_FIXED
-                status_fixed_width
-              else
-                [terminal_columns, status_max_width].min
-              end
-      width = status_fixed_width unless width.positive?
-      width
-    end
-
-    def status_fixed_width
-      env_positive_int(STATUS_FIXED_WIDTH_ENV, THINKING_PREVIEW_WIDTH)
-    end
-
-    def status_max_width
-      env_positive_int(STATUS_MAX_WIDTH_ENV, STATUS_MAX_WIDTH_DEFAULT)
-    end
-
-    def terminal_columns
-      columns = begin
-        io = IO.console
-        io&.winsize&.[](1).to_i
-      rescue StandardError
-        0
-      end
-      return columns if columns.positive?
-
-      env_positive_int("COLUMNS", status_max_width)
-    end
-
-    def env_positive_int(key, default)
-      value = ENV.fetch(key, default.to_s).to_i
-      value.positive? ? value : default
-    end
-
-    def status_segments(scope)
-      segments = [status_model_segment, status_server_segment].reject(&:empty?)
-      context_segment = status_context_segment
-      memory_segment = status_memory_segment(scope)
-      segments << context_segment unless context_segment.empty?
-      segments << memory_segment unless memory_segment.empty?
-      # The session's --mute list, on the sticky and idle rows (not the spinner).
-      muted_segment = scope == :spinner ? "" : status_memory_text(@engine.muted_memory_names, MEMORY_STICKY_PREVIEW_LIMIT, label: "muted")
-      segments << muted_segment unless muted_segment.empty?
-      segments
-    end
-
-    def status_model_segment
-      served, served_for = @engine.respond_to?(:served_model) ? @engine.served_model(probe: false) : nil
-      status_model_text(@effective_model_name, @default_model_name, served: served, served_for: served_for)
-    end
-
-    def status_context_segment
-      status_context_text(server: @latest_server_context_status, estimate: @latest_context_status)
-    end
-
-    def status_memory_segment(scope)
-      names, limit = case scope
-                     when :spinner
-                       [Array(@thinking_memory_names), MEMORY_SPINNER_PREVIEW_LIMIT]
-                     else
-                       [Array(@session_memory_names), MEMORY_STICKY_PREVIEW_LIMIT]
-                     end
-      status_memory_text(names, limit)
-    end
-
-    def thinking_memory_notification_suffix
-      memory_name = @thinking_recent_memory_loaded.to_s.strip
-      return "" if memory_name.empty?
-
-      " memory_loaded: #{memory_name}"
-    end
-
-    def thinking_tool_notification_suffix
-      tool_call = @thinking_recent_tool_call.to_s.strip
-      return "" if tool_call.empty?
-
-      " last_tool: #{tool_call}"
-    end
-
-    def thinking_notification_segments(width)
-      return ["", ""] if width <= 0
-
-      memory_suffix = cap_preview_text(thinking_memory_notification_suffix, width)
-      remaining = [width - memory_suffix.length, 0].max
-      tool_suffix = cap_preview_text(thinking_tool_notification_suffix, remaining)
-      [memory_suffix, tool_suffix]
-    end
-
-    def paint_if_present(text, code)
-      return "" if text.to_s.empty?
-
-      paint(text, code)
-    end
-
-    def thinking_spinner_enabled?
-      return false unless $stdout.tty?
-
-      mode = ENV.fetch(THINKING_UI_ENV, THINKING_UI_SPINNER).to_s.strip.downcase
-      return false if mode.empty? || mode == THINKING_UI_OFF || mode == "false" || mode == "0"
-
-      mode == THINKING_UI_SPINNER && ENV.fetch("TERM", "") != "dumb"
-    end
-
-    def set_retry_spinner_status(event)
-      @retry_spinner_status = {
-        attempt: event[:attempt],
-        max_retries: event[:max_retries],
-        next_delay: event[:next_delay],
-        error_class: event[:error_class]
-      }
-    end
-
-    def clear_retry_spinner_status
-      @retry_spinner_status = nil
-    end
-
-    def retry_spinner_status_active?
-      @retry_spinner_status.is_a?(Hash)
-    end
 
     # Reset the Engine's shared inactivity clock when a prompt opens (a
     # Reline.pre_input_hook) and on each key typed (RelineSeam.key_handler). This is the
@@ -1825,79 +1130,6 @@ module Samagotchi
       RelineSeam.key_handler = previous_key_handler
     end
 
-    def render_thinking_spinner
-      frame = THINKING_SPINNER_FRAMES[@thinking_spinner_index % THINKING_SPINNER_FRAMES.length]
-      width = status_effective_width
-      @thinking_line.tick
-      # The spinner goes above the prompt, the status rows below it.
-      @surface.set_slots(activity: thinking_spinner_status_lines(frame, width: width), status: spinner_status_lines(width: width))
-      @thinking_spinner_last_render_at = monotonic_time
-    end
-
-    # "model> waiting for the first token... 5s |" once a generation has
-    # shown nothing for THINKING_WAIT_NOTICE_AFTER seconds, else nil.
-    def first_token_wait_status(frame)
-      return nil unless @thinking_waiting_since
-
-      waited = monotonic_time - @thinking_waiting_since
-      return nil if waited < THINKING_WAIT_NOTICE_AFTER
-
-      "model> waiting for the first token... #{waited.floor}s #{frame}"
-    end
-
-    def thinking_spinner_status_line(frame)
-      lines = thinking_spinner_status_lines(frame)
-      lines.empty? ? "" : lines.first
-    end
-
-    # The spinner row, then (from a turn's 3rd tool call) its tool tally.
-    # The spinner stops while tools run, so the tally shows while the model
-    # generates between tool rounds.
-    def thinking_spinner_status_lines(frame, width: status_effective_width)
-      spinner_row_lines(frame, width: width) + tally_status_lines(width)
-    end
-
-    def tally_status_lines(width)
-      tally = @turn_tally.text(width: width)
-      return [] unless tally
-
-      [color_output? ? paint(tally, 90) : tally]
-    end
-
-    def tally_key(event)
-      [event[:iteration].to_i, event[:call_index].to_i]
-    end
-
-    def spinner_row_lines(frame, width:)
-      if retry_spinner_status_active?
-        return [retry_spinner_status_line(frame, width)]
-      end
-
-      return ["#{@init_wait_status} #{frame}"[0, width]] if @init_wait_status
-
-      base = first_token_wait_status(frame) || "model> thinking... #{frame}"
-      available_for_notification = [width - base.length, 0].max
-      memory_notification, tool_notification = thinking_notification_segments(available_for_notification)
-      notification = "#{memory_notification}#{tool_notification}"
-      base = thinking_sentence_base(frame, width - notification.length) || base
-
-      return ["#{base}#{notification}"] unless color_output?
-
-      ["#{paint(base, 90)}#{paint_if_present(memory_notification, MEMORY_SPINNER_COLOR)}#{paint_if_present(tool_notification, TOOL_SPINNER_COLOR)}"]
-    end
-
-    # "model> thinking · <the newest sentence> |" within +room+ columns (the
-    # web's thinking ticker, ThinkingLine), or nil before the first sentence.
-    def thinking_sentence_base(frame, room)
-      return nil if @thinking_waiting_since || @thinking_line.empty?
-
-      prefix = "model> #{@thinking_line.label} · "
-      room -= prefix.length + frame.length + 1
-      return nil if room < MIN_SENTENCE_ROOM
-
-      "#{prefix}#{@thinking_line.fit(room)} #{frame}"
-    end
-
     # ── Ask-user-question adapter (generic TUI renderer) ─────────────────────
 
     # Non-blocking observer: the turn thread emits :question_requested; we stash
@@ -1917,10 +1149,6 @@ module Samagotchi
       nil
     end
 
-    def pending_question_event?
-      !!@pending_question_event
-    end
-
     # Called from REPL thread (run_assist_loop top) — renders widget, blocks
     # until user selects, then answers via Engine#answer_question which wakes
     # the parked turn thread.
@@ -1960,8 +1188,11 @@ module Samagotchi
     def render_question_widget(pending)
       prompt = QuestionPrompt.new(pending)
 
-      # Ensure spinner cleared and terminal in known state (same as reminder mute handling)
-      finish_thinking_spinner rescue nil
+      # The activity row goes while the question waits.
+      @view.finish_thinking_spinner
+      # An edit's diff goes above the slot, into the scrollback.
+      preview = prompt.preview_lines(paint: method(:paint))
+      @surface.commit(preview.join("\n")) unless preview.empty?
       choices = prompt.slot(paint: method(:paint))
 
       question_prompt = paint(QUESTION_PROMPT, 33)
@@ -2049,17 +1280,5 @@ module Samagotchi
         return :canceled if controller&.cancelled?
       end
     end
-
-    # Process a prompt through the kernel loop and return the model response.
-    # Delegates to the internal Engine instance.
-    def process_prompt_through_kernel(session, prompt)
-      @engine.process_prompt_through_kernel(session, prompt)
-    end
-
-    # Write an agent response to the session output directory.
-    def write_session_output(output_dir, response)
-      timestamp = Time.now.strftime("%Y%m%d%H%M%S%9N")
-      File.write(File.join(output_dir, "#{timestamp}.txt"), response.to_s)
-    end
   end
 end