samagotchi 0.22.0 → 0.23.0

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

data/lib/samagotchi/terminal_ui.rb

@@ -90,7 +90,7 @@ module Samagotchi
       # As typed: the Engine applies an alias where it resolves the model.
       flag_model_name = model_name.to_s.strip.empty? ? nil : ModelProfile.required_model_name(model_name)
       @effective_model_name = flag_model_name || @default_model_name
-      @host_registry  = host_registry || Samagotchi::HostRegistry.new
+      @host_registry = host_registry || Samagotchi::HostRegistry.new
       # An injected client (specs) stands in for every host's client.
       @host_registry.client_override = client if client
       @client = @host_registry.resolve(@effective_model_name).client
@@ -101,6 +101,7 @@ module Samagotchi
       if session_id && !Session.exist?(session_id)
         raise SessionNotFound, "Session not found: #{session_id}"
       end
+
       claim_session!(session_id) if session_id
       @resume_session = session_id ? Session.load(session_id) : nil
       if @resume_session
@@ -146,7 +147,7 @@ module Samagotchi
       @between_turns = BetweenTurns.new(surface: @surface, view: @view, renderer: @renderer,
                                         turn_running: -> { @engine.turn_running? }, quiet: @non_interactive)
       @render_event = ->(event) { handle_stream_event(event) }
-      @engine         = Engine.new(
+      @engine = Engine.new(
         client: client,
         host_registry: @host_registry,
         profile: profile,
@@ -504,6 +505,7 @@ module Samagotchi
           end
         end
         break if input.nil?
+
         local = local_command(input)
         if local == :exit
           @delete_on_exit ||= SessionCommands.delete_on_exit?(input)
@@ -705,6 +707,7 @@ module Samagotchi
         return
       end
       return if show_local_command(input)
+
       # A typo of a command (/modle) is not a prompt: say so, send nothing.
       hint = command_registry.unknown_command_hint(input)
       return @surface.commit(hint) if hint
@@ -849,6 +852,7 @@ module Samagotchi
     # #cancel_turn_from_prompt.
     def poll_input_with_reminder_check(awaiting_continue:)
       return :due unless @engine.due_reminder_names.empty?
+
       # Specs and pipes: a plain blocking read.
       unless @repl_input
         @between_turns.flush_cards
@@ -972,10 +976,10 @@ module Samagotchi
     # While a turn runs, a line submitted at the open prompt steers it: it
     # merges at the next iteration boundary (Kernel), and one that comes after
     # the last runs as the next turn. Reminder turns too.
-    def with_steering(&block)
+    def with_steering(&)
       return yield unless @repl_input
 
-      @repl_input.during_turn(method(:steer_line), leftovers: -> { @pending_input_queue.drain }, &block)
+      @repl_input.during_turn(method(:steer_line), leftovers: -> { @pending_input_queue.drain }, &)
     end
 
     # On the reader thread, from ReplInput: takes a line for the running turn.
@@ -994,6 +998,7 @@ module Samagotchi
       # 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?
+
       # A typo of a command (/modle) is not steering text: say so, take it.
       if (hint = command_registry.unknown_command_hint(line))
         @surface.commit(hint)
@@ -1092,7 +1097,6 @@ module Samagotchi
       ConfigFile.recap_config
     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
     # single seam the Engine-owned idle recap detector reads, so the idle clock

data/lib/samagotchi/text_diff.rb

@@ -46,8 +46,8 @@ module Samagotchi
       a_mid = a[pre...(a.size - suf)]
       b_mid = b[pre...(b.size - suf)]
       middle = myers(a_mid, b_mid) ||
-               a_mid.each_index.map { |i| [:del, i, nil] } + b_mid.each_index.map { |j| [:add, nil, j] }
-      middle.each { |t, i, j| ops << [t, i && i + pre, j && j + pre] }
+               (a_mid.each_index.map { |i| [:del, i, nil] } + b_mid.each_index.map { |j| [:add, nil, j] })
+      middle.each { |t, i, j| ops << [t, i && (i + pre), j && (j + pre)] }
       (0...suf).each { |s| ops << [:eq, a.size - suf + s, b.size - suf + s] }
       ops
     end
@@ -64,13 +64,13 @@ module Samagotchi
       n = a.size
       m = b.size
       off = n + m + 1
-      v = Array.new(2 * off + 1, 0)
+      v = Array.new((2 * off) + 1, 0)
       trace = []
       (0..(n + m)).each do |d|
         return nil if d > max_d
 
         # Round d reads k-1 and k+1 for k in -d..d: keep -(d+1)..d+1.
-        trace << v[off - d - 1, 2 * d + 3]
+        trace << v[off - d - 1, (2 * d) + 3]
         k = -d
         while k <= d
           x = if k == -d || (k != d && v[off + k - 1] < v[off + k + 1])
@@ -98,8 +98,8 @@ module Samagotchi
         vd = trace[d]
         at = ->(k) { vd[k + d + 1] }
         k = x - y
-        prev_k = k == -d || (k != d && at.(k - 1) < at.(k + 1)) ? k + 1 : k - 1
-        prev_x = at.(prev_k)
+        prev_k = k == -d || (k != d && at.call(k - 1) < at.call(k + 1)) ? k + 1 : k - 1
+        prev_x = at.call(prev_k)
         prev_y = prev_x - prev_k
         while x > prev_x && y > prev_y
           x -= 1
@@ -108,11 +108,11 @@ module Samagotchi
         end
         break if d.zero?
 
-        if x == prev_x
-          ops << [:add, nil, prev_y]
-        else
-          ops << [:del, prev_x, nil]
-        end
+        ops << if x == prev_x
+                 [:add, nil, prev_y]
+               else
+                 [:del, prev_x, nil]
+               end
         x = prev_x
         y = prev_y
       end
@@ -144,7 +144,7 @@ module Samagotchi
           line = t == :add ? b[j] : a[i]
           mark = { eq: " ", del: "-", add: "+" }[t]
           # Only the "\n": chomp("\n") would take a CRLF's "\r" too.
-          lines << mark + (line.end_with?("\n") ? line[0...-1] : line)
+          lines << (mark + (line.end_with?("\n") ? line[0...-1] : line))
           lines << NO_NEWLINE unless line.end_with?("\n")
         end
       end

data/lib/samagotchi/thinking.rb

@@ -23,6 +23,10 @@ module Samagotchi
     # An empty thought after the Qwen assistant cue: the model answers at once
     # (what the server's own template does with enable_thinking false).
     QWEN_EMPTY_THOUGHT = "<think>\n\n</think>\n\n"
+    # Gemma 4's empty thought channel after the model cue, as its chat
+    # template writes it with enable_thinking false (only where a model turn
+    # starts: Prompt.prefill_for).
+    GEMMA_EMPTY_THOUGHT = "<|channel>thought\n<channel|>"
 
     # What a native prompt gets for a level: the text before the system
     # prompt, the text after the assistant cue, and whether the level means
@@ -43,7 +47,7 @@ module Samagotchi
       return text.to_sym if LEVELS.include?(text.to_sym)
 
       hint = value == true || %w[true on].include?(text) ? "; `on` isn't one, `default` leaves it to the model" : ""
-      ConfigFile.warn_once "Warning: #{where}: thinking must be one of #{LEVELS.join(', ')}#{hint}; ignored"
+      ConfigFile.warn_once "Warning: #{where}: thinking must be one of #{LEVELS.join(", ")}#{hint}; ignored"
       nil
     end
 
@@ -116,7 +120,7 @@ module Samagotchi
       off = level == :off
       honoured = !EFFORTS.include?(level)
       case profile&.name
-      when "gemma4" then Native.new(system_token: off ? "" : GEMMA_THINK_TOKEN, prefill: "", honoured: honoured)
+      when "gemma4" then Native.new(system_token: off ? "" : GEMMA_THINK_TOKEN, prefill: off ? GEMMA_EMPTY_THOUGHT : "", honoured: honoured)
       when "qwen36" then Native.new(system_token: "", prefill: off ? QWEN_EMPTY_THOUGHT : "", honoured: honoured)
       else Native.new(system_token: "", prefill: "", honoured: level == DEFAULT)
       end

data/lib/samagotchi/thought_stream_splitter.rb

@@ -74,7 +74,7 @@ module Samagotchi
           end
           body = @carry[0...close_pos]
           route_body(body, thinking)
-          @carry = @carry[close_pos + @active[:close].length..].to_s
+          @carry = @carry[(close_pos + @active[:close].length)..].to_s
           @active = nil
           @state = :normal
         end
@@ -108,6 +108,7 @@ module Samagotchi
       @blocks.each do |block|
         pos = @carry.index(block[:open])
         next if pos.nil?
+
         best = { pos: pos, block: block } if best.nil? || pos < best[:pos]
       end
       best
@@ -118,7 +119,7 @@ module Samagotchi
     def flush_normal(text)
       partial = @blocks.map { |block| longest_suffix_prefix_of(@carry, block[:open]) }.max.to_i
       text << @carry[0...(@carry.length - partial)]
-      @carry = @carry[@carry.length - partial..].to_s
+      @carry = @carry[(@carry.length - partial)..].to_s
     end
 
     # In-block state: emit the body seen so far to the active lane, retaining a
@@ -127,12 +128,13 @@ module Samagotchi
       close = @active[:close]
       partial = longest_suffix_prefix_of(@carry, close)
       route_body(@carry[0...(@carry.length - partial)], thinking)
-      @carry = @carry[@carry.length - partial..].to_s
+      @carry = @carry[(@carry.length - partial)..].to_s
     end
 
     # Route a body fragment to the active block's lane (:thinking or :drop).
     def route_body(body, thinking)
       return if body.nil? || body.empty?
+
       thinking << body if @active && @active[:lane] == :thinking
     end
 
@@ -141,6 +143,7 @@ module Samagotchi
     def longest_suffix_prefix_of(str, marker)
       mlen = marker.length
       return 0 if mlen.zero? || str.empty?
+
       [str.length, mlen].min.downto(1) do |n|
         return n if str[-n..] == marker[0, n]
       end

data/lib/samagotchi/tool_activity.rb

@@ -229,6 +229,7 @@ module Samagotchi
     def registry_params(entry, call)
       return nil if entry&.core?
       return nil if entry.nil? && !call[:args].is_a?(Hash)
+
       if entry&.preview
         begin
           return entry.preview.call(call)

data/lib/samagotchi/tool_call_parser.rb

@@ -25,7 +25,7 @@ module Samagotchi
       result = text.to_s
       while (open_pos = result.index(open))
         close_pos = result.index(close, open_pos + open.length)
-        result = result[0...open_pos] + (close_pos ? result[close_pos + close.length..] : "")
+        result = result[0...open_pos] + (close_pos ? result[(close_pos + close.length)..] : "")
       end
       result.strip
     end
@@ -37,7 +37,7 @@ module Samagotchi
     class Gemma
       # Digits after the first character: plugin tools may have them
       # (Plugin::Api::TOOL_NAME).
-      TOOL_CALL_BODY_RE   = /\Acall:([a-z_][a-z0-9_]{0,49})\{/
+      TOOL_CALL_BODY_RE = /\Acall:([a-z_][a-z0-9_]{0,49})\{/
       THOUGHT_CHANNEL_OPEN  = ModelProfile::GEMMA_THOUGHT_CHANNEL_OPEN
       THOUGHT_CHANNEL_CLOSE = ModelProfile::GEMMA_THOUGHT_CHANNEL_CLOSE
       CONTROL_TOKEN_START = "<|"
@@ -102,7 +102,7 @@ module Samagotchi
         while (open_pos = result.index(THOUGHT_CHANNEL_OPEN))
           close_pos = result.index(THOUGHT_CHANNEL_CLOSE, open_pos)
           result = if close_pos
-                     result[0...open_pos] + result[close_pos + THOUGHT_CHANNEL_CLOSE.length..]
+                     result[0...open_pos] + result[(close_pos + THOUGHT_CHANNEL_CLOSE.length)..]
                    else
                      result[0...open_pos]
                    end
@@ -128,11 +128,10 @@ module Samagotchi
         pos = start
         while (p = text.index(CONTROL_TOKEN_START, pos))
           # Skip over a <|"|> token entirely
-          if text[p, @string_delim.length] == @string_delim
-            pos = p + @string_delim.length
-          else
-            return p
-          end
+          return p unless text[p, @string_delim.length] == @string_delim
+
+          pos = p + @string_delim.length
+
         end
         nil
       end
@@ -213,7 +212,7 @@ module Samagotchi
             e = params_raw.index(@string_delim, s + @string_delim.length)
             break unless e
 
-            arr << params_raw[s + @string_delim.length...e]
+            arr << params_raw[(s + @string_delim.length)...e]
             pos = e + @string_delim.length
           end
           unless arr.empty?
@@ -334,13 +333,13 @@ module Samagotchi
 
       def strip_thought(text)
         # Remove all complete <think>...</think> blocks with the newlines after them
-        result = text.gsub(/<think>.*?<\/think>\n*/m, '')
+        result = text.gsub(%r{<think>.*?</think>\n*}m, "")
         # Remove any stray opening tags
-        result = result.gsub(/<think>.*?(?=\n|$)/m, '')
+        result = result.gsub(/<think>.*?(?=\n|$)/m, "")
         # Remove any orphaned closing tags (and the whitespace around them)
         # The answer's own blank lines stay: they are its markdown paragraphs
         # and lists (a chat host's answer is saved as stripped here).
-        result.gsub(/^\s*<\/think>\s*/m, '')
+        result.gsub(%r{^\s*</think>\s*}m, "")
       end
 
       def strip_tool_calls(text)
@@ -365,11 +364,11 @@ module Samagotchi
       def qwen_params(body)
         params = {}
 
-        body.scan(/<parameter=(\w+)>(.*?)<\/parameter>/m) do |key, value|
+        body.scan(%r{<parameter=(\w+)>(.*?)</parameter>}m) do |key, value|
           params[key.to_s.downcase] = trim_tag_newline(value)
         end
 
-        body.scan(/<arg_key>(.*?)<\/arg_key>\s*<arg_value>(.*?)<\/arg_value>/m) do |key, value|
+        body.scan(%r{<arg_key>(.*?)</arg_key>\s*<arg_value>(.*?)</arg_value>}m) do |key, value|
           params[key.to_s.downcase.strip] = trim_tag_newline(value)
         end