samagotchi 0.21.0 → 0.23.0

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
 

data/lib/samagotchi/tool_declarations.rb

@@ -71,7 +71,7 @@ module Samagotchi
               description: "Content to write to the file"
             }
           },
-          required: ["path", "content"]
+          required: %w[path content]
         }
       },
       {
@@ -101,7 +101,7 @@ module Samagotchi
               description: "Optional end line (1-based, inclusive) for range mode. Must be provided with start_line."
             }
           },
-          required: ["path", "new_text"]
+          required: %w[path new_text]
         }
       },
       {
@@ -148,7 +148,7 @@ module Samagotchi
               description: "Set true to save this entry as a model-specific overlay for the current model only (<name>.<model>.md); it is auto-appended when the entry is read under that model and never listed in the index."
             }
           },
-          required: ["name", "content", "scope"]
+          required: %w[name content scope]
         }
       },
       {
@@ -268,7 +268,7 @@ module Samagotchi
               description: "How often to remind (1-1440 minutes, i.e. up to 1 day)"
             }
           },
-          required: ["name", "description", "interval_minutes"]
+          required: %w[name description interval_minutes]
         }
       },
       {
@@ -321,7 +321,7 @@ module Samagotchi
               description: "The note: what the other session should know (up to 16 KiB)"
             }
           },
-          required: ["session", "text"]
+          required: %w[session text]
         }
       },
       {
@@ -399,30 +399,15 @@ module Samagotchi
               description: "Allow freeform/Other text alongside selection. Default false."
             }
           },
-          required: ["question", "options"]
+          required: %w[question options]
         }
       }
     ].freeze
 
-    # Where Gemma's declaration text says something the schema doesn't: extra
-    # description text, and explicit required:false on optional parameters.
+    # Where Gemma's declaration text says something the schema doesn't:
+    # extra description text.
     GEMMA_PARAM_OVERRIDES = {
       "edit" => { new_text: { description: "Replacement text (required)" } },
-      "task_wait" => {
-        timeout: { required: false },
-        tail_lines: { required: false },
-        done_pattern: { required: false }
-      },
-      "delegate" => {
-        model: { required: false },
-        session: { required: false },
-        wait: { required: false },
-        timeout: { required: false }
-      },
-      "delegate_result" => {
-        session: { required: false },
-        timeout: { required: false }
-      },
       "ask_user_question" => {
         options: { description: "2-8 answer options as strings (labels). Single/multi selection via multi_select flag." }
       }
@@ -440,26 +425,42 @@ module Samagotchi
 
     module_function
 
-    # Gemma 4 <|tool>declaration:NAME{…}<tool|> blocks for every tool, one per line group.
+    # Gemma 4 <|tool>declaration:NAME{…}<tool|> blocks for every tool, back
+    # to back, as Gemma 4's chat template declares tools.
     # @param schemas [Array<Hash>] a Tools::Registry's schemas
     def gemma_declarations(schemas = TOOL_SCHEMAS)
-      schemas.map { |schema| gemma_declaration(schema) }.join("\n")
+      schemas.map { |schema| gemma_declaration(schema) }.join
     end
 
+    # One declaration in the template's shape: properties sorted by name,
+    # types upper-cased, the required names as a list.
     def gemma_declaration(schema)
       q = GEMMA_QUOTE
-      required = Array(schema[:parameters][:required])
+      parameters = schema[:parameters] || {}
       overrides = GEMMA_PARAM_OVERRIDES.fetch(schema[:name], {})
-      lines = schema[:parameters][:properties].map do |name, param|
-        override = overrides.fetch(name, {})
-        description = override.fetch(:description, param[:description])
-        line = "    #{name}:{type:#{q}#{param[:type]}#{q}, description:#{q}#{description}#{q}"
-        req = override.fetch(:required, required.include?(name.to_s) ? true : nil)
-        line += ", required:#{req}" unless req.nil?
-        "#{line}}"
+      properties = (parameters[:properties] || {}).to_h do |name, param|
+        [name.to_s, param.merge(overrides.fetch(name.to_sym, {}))]
       end
-      params = lines.empty? ? "  parameters:{}" : "  parameters:{\n#{lines.join(",\n")}\n  }"
-      "<|tool>declaration:#{schema[:name]}{\n  description:#{q}#{schema[:description]}#{q},\n#{params}\n}<tool|>"
+      required = Array(parameters[:required]).map(&:to_s)
+      fields = []
+      fields << "properties:{#{gemma_properties(properties)}}" unless properties.empty?
+      fields << "required:[#{required.map { |name| "#{q}#{name}#{q}" }.join(",")}]" unless required.empty?
+      fields << "type:#{q}#{(parameters[:type] || "object").to_s.upcase}#{q}"
+      "<|tool>declaration:#{schema[:name]}{description:#{q}#{schema[:description]}#{q},parameters:{#{fields.join(",")}}}<tool|>"
+    end
+
+    def gemma_properties(properties)
+      q = GEMMA_QUOTE
+      properties.sort.map do |name, param|
+        fields = []
+        fields << "description:#{q}#{param[:description]}#{q}" unless param[:description].to_s.empty?
+        items = param[:items]
+        if param[:type].to_s.casecmp?("array") && items.is_a?(Hash) && !items.empty?
+          fields << "items:{#{items.sort_by { |key, _| key.to_s }.map { |key, value| "#{key}:#{q}#{value.to_s.upcase}#{q}" if key.to_s == "type" }.compact.join(",")}}"
+        end
+        fields << "type:#{q}#{param[:type].to_s.upcase}#{q}"
+        "#{name}:{#{fields.join(",")}}"
+      end.join(",")
     end
 
     # The schemas for the chat path's tools: array: +schemas+ with

data/lib/samagotchi/tools/ask_user_question.rb

@@ -56,7 +56,7 @@ module Samagotchi
 
       # Booleans the way models send them (Gemma passes "true"/"false").
       def self.to_bool(value)
-        return value if value == true || value == false
+        return value if [true, false].include?(value)
 
         %w[1 true yes on].include?(value.to_s.strip.downcase)
       end
@@ -90,6 +90,7 @@ module Samagotchi
           begin
             parsed = JSON.parse(s)
             return parsed.dup if parsed.is_a?(Array)
+
             # If parsed is a String like "a, b", fall through to split
             if parsed.is_a?(String)
               s = parsed
@@ -124,8 +125,6 @@ module Samagotchi
           parts = t.split(/[,;\n]+/).map(&:strip)
           # Strip surrounding quotes from each part
           parts.map { |p| p.gsub(/\A["'\s]+|["'\s]+\z/, "").strip }
-        else
-          return nil
         end
       end
 
@@ -143,7 +142,7 @@ module Samagotchi
         s = s.strip
         return nil if s.empty?
         return nil if s.match?(/\A[\[\],\s]+\z/)
-        return nil if s == "]" || s == "["
+        return nil if ["]", "["].include?(s)
 
         s
       end

data/lib/samagotchi/tools/builtin_calls.rb

@@ -87,7 +87,7 @@ module Samagotchi
         # one of its keys must be a property; the rest must all be.
         unknown = ([path_key].compact + Array(o[:verbatim]) + Array(o[:also]) + o.fetch(:aliases, {}).keys) - properties
         unknown << content_keys.join("/") unless content_keys.empty? || content_keys.intersect?(properties)
-        raise ArgumentError, "#{name}: overrides name no schema property: #{unknown.join(', ')}" unless unknown.empty?
+        raise ArgumentError, "#{name}: overrides name no schema property: #{unknown.join(", ")}" unless unknown.empty?
         raise ArgumentError, "#{name}: a property would replace the call's name" if fields.include?("name")
 
         Row.new(name: name, content_keys: content_keys, path_key: path_key, fields: fields,

data/lib/samagotchi/tools/delegate.rb

@@ -155,7 +155,7 @@ module Samagotchi
       # true unless told otherwise; text-based parsers hand strings over.
       def self.parse_wait(value)
         return true if value.nil? || value.to_s.strip.empty?
-        return value if value == true || value == false
+        return value if [true, false].include?(value)
 
         !%w[false 0 no off].include?(value.to_s.strip.downcase)
       end

data/lib/samagotchi/tools/delegate_relay.rb

@@ -137,7 +137,7 @@ module Samagotchi
 
       # execute: git push origin main
       def what_text(facts)
-        facts = facts.is_a?(Hash) ? facts : {}
+        facts = {} unless facts.is_a?(Hash)
         tool = facts[:label] || facts[:tool] || "tool"
         what = facts[:command] || Array(facts[:paths]).join(", ")
         what = facts[:args].to_s if what.to_s.empty?

data/lib/samagotchi/tools/delegate_wait.rb

@@ -216,7 +216,6 @@ module Samagotchi
           preview[:tail]
         ].join("\n")
       end
-
     end
   end
 end

data/lib/samagotchi/tools/edit.rb

@@ -27,7 +27,7 @@ module Samagotchi
         updated, message = result
         File.write(path, updated)
         message
-      rescue => e
+      rescue StandardError => e
         "Error: #{e.message}"
       end
 
@@ -49,16 +49,16 @@ module Samagotchi
         old_text = old_text.to_s
         new_text = new_text.to_s
 
-        source = read.(path)
+        source = read.call(path)
         count  = count_occurrences(source, old_text)
 
         return "Error: old text not found in #{path}" if count == 0
         return "Error: old text matches #{count} times in #{path}; make it unique" if count > 1
 
         idx     = source.index(old_text)
-        updated = source[0, idx] + new_text + source[idx + old_text.length..]
+        updated = source[0, idx] + new_text + source[(idx + old_text.length)..]
         [updated, "Edited #{path}: replaced #{old_text.bytesize} bytes with #{new_text.bytesize} bytes"]
-      rescue => e
+      rescue StandardError => e
         "Error: #{e.message}"
       end
 
@@ -77,7 +77,7 @@ module Samagotchi
         # guessed start would silently overwrite the top of the file.
         return START_LINE_REQUIRED if start_num.nil?
 
-        source = read.(path)
+        source = read.call(path)
         lines = source.lines
         total_lines = lines.length
 
@@ -94,12 +94,11 @@ module Samagotchi
         end_value = nil
         if end_provided
           if end_num > total_lines
-            if OutputGuardrails.env_bool("SAMAGOTCHI_EDIT_ALLOW_OOR_END", default: true)
-              clamp_note = " (end_line #{end_num} exceeds #{total_lines} lines; clamped to line #{total_lines})"
-              end_value = total_lines
-            else
-              return "Error: range out of bounds for #{path}: file has #{total_lines} lines"
-            end
+            return "Error: range out of bounds for #{path}: file has #{total_lines} lines" unless OutputGuardrails.env_bool("SAMAGOTCHI_EDIT_ALLOW_OOR_END", default: true)
+
+            clamp_note = " (end_line #{end_num} exceeds #{total_lines} lines; clamped to line #{total_lines})"
+            end_value = total_lines
+
           else
             end_value = end_num
           end
@@ -107,6 +106,7 @@ module Samagotchi
           unless OutputGuardrails.env_bool("SAMAGOTCHI_EDIT_END_OPTIONAL", default: true)
             return "Error: start_line and end_line must both be provided for range edits"
           end
+
           end_value = total_lines
         end
 
@@ -118,13 +118,13 @@ module Samagotchi
         suffix = lines[end_value..]&.join.to_s
         # Ensure new_text ends with a newline when a suffix follows so that the
         # first suffix line isn't concatenated onto the last replacement line.
-        normalized = (!new_text.empty? && !suffix.empty? && !new_text.end_with?("\n")) ? new_text + "\n" : new_text
+        normalized = !new_text.empty? && !suffix.empty? && !new_text.end_with?("\n") ? new_text + "\n" : new_text
         updated = prefix + normalized + suffix
 
         replaced_lines = (end_value - start_num) + 1
         new_line_count = new_text.lines.length
         [updated, "Edited #{path}: replaced lines #{start_num}-#{end_value} (#{replaced_lines} lines) with #{new_line_count} lines#{clamp_note}"]
-      rescue => e
+      rescue StandardError => e
         "Error: #{e.message}"
       end
       private_class_method :apply_range_mode
@@ -136,6 +136,7 @@ module Samagotchi
         while (i = haystack.index(needle, pos))
           count += 1
           break if count > 1  # early exit — we only care whether it's 0, 1, or >1
+
           pos = i + needle.length
         end
         count

data/lib/samagotchi/tools/execute.rb

@@ -67,7 +67,7 @@ module Samagotchi
         stopped_result("Error: command timed out after #{timeout_sec}s\n#{TIMEOUT_HINT}", e)
       rescue CommandCancelled => e
         stopped_result("Error: command stopped by the user after #{e.elapsed.round}s (killed; rerun it if still needed)", e)
-      rescue => e
+      rescue StandardError => e
         "Error: #{e.message}"
       end
 
@@ -186,7 +186,7 @@ module Samagotchi
           @thread = Thread.new do
             Thread.current.report_on_exception = false
             loop { @buffer << io.readpartial(READ_CHUNK_BYTES) }
-          rescue EOFError, IOError
+          rescue IOError # EOFError is one
             nil
           end
         end
@@ -221,9 +221,7 @@ module Samagotchi
         signal_process(pid, "TERM")
 
         deadline = monotonic_time + STOP_GRACE_SEC
-        while process_alive?(pid) && monotonic_time < deadline
-          sleep(STOP_POLL_INTERVAL_SEC)
-        end
+        sleep(STOP_POLL_INTERVAL_SEC) while process_alive?(pid) && monotonic_time < deadline
 
         signal_process(pid, "KILL") if process_alive?(pid)
       end

data/lib/samagotchi/tools/list_reminders.rb

@@ -10,7 +10,7 @@ module Samagotchi
 
       def self.name        = NAME
 
-      def self.call(content, reminder_store: nil)
+      def self.call(_content, reminder_store: nil)
         return "Error: reminder_store not configured" unless reminder_store
 
         reminder_store.list