samagotchi 0.21.0 → 0.23.0

data/lib/samagotchi/send_command.rb

@@ -197,6 +197,7 @@ module Samagotchi
       return usage_error("--wait takes one session") if options[:wait] && options[:ids].uniq.size > 1
       return usage_error("at most #{MAX_IMAGES} images") if options[:images].size > MAX_IMAGES
       return new_options(options) if options[:new]
+
       %i[dir model].each { |key| return usage_error("--#{key} needs --new") if options[key] }
       return usage_error("give session ids") if options[:ids].empty?
 
@@ -229,6 +230,7 @@ module Samagotchi
     # caller never closes still hangs, as it would for cat.)
     def read_stdin
       return nil if @stdin.respond_to?(:tty?) && @stdin.tty?
+
       if @stdin.respond_to?(:stat)
         stat = @stdin.stat
         return nil unless stat.pipe? || stat.file?
@@ -328,8 +330,8 @@ module Samagotchi
 
     # The session as it was before the message went in (ReplyWait's
     # baseline).
-    def baseline_of(session, **options)
-      ReplyWait.baseline_of(session, **options)
+    def baseline_of(session, **)
+      ReplyWait.baseline_of(session, **)
     end
 
     # A new idle session's first turn, with the images. Its worker's Bridge

data/lib/samagotchi/session.rb

@@ -35,8 +35,8 @@ module Samagotchi
     SORT_ORDERS = %w[asc desc].freeze
 
     attr_accessor :id, :metadata_version, :mode, :model_name, :working_directory, :messages,
-                   :created_at, :updated_at, :status, :last_prompt, :first_preview, :test_run,
-                   :pending_question, :used_memory_names
+                  :created_at, :updated_at, :status, :last_prompt, :first_preview, :test_run,
+                  :pending_question, :used_memory_names
     # Memories the session was started with (--memory) and memories hidden
     # from it (--mute): the worker rebuilds the same prompt on a respawn.
     # Names as given; the engine normalizes them.

data/lib/samagotchi/session_archive_command.rb

@@ -47,7 +47,11 @@ module Samagotchi
       bad = @argv.find { |arg| arg.start_with?("-") }
       return usage_error(bad ? "unknown option #{bad}" : "give session ids") if bad || @argv.empty?
 
-      @argv.uniq.map { |given| @action == "archive" ? archive(given) : unarchive(given) }.all? ? 0 : 1
+      if @argv.uniq.map { |given| @action == "archive" ? archive(given) : unarchive(given) }.all?
+        0
+      else
+        1
+      end
     end
 
     private

data/lib/samagotchi/session_commands.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 require_relative "config"
 require_relative "model_profile"
 require_relative "served_model"
@@ -65,7 +63,7 @@ module Samagotchi
         guardrails(text.delete_prefix(GUARDRAILS_COMMAND).strip)
       end
       registry.register(MODEL_COMMAND, "show or switch the model",
-                        match: ->(text) { text.match?(/\A\/model(?:\s+.*)?\z/) }) { |text| model(text) }
+                        match: ->(text) { text.match?(%r{\A/model(?:\s+.*)?\z}) }) { |text| model(text) }
       registry.register(HELP_COMMAND, "list the commands, the bundles' too", anytime: true) { |_text| reply(help_listing) }
       registry.register("/stats", "show the session's stats", local: true)
       registry.register("/recap", "show the session's recap", local: true)

data/lib/samagotchi/session_manager.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 require "fileutils"
@@ -272,7 +271,7 @@ module Samagotchi
       root = cwd && folder_path(cwd)
       roots = {}
       summaries = Session.list(state_dir: sd, sort: sort || "updated_at", order: order || "desc", project_root: project_root,
-                                           include_archived: include_archived).lazy
+                               include_archived: include_archived).lazy
                          .reject { |s| (!include_tests && s.test_run) || s.id == exclude }
                          .select { |s| root.nil? || in_folder?(s.working_directory, root) }
                          .filter_map do |s|
@@ -703,7 +702,7 @@ module Samagotchi
       Dir.children(dir).all? do |name|
         path = File.join(dir, name)
         if EMPTY_SKELETON_DIRS.include?(name)
-          File.directory?(path) && (!EMPTY_DIRS.include?(name) || Dir.children(path).empty?)
+          File.directory?(path) && (!EMPTY_DIRS.include?(name) || Dir.empty?(path))
         elsif name == "analytics.json"
           Array(JSON.parse(File.read(path))["turn_records"]).empty?
         # Cards and notices from before any turn (Bridge::CardStore).
@@ -1054,4 +1053,3 @@ module Samagotchi
     end
   end
 end
-

data/lib/samagotchi/session_metrics.rb

@@ -137,9 +137,9 @@ module Samagotchi
 
       tokens = data["tokens"].is_a?(Hash) ? data["tokens"] : {}
       count = ->(key) { tokens[key].is_a?(Numeric) ? tokens[key] : 0 }
-      SavedSummary.new(ctx_pct: saved_pct(data["context"]), prompt_sum: count.("prompt_sum"),
-                       completion_sum: count.("completion_sum"), cached_sum: count.("cached_sum"),
-                       reasoning_sum: count.("reasoning_sum"), cost_sum: count.("cost_sum"))
+      SavedSummary.new(ctx_pct: saved_pct(data["context"]), prompt_sum: count.call("prompt_sum"),
+                       completion_sum: count.call("completion_sum"), cached_sum: count.call("cached_sum"),
+                       reasoning_sum: count.call("reasoning_sum"), cost_sum: count.call("cost_sum"))
     rescue JSON::ParserError, SystemCallError, TypeError
       nil
     end
@@ -379,15 +379,15 @@ module Samagotchi
     # Caller holds the mutex.
     def tokens_block(totals, turn)
       add = ->(key) { totals[key] + (turn&.public_send(key) || 0) }
-      decode_ms = add.(:decode_ms_sum)
-      decode_tokens = add.(:decode_tokens_sum)
+      decode_ms = add.call(:decode_ms_sum)
+      decode_tokens = add.call(:decode_tokens_sum)
       speed_turn = turn&.last_decode_tps ? turn : nil
       {
-        prompt_sum: add.(:prompt_sum),
-        completion_sum: add.(:completion_sum),
-        cached_sum: add.(:cached_sum),
-        reasoning_sum: add.(:reasoning_sum),
-        cost_sum: add.(:cost_sum),
+        prompt_sum: add.call(:prompt_sum),
+        completion_sum: add.call(:completion_sum),
+        cached_sum: add.call(:cached_sum),
+        reasoning_sum: add.call(:reasoning_sum),
+        cost_sum: add.call(:cost_sum),
         decode_ms_sum: decode_ms.round,
         decode_tokens_sum: decode_tokens,
         avg_decode_tps: decode_ms.positive? ? (decode_tokens * 1000.0 / decode_ms).round(1) : nil,

data/lib/samagotchi/session_observer.rb

@@ -70,6 +70,7 @@ module Samagotchi
     #   already-unsubscribed never raises)
     def unsubscribe(handle:)
       return false unless handle.is_a?(SubscribedObserver)
+
       @mutex.synchronize { !!@observers.delete(handle) }
     end
 
@@ -110,8 +111,8 @@ module Samagotchi
     # Run the block while no event is being numbered or delivered, so it sees
     # (and can change) state consistently with the event log. Reentrant: the
     # block may notify. Keep it short; every emitter waits for it.
-    def synchronize(&block)
-      @mutex.synchronize(&block)
+    def synchronize(&)
+      @mutex.synchronize(&)
     end
   end
 end

data/lib/samagotchi/session_retention.rb

@@ -171,7 +171,7 @@ module Samagotchi
       end
 
       now = Time.now
-      cutoff = days.to_i.positive? ? now - days.to_i * 86_400 : nil
+      cutoff = days.to_i.positive? ? now - (days.to_i * 86_400) : nil
       max = max_count.to_i
 
       deleted = []
@@ -249,7 +249,7 @@ module Samagotchi
           begin
             FileUtils.rm_f(path)
             sidecar = File.join(state_dir, session.id)
-            FileUtils.rm_rf(sidecar) if File.exist?(sidecar)
+            FileUtils.rm_rf(sidecar)
             PluginSessionState.remove(session.id)
             deleted << session.id
           rescue StandardError

data/lib/samagotchi/sessions_command.rb

@@ -118,6 +118,7 @@ module Samagotchi
         return usage_error("unknown format #{format.inspect}: use --format text|json|tsv")
       end
       return usage_error("unknown scope #{scope.inspect}: use --scope=project|all") unless scope.nil? || %w[project all].include?(scope)
+
       # The current git project's sessions (Samagotchi::ProjectScope), like
       # chi web's; --scope=all, a folder in no repo or an explicit --cwd: every
       # project's.
@@ -175,13 +176,17 @@ module Samagotchi
           end
           # A delegated session points at its parent.
           child = summary[:parent_short_id] ? "  ↳ #{summary[:parent_short_id]}" : ""
-          flag = summary[:scratch] ? " [scratch]" : (summary[:test_run] ? " [test]" : "")
+          flag = if summary[:scratch]
+                   " [scratch]"
+                 else
+                   (summary[:test_run] ? " [test]" : "")
+                 end
           flag += " [archived]" if summary[:archived]
           ctx = Samagotchi::SessionMetrics.context_label(summary[:ctx_pct])
           @stdout.puts "#{summary[:id]}  #{state.ljust(8)}  #{ctx.ljust(8)}  #{summary[:updated_at]}  #{desc}#{flag}#{child}"
         end
         if project
-          @stdout.puts "#{summaries.empty? ? "" : "\n"}#{scope_note.call(summaries.size)}"
+          @stdout.puts "#{"\n" unless summaries.empty?}#{scope_note.call(summaries.size)}"
         else
           @stdout.puts summaries.empty? ? "No sessions." : "\n#{summaries.size} session(s)"
         end
@@ -204,7 +209,11 @@ module Samagotchi
       end
       # A delegated session points at its parent: ↳ <parent's short id>.
       row = lambda do |s|
-        flag = s.scratch ? " [scratch]" : (s.test_run ? " [test]" : "")
+        flag = if s.scratch
+                 " [scratch]"
+               else
+                 (s.test_run ? " [test]" : "")
+               end
         flag += " [archived]" if s.archived
         child = s.parent_id ? "  ↳ #{s.parent_id[0, 8]}" : ""
         # How full the context was after the last turn: "ctx 12%", blank when unknown.
@@ -222,7 +231,7 @@ module Samagotchi
       end
       if project
         sessions.each { |s| @stdout.puts row.call(s) }
-        @stdout.puts "#{sessions.empty? ? "" : "\n"}#{scope_note.call(sessions.size)}"
+        @stdout.puts "#{"\n" unless sessions.empty?}#{scope_note.call(sessions.size)}"
       elsif sessions.empty?
         @stdout.puts "No sessions."
       else
@@ -276,7 +285,7 @@ module Samagotchi
           next false
         rescue Samagotchi::SessionManager::RestartRefused => e
           @stdout.flush
-          @stderr.puts e.reason == :not_running || e.reason == :unsupported ? e.message : "session #{id}: #{e.message}"
+          @stderr.puts %i[not_running unsupported].include?(e.reason) ? e.message : "session #{id}: #{e.message}"
           next false
         rescue ArgumentError => e
           @stdout.flush

data/lib/samagotchi/system_prompt.rb

@@ -79,9 +79,10 @@ module Samagotchi
       @built = nil
     end
 
-    # The base prompt (specs, plugins' declarations).
+    # The base prompt (specs, plugins' declarations), with Gemma's tool
+    # declarations at its end as #build has them.
     def base(chat: false, thinking: nil)
-      assist_system_prompt(chat: chat, thinking: thinking)
+      with_tail_declarations(assist_system_prompt(chat: chat, thinking: thinking), chat: chat)
     end
 
     # Names activated via preloaded --memory entries during prompt
@@ -141,15 +142,18 @@ module Samagotchi
     def assist_system_prompt(chat: false, thinking: nil)
       return chat_system_prompt if chat
 
-      declarations = tool_declarations
       hint = tool_call_hint
       turn_preamble = turn_preamble_instruction(thinking)
+      # Gemma 4's template declares the tools at the end of the system turn
+      # (#system_prompt_with_index puts them there).
+      tools = if gemma_tail_declarations?
+                "Your tools are declared at the end of this system prompt."
+              else
+                "You have access to the following tools:\n\n#{tool_declarations}\n"
+              end
 
       <<~SYS
-        You are Chi (pronounced "chee"), the friendly name for the Samagotchi assistant harness. You have access to the following tools:
-
-        #{declarations}
-
+        You are Chi (pronounced "chee"), the friendly name for the Samagotchi assistant harness. #{tools}
         #{hint}
         You may make multiple tool calls. After seeing tool results, continue reasoning or answer the user.
         #{turn_preamble}
@@ -234,9 +238,16 @@ module Samagotchi
         "Project memories:\n#{project_index}",
         "System memories:\n#{system_index}"
       ].join("\n\n")
-      [thinking_token + base, rg_guidance, project_description, project_location, current_model, current_session, memory_sections, system_identity_section, explicit_memory_section].compact.join("\n")
+      prompt = [thinking_token + base, rg_guidance, project_description, project_location, current_model, current_session, memory_sections, system_identity_section, explicit_memory_section].compact.join("\n")
+      with_tail_declarations(prompt, chat: chat)
     end
 
+    def with_tail_declarations(prompt, chat:)
+      chat || !gemma_tail_declarations? ? prompt : prompt.rstrip + tool_declarations
+    end
+
+    def gemma_tail_declarations? = profile.name == "gemma4"
+
     # B-light: auto-preload the built-in identity memory.
     # The file is installed by SystemBundle.ensure! as a normal system memory,
     # but its body is injected here so the agent has it without an extra tool call.

data/lib/samagotchi/terminal_ui/attach_launcher.rb

@@ -46,10 +46,10 @@ module Samagotchi
         first_command = model && (attach || resume) ? "/model #{model}" : nil
         surface = open_surface
         attached = AttachedLoop.new(client: client, screen: surface, client_id: "tui:#{Process.pid}", first_prompt: prompt,
-                                first_command: first_command, no_interrupt: no_interrupt,
-                                default_input: default_input && !prompt && !attach && !resume,
-                                wait_at_eof: !$stdin.tty?,
-                                parent_answers: Guardrails::ParentApprovals.parent_process?)
+                                    first_command: first_command, no_interrupt: no_interrupt,
+                                    default_input: default_input && !prompt && !attach && !resume,
+                                    wait_at_eof: !$stdin.tty?,
+                                    parent_answers: Guardrails::ParentApprovals.parent_process?)
         ended = begin
           attached.run
         ensure
@@ -144,7 +144,7 @@ module Samagotchi
         return if flags.empty?
 
         verb = flags.size == 1 ? "applies" : "apply"
-        err.puts "(#{flags.join(' and ')} #{verb} to a new session; #{session_id}'s prompt is already built)"
+        err.puts "(#{flags.join(" and ")} #{verb} to a new session; #{session_id}'s prompt is already built)"
       end
 
       # @return [BridgeClient, nil] the running worker's, or nil when none runs

data/lib/samagotchi/terminal_ui/attached_loop.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require_relative "event_renderer"
 require_relative "formatting"
 require_relative "../prompt_history"
@@ -1174,7 +1173,8 @@ module Samagotchi
         Bridge::TurnAccumulator.replay_events(turn).each do |event|
           case event[:type]
           # A new step starts its line over, as live (a join during a hold).
-          when :generation_started then tail, lane = nil, :writing
+          when :generation_started then tail = nil
+                                        lane = :writing
           when :generation_chunk
             tail, lane = event[:thinking].to_s.empty? ? [event[:text], :writing] : [event[:thinking], :thinking]
           when :tool_call_started

data/lib/samagotchi/terminal_ui/event_renderer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require_relative "formatting"
 
 module Samagotchi
@@ -188,7 +187,7 @@ module Samagotchi
         Array(event[:steers]).each { |steer| @view.print_line(@view.format_steer_line(source: steer[:source], text: steer[:text])) }
       end
 
-private
+      private
 
       def render_streamed_tool_activity(activity, duration_ms:, images: nil, diff: nil)
         return if activity.nil?

data/lib/samagotchi/terminal_ui/formatting.rb

@@ -15,7 +15,7 @@ module Samagotchi
         params_suffix = params.empty? ? "" : " #{paint(params, 90)}"
         status = activity[:status].to_s
         elapsed_suffix = duration_ms.nil? ? "" : " (#{format_elapsed_duration(duration_ms)})"
-        "#{paint('tool>', 36)} #{activity[:action]} (#{activity[:tool]}#{params_suffix}): #{paint(status, status_color(status))}#{elapsed_suffix}"
+        "#{paint("tool>", 36)} #{activity[:action]} (#{activity[:tool]}#{params_suffix}): #{paint(status, status_color(status))}#{elapsed_suffix}"
       end
 
       # Green ok, yellow stopped (a wait the user's Stop ended), red the rest.
@@ -75,7 +75,7 @@ module Samagotchi
         return "" unless diff.is_a?(Hash)
 
         get = ->(key) { diff[key] || diff[key.to_s] }
-        " #{paint("+#{get.(:added).to_i}", 32)} #{paint("\u2212#{get.(:removed).to_i}", 31)}"
+        " #{paint("+#{get.call(:added).to_i}", 32)} #{paint("\u2212#{get.call(:removed).to_i}", 31)}"
       end
 
       # Prompt labels by the sender's client_id prefix (turn_events.js
@@ -113,7 +113,7 @@ module Samagotchi
         params = part[:params].to_s.strip
         params_suffix = params.empty? ? "" : " #{paint(params, 90)}"
         status = part[:status].to_s
-        "#{paint('tool>', 36)} #{part[:tool]}#{params_suffix}: #{paint(status, status_color(status))}" \
+        "#{paint("tool>", 36)} #{part[:tool]}#{params_suffix}: #{paint(status, status_color(status))}" \
           "#{format_tool_image_suffix(part[:images])}#{format_tool_diff_suffix(part[:diff])}"
       end
 
@@ -233,8 +233,8 @@ module Samagotchi
         value = tps.to_f
         return "" unless value.positive?
 
-        number = value >= 1000 ? "#{format('%.1f', (value / 100).round / 10.0)}k" : value.round.to_s
-        "#{'~' if source.to_s == 'estimate'}#{number} tok/s"
+        number = value >= 1000 ? "#{format("%.1f", (value / 100).round / 10.0)}k" : value.round.to_s
+        "#{"~" if source.to_s == "estimate"}#{number} tok/s"
       end
 
       # "$0.42"; a cost under a cent keeps four decimals ("$0.0012"); "" for
@@ -297,7 +297,7 @@ module Samagotchi
       def status_rows(segments, width)
         return [] if segments.empty? || width <= 0
 
-        row = cap_preview_text("status> #{segments.join(' | ')}", width)
+        row = cap_preview_text("status> #{segments.join(" | ")}", width)
         [color_output? ? paint(row, 90) : row]
       end
 
@@ -336,7 +336,7 @@ module Samagotchi
 
         visible = names.first(limit)
         suffix = names.length > visible.length ? ", +#{names.length - visible.length}" : ""
-        "#{label}: #{visible.join(', ')}#{suffix}"
+        "#{label}: #{visible.join(", ")}#{suffix}"
       end
 
       def cap_preview_text(text, width)
@@ -411,8 +411,8 @@ module Samagotchi
         return nil unless last
 
         source = tokens[:tps_source].to_s
-        text = +"#{speed_text(last, source)} out"
-        text << ", #{speed_text(tokens[:last_prefill_tps], 'server')} prompt" if tokens[:last_prefill_tps]
+        text = "#{speed_text(last, source)} out"
+        text << ", #{speed_text(tokens[:last_prefill_tps], "server")} prompt" if tokens[:last_prefill_tps]
         text << " (last, #{source})"
         text << ", avg #{speed_text(tokens[:avg_decode_tps], source)}" if tokens[:avg_decode_tps]
         text
@@ -428,7 +428,7 @@ module Samagotchi
         return "#{seconds.round}s" if seconds < 60
 
         total_seconds = seconds.round
-        "#{total_seconds / 60}m #{format('%02d', total_seconds % 60)}s"
+        "#{total_seconds / 60}m #{format("%02d", total_seconds % 60)}s"
       end
 
       def paint(text, code)

data/lib/samagotchi/terminal_ui/input_support.rb

@@ -98,8 +98,8 @@ module Samagotchi
 
         begin
           buf = Reline.line_buffer.to_s
-          unless buf.empty?
-            return [] unless buf.lstrip.start_with?("/")
+          if !buf.empty? && !buf.lstrip.start_with?("/")
+            return []
           end
         rescue StandardError
           nil

data/lib/samagotchi/terminal_ui/line_reader.rb

@@ -39,7 +39,7 @@ module Samagotchi
       end
 
       def alive? = @thread&.alive? || false
-      
+
       # Drop the open read and start it again with the current prompt.
       # @param keep_text [Boolean] with what is typed there now
       # @param prefill [String, nil] with this text instead
@@ -48,7 +48,7 @@ module Samagotchi
         @prefill = text unless text.to_s.empty?
         @thread&.raise(Reprompt)
       end
-      
+
       # Type +text+ into the next read (from the sink, between two reads).
       def prefill_next(text)
         @prefill = text
@@ -57,7 +57,7 @@ module Samagotchi
       # @return [String, nil] what the open read holds
       def typed_text
         return nil unless $stdin.tty?
-      
+
         Reline.line_buffer.to_s
       rescue StandardError
         nil

data/lib/samagotchi/terminal_ui/question_prompt.rb

@@ -33,29 +33,29 @@ module Samagotchi
       # @param pending [Hash] Engine#pending_question (symbol or string keys)
       def initialize(pending)
         field = ->(key) { pending[key] || pending[key.to_s] }
-        approval = field.(:approval)
+        approval = field.call(:approval)
         @preview = approval.is_a?(Hash) ? (approval[:preview] || approval["preview"]) : nil
-        @id = field.(:id).to_s
-        @question = field.(:question).to_s
+        @id = field.call(:id).to_s
+        @question = field.call(:question).to_s
         # A delegate's approval relayed here: the delegate's own text is the
         # question, who asks a dim line (#note).
-        relay = field.(:relay)
+        relay = field.call(:relay)
         if relay.is_a?(Hash)
           get = ->(key) { relay[key] || relay[key.to_s] }
-          chain = Array(get.(:chain)).map(&:to_s)
-          chain = [get.(:child_id).to_s[0, 8]] if chain.empty?
+          chain = Array(get.call(:chain)).map(&:to_s)
+          chain = [get.call(:child_id).to_s[0, 8]] if chain.empty?
           @delegate = chain.reverse.join(" → ")
-          @delegate_task = get.(:task).to_s
-          @question = get.(:asked).to_s unless get.(:asked).to_s.strip.empty?
+          @delegate_task = get.call(:task).to_s
+          @question = get.call(:asked).to_s unless get.call(:asked).to_s.strip.empty?
         end
-        self.relayed_to = field.(:relayed_to)
-        @options = Array(field.(:options)).map { |v| v.to_s.strip }.reject(&:empty?)
-        header = field.(:header).to_s.strip
+        self.relayed_to = field.call(:relayed_to)
+        @options = Array(field.call(:options)).map { |v| v.to_s.strip }.reject(&:empty?)
+        header = field.call(:header).to_s.strip
         @header = header.empty? ? nil : header
-        @multi = !!field.(:multi_select)
-        @free = !!field.(:allow_freeform)
-        @approval = field.(:kind).to_s == "approval"
-        @continue = field.(:kind).to_s == "continue"
+        @multi = !!field.call(:multi_select)
+        @free = !!field.call(:allow_freeform)
+        @approval = field.call(:kind).to_s == "approval"
+        @continue = field.call(:kind).to_s == "continue"
       end
 
       def multi? = @multi
@@ -121,19 +121,19 @@ module Samagotchi
         return [] unless preview.is_a?(Hash)
 
         get = ->(key) { preview[key] || preview[key.to_s] }
-        return [paint.("this edit would fail: #{get.(:error)}", 33)] if get.(:error)
-        return [paint.("diff not shown: #{get.(:skipped)}", 2)] if get.(:skipped)
+        return [paint.call("this edit would fail: #{get.call(:error)}", 33)] if get.call(:error)
+        return [paint.call("diff not shown: #{get.call(:skipped)}", 2)] if get.call(:skipped)
 
-        lines = get.(:text).to_s.split("\n")
+        lines = get.call(:text).to_s.split("\n")
         return [] if lines.empty?
 
         # TextDiff's own cut note ("… N more lines") counts toward the rest.
         cut = lines.last.to_s[/\A… (\d+) more lines\z/, 1]
         lines.pop if cut
         hidden = [lines.size - PREVIEW_LINES, 0].max + cut.to_i
-        shown = lines.first(PREVIEW_LINES).map { |line| paint.(line, diff_code(line)) }
-        shown.unshift(paint.("new file", 2)) if get.(:new_file)
-        shown << paint.("… #{hidden} more lines (full diff on the web)", 2) if hidden.positive?
+        shown = lines.first(PREVIEW_LINES).map { |line| paint.call(line, diff_code(line)) }
+        shown.unshift(paint.call("new file", 2)) if get.call(:new_file)
+        shown << paint.call("… #{hidden} more lines (full diff on the web)", 2) if hidden.positive?
         shown
       end
 
@@ -142,7 +142,7 @@ module Samagotchi
       # @param outcome [String] the answer (#answer_text) or what closed it
       def summary(outcome, paint: ->(text, _code) { text })
         who = @delegate ? "#{@delegate}: " : ""
-        "#{paint.("#{mark}#{who}#{question.lines.first.to_s.chomp}", approval? ? 33 : 94)} → #{outcome}"
+        "#{paint.call("#{mark}#{who}#{question.lines.first.to_s.chomp}", approval? ? 33 : 94)} → #{outcome}"
       end
 
       # @param answer [Answer] an accepted one
@@ -166,7 +166,7 @@ module Samagotchi
         raw = raw.to_s.strip
         # "1,3; my text": the first ';' separates the selection from freeform text.
         sel_part, free_part = raw.include?(";") ? raw.split(";", 2).map(&:strip) : [raw, nil]
-        free_part = nil if free_part&.empty?
+        free_part = nil if free_part && free_part.empty?
         # Models forget to flag freeform: accept it anyway, with a note.
         note = free_part && !free? ? "(note: freeform not flagged but accepting '#{free_part}')" : nil
 

data/lib/samagotchi/terminal_ui/question_slot.rb

@@ -31,7 +31,7 @@ module Samagotchi
 
       # The line a continue offer leaves in the scrollback.
       def self.continue_summary(outcome, paint: ->(text, _code) { text })
-        "#{paint.("? #{CONTINUE_QUESTION}", 33)} → #{outcome}"
+        "#{paint.call("? #{CONTINUE_QUESTION}", 33)} → #{outcome}"
       end
 
       # @param question [String] the first row's text, wrapped when there is room
@@ -77,14 +77,14 @@ module Samagotchi
 
       def layout(width, hint:, details:, header:, folded:)
         rows = []
-        rows << @paint.(@header, 1) if header && @header
-        rows << @paint.(@note, 2) if header && @note
+        rows << @paint.call(@header, 1) if header && @header
+        rows << @paint.call(@note, 2) if header && @note
         question_rows = wrap(@question, width, first: @mark, indent: " " * @mark.size)
         question_rows = question_rows.first(1) unless details
-        rows.concat(question_rows.map { |row| @paint.(row, @question_code) })
-        rows.concat(@details.map { |row| @paint.(row, @question_code) }) if details
-        rows.concat(folded ? folded_options(width) : @options.map { |o| @paint.("  #{o.text}", 92) })
-        rows << @paint.("  [#{@hint}]", 90) if hint && @hint
+        rows.concat(question_rows.map { |row| @paint.call(row, @question_code) })
+        rows.concat(@details.map { |row| @paint.call(row, @question_code) }) if details
+        rows.concat(folded ? folded_options(width) : @options.map { |o| @paint.call("  #{o.text}", 92) })
+        rows << @paint.call("  [#{@hint}]", 90) if hint && @hint
         rows
       end
 
@@ -97,13 +97,13 @@ module Samagotchi
           candidate = line.empty? ? "  #{item}" : "#{line} · #{item}"
           if !line.empty? && display_width(candidate) > width
             rows << line
-            line = +"  #{item}"
+            line = "  #{item}"
           else
             line = +candidate
           end
         end
         rows << line unless line.empty?
-        rows.map { |row| @paint.(row, 92) }
+        rows.map { |row| @paint.call(row, 92) }
       end
 
       # Word wrap at +width+ columns, the first row after +first+, the others
@@ -122,7 +122,7 @@ module Samagotchi
           while display_width(line.rstrip) > width
             head, = Reline::Unicode.take_mbchar_range(line, 0, width, padding: false)
             rows << head
-            line = +"#{indent}#{line[head.size..]}"
+            line = "#{indent}#{line[head.size..]}"
           end
         end
         rows << line.rstrip unless line.strip.empty? && !rows.empty?

data/lib/samagotchi/terminal_ui/reline_seam.rb

@@ -216,7 +216,7 @@ module Samagotchi
       # The prompt and the text as render_finished writes them: one line per
       # input line, with a trailing space when a line fills the width exactly.
       def seam_final_lines
-        @buffer_of_lines.size.times.map do |i|
+        Array.new(@buffer_of_lines.size) do |i|
           line = Reline::Unicode.strip_non_printing_start_end(prompt_list[i]) + modified_lines[i]
           split_line_by_width(line, screen_width).last.empty? ? "#{line} " : line
         end

data/lib/samagotchi/terminal_ui/repl_input.rb

@@ -43,6 +43,7 @@ module Samagotchi
       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
@@ -130,8 +131,8 @@ module Samagotchi
         end
       end
 
-      def with_surface_lock(&block)
-        @surface.respond_to?(:synchronize) ? @surface.synchronize(&block) : yield
+      def with_surface_lock(&)
+        @surface.respond_to?(:synchronize) ? @surface.synchronize(&) : yield
       end
     end
   end